Cleanup

src/device/device.cpp

@@ -701,6 +701,7 @@ 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.render(camera);

src/lua/lua_api.cpp

@@ -1351,20 +1351,6 @@ static int camera_set_fov(lua_State* L)
 	return 0;
 }
 
-static int camera_aspect(lua_State* L)
-{
-	LuaStack stack(L);
-	stack.push_float(stack.get_world(1)->camera_aspect(stack.get_camera(2)));
-	return 1;
-}
-
-static int camera_set_aspect(lua_State* L)
-{
-	LuaStack stack(L);
-	stack.get_world(1)->set_camera_aspect(stack.get_camera(2), stack.get_float(3));
-	return 0;
-}
-
 static int camera_near_clip_distance(lua_State* L)
 {
 	LuaStack stack(L);
@@ -3201,8 +3187,6 @@ void load_api(LuaEnvironment& env)
 	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_aspect",                   camera_aspect);
-	env.add_module_function("World", "set_camera_aspect",               camera_set_aspect);
 	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_far_clip_distance",        camera_far_clip_distance);

src/world/world.cpp

@@ -271,11 +271,6 @@ void World::set_camera_fov(CameraInstance i, f32 fov)
 	_camera[i.i].update_projection_matrix();
 }
 
-f32 World::camera_aspect(CameraInstance i) const
-{
-	return _camera[i.i].aspect;
-}
-
 void World::set_camera_aspect(CameraInstance i, f32 aspect)
 {
 	_camera[i.i].aspect = aspect;

src/world/world.h

@@ -118,9 +118,6 @@ public:
 	/// Sets the field-of-view of the camera in degrees.
 	void set_camera_fov(CameraInstance i, f32 fov);
 
-	/// Returns the aspect ratio of the camera. (Perspective projection only.)
-	f32 camera_aspect(CameraInstance i) const;
-
 	/// Sets the aspect ratio of the camera. (Perspective projection only.)
 	void set_camera_aspect(CameraInstance i, f32 aspect);