asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix errors with global config names no more sorrys please

Browse source
This commit is contained in:
geequlim 2017-07-19 09:25:35 +08:00
parent 9cf72d0ae1
commit 5a2500f580
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/global_config.cpp
View file

@ -945,7 +945,7 @@ GlobalConfig::GlobalConfig() {
GLOBAL_DEF("input/ui_page_down", va); GLOBAL_DEF("input/ui_page_down", va);
input_presets.push_back("input/ui_page_down"); input_presets.push_back("input/ui_page_down");
//GLOBAL_DEF("display/handheld/orientation", "landscape"); //GLOBAL_DEF("display/window/handheld/orientation", "landscape");
custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::STRING, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "landscape,portrait,reverse_landscape,reverse_portrait,sensor_landscape,sensor_portrait,sensor"); custom_prop_info["display/window/handheld/orientation"] = PropertyInfo(Variant::STRING, "display/window/handheld/orientation", PROPERTY_HINT_ENUM, "landscape,portrait,reverse_landscape,reverse_portrait,sensor_landscape,sensor_portrait,sensor");
custom_prop_info["rendering/threads/thread_model"] = PropertyInfo(Variant::INT, "rendering/threads/thread_model", PROPERTY_HINT_ENUM, "Single-Unsafe,Single-Safe,Multi-Threaded"); custom_prop_info["rendering/threads/thread_model"] = PropertyInfo(Variant::INT, "rendering/threads/thread_model", PROPERTY_HINT_ENUM, "Single-Unsafe,Single-Safe,Multi-Threaded");

2
core/input_map.cpp
View file

@ -281,7 +281,7 @@ void InputMap::load_default() {
key->set_scancode(KEY_PAGEDOWN); key->set_scancode(KEY_PAGEDOWN);
action_add_event("ui_page_down", key); action_add_event("ui_page_down", key);
//set("display/handheld/orientation", "landscape"); //set("display/window/handheld/orientation", "landscape");
} }
InputMap::InputMap() { InputMap::InputMap() {

2
main/main.cpp
View file

@ -679,7 +679,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (main_args.size() == 0 && (!GlobalConfig::get_singleton()->has("application/run/main_loop_type")) && (!GlobalConfig::get_singleton()->has("application/main_scene") || String(GlobalConfig::get_singleton()->get("application/main_scene")) == "")) if (main_args.size() == 0 && (!GlobalConfig::get_singleton()->has("application/run/main_loop_type")) && (!GlobalConfig::get_singleton()->has("application/run/main_scene") || String(GlobalConfig::get_singleton()->get("application/run/main_scene")) == ""))
use_custom_res = false; //project manager (run without arguments) use_custom_res = false; //project manager (run without arguments)
#endif #endif

4
platform/iphone/export/export.cpp
View file

@ -175,8 +175,8 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
String pkg_name; String pkg_name;
if (p_preset->get("application/name") != "") if (p_preset->get("application/name") != "")
pkg_name = p_preset->get("application/name"); // app_name pkg_name = p_preset->get("application/name"); // app_name
else if (String(GlobalConfig::get_singleton()->get("application/name")) != "") else if (String(GlobalConfig::get_singleton()->get("application/config/name")) != "")
pkg_name = String(GlobalConfig::get_singleton()->get("application/name")); pkg_name = String(GlobalConfig::get_singleton()->get("application/config/name"));
else else
pkg_name = "Unnamed"; pkg_name = "Unnamed";

4
platform/osx/export/export.cpp
View file

@ -275,8 +275,8 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p
String pkg_name; String pkg_name;
if (p_preset->get("application/name") != "") if (p_preset->get("application/name") != "")
pkg_name = p_preset->get("application/name"); // app_name pkg_name = p_preset->get("application/name"); // app_name
else if (String(GlobalConfig::get_singleton()->get("application/name")) != "") else if (String(GlobalConfig::get_singleton()->get("application/config/name")) != "")
pkg_name = String(GlobalConfig::get_singleton()->get("application/name")); pkg_name = String(GlobalConfig::get_singleton()->get("application/config/name"));
else else
pkg_name = "Unnamed"; pkg_name = "Unnamed";

2
platform/uwp/export/export.cpp
View file

@ -774,7 +774,7 @@ class EditorExportUWP : public EditorExportPlatform {
String architecture = arch == ARM ? "ARM" : arch == X86 ? "x86" : "x64"; String architecture = arch == ARM ? "ARM" : arch == X86 ? "x86" : "x64";
result = result.replace("$architecture$", architecture); result = result.replace("$architecture$", architecture);
result = result.replace("$display_name$", String(p_preset->get("package/display_name")).empty() ? (String)GlobalConfig::get_singleton()->get("application/name") : String(p_preset->get("package/display_name"))); result = result.replace("$display_name$", String(p_preset->get("package/display_name")).empty() ? (String)GlobalConfig::get_singleton()->get("application/config/name") : String(p_preset->get("package/display_name")));
result = result.replace("$publisher_display_name$", p_preset->get("package/publisher_display_name")); result = result.replace("$publisher_display_name$", p_preset->get("package/publisher_display_name"));
result = result.replace("$app_description$", p_preset->get("package/description")); result = result.replace("$app_description$", p_preset->get("package/description"));
result = result.replace("$bg_color$", p_preset->get("images/background_color")); result = result.replace("$bg_color$", p_preset->get("images/background_color"));