send entity visual from server to client

diff --git a/doc/protocol b/doc/protocol
index a02ff2afa4bffa99b29dc32b7fe448e3d115af13..432a3e9413d6604e75808424ab35bb29fd7bdf96 100644 (file)
--- a/doc/protocol
+++ b/doc/protocol
@@ -94,14 +94,15 @@ Sent by the server to notify the client of an entity entering spawn range.
 
 Code: 5
 Payload:
-        0 entity ID, 32bit unsigned int
-        4 chunk coords of the entity, 3x 32bit signed int
-       16 pos/vel/rot/ang of the entity, 13x 32bit float
-       68 bounding box of the entity, 6x 32bit float
-       92 flags, 32bit bitfield with boolean values
-          1: world collision
-       96 entity name, max 32 byte UTF-8 string
-Length: 128
+         0 entity ID, 32bit unsigned int
+         4 entity's skeleton ID, 32bit unsigned int
+         8 chunk coords of the entity, 3x 32bit signed int
+        20 pos/vel/rot/ang of the entity, 13x 32bit float
+        72 bounding box of the entity, 6x 32bit float
+        96 flags, 32bit bitfield with boolean values
+           1: world collision
+       100 entity name, max 32 byte UTF-8 string
+Length: 132
 
 
 Despawn Entity

diff --git a/src/client/InteractiveState.hpp b/src/client/InteractiveState.hpp
index efaeae425c03d869ef8df008ebad386793138b72..d36472d4855a2cd34feddf76174966589cd50910 100644 (file)
--- a/src/client/InteractiveState.hpp
+++ b/src/client/InteractiveState.hpp
@@ -3,6 +3,7 @@
 
 #include "../app/State.hpp"
 #include "../io/WorldSave.hpp"
+#include "../model/Skeletons.hpp"
 #include "../ui/Interface.hpp"
 #include "../world/BlockTypeRegistry.hpp"
 #include "../world/ChunkRenderer.hpp"
@@ -25,6 +26,7 @@ public:
 
        World &GetWorld() noexcept { return world; }
        Interface &GetInterface() noexcept { return interface; }
+       Skeletons &GetSkeletons() noexcept { return skeletons; }
 
        void OnEnter() override;
 
@@ -39,6 +41,7 @@ private:
        World world;
        Interface interface;
        ChunkRenderer chunk_renderer;
+       Skeletons skeletons;
 
 };
 

diff --git a/src/client/client.cpp b/src/client/client.cpp
index ba9fcc9bdfb3c9b9e742deb60d1c7d0dd51f46a5..96c30f5b1d15d8ca3229e7a701cfa1211b60a21d 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -5,6 +5,7 @@
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
 #include "../app/TextureIndex.hpp"
+#include "../model/CompositeModel.hpp"
 
 #include <iostream>
 #include <glm/gtx/io.hpp>
@@ -53,11 +54,13 @@ InteractiveState::InteractiveState(MasterState &master, uint32_t player_id)
        world,
        world.AddPlayer(master.GetInterfaceConf().player_name, player_id)
 )
-, chunk_renderer(*interface.GetPlayer().chunks) {
+, chunk_renderer(*interface.GetPlayer().chunks)
+, skeletons() {
        TextureIndex tex_index;
        master.GetEnv().loader.LoadBlockTypes("default", block_types, tex_index);
        chunk_renderer.LoadTextures(master.GetEnv().loader, tex_index);
        chunk_renderer.FogDensity(master.GetWorldConf().fog_density);
+       skeletons.Load();
        // TODO: better solution for initializing HUD
        interface.SelectNext();
 }
@@ -229,6 +232,12 @@ void MasterState::On(const Packet::SpawnEntity &pack) {
                return;
        }
        pack.ReadEntity(*entity);
+       uint32_t skel_id;
+       pack.ReadSkeletonID(skel_id);
+       CompositeModel *skel = state->GetSkeletons().ByID(skel_id);
+       if (skel) {
+               skel->Instantiate(entity->GetModel());
+       }
        cout << "spawned entity " << entity->Name() << " at " << entity->AbsolutePosition() << endl;
 }
 

