Remove bad stuff

engine/lua/lua_unit.cpp

@@ -180,75 +180,6 @@ static int unit_stop_sprite_animation(lua_State* L)
 	return 0;
 }
 
-static int unit_has_key(lua_State* L)
-{
-	LuaStack stack(L);
-	stack.push_bool(stack.get_unit(1)->has_key(stack.get_string(2)));
-	return 1;
-}
-
-static int unit_get_key(lua_State* L)
-{
-	LuaStack stack(L);
-
-	Unit* unit = stack.get_unit(1);
-	const char* key = stack.get_string(2);
-
-	switch (unit->value_type(key))
-	{
-		case ValueType::BOOL:
-		{
-			bool val;
-			unit->get_key(key, val);
-			stack.push_bool(val);
-			return 1;
-		}
-		case ValueType::FLOAT:
-		{
-			float val;
-			unit->get_key(key, val);
-			stack.push_float(val);
-			return 1;
-		}
-		case ValueType::STRING:
-		{
-			StringId32 val;
-			unit->get_key(key, val);
-			stack.push_string_id(val);
-			return 1;
-		}
-		case ValueType::VECTOR3:
-		{
-			Vector3 val;
-			unit->get_key(key, val);
-			stack.push_vector3(val);
-			return 1;
-		}
-		default: CE_FATAL("Unknown value type"); break;
-	}
-
-	return 0;
-}
-
-static int unit_set_key(lua_State* L)
-{
-	LuaStack stack(L);
-
-	Unit* unit = stack.get_unit(1);
-	const char* key = stack.get_string(2);
-
-	switch (stack.value_type(3))
-	{
-		case LUA_TBOOLEAN: unit->set_key(key, stack.get_bool(3)); break;
-		case LUA_TNUMBER: unit->set_key(key, stack.get_float(3)); break;
-		case LUA_TSTRING: unit->set_key(key, stack.get_string(3)); break;
-		case LUA_TLIGHTUSERDATA: unit->set_key(key, stack.get_vector3(3)); break;
-		default: CE_FATAL("Unsupported value type"); break; // FIXME use LUA_ASSERT
-	}
-
-	return 0;
-}
-
 void load_unit(LuaEnvironment& env)
 {
 	env.load_module_function("Unit", "local_position",        unit_local_position);
@@ -270,9 +201,6 @@ void load_unit(LuaEnvironment& env)
 	env.load_module_function("Unit", "is_a",                  unit_is_a);
 	env.load_module_function("Unit", "play_sprite_animation", unit_play_sprite_animation);
 	env.load_module_function("Unit", "stop_sprite_animation", unit_stop_sprite_animation);
-	env.load_module_function("Unit", "has_key",               unit_has_key);
-	env.load_module_function("Unit", "get_key",               unit_get_key);
-	env.load_module_function("Unit", "set_key",               unit_set_key);
 }
 
 } // namespace crown

engine/resource/unit_resource.cpp

@@ -313,7 +313,6 @@ namespace unit_resource
 		Array<UnitCamera>		m_cameras(default_allocator());
 		Array<UnitRenderable>	m_renderables(default_allocator());
 		Array<Key>				m_keys(default_allocator());
-		Array<char>				m_values(default_allocator());
 		Array<UnitMaterial>		m_materials(default_allocator());
 
 		// Check for nodes
@@ -328,7 +327,6 @@ namespace unit_resource
 
 		if (root.has_key("renderables")) parse_renderables(root.key("renderables"), m_renderables, m_node_depths);
 		if (root.has_key("cameras")) parse_cameras(root.key("cameras"), m_cameras, m_node_depths);
-		if (root.has_key("keys")) parse_keys(root.key("keys"), m_keys, m_values);
 		if (root.has_key("materials")) parse_materials(root.key("materials"), m_materials);
 
 		// Check if the unit has a .physics resource
@@ -358,16 +356,12 @@ namespace unit_resource
 		ur.num_materials = array::size(m_materials);
 		ur.num_cameras = array::size(m_cameras);
 		ur.num_scene_graph_nodes = array::size(m_nodes);
