From 629a3d9e085656ce7b51a9c4e09dfa50c95c927f Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Fri, 28 Oct 2016 21:06:19 +0200 Subject: [PATCH] Add movingobject --- CMakeLists.txt | 1 + src/ingamescene.cpp | 5 ++++- src/movingobject.cpp | 8 ++++++++ src/movingobject.hpp | 13 +++++++++++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/movingobject.cpp create mode 100644 src/movingobject.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 21c4018..3d34c87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,6 +63,7 @@ add_executable(${PROJECT_NAME} src/inputbag.cpp src/tileiterator.cpp src/texture.cpp + src/movingobject.cpp ) target_include_directories(${PROJECT_NAME} SYSTEM diff --git a/src/ingamescene.cpp b/src/ingamescene.cpp index ee23994..a0f6fb2 100644 --- a/src/ingamescene.cpp +++ b/src/ingamescene.cpp @@ -3,6 +3,7 @@ #include "mycurryConfig.h" #include "key.hpp" #include "inputbag.hpp" +#include "movingobject.hpp" #include "worldgrid.hpp" #include "worldviewport.hpp" #include "texture.hpp" @@ -32,13 +33,15 @@ namespace curry { struct IngameScene::LocalData { LocalData (const vec2us& parTileSize, const vec2us& parTileCount, cloonel::SDLMain* parSDLMain) : world(parTileSize, parTileCount), - viewport(&world, vec2i(parSDLMain->WidthHeight())) + viewport(&world, vec2i(parSDLMain->WidthHeight())), + player(parTileSize) { } WorldGrid world; WorldViewport viewport; Texture worldtiles; + MovingObject player; }; IngameScene::IngameScene (cloonel::SDLMain* parSDLMain) : diff --git a/src/movingobject.cpp b/src/movingobject.cpp new file mode 100644 index 0000000..47841f6 --- /dev/null +++ b/src/movingobject.cpp @@ -0,0 +1,8 @@ +#include "movingobject.hpp" + +namespace curry { + MovingObject::MovingObject (const vec2us& parSize) : + m_size(parSize) + { + } +} //namespace curry diff --git a/src/movingobject.hpp b/src/movingobject.hpp new file mode 100644 index 0000000..8c29b0a --- /dev/null +++ b/src/movingobject.hpp @@ -0,0 +1,13 @@ +#pragma once + +#include "vector.hpp" + +namespace curry { + class MovingObject { + public: + MovingObject (const vec2us& parSize); + + private: + vec2us m_size; + }; +} //namespace curry