Cleanup

src/device/device.cpp

@@ -702,8 +702,8 @@ void Device::render(World& world, CameraInstance camera)
 	bgfx::touch(1);
 	bgfx::touch(2);
 
-	world.set_camera_aspect(camera, (float)_width/(float)_height);
-	world.set_camera_viewport_metrics(camera, 0, 0, _width, _height);
+	world.camera_set_aspect(camera, (float)_width/(float)_height);
+	world.camera_set_viewport_metrics(camera, 0, 0, _width, _height);
 
 	world.render(camera);
 }

src/lua/lua_api.cpp

@@ -1332,7 +1332,7 @@ static int camera_set_projection_type(lua_State* L)
 	const ProjectionType::Enum pt = name_to_projection_type(name);
 	LUA_ASSERT(pt != ProjectionType::COUNT, stack, "Unknown projection type: '%s'", name);
 
-	stack.get_world(1)->set_camera_projection_type(stack.get_camera(2), pt);
+	stack.get_world(1)->camera_set_projection_type(stack.get_camera(2), pt);
 	return 0;
 }
 
@@ -1354,7 +1354,7 @@ static int camera_fov(lua_State* L)
 static int camera_set_fov(lua_State* L)
 {
 	LuaStack stack(L);
-	stack.get_world(1)->set_camera_fov(stack.get_camera(2), stack.get_float(3));
+	stack.get_world(1)->camera_set_fov(stack.get_camera(2), stack.get_float(3));
 	return 0;
 }
 
@@ -1368,7 +1368,7 @@ static int camera_near_clip_distance(lua_State* L)
 static int camera_set_near_clip_distance(lua_State* L)
 {
 	LuaStack stack(L);
-	stack.get_world(1)->set_camera_near_clip_distance(stack.get_camera(2), stack.get_float(3));
+	stack.get_world(1)->camera_set_near_clip_distance(stack.get_camera(2), stack.get_float(3));
 	return 0;
 }
 
@@ -1382,14 +1382,14 @@ static int camera_far_clip_distance(lua_State* L)
 static int camera_set_far_clip_distance(lua_State* L)
 {
 	LuaStack stack(L);
-	stack.get_world(1)->set_camera_far_clip_distance(stack.get_camera(2), stack.get_float(3));
+	stack.get_world(1)->camera_set_far_clip_distance(stack.get_camera(2), stack.get_float(3));
 	return 0;
 }
 
 static int camera_set_orthographic_metrics(lua_State* L)
 {
 	LuaStack stack(L);
-	stack.get_world(1)->set_camera_orthographic_metrics(stack.get_camera(2), stack.get_float(3), stack.get_float(4),
+	stack.get_world(1)->camera_set_orthographic_metrics(stack.get_camera(2), stack.get_float(3), stack.get_float(4),
 		stack.get_float(5), stack.get_float(6));
 	return 0;
 }
@@ -3198,15 +3198,15 @@ void load_api(LuaEnvironment& env)
 	env.add_module_function("World", "num_units",                       world_num_units);
 	env.add_module_function("World", "units",                           world_units);
 	env.add_module_function("World", "camera",                          world_camera);
-	env.add_module_function("World", "set_camera_projection_type",      camera_set_projection_type);
+	env.add_module_function("World", "camera_set_projection_type",      camera_set_projection_type);
 	env.add_module_function("World", "camera_projection_type",          camera_projection_type);
 	env.add_module_function("World", "camera_fov",                      camera_fov);
-	env.add_module_function("World", "set_camera_fov",                  camera_set_fov);
+	env.add_module_function("World", "camera_set_fov",                  camera_set_fov);
 	env.add_module_function("World", "camera_near_clip_distance",       camera_near_clip_distance);
-	env.add_module_function("World", "set_camera_near_clip_distance",   camera_set_near_clip_distance);
+	env.add_module_function("World", "camera_set_near_clip_distance",   camera_set_near_clip_distance);
 	env.add_module_function("World", "camera_far_clip_distance",        camera_far_clip_distance);
-	env.add_module_function("World", "set_camera_far_clip_distance",    camera_set_far_clip_distance);
-	env.add_module_function("World", "set_camera_orthographic_metrics", camera_set_orthographic_metrics);
+	env.add_module_function("World", "camera_set_far_clip_distance",    camera_set_far_clip_distance);
+	env.add_module_function("World", "camera_set_orthographic_metrics", camera_set_orthographic_metrics);
 	env.add_module_function("World", "camera_screen_to_world",          camera_screen_to_world);
 	env.add_module_function("World", "camera_world_to_screen",          camera_world_to_screen);
 	env.add_module_function("World", "update_animations",               world_update_animations);

src/world/world.cpp

@@ -203,7 +203,7 @@ void World::render(CameraInstance i)
 	_lines->reset();
 }
 
-CameraInstance World::create_camera(UnitId id, const CameraDesc& cd)
+CameraInstance World::camera_create(UnitId id, const CameraDesc& cd)
 {
 	Camera camera;
 	camera.unit            = id;
@@ -219,7 +219,7 @@ CameraInstance World::create_camera(UnitId id, const CameraDesc& cd)
 	return make_camera_instance(last);
 }
 
-void World::destroy_camera(CameraInstance i)
+void World::camera_destroy(CameraInstance i)
 {
 	const u32 last = array::size(_camera) - 1;
 	const UnitId u = _camera[i.i].unit;
@@ -236,7 +236,7 @@ CameraInstance World::camera(UnitId id)
 	return make_camera_instance(hash_map::get(_camera_map, id, UINT32_MAX));
 }
 