-		ur.num_keys = array::size(m_keys);
-		ur.values_size = array::size(m_values);
 
 		uint32_t offt = sizeof(UnitResource);
 		ur.renderables_offset         = offt; offt += sizeof(UnitRenderable) * ur.num_renderables;
 		ur.materials_offset           = offt; offt += sizeof(UnitMaterial) * ur.num_materials;
 		ur.cameras_offset             = offt; offt += sizeof(UnitCamera) * ur.num_cameras;
-		ur.scene_graph_nodes_offset   = offt; offt += sizeof(UnitNode) * ur.num_scene_graph_nodes;
-		ur.keys_offset                = offt; offt += sizeof(Key) * ur.num_keys;
-		ur.values_offset              = offt;
+		ur.scene_graph_nodes_offset   = offt;
 
 		opts.write(ur.version);
 		opts.write(ur._pad);
@@ -382,10 +376,6 @@ namespace unit_resource
 		opts.write(ur.cameras_offset);
 		opts.write(ur.num_scene_graph_nodes);
 		opts.write(ur.scene_graph_nodes_offset);
-		opts.write(ur.num_keys);
-		opts.write(ur.keys_offset);
-		opts.write(ur.values_size);
-		opts.write(ur.values_offset);
 
 		// Renderables
 		for (uint32_t i = 0; i < array::size(m_renderables); i++)
@@ -444,11 +434,6 @@ namespace unit_resource
 			opts.write(m_keys[i].type);
 			opts.write(m_keys[i].offset);
 		}
-
-		for (uint32_t i = 0; i < array::size(m_values); i++)
-		{
-			opts.write(m_values[i]);
-		}
 	}
 
 	void* load(File& file, Allocator& a)
@@ -530,55 +515,5 @@ namespace unit_resource
 	{
 		return (UnitNode*) ((char*)ur + ur->scene_graph_nodes_offset);
 	}
