Remove boilerplate methods

src/device/console_api.cpp

@@ -24,7 +24,7 @@ static void console_command_script(ConsoleServer& /*cs*/, TCPSocket /*client*/,
 	sjson::parse(json, obj);
 	sjson::parse_string(obj["script"], script);
 
-	device()->lua_environment()->execute_string(script.c_str());
+	device()->_lua_environment->execute_string(script.c_str());
 }
 
 static void console_command_reload(ConsoleServer& /*cs*/, TCPSocket /*client*/, const char* json)
@@ -74,7 +74,7 @@ static void console_command_compile(ConsoleServer& cs, TCPSocket client, const c
 	}
 
 	logi("Compiling '%s'", id.c_str());
-	bool succ = device()->data_compiler()->compile(data_dir.c_str(), platform.c_str());
+	bool succ = device()->_data_compiler->compile(data_dir.c_str(), platform.c_str());
 
 	if (succ)
 		logi("Compiled '%s'", id.c_str());

src/device/device.cpp

@@ -713,56 +713,6 @@ void Device::log(const char* msg, LogSeverity::Enum severity)
 	}
 }
 
-ConsoleServer* Device::console_server()
-{
-	return _console_server;
-}
-
-DataCompiler* Device::data_compiler()
-{
-	return _data_compiler;
-}
-
-ResourceManager* Device::resource_manager()
-{
-	return _resource_manager;
-}
-
-LuaEnvironment* Device::lua_environment()
-{
-	return _lua_environment;
-}
-
-InputManager* Device::input_manager()
-{
-	return _input_manager;
-}
-
-ShaderManager* Device::shader_manager()
-{
-	return _shader_manager;
-}
-
-MaterialManager* Device::material_manager()
-{
-	return _material_manager;
-}
-
-UnitManager* Device::unit_manager()
-{
-	return _unit_manager;
-}
-
-Display* Device::display()
-{
-	return _display;
-}
-
-Window* Device::window()
-{
-	return _window;
-}
-
 char _buffer[sizeof(Device)];
 Device* _device = NULL;
 

src/device/device.h

@@ -34,7 +34,7 @@ struct BgfxCallback;
 /// the engine subsystems and related stuff.
 ///
 /// @ingroup Device
