모델 업로드 구조 완성

impl/vulkan_engine/asset/object/model.cpp

@@ -18,35 +18,16 @@ void Append(std::vector<char>& buffer, const T& value) {
   buffer.insert(buffer.end(), data, data + sizeof(T));
 }
 
-template <typename T>
-void AppendVector(std::vector<char>& buffer, const std::vector<T>& vec) {
-  std::uint32_t size = static_cast<std::uint32_t>(vec.size());
-  Append(buffer, size);
-  buffer.insert(buffer.end(), reinterpret_cast<const char*>(vec.data()),
-                reinterpret_cast<const char*>(vec.data() + size));
-}
-
 template <typename T>
 void Read(const std::vector<char>& buffer, size_t& offset, T& out) {
   std::memcpy(&out, buffer.data() + offset, sizeof(T));
   offset += sizeof(T);
 }
 
-template <typename T>
-void ReadVector(const std::vector<char>& buffer, size_t& offset,
-                std::vector<T>& out) {
-  std::uint32_t size = 0;
-  Read(buffer, offset, size);
-  out.resize(size);
-  std::memcpy(out.data(), buffer.data() + offset, sizeof(T) * size);
-  offset += sizeof(T) * size;
-}
-
 std::vector<char> Model::Serialize() {
   std::vector<char> buffer;
 
-  AppendVector(buffer, vertices);
-  AppendVector(buffer, indices);
+  Append(buffer, ID);
 
   Append(buffer, position);
   Append(buffer, linear_velocity);
@@ -72,8 +53,7 @@ std::vector<char> Model::Serialize() {
 void Model::Deserialize(std::vector<char> data) {
   size_t offset = 0;
 
-  ReadVector(data, offset, vertices);
-  ReadVector(data, offset, indices);
+  Read(data, offset, ID);
 
   Read(data, offset, position);
   Read(data, offset, linear_velocity);

impl/vulkan_engine/vulkan/engine.cpp

@@ -171,38 +171,35 @@ void Engine::Update() {
 }
 void Engine::NetUpdate(std::shared_ptr<Network::Socket> sock) {
   NetworkUpload(sock);
-  RefreshFromServer(sock);
+  ResponseToServerAndRefresh(sock);
 }
 
 void Engine::NetworkUpload(std::shared_ptr<Network::Socket> sock) {
-  Packet::Header header;
-  header.opcode = Packet::Opcode::UPDATEMODEL;
-  header.body_length = 0;
-
-  std::vector<Network::IOCPPASSINDATA*> data;
-  Network::IOCPPASSINDATA* packet =
-      new Network::IOCPPASSINDATA(sizeof(Packet::Header));
-  packet->event = Network::IOCPEVENT::WRITE;
-  packet->socket = sock;
-  ::memcpy(packet->wsabuf.buf, &header, sizeof(Packet::Header));
-  packet->wsabuf.len = sizeof(Packet::Header);
-  data.push_back(packet);
+  std::vector<char> data;
   for (auto& it : models_) {
-    auto model = it.second.Serialize();
-    Network::IOCPPASSINDATA* packet = new Network::IOCPPASSINDATA(model.size());
-    packet->event = Network::IOCPEVENT::WRITE;
-    packet->socket = sock;
-    ::memcpy(packet->wsabuf.buf, model.data(), model.size());
-    packet->wsabuf.len = model.size();
-    data.push_back(packet);
+    if (!it.second.networkReplicated) continue;
+
+    Packet::Header header;
+    header.opcode = Packet::Opcode::UPDATEMODEL;
+    std::vector<char> model = it.second.Serialize();
+    header.body_length = model.size();
+    std::vector<char> header_serialized = header.Serialize();
+
+    data.insert(data.end(), header_serialized.begin(), header_serialized.end());
+    data.insert(data.end(), model.begin(), model.end());
   }
-  iocp_->send(sock->sock, &data);
+  iocp_->send(*sock, data);
 }
 
-void Engine::RefreshFromServer(std::shared_ptr<Network::Socket> sock) {
-  Network::IOCPPASSINDATA* recv_data = new Network::IOCPPASSINDATA(16 * 1024);
-  recv_data->socket = sock;
-  iocp_->recv(recv_data);
+void Engine::ResponseToServerAndRefresh(std::shared_ptr<Network::Socket> sock) {
+  while (iocp_->GetRecvedBytes(sock->sock) < 6);
+  std::vector<char> recv_data(6);
+  iocp_->recv(*sock, recv_data);
+  Packet::Header header;
+  header.Deserialize(recv_data);
+  recv_data.resize(header.body_length);
+  while (iocp_->GetRecvedBytes(sock->sock) < header.body_length);
+  iocp_->recv(*sock, recv_data);
 }
 
 }  // namespace veng