allow multiple meshes per entity

[blank.git] / src / world / World.cpp

diff --git a/src/world/World.cpp b/src/world/World.cpp
index e8b665c992366ca2b5f2ecc0efd63447a2f8d73d..19219e4dd9360a85b68c69cc81b9f982fd94eb54 100644 (file)
--- a/src/world/World.cpp
+++ b/src/world/World.cpp
@@ -1,9 +1,10 @@
 #include "World.hpp"
 
 #include "WorldCollision.hpp"
+#include "../app/Assets.hpp"
+#include "../graphics/Format.hpp"
 #include "../graphics/Viewport.hpp"
 
-#include <iostream>
 #include <limits>
 #include <glm/gtx/io.hpp>
 #include <glm/gtx/transform.hpp>
@@ -11,13 +12,14 @@
 
 namespace blank {
 
-World::World(const Config &config)
+World::World(const Assets &assets, const Config &config, const WorldSave &save)
 : blockType()
 , blockShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }})
 , stairShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f })
 , slabShape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }})
+, block_tex()
 , generate(config.gen)
-, chunks(config.load, blockType, generate)
+, chunks(config.load, blockType, generate, save)
 , player()
 , entities()
 , light_direction(config.light_direction)
@@ -26,8 +28,17 @@ World::World(const Config &config)
        BlockType::Faces slab_fill  = { false,  true, false, false, false, false };
        BlockType::Faces stair_fill = { false,  true, false, false, false,  true };
 
+       block_tex.Bind();
+       block_tex.Reserve(16, 16, 4, Format());
+       assets.LoadTexture("debug", block_tex, 0);
+       assets.LoadTexture("rock-1", block_tex, 1);
+       assets.LoadTexture("rock-2", block_tex, 2);
+       assets.LoadTexture("rock-3", block_tex, 3);
+       block_tex.FilterNearest();
+
        { // white block
                BlockType type(true, { 1.0f, 1.0f, 1.0f }, &blockShape);
+               type.texture = 1;
                type.label = "White Block";
                type.block_light = true;
                type.collision = true;
@@ -37,6 +48,7 @@ World::World(const Config &config)
        }
        { // white slab
                BlockType type(true, { 1.0f, 1.0f, 1.0f }, &slabShape);
+               type.texture = 1;
                type.label = "White Slab";
                type.block_light = true;
                type.collision = true;
@@ -46,6 +58,7 @@ World::World(const Config &config)
        }
        { // white stair
                BlockType type(true, { 1.0f, 1.0f, 1.0f }, &stairShape);
+               type.texture = 1;
                type.label = "White Stair";
                type.block_light = true;
                type.collision = true;
@@ -56,6 +69,7 @@ World::World(const Config &config)
 
        { // red block
                BlockType type(true, { 1.0f, 0.0f, 0.0f }, &blockShape);
+               type.texture = 3;
                type.label = "Red Block";
                type.block_light = true;
                type.collision = true;
@@ -65,6 +79,7 @@ World::World(const Config &config)
        }
        { // red slab
                BlockType type(true, { 1.0f, 0.0f, 0.0f }, &slabShape);
+               type.texture = 3;
                type.label = "Red Slab";
                type.block_light = true;
                type.collision = true;
@@ -74,6 +89,7 @@ World::World(const Config &config)
        }
        { // red stair
                BlockType type(true, { 1.0f, 0.0f, 0.0f }, &stairShape);
+               type.texture = 3;
                type.label = "Red Stair";
                type.block_light = true;
                type.collision = true;
@@ -84,6 +100,7 @@ World::World(const Config &config)
 
        { // green block
                BlockType type(true, { 0.0f, 1.0f, 0.0f }, &blockShape);
+               type.texture = 1;
                type.label = "Green Block";
                type.block_light = true;
                type.collision = true;
@@ -93,6 +110,7 @@ World::World(const Config &config)
        }
        { // green slab
                BlockType type(true, { 0.0f, 1.0f, 0.0f }, &slabShape);
+               type.texture = 1;
                type.label = "Green Slab";
                type.block_light = true;
                type.collision = true;
@@ -102,6 +120,7 @@ World::World(const Config &config)
        }
        { // green stair
                BlockType type(true, { 0.0f, 1.0f, 0.0f }, &stairShape);
+               type.texture = 1;
                type.label = "Green Stair";
                type.block_light = true;
                type.collision = true;
@@ -112,6 +131,7 @@ World::World(const Config &config)
 
        { // blue block
                BlockType type(true, { 0.0f, 0.0f, 1.0f }, &blockShape);
+               type.texture = 3;
                type.label = "Blue Block";
                type.block_light = true;
                type.collision = true;
@@ -121,6 +141,7 @@ World::World(const Config &config)
        }
        { // blue slab
                BlockType type(true, { 0.0f, 0.0f, 1.0f }, &slabShape);
+               type.texture = 3;
                type.label = "Blue Slab";
                type.block_light = true;
                type.collision = true;
@@ -130,6 +151,7 @@ World::World(const Config &config)
        }
        { // blue stair
                BlockType type(true, { 0.0f, 0.0f, 1.0f }, &stairShape);
+               type.texture = 3;
                type.label = "Blue Stair";
                type.block_light = true;
                type.collision = true;
@@ -140,6 +162,7 @@ World::World(const Config &config)
 
        { // glowing yellow block
                BlockType type(true, { 1.0f, 1.0f, 0.0f }, &blockShape);
+               type.texture = 2;
                type.label = "Light";
                type.luminosity = 15;
                type.block_light = true;
@@ -149,6 +172,18 @@ World::World(const Config &config)
                blockType.Add(type);
        }
 
+       { // the mysterious debug cube
+               BlockType type(true, { 1.0f, 1.0f, 1.0f }, &blockShape);
+               type.texture = 0;
+               type.label = "Debug Cube";
+               type.luminosity = 0;
+               type.block_light = true;
+               type.collision = true;
+               type.collide_block = true;
+               type.fill = block_fill;
+               blockType.Add(type);
+       }
+
        generate.Space(0);
        generate.Light(13);
        generate.Solids({ 1, 4, 7, 10 });
@@ -159,7 +194,7 @@ World::World(const Config &config)
        player->WorldCollidable(true);
        player->Position(config.spawn);
 
-       chunks.GenerateSurrounding(player->ChunkCoords());
+       chunks.QueueSurrounding(player->ChunkCoords());
 }
 
 
@@ -305,6 +340,7 @@ void World::Render(Viewport &viewport) {
        viewport.WorldPosition(player->Transform(player->ChunkCoords()));
 
        BlockLighting &chunk_prog = viewport.ChunkProgram();
+       chunk_prog.SetTexture(block_tex);
        chunk_prog.SetFogDensity(fog_density);
 
        for (Chunk &chunk : chunks.Loaded()) {
@@ -321,10 +357,7 @@ void World::Render(Viewport &viewport) {
        entity_prog.SetFogDensity(fog_density);
 
        for (Entity &entity : entities) {
-               if (entity.HasShape()) {
-                       entity_prog.SetM(entity.Transform(player->ChunkCoords()));
-                       entity.Draw();
-               }
+               entity.Render(entity.ChunkTransform(player->ChunkCoords()), entity_prog);
        }
 }