BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Networking' into Networking

Browse Source
This commit is contained in:
Jocke
2015-12-16 14:58:36 +01:00
parent 58a9d38e26 50ccf96268
commit 6eebce05af
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/Package.h
+2 -2
View File
@@ -13,7 +13,7 @@ public:
// arg2: PackageID for identifying packet loss. // arg2: PackageID for identifying packet loss.
Package(MessageType type, unsigned int& packageID); Package(MessageType type, unsigned int& packageID);
// Used to create package from already existing data buffer. // Used to create package from already existing data buffer.
Package(char* data, int sizeOfPackage); Package(char* data, const int sizeOfPackage);
~Package(); ~Package();
// Add primitive types like int, float, char... // Add primitive types like int, float, char...
template<typename T> template<typename T>
@@ -43,7 +43,7 @@ public:
char* Data() { return m_Data; }; char* Data() { return m_Data; };
private: private:
char* m_Data = new char[128]; char* m_Data;
unsigned int m_ReturnDataOffset = 0; unsigned int m_ReturnDataOffset = 0;
int m_Offset = 0; int m_Offset = 0;
}; };
src/Engine/Network/Package.cpp
+3 -1
View File
@@ -2,6 +2,7 @@
Package::Package(MessageType type, unsigned int& packageID) Package::Package(MessageType type, unsigned int& packageID)
{ {
m_Data = new char[128];
// Create message header // Create message header
// Add message type // Add message type
int messageType = static_cast<int>(type); int messageType = static_cast<int>(type);
@@ -12,9 +13,10 @@ Package::Package(MessageType type, unsigned int& packageID)
} }
Package::Package(char* data, int sizeOfPackage) Package::Package(char* data, const int sizeOfPackage)
{ {
// Create message // Create message
m_Data = new char[sizeOfPackage];
memcpy(m_Data, data, sizeOfPackage); memcpy(m_Data, data, sizeOfPackage);
m_Offset = sizeOfPackage; m_Offset = sizeOfPackage;
} }
src/Game/PlayerSystem.cpp
+5 -5
View File
@@ -2,17 +2,17 @@
void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, double dt) void PlayerSystem::UpdateComponent(World * world, ComponentWrapper & player, double dt)
{ {
(glm::vec3)player["Velocity"] = glm::vec3(0.f, 0.f, 0.f); player["Velocity"] = glm::vec3(0.f, 0.f, 0.f);
if (static_cast<bool>(player["Forward"])== true) { if ((bool&)player["Forward"] == true) {
((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt) * -1; ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt) * -1;
} }
if (static_cast<bool>(player["Left"]) == true) { if ((bool&)player["Left"] == true) {
((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt) * -1; ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt) * -1;
} }
if (static_cast<bool>(player["Back"]) == true) { if ((bool&)player["Back"] == true) {
((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt); ((glm::vec3&)player["Velocity"]).z = m_Speed * float(dt);
} }
if (static_cast<bool>(player["Right"]) == true) { if ((bool&)player["Right"] == true) {
((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt); ((glm::vec3&)player["Velocity"]).x = m_Speed * float(dt);
} }