, place_id(1) {
GLContext::EnableVSync();
- GLuint VertexArrayID;
- glGenVertexArrays(1, &VertexArrayID);
- glBindVertexArray(VertexArrayID);
-
- world.Generate({ -4, -4, -4 }, { 5, 5, 5});
-
hud.Viewport(960, 600);
hud.Display(*world.BlockTypes()[place_id]);
}
+void Application::RunN(size_t n) {
+ Uint32 last = SDL_GetTicks();
+ for (size_t i = 0; i < n; ++i) {
+ Uint32 now = SDL_GetTicks();
+ int delta = now - last;
+ Loop(delta);
+ last = now;
+ }
+}
+
+void Application::RunT(size_t t) {
+ Uint32 last = SDL_GetTicks();
+ Uint32 finish = last + t;
+ while (last < finish) {
+ Uint32 now = SDL_GetTicks();
+ int delta = now - last;
+ Loop(delta);
+ last = now;
+ }
+}
+
+void Application::RunS(size_t n, size_t t) {
+ for (size_t i = 0; i < n; ++i) {
+ Loop(t);
+ }
+}
+
+
void Application::Run() {
running = true;
Uint32 last = SDL_GetTicks();
glm::vec3 pos = Chunk::ToCoords(blkid);
outline_visible = true;
outline.Clear();
- chunk->BlockAt(blkid).type->FillOutlineModel(outline);
- outline_transform = glm::translate(chunk->Transform(), pos);
+ chunk->Type(chunk->BlockAt(blkid)).FillOutlineModel(outline);
+ outline_transform = glm::translate(chunk->Transform(world.Player().ChunkCoords()), pos);
outline_transform = glm::scale(outline_transform, glm::vec3(1.0001f));
} else {
outline_visible = false;
if (pick) {
if (chunk) {
- place_id = chunk->BlockAt(blkid).type->id;
+ place_id = chunk->BlockAt(blkid).type;
hud.Display(*world.BlockTypes()[place_id]);
}
pick = false;
}
if (remove) {
if (chunk) {
- chunk->BlockAt(blkid).type = world.BlockTypes()[remove_id];
+ chunk->BlockAt(blkid).type = remove_id;
chunk->Invalidate();
}
remove = false;
glm::vec3 next_pos = Chunk::ToCoords(blkid) + normal;
if (!Chunk::InBounds(next_pos)) {
mod_chunk = &world.Next(*chunk, normal);
- next_pos -= normal * Chunk::Extent();
+ next_pos -= normal * glm::vec3(Chunk::Extent());
}
- mod_chunk->BlockAt(next_pos).type = world.BlockTypes()[place_id];
+ mod_chunk->BlockAt(next_pos).type = place_id;
mod_chunk->Invalidate();
}
place = false;