X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fapp.cpp;h=3f87c8f5cf39011e0734d936bf315e1be7ababdb;hb=a1b5d6dbc13d185b9ac459e421ae44b3ef8ce133;hp=62de9abab0320ca56ae20fbb130e42c6ec7a4d60;hpb=fec78f7f01a03f10f8ff75c9b87929bf8c2d61e4;p=blobs.git

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 62de9ab..3f87c8f 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -4,10 +4,15 @@
 
 #include "init.hpp"
 #include "../graphics/Viewport.hpp"
+#include "../io/Token.hpp"
+#include "../io/TokenStreamReader.hpp"
 
+#include <fstream>
 #include <SDL.h>
 #include <SDL_image.h>
 
+using std::string;
+
 
 namespace blobs {
 namespace app {
@@ -167,8 +172,29 @@ void State::OnQuit() {
 
 Assets::Assets()
 : path("assets/")
+, data_path(path + "data/")
+, font_path(path + "fonts/")
+, skin_path(path + "skins/")
 , tile_path(path + "tiles/")
-, skin_path(path + "skins/") {
+, random(0x6283B64CEFE47925)
+, fonts{
+	graphics::Font(font_path + "DejaVuSans.ttf", 32),
+	graphics::Font(font_path + "DejaVuSans.ttf", 24),
+	graphics::Font(font_path + "DejaVuSans.ttf", 16)
+} {
+	{
+		std::ifstream resource_file(data_path + "resources");
+		io::TokenStreamReader resource_reader(resource_file);
+		ReadResources(resource_reader);
+	}
+
+	{
+		std::ifstream tile_file(data_path + "tile_types");
+		io::TokenStreamReader tile_reader(tile_file);
+		ReadTileTypes(tile_reader);
+	}
+
+
 	graphics::Format format;
 	textures.tiles.Bind();
 	textures.tiles.Reserve(256, 256, 14, format);
@@ -186,24 +212,133 @@ Assets::Assets()
 	LoadTileTexture("tundra",   textures.tiles, 11);
 	LoadTileTexture("water",    textures.tiles, 12);
 	LoadTileTexture("wheat",    textures.tiles, 13);
+	textures.tiles.FilterTrilinear();
+
 	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();
 }
 
 Assets::~Assets() {
 }
 
-void Assets::LoadTileTexture(const std::string &name, graphics::ArrayTexture &tex, int layer) const {
-	std::string path = tile_path + name + ".png";
+void Assets::ReadResources(io::TokenStreamReader &in) {
+	while (in.HasMore()) {
+		string name;
+		in.ReadIdentifier(name);
+		in.Skip(io::Token::EQUALS);
+
+		int id = 0;
+		if (data.resources.Has(name)) {
+			id = data.resources[name].id;
+		} else {
+			world::Resource res;
+			res.name = name;
+			id = data.resources.Add(res);
+		}
+
+		in.Skip(io::Token::ANGLE_BRACKET_OPEN);
+		while (in.Peek().type != io::Token::ANGLE_BRACKET_CLOSE) {
+			in.ReadIdentifier(name);
+			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") {
+					data.resources[id].state = world::Resource::SOLID;
+				} else if (name == "liquid") {
+					data.resources[id].state = world::Resource::LIQUID;
+				} else if (name == "gas") {
+					data.resources[id].state = world::Resource::GAS;
+				} else if (name == "plasma") {
+					data.resources[id].state = world::Resource::PLASMA;
+				} else {
+					throw std::runtime_error("unknown resource state '" + name + "'");
+				}
+			} else if (name == "base_color") {
+				in.ReadVec(data.resources[id].base_color);
+			} else {
+				throw std::runtime_error("unknown resource property '" + name + "'");
+			}
+			in.Skip(io::Token::SEMICOLON);
+		}
+		in.Skip(io::Token::ANGLE_BRACKET_CLOSE);
+		in.Skip(io::Token::SEMICOLON);
+	}
+}
+
+void Assets::ReadTileTypes(io::TokenStreamReader &in) {
+	while (in.HasMore()) {
+		string name;
+		in.ReadIdentifier(name);
+		in.Skip(io::Token::EQUALS);
+
+		int id = 0;
+		if (data.tile_types.Has(name)) {
+			id = data.tile_types[name].id;
+		} else {
+			world::TileType type;
+			type.name = name;
+			id = data.tile_types.Add(type);
+		}
+
+		in.Skip(io::Token::ANGLE_BRACKET_OPEN);
+		while (in.Peek().type != io::Token::ANGLE_BRACKET_CLOSE) {
+			in.ReadIdentifier(name);
+			in.Skip(io::Token::EQUALS);
+			if (name == "label") {
+				in.ReadString(data.tile_types[id].label);
+			} else if (name == "texture") {
+				data.tile_types[id].texture = in.GetInt();
+			} else if (name == "yield") {
+				in.Skip(io::Token::BRACKET_OPEN);
+				while (in.Peek().type != io::Token::BRACKET_CLOSE) {
+					world::TileType::Yield yield;
+					in.Skip(io::Token::ANGLE_BRACKET_OPEN);
+					while (in.Peek().type != io::Token::ANGLE_BRACKET_CLOSE) {
+						in.ReadIdentifier(name);
+						in.Skip(io::Token::EQUALS);
+						if (name == "resource") {
+							in.ReadIdentifier(name);
+							yield.resource = data.resources[name].id;
+						} else if (name == "ubiquity") {
+							yield.ubiquity = in.GetDouble();
+						} else {
+							throw std::runtime_error("unknown tile type yield property '" + name + "'");
+						}
+						in.Skip(io::Token::SEMICOLON);
+					}
+					in.Skip(io::Token::ANGLE_BRACKET_CLOSE);
+					data.tile_types[id].resources.push_back(yield);
+					if (in.Peek().type == io::Token::COMMA) {
+						in.Skip(io::Token::COMMA);
+					}
+				}
+				in.Skip(io::Token::BRACKET_CLOSE);
+			} else {
+				throw std::runtime_error("unknown tile type property '" + name + "'");
+			}
+			in.Skip(io::Token::SEMICOLON);
+		}
+		in.Skip(io::Token::ANGLE_BRACKET_CLOSE);
+		in.Skip(io::Token::SEMICOLON);
+	}
+}
+
+void Assets::LoadTileTexture(const string &name, graphics::ArrayTexture &tex, int layer) const {
+	string path = tile_path + name + ".png";
 	SDL_Surface *srf = IMG_Load(path.c_str());
 	if (!srf) {
 		throw SDLError("IMG_Load");
@@ -217,8 +352,8 @@ void Assets::LoadTileTexture(const std::string &name, graphics::ArrayTexture &te
 	SDL_FreeSurface(srf);
 }
 
-void Assets::LoadSkinTexture(const std::string &name, graphics::ArrayTexture &tex, int layer) const {
-	std::string path = skin_path + name + ".png";
+void Assets::LoadSkinTexture(const string &name, graphics::ArrayTexture &tex, int layer) const {
+	string path = skin_path + name + ".png";
 	SDL_Surface *srf = IMG_Load(path.c_str());
 	if (!srf) {
 		throw SDLError("IMG_Load");