From e65c2341c266573f6ad6b318a6b33a6bf18e8d9d Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Wed, 9 Nov 2016 01:46:10 +0100
Subject: [PATCH] Draw a test character to start experimenting.

---
 CMakeLists.txt       |   1 +
 LPC_Sara_Preview.png | Bin 0 -> 1896 bytes
 src/character.cpp    |  46 +++++++++++++++++++++++++++++++++++++++++++
 src/character.hpp    |  29 +++++++++++++++++++++++++++
 src/ingamescene.cpp  |   6 ++++++
 5 files changed, 82 insertions(+)
 create mode 100644 LPC_Sara_Preview.png
 create mode 100644 src/character.cpp
 create mode 100644 src/character.hpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e26d76b..4e04676 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,6 +65,7 @@ add_executable(${PROJECT_NAME}
 	src/tileiterator.cpp
 	src/texture.cpp
 	src/movingobject.cpp
+	src/character.cpp
 )
 
 target_include_directories(${PROJECT_NAME} SYSTEM
diff --git a/LPC_Sara_Preview.png b/LPC_Sara_Preview.png
new file mode 100644
index 0000000000000000000000000000000000000000..69417cb812965a22e40665c4eb51cc0ab0e3887f
GIT binary patch
literal 1896
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

literal 0
HcmV?d00001

diff --git a/src/character.cpp b/src/character.cpp
new file mode 100644
index 0000000..bd79f2c
--- /dev/null
+++ b/src/character.cpp
@@ -0,0 +1,46 @@
+#include "character.hpp"
+
+namespace curry {
+	Character::Character() :
+		m_position(0.0f)
+	{
+	}
+
+	void Character::load (const char* parTexturePath, cloonel::SDLMain& parSDLMain) {
+		m_texture.load(parTexturePath, parSDLMain);
+	}
+
+	void Character::unload() {
+		m_texture.unload();
+	}
+
+	void Character::set_position (const vec2f& parPos) {
+		m_position = parPos;
+	}
+
+	const vec2f& Character::position() const {
+		return m_position;
+	}
+
+	vec2us Character::width_height() const {
+		return m_texture.width_height();
+	}
+
+	Texture& Character::texture() {
+		return m_texture;
+	}
+
+	Rect<float> Character::destination_rect (const vec2f& parWorldPos) const {
+		return Rect<float>(
+			m_position - parWorldPos,
+			m_position - parWorldPos + vector_cast<vec2f>(width_height())
+		);
+	}
+
+	Rect<float> Character::source_rect() const {
+		return Rect<float>(
+			vec2f(0.0f),
+			vector_cast<vec2f>(width_height())
+		);
+	}
+} //namespace curry
diff --git a/src/character.hpp b/src/character.hpp
new file mode 100644
index 0000000..3033a21
--- /dev/null
+++ b/src/character.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "texture.hpp"
+#include "vector.hpp"
+#include "rect.hpp"
+
+namespace cloonel {
+	class SDLMain;
+} //namespace cloonel
+
+namespace curry {
+	class Character {
+	public:
+		Character();
+
+		void load (const char* parTexturePath, cloonel::SDLMain& parSDLMain);
+		void unload();
+		const vec2f& position() const;
+		void set_position (const vec2f& parPos);
+		vec2us width_height() const;
+		Texture& texture();
+		Rect<float> destination_rect (const vec2f& parWorldPos) const;
+		Rect<float> source_rect() const;
+
+	private:
+		Texture m_texture;
+		vec2f m_position;
+	};
+} //namespace curry
diff --git a/src/ingamescene.cpp b/src/ingamescene.cpp
index 8b88b12..b4377bb 100644
--- a/src/ingamescene.cpp
+++ b/src/ingamescene.cpp
@@ -8,6 +8,7 @@
 #include "worldviewport.hpp"
 #include "texture.hpp"
 #include "rect.hpp"
+#include "character.hpp"
 #include "csvloader.hpp"
 #include <SDL2/SDL.h>
 #include <algorithm>
@@ -39,6 +40,7 @@ namespace curry {
 		WorldViewport viewport;
 		Texture worldtiles;
 		MovingObject player;
+		Character character;
 	};
 
 	IngameScene::IngameScene (cloonel::SDLMain* parSDLMain) :
@@ -71,6 +73,7 @@ namespace curry {
 #endif
 
 		m_local_data->viewport.allow_overscan(false);
+		m_local_data->character.load(RESOURCES_PATH "LPC_Sara_Preview.png", *this->sdl_main());
 	}
 
 	void IngameScene::on_update (float parDeltaT) {
@@ -92,6 +95,7 @@ namespace curry {
 		if (cloonel::IsPressed(input_bag(), ActionDown))
 			offset.y() += speed;
 		viewport.set_position(viewport.position() + offset);
+		m_local_data->character.set_position(m_local_data->character.position() + offset);
 
 		const auto tilesize(static_cast<vec2f>(world.tile_size()));
 		const auto tilecount(m_local_data->worldtiles.width_height() / world.tile_size());
@@ -108,9 +112,11 @@ namespace curry {
 				this->draw_clipped(m_local_data->worldtiles, src_rect, dst_rect);
 			}
 		}
+		this->draw_clipped(m_local_data->character.texture(), m_local_data->character.source_rect(), m_local_data->character.destination_rect(viewport.position()));
 	}
 
 	void IngameScene::on_destroy() noexcept {
 		m_local_data->worldtiles.unload();
+		m_local_data->character.unload();
 	}
 } //namespace curry