store block type as ID rather than pointer

[blank.git] / src / app.cpp

diff --git a/src/app.cpp b/src/app.cpp
index 539858f58df74ba0adc865adda884169bcbd94f9..9580d33560024171ab9db84e957777b697f2c970 100644 (file)
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -19,6 +19,7 @@ Application::Application()
 , cam()
 , hud()
 , world()
+, controller(world.Player())
 , outline()
 , outline_visible(false)
 , outline_transform(1.0f)
@@ -68,7 +69,7 @@ void Application::HandleEvents() {
                switch (event.type) {
                        case SDL_KEYDOWN:
                        case SDL_KEYUP:
-                               world.Controller().HandleKeyboard(event.key);
+                               controller.HandleKeyboard(event.key);
                                break;
                        case SDL_MOUSEBUTTONDOWN:
                                if (event.button.button == 1) {
@@ -83,7 +84,7 @@ void Application::HandleEvents() {
                                }
                                break;
                        case SDL_MOUSEMOTION:
-                               world.Controller().HandleMouse(event.motion);
+                               controller.HandleMouse(event.motion);
                                break;
                        case SDL_QUIT:
                                running = false;
@@ -105,9 +106,10 @@ void Application::HandleEvents() {
 }
 
 void Application::Update(int dt) {
+       controller.Update(dt);
        world.Update(dt);
 
-       Ray aim = world.Controller().Aim();
+       Ray aim = controller.Aim();
        Chunk *chunk;
        int blkid;
        float dist;
@@ -116,8 +118,8 @@ void Application::Update(int dt) {
                glm::vec3 pos = Chunk::ToCoords(blkid);
                outline_visible = true;
                outline.Clear();
-               chunk->BlockAt(blkid).type->FillOutlineModel(outline);
-               outline_transform = glm::translate(chunk->Transform(), pos);
+               chunk->Type(chunk->BlockAt(blkid)).FillOutlineModel(outline);
+               outline_transform = glm::translate(chunk->Transform(world.Player().ChunkCoords()), pos);
                outline_transform = glm::scale(outline_transform, glm::vec3(1.0001f));
        } else {
                outline_visible = false;
@@ -125,14 +127,14 @@ void Application::Update(int dt) {
 
        if (pick) {
                if (chunk) {
-                       place_id = chunk->BlockAt(blkid).type->id;
+                       place_id = chunk->BlockAt(blkid).type;
                        hud.Display(*world.BlockTypes()[place_id]);
                }
                pick = false;
        }
        if (remove) {
                if (chunk) {
-                       chunk->BlockAt(blkid).type = world.BlockTypes()[remove_id];
+                       chunk->BlockAt(blkid).type = remove_id;
                        chunk->Invalidate();
                }
                remove = false;
@@ -143,9 +145,9 @@ void Application::Update(int dt) {
                        glm::vec3 next_pos = Chunk::ToCoords(blkid) + normal;
                        if (!Chunk::InBounds(next_pos)) {
                                mod_chunk = &world.Next(*chunk, normal);
-                               next_pos -= normal * Chunk::Extent();
+                               next_pos -= normal * glm::vec3(Chunk::Extent());
                        }
-                       mod_chunk->BlockAt(next_pos).type = world.BlockTypes()[place_id];
+                       mod_chunk->BlockAt(next_pos).type = place_id;
                        mod_chunk->Invalidate();
                }
                place = false;