Map converted to entity child

svenstaro · Mar 23, 2014 · 5ac8ce2 · 5ac8ce2
1 parent 6231700
commit 5ac8ce2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/BGJ07/src/game.cpp b/BGJ07/src/game.cpp
@@ -105,7 +105,6 @@ void Game::run() {
         m_CameraViewport.h = m_MainViewport.h;
 
         SDL_RenderClear(m_Renderer);
-        arena->drawLevel(m_Renderer);
         m_World.draw(m_Renderer);
         SDL_SetRenderTarget(m_Renderer, 0);
         SDL_RenderCopy(m_Renderer, m_DrawTexture, &m_CameraViewport, NULL); 

diff --git a/BGJ07/src/map.cpp b/BGJ07/src/map.cpp
@@ -1,6 +1,10 @@
 #include "map.hpp"
 #include <SDL2_gfxPrimitives.h>
 
+void Map::onInit(){
+    physicsShape = createMap();    
+}
+
 btBvhTriangleMeshShape* Map::createMap(){
     btTriangleMesh* triMesh = new btTriangleMesh();
 
@@ -24,7 +28,7 @@ btBvhTriangleMeshShape* Map::createMap(){
     return triMeshShape;
 }
 
-void Map::drawLevel(SDL_Renderer* renderer){
+void Map::onDraw(SDL_Renderer* renderer){
     SDL_SetRenderDrawColor(renderer, 255, 100, 0, 255);
     for (std::size_t count = 0; count < m_Vector.size(); count ++){
         SDL_Point points[4];

diff --git a/BGJ07/src/map.hpp b/BGJ07/src/map.hpp
@@ -4,11 +4,13 @@
 #include <btBulletDynamicsCommon.h>
 #include <vector>
 #include <SDL.h>
+#include "entity.hpp"
 
-class Map{
+class Map : public Entity{
     public:
         btBvhTriangleMeshShape* createMap();
-        void drawLevel(SDL_Renderer* renderer);
+        void onDraw(SDL_Renderer* renderer) override;
+        void onInit() override;
 
     private:
         std::vector<std::vector<btVector3>> m_Vector;

diff --git a/BGJ07/src/world.cpp b/BGJ07/src/world.cpp
@@ -4,6 +4,7 @@
 
 #include "game.hpp"
 #include "player.hpp"
+#include "map.hpp"
 
 void bulletTickCallback(btDynamicsWorld *world, btScalar timeStep) {
     auto w = static_cast<World*>(world->getWorldUserInfo());
@@ -58,6 +59,7 @@ void World::init(Game* g) {
     m_DynamicsWorld->setGravity(btVector3(0, 2, 0));
 
     addEntity(new Player());
+    addEntity(new Map());
 }
 
 void World::destroy() {