#include <stdexcept>
#include <SDL_image.h>
-using std::runtime_error;
-using std::string;
+using namespace std;
namespace blank {
void HeadlessApplication::RunS(size_t n, size_t t) {
for (size_t i = 0; HasState() && i < n; ++i) {
Loop(t);
- std::cout << '.';
- if (i % 16 == 15) {
- std::cout << std::setfill(' ') << std::setw(5) << std::right << (i + 1) << std::endl;
+ cout << '.';
+ if (i % 32 == 31) {
+ cout << setfill(' ') << setw(5) << right << (i + 1) << endl;
} else {
- std::cout << std::flush;
+ cout << flush;
}
}
}
void Application::Handle(const SDL_WindowEvent &event) {
switch (event.event) {
case SDL_WINDOWEVENT_FOCUS_GAINED:
- env.window.GrabMouse();
+ GetState().OnFocus();
break;
case SDL_WINDOWEVENT_FOCUS_LOST:
- env.window.ReleaseMouse();
+ GetState().OnBlur();
break;
case SDL_WINDOWEVENT_RESIZED:
env.viewport.Resize(event.data1, event.data2);
+ GetState().OnResize(env.viewport);
break;
default:
break;
}
-namespace {
-
-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 }});
-
-}
-
void AssetLoader::LoadBlockTypes(
const string &set_name,
BlockTypeRegistry ®,
const ShapeRegistry &shapes
) const {
string full = data + set_name + ".types";
- std::ifstream file(full);
+ ifstream file(full);
if (!file) {
- throw std::runtime_error("failed to open block type file " + full);
+ throw runtime_error("failed to open block type file " + full);
}
TokenStreamReader in(file);
- string type_name;
- string name;
- string tex_name;
- string shape_name;
+ string proto;
while (in.HasMore()) {
- in.ReadIdentifier(type_name);
- in.Skip(Token::EQUALS);
BlockType type;
-
- // read block type
- in.Skip(Token::ANGLE_BRACKET_OPEN);
- while (in.Peek().type != Token::ANGLE_BRACKET_CLOSE) {
- in.ReadIdentifier(name);
- in.Skip(Token::EQUALS);
- if (name == "visible") {
- type.visible = in.GetBool();
- } else if (name == "texture") {
- in.ReadString(tex_name);
- type.textures.push_back(tex_index.GetID(tex_name));
- } else if (name == "textures") {
- in.Skip(Token::BRACKET_OPEN);
- while (in.Peek().type != Token::BRACKET_CLOSE) {
- in.ReadString(tex_name);
- type.textures.push_back(tex_index.GetID(tex_name));
- if (in.Peek().type == Token::COMMA) {
- in.Skip(Token::COMMA);
- }
- }
- in.Skip(Token::BRACKET_CLOSE);
- } 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") {
- in.ReadString(type.label);
- } else if (name == "place_sound") {
- in.ReadString(tex_name);
- type.place_sound = snd_index.GetID(tex_name);
- } else if (name == "remove_sound") {
- in.ReadString(tex_name);
- type.remove_sound = snd_index.GetID(tex_name);
- } else if (name == "luminosity") {
- type.luminosity = in.GetInt();
- } else if (name == "block_light") {
- type.block_light = in.GetBool();
- } else if (name == "collision") {
- type.collision = in.GetBool();
- } else if (name == "collide_block") {
- type.collide_block = in.GetBool();
- } else if (name == "generate") {
- type.generate = in.GetBool();
- } else if (name == "min_solidity") {
- type.min_solidity = in.GetFloat();
- } else if (name == "mid_solidity") {
- type.mid_solidity = in.GetFloat();
- } else if (name == "max_solidity") {
- type.max_solidity = in.GetFloat();
- } else if (name == "min_humidity") {
- type.min_humidity = in.GetFloat();
- } else if (name == "mid_humidity") {
- type.mid_humidity = in.GetFloat();
- } else if (name == "max_humidity") {
- type.max_humidity = in.GetFloat();
- } else if (name == "min_temperature") {
- type.min_temperature = in.GetFloat();
- } else if (name == "mid_temperature") {
- type.mid_temperature = in.GetFloat();
- } else if (name == "max_temperature") {
- type.max_temperature = in.GetFloat();
- } else if (name == "min_richness") {
- type.min_richness = in.GetFloat();
- } else if (name == "mid_richness") {
- type.mid_richness = in.GetFloat();
- } else if (name == "max_richness") {
- type.max_richness = in.GetFloat();
- } else if (name == "commonness") {
- type.commonness = in.GetFloat();
- } else if (name == "shape") {
- in.ReadIdentifier(shape_name);
- type.shape = &shapes.Get(shape_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.ReadIdentifier(type.name);
+ in.Skip(Token::EQUALS);
+ if (in.Peek().type == Token::IDENTIFIER) {
+ // prototype
+ in.ReadIdentifier(proto);
+ type.Copy(reg.Get(proto));
}
- in.Skip(Token::ANGLE_BRACKET_CLOSE);
+ type.Read(in, snd_index, tex_index, shapes);
in.Skip(Token::SEMICOLON);
-
- reg.Add(type);
+ reg.Add(move(type));
}
}
const ShapeRegistry &shapes
) const {
string full = data + set_name + ".models";
- std::ifstream file(full);
+ ifstream file(full);
if (!file) {
- throw std::runtime_error("failed to open model file " + full);
+ throw runtime_error("failed to open model file " + full);
}
TokenStreamReader in(file);
string model_name;
in.Skip(Token::EQUALS);
if (prop_name == "root") {
model.RootPart().Read(in, tex_index, shapes);
+ } else if (prop_name == "body") {
+ model.SetBody(in.GetULong());
} else if (prop_name == "eyes") {
model.SetEyes(in.GetULong());
} else {
void AssetLoader::LoadShapes(const string &set_name, ShapeRegistry &shapes) const {
string full = data + set_name + ".shapes";
- std::ifstream file(full);
+ ifstream file(full);
if (!file) {
- throw std::runtime_error("failed to open shape file " + full);
+ throw runtime_error("failed to open shape file " + full);
}
TokenStreamReader in(file);
string shape_name;
avg.waiting = sum.waiting * factor;
avg.total = sum.total * factor;
+ //Print(cout);
+
sum = Frame<int>();
max = Frame<int>();
}
+void FrameCounter::Print(ostream &out) const {
+ out << fixed << right << setprecision(2) << setfill(' ')
+ << "PEAK handle: " << setw(2) << peak.handle
+ << ".00ms, update: " << setw(2) << peak.update
+ << ".00ms, render: " << setw(2) << peak.render
+ << ".00ms, running: " << setw(2) << peak.running
+ << ".00ms, waiting: " << setw(2) << peak.waiting
+ << ".00ms, total: " << setw(2) << peak.total
+ << ".00ms" << endl
+ << " AVG handle: " << setw(5) << avg.handle
+ << "ms, update: " << setw(5) << avg.update
+ << "ms, render: " << setw(5) << avg.render
+ << "ms, running: " << setw(5) << avg.running
+ << "ms, waiting: " << setw(5) << avg.waiting
+ << "ms, total: " << setw(5) << avg.total
+ << "ms" << endl;
+}
+
}
projects / blank.git / blobdiff