godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-09 12:50:35 +00:00
Code Releases Wiki Activity

merged some stuff for okam

Browse Source
This commit is contained in:
Juan Linietsky
2015-09-03 23:24:55 -03:00
parent 7900d5daf2
commit b0aa49accb
38 changed files with 470 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/main.cpp
View File

@@ -846,17 +846,29 @@ Error Main::setup2() {
if (init_maximized) {
OS::get_singleton()->set_window_maximized(true);
}
MAIN_PRINT("Main: Load Remaps");
path_remap->load_remaps();
if (show_logo) { //boot logo!
String boot_logo_path=GLOBAL_DEF("application/boot_splash",String());
bool boot_logo_scale=GLOBAL_DEF("application/boot_splash_fullsize",true);
Globals::get_singleton()->set_custom_property_info("application/boot_splash",PropertyInfo(Variant::STRING,"application/boot_splash",PROPERTY_HINT_FILE,"*.png"));
print_line("BOOT SPLASH: "+boot_logo_path);
Image boot_logo;
if (boot_logo_path.strip_edges()!="" && FileAccess::exists(boot_logo_path)) {
boot_logo.load(boot_logo_path);
boot_logo_path = boot_logo_path.strip_edges();
print_line("BOOT SPLASH IS : "+boot_logo_path);
if (boot_logo_path!=String() /*&& FileAccess::exists(boot_logo_path)*/) {
Error err = boot_logo.load(boot_logo_path);
if (err!=OK) {
print_line("ËRROR LOADING BOOT LOGO SPLASH :"+boot_logo_path);
} else {
print_line("BOOT SPLASH OK!");
}
}
if (!boot_logo.empty()) {
@@ -867,7 +879,7 @@ Error Main::setup2() {
VisualServer::get_singleton()->set_boot_image(boot_logo, boot_bg,boot_logo_scale);
#ifndef TOOLS_ENABLED
//no tools, so free the boot logo (no longer needed)
Globals::get_singleton()->set("application/boot_logo",Image());
// Globals::get_singleton()->set("application/boot_logo",Image());
#endif
} else {
@@ -902,8 +914,6 @@ Error Main::setup2() {
}
MAIN_PRINT("Main: Load Remaps");
path_remap->load_remaps();
MAIN_PRINT("Main: Load Scene Types");
register_scene_types();