Cleanup

src/device/device.cpp

@@ -169,9 +169,9 @@ void Device::init()
 	profiler_globals::init();
 
 #if CROWN_PLATFORM_ANDROID
-	_bundle_filesystem = CE_NEW(_allocator, ApkFilesystem)(default_allocator(), const_cast<AAssetManager*>((AAssetManager*)_device_options.asset_manager()));
+	_bundle_filesystem = CE_NEW(_allocator, ApkFilesystem)(default_allocator(), const_cast<AAssetManager*>((AAssetManager*)_device_options._asset_manager));
 #else
-	_bundle_filesystem = CE_NEW(_allocator, DiskFilesystem)(default_allocator(), _device_options.bundle_dir());
+	_bundle_filesystem = CE_NEW(_allocator, DiskFilesystem)(default_allocator(), _device_options._bundle_dir);
 	_last_log = _bundle_filesystem->open(CROWN_LAST_LOG, FileOpenMode::WRITE);
 #endif // CROWN_PLATFORM_ANDROID
 
@@ -187,11 +187,11 @@ void Device::init()
 
 	_display = display::create(_allocator);
 	_window = window::create(_allocator);
-	_window->open(_device_options.window_x()
-		, _device_options.window_y()
+	_window->open(_device_options._window_x
+		, _device_options._window_y
 		, _config_window_w
 		, _config_window_h
-		, _device_options.parent_window()
+		, _device_options._parent_window
 		);
 	_window->bgfx_setup();
 
@@ -485,9 +485,9 @@ void Device::read_config()
 	TempAllocator4096 ta;
 	DynamicString boot_dir(ta);
 
-	if (_device_options.boot_dir() != NULL)
+	if (_device_options._boot_dir != NULL)
 	{
-		boot_dir += _device_options.boot_dir();
+		boot_dir += _device_options._boot_dir;
 		boot_dir += '/';
 	}
 

src/device/device.h

@@ -91,10 +91,10 @@ public:
 	void shutdown();
 
 	/// Returns the number of command line parameters.
-	int argc() const { return _device_options.argc(); }
+	int argc() const { return _device_options._argc; }
 
 	/// Returns command line parameters.
-	const char** argv() const { return _device_options.argv(); }
+	const char** argv() const { return (const char**)_device_options._argv; }
 
 	/// Returns a string identifying what platform the engine is running on.
 	const char* platform() const { return CROWN_PLATFORM_NAME; }

src/device/device_options.h

@@ -13,7 +13,7 @@ namespace crown
 /// Holds device options.
 ///
 /// @ingroup Device
-class DeviceOptions
+struct DeviceOptions
 {
 	int _argc;
 	char** _argv;
@@ -35,34 +35,11 @@ class DeviceOptions
 	void* _asset_manager;
 #endif // CROWN_PLATFORM_ANDROID
 
-public:
-
 	DeviceOptions(int argc, char** argv);
 
 	/// Parses the command line and returns
 	/// EXIT_SUCCESS if no error is found.
 	int parse();
-
-	int argc() const { return _argc; }
-	const char** argv() const { return (const char**)_argv; }
-	const char* source_dir() const { return _source_dir; }
-	const char* bundle_dir() const { return _bundle_dir; }
-	const char* boot_dir() const { return _boot_dir; }
-	const char* platform() const { return _platform; }
-	bool wait_console() const { return _wait_console; }
-	bool do_compile() const { return _do_compile; }
-	bool do_continue() const { return _do_continue; }
-	u32 parent_window() const { return _parent_window; }
-	u16 console_port() const { return _console_port; }
-	u16 window_x() const { return _window_x; }
-	u16 window_y() const { return _window_y; }
-	u16 window_width() const { return _window_width; }
-	u16 window_height() const { return _window_height; }
-
-#if CROWN_PLATFORM_ANDROID
-	void set_asset_manager(void* am) { _asset_manager = am; }
-	const void* asset_manager() const { return _asset_manager; }
-#endif // CROWN_PLATFORM_ANDROID
 };
 
 } // namespace crown

src/main/main_android.cpp

@@ -311,9 +311,9 @@ void android_main(struct android_app* app)
 	memory_globals::init();
 
 	DeviceOptions opts(0, NULL);
-	opts.set_asset_manager(app->activity->assetManager);
+	opts._asset_manager = app->activity->assetManager;
 
-	console_server_globals::init(opts.console_port(), false);
+	console_server_globals::init(opts._console_port, false);
 	crown::s_advc.run(app, opts);
 	console_server_globals::shutdown();
 	memory_globals::shutdown();

src/main/main_linux.cpp

@@ -728,20 +728,20 @@ int main(int argc, char** argv)
 		return exitcode;
 	}
 
-	console_server_globals::init(opts.console_port(), opts.wait_console());
+	console_server_globals::init(opts._console_port, opts._wait_console);
 
 	bool do_continue = true;
 
-	if (opts.do_compile())
+	if (opts._do_compile)
 	{
-		bundle_compiler_globals::init(opts.source_dir(), opts.bundle_dir());
-		do_continue = bundle_compiler::main(opts.do_compile(), opts.do_continue(), opts.platform());
+		bundle_compiler_globals::init(opts._source_dir, opts._bundle_dir);
+		do_continue = bundle_compiler::main(opts._do_compile, opts._do_continue, opts._platform);
 	}
 
 	if (do_continue)
 		exitcode = crown::s_ldvc.run(&opts);
 
-	if (opts.do_compile())
+	if (opts._do_compile)
 		bundle_compiler_globals::shutdown();
 
 	console_server_globals::shutdown();

src/main/main_windows.cpp

@@ -629,20 +629,20 @@ int main(int argc, char** argv)
 		return exitcode;
 	}
 
-	console_server_globals::init(opts.console_port(), opts.wait_console());
+	console_server_globals::init(opts._console_port, opts._wait_console);
 
 	bool do_continue = true;
 
-	if (opts.do_compile())
+	if (opts._do_compile)
 	{
-		bundle_compiler_globals::init(opts.source_dir(), opts.bundle_dir());
-		do_continue = bundle_compiler::main(opts.do_compile(), opts.do_continue(), opts.platform());
+		bundle_compiler_globals::init(opts._source_dir, opts._bundle_dir);
+		do_continue = bundle_compiler::main(opts._do_compile, opts._do_continue, opts._platform);
 	}
 
 	if (do_continue)
 		exitcode = crown::s_wdvc.run(&opts);
 
-	if (opts.do_compile())
+	if (opts._do_compile)
 		bundle_compiler_globals::shutdown();
 
 	console_server_globals::shutdown();