renamed Shape -> CollisionBounds

[blank.git] / src / app / app.cpp

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 2d5aa4fd05b6eb5df3653878d0bd7af6551a1317..4f2a6ecdfaad1ff6a7b4a49cb462aea382ef426c 100644 (file)
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -13,7 +13,7 @@
 #include "../graphics/Font.hpp"
 #include "../graphics/Texture.hpp"
 #include "../io/TokenStreamReader.hpp"
-#include "../model/shapes.hpp"
+#include "../model/bounds.hpp"
 #include "../world/BlockType.hpp"
 #include "../world/BlockTypeRegistry.hpp"
 #include "../world/Entity.hpp"
@@ -305,9 +305,9 @@ Assets::Assets(const AssetLoader &loader)
 
 namespace {
 
-CuboidShape block_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }});
-StairShape stair_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f });
-CuboidShape slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }});
+CuboidBounds block_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }});
+StairBounds stair_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }}, { 0.0f, 0.0f });
+CuboidBounds slab_shape({{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.0f, 0.5f }});
 
 }
 
@@ -337,8 +337,10 @@ void AssetLoader::LoadBlockTypes(const std::string &set_name, BlockTypeRegistry
                        } else if (name == "texture") {
                                in.ReadString(tex_name);
                                type.texture = tex_index.GetID(tex_name);
-                       } else if (name == "color") {
-                               in.ReadVec(type.color);
+                       } else if (name == "rgb_mod") {
+                               in.ReadVec(type.rgb_mod);
+                       } else if (name == "hsl_mod") {
+                               in.ReadVec(type.hsl_mod);
                        } else if (name == "outline") {
                                in.ReadVec(type.outline_color);
                        } else if (name == "label") {