diff --git a/SQCSim-common/player.cpp b/SQCSim-common/player.cpp
index 9fe810c..10ec32c 100644
--- a/SQCSim-common/player.cpp
+++ b/SQCSim-common/player.cpp
@@ -8,6 +8,8 @@ Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(po
m_username = "Zelda Bee-Bop56";
}
+Player::~Player() {}
+
void Player::TurnLeftRight(float value) {
m_rotY += value;
if (m_rotY > 360) m_rotY = 0;
@@ -206,3 +208,7 @@ void Player::Teleport(int& x, int& z) {
m_position.x -= x * CHUNK_SIZE_X;
m_position.z -= z * CHUNK_SIZE_Z;
}
+
+Vector3f Player::InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now) {
+ return Vector3f();
+}
diff --git a/SQCSim-common/player.h b/SQCSim-common/player.h
index e439fa2..d592613 100644
--- a/SQCSim-common/player.h
+++ b/SQCSim-common/player.h
@@ -12,6 +12,8 @@ public:
enum Sound { NOSOUND, STEP, FALL };
Player(const Vector3f& position, float rotX = 0, float rotY = 0);
+ ~Player();
+
void TurnLeftRight(float value);
void TurnTopBottom(float value);
Vector3f GetInput(bool front, bool back, bool left, bool right, bool jump, bool dash, float elapsedTime);
@@ -26,12 +28,13 @@ public:
float GetHP() const;
void Teleport(int& x, int& z);
-private:
+protected:
Vector3f m_position;
Vector3f m_velocity;
Vector3f m_direction;
std::string m_username;
+ uint64_t id = 0;
float m_rotX = 0;
float m_rotY = 0;
@@ -40,6 +43,9 @@ private:
float m_hp;
bool m_airborne;
+
+ Vector3f InterpolatePosition(const Vector3f& vec1, const Vector3f& vec2, const Timestamp& tim1, const Timestamp& tim2, const Timestamp& now);
+
};
#endif //_PLAYER_H__
diff --git a/SQCSim2021/SQCSim2021.vcxproj b/SQCSim2021/SQCSim2021.vcxproj
index d120d7b..eadb743 100644
--- a/SQCSim2021/SQCSim2021.vcxproj
+++ b/SQCSim2021/SQCSim2021.vcxproj
@@ -25,13 +25,14 @@
+
-
+
@@ -46,7 +47,7 @@
-
+
diff --git a/SQCSim2021/SQCSim2021.vcxproj.filters b/SQCSim2021/SQCSim2021.vcxproj.filters
index 3bf0928..b5d2499 100644
--- a/SQCSim2021/SQCSim2021.vcxproj.filters
+++ b/SQCSim2021/SQCSim2021.vcxproj.filters
@@ -47,7 +47,10 @@
Fichiers d%27en-tête
-
+
+ Fichiers d%27en-tête
+
+
Fichiers d%27en-tête
@@ -88,7 +91,7 @@
Fichiers sources
-
+
Fichiers sources
diff --git a/SQCSim2021/connector.h b/SQCSim2021/connector.h
index 297be6f..3ded42b 100644
--- a/SQCSim2021/connector.h
+++ b/SQCSim2021/connector.h
@@ -17,6 +17,8 @@ public:
//void SendInput();
//int Sync();
+
+ // void updateRemotePlayers(std::map rplayers);
private:
#ifdef _WIN32
WSADATA m_wsaData;
diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp
index f44eb96..2e2d99f 100644
--- a/SQCSim2021/engine.cpp
+++ b/SQCSim2021/engine.cpp
@@ -531,9 +531,9 @@ void Engine::Render(float elapsedTime) {
m_bullets[x] = nullptr;
}
- m_wrenderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
+ m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
- m_wrenderer.UpdateWorld(&m_world, m_player.GetPosition(), m_blockinfo);
+ m_renderer.UpdateMesh(&m_world, m_player.GetPosition(), m_blockinfo);
if (m_isSkybox) m_skybox.Render(skybox);
diff --git a/SQCSim2021/engine.h b/SQCSim2021/engine.h
index fa3a088..5d85415 100644
--- a/SQCSim2021/engine.h
+++ b/SQCSim2021/engine.h
@@ -18,7 +18,7 @@
#include "audio.h"
#include "textureatlas.h"
#include "connector.h"
-#include "worldrenderer.h"
+#include "renderer.h"
class Engine : public OpenglContext {
public:
@@ -60,7 +60,7 @@ private:
TextureAtlas m_textureAtlas = TextureAtlas(BTYPE_LAST);
World m_world = World();
- WorldRenderer m_wrenderer = WorldRenderer();
+ Renderer m_renderer = Renderer();
Texture m_textureSkybox;
Texture m_textureFont;
diff --git a/SQCSim2021/remoteplayer.h b/SQCSim2021/remoteplayer.h
new file mode 100644
index 0000000..bc84d76
--- /dev/null
+++ b/SQCSim2021/remoteplayer.h
@@ -0,0 +1,25 @@
+#ifndef REMOTEPLAYER_H__
+#define REMOTEPLAYER_H__
+#include "../SQCSim-common/player.h"
+#include "../SQCSim-common/netprotocol.h"
+#include "define.h"
+#include "textureatlas.h"
+#include "shader.h"
+
+class RemotePlayer : public Player {
+public:
+ enum Anim { STILL, RUNNING, JUMPING, SHOOTING, JUMPSHOOT, DEAD };
+
+ RemotePlayer();
+
+ void Init();
+ void Feed(const netprot::Output out);
+
+private:
+ netprot::Output current, next;
+ float m_aminacc;
+ Anim m_animstate;
+ uint64_t m_team_id;
+
+};
+#endif
\ No newline at end of file
diff --git a/SQCSim2021/worldrenderer.cpp b/SQCSim2021/renderer.cpp
similarity index 92%
rename from SQCSim2021/worldrenderer.cpp
rename to SQCSim2021/renderer.cpp
index dcf6d45..e506c94 100644
--- a/SQCSim2021/worldrenderer.cpp
+++ b/SQCSim2021/renderer.cpp
@@ -1,13 +1,13 @@
-#include "worldrenderer.h"
+#include "renderer.h"
-WorldRenderer::WorldRenderer() {
+Renderer::Renderer() {
m_meshes.Reset(nullptr);
}
-WorldRenderer::~WorldRenderer() {
+Renderer::~Renderer() {
}
-void WorldRenderer::RenderWorld(World* origin, int& rendercount, const Vector3f& player_pos, const Vector3f& player_dir, Transformation& world, Shader& shader, TextureAtlas& atlas) {
+void Renderer::RenderWorld(World* origin, int& rendercount, const Vector3f& player_pos, const Vector3f& player_dir, Transformation& world, Shader& shader, TextureAtlas& atlas) const {
rendercount = 0;
Vector3f angle;
Vector3f cursor;
@@ -107,7 +107,7 @@ void WorldRenderer::RenderWorld(World* origin, int& rendercount, const Vector3f&
glStencilFunc(GL_GREATER, 1, 0xFF);
};
-void WorldRenderer::UpdateWorld(World* origin, const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]) {
+void Renderer::UpdateMesh(World* origin, const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]) {
int cx = player.x;
int cy = player.z;
static int frameUpdate = 2;
@@ -211,3 +211,9 @@ void WorldRenderer::UpdateWorld(World* origin, const Vector3f& player, BlockInfo
}
}
}
+
+void Renderer::RenderPlayer(Player* player, Transformation tran) const {
+}
+
+void Renderer::RenderPlayer(RemotePlayer* rplayer, const Vector3f& player_pos, const Vector3f& player_dir) const {
+}
diff --git a/SQCSim2021/renderer.h b/SQCSim2021/renderer.h
new file mode 100644
index 0000000..8afdc3b
--- /dev/null
+++ b/SQCSim2021/renderer.h
@@ -0,0 +1,30 @@
+#ifndef RENDERER_H__
+#define RENDERER_H__
+#include
+#include
+#include "../SQCSim-common/world.h"
+#include "../SQCSim-common/transformation.h"
+#include "define.h"
+#include "mesh.h"
+#include "textureatlas.h"
+#include "shader.h"
+#include "remoteplayer.h"
+
+class Renderer {
+private:
+ Array2d m_meshes = Array2d(WORLD_SIZE_X, WORLD_SIZE_Y);
+
+ TextureAtlas* m_playertext = nullptr;
+ Shader* m_playershader = nullptr;
+
+public:
+ Renderer();
+ ~Renderer();
+
+ void UpdateMesh(World* origin, const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]);
+
+ void RenderWorld(World* origin, int& rendercount, const Vector3f& player_pos, const Vector3f& player_dir, Transformation& world, Shader& shader, TextureAtlas& atlas) const;
+ void RenderPlayer(Player* player, Transformation tran) const;
+ void RenderPlayer(RemotePlayer* rplayer, const Vector3f& player_pos, const Vector3f& player_dir) const;
+};
+#endif
\ No newline at end of file
diff --git a/SQCSim2021/worldrenderer.h b/SQCSim2021/worldrenderer.h
deleted file mode 100644
index 46e6624..0000000
--- a/SQCSim2021/worldrenderer.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef WORLDRENDERER_H__
-#define WORLDRENDERER_H__
-#include
-#include
-#include "../SQCSim-common/world.h"
-#include "../SQCSim-common/transformation.h"
-#include "define.h"
-#include "mesh.h"
-#include "textureatlas.h"
-#include "shader.h"
-
-class WorldRenderer {
-private:
- Array2d m_meshes = Array2d(WORLD_SIZE_X, WORLD_SIZE_Y);
-
-public:
- WorldRenderer();
- ~WorldRenderer();
-
- void RenderWorld(World* origin, int& rendercount, const Vector3f& player_pos, const Vector3f& player_dir, Transformation& world, Shader& shader, TextureAtlas& atlas);
- void UpdateWorld(World* origin, const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]);
-};
-#endif
\ No newline at end of file