]> git.localhorst.tv Git - blank.git/blobdiff - src/world/block.cpp
fix default outline color
[blank.git] / src / world / block.cpp
index d6e5507ddf5777f1b061dca6e256099d34397c68..f518b64aeabc96ad4a7cc8d8313582cb64348f8f 100644 (file)
@@ -1,9 +1,16 @@
 #include "Block.hpp"
+#include "BlockGravity.hpp"
 #include "BlockType.hpp"
 #include "BlockTypeRegistry.hpp"
 
-#include <ostream>
+#include "../io/TokenStreamReader.hpp"
+#include "../model/ShapeRegistry.hpp"
+#include "../shared/ResourceIndex.hpp"
+
+#include <iostream>
+#include <stdexcept>
 #include <glm/gtx/euler_angles.hpp>
+#include <glm/gtx/norm.hpp>
 #include <glm/gtx/transform.hpp>
 
 
@@ -67,9 +74,11 @@ std::ostream &operator <<(std::ostream &out, const Block::Turn &turn) {
 BlockType::BlockType() noexcept
 : shape(nullptr)
 , textures()
-, hsl_mod(0.0f, 1.0f, 1.0f)
-, rgb_mod(1.0f, 1.0f, 1.0f)
-, outline_color(-1, -1, -1)
+, hsl_mod(0, 255, 255)
+, rgb_mod(255, 255, 255)
+, outline_color(0, 0, 0)
+, gravity()
+, name("anonymous")
 , label("some block")
 , place_sound(-1)
 , remove_sound(-1)
@@ -96,6 +105,133 @@ BlockType::BlockType() noexcept
 
 }
 
