diff options
| -rw-r--r-- | src/crepe/facade/SDLContext.cpp | 4 | ||||
| -rw-r--r-- | src/crepe/facade/SDLContext.h | 2 | ||||
| -rw-r--r-- | src/crepe/util/AbsoluutPosition.cpp | 20 | ||||
| -rw-r--r-- | src/crepe/util/AbsoluutPosition.h | 14 | 
4 files changed, 3 insertions, 37 deletions
diff --git a/src/crepe/facade/SDLContext.cpp b/src/crepe/facade/SDLContext.cpp index 642aef8..31b0a0b 100644 --- a/src/crepe/facade/SDLContext.cpp +++ b/src/crepe/facade/SDLContext.cpp @@ -24,11 +24,11 @@  #include "api/Transform.h"  #include "facade/Font.h"  #include "manager/Mediator.h" +#include "util/AbsolutePosition.h"  #include "SDLContext.h"  #include "Texture.h"  #include "types.h" -#include "util/AbsoluutPosition.h"  using namespace crepe;  using namespace std; @@ -204,7 +204,7 @@ void SDLContext::draw_text(const RenderText & data) {  	const Text & text = data.text;  	const Font & font = data.font; -	vec2 absoluut_pos = AbsoluutPosition::get_position(data.transform, data.text.offset); +	vec2 absoluut_pos = AbsolutePosition::get_position(data.transform, data.text.offset);  	std::unique_ptr<SDL_Surface, std::function<void(SDL_Surface *)>> font_surface;  	std::unique_ptr<SDL_Texture, std::function<void(SDL_Texture *)>> font_texture; diff --git a/src/crepe/facade/SDLContext.h b/src/crepe/facade/SDLContext.h index 1dada74..7f07d34 100644 --- a/src/crepe/facade/SDLContext.h +++ b/src/crepe/facade/SDLContext.h @@ -18,8 +18,8 @@  #include "api/KeyCodes.h"  #include "api/Sprite.h"  #include "api/Transform.h" -#include "types.h" +#include "types.h"  #include "EventData.h"  #include "FontFacade.h" diff --git a/src/crepe/util/AbsoluutPosition.cpp b/src/crepe/util/AbsoluutPosition.cpp deleted file mode 100644 index 296cc09..0000000 --- a/src/crepe/util/AbsoluutPosition.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "AbsoluutPosition.h" - -using namespace crepe; - -vec2 AbsoluutPosition::get_position(const Transform & transform, const vec2 & offset) { -	// Get the rotation in radians -	float radians1 = transform.rotation * (M_PI / 180.0); - -	// Calculate total offset with scale -	vec2 total_offset = offset * transform.scale; - -	// Rotate -	float rotated_total_offset_x1 -		= total_offset.x * cos(radians1) - total_offset.y * sin(radians1); -	float rotated_total_offset_y1 -		= total_offset.x * sin(radians1) + total_offset.y * cos(radians1); - -	// Final positions considering scaling and rotation -	return (transform.position + vec2(rotated_total_offset_x1, rotated_total_offset_y1)); -} diff --git a/src/crepe/util/AbsoluutPosition.h b/src/crepe/util/AbsoluutPosition.h deleted file mode 100644 index 30a7f93..0000000 --- a/src/crepe/util/AbsoluutPosition.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "api/Transform.h" - -#include "types.h" - -namespace crepe { - -class AbsoluutPosition { -public: -	static vec2 get_position(const Transform & transform, const vec2 & offset); -}; - -} // namespace crepe  |