, ctx(window.CreateContext())
, init_glew()
, program()
-, move_velocity(0.003f)
-, pitch_sensitivity(-0.0025f)
-, yaw_sensitivity(-0.001f)
, cam()
+, hud()
, world()
+, controller(world.Player())
, outline()
, outline_visible(false)
, outline_transform(1.0f)
, running(false)
-, front(false)
-, back(false)
-, left(false)
-, right(false)
-, up(false)
-, down(false)
, place(false)
, remove(false)
, pick(false)
, place_id(1) {
GLContext::EnableVSync();
- GLuint VertexArrayID;
- glGenVertexArrays(1, &VertexArrayID);
- glBindVertexArray(VertexArrayID);
-
- cam.Position(glm::vec3(0, 4, 4));
-
- world.Generate();
-
- outline.vertices = std::vector<glm::vec3>({
- { 0.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 0.0f },
- { 1.0f, 0.0f, 0.0f }, { 1.0f, 1.0f, 0.0f },
- { 1.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 0.0f },
- { 0.0f, 1.0f, 0.0f }, { 0.0f, 0.0f, 0.0f },
- { 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 1.0f },
- { 1.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, 1.0f },
- { 1.0f, 1.0f, 0.0f }, { 1.0f, 1.0f, 1.0f },
- { 0.0f, 1.0f, 0.0f }, { 0.0f, 1.0f, 1.0f },
- { 0.0f, 0.0f, 1.0f }, { 1.0f, 0.0f, 1.0f },
- { 1.0f, 0.0f, 1.0f }, { 1.0f, 1.0f, 1.0f },
- { 1.0f, 1.0f, 1.0f }, { 0.0f, 1.0f, 1.0f },
- { 0.0f, 1.0f, 1.0f }, { 0.0f, 0.0f, 1.0f },
- });
- outline.colors.resize(24, { -1, -1, -1 });
- outline.Invalidate();
+ hud.Viewport(960, 600);
+ hud.Display(*world.BlockTypes()[place_id]);
glClearColor(0.0, 0.0, 0.0, 1.0);
}
+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();
switch (event.type) {
case SDL_KEYDOWN:
case SDL_KEYUP:
- switch (event.key.keysym.sym) {
- case SDLK_w:
- front = event.key.state == SDL_PRESSED;
- break;
- case SDLK_s:
- back = event.key.state == SDL_PRESSED;
- break;
- case SDLK_a:
- left = event.key.state == SDL_PRESSED;
- break;
- case SDLK_d:
- right = event.key.state == SDL_PRESSED;
- break;
- case SDLK_q:
- up = event.key.state == SDL_PRESSED;
- break;
- case SDLK_e:
- down = event.key.state == SDL_PRESSED;
- break;
- }
+ controller.HandleKeyboard(event.key);
break;
case SDL_MOUSEBUTTONDOWN:
if (event.button.button == 1) {
}
break;
case SDL_MOUSEMOTION:
- cam.RotateYaw(event.motion.xrel * yaw_sensitivity);
- cam.RotatePitch(event.motion.yrel * pitch_sensitivity);
+ controller.HandleMouse(event.motion);
break;
case SDL_QUIT:
running = false;
switch (event.window.event) {
case SDL_WINDOWEVENT_RESIZED:
cam.Viewport(event.window.data1, event.window.data2);
+ hud.Viewport(event.window.data1, event.window.data2);
break;
default:
break;
}
void Application::Update(int dt) {
- glm::vec3 vel;
- if (right && !left) {
- vel.x = move_velocity;
- } else if (left && !right) {
- vel.x = -move_velocity;
- }
- if (up && !down) {
- vel.y = move_velocity;
- } else if (down && !up) {
- vel.y = -move_velocity;
- }
- if (back && !front) {
- vel.z = move_velocity;
- } else if (front && !back) {
- vel.z = -move_velocity;
- }
- cam.OrientationVelocity(vel);
+ controller.Update(dt);
+ world.Update(dt);
- cam.Update(dt);
-
- Ray aim = cam.Aim();
+ Ray aim = controller.Aim();
Chunk *chunk;
int blkid;
float dist;
if (world.Intersection(aim, glm::mat4(1.0f), &chunk, &blkid, &dist, &normal)) {
glm::vec3 pos = Chunk::ToCoords(blkid);
outline_visible = true;
- outline_transform = glm::translate(chunk->Transform(), pos);
+ outline.Clear();
+ 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;
program.Activate();
- program.SetVP(cam.View(), cam.Projection());
-
- for (Chunk &chunk : world.LoadedChunks()) {
- program.SetM(chunk.Transform());
- chunk.Draw();
- }
+ program.SetProjection(cam.Projection());
+ world.Render(program);
if (outline_visible) {
program.SetM(outline_transform);
outline.Draw();
}
+ hud.Render(program);
+
window.Flip();
}
projects / blank.git / blobdiff