fix this whole sky box mess

[blank.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 52bc0a9eea97ab729e7e2e62612b6ab8142fba2a..521b149ae824185cd44fda750f9ec38c48917ba7 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -120,6 +120,7 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 , chunk_renderer(*interface.GetPlayer().chunks)
 , skeletons()
 , loop_timer(16)
+, sky(master.GetEnv().loader.LoadCubeMap("skybox"))
 , player_hist() {
        if (!save.Exists()) {
                save.Write(master.GetWorldConf());
@@ -277,6 +278,7 @@ void InteractiveState::Render(Viewport &viewport) {
        viewport.WorldPosition(player.Transform(player.ChunkCoords()));
        chunk_renderer.Render(viewport);
        world.Render(viewport);
+       sky.Render(viewport);
        interface.Render(viewport);
 }
 
@@ -396,7 +398,8 @@ void MasterState::On(const Packet::SpawnEntity &pack) {
        if (skel) {
                skel->Instantiate(entity.GetModel());
        }
-       cout << "spawned entity " << entity.Name() << " at " << entity.AbsolutePosition() << endl;
+       cout << "spawned entity #" << entity_id << "  (" << entity.Name()
+               << ") at " << entity.AbsolutePosition() << endl;
 }
 
 void MasterState::On(const Packet::DespawnEntity &pack) {
@@ -411,7 +414,7 @@ void MasterState::On(const Packet::DespawnEntity &pack) {
        for (Entity &entity : state->GetWorld().Entities()) {
                if (entity.ID() == entity_id) {
                        entity.Kill();
-                       cout << "despawned entity " << entity.Name() << " at " << entity.AbsolutePosition() << endl;
+                       cout << "despawned entity #" << entity_id << " (" << entity.Name() << ") at " << entity.AbsolutePosition() << endl;
                        return;
                }
        }