+void BlockType::Copy(const BlockType &other) noexcept {
+       shape = other.shape;
+       textures = other.textures;
+       hsl_mod = other.hsl_mod;
+       rgb_mod = other.rgb_mod;
+       outline_color = other.outline_color;
+       place_sound = other.place_sound;
+       remove_sound = other.remove_sound;
+       luminosity = other.luminosity;
+       visible = other.visible;
+       block_light = other.block_light;
+       collision = other.collision;
+       collide_block = collide_block;
+       generate = other.generate;
+       min_solidity = other.min_solidity;
+       mid_solidity = other.mid_solidity;
+       max_solidity = other.max_solidity;
+       min_humidity = other.min_humidity;
+       mid_humidity = other.mid_humidity;
+       max_humidity = other.max_humidity;
+       min_temperature = other.min_temperature;
+       mid_temperature = other.mid_temperature;
+       max_temperature = other.max_temperature;
+       min_richness = other.min_richness;
+       mid_richness = other.mid_richness;
+       max_richness = other.max_richness;
+       commonness = other.commonness;
+}
+
+void BlockType::Read(
+       TokenStreamReader &in,
+       ResourceIndex &snd_index,
+       ResourceIndex &tex_index,
+       const ShapeRegistry &shapes
+) {
+       std::string name;
+       in.Skip(Token::ANGLE_BRACKET_OPEN);
+       glm::vec3 color_conv;
+       while (in.Peek().type != Token::ANGLE_BRACKET_CLOSE) {
+               in.ReadIdentifier(name);
+               in.Skip(Token::EQUALS);
+               if (name == "visible") {
+                       visible = in.GetBool();
+               } else if (name == "texture") {
+                       textures.clear();
+                       in.ReadString(name);
+                       textures.push_back(tex_index.GetID(name));
+               } else if (name == "textures") {
+                       textures.clear();
+                       in.Skip(Token::BRACKET_OPEN);
+                       while (in.Peek().type != Token::BRACKET_CLOSE) {
+                               in.ReadString(name);
+                               textures.push_back(tex_index.GetID(name));
+                               if (in.Peek().type == Token::COMMA) {
+                                       in.Skip(Token::COMMA);
+                               }
+                       }
+                       in.Skip(Token::BRACKET_CLOSE);
+               } else if (name == "rgb_mod") {
+                       in.ReadVec(color_conv);
+                       rgb_mod = glm::tvec3<unsigned char>(color_conv * 255.0f);
+               } else if (name == "hsl_mod") {
+                       in.ReadVec(color_conv);
+                       hsl_mod = glm::tvec3<unsigned char>(color_conv * 255.0f);
+               } else if (name == "outline") {
+                       in.ReadVec(color_conv);
+                       outline_color = glm::tvec3<unsigned char>(color_conv * 255.0f);
+               } else if (name == "gravity") {
+                       gravity = BlockGravity::Read(in);
+               } else if (name == "label") {
+                       in.ReadString(label);
+               } else if (name == "place_sound") {
+                       in.ReadString(name);
+                       place_sound = snd_index.GetID(name);
+               } else if (name == "remove_sound") {
+                       in.ReadString(name);
+                       remove_sound = snd_index.GetID(name);
+               } else if (name == "luminosity") {
+                       luminosity = in.GetInt();
+               } else if (name == "block_light") {
+                       block_light = in.GetBool();
+               } else if (name == "collision") {
+                       collision = in.GetBool();
+               } else if (name == "collide_block") {
+                       collide_block = in.GetBool();
+               } else if (name == "generate") {
+                       generate = in.GetBool();
+               } else if (name == "min_solidity") {
+                       min_solidity = in.GetFloat();
+               } else if (name == "mid_solidity") {
+                       mid_solidity = in.GetFloat();
+               } else if (name == "max_solidity") {
+                       max_solidity = in.GetFloat();
+               } else if (name == "min_humidity") {
+                       min_humidity = in.GetFloat();
+               } else if (name == "mid_humidity") {
+                       mid_humidity = in.GetFloat();
+               } else if (name == "max_humidity") {
+                       max_humidity = in.GetFloat();
+               } else if (name == "min_temperature") {
+                       min_temperature = in.GetFloat();
+               } else if (name == "mid_temperature") {
+                       mid_temperature = in.GetFloat();
+               } else if (name == "max_temperature") {
+                       max_temperature = in.GetFloat();
+               } else if (name == "min_richness") {
+                       min_richness = in.GetFloat();
+               } else if (name == "mid_richness") {
+                       mid_richness = in.GetFloat();
+               } else if (name == "max_richness") {
+                       max_richness = in.GetFloat();
+               } else if (name == "commonness") {
+                       commonness = in.GetFloat();
+               } else if (name == "shape") {
+                       in.ReadIdentifier(name);
+                       shape = &shapes.Get(name);
+               } else {
+                       std::cerr << "warning: unknown block type property " << name << std::endl;
+                       while (in.Peek().type != Token::SEMICOLON) {
+                               in.Next();
+                       }
+               }
+               in.Skip(Token::SEMICOLON);
+       }
+       in.Skip(Token::ANGLE_BRACKET_CLOSE);
+}
+
 void BlockType::FillEntityMesh(
        EntityMesh::Buffer &buf,
        const glm::mat4 &transform
@@ -120,26 +256,135 @@ void BlockType::FillBlockMesh(
 void BlockType::OutlinePrimitiveMesh(PrimitiveMesh::Buffer &buf) const noexcept {
        if (!shape) return;
        shape->Outline(buf);
-       buf.colors.insert(buf.colors.end(), shape->OutlineCount(), glm::vec4(outline_color, 1.0f));
+       buf.colors.insert(buf.colors.end(), shape->OutlineCount(), glm::tvec4<unsigned char>(outline_color, 255));
 }
 
 
 BlockTypeRegistry::BlockTypeRegistry() {
        BlockType air;
+       air.name = "air";
+       air.label = "Air";
        air.visible = false;
        air.block_light = false;
        air.collision = false;
        air.collide_block = false;
-       Add(air);
+       Add(std::move(air));
 }
 
-Block::Type BlockTypeRegistry::Add(const BlockType &t) {
+Block::Type BlockTypeRegistry::Add(BlockType &&t) {
        int id = types.size();
-       types.push_back(t);
+       if (!names.emplace(t.name, id).second) {
+               throw std::runtime_error("duplicate block type name " + t.name);
+       }
+       types.push_back(std::move(t));
        types.back().id = id;
        return id;
 }
 
+BlockType &BlockTypeRegistry::Get(const std::string &name) {
+       auto entry = names.find(name);
+       if (entry != names.end()) {
+               return Get(entry->second);
+       } else {
+               throw std::runtime_error("unknown block type " + name);
+       }
+}
+
+const BlockType &BlockTypeRegistry::Get(const std::string &name) const {
+       auto entry = names.find(name);
+       if (entry != names.end()) {
+               return Get(entry->second);
+       } else {
+               throw std::runtime_error("unknown block type " + name);
+       }
+}
+
+
+namespace {
+
+/// the "usual" type of gravity
+/// direction is towards the block's center, strength is inverse
+/// proportional to distance squared
+/// note that the effect can get clipped at distances > 16 units
+struct RadialGravity
+: public BlockGravity {
+
+       explicit RadialGravity(float strength)
+       : strength(strength) { }
+
+       glm::vec3 GetGravity(const glm::vec3 &diff, const glm::mat4 &) const noexcept override {
+               float dist2 = length2(diff);
+               glm::vec3 dir = -normalize(diff);
+               return dir * (strength / dist2);
+       }
+
+       float strength;
+
+};
+
+/// a "force field" variant of artificial gravity
+/// strength and direction is constant throughout the cuboid
+/// extent shouldn't exceed 16 units as gravity is only calculated for
+/// chunks surrounding and entity (and sometimes not even those if they're
+/// unavailable, but they will be for players)
+struct CuboidFieldGravity
+: public BlockGravity {
+
+       explicit CuboidFieldGravity(const glm::vec3 &strength, const AABB &extent)
+       : strength(strength), extent(extent) { }
+
+       glm::vec3 GetGravity(const glm::vec3 &diff, const glm::mat4 &M) const noexcept override {
+               /// rotate AABB endpoints accordingly, ignore translation
+               glm::vec3 min(M * glm::vec4(extent.min, 0.0f));
+               glm::vec3 max(M * glm::vec4(extent.max, 0.0f));
+               if (diff.x < min.x || diff.y < min.y || diff.z < min.z ||
+                               diff.x > max.x || diff.y > max.y || diff.z > max.z) {
+                       /// if point is outside, force is zero
+                       return glm::vec3(0.0f);
+               } else {
+                       /// otherwise it's out constant strength in block orientation
+                       return glm::vec3(M * glm::vec4(strength, 0.0f));
+               }
+       }
+
+       glm::vec3 strength;
+       AABB extent;
+
+};
+
+
+}
+
+BlockGravity::~BlockGravity() {
+
+}
+
+std::unique_ptr<BlockGravity> BlockGravity::Read(TokenStreamReader &in) {
+       std::string type;
+       in.ReadIdentifier(type);
+       if (type == "Radial") {
+               float strength;
+               in.Skip(Token::PARENTHESIS_OPEN);
+               in.ReadNumber(strength);
+               in.Skip(Token::PARENTHESIS_CLOSE);
+               return std::unique_ptr<BlockGravity>(new RadialGravity(strength));
+       } else if (type == "CuboidField") {
+               glm::vec3 strength;
+               AABB extent;
+               in.Skip(Token::PARENTHESIS_OPEN);
+               in.ReadVec(strength);
+               in.Skip(Token::COMMA);
+               in.ReadVec(extent.min);
+               in.Skip(Token::COMMA);
+               in.ReadVec(extent.max);
+               in.Skip(Token::PARENTHESIS_CLOSE);
+               extent.Adjust();
+               return std::unique_ptr<BlockGravity>(new CuboidFieldGravity(strength, extent));
+       } else {
+               throw std::runtime_error("unknown gravity type: " + type);
+       }
+}
+
 
 const glm::mat4 Block::orient2transform[ORIENT_COUNT] = {
        {  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1,  0,  0,  0,  0,  1, }, // face: up,    turn: none