diff --git a/Code/Game/GameLogic/GameLogic.vcxproj b/Code/Game/GameLogic/GameLogic.vcxproj
index ba7603a7..54ec2d7e 100644
--- a/Code/Game/GameLogic/GameLogic.vcxproj
+++ b/Code/Game/GameLogic/GameLogic.vcxproj
@@ -189,6 +189,7 @@
+
@@ -210,6 +211,7 @@
+
diff --git a/Code/Game/GameLogic/Loader.cpp b/Code/Game/GameLogic/Loader.cpp
index ec537765..01047b2f 100644
--- a/Code/Game/GameLogic/Loader.cpp
+++ b/Code/Game/GameLogic/Loader.cpp
@@ -8,11 +8,12 @@ using namespace GameLogic::LevelFileLoader;
using namespace Oyster::Resource;
using namespace std;
-char* Loader::LoadFile(std::string fileName)
+unsigned char* Loader::LoadFile(std::string fileName, int &size)
{
//convert from string to wstring
std::wstring temp(fileName.begin(), fileName.end());
+ size = temp.size();
//convert from wstring to wchar then loads the file
- return (char*)OysterResource::LoadResource(temp.c_str(), Oyster::Resource::ResourceType::ResourceType_Byte_Raw, -1 , false);
+ return (unsigned char*)OysterResource::LoadResource(temp.c_str(), Oyster::Resource::ResourceType::ResourceType_Byte_Raw, -1 , false);
}
\ No newline at end of file
diff --git a/Code/Game/GameLogic/Loader.h b/Code/Game/GameLogic/Loader.h
index 72d53854..d77921c5 100644
--- a/Code/Game/GameLogic/Loader.h
+++ b/Code/Game/GameLogic/Loader.h
@@ -15,9 +15,9 @@ namespace GameLogic
class Loader
{
public:
- Loader(){};
+ Loader (){};
~Loader(){};
- char* LoadFile(std::string fileName);
+ unsigned char* LoadFile(std::string fileName, int &size);
//TODO:
//Add functionality to load physicsObjects (hitboxes)
diff --git a/Code/Game/GameLogic/ObjectDefines.h b/Code/Game/GameLogic/ObjectDefines.h
index eae1b0c9..7f2307d1 100644
--- a/Code/Game/GameLogic/ObjectDefines.h
+++ b/Code/Game/GameLogic/ObjectDefines.h
@@ -24,9 +24,9 @@ namespace GameLogic
struct ObjectHeader : public ObjectTypeHeader
{
//Model,
-
+ int ModelID;
//Texture
-
+ int TextureID;
//Position
float position[3];
//Rotation
diff --git a/Code/Game/GameLogic/ParseFunctions.cpp b/Code/Game/GameLogic/ParseFunctions.cpp
new file mode 100644
index 00000000..28199e6b
--- /dev/null
+++ b/Code/Game/GameLogic/ParseFunctions.cpp
@@ -0,0 +1,83 @@
+//////////////////////////////////
+// Created by Sam Svensson 2013 //
+//////////////////////////////////
+
+#include "ParserFunctions.h"
+#include "../../Misc/Packing/Packing.h"
+#include
+
+using namespace Oyster::Packing;
+using namespace GameLogic;
+using namespace std;
+
+ObjectTypeHeader parseObjectTypeHeader(unsigned char* buffer)
+{
+ int i = Unpacki(buffer);
+
+ struct ObjectTypeHeader header;
+ header.typeID = (ObjectType)i;
+
+ return header;
+}
+ObjectHeader parseObjectHeader (unsigned char* buffer)
+{
+ struct ObjectHeader header;
+ int x, y,z;
+ string s;
+ int start = 0;
+
+
+ //ModelID
+ x = Unpacki(buffer);
+ header.ModelID = (ObjectType)x;
+
+ //TextureID
+ start += 4;
+ x = Unpacki(&buffer[start]);
+ header.TextureID = x;
+
+ //Position
+ start += 4;
+ x = Unpacki(&buffer[start]);
+
+ start += 4;
+ y = Unpacki(&buffer[start]);
+
+ start += 4;
+ z = Unpacki(&buffer[start]);
+
+ header.position[0] = x;
+ header.position[1] = y;
+ header.position[2] = z;
+
+ //Rotation
+ start += 4;
+ x = Unpacki(&buffer[start]);
+
+ start += 4;
+ y = Unpacki(&buffer[start]);
+
+ start += 4;
+ z = Unpacki(&buffer[start]);
+
+ header.rotation[0] = x;
+ header.rotation[1] = y;
+ header.rotation[2] = z;
+
+ //Scale
+ start += 4;
+ x = Unpacki(&buffer[start]);
+
+ start += 4;
+ y = Unpacki(&buffer[start]);
+
+ start += 4;
+ z = Unpacki(&buffer[start]);
+
+ header.scale[0] = x;
+ header.scale[1] = y;
+ header.scale[2] = z;
+
+
+ return header;
+}
\ No newline at end of file
diff --git a/Code/Game/GameLogic/ParserFunctions.h b/Code/Game/GameLogic/ParserFunctions.h
new file mode 100644
index 00000000..0608e77a
--- /dev/null
+++ b/Code/Game/GameLogic/ParserFunctions.h
@@ -0,0 +1,22 @@
+//////////////////////////////////
+// Created by Sam Svensson 2013 //
+//////////////////////////////////
+
+#ifndef PARSERFUNCTIONS_H
+#define PARSERFUNCTIONS_H
+#include "ObjectDefines.h"
+
+namespace GameLogic
+{
+ namespace LevelFileLoader
+ {
+ namespace parseFunctions
+ {
+ ObjectTypeHeader parseObjectTypeHeader(unsigned char* buffer); //send in a char buffer, this function will seperate it and then return the right struct with the values.
+ ObjectHeader parseObjectHeader (unsigned char* buffer); //send in a char buffer, this function will seperate it and then return the right struct with the values.
+ }
+ }
+}
+
+
+#endif
\ No newline at end of file
diff --git a/Code/Misc/Misc.vcxproj b/Code/Misc/Misc.vcxproj
index 0b7bf576..6c3db1ec 100644
--- a/Code/Misc/Misc.vcxproj
+++ b/Code/Misc/Misc.vcxproj
@@ -146,6 +146,7 @@
+
@@ -164,6 +165,7 @@
+
diff --git a/Code/Misc/Misc.vcxproj.filters b/Code/Misc/Misc.vcxproj.filters
index 44348332..8413642a 100644
--- a/Code/Misc/Misc.vcxproj.filters
+++ b/Code/Misc/Misc.vcxproj.filters
@@ -48,6 +48,9 @@
Source Files
+
+ Source Files
+
@@ -110,5 +113,8 @@
Header Files
+
+ Header Files
+
\ No newline at end of file
diff --git a/Code/Misc/Packing/Packing.cpp b/Code/Misc/Packing/Packing.cpp
new file mode 100644
index 00000000..30064b0a
--- /dev/null
+++ b/Code/Misc/Packing/Packing.cpp
@@ -0,0 +1,346 @@
+#include "Packing.h"
+
+/***************************
+ Packing
+***************************/
+
+#include
+
+namespace Oyster
+{
+ namespace Packing
+ {
+ //bool (1-bit)
+ void Pack(unsigned char buffer[], bool i)
+ {
+ *buffer++ = i;
+ }
+
+ //char (8-bit)
+ void Pack(unsigned char buffer[], char i)
+ {
+ *buffer++ = i;
+ }
+
+ void Pack(unsigned char buffer[], unsigned char i)
+ {
+ *buffer++ = i;
+ }
+
+ //short (16-bit)
+ void Pack(unsigned char buffer[], short i)
+ {
+ *buffer++ = i >> 8;
+ *buffer++ = (char)i;
+ }
+
+ void Pack(unsigned char buffer[], unsigned short i)
+ {
+ *buffer++ = i >> 8;
+ *buffer++ = (char)i;
+ }
+
+ //int (32-bit)
+ void Pack(unsigned char buffer[], int i)
+ {
+ *buffer++ = i >> 24;
+ *buffer++ = i >> 16;
+ *buffer++ = i >> 8;
+ *buffer++ = i;
+ }
+
+ void Pack(unsigned char buffer[], unsigned int i)
+ {
+ *buffer++ = i >> 24;
+ *buffer++ = i >> 16;
+ *buffer++ = i >> 8;
+ *buffer++ = i;
+ }
+
+ //__int64 (64-bit)
+ void Pack(unsigned char buffer[], __int64 i)
+ {
+ *buffer++ = (char)(i >> 56);
+ *buffer++ = (char)(i >> 48);
+ *buffer++ = (char)(i >> 40);
+ *buffer++ = (char)(i >> 32);
+ *buffer++ = (char)(i >> 24);
+ *buffer++ = (char)(i >> 16);
+ *buffer++ = (char)(i >> 8);
+ *buffer++ = (char)i;
+ }
+
+ void Pack(unsigned char buffer[], unsigned __int64 i)
+ {
+ *buffer++ = (char)(i >> 56);
+ *buffer++ = (char)(i >> 48);
+ *buffer++ = (char)(i >> 40);
+ *buffer++ = (char)(i >> 32);
+ *buffer++ = (char)(i >> 24);
+ *buffer++ = (char)(i >> 16);
+ *buffer++ = (char)(i >> 8);
+ *buffer++ = (char)i;
+ }
+
+ //floating point (32, 64-bit)
+ void Pack(unsigned char buffer[], float i)
+ {
+ int tempFloat = (int)Pack754(i, 32, 8);
+ Pack(buffer, tempFloat);
+ }
+
+ void Pack(unsigned char buffer[], double i)
+ {
+ __int64 tempDouble = Pack754(i, 64, 11);
+ Pack(buffer, tempDouble);
+ }
+
+ //string
+ void Pack(unsigned char buffer[], char str[])
+ {
+ short len = (short)strlen(str);
+ Pack(buffer, len);
+ buffer += 2;
+ memcpy(buffer, str, len);
+ }
+
+ void Pack(unsigned char buffer[], std::string& str)
+ {
+ short len = (short)str.length();
+ Pack(buffer, len);
+ buffer += 2;
+ memcpy(buffer, str.c_str(), len);
+ }
+
+ unsigned __int64 Pack754(long double f, unsigned bits, unsigned expbits)
+ {
+ long double fnorm;
+ int shift;
+ long long sign, exp, significand;
+ unsigned significandbits = bits - expbits - 1; // -1 for sign bit
+
+ if (f == 0.0)
+ return 0; // get this special case out of the way
+
+ // check sign and begin normalization
+ if (f < 0)
+ {
+ sign = 1;
+ fnorm = -f;
+ }
+ else
+ {
+ sign = 0;
+ fnorm = f;
+ }
+
+ // get the normalized form of f and track the exponent
+ shift = 0;
+ while(fnorm >= 2.0)
+ {
+ fnorm /= 2.0;
+ shift++;
+ }
+
+ while(fnorm < 1.0)
+ {
+ fnorm *= 2.0;
+ shift--;
+ }
+
+ fnorm = fnorm - 1.0;
+
+ // calculate the binary form (non-float) of the significand data
+ significand = (long long)(fnorm * ((1LL << significandbits) + 0.5f));
+
+ // get the biased exponent
+ exp = shift + ((1 << (expbits - 1)) - 1); // shift + bias
+
+ // return the final answer
+ return (sign << (bits - 1)) | (exp << (bits - expbits - 1)) | significand;
+ }
+
+ /******************************
+ Unpacking
+ ******************************/
+
+ //bool (1-bit)
+ bool Unpackb(unsigned char buffer[])
+ {
+ return *buffer;
+ }
+
+ //char (8-bit)
+ char Unpackc(unsigned char buffer[])
+ {
+ if(*buffer <= 0x7f)
+ {
+ return *buffer;
+ }
+ else
+ {
+ return (-1 - (unsigned char)(0xffu - *buffer));
+ }
+ }
+
+ unsigned char UnpackC(unsigned char buffer[])
+ {
+ return *buffer;
+ }
+
+ //short (16-bit)
+ short Unpacks(unsigned char buffer[])
+ {
+ short i = ((short)buffer[0] << 8) | buffer[1];
+
+ if(i > 0x7fffu)
+ {
+ i = -1 - (unsigned short)(0xffffu - i);
+ }
+
+ return i;
+ }
+
+ unsigned short UnpackS(unsigned char buffer[])
+ {
+ return ((unsigned int)buffer[0] << 8) | buffer[1];
+ }
+
+ //int (32-bit)
+ int Unpacki(unsigned char buffer[])
+ {
+ int i = ((int)buffer[0] << 24) |
+ ((int)buffer[1] << 16) |
+ ((int)buffer[2] << 8) |
+ ((int)buffer[3]);
+
+ if(i > 0x7fffffffu)
+ {
+ i = -1 - (int)(0xffffffffu - i);
+ }
+
+ return i;
+ }
+
+ unsigned int UnpackI(unsigned char buffer[])
+ {
+ return ((unsigned int)buffer[0] << 24) |
+ ((unsigned int)buffer[1] << 16) |
+ ((unsigned int)buffer[2] << 8) |
+ ((unsigned int)buffer[3]);
+ }
+
+ //__int64 (64-bit)
+ __int64 Unpacki64(unsigned char buffer[])
+ {
+ __int64 i = ((__int64)buffer[0] << 56) |
+ ((__int64)buffer[1] << 48) |
+ ((__int64)buffer[2] << 40) |
+ ((__int64)buffer[3] << 32) |
+ ((__int64)buffer[4] << 24) |
+ ((__int64)buffer[5] << 16) |
+ ((__int64)buffer[6] << 8) |
+ (buffer[7]);
+
+ if(i > 0x7fffffffffffffffu)
+ {
+ i = -1 - (__int64)(0xffffffffffffffffu - i);
+ }
+
+ return i;
+ }
+
+ unsigned __int64 UnpackI64(unsigned char buffer[])
+ {
+
+ return ((__int64)buffer[0] << 56) |
+ ((__int64)buffer[1] << 48) |
+ ((__int64)buffer[2] << 40) |
+ ((__int64)buffer[3] << 32) |
+ ((__int64)buffer[4] << 24) |
+ ((__int64)buffer[5] << 16) |
+ ((__int64)buffer[6] << 8) |
+ ((__int64)buffer[7]);
+ }
+
+ //floating point (32, 64-bit)
+ float Unpackf(unsigned char buffer[])
+ {
+ int tempFloat = Unpacki(buffer);
+ return (float)Unpack754(tempFloat, 32, 8);
+ }
+
+ double Unpackd(unsigned char buffer[])
+ {
+ __int64 tempDouble = Unpacki64(buffer);
+ return Unpack754(tempDouble, 64, 11);
+ }
+
+ //string
+ char* UnpackCStr(unsigned char buffer[])
+ {
+ short len = UnpackS(buffer);
+ char* str = new char[len+1];
+
+ buffer += 2;
+ for(int i = 0; i < len; i++)
+ {
+ str[i] = buffer[i];
+ }
+
+ str[len] = '\0';
+
+ return str;
+ }
+
+ std::string UnpackStr(unsigned char buffer[])
+ {
+ short len = UnpackS(buffer);
+ std::string temp;
+ temp.resize(len);
+
+ buffer += 2;
+ for(int i = 0; i < len; i++)
+ {
+ temp[i] = buffer[i];
+ }
+
+ return temp;
+ }
+
+ long double Unpack754(unsigned __int64 i, unsigned bits, unsigned expbits)
+ {
+ long double result;
+ long long shift;
+ unsigned bias;
+ unsigned significandbits = bits - expbits - 1; // -1 for sign bit
+
+ if (i == 0)
+ return 0.0;
+
+ // pull the significand
+ result = (long double)(i&((1LL << significandbits) - 1)); // mask
+ result /= (1LL << significandbits); // convert back to float
+ result += 1.0f; // add the one back on
+
+ // deal with the exponent
+ bias = (1 << (expbits - 1)) - 1;
+ shift = ((i >> significandbits) & ((1LL << expbits) - 1)) - bias;
+ while(shift > 0)
+ {
+ result *= 2.0;
+ shift--;
+ }
+ while(shift < 0)
+ {
+ result /= 2.0;
+ shift++;
+ }
+
+ // sign it
+ result *= (i >> (bits - 1)) & 1 ? -1.0 : 1.0;
+
+ return result;
+ }
+ }
+}
diff --git a/Code/Misc/Packing/Packing.h b/Code/Misc/Packing/Packing.h
new file mode 100644
index 00000000..47a65c51
--- /dev/null
+++ b/Code/Misc/Packing/Packing.h
@@ -0,0 +1,81 @@
+#ifndef PACKING_H
+#define PACKING_H
+
+/////////////////////////////////////
+// Created by Pontus Fransson 2013 //
+/////////////////////////////////////
+
+#include
+
+/******************************
+ Packing
+******************************/
+namespace Oyster
+{
+ namespace Packing
+ {
+ //bool (1-bit)
+ void Pack(unsigned char buffer[], bool i);
+
+ //char (8-bit)
+ void Pack(unsigned char buffer[], char i);
+ void Pack(unsigned char buffer[], unsigned char i); // unsigned
+
+ //short (16-bit)
+ void Pack(unsigned char buffer[], short i);
+ void Pack(unsigned char buffer[], unsigned short i); // unsigned
+
+ //int (32-bit)
+ void Pack(unsigned char buffer[], int i);
+ void Pack(unsigned char buffer[], unsigned int i); // unsigned
+
+ //__int64 (64-bit)
+ void Pack(unsigned char buffer[], __int64 i);
+ void Pack(unsigned char buffer[], unsigned __int64 i); // unsigned
+
+ //floating point (32, 64-bit)
+ void Pack(unsigned char buffer[], float i);
+ void Pack(unsigned char buffer[], double i);
+
+ //string
+ void Pack(unsigned char buffer[], char str[]);
+ void Pack(unsigned char buffer[], std::string& str);
+
+ unsigned __int64 Pack754(long double f, unsigned bits, unsigned expbits);
+
+ /******************************
+ Unpacking
+ ******************************/
+
+ //bool (1-bit)
+ bool Unpackb(unsigned char buffer[]);
+
+ //char (8-bit)
+ char Unpackc(unsigned char buffer[]);
+ unsigned char UnpackC(unsigned char buffer[]); // unsigned
+
+ //short (16-bit)
+ short Unpacks(unsigned char buffer[]);
+ unsigned short UnpackS(unsigned char buffer[]); // unsigned
+
+ //int (32-bit)
+ int Unpacki(unsigned char buffer[]);
+ unsigned int UnpackI(unsigned char buffer[]); // unsigned
+
+ //__int64 (64-bit)
+ __int64 Unpacki64(unsigned char buffer[]);
+ unsigned __int64 UnpackI64(unsigned char buffer[]); // unsigned
+
+ //floating point (32, 64-bit)
+ float Unpackf(unsigned char buffer[]);
+ double Unpackd(unsigned char buffer[]);
+
+ //string
+ char* UnpackCStr(unsigned char buffer[]);
+ std::string UnpackStr(unsigned char buffer[]);
+
+ long double Unpack754(unsigned __int64 i, unsigned bits, unsigned expbits);
+ }
+}
+
+#endif
\ No newline at end of file
diff --git a/Code/Network/NetworkDependencies/Messages/MessageHeader.cpp b/Code/Network/NetworkDependencies/Messages/MessageHeader.cpp
index d2823b62..8f315797 100644
--- a/Code/Network/NetworkDependencies/Messages/MessageHeader.cpp
+++ b/Code/Network/NetworkDependencies/Messages/MessageHeader.cpp
@@ -1,8 +1,9 @@
#include "MessageHeader.h"
-#include "../Packing.h"
+#include "../../../Misc/Packing/Packing.h"
#include
using namespace std;
+using namespace Oyster::Packing;
using namespace Oyster::Network;
using namespace Oyster::Network::Messages;
using namespace Oyster::Network::Protocols;
diff --git a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj
index 4d2ad291..c0048016 100644
--- a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj
+++ b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj
@@ -157,7 +157,6 @@
-
@@ -172,7 +171,6 @@
-
diff --git a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
index eadbbeb3..cce2fe94 100644
--- a/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
+++ b/Code/Network/NetworkDependencies/NetworkDependencies.vcxproj.filters
@@ -7,7 +7,6 @@
-
@@ -22,7 +21,6 @@
-
diff --git a/Code/Network/NetworkDependencies/Packing.cpp b/Code/Network/NetworkDependencies/Packing.cpp
deleted file mode 100644
index 41d059a3..00000000
--- a/Code/Network/NetworkDependencies/Packing.cpp
+++ /dev/null
@@ -1,486 +0,0 @@
-#include "Packing.h"
-
-/***************************
- Packing
-***************************/
-
-#include
-
-namespace Oyster
-{
- namespace Network
- {
- namespace Packing
- {
- //bool (1-bit)
- void Pack(unsigned char buffer[], bool i)
- {
- *buffer++ = i;
- }
-
- //char (8-bit)
- void Pack(unsigned char buffer[], char i)
- {
- *buffer++ = i;
- }
-
- void Pack(unsigned char buffer[], unsigned char i)
- {
- *buffer++ = i;
- }
-
- //short (16-bit)
- void Pack(unsigned char buffer[], short i)
- {
- *buffer++ = i >> 8;
- *buffer++ = (char)i;
- }
-
- void Pack(unsigned char buffer[], unsigned short i)
- {
- *buffer++ = i >> 8;
- *buffer++ = (char)i;
- }
-
- //int (32-bit)
- void Pack(unsigned char buffer[], int i)
- {
- *buffer++ = i >> 24;
- *buffer++ = i >> 16;
- *buffer++ = i >> 8;
- *buffer++ = i;
- }
-
- void Pack(unsigned char buffer[], unsigned int i)
- {
- *buffer++ = i >> 24;
- *buffer++ = i >> 16;
- *buffer++ = i >> 8;
- *buffer++ = i;
- }
-
- //__int64 (64-bit)
- void Pack(unsigned char buffer[], __int64 i)
- {
- *buffer++ = (char)(i >> 56);
- *buffer++ = (char)(i >> 48);
- *buffer++ = (char)(i >> 40);
- *buffer++ = (char)(i >> 32);
- *buffer++ = (char)(i >> 24);
- *buffer++ = (char)(i >> 16);
- *buffer++ = (char)(i >> 8);
- *buffer++ = (char)i;
- }
-
- void Pack(unsigned char buffer[], unsigned __int64 i)
- {
- *buffer++ = (char)(i >> 56);
- *buffer++ = (char)(i >> 48);
- *buffer++ = (char)(i >> 40);
- *buffer++ = (char)(i >> 32);
- *buffer++ = (char)(i >> 24);
- *buffer++ = (char)(i >> 16);
- *buffer++ = (char)(i >> 8);
- *buffer++ = (char)i;
- }
-
- //floating point (32, 64-bit)
- void Pack(unsigned char buffer[], float i)
- {
- int tempFloat = (int)Pack754(i, 32, 8);
- Pack(buffer, tempFloat);
- }
-
- void Pack(unsigned char buffer[], double i)
- {
- __int64 tempDouble = Pack754(i, 64, 11);
- Pack(buffer, tempDouble);
- }
-
- //string
- void Pack(unsigned char buffer[], char str[])
- {
- short len = (short)strlen(str);
- Pack(buffer, len);
- buffer += 2;
- memcpy(buffer, str, len);
- }
-
- void Pack(unsigned char buffer[], std::string& str)
- {
- short len = (short)str.length();
- Pack(buffer, len);
- buffer += 2;
- memcpy(buffer, str.c_str(), len);
- }
-
- unsigned __int64 Pack754(long double f, unsigned bits, unsigned expbits)
- {
- long double fnorm;
- int shift;
- long long sign, exp, significand;
- unsigned significandbits = bits - expbits - 1; // -1 for sign bit
-
- if (f == 0.0)
- return 0; // get this special case out of the way
-
- // check sign and begin normalization
- if (f < 0)
- {
- sign = 1;
- fnorm = -f;
- }
- else
- {
- sign = 0;
- fnorm = f;
- }
-
- // get the normalized form of f and track the exponent
- shift = 0;
- while(fnorm >= 2.0)
- {
- fnorm /= 2.0;
- shift++;
- }
-
- while(fnorm < 1.0)
- {
- fnorm *= 2.0;
- shift--;
- }
-
- fnorm = fnorm - 1.0;
-
- // calculate the binary form (non-float) of the significand data
- significand = (long long)(fnorm * ((1LL << significandbits) + 0.5f));
-
- // get the biased exponent
- exp = shift + ((1 << (expbits - 1)) - 1); // shift + bias
-
- // return the final answer
- return (sign << (bits - 1)) | (exp << (bits - expbits - 1)) | significand;
- }
-
- /******************************
- Unpacking
- ******************************/
-
- //bool (1-bit)
- bool Unpackb(unsigned char buffer[])
- {
- return *buffer;
- }
-
- //char (8-bit)
- char Unpackc(unsigned char buffer[])
- {
- if(*buffer <= 0x7f)
- {
- return *buffer;
- }
- else
- {
- return (-1 - (unsigned char)(0xffu - *buffer));
- }
- }
-
- unsigned char UnpackC(unsigned char buffer[])
- {
- return *buffer;
- }
-
- //short (16-bit)
- short Unpacks(unsigned char buffer[])
- {
- short i = ((short)buffer[0] << 8) | buffer[1];
-
- if(i > 0x7fffu)
- {
- i = -1 - (unsigned short)(0xffffu - i);
- }
-
- return i;
- }
-
- unsigned short UnpackS(unsigned char buffer[])
- {
- return ((unsigned int)buffer[0] << 8) | buffer[1];
- }
-
- //int (32-bit)
- int Unpacki(unsigned char buffer[])
- {
- int i = ((int)buffer[0] << 24) |
- ((int)buffer[1] << 16) |
- ((int)buffer[2] << 8) |
- ((int)buffer[3]);
-
- if(i > 0x7fffffffu)
- {
- i = -1 - (int)(0xffffffffu - i);
- }
-
- return i;
- }
-
- unsigned int UnpackI(unsigned char buffer[])
- {
- return ((unsigned int)buffer[0] << 24) |
- ((unsigned int)buffer[1] << 16) |
- ((unsigned int)buffer[2] << 8) |
- ((unsigned int)buffer[3]);
- }
-
- //__int64 (64-bit)
- __int64 Unpacki64(unsigned char buffer[])
- {
- __int64 i = ((__int64)buffer[0] << 56) |
- ((__int64)buffer[1] << 48) |
- ((__int64)buffer[2] << 40) |
- ((__int64)buffer[3] << 32) |
- ((__int64)buffer[4] << 24) |
- ((__int64)buffer[5] << 16) |
- ((__int64)buffer[6] << 8) |
- (buffer[7]);
-
- if(i > 0x7fffffffffffffffu)
- {
- i = -1 - (__int64)(0xffffffffffffffffu - i);
- }
-
- return i;
- }
-
- unsigned __int64 UnpackI64(unsigned char buffer[])
- {
-
- return ((__int64)buffer[0] << 56) |
- ((__int64)buffer[1] << 48) |
- ((__int64)buffer[2] << 40) |
- ((__int64)buffer[3] << 32) |
- ((__int64)buffer[4] << 24) |
- ((__int64)buffer[5] << 16) |
- ((__int64)buffer[6] << 8) |
- ((__int64)buffer[7]);
- }
-
- //floating point (32, 64-bit)
- float Unpackf(unsigned char buffer[])
- {
- int tempFloat = Unpacki(buffer);
- return (float)Unpack754(tempFloat, 32, 8);
- }
-
- double Unpackd(unsigned char buffer[])
- {
- __int64 tempDouble = Unpacki64(buffer);
- return Unpack754(tempDouble, 64, 11);
- }
-
- //string
- char* UnpackCStr(unsigned char buffer[])
- {
- short len = UnpackS(buffer);
- char* str = new char[len+1];
-
- buffer += 2;
- for(int i = 0; i < len; i++)
- {
- str[i] = buffer[i];
- }
-
- str[len] = '\0';
-
- return str;
- }
-
- std::string UnpackStr(unsigned char buffer[])
- {
- short len = UnpackS(buffer);
- std::string temp;
- temp.resize(len);
-
- buffer += 2;
- for(int i = 0; i < len; i++)
- {
- temp[i] = buffer[i];
- }
-
- return temp;
- }
-
- long double Unpack754(unsigned __int64 i, unsigned bits, unsigned expbits)
- {
- long double result;
- long long shift;
- unsigned bias;
- unsigned significandbits = bits - expbits - 1; // -1 for sign bit
-
- if (i == 0)
- return 0.0;
-
- // pull the significand
- result = (long double)(i&((1LL << significandbits) - 1)); // mask
- result /= (1LL << significandbits); // convert back to float
- result += 1.0f; // add the one back on
-
- // deal with the exponent
- bias = (1 << (expbits - 1)) - 1;
- shift = ((i >> significandbits) & ((1LL << expbits) - 1)) - bias;
- while(shift > 0)
- {
- result *= 2.0;
- shift--;
- }
- while(shift < 0)
- {
- result /= 2.0;
- shift++;
- }
-
- // sign it
- result *= (i >> (bits - 1)) & 1 ? -1.0 : 1.0;
-
- return result;
- }
- }
- }
-}
-
-/*
-int32_t pack(unsigned char* buffer, char* format, ...)
-{
- va_list ap;
- int16_t h;
- int32_t l;
- int8_t c;
- float f;
- double d;
- char* s;
- int32_t size = 0, len;
-
- va_start(ap, format);
-
- for(; *format != '\0'; format++)
- {
- switch(*format)
- {
- case 'h': // 16-bit
- size += 2;
- h = (int16_t)va_arg(ap, int);
- packi16(buffer, h);
- buffer += 2;
- break;
- case 'l': // 32-bit
- size += 4;
- l = va_arg(ap, int32_t);
- packi32(buffer, l);
- buffer += 4;
- break;
- case 'c': // 8-bit
- size += 1;
- c = (int8_t)va_arg(ap, int);
- *buffer++ = (c >> 0)&0xff;
- break;
- case 'f': // float (32-bit)
- size += 4;
- f = (float)va_arg(ap, double);
- //l = pack754(f, 32, 8);
- packi32(buffer, l);
- buffer += 4;
- break;
- case 'd': // double (64-bit)
- size += 8;
- d = (float)va_arg(ap, double);
- //l = pack754(f, 64, 11);
- packi32(buffer, l);
- buffer += 4;
- break;
- case 's': // string
- s = va_arg(ap, char*);
- len = strlen(s);
- size += len + 2;
- packi16(buffer, len);
- buffer += 2;
- memcpy(buffer, s, len);
- buffer += len;
- break;
- }
- }
-
- va_end(ap);
-
- return size;
-}
-*/
-
-/*
-void unpack(unsigned char* buffer, char* format, ...)
-{
- va_list ap;
- int16_t* h;
- int32_t* l;
- int32_t pf;
- int64_t pd;
- int8_t* c;
- float* f;
- double* d;
- char* s;
- int32_t len, count, maxstrlen = 0;
-
- va_start(ap, format);
-
- for(; *format != '\0'; format++)
- {
- switch(*format)
- {
- case 'h': // 16-bit
- h = va_arg(ap, int16_t*);
- *h = unpacki16(buffer);
- buffer += 2;
- break;
- case 'l': // 32-bit
- l = va_arg(ap, int32_t*);
- *l = unpacki32(buffer);
- buffer += 4;
- break;
- case 'c': // 8-bit
- c = va_arg(ap, int8_t*);
- *c = *buffer++;
- break;
- case 'f': // float
- f = va_arg(ap, float*);
- pf = unpacki32(buffer);
- buffer += 4;
- //*f = unpack754(pf, 32, 8);
- break;
- case 'd': // double (64-bit)
- d = va_arg(ap, double*);
- pd = unpacki64(buffer);
- buffer += 8;
- //*d = unpack754(pf, 64, 11);
- break;
- case 's': // string
- s = va_arg(ap, char*);
- len = unpacki16(buffer);
- buffer += 2;
- if (maxstrlen > 0 && len > maxstrlen) count = maxstrlen - 1;
- else count = len;
- memcpy(s, buffer, count);
- s[count] = '\0';
- buffer += len;
- break;
- default:
- if (isdigit(*format)) // track max str len
- {
- maxstrlen = maxstrlen * 10 + (*format-'0');
- }
- }
-
- if(!isdigit(*format))
- maxstrlen = 0;
- }
-
- va_end(ap);
-}*/
\ No newline at end of file
diff --git a/Code/Network/NetworkDependencies/Packing.h b/Code/Network/NetworkDependencies/Packing.h
deleted file mode 100644
index aaf3a1b8..00000000
--- a/Code/Network/NetworkDependencies/Packing.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#ifndef PACKING_H
-#define PACKING_H
-
-/////////////////////////////////////
-// Created by Pontus Fransson 2013 //
-/////////////////////////////////////
-
-#include
-
-/******************************
- Packing
-******************************/
-namespace Oyster
-{
- namespace Network
- {
- namespace Packing
- {
- //bool (1-bit)
- void Pack(unsigned char buffer[], bool i);
-
- //char (8-bit)
- void Pack(unsigned char buffer[], char i);
- void Pack(unsigned char buffer[], unsigned char i); // unsigned
-
- //short (16-bit)
- void Pack(unsigned char buffer[], short i);
- void Pack(unsigned char buffer[], unsigned short i); // unsigned
-
- //int (32-bit)
- void Pack(unsigned char buffer[], int i);
- void Pack(unsigned char buffer[], unsigned int i); // unsigned
-
- //__int64 (64-bit)
- void Pack(unsigned char buffer[], __int64 i);
- void Pack(unsigned char buffer[], unsigned __int64 i); // unsigned
-
- //floating point (32, 64-bit)
- void Pack(unsigned char buffer[], float i);
- void Pack(unsigned char buffer[], double i);
-
- //string
- void Pack(unsigned char buffer[], char str[]);
- void Pack(unsigned char buffer[], std::string& str);
-
- unsigned __int64 Pack754(long double f, unsigned bits, unsigned expbits);
-
- /******************************
- Unpacking
- ******************************/
-
- //bool (1-bit)
- bool Unpackb(unsigned char buffer[]);
-
- //char (8-bit)
- char Unpackc(unsigned char buffer[]);
- unsigned char UnpackC(unsigned char buffer[]); // unsigned
-
- //short (16-bit)
- short Unpacks(unsigned char buffer[]);
- unsigned short UnpackS(unsigned char buffer[]); // unsigned
-
- //int (32-bit)
- int Unpacki(unsigned char buffer[]);
- unsigned int UnpackI(unsigned char buffer[]); // unsigned
-
- //__int64 (64-bit)
- __int64 Unpacki64(unsigned char buffer[]);
- unsigned __int64 UnpackI64(unsigned char buffer[]); // unsigned
-
- //floating point (32, 64-bit)
- float Unpackf(unsigned char buffer[]);
- double Unpackd(unsigned char buffer[]);
-
- //string
- char* UnpackCStr(unsigned char buffer[]);
- std::string UnpackStr(unsigned char buffer[]);
-
- long double Unpack754(unsigned __int64 i, unsigned bits, unsigned expbits);
- }
- }
-}
-
-
-//int32_t pack(unsigned char* buffer, char* format, ...);
-
-//void unpack(unsigned char* buffer, char* format, ...);
-
-
-/***********************************************
-* This table is used for naming pack/unpack functions.
-* It's also used to identify types in the 'format' string in function pack()/unpack()
-*
-* bits |signed unsigned float string
-* -----+----------------------------------
-* 1 | b
-* 8 | c C
-* 16 | s S f
-* 32 | i I d
-* 64 | q Q g
-* - | str
-*
-* (16-bit unsigned length is automatically added in front of strings)
-*
-*/
-
-#endif
\ No newline at end of file