Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-27 03:19:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change script extension.

Browse Source
This commit is contained in:
Relintai 2022-07-12 21:38:17 +02:00
parent 90e555ebb0
commit 6b2db83031
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/cscript/cscript.cpp
View File

@ -1442,7 +1442,7 @@ String CScriptLanguage::get_type() const {
return "CScript"; return "CScript";
} }
String CScriptLanguage::get_extension() const { String CScriptLanguage::get_extension() const {
return "gd"; return "cpps";
} }
Error CScriptLanguage::execute_file(const String &p_path) { Error CScriptLanguage::execute_file(const String &p_path) {
// ?? // ??
@ -2109,8 +2109,8 @@ CScriptLanguage::CScriptLanguage() {
script_frame_time = 0; script_frame_time = 0;
_debug_call_stack_pos = 0; _debug_call_stack_pos = 0;
int dmcs = GLOBAL_DEF("debug/settings/gdscript/max_call_stack", 1024); int dmcs = GLOBAL_DEF("debug/settings/cscript/max_call_stack", 1024);
ProjectSettings::get_singleton()->set_custom_property_info("debug/settings/gdscript/max_call_stack", PropertyInfo(Variant::INT, "debug/settings/gdscript/max_call_stack", PROPERTY_HINT_RANGE, "1024,4096,1,or_greater")); //minimum is 1024 ProjectSettings::get_singleton()->set_custom_property_info("debug/settings/cscript/max_call_stack", PropertyInfo(Variant::INT, "debug/settings/cscript/max_call_stack", PROPERTY_HINT_RANGE, "1024,4096,1,or_greater")); //minimum is 1024
if (ScriptDebugger::get_singleton()) { if (ScriptDebugger::get_singleton()) {
//debugging enabled! //debugging enabled!
@ -2124,14 +2124,14 @@ CScriptLanguage::CScriptLanguage() {
} }
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
GLOBAL_DEF("debug/gdscript/warnings/enable", true); GLOBAL_DEF("debug/cscript/warnings/enable", true);
GLOBAL_DEF("debug/gdscript/warnings/treat_warnings_as_errors", false); GLOBAL_DEF("debug/cscript/warnings/treat_warnings_as_errors", false);
GLOBAL_DEF("debug/gdscript/warnings/exclude_addons", true); GLOBAL_DEF("debug/cscript/warnings/exclude_addons", true);
GLOBAL_DEF("debug/gdscript/completion/autocomplete_setters_and_getters", false); GLOBAL_DEF("debug/cscript/completion/autocomplete_setters_and_getters", false);
for (int i = 0; i < (int)CScriptWarning::WARNING_MAX; i++) { for (int i = 0; i < (int)CScriptWarning::WARNING_MAX; i++) {
String warning = CScriptWarning::get_name_from_code((CScriptWarning::Code)i).to_lower(); String warning = CScriptWarning::get_name_from_code((CScriptWarning::Code)i).to_lower();
bool default_enabled = !warning.begins_with("unsafe_") && i != CScriptWarning::UNUSED_CLASS_VARIABLE; bool default_enabled = !warning.begins_with("unsafe_") && i != CScriptWarning::UNUSED_CLASS_VARIABLE;
GLOBAL_DEF("debug/gdscript/warnings/" + warning, default_enabled); GLOBAL_DEF("debug/cscript/warnings/" + warning, default_enabled);
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED
} }
@ -2198,7 +2198,7 @@ RES ResourceFormatLoaderCScript::load(const String &p_path, const String &p_orig
Ref<CScript> scriptres(script); Ref<CScript> scriptres(script);
if (p_path.ends_with(".gde") || p_path.ends_with(".gdc")) { if (p_path.ends_with(".cppse") || p_path.ends_with(".cppsc")) {
script->set_script_path(p_original_path); // script needs this. script->set_script_path(p_original_path); // script needs this.
script->set_path(p_original_path, true); script->set_path(p_original_path, true);
Error err = script->load_byte_code(p_path); Error err = script->load_byte_code(p_path);
@ -2221,9 +2221,9 @@ RES ResourceFormatLoaderCScript::load(const String &p_path, const String &p_orig
} }
void ResourceFormatLoaderCScript::get_recognized_extensions(List<String> *p_extensions) const { void ResourceFormatLoaderCScript::get_recognized_extensions(List<String> *p_extensions) const {
p_extensions->push_back("gd"); p_extensions->push_back("cpps");
p_extensions->push_back("gdc"); p_extensions->push_back("cppsc");
p_extensions->push_back("gde"); p_extensions->push_back("cppse");
} }
bool ResourceFormatLoaderCScript::handles_type(const String &p_type) const { bool ResourceFormatLoaderCScript::handles_type(const String &p_type) const {
@ -2232,7 +2232,7 @@ bool ResourceFormatLoaderCScript::handles_type(const String &p_type) const {
String ResourceFormatLoaderCScript::get_resource_type(const String &p_path) const { String ResourceFormatLoaderCScript::get_resource_type(const String &p_path) const {
String el = p_path.get_extension().to_lower(); String el = p_path.get_extension().to_lower();
if (el == "gd" || el == "gdc" || el == "gde") { if (el == "cpps" || el == "cppsc" || el == "cppse") {
return "CScript"; return "CScript";
} }
return ""; return "";
@ -2285,7 +2285,7 @@ Error ResourceFormatSaverCScript::save(const String &p_path, const RES &p_resour
void ResourceFormatSaverCScript::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const { void ResourceFormatSaverCScript::get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const {
if (Object::cast_to<CScript>(*p_resource)) { if (Object::cast_to<CScript>(*p_resource)) {
p_extensions->push_back("gd"); p_extensions->push_back("cpps");
} }
} }
bool ResourceFormatSaverCScript::recognize(const RES &p_resource) const { bool ResourceFormatSaverCScript::recognize(const RES &p_resource) const {

8
modules/cscript/cscript_editor.cpp
View File

@ -842,10 +842,10 @@ static bool _guess_expression_type(CScriptCompletionContext &p_context, const CS
script = "res://" + script; script = "res://" + script;
} }
if (!script.ends_with(".cpp")) { if (!script.ends_with(".cpps")) {
//not a script, try find the script anyway, //not a script, try find the script anyway,
//may have some success //may have some success
script = script.get_basename() + ".cpp"; script = script.get_basename() + ".cpps";
} }
if (FileAccess::exists(script)) { if (FileAccess::exists(script)) {
@ -3434,10 +3434,10 @@ Error CScriptLanguage::lookup_code(const String &p_code, const String &p_symbol,
if (path.begins_with("*")) { if (path.begins_with("*")) {
String script = path.substr(1, path.length()); String script = path.substr(1, path.length());
if (!script.ends_with(".cpp")) { if (!script.ends_with(".cpps")) {
// Not a script, try find the script anyway, // Not a script, try find the script anyway,
// may have some success // may have some success
script = script.get_basename() + ".cpp"; script = script.get_basename() + ".cpps";
} }
if (FileAccess::exists(script)) { if (FileAccess::exists(script)) {

8
modules/cscript/register_types.cpp
View File

@ -63,7 +63,7 @@ public:
script_key = preset->get_script_encryption_key().to_lower(); script_key = preset->get_script_encryption_key().to_lower();
} }
if (!p_path.ends_with(".cpp") || script_mode == EditorExportPreset::MODE_SCRIPT_TEXT) { if (!p_path.ends_with(".cpps") || script_mode == EditorExportPreset::MODE_SCRIPT_TEXT) {
return; return;
} }
@ -78,7 +78,7 @@ public:
if (!file.empty()) { if (!file.empty()) {
if (script_mode == EditorExportPreset::MODE_SCRIPT_ENCRYPTED) { if (script_mode == EditorExportPreset::MODE_SCRIPT_ENCRYPTED) {
String tmp_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("script.gde"); String tmp_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("script.cppse");
FileAccess *fa = FileAccess::open(tmp_path, FileAccess::WRITE); FileAccess *fa = FileAccess::open(tmp_path, FileAccess::WRITE);
Vector<uint8_t> key; Vector<uint8_t> key;
@ -116,13 +116,13 @@ public:
memdelete(fae); memdelete(fae);
file = FileAccess::get_file_as_array(tmp_path); file = FileAccess::get_file_as_array(tmp_path);
add_file(p_path.get_basename() + ".cppe", file, true); add_file(p_path.get_basename() + ".cppse", file, true);
// Clean up temporary file. // Clean up temporary file.
DirAccess::remove_file_or_error(tmp_path); DirAccess::remove_file_or_error(tmp_path);
} else { } else {
add_file(p_path.get_basename() + ".cppc", file, true); add_file(p_path.get_basename() + ".cppsc", file, true);
} }
} }
} }