-void World::set_camera_projection_type(CameraInstance i, ProjectionType::Enum type)
+void World::camera_set_projection_type(CameraInstance i, ProjectionType::Enum type)
 {
 	_camera[i.i].projection_type = type;
 	_camera[i.i].update_projection_matrix();
@@ -265,13 +265,13 @@ f32 World::camera_fov(CameraInstance i) const
 	return _camera[i.i].fov;
 }
 
-void World::set_camera_fov(CameraInstance i, f32 fov)
+void World::camera_set_fov(CameraInstance i, f32 fov)
 {
 	_camera[i.i].fov = fov;
 	_camera[i.i].update_projection_matrix();
 }
 
-void World::set_camera_aspect(CameraInstance i, f32 aspect)
+void World::camera_set_aspect(CameraInstance i, f32 aspect)
 {
 	_camera[i.i].aspect = aspect;
 	_camera[i.i].update_projection_matrix();
@@ -282,7 +282,7 @@ f32 World::camera_near_clip_distance(CameraInstance i) const
 	return _camera[i.i].near;
 }
 
-void World::set_camera_near_clip_distance(CameraInstance i, f32 near)
+void World::camera_set_near_clip_distance(CameraInstance i, f32 near)
 {
 	_camera[i.i].near = near;
 	_camera[i.i].update_projection_matrix();
@@ -293,13 +293,13 @@ f32 World::camera_far_clip_distance(CameraInstance i) const
 	return _camera[i.i].far;
 }
 
-void World::set_camera_far_clip_distance(CameraInstance i, f32 far)
+void World::camera_set_far_clip_distance(CameraInstance i, f32 far)
 {
 	_camera[i.i].far = far;
 	_camera[i.i].update_projection_matrix();
 }
 
-void World::set_camera_orthographic_metrics(CameraInstance i, f32 left, f32 right, f32 bottom, f32 top)
+void World::camera_set_orthographic_metrics(CameraInstance i, f32 left, f32 right, f32 bottom, f32 top)
 {
 	_camera[i.i].left = left;
 	_camera[i.i].right = right;
@@ -309,7 +309,7 @@ void World::set_camera_orthographic_metrics(CameraInstance i, f32 left, f32 righ
 	_camera[i.i].update_projection_matrix();
 }
 
-void World::set_camera_viewport_metrics(CameraInstance i, u16 x, u16 y, u16 width, u16 height)
+void World::camera_set_viewport_metrics(CameraInstance i, u16 x, u16 y, u16 width, u16 height)
 {
 	_camera[i.i].view_x = x;
 	_camera[i.i].view_y = y;
@@ -556,7 +556,7 @@ void spawn_units(World& w, const UnitResource& ur, const Vector3& pos, const Qua
 			const CameraDesc* cd = (const CameraDesc*)data;
 			for (u32 i = 0; i < component->num_instances; ++i, ++cd)
 			{
-				w.create_camera(unit_lookup[unit_index[i]], *cd);
+				w.camera_create(unit_lookup[unit_index[i]], *cd);
 			}
 		}
 		else if (component->type == COMPONENT_TYPE_COLLIDER)

src/world/world.h

@@ -92,16 +92,16 @@ public:
 	void units(Array<UnitId>& units) const;
 
 	/// Creates a new camera.
-	CameraInstance create_camera(UnitId id, const CameraDesc& cd);
+	CameraInstance camera_create(UnitId id, const CameraDesc& cd);
 
 	/// Destroys the camera @a id.
-	void destroy_camera(CameraInstance i);
+	void camera_destroy(CameraInstance i);
 
 	/// Returns the camera owned by unit @a id.
 	CameraInstance camera(UnitId id);
 
 	/// Sets the projection type of the camera.
-	void set_camera_projection_type(CameraInstance i, ProjectionType::Enum type);
+	void camera_set_projection_type(CameraInstance i, ProjectionType::Enum type);
 
 	/// Returns the projection type of the camera.
 	ProjectionType::Enum camera_projection_type(CameraInstance i) const;
@@ -116,28 +116,28 @@ public:
 	f32 camera_fov(CameraInstance i) const;
 
 	/// Sets the field-of-view of the camera in degrees.
-	void set_camera_fov(CameraInstance i, f32 fov);
+	void camera_set_fov(CameraInstance i, f32 fov);
 
 	/// Sets the aspect ratio of the camera. (Perspective projection only.)
-	void set_camera_aspect(CameraInstance i, f32 aspect);
+	void camera_set_aspect(CameraInstance i, f32 aspect);
 
 	/// Returns the near clip distance of the camera.
 	f32 camera_near_clip_distance(CameraInstance i) const;
 
 	/// Sets the near clip distance of the camera.
-	void set_camera_near_clip_distance(CameraInstance i, f32 near);
+	void camera_set_near_clip_distance(CameraInstance i, f32 near);
 
 	/// Returns the far clip distance of the camera.
 	f32 camera_far_clip_distance(CameraInstance i) const;
 
 	/// Sets the far clip distance of the camera.
-	void set_camera_far_clip_distance(CameraInstance i, f32 far);
+	void camera_set_far_clip_distance(CameraInstance i, f32 far);
 
 	/// Sets the coordinates for orthographic clipping planes. (Orthographic projection only.)
-	void set_camera_orthographic_metrics(CameraInstance i, f32 left, f32 right, f32 bottom, f32 top);
+	void camera_set_orthographic_metrics(CameraInstance i, f32 left, f32 right, f32 bottom, f32 top);
 
 	/// Sets the coordinates for the camera viewport in pixels.
-	void set_camera_viewport_metrics(CameraInstance i, u16 x, u16 y, u16 width, u16 height);
+	void camera_set_viewport_metrics(CameraInstance i, u16 x, u16 y, u16 width, u16 height);
 
 	/// Returns @a pos from screen-space to world-space coordinates.
 	Vector3 camera_screen_to_world(CameraInstance i, const Vector3& pos);