ingest forgein materials

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

diff --git a/src/app/app.cpp b/src/app/app.cpp
index e4dc1a58eef0de9166254142f5ea19073810c9e3..f847a79176701f174a60bdaf323b5efda252320f 100644 (file)
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -176,6 +176,7 @@ Assets::Assets()
 , font_path(path + "fonts/")
 , skin_path(path + "skins/")
 , tile_path(path + "tiles/")
+, random(0x6283B64CEFE57925)
 , fonts{
        graphics::Font(font_path + "DejaVuSans.ttf", 32),
        graphics::Font(font_path + "DejaVuSans.ttf", 24),
@@ -215,15 +216,12 @@ Assets::Assets()
 
        textures.skins.Bind();
        textures.skins.Reserve(256, 256, 9, format);
-       LoadSkinTexture("1", textures.skins, 0);
-       LoadSkinTexture("2", textures.skins, 1);
-       LoadSkinTexture("3", textures.skins, 2);
-       LoadSkinTexture("4", textures.skins, 3);
-       LoadSkinTexture("5", textures.skins, 4);
-       LoadSkinTexture("6", textures.skins, 5);
-       LoadSkinTexture("7", textures.skins, 6);
-       LoadSkinTexture("8", textures.skins, 7);
-       LoadSkinTexture("9", textures.skins, 8);
+       LoadSkinTexture("plain", textures.skins, 0);
+       LoadSkinTexture("stripes", textures.skins, 1);
+       LoadSkinTexture("dots", textures.skins, 2);
+       LoadSkinTexture("lines", textures.skins, 3);
+       LoadSkinTexture("spots", textures.skins, 4);
+       LoadSkinTexture("circles", textures.skins, 5);
        textures.skins.FilterTrilinear();
 }
 
@@ -251,6 +249,11 @@ void Assets::ReadResources(io::TokenStreamReader &in) {
                        in.Skip(io::Token::EQUALS);
                        if (name == "label") {
                                in.ReadString(data.resources[id].label);
+                       } else if (name == "density") {
+                               data.resources[id].density = in.GetDouble();
+                       } else if (name == "energy") {
+                               data.resources[id].energy = in.GetDouble();
+                               data.resources[id].inverse_energy = 1.0 / data.resources[id].energy;
                        } else if (name == "state") {
                                in.ReadIdentifier(name);
                                if (name == "solid") {
@@ -264,6 +267,26 @@ void Assets::ReadResources(io::TokenStreamReader &in) {
                                } else {
                                        throw std::runtime_error("unknown resource state '" + name + "'");
                                }
+                       } else if (name == "base_color") {
+                               in.ReadVec(data.resources[id].base_color);
+                       } else if (name == "compatibility") {
+                               in.Skip(io::Token::ANGLE_BRACKET_OPEN);
+                               while (in.Peek().type != io::Token::ANGLE_BRACKET_CLOSE) {
+                                       in.ReadIdentifier(name);
+                                       int sub_id = 0;
+                                       if (data.resources.Has(name)) {
+                                               sub_id = data.resources[name].id;
+                                       } else {
+                                               world::Resource res;
+                                               res.name = name;
+                                               sub_id = data.resources.Add(res);
+                                       }
+                                       in.Skip(io::Token::COLON);
+                                       double value = in.GetDouble();
+                                       in.Skip(io::Token::SEMICOLON);
+                                       data.resources[id].compatibility[sub_id] = value;
+                               }
+                               in.Skip(io::Token::ANGLE_BRACKET_CLOSE);
                        } else {
                                throw std::runtime_error("unknown resource property '" + name + "'");
                        }