-class Device
+struct Device
 {
 	LinearAllocator _allocator;
 
@@ -136,36 +136,6 @@ public:
 	/// Logs @a msg to log file and console.
 	void log(const char* msg, LogSeverity::Enum severity);
 
-	/// Returns the console server.
-	ConsoleServer* console_server();
-
-	/// Returns the bundle compiler.
-	DataCompiler* data_compiler();
-
-	/// Returns the resource manager.
-	ResourceManager* resource_manager();
-
-	/// Returns the lua environment.
-	LuaEnvironment* lua_environment();
-
-	/// Returns the input manager.
-	InputManager* input_manager();
-
-	/// Returns the shader manager.
-	ShaderManager* shader_manager();
-
-	/// Returns the material manager.
-	MaterialManager* material_manager();
-
-	/// Returns the unit manager.
-	UnitManager* unit_manager();
-
-	/// Returns the main display.
-	Display* display();
-
-	/// Returns the main window.
-	Window* window();
-
 private:
 
 	// Disable copying

src/lua/lua_api.cpp

@@ -1177,13 +1177,13 @@ static int input_device_axis_id(lua_State* L, InputDevice& dev)
 #define JOYPAD_FN(index, name) joypad_##name##index
 
 #define KEYBOARD(name) static int KEYBOARD_FN(name)(lua_State* L)\
-	{ return input_device_##name(L, *device()->input_manager()->keyboard()); }
+	{ return input_device_##name(L, *device()->_input_manager->keyboard()); }
 #define MOUSE(name) static int MOUSE_FN(name)(lua_State* L)\
-	{ return input_device_##name(L, *device()->input_manager()->mouse()); }
+	{ return input_device_##name(L, *device()->_input_manager->mouse()); }
 #define TOUCH(name) static int TOUCH_FN(name)(lua_State* L)\
-	{ return input_device_##name(L, *device()->input_manager()->touch()); }
+	{ return input_device_##name(L, *device()->_input_manager->touch()); }
 #define JOYPAD(index, name) static int JOYPAD_FN(index, name)(lua_State* L)\
-	{ return input_device_##name(L, *device()->input_manager()->joypad(index)); }
+	{ return input_device_##name(L, *device()->_input_manager->joypad(index)); }
 
 KEYBOARD(name)
 KEYBOARD(connected)
@@ -1292,7 +1292,7 @@ static int world_spawn_unit(lua_State* L)
 	const Vector3& pos    = nargs > 2 ? stack.get_vector3(3)    : VECTOR3_ZERO;
 	const Quaternion& rot = nargs > 3 ? stack.get_quaternion(4) : QUATERNION_IDENTITY;
 
-	LUA_ASSERT(device()->resource_manager()->can_get(RESOURCE_TYPE_UNIT, name), stack, "Unit not found");
+	LUA_ASSERT(device()->_resource_manager->can_get(RESOURCE_TYPE_UNIT, name), stack, "Unit not found");
 
 	stack.push_unit(stack.get_world(1)->spawn_unit(name, pos, rot));
 	return 1;
@@ -1486,7 +1486,7 @@ static int world_play_sound(lua_State* L)
 	const Vector3& pos = nargs > 4 ? stack.get_vector3(5) : VECTOR3_ZERO;
 	const f32 range  = nargs > 5 ? stack.get_float(6)   : 1000.0f;
 
-	LUA_ASSERT(device()->resource_manager()->can_get(RESOURCE_TYPE_SOUND, name), stack, "Sound not found");
+	LUA_ASSERT(device()->_resource_manager->can_get(RESOURCE_TYPE_SOUND, name), stack, "Sound not found");
 
 	stack.push_sound_instance_id(world->play_sound(name, loop, volume, pos, range));
 	return 1;
@@ -1573,7 +1573,7 @@ static int world_load_level(lua_State* L)
 	const StringId64 name = stack.get_resource_id(2);
 	const Vector3& pos    = nargs > 2 ? stack.get_vector3(3)    : VECTOR3_ZERO;
 	const Quaternion& rot = nargs > 3 ? stack.get_quaternion(4) : QUATERNION_IDENTITY;
-	LUA_ASSERT(device()->resource_manager()->can_get(RESOURCE_TYPE_LEVEL, name), stack, "Level not found");
+	LUA_ASSERT(device()->_resource_manager->can_get(RESOURCE_TYPE_LEVEL, name), stack, "Level not found");
 	stack.push_level(stack.get_world(1)->load_level(name, pos, rot));
 	return 1;
 }
@@ -1789,9 +1789,9 @@ static int unit_manager_create(lua_State* L)
 	LuaStack stack(L);
 
 	if (stack.num_args() == 1)
-		stack.push_unit(device()->unit_manager()->create(*stack.get_world(1)));
+		stack.push_unit(device()->_unit_manager->create(*stack.get_world(1)));
 	else
-		stack.push_unit(device()->unit_manager()->create());
+		stack.push_unit(device()->_unit_manager->create());
 
 	return 1;
 }
@@ -1799,7 +1799,7 @@ static int unit_manager_create(lua_State* L)
 static int unit_manager_alive(lua_State* L)
 {
 	LuaStack stack(L);
-	stack.push_bool(device()->unit_manager()->alive(stack.get_unit(1)));
+	stack.push_bool(device()->_unit_manager->alive(stack.get_unit(1)));
 	return 1;
 }
 
@@ -2640,7 +2640,7 @@ static int device_console_send(lua_State* L)
 	StringStream json(alloc);
 	lua_dump_table(L, 1, json);
 
-	device()->console_server()->send(string_stream::c_str(json));
+	device()->_console_server->send(string_stream::c_str(json));
 	return 0;
 }
 
@@ -2648,14 +2648,14 @@ static int device_can_get(lua_State* L)
 {
 	LuaStack stack(L);
 	const StringId64 type(stack.get_string(1));
-	stack.push_bool(device()->resource_manager()->can_get(type, stack.get_resource_id(2)));
+	stack.push_bool(device()->_resource_manager->can_get(type, stack.get_resource_id(2)));
 	return 1;
 }
 
 static int device_enable_resource_autoload(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->resource_manager()->enable_autoload(stack.get_bool(1));
+	device()->_resource_manager->enable_autoload(stack.get_bool(1));
 	return 0;
 }
 
@@ -2663,7 +2663,7 @@ static int device_temp_count(lua_State* L)
 {
 	LuaStack stack(L);
 	u32 nv, nq, nm;
-	device()->lua_environment()->temp_count(nv, nq, nm);
+	device()->_lua_environment->temp_count(nv, nq, nm);
 	stack.push_int(nv);
 	stack.push_int(nq);
 	stack.push_int(nm);
@@ -2676,7 +2676,7 @@ static int device_set_temp_count(lua_State* L)
 	u32 nv = stack.get_int(1);
 	u32 nq = stack.get_int(2);
 	u32 nm = stack.get_int(3);
-	device()->lua_environment()->set_temp_count(nv, nq, nm);
+	device()->_lua_environment->set_temp_count(nv, nq, nm);
 	return 0;
 }
 
@@ -2809,7 +2809,7 @@ static int debug_line_add_frustum(lua_State* L)
 static int debug_line_add_unit(lua_State* L)
 {
 	LuaStack stack(L);
-	stack.get_debug_line(1)->add_unit(*device()->resource_manager()
+	stack.get_debug_line(1)->add_unit(*device()->_resource_manager
 		, stack.get_matrix4x4(2)
 		, stack.get_resource_id(3)
 		, stack.get_color4(4)
@@ -2971,7 +2971,7 @@ static int display_modes(lua_State* L)
 	LuaStack stack(L);
 	TempAllocator1024 ta;
 	Array<DisplayMode> modes(ta);
-	device()->display()->modes(modes);
+	device()->_display->modes(modes);
 	stack.push_table(array::size(modes));
 	for (u32 i = 0; i < array::size(modes); ++i)
 	{
@@ -2998,68 +2998,68 @@ static int display_modes(lua_State* L)
 static int display_set_mode(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->display()->set_mode(stack.get_int(1));
+	device()->_display->set_mode(stack.get_int(1));
 	return 0;
 }
 
 static int window_show(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->window()->show();
+	device()->_window->show();
 	return 0;
 }
 
 static int window_hide(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->window()->hide();
+	device()->_window->hide();
 	return 0;
 }
 
 static int window_resize(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->window()->resize(stack.get_int(1), stack.get_int(2));
+	device()->_window->resize(stack.get_int(1), stack.get_int(2));
 	return 0;
 }
 
 static int window_move(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->window()->move(stack.get_int(1), stack.get_int(2));
+	device()->_window->move(stack.get_int(1), stack.get_int(2));
 	return 0;
 }
 
 static int window_minimize(lua_State* /*L*/)
 {
-	device()->window()->minimize();
+	device()->_window->minimize();
 	return 0;
 }
 
 static int window_restore(lua_State* /*L*/)
 {
-	device()->window()->restore();
+	device()->_window->restore();
 	return 0;
 }
 
 static int window_title(lua_State* L)
 {
 	LuaStack stack(L);
-	stack.push_string(device()->window()->title());
+	stack.push_string(device()->_window->title());
 	return 1;
 }
 
 static int window_set_title(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->window()->set_title(stack.get_string(1));
+	device()->_window->set_title(stack.get_string(1));
 	return 0;
 }
 
 static int window_show_cursor(lua_State* L)
 {
 	LuaStack stack(L);
-	device()->window()->show_cursor(stack.get_bool(1));
+	device()->_window->show_cursor(stack.get_bool(1));
 	return 0;
 }
 

src/lua/lua_environment.cpp

@@ -50,7 +50,7 @@ static int error_handler(lua_State* L)
 static int require(lua_State* L)
 {
 	LuaStack stack(L);
-	const LuaResource* lr = (LuaResource*)device()->resource_manager()->get(RESOURCE_TYPE_SCRIPT, stack.get_resource_id(1));
+	const LuaResource* lr = (LuaResource*)device()->_resource_manager->get(RESOURCE_TYPE_SCRIPT, stack.get_resource_id(1));
 	luaL_loadbuffer(L, lua_resource::program(lr), lr->size, "");
 	return 1;
 }

src/lua/lua_stack.cpp

@@ -11,37 +11,37 @@ namespace crown
 {
 bool LuaStack::is_vector3(int i)
 {
-	return device()->lua_environment()->is_vector3((Vector3*)lua_touserdata(L, i));
+	return device()->_lua_environment->is_vector3((Vector3*)lua_touserdata(L, i));
 }
 
 bool LuaStack::is_quaternion(int i)
 {
-	return device()->lua_environment()->is_quaternion((Quaternion*)lua_touserdata(L, i));
+	return device()->_lua_environment->is_quaternion((Quaternion*)lua_touserdata(L, i));
 }
 
 bool LuaStack::is_matrix4x4(int i)
 {
-	return device()->lua_environment()->is_matrix4x4((Matrix4x4*)lua_touserdata(L, i));
+	return device()->_lua_environment->is_matrix4x4((Matrix4x4*)lua_touserdata(L, i));
 }
 
 #if !CROWN_RELEASE
 void LuaStack::check_temporary(int i, const Vector3* p)
 {
-	LuaEnvironment* env = device()->lua_environment();
+	LuaEnvironment* env = device()->_lua_environment;
 	if (!is_pointer(i) || !env->is_vector3(p))
 		luaL_typerror(L, i, "Vector3");
 }
 
 void LuaStack::check_temporary(int i, const Quaternion* p)
 {
-	LuaEnvironment* env = device()->lua_environment();
+	LuaEnvironment* env = device()->_lua_environment;
 	if (!is_pointer(i) || !env->is_quaternion(p))
 		luaL_typerror(L, i, "Quaternion");
 }
 
 void LuaStack::check_temporary(int i, const Matrix4x4* p)
 {
-	LuaEnvironment* env = device()->lua_environment();
+	LuaEnvironment* env = device()->_lua_environment;
 	if (!is_pointer(i) || !env->is_matrix4x4(p))
 		luaL_typerror(L, i, "Matrix4x4");
 }
@@ -58,17 +58,17 @@ void LuaStack::push_vector2(const Vector2& v)
 
 void LuaStack::push_vector3(const Vector3& v)
 {
-	lua_pushlightuserdata(L, device()->lua_environment()->next_vector3(v));
+	lua_pushlightuserdata(L, device()->_lua_environment->next_vector3(v));
 }
 
 void LuaStack::push_quaternion(const Quaternion& q)
 {
-	lua_pushlightuserdata(L, device()->lua_environment()->next_quaternion(q));
+	lua_pushlightuserdata(L, device()->_lua_environment->next_quaternion(q));
 }
 
 void LuaStack::push_matrix4x4(const Matrix4x4& m)
 {
-	lua_pushlightuserdata(L, device()->lua_environment()->next_matrix4x4(m));
+	lua_pushlightuserdata(L, device()->_lua_environment->next_matrix4x4(m));
 }
 
 void LuaStack::push_color4(const Color4& c)

src/resource/material_resource.cpp

@@ -234,22 +234,22 @@ namespace material_resource_internal
 
 	void* load(File& file, Allocator& a)
 	{
-		return device()->material_manager()->load(file, a);
+		return device()->_material_manager->load(file, a);
 	}
 
 	void online(StringId64 id, ResourceManager& rm)
 	{
-		device()->material_manager()->online(id, rm);
+		device()->_material_manager->online(id, rm);
 	}
 
 	void offline(StringId64 id, ResourceManager& rm)
 	{
-		device()->material_manager()->offline(id, rm);
+		device()->_material_manager->offline(id, rm);
 	}
 
 	void unload(Allocator& a, void* res)
 	{
-		device()->material_manager()->unload(a, res);
+		device()->_material_manager->unload(a, res);
 	}
 } // namespace material_resource_internal
 

src/resource/shader_resource.cpp

@@ -1243,22 +1243,22 @@ namespace shader_resource_internal
 
 	void* load(File& file, Allocator& a)
 	{
-		return device()->shader_manager()->load(file, a);
+		return device()->_shader_manager->load(file, a);
 	}
 
 	void online(StringId64 id, ResourceManager& rm)
 	{
-		device()->shader_manager()->online(id, rm);
+		device()->_shader_manager->online(id, rm);
 	}
 
 	void offline(StringId64 id, ResourceManager& rm)
 	{
-		device()->shader_manager()->offline(id, rm);
+		device()->_shader_manager->offline(id, rm);
 	}
 
 	void unload(Allocator& a, void* res)
 	{
-		device()->shader_manager()->unload(a, res);
+		device()->_shader_manager->unload(a, res);
 	}
 } // namespace shader_resource_internal