better stability of collision response

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

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 2618d98f3b0e0d1e1c0810c7b2f6db8bbb7964a1..97292a957f86466a228dbd24f1c45e28a20aae85 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -4,7 +4,6 @@
 
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
-#include "../app/TextureIndex.hpp"
 #include "../model/Model.hpp"
 #include "../io/WorldSave.hpp"
 #include "../world/ChunkIndex.hpp"
@@ -48,33 +47,31 @@ void InitialState::Render(Viewport &viewport) {
 // TODO: this clutter is a giant mess
 InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
 : master(master)
-, shapes()
-, block_types()
+, res()
+, sounds()
 , save(master.GetEnv().config.GetWorldPath(master.GetWorldConf().name, master.GetConfig().net.host))
-, world(block_types, master.GetWorldConf())
+, world(res.block_types, master.GetWorldConf())
 , player(*world.AddPlayer(master.GetConfig().player.name))
 , hud(master.GetEnv(), master.GetConfig(), player)
-, manip(master.GetEnv(), player.GetEntity())
+, manip(master.GetEnv().audio, sounds, player.GetEntity())
 , input(world, player, master.GetClient())
 , interface(master.GetConfig(), master.GetEnv().keymap, input, *this)
 , chunk_receiver(world.Chunks(), save)
 , chunk_renderer(player.GetChunks())
-, skeletons()
 , loop_timer(16)
 , sky(master.GetEnv().loader.LoadCubeMap("skybox"))
-, tex_map()
 , update_status() {
        if (!save.Exists()) {
                save.Write(master.GetWorldConf());
        }
-       TextureIndex tex_index;
-       master.GetEnv().loader.LoadShapes("default", shapes);
-       master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index, shapes);
-       skeletons.Load(shapes);
-       tex_map.push_back(tex_index.GetID("rock-1"));
-       tex_map.push_back(tex_index.GetID("rock-face"));
-       interface.SetInventorySlots(block_types.size() - 1);
-       chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
+       res.Load(master.GetEnv().loader, "default");
+       if (res.models.size() < 1) {
+               throw std::runtime_error("need at least one model to run");
+       }
+       res.models[0].Instantiate(player.GetEntity().GetModel());
+       sounds.Load(master.GetEnv().loader, res.snd_index);
+       interface.SetInventorySlots(res.block_types.size() - 1);
+       chunk_renderer.LoadTextures(master.GetEnv().loader, res.tex_index);
        chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
        loop_timer.Start();
        if (save.Exists(player)) {
@@ -123,7 +120,7 @@ void InteractiveState::Update(int dt) {
        } else {
                hud.FocusNone();
        }
-       hud.Display(block_types[player.GetInventorySlot() + 1]);
+       hud.Display(res.block_types[player.GetInventorySlot() + 1]);
        loop_timer.Update(dt);
        master.Update(dt);
        chunk_receiver.Update(dt);
@@ -167,10 +164,9 @@ void InteractiveState::Handle(const Packet::SpawnEntity &pack) {
        pack.ReadEntity(entity);
        uint32_t skel_id;
        pack.ReadSkeletonID(skel_id);
-       Model *skel = skeletons.ByID(skel_id);
-       if (skel) {
-               skel->Instantiate(entity.GetModel());
-               entity.GetModel().SetTextures(tex_map);
+       if (skel_id > 0 && skel_id <= res.models.size()) {
+               Model &skel = res.models.Get(skel_id);
+               skel.Instantiate(entity.GetModel());
        }
        cout << "spawned entity #" << entity_id << "  (" << entity.Name()
                << ") at " << entity.AbsolutePosition() << endl;
@@ -261,7 +257,7 @@ void InteractiveState::Handle(const Packet::BlockUpdate &pack) {
                Block block;
                pack.ReadIndex(index, i);
                pack.ReadBlock(block, i);
-               if (index < Chunk::size && block.type < block_types.size()) {
+               if (index < Chunk::size && block.type < res.block_types.size()) {
                        manip.SetBlock(*chunk, index, block);
                }
        }