Cleanup

engine/core/json/json_parser.h

@@ -120,7 +120,7 @@ public:
 	/// @note Matrix4x4 = [x, x, x, x, y, y, y, y, z, z, z, z, t, t, t, t]
 	Matrix4x4 to_matrix4x4(const Matrix4x4& def = matrix4x4::IDENTITY) const;
 
-	/// Returns the string id value hashed to murmur2_32() of the element.
+	/// Returns the string id value hashed to murmur32() of the element.
 	StringId32 to_string_id(const StringId32 def = 0) const;
 
 	/// Returns the resource id value of the element.

engine/core/murmur.cpp

@@ -20,7 +20,7 @@ namespace crown
 /// 1. It will not work incrementally.
 /// 2. It will not produce the same results on little-endian and big-endian
 ///    machines.
-uint32_t murmur2_32(const void* key, size_t len, uint32_t seed)
+uint32_t murmur32(const void* key, size_t len, uint32_t seed)
 {
 	// 'm' and 'r' are mixing constants generated offline.
 	// They're not really 'magic', they just happen to work well.
@@ -66,7 +66,7 @@ uint32_t murmur2_32(const void* key, size_t len, uint32_t seed)
 	return h;
 }
 
-uint64_t murmur2_64(const void* key, int len, uint64_t seed)
+uint64_t murmur64(const void* key, int len, uint64_t seed)
 {
 	const uint64_t m = 0xc6a4a7935bd1e995ull;
 	const int r = 47;

engine/core/murmur.h

@@ -9,6 +9,6 @@
 
 namespace crown
 {
-uint32_t murmur2_32(const void* key, size_t len, uint32_t seed = 0);
-uint64_t murmur2_64(const void* key, int len, uint64_t seed = 0);
+uint32_t murmur32(const void* key, size_t len, uint32_t seed = 0);
+uint64_t murmur64(const void* key, int len, uint64_t seed = 0);
 } // namespace crown

engine/core/strings/dynamic_string.h

@@ -58,7 +58,7 @@ public:
 	/// Returns wheterh the string ends with the given @a s string.
 	bool ends_with(const char* s) const;
 
-	/// Returns the string hashed to murmur2_32.
+	/// Returns the string hashed to murmur32.
 	StringId32 to_string_id() const;
 
 	///
@@ -203,7 +203,7 @@ inline bool DynamicString::ends_with(const char* s) const
 
 inline StringId32 DynamicString::to_string_id() const
 {
-	return murmur2_32(c_str(), length());
+	return murmur32(c_str(), length());
 }
 
 inline const char* DynamicString::c_str() const

engine/physics/actor.cpp

@@ -311,7 +311,7 @@ void Actor::disable_collision()
 
 void Actor::set_collision_filter(const char* name)
 {
-	set_collision_filter(murmur2_32(name, strlen(name)));
+	set_collision_filter(murmur32(name, strlen(name)));
 }
 
 void Actor::set_collision_filter(StringId32 filter)

engine/resource/resource_id.h

@@ -21,8 +21,8 @@ struct ResourceId
 	}
 
 	ResourceId(const char* type, const char* name)
-		: type(murmur2_64(type, strlen(type), SEED))
-		, name(murmur2_64(name, strlen(name), SEED))
+		: type(murmur64(type, strlen(type), SEED))
+		, name(murmur64(name, strlen(name), SEED))
 	{
 	}
 

engine/resource/unit_resource.cpp

@@ -130,14 +130,14 @@ namespace unit_resource
 			JSONElement node = e.key(node_name);
 
 			GraphNode gn;
-			gn.name = murmur2_32(node_name, strlen(node_name));
+			gn.name = murmur32(node_name, strlen(node_name));
 			gn.parent = NO_PARENT;
 
 			if (!node.key("parent").is_nil())
 			{
 				DynamicString parent_name;
 				node.key("parent").to_string(parent_name);
-				gn.parent = murmur2_32(parent_name.c_str(), parent_name.length(), 0);
+				gn.parent = murmur32(parent_name.c_str(), parent_name.length(), 0);
 			}
 
 			JSONElement pos = node.key("position");
@@ -172,10 +172,10 @@ namespace unit_resource
 			DynamicString camera_type;
 			type.to_string(camera_type);
 
-			StringId32 node_name_hash = murmur2_32(node_name.c_str(), node_name.length());
+			StringId32 node_name_hash = murmur32(node_name.c_str(), node_name.length());
 
 			UnitCamera cn;
-			cn.name = murmur2_32(camera_name, strlen(camera_name));
+			cn.name = murmur32(camera_name, strlen(camera_name));
 			cn.node = find_node_index(node_name_hash, node_depths);
 			cn.type = projection_name_to_enum(camera_type.c_str());
 			cn.fov =  camera.key_or_nil("fov").to_float(16.0f / 9.0f);
