浏览代码

Keep register-like function calls ordered by name

Daniele Bartolini 8 年之前
父节点
当前提交
ed0ecb17f7
共有 2 个文件被更改,包括 16 次插入16 次删除
  1. 10 10
      src/device/device.cpp
  2. 6 6
      src/resource/data_compiler.cpp

+ 10 - 10
src/device/device.cpp

@@ -314,8 +314,8 @@ bool Device::process_events(bool vsync)
 
 void Device::run()
 {
-	_console_server->register_command("script",  console_command_script, this);
 	_console_server->register_command("command", console_command, this);
+	_console_server->register_command("script",  console_command_script, this);
 
 	_console_server->listen(_device_options._console_port, _device_options._wait_console);
 
@@ -358,21 +358,21 @@ void Device::run()
 
 	_resource_loader  = CE_NEW(_allocator, ResourceLoader)(*_data_filesystem);
 	_resource_manager = CE_NEW(_allocator, ResourceManager)(*_resource_loader);
-	_resource_manager->register_type(RESOURCE_TYPE_SCRIPT,           lur::load, lur::unload, NULL,        NULL        );
-	_resource_manager->register_type(RESOURCE_TYPE_TEXTURE,          txr::load, txr::unload, txr::online, txr::offline);
+	_resource_manager->register_type(RESOURCE_TYPE_CONFIG,           cor::load, cor::unload, NULL,        NULL        );
+	_resource_manager->register_type(RESOURCE_TYPE_FONT,             ftr::load, ftr::unload, NULL,        NULL        );
+	_resource_manager->register_type(RESOURCE_TYPE_LEVEL,            lvr::load, lvr::unload, NULL,        NULL        );
+	_resource_manager->register_type(RESOURCE_TYPE_MATERIAL,         mtr::load, mtr::unload, mtr::online, mtr::offline);
 	_resource_manager->register_type(RESOURCE_TYPE_MESH,             mhr::load, mhr::unload, mhr::online, mhr::offline);
-	_resource_manager->register_type(RESOURCE_TYPE_SOUND,            sdr::load, sdr::unload, NULL,        NULL        );
-	_resource_manager->register_type(RESOURCE_TYPE_UNIT,             utr::load, utr::unload, NULL,        NULL        );
-	_resource_manager->register_type(RESOURCE_TYPE_SPRITE,           spr::load, spr::unload, NULL,        NULL        );
 	_resource_manager->register_type(RESOURCE_TYPE_PACKAGE,          pkr::load, pkr::unload, NULL,        NULL        );
 	_resource_manager->register_type(RESOURCE_TYPE_PHYSICS,          phr::load, phr::unload, NULL,        NULL        );
-	_resource_manager->register_type(RESOURCE_TYPE_MATERIAL,         mtr::load, mtr::unload, mtr::online, mtr::offline);
 	_resource_manager->register_type(RESOURCE_TYPE_PHYSICS_CONFIG,   pcr::load, pcr::unload, NULL,        NULL        );
-	_resource_manager->register_type(RESOURCE_TYPE_FONT,             ftr::load, ftr::unload, NULL,        NULL        );
-	_resource_manager->register_type(RESOURCE_TYPE_LEVEL,            lvr::load, lvr::unload, NULL,        NULL        );
+	_resource_manager->register_type(RESOURCE_TYPE_SCRIPT,           lur::load, lur::unload, NULL,        NULL        );
 	_resource_manager->register_type(RESOURCE_TYPE_SHADER,           shr::load, shr::unload, shr::online, shr::offline);
+	_resource_manager->register_type(RESOURCE_TYPE_SOUND,            sdr::load, sdr::unload, NULL,        NULL        );
+	_resource_manager->register_type(RESOURCE_TYPE_SPRITE,           spr::load, spr::unload, NULL,        NULL        );
 	_resource_manager->register_type(RESOURCE_TYPE_SPRITE_ANIMATION, sar::load, sar::unload, NULL,        NULL        );
-	_resource_manager->register_type(RESOURCE_TYPE_CONFIG,           cor::load, cor::unload, NULL,        NULL        );
+	_resource_manager->register_type(RESOURCE_TYPE_TEXTURE,          txr::load, txr::unload, txr::online, txr::offline);
+	_resource_manager->register_type(RESOURCE_TYPE_UNIT,             utr::load, utr::unload, NULL,        NULL        );
 
 	// Read config
 	{

+ 6 - 6
src/resource/data_compiler.cpp

@@ -583,18 +583,18 @@ int main_data_compiler(int argc, char** argv)
 	dc->register_compiler(RESOURCE_TYPE_UNIT,             RESOURCE_VERSION_UNIT,             utr::compile);
 
 	// Add ignore globs
-	dc->add_ignore_glob("*.tmp");
-	dc->add_ignore_glob("*.wav");
-	dc->add_ignore_glob("*.ogg");
-	dc->add_ignore_glob("*.png");
-	dc->add_ignore_glob("*.tga");
+	dc->add_ignore_glob("*.bak");
 	dc->add_ignore_glob("*.dds");
 	dc->add_ignore_glob("*.ktx");
+	dc->add_ignore_glob("*.ogg");
+	dc->add_ignore_glob("*.png");
 	dc->add_ignore_glob("*.pvr");
 	dc->add_ignore_glob("*.swn"); // VIM swap file.
 	dc->add_ignore_glob("*.swo"); // VIM swap file.
 	dc->add_ignore_glob("*.swp"); // VIM swap file.
-	dc->add_ignore_glob("*.bak");
+	dc->add_ignore_glob("*.tga");
+	dc->add_ignore_glob("*.tmp");
+	dc->add_ignore_glob("*.wav");
 	dc->add_ignore_glob("*~");
 	dc->add_ignore_glob(".*");