diff --git a/src/model/CompositeInstance.hpp b/src/model/CompositeInstance.hpp
index 7d48b76e73fffe7c837c2184b92aff1bed5e471c..4b6cfb520aaeb52d450087a7fd0374d5b22636a9 100644 (file)
--- a/src/model/CompositeInstance.hpp
+++ b/src/model/CompositeInstance.hpp
@@ -21,6 +21,7 @@ public:
        CompositeInstance();
 
        operator bool() const noexcept { return part_model; }
+       const CompositeModel &GetModel() const noexcept { return *part_model; }
 
        const glm::vec3 &Position() const noexcept { return position; }
        void Position(const glm::vec3 &p) noexcept { position = p; }

diff --git a/src/model/CompositeModel.hpp b/src/model/CompositeModel.hpp
index 55708494cbbf37a53f61952503ad6f843dc071ef..947db0140b4a32219a26b44b57301070ed65ada9 100644 (file)
--- a/src/model/CompositeModel.hpp
+++ b/src/model/CompositeModel.hpp
@@ -3,6 +3,7 @@
 
 #include "geometry.hpp"
 
+#include <cstdint>
 #include <list>
 #include <glm/glm.hpp>
 #include <glm/gtc/quaternion.hpp>
@@ -21,6 +22,9 @@ public:
        CompositeModel(const CompositeModel &) = delete;
        CompositeModel &operator =(const CompositeModel &) = delete;
 
+       std::uint32_t ID() const noexcept { return id; }
+       void ID(std::uint32_t i) noexcept { id = i; }
+
        const AABB &Bounds() const noexcept { return bounds; }
        void Bounds(const AABB &b) noexcept { bounds = b; }
 
@@ -49,6 +53,8 @@ private:
        CompositeModel *parent;
        const EntityModel *node_model;
 
+       std::uint32_t id;
+
        AABB bounds;
 
        glm::vec3 position;

diff --git a/src/model/Skeletons.hpp b/src/model/Skeletons.hpp
index c91abe1c3ef015fa3817b00e717533cab982de9c..e49352c48613e7c31e4dfeec682427199f2a29ee 100644 (file)
--- a/src/model/Skeletons.hpp
+++ b/src/model/Skeletons.hpp
@@ -1,6 +1,7 @@
 #ifndef BLANK_MODEL_SKELETONS_HPP_
 #define BLANK_MODEL_SKELETONS_HPP_
 
+#include <cstdint>
 #include <memory>
 #include <vector>
 
@@ -24,6 +25,9 @@ public:
        CompositeModel &operator[](std::size_t i) noexcept { return *skeletons[i]; }
        const CompositeModel &operator[](std::size_t i) const noexcept { return *skeletons[i]; }
 
+       CompositeModel *ByID(std::uint16_t) noexcept;
+       const CompositeModel *ByID(std::uint16_t) const noexcept;
+
 private:
        std::vector<std::unique_ptr<CompositeModel>> skeletons;
        std::vector<EntityModel> models;

diff --git a/src/model/composite.cpp b/src/model/composite.cpp
index ffb58572eae4bafaceea5f14978a8ec36e7b9089..bb77fa5b3d573b31caed5dd1bf2a8ca1279fb1b9 100644 (file)
--- a/src/model/composite.cpp
+++ b/src/model/composite.cpp
@@ -12,7 +12,10 @@
 namespace blank {
 
 CompositeModel::CompositeModel()
-: node_model(nullptr)
+: parent(nullptr)
+, node_model(nullptr)
+, id(0)
+, bounds{{ 0.0f, 0.0f, 0.0f }, { 0.0f, 0.0f, 0.0f }}
 , position(0.0f)
 , orientation(1.0f, 0.0f, 0.0f, 0.0f)
 , parts() {
@@ -118,16 +121,19 @@ void Skeletons::LoadHeadless() {
        {
                AABB bounds{{ -0.25f, -0.5f, -0.25f }, { 0.25f, 0.5f, 0.25f }};
                skeletons.emplace_back(new CompositeModel);
+               skeletons[0]->ID(1);
                skeletons[0]->Bounds(bounds);
        }
        {
                AABB bounds{{ -0.5f, -0.25f, -0.5f }, { 0.5f, 0.25f, 0.5f }};
                skeletons.emplace_back(new CompositeModel);
+               skeletons[1]->ID(2);
                skeletons[1]->Bounds(bounds);
        }
        {
                AABB bounds{{ -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f }};
                skeletons.emplace_back(new CompositeModel);
+               skeletons[2]->ID(3);
                skeletons[2]->Bounds(bounds);
        }
 }
@@ -161,4 +167,20 @@ void Skeletons::Load() {
        }
 }
 
+CompositeModel *Skeletons::ByID(std::uint16_t id) noexcept {
+       if (id == 0 || id > skeletons.size()) {
+               return nullptr;
+       } else {
+               return skeletons[id - 1].get();
+       }
+}
+
+const CompositeModel *Skeletons::ByID(std::uint16_t id) const noexcept {
+       if (id == 0 || id > skeletons.size()) {
+               return nullptr;
+       } else {
+               return skeletons[id - 1].get();
+       }
+}
+
 }