@@ -197,10 +197,10 @@ namespace unit_resource
 			JSONElement renderable = e.key(renderable_name);
 
 			DynamicString node_name; renderable.key("node").to_string(node_name);
-			StringId32 node_name_hash = murmur2_32(node_name.c_str(), node_name.length(), 0);
+			StringId32 node_name_hash = murmur32(node_name.c_str(), node_name.length(), 0);
 
 			UnitRenderable rn;
-			rn.name = murmur2_32(renderable_name, strlen(renderable_name), 0);
+			rn.name = murmur32(renderable_name, strlen(renderable_name), 0);
 			rn.node = find_node_index(node_name_hash, node_depths);
 			rn.visible = renderable.key("visible").to_bool();
 
@@ -237,7 +237,7 @@ namespace unit_resource
 			JSONElement value = e.key(key);
 
 			Key out_key;
-			out_key.name = murmur2_32(key, strlen(key));
+			out_key.name = murmur32(key, strlen(key));
 			out_key.offset = array::size(values);
 
 			if (value.is_bool()) out_key.type = ValueType::BOOL;
@@ -266,7 +266,7 @@ namespace unit_resource
 				{
 					DynamicString val;
 					value.to_string(val);
-					StringId32 val_hash = murmur2_32(val.c_str(), val.length());
+					StringId32 val_hash = murmur32(val.c_str(), val.length());
 					array::push(values, (char*) &val_hash, sizeof(StringId32));
 					break;
 				}
@@ -543,7 +543,7 @@ namespace unit_resource
 
 		for (uint32_t i = 0; i < nk; i++)
 		{
-			if (begin[i].name == murmur2_32(k, strlen(k)))
+			if (begin[i].name == murmur32(k, strlen(k)))
 			{
 				return true;
 			}
@@ -559,7 +559,7 @@ namespace unit_resource
 
 		for (uint32_t i = 0; i < nk; i++)
 		{
-			if (begin[i].name == murmur2_32(k, strlen(k)))
+			if (begin[i].name == murmur32(k, strlen(k)))
 			{
 				out_k = begin[i];
 				return true;

engine/world/scene_graph.cpp

@@ -74,7 +74,7 @@ void SceneGraph::destroy()
 
 int32_t SceneGraph::node(const char* name) const
 {
-	return node(murmur2_32(name, strlen(name)));
+	return node(murmur32(name, strlen(name)));
 }
 
 int32_t SceneGraph::node(StringId32 name) const
@@ -93,7 +93,7 @@ int32_t SceneGraph::node(StringId32 name) const
 
 bool SceneGraph::has_node(const char* name) const
 {
-	StringId32 name_hash = murmur2_32(name, strlen(name), 0);
+	StringId32 name_hash = murmur32(name, strlen(name), 0);
 
 	for (uint32_t i = 0; i < m_num_nodes; i++)
 	{

engine/world/unit.cpp

@@ -144,7 +144,7 @@ void Unit::create_renderable_objects()
 	for (uint32_t i = 0; i < num_materials(m_resource); i++)
 	{
 		const UnitMaterial* mat = get_material(m_resource, i);
-		add_material(murmur2_32("default", strlen("default"), 0), material_manager::get()->create_material(mat->id));
+		add_material(murmur32("default", strlen("default"), 0), material_manager::get()->create_material(mat->id));
 	}
 
 	// Create renderables
@@ -315,7 +315,7 @@ void Unit::add_component(StringId32 name, Id component, uint32_t& size, Componen
 
 Id Unit::find_component(const char* name, uint32_t size, Component* array)
 {
-	const uint32_t name_hash = murmur2_32(name, strlen(name), 0);
+	const uint32_t name_hash = murmur32(name, strlen(name), 0);
 	return find_component_by_name(name_hash, size, array);
 }
 
@@ -477,7 +477,7 @@ bool Unit::is_a(const char* name)
 void Unit::play_sprite_animation(const char* name, bool loop)
 {
 	if (m_sprite_animation)
-		m_sprite_animation->play(murmur2_32(name, strlen(name), 0), loop);
+		m_sprite_animation->play(murmur32(name, strlen(name), 0), loop);
 }
 
 void Unit::stop_sprite_animation()
@@ -557,7 +557,7 @@ void Unit::set_key(const char* k, const char* v)
 	using namespace unit_resource;
 	Key key;
 	unit_resource::get_key(m_resource, k, key);
-	*(StringId32*)(m_values + key.offset) = murmur2_32(v, strlen(v));
+	*(StringId32*)(m_values + key.offset) = murmur32(v, strlen(v));
 }
 
 void Unit::set_key(const char* k, const Vector3& v)