-
-	uint32_t num_keys(const UnitResource* ur)
-	{
-		return ur->num_keys;
-	}
-
-	bool has_key(const UnitResource* ur, const char* k)
-	{
-		const uint32_t nk = num_keys(ur);
-		const StringId32 key_hash(k);
-		Key* begin = (Key*) ((char*)ur + ur->keys_offset);
-
-		for (uint32_t i = 0; i < nk; i++)
-		{
-			if (begin[i].name == key_hash)
-			{
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	bool get_key(const UnitResource* ur, const char* k, Key& out_k)
-	{
-		const uint32_t nk = num_keys(ur);
-		const StringId32 key_hash(k);
-		Key* begin = (Key*) ((char*)ur + ur->keys_offset);
-
-		for (uint32_t i = 0; i < nk; i++)
-		{
-			if (begin[i].name == key_hash)
-			{
-				out_k = begin[i];
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	uint32_t values_size(const UnitResource* ur)
-	{
-		return ur->values_size;
-	}
-
-	const char* values(const UnitResource* ur)
-	{
-		return ((char*)ur + ur->values_offset);
-	}
 } // namespace unit_resource
 } // namespace crown

engine/resource/unit_resource.h

@@ -30,10 +30,6 @@ struct UnitResource
 	uint32_t cameras_offset;
 	uint32_t num_scene_graph_nodes;
 	uint32_t scene_graph_nodes_offset;
-	uint32_t num_keys;
-	uint32_t keys_offset;
-	uint32_t values_size;
-	uint32_t values_offset;
 };
 
 struct UnitRenderable
@@ -107,10 +103,5 @@ namespace unit_resource
 	const UnitCamera* get_camera(const UnitResource* ur, uint32_t i);
 	uint32_t num_scene_graph_nodes(const UnitResource* ur);
 	const UnitNode* scene_graph_nodes(const UnitResource* ur);
-	uint32_t num_keys(const UnitResource* ur);
-	bool has_key(const UnitResource* ur, const char* k);
-	bool get_key(const UnitResource* ur, const char* k, Key& out_k);
-	uint32_t values_size(const UnitResource* ur);
-	const char* values(const UnitResource* ur);
 } // namespace unit_resource
 } // namespace crown

engine/world/unit.cpp

@@ -31,7 +31,6 @@ Unit::Unit(World& w, UnitId unit_id, const UnitResource* ur, SceneGraph& sg, con
 	, m_num_sprites(0)
 	, m_num_actors(0)
 	, m_num_materials(0)
-	, m_values(NULL)
 {
 	m_controller.component.id = INVALID_ID;
 	create_objects(pose);
@@ -68,9 +67,6 @@ void Unit::create_objects(const Matrix4x4& pose)
 
 	set_default_material();
 
-	m_values = (char*) default_allocator().allocate(values_size(m_resource));
-	memcpy(m_values, values(m_resource), values_size(m_resource));
-
 	StringId64 anim_id = sprite_animation(m_resource);
 	if (anim_id.id() != 0)
 	{
@@ -85,8 +81,6 @@ void Unit::destroy_objects()
 		m_world.sprite_animation_player()->destroy_sprite_animation(m_sprite_animation);
 	}
 
-	default_allocator().deallocate(m_values);
-
 	// Destroy cameras
 	for (uint32_t i = 0; i < m_num_cameras; i++)
 	{
@@ -476,86 +470,4 @@ void Unit::stop_sprite_animation()
 		m_sprite_animation->stop();
 }
 
-bool Unit::has_key(const char* k) const
-{
-	using namespace unit_resource;
-	return unit_resource::has_key(m_resource, k);
-}
-
-ValueType::Enum Unit::value_type(const char* k)
-{
-	using namespace unit_resource;
-	Key key;
-	unit_resource::get_key(m_resource, k, key);
-	return (ValueType::Enum) key.type;
-}
-
-bool Unit::get_key(const char* k, bool& v) const
-{
-	using namespace unit_resource;
-	Key key;
-	bool has = unit_resource::get_key(m_resource, k, key);
-	v = *(uint32_t*)(m_values + key.offset);
-	return has;
-}
-
-bool Unit::get_key(const char* k, float& v) const
-{
-	using namespace unit_resource;
-	Key key;
-	bool has = unit_resource::get_key(m_resource, k, key);
-	v = *(float*)(m_values + key.offset);
-	return has;
-}
-
-bool Unit::get_key(const char* k, StringId32& v) const
-{
-	using namespace unit_resource;
-	Key key;
-	bool has = unit_resource::get_key(m_resource, k, key);
-	v = *(StringId32*)(m_values + key.offset);
-	return has;
-}
-
-bool Unit::get_key(const char* k, Vector3& v) const
-{
-	using namespace unit_resource;
-	Key key;
-	bool has = unit_resource::get_key(m_resource, k, key);
-	v = *(Vector3*)(m_values + key.offset);
-	return has;
-}
-
-void Unit::set_key(const char* k, bool v)
-{
-	using namespace unit_resource;
-	Key key;
-	unit_resource::get_key(m_resource, k, key);
-	*(uint32_t*)(m_values + key.offset) = v;
-}
-
-void Unit::set_key(const char* k, float v)
-{
-	using namespace unit_resource;
-	Key key;
-	unit_resource::get_key(m_resource, k, key);
-	*(float*)(m_values + key.offset) = v;
-}
-
-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) = StringId32(v);
-}
-
-void Unit::set_key(const char* k, const Vector3& v)
-{
-	using namespace unit_resource;
-	Key key;
-	unit_resource::get_key(m_resource, k, key);
-	*(Vector3*)(m_values + key.offset) = v;
-}
-
 } // namespace crown

engine/world/unit.h

@@ -131,17 +131,6 @@ struct Unit
 	void play_sprite_animation(const char* name, bool loop);
 	void stop_sprite_animation();
 
-	bool has_key(const char* k) const;
-	ValueType::Enum value_type(const char* k);
-	bool get_key(const char* k, bool& v) const;
-	bool get_key(const char* k, float& v) const;
-	bool get_key(const char* k, StringId32& v) const;
-	bool get_key(const char* k, Vector3& v) const;
-	void set_key(const char* k, bool v);
-	void set_key(const char* k, float v);
-	void set_key(const char* k, const char* v);
-	void set_key(const char* k, const Vector3& v);
-
 private:
 
 	void create_objects(const Matrix4x4& pose);
@@ -172,8 +161,6 @@ public:
 	Component m_materials[CE_MAX_MATERIAL_COMPONENTS];
 
 	Component m_controller;
-
-	char* m_values;
 };
 
 } // namespace crown