diff --git a/src/net/Packet.hpp b/src/net/Packet.hpp
index bb6140d5952cef743c69fe4d2ff3365123491d7b..76cd966bed681aec73e22f8c9a87276eb1cc4569 100644 (file)
--- a/src/net/Packet.hpp
+++ b/src/net/Packet.hpp
@@ -101,10 +101,11 @@ struct Packet {
 
        struct SpawnEntity : public Payload {
                static constexpr std::uint8_t TYPE = 5;
-               static constexpr std::size_t MAX_LEN = 128;
+               static constexpr std::size_t MAX_LEN = 132;
 
                void WriteEntity(const Entity &) noexcept;
                void ReadEntityID(std::uint32_t &) const noexcept;
+               void ReadSkeletonID(std::uint32_t &) const noexcept;
                void ReadEntity(Entity &) const noexcept;
        };
 

diff --git a/src/net/net.cpp b/src/net/net.cpp
index 9fe282f5138b4c7a115819834c3a2b0a44373c16..e6af690aeacb36f16ad0c289843b3df456833ffe 100644 (file)
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -7,6 +7,7 @@
 #include "Server.hpp"
 
 #include "../app/init.hpp"
+#include "../model/CompositeModel.hpp"
 #include "../world/World.hpp"
 
 #include <cstring>
@@ -596,24 +597,33 @@ void Packet::PlayerUpdate::ReadPlayer(Entity &player) const noexcept {
 
 void Packet::SpawnEntity::WriteEntity(const Entity &e) noexcept {
        Write(e.ID(), 0);
-       Write(e.ChunkCoords(), 4);
-       Write(e.Position(), 16);
-       Write(e.Velocity(), 28);
-       Write(e.Orientation(), 40);
-       Write(e.AngularVelocity(), 56);
-       Write(e.Bounds(), 68);
+       if (e.GetModel()) {
+               Write(e.GetModel().GetModel().ID(), 4);
+       } else {
+               Write(uint32_t(0), 4);
+       }
+       Write(e.ChunkCoords(), 8);
+       Write(e.Position(), 20);
+       Write(e.Velocity(), 32);
+       Write(e.Orientation(), 44);
+       Write(e.AngularVelocity(), 60);
+       Write(e.Bounds(), 72);
        uint32_t flags = 0;
        if (e.WorldCollidable()) {
                flags |= 1;
        }
-       Write(flags, 92);
-       WriteString(e.Name(), 96, 32);
+       Write(flags, 96);
+       WriteString(e.Name(), 100, 32);
 }
 
 void Packet::SpawnEntity::ReadEntityID(uint32_t &id) const noexcept {
        Read(id, 0);
 }
 
+void Packet::SpawnEntity::ReadSkeletonID(uint32_t &id) const noexcept {
+       Read(id, 4);
+}
+
 void Packet::SpawnEntity::ReadEntity(Entity &e) const noexcept {
        glm::ivec3 chunk_coords(0);
        glm::vec3 pos;
@@ -624,14 +634,14 @@ void Packet::SpawnEntity::ReadEntity(Entity &e) const noexcept {
        uint32_t flags = 0;
        string name;
 
-       Read(chunk_coords, 4);
-       Read(pos, 16);
-       Read(vel, 28);
-       Read(rot, 40);
-       Read(ang, 56);
-       Read(bounds, 68);
-       Read(flags, 92);
-       ReadString(name, 96, 32);
+       Read(chunk_coords, 8);
+       Read(pos, 20);
+       Read(vel, 32);
+       Read(rot, 44);
+       Read(ang, 60);
+       Read(bounds, 72);
+       Read(flags, 96);
+       ReadString(name, 100, 32);
 
        e.Position(chunk_coords, pos);
        e.Velocity(vel);