Replaced usage of std::map with std::unordered_map in Entity, EntityO…

…bject classes and the Utility source files.

res/runtime/data/worlds/random.world

@@ -69,7 +69,7 @@ object10.rot: [0.3, 18.9416, 0]
 object10.scale: [0.05, 0.05, 0.05]
 object11.mesh: sphere
 object11.texture: lava
-object11.normalmap: default_normalmap
+object11.normalmap: lava_normalmap
 object11.pos: [86.4294, 32.143, 49.7597]
 object11.rot: [3.85, 22.4415, 0]
 object11.scale: [44, 44, 44]

res/runtime/resources.data

@@ -72,4 +72,9 @@ speed: 2.5
 
 
 
-played: 117065
+
+
+
+
+
+played: 117303

src/entity.cpp

@@ -1,6 +1,6 @@
 #include "entity.hpp"
 
-Entity::Entity(float mass, Vector3F position, Vector3F velocity, std::map<std::string, Force> forces): mass(mass), position(position), velocity(velocity), forces(forces){}
+Entity::Entity(float mass, Vector3F position, Vector3F velocity, std::unordered_map<std::string, Force> forces): mass(mass), position(position), velocity(velocity), forces(forces){}
 
 void Entity::setPosition(Vector3F position)
 {
@@ -49,7 +49,7 @@ Vector3F Entity::getAcceleration() const
 	return Vector3F(resultant.getSize() / this->mass);
 }
 
-std::map<std::string, Force> Entity::getForces() const
+std::unordered_map<std::string, Force> Entity::getForces() const
 {
 	return this->forces;
 }

src/entity.hpp

@@ -6,7 +6,7 @@
 class Entity
 {
 public:
-	Entity(float mass = 1.0f, Vector3F position = Vector3F(), Vector3F velocity = Vector3F(), std::map<std::string, Force> forces = std::map<std::string, Force>());
+	Entity(float mass = 1.0f, Vector3F position = Vector3F(), Vector3F velocity = Vector3F(), std::unordered_map<std::string, Force> forces = std::unordered_map<std::string, Force>());
 	virtual void setPosition(Vector3F position);
 	void setVelocity(Vector3F velocity);
 	void applyForce(std::string forceName, Force f);
@@ -15,12 +15,12 @@ class Entity
 	float getMass() const;
 	Vector3F getVelocity() const;
 	Vector3F getAcceleration() const;
-	std::map<std::string, Force> getForces() const;
+	std::unordered_map<std::string, Force> getForces() const;
 	virtual void updateMotion(unsigned int fps);
 protected:
 	float mass;
 	Vector3F velocity;
-	std::map<std::string, Force> forces;
+	std::unordered_map<std::string, Force> forces;
 private:
 	Vector3F position;
 	//Position is private because a child (Player) will not need an instance of position. getters and setters should mean that other children keep this instance of position.

src/entityobject.cpp

@@ -1,6 +1,6 @@
 #include "entityobject.hpp"
 
-EntityObject::EntityObject(std::string meshLink, std::string textureLink, std::string normalMapLink, float mass, Vector3F position, Vector3F rotation, Vector3F scale, Vector3F velocity, std::map<std::string, Force> forces): Entity(mass, position, velocity, forces), Object(meshLink, textureLink, normalMapLink, position, rotation, scale){}
+EntityObject::EntityObject(std::string meshLink, std::string textureLink, std::string normalMapLink, float mass, Vector3F position, Vector3F rotation, Vector3F scale, Vector3F velocity, std::unordered_map<std::string, Force> forces): Entity(mass, position, velocity, forces), Object(meshLink, textureLink, normalMapLink, position, rotation, scale){}
 
 void EntityObject::setPosition(Vector3F pos)
 {

src/entityobject.hpp

@@ -6,7 +6,7 @@
 class EntityObject: public Entity, public Object
 {
 public:
-	EntityObject(std::string meshLink, std::string textureLink, std::string normalMapLink, float mass = 1.0f, Vector3F position = Vector3F(), Vector3F rotation = Vector3F(), Vector3F scale = Vector3F(1, 1, 1), Vector3F velocity = Vector3F(), std::map<std::string, Force> forces = std::map<std::string, Force>());
+	EntityObject(std::string meshLink, std::string textureLink, std::string normalMapLink, float mass = 1.0f, Vector3F position = Vector3F(), Vector3F rotation = Vector3F(), Vector3F scale = Vector3F(1, 1, 1), Vector3F velocity = Vector3F(), std::unordered_map<std::string, Force> forces = std::unordered_map<std::string, Force>());
 	void setPosition(Vector3F position);
 	Vector3F getPosition() const;
 	void updateMotion(unsigned int fps);

src/utility.cpp

@@ -75,7 +75,7 @@ std::vector<std::string> StringUtility::splitString(std::string split, char deli
 	const char* str = split.c_str();
 	std::vector<std::string> ret;
 	unsigned int numcount = 0;
-	std::map<unsigned int, unsigned int> num_pos;
+	std::unordered_map<unsigned int, unsigned int> num_pos;
 	for(unsigned int i = 0; i < strsize; i++)
 	{
 		char cur = str[i];

src/utility.hpp

@@ -7,7 +7,7 @@
 #include <fstream>
 #include <vector>
 #include <algorithm>
-#include <map>
+#include <unordered_map>
 #include "vector.hpp"
 
 namespace StringUtility