Merge branch 'develop'

Conflicts:
	todo.txt

client/entities/local_character.cpp

@@ -21,3 +21,15 @@
 */
 #include "local_character.hpp"
 
+#include <iostream>
+
+bool LocalCharacter::ProcessCollisionGrid(std::list<BoundingBox> boxList) {
+	for(auto& box : boxList) {
+		if (box.CheckOverlap(origin + bounds)) {
+			origin -= motion;
+			motion = {0, 0};
+			return true;
+		}
+	}
+	return false;
+}

client/entities/local_character.hpp

@@ -23,12 +23,18 @@
 #define LOCALCHARACTER_HPP_
 
 #include "base_character.hpp"
+#include "bounding_box.hpp"
+#include "vector2.hpp"
+
+#include <list>
 
 class LocalCharacter: public BaseCharacter {
 public:
 	LocalCharacter() = default;
 	virtual ~LocalCharacter() = default;
 
+	bool ProcessCollisionGrid(std::list<BoundingBox>);
+
 private:
 	//NOTE: NO MEMBERS
 };

client/scenes/in_world.cpp

@@ -134,23 +134,8 @@ void InWorld::Update() {
 	//free the buffer
 	delete reinterpret_cast<char*>(packetBuffer);
 
-	//check the connection (heartbeat)
-	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
-		if (attemptedBeats > 2) {
-			//escape to the disconnect screen
-			SendDisconnectRequest();
-			SetNextScene(SceneList::DISCONNECTEDSCREEN);
-			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
-		}
-		else {
-			ServerPacket newPacket;
-			newPacket.type = SerialPacketType::PING;
-			network.SendTo(Channels::SERVER, &newPacket);
-
-			attemptedBeats++;
-			lastBeat = Clock::now();
-		}
-	}
+	//heartbeat system
+	CheckHeartBeat();
 
 	//update all entities
 	for (auto& it : characterMap) {
@@ -168,35 +153,14 @@ void InWorld::Update() {
 		return;
 	}
 
-	//prepare for collisions
-	BoundingBox wallBounds = {0, 0, tileSheet.GetTileW(), tileSheet.GetTileH()};
-	std::list<BoundingBox> boxList;
-
-	//NOTE: for loops were too dense to work with, so I've just used while loops
-	//NOTE: this code is complex, and can be replaced with hard-coded relative positions, at the cost of variable-sized sprites/bounding boxes
-
-	//outer loop
-	wallBounds.x = snapToBase((double)wallBounds.w, localCharacter->GetOrigin().x) - wallBounds.w;
-	while(wallBounds.x < (localCharacter->GetOrigin() + localCharacter->GetBounds()).x + localCharacter->GetBounds().w) {
-		//inner loop
-		wallBounds.y = snapToBase((double)wallBounds.h, localCharacter->GetOrigin().y) - wallBounds.h;
-		while(wallBounds.y < (localCharacter->GetOrigin() + localCharacter->GetBounds()).y + localCharacter->GetBounds().h) {
-			//check to see if this tile is solid
-			if (regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
-				//push onto the box set
-				boxList.push_front(wallBounds);
-			}
-
-			//increment
-			wallBounds.y += wallBounds.h;
-		}
-
-		//increment
-		wallBounds.x += wallBounds.w;
-	}
+	//get the collidable boxes
+	std::list<BoundingBox> boxList = GenerateCollisionGrid(localCharacter, tileSheet.GetTileW(), tileSheet.GetTileH());
 
 	//process the collisions
-	std::cout << "boxList.size(): " << boxList.size() << std::endl;
+	if (localCharacter->ProcessCollisionGrid(boxList)) {
+		localCharacter->CorrectSprite();
+		SendLocalCharacterMotion();
+	}
 
 	//update the camera
 	camera.x = localCharacter->GetOrigin().x - camera.marginX;
@@ -499,6 +463,26 @@ void InWorld::HandleDisconnectForced(ClientPacket* const argPacket) {
 	ConfigUtility::GetSingleton()["client.disconnectMessage"] = "You have been forcibly disconnected by the server";
 }
 
+void InWorld::CheckHeartBeat() {
+	//check the connection (heartbeat)
+	if (Clock::now() - lastBeat > std::chrono::seconds(3)) {
+		if (attemptedBeats > 2) {
+			//escape to the disconnect screen
+			SendDisconnectRequest();
+			SetNextScene(SceneList::DISCONNECTEDSCREEN);
+			ConfigUtility::GetSingleton()["client.disconnectMessage"] = "Error: Lost connection to the server";
+		}
+		else {
+			ServerPacket newPacket;
+			newPacket.type = SerialPacketType::PING;
+			network.SendTo(Channels::SERVER, &newPacket);
+
+			attemptedBeats++;
+			lastBeat = Clock::now();
+		}
+	}
+}
+
 //-------------------------
 //map management
 //-------------------------
@@ -691,6 +675,11 @@ void InWorld::HandleCharacterSetRoom(CharacterPacket* const argPacket) {
 }
 
 void InWorld::HandleCharacterSetOrigin(CharacterPacket* const argPacket) {
+	//TODO: Authentication
+	if (argPacket->characterIndex == characterIndex) {
+		return;
+	}
+
 	//check that this character exists
 	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
 	if (characterIt != characterMap.end()) {
@@ -702,6 +691,11 @@ void InWorld::HandleCharacterSetOrigin(CharacterPacket* const argPacket) {
 }
 
 void InWorld::HandleCharacterSetMotion(CharacterPacket* const argPacket) {
+	//TODO: Authentication
+	if (argPacket->characterIndex == characterIndex) {
+		return;
+	}
+
 	//check that this character exists
 	std::map<int, BaseCharacter>::iterator characterIt = characterMap.find(argPacket->characterIndex);
 	if (characterIt != characterMap.end()) {
@@ -728,4 +722,34 @@ void InWorld::SendLocalCharacterMotion() {
 	newPacket.motion = localCharacter->GetMotion();
 
 	network.SendTo(Channels::SERVER, &newPacket);
+}
+
+std::list<BoundingBox> InWorld::GenerateCollisionGrid(Entity* ptr, int tileWidth, int tileHeight) {
+	//prepare for collisions
+	BoundingBox wallBounds = {0, 0, tileWidth, tileHeight};
+	std::list<BoundingBox> boxList;
+
+	//NOTE: for loops were too dense to work with, so I've just used while loops
+
+	//outer loop
+	wallBounds.x = snapToBase((double)wallBounds.w, ptr->GetOrigin().x);
+	while(wallBounds.x < (ptr->GetOrigin() + ptr->GetBounds()).x + ptr->GetBounds().w) {
+		//inner loop
+		wallBounds.y = snapToBase((double)wallBounds.h, ptr->GetOrigin().y);
+		while(wallBounds.y < (ptr->GetOrigin() + ptr->GetBounds()).y + ptr->GetBounds().h) {
+			//check to see if this tile is solid
+			if (regionPager.GetSolid(wallBounds.x / wallBounds.w, wallBounds.y / wallBounds.h)) {
+				//push onto the box set
+				boxList.push_front(wallBounds);
+			}
+
+			//increment
+			wallBounds.y += wallBounds.h;
+		}
+
+		//increment
+		wallBounds.x += wallBounds.w;
+	}
+
+	return std::move(boxList);
 }

client/scenes/in_world.hpp

@@ -85,6 +85,8 @@ protected:
 	void HandleDisconnectResponse(ClientPacket* const);
 	void HandleDisconnectForced(ClientPacket* const);
 
+	void CheckHeartBeat();
+
 	//map management
 	void SendRegionRequest(int roomIndex, int x, int y);
 	void HandleRegionContent(RegionPacket* const);
@@ -100,6 +102,7 @@ protected:
 
 	//player movement
 	void SendLocalCharacterMotion();
+	std::list<BoundingBox> GenerateCollisionGrid(Entity*, int tileWidth, int tileHeight);
 
 	//indexes
 	int& clientIndex;

common/utilities/vector2.hpp

@@ -92,6 +92,10 @@ public:
 		return ret;
 	}
 
+	//unary operators
+	Vector2 operator-() { return {-x, -y}; }
+
+	//comparison operators
 	bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
 	bool operator!=(Vector2 v) { return (x != v.x || y != v.y); }
 

todo.txt

@@ -1,31 +0,0 @@
-TODO: Account system needs salts & hashes for security
-TODO: Character system might need an API
-TODO: Door system needs an API
-TODO: monster system needs an API
-
-TODO: rewrite the main body of the server
-TODO: I need a better way to handle the statistics
-TODO: Fix shoddy movement
-TODO: Handle statistics server-side
-TODO: Periodic mass server saves
-TODO: join vs login
-
-TODO: Remove the big "Shut Down" button
-TODO: Make a way for the server owner to control the server directly
-TODO: The TileSheet class should implement the surface itself
-TODO: Passwords/Authentication
-TODO: Time delay for requesting region packets
-TODO: A proper logging system
-
--------------------------
-
-The entities might need an API, which interfaces with all entity types (characters, monsters, doors, etc.)
-The Entity base class handles position (including room) and motion, so something generic like this could be used (or aliased by other APIs)
-
-entity:
-	
--------------------------
-
-Lobby:
-	JOIN_REQUEST -> JOIN_RESPONSE, JOIN_REJECTION
-	LOGIN_REQUEST -> LOGIN_RESPONSE, LOGIN_REJECTION