}
+void HUD::DisplayNone() {
+ block_visible = false;
+}
+
void HUD::Display(const Block &b) {
const BlockType &type = types.Get(b.type);
Interface::Interface(
const Config &config,
Environment &env,
- World &world)
+ World &world,
+ const Player &player)
: env(env)
, world(world)
-, ctrl(world.Player())
+, player(player)
+, ctrl(*player.entity)
, hud(world.BlockTypes(), env.assets.small_ui_font)
, aim{{ 0, 0, 0 }, { 0, 0, -1 }}
, aim_world()
, place_timer(256)
, remove_timer(256)
, remove(0)
-, selection(1)
-, place_sound(env.assets.LoadSound("thump"))
-, remove_sound(env.assets.LoadSound("plop"))
+, selection(0)
+, place_sound(env.loader.LoadSound("thump"))
+, remove_sound(env.loader.LoadSound("plop"))
, fwd(0)
, rev(0)
, debug(false) {
messages.Position(glm::vec3(25.0f, -25.0f, 0.0f), Gravity::SOUTH_WEST);
messages.Foreground(glm::vec4(1.0f));
messages.Background(glm::vec4(0.5f));
- hud.Display(selection);
+ hud.DisplayNone();
}
ToggleCollision();
break;
- case Keymap::PRINT_BLOCK:
- PrintBlockInfo();
- break;
- case Keymap::PRINT_CHUNK:
- PrintChunkInfo();
- break;
- case Keymap::PRINT_LIGHT:
- PrintLightInfo();
- break;
- case Keymap::PRINT_SELECTION:
- PrintSelectionInfo();
- break;
-
case Keymap::TOGGLE_VISUAL:
ToggleVisual();
break;
}
}
-void Interface::PrintBlockInfo() {
- std::cout << std::endl;
- if (!aim_world) {
- PostMessage("not looking at any block");
- Ray aim = ctrl.Aim();
- std::stringstream s;
- s << "aim ray: " << aim.orig << ", " << aim.dir;
- PostMessage(s.str());
- return;
- }
- std::stringstream s;
- s << "looking at block " << aim_world.block
- << " " << aim_world.BlockCoords()
- << " of chunk " << aim_world.GetChunk().Position()
- ;
- PostMessage(s.str());
- Print(aim_world.GetBlock());
-}
-
-void Interface::PrintChunkInfo() {
- std::cout << std::endl;
- if (!aim_world) {
- PostMessage("not looking at any block");
- return;
- }
- std::stringstream s;
- s << "looking at chunk " << aim_world.GetChunk().Position();
- PostMessage(s.str());
-
- PostMessage(" neighbors:");
- if (aim_world.GetChunk().HasNeighbor(Block::FACE_LEFT)) {
- s.str("");
- s << " left " << aim_world.GetChunk().GetNeighbor(Block::FACE_LEFT).Position();
- PostMessage(s.str());
- }
- if (aim_world.GetChunk().HasNeighbor(Block::FACE_RIGHT)) {
- s.str("");
- s << " right " << aim_world.GetChunk().GetNeighbor(Block::FACE_RIGHT).Position();
- PostMessage(s.str());
- }
- if (aim_world.GetChunk().HasNeighbor(Block::FACE_UP)) {
- s.str("");
- s << " up " << aim_world.GetChunk().GetNeighbor(Block::FACE_UP).Position();
- PostMessage(s.str());
- }
- if (aim_world.GetChunk().HasNeighbor(Block::FACE_DOWN)) {
- s.str("");
- s << " down " << aim_world.GetChunk().GetNeighbor(Block::FACE_DOWN).Position();
- PostMessage(s.str());
- }
- if (aim_world.GetChunk().HasNeighbor(Block::FACE_FRONT)) {
- s.str("");
- s << " front " << aim_world.GetChunk().GetNeighbor(Block::FACE_FRONT).Position();
- PostMessage(s.str());
- }
- if (aim_world.GetChunk().HasNeighbor(Block::FACE_BACK)) {
- s.str("");
- s << " back " << aim_world.GetChunk().GetNeighbor(Block::FACE_BACK).Position();
- PostMessage(s.str());
- }
- std::cout << std::endl;
-}
-
-void Interface::PrintLightInfo() {
- std::stringstream s;
- s
- << "light level " << world.PlayerChunk().GetLight(world.Player().Position())
- << " at position " << world.Player().Position()
- ;
- PostMessage(s.str());
-}
-
-void Interface::PrintSelectionInfo() {
- std::cout << std::endl;
- Print(selection);
-}
-
-void Interface::Print(const Block &block) {
- std::stringstream s;
- s << "type: " << block.type
- << ", face: " << block.GetFace()
- << ", turn: " << block.GetTurn()
- ;
- PostMessage(s.str());
-}
-
void Interface::ToggleAudio() {
config.audio_disabled = !config.audio_disabled;
if (config.audio_disabled) {
void Interface::PlaceBlock() {
if (!aim_world) return;
- glm::vec3 next_pos = aim_world.BlockCoords() + aim_world.normal;
- BlockLookup next_block(&aim_world.GetChunk(), next_pos);
- if (next_block) {
+ BlockLookup next_block(aim_world.chunk, aim_world.BlockPos(), Block::NormalFace(aim_world.normal));
+ if (!next_block) {
+ return;
}
next_block.SetBlock(selection);
const Entity &player = ctrl.Controlled();
env.audio.Play(
place_sound,
- aim_world.GetChunk().ToSceneCoords(player.ChunkCoords(), next_pos)
+ next_block.GetChunk().ToSceneCoords(player.ChunkCoords(), next_block.GetBlockCoords())
);
}
}
void Interface::CheckAim() {
- if (!world.Intersection(aim, glm::mat4(1.0f), aim_world)) {
+ if (!world.Intersection(aim, glm::mat4(1.0f), ctrl.Controlled().ChunkCoords(), aim_world)) {
aim_world = WorldCollision();
}
- if (!world.Intersection(aim, glm::mat4(1.0f), aim_entity)) {
+ if (!world.Intersection(aim, glm::mat4(1.0f), ctrl.Controlled(), aim_entity)) {
aim_entity = EntityCollision();
}
if (aim_world && aim_entity) {
outl_buf.Clear();
aim_world.GetType().FillOutlineModel(outl_buf);
outline.Update(outl_buf);
- outline_transform = aim_world.GetChunk().Transform(world.Player().ChunkCoords());
+ outline_transform = aim_world.GetChunk().Transform(player.entity->ChunkCoords());
outline_transform *= aim_world.BlockTransform();
outline_transform *= glm::scale(glm::vec3(1.005f));
}
Map(SDL_SCANCODE_F3, TOGGLE_DEBUG);
Map(SDL_SCANCODE_F4, TOGGLE_AUDIO);
- Map(SDL_SCANCODE_B, PRINT_BLOCK);
- Map(SDL_SCANCODE_C, PRINT_CHUNK);
- Map(SDL_SCANCODE_L, PRINT_LIGHT);
- Map(SDL_SCANCODE_P, PRINT_SELECTION);
-
Map(SDL_SCANCODE_ESCAPE, EXIT);
}
return "toggle_visual";
case TOGGLE_DEBUG:
return "toggle_debug";
- case PRINT_BLOCK:
- return "print_block";
- case PRINT_CHUNK:
- return "print_chunk";
- case PRINT_LIGHT:
- return "print_light";
- case PRINT_SELECTION:
- return "print_selection";
case EXIT:
return "exit";
}
return TOGGLE_VISUAL;
} else if (str == "toggle_debug") {
return TOGGLE_DEBUG;
- } else if (str == "print_block") {
- return PRINT_BLOCK;
- } else if (str == "print_chunk") {
- return PRINT_CHUNK;
- } else if (str == "print_light") {
- return PRINT_LIGHT;
- } else if (str == "print_selection") {
- return PRINT_SELECTION;
} else if (str == "exit") {
return EXIT;
} else {