From afa90aca96a05420fcb52df9e0d088e830729f81 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Wed, 10 Jul 2024 11:31:08 +0300 Subject: [PATCH 1/6] Apply Rebel branding to tools/scripts --- tools/scripts/check_ci_log.py | 8 ++++---- tools/scripts/make_tarball.sh | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/scripts/check_ci_log.py b/tools/scripts/check_ci_log.py index 19d0362d61..f4f72a03ca 100755 --- a/tools/scripts/check_ci_log.py +++ b/tools/scripts/check_ci_log.py @@ -26,10 +26,10 @@ or file_contents.find("Dumping the backtrace") != -1 or file_contents.find("Segmentation fault (core dumped)") != -1 ): - print("FATAL ERROR: Godot has been crashed.") + print("FATAL ERROR: Rebel has been crashed.") sys.exit(1) -# Finding memory leaks in Godot is quite difficult, because we need to take into +# Finding memory leaks in Rebel is quite difficult, because we need to take into # account leaks also in external libraries. They are usually provided without # debugging symbols, so the leak report from it usually has only 2/3 lines, # so searching for 5 element - "#4 0x" - should correctly detect the vast @@ -40,8 +40,8 @@ print("ERROR: Memory leak was found") sys.exit(1) -# It may happen that Godot detects leaking nodes/resources and removes them, so -# this possibility should also be handled as a potential error, even if +# It may happen that Rebel Engine detects leaking nodes/resources and removes +# them, so this possibility should also be handled as a potential error, even if # LeakSanitizer doesn't report anything if file_contents.find("ObjectDB instances leaked at exit") != -1: diff --git a/tools/scripts/make_tarball.sh b/tools/scripts/make_tarball.sh index 9e02b80af1..f01ce10ca5 100755 --- a/tools/scripts/make_tarball.sh +++ b/tools/scripts/make_tarball.sh @@ -1,7 +1,7 @@ #!/bin/sh if [ ! -e "version.py" ]; then - echo "This script should be ran from the root folder of the Godot repository." + echo "This script should be ran from the root folder of the Rebel Engine repository." exit 1 fi @@ -10,9 +10,9 @@ while getopts "h?sv:g:" opt; do h|\?) echo "Usage: $0 [OPTIONS...]" echo - echo " -s script friendly file name (godot.tar.gz)" - echo " -v godot version for file name (e.g. 4.0-stable)" - echo " -g git treeish to archive (e.g. master)" + echo " -s script friendly file name (rebel.tar.gz)" + echo " -v Rebel Engine version for file name (e.g. 1.0-stable)" + echo " -g git treeish to archive (e.g. main)" echo exit 1 ;; @@ -20,7 +20,7 @@ while getopts "h?sv:g:" opt; do script_friendly_name=1 ;; v) - godot_version=$OPTARG + rebel_version=$OPTARG ;; g) git_treeish=$OPTARG @@ -35,17 +35,17 @@ else fi if [ ! -z "$script_friendly_name" ]; then - NAME=godot + NAME=rebel else - if [ ! -z "$godot_version" ]; then - NAME=godot-$godot_version + if [ ! -z "$rebel_version" ]; then + NAME=rebel-$rebel_version else - NAME=godot-$HEAD + NAME=rebel-$HEAD fi fi CURDIR=$(pwd) -TMPDIR=$(mktemp -d -t godot-XXXXXX) +TMPDIR=$(mktemp -d -t rebel-XXXXXX) echo "Generating tarball for revision $HEAD with folder name '$NAME'." echo From bba2a1606e988bc8d667ee4cddacbffe94a2f461 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Sun, 25 Aug 2024 16:41:52 +0300 Subject: [PATCH 2/6] Apply Rebel branding to drivers --- drivers/coremidi/midi_driver_coremidi.cpp | 4 ++-- drivers/gl_context/SCsub | 2 +- drivers/gles2/rasterizer_gles2.cpp | 2 +- drivers/gles2/rasterizer_storage_gles2.cpp | 4 ++-- drivers/gles2/shaders/scene.glsl | 2 +- drivers/gles3/rasterizer_storage_gles3.cpp | 3 +-- drivers/gles_common/rasterizer_canvas_batcher.h | 2 +- drivers/png/SCsub | 2 +- drivers/png/image_loader_png.cpp | 2 +- drivers/pulseaudio/audio_driver_pulseaudio.cpp | 5 +++-- drivers/pulseaudio/pulse-so_wrap.c | 15 +++++++++++---- drivers/unix/unix_os.cpp | 12 ++++++------ 12 files changed, 31 insertions(+), 24 deletions(-) diff --git a/drivers/coremidi/midi_driver_coremidi.cpp b/drivers/coremidi/midi_driver_coremidi.cpp index c4bf67dccb..a2fabaaf20 100644 --- a/drivers/coremidi/midi_driver_coremidi.cpp +++ b/drivers/coremidi/midi_driver_coremidi.cpp @@ -27,7 +27,7 @@ void MIDIDriverCoreMidi::read( Error MIDIDriverCoreMidi::open() { CFStringRef name = - CFStringCreateWithCString(NULL, "Godot", kCFStringEncodingASCII); + CFStringCreateWithCString(NULL, "Rebel", kCFStringEncodingASCII); OSStatus result = MIDIClientCreate(name, NULL, NULL, &client); CFRelease(name); if (result != noErr) { @@ -37,7 +37,7 @@ Error MIDIDriverCoreMidi::open() { result = MIDIInputPortCreate( client, - CFSTR("Godot Input"), + CFSTR("Rebel Input"), MIDIDriverCoreMidi::read, (void*)this, &port_in diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index 98cbe49aa1..6a6864c8f6 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -23,7 +23,7 @@ if env["platform"] in ["macos", "windows", "linux"]: env.drivers_sources += thirdparty_obj -# Godot source files +# Rebel source files driver_obj = [] diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 5f8496792c..212a78ec81 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -288,7 +288,7 @@ void RasterizerGLES2::initialize() { } if (callback) { - print_line("godot: ENABLING GL DEBUG"); + print_line("Rebel: ENABLING GL DEBUG"); glEnable(_EXT_DEBUG_OUTPUT_SYNCHRONOUS_ARB); callback(_gl_debug_print, NULL); glEnable(_EXT_DEBUG_OUTPUT); diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index b56633456a..b047c0d326 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -7181,8 +7181,8 @@ void RasterizerStorageGLES2::render_target_set_external_texture( if (rt->external.depth == 0) { rt->external.depth_owned = true; - // create a multisample depth buffer, we're not reusing Godots - // because Godot's didn't get created.. + // create a multisample depth buffer, we're not reusing Rebel's + // because Rebel's didn't get created.. glGenRenderbuffers(1, &rt->external.depth); glBindRenderbuffer(GL_RENDERBUFFER, rt->external.depth); glRenderbufferStorageMultisample( diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl index a1a232f48d..8e2cda4bee 100644 --- a/drivers/gles2/shaders/scene.glsl +++ b/drivers/gles2/shaders/scene.glsl @@ -1876,7 +1876,7 @@ void main() { vec2 anisotropy_flow = vec2(1.0, 0.0); float sss_strength = 0.0; // unused // gl_FragDepth is not available in GLES2, so writing to DEPTH is not - // converted to gl_FragDepth by Godot compiler resulting in a compile error + // converted to gl_FragDepth by Rebel compiler resulting in a compile error // because DEPTH is not a variable. float m_DEPTH = 0.0; diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 731f1e9538..7a42a7df69 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -7685,8 +7685,7 @@ bool RasterizerStorageGLES3::gi_probe_is_interior(RID p_probe) const { void RasterizerStorageGLES3::gi_probe_set_compress(RID p_probe, bool p_enable) { if (p_enable) { WARN_DEPRECATED_MSG( - "GIProbe's Compress property has been deprecated due to known bugs " - "and will be removed in Godot 4.0." + "GIProbe's Compress property has been deprecated due to known bugs." ); } diff --git a/drivers/gles_common/rasterizer_canvas_batcher.h b/drivers/gles_common/rasterizer_canvas_batcher.h index 5e1ec31437..e3c80fbf46 100644 --- a/drivers/gles_common/rasterizer_canvas_batcher.h +++ b/drivers/gles_common/rasterizer_canvas_batcher.h @@ -1789,7 +1789,7 @@ bool C_PREAMBLE::_prefill_ninepatch( // cope with ninepatch of zero area. These cannot be created by the user // interface or gdscript, but can be created programmatically from c++, e.g. - // by the Godot UI for sliders. We will just not draw these. + // by the Rebel UI for sliders. We will just not draw these. if ((p_np->rect.size.x * p_np->rect.size.y) <= 0.0f) { return false; } diff --git a/drivers/png/SCsub b/drivers/png/SCsub index a09cf4b30c..0a5ae7d42e 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -64,7 +64,7 @@ if env["builtin_libpng"]: env.drivers_sources += thirdparty_obj -# Godot source files +# Rebel source files driver_obj = [] diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index 15e0aa687b..ca7f2ab574 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -72,7 +72,7 @@ PoolVector ImageLoaderPNG::lossless_pack_png(const Ref& p_image ) { PoolVector out_buffer; - // add Godot's own "PNG " prefix + // Add Rebel's own "PNG " prefix. if (out_buffer.resize(4) != OK) { ERR_FAIL_V(PoolVector()); } diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp index a9fd6572a5..53ffb926bd 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp +++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp @@ -205,7 +205,8 @@ Error AudioDriverPulseAudio::init_device() { // Note: If using an even amount of channels (2, 4, etc) channels and // pa_map.channels will be equal, if not then pa_map.channels will have the // real amount of channels PulseAudio is using and channels will have the - // amount of channels Godot is using (in this case it's pa_map.channels + 1) + // amount of channels Rebel Engine is using (in this case it's + // pa_map.channels + 1) Error err = detect_channels(); if (err != OK) { // This most likely means there are no sinks. @@ -330,7 +331,7 @@ Error AudioDriverPulseAudio::init() { pa_ml = pa_mainloop_new(); ERR_FAIL_COND_V(pa_ml == nullptr, ERR_CANT_OPEN); - pa_ctx = pa_context_new(pa_mainloop_get_api(pa_ml), "Godot"); + pa_ctx = pa_context_new(pa_mainloop_get_api(pa_ml), "Rebel"); ERR_FAIL_COND_V(pa_ctx == nullptr, ERR_CANT_OPEN); pa_ready = 0; diff --git a/drivers/pulseaudio/pulse-so_wrap.c b/drivers/pulseaudio/pulse-so_wrap.c index 12bdcc704e..958fd383b8 100644 --- a/drivers/pulseaudio/pulse-so_wrap.c +++ b/drivers/pulseaudio/pulse-so_wrap.c @@ -1,8 +1,15 @@ // This file is generated. Do not edit! -// see https://github.com/hpvb/dynload-wrapper for details -// generated by /home/hp/Projects/godot/pulse/generate-wrapper.py 0.3 on 2021-02-20 00:08:31 -// flags: /home/hp/Projects/godot/pulse/generate-wrapper.py --include /usr/include/pulse/pulseaudio.h --sys-include --soname libpulse.so.0 --omit-prefix _pa_ --init-name pulse --output-header pulse-so_wrap.h --output-implementation pulse-so_wrap.c -// +// See https://github.com/hpvb/dynload-wrapper for details. +// Generated on 2021-02-20 00:08:31 +// flags: +// --include /usr/include/pulse/pulseaudio.h +// --sys-include +// --soname libpulse.so.0 +// --omit-prefix _pa_ +// --init-name pulse +// --output-header pulse-so_wrap.h +// --output-implementation pulse-so_wrap.c + #include #define pa_get_library_version pa_get_library_version_dylibloader_orig_pulse diff --git a/drivers/unix/unix_os.cpp b/drivers/unix/unix_os.cpp index 7022cd92d1..ed266ab7a2 100644 --- a/drivers/unix/unix_os.cpp +++ b/drivers/unix/unix_os.cpp @@ -54,14 +54,14 @@ static void _setup_clock() { #else #if defined(CLOCK_MONOTONIC_RAW) \ && !defined(WEB_ENABLED) // This is a better clock on Linux. -#define GODOT_CLOCK CLOCK_MONOTONIC_RAW +#define REBEL_CLOCK CLOCK_MONOTONIC_RAW #else -#define GODOT_CLOCK CLOCK_MONOTONIC +#define REBEL_CLOCK CLOCK_MONOTONIC #endif static void _setup_clock() { struct timespec tv_now = {0, 0}; ERR_FAIL_COND_MSG( - clock_gettime(GODOT_CLOCK, &tv_now) != 0, + clock_gettime(REBEL_CLOCK, &tv_now) != 0, "OS CLOCK IS NOT WORKING!" ); _clock_start = @@ -243,7 +243,7 @@ uint64_t UnixOS::get_ticks_usec() const { // Unchecked return. Static analyzers might complain. // If _setup_clock() succeeded, we assume clock_gettime() works. struct timespec tv_now = {0, 0}; - clock_gettime(GODOT_CLOCK, &tv_now); + clock_gettime(REBEL_CLOCK, &tv_now); uint64_t longtime = ((uint64_t)tv_now.tv_nsec / 1000L) + (uint64_t)tv_now.tv_sec * 1000000L; #endif @@ -598,8 +598,8 @@ void UnixTerminalLogger::log_error( } // Disable color codes if stdout is not a TTY. - // This prevents Godot from writing ANSI escape codes when redirecting - // stdout and stderr to a file. + // This prevents Rebel Engine from writing ANSI escape codes when + // redirecting stdout and stderr to a file. const bool tty = isatty(fileno(stdout)); const char* gray = tty ? "\E[0;90m" : ""; const char* red = tty ? "\E[0;91m" : ""; From 59dda567f4f4b47aa776d18466f20ff989899377 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Sun, 25 Aug 2024 17:20:22 +0300 Subject: [PATCH 3/6] Apply Rebel branding to main and tests --- main/SCsub | 2 +- main/input_default.cpp | 3 +- main/main.cpp | 21 ++++++-------- main/main_timer_sync.cpp | 28 ------------------- main/main_timer_sync.h | 7 ----- ...controllerdb.txt => rebelcontrollerdb.txt} | 4 +-- main/tests/test_oa_hash_map.cpp | 2 +- main/tests/test_shader_lang.cpp | 2 +- main/tests/test_string.cpp | 6 ++-- main/tests/test_transform.cpp | 16 ----------- 10 files changed, 18 insertions(+), 73 deletions(-) rename main/{godotcontrollerdb.txt => rebelcontrollerdb.txt} (98%) diff --git a/main/SCsub b/main/SCsub index a7e4d42e19..767c82d25e 100644 --- a/main/SCsub +++ b/main/SCsub @@ -10,7 +10,7 @@ env.main_sources = [] env.add_source_files(env.main_sources, "*.cpp") # Order matters here. Higher index controller database files write on top of lower index database files. -controller_databases = ["gamecontrollerdb.txt", "godotcontrollerdb.txt"] +controller_databases = ["gamecontrollerdb.txt", "rebelcontrollerdb.txt"] gensource = env.CommandNoCache( "default_controller_mappings.gen.cpp", diff --git a/main/input_default.cpp b/main/input_default.cpp index a175214e91..ebc7b7fe0c 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -1260,8 +1260,7 @@ void InputDefault::_get_mapped_hat_events( } } -// string names of the SDL buttons in the same order as input_event.h godot -// buttons +// String names of the SDL buttons in the same order as Rebel Engine buttons. static const char* _joy_buttons[] = { "a", "b", diff --git a/main/main.cpp b/main/main.cpp index 63c5086d56..b228c13116 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -470,8 +470,8 @@ void Main::print_help(const char* p_binary) { ); #ifdef DEBUG_METHODS_ENABLED OS::get_singleton()->print( - " --gdnative-generate-json-api Generate JSON dump of the Godot " - "API for GDNative bindings.\n" + " --gdnative-generate-json-api Generate JSON dump of the Rebel " + "Engine API for GDNative bindings.\n" ); #endif OS::get_singleton()->print( @@ -621,8 +621,8 @@ Error Main::setup( while (I) { #ifdef MACOS_ENABLED // Ignore the process serial number argument passed by macOS Gatekeeper. - // Otherwise, Godot would try to open a non-existent project on the - // first start and abort. + // Otherwise, Rebel Engine would try to open a non-existent project on + // the first start and abort. if (I->get().begins_with("-psn_")) { I = I->next(); continue; @@ -1788,14 +1788,11 @@ Error Main::setup2(Thread::ID p_main_tid_override) { #ifdef UNIX_ENABLED // Print warning before initializing audio. - if (OS::get_singleton()->get_environment("USER") == "root" - && !OS::get_singleton()->has_environment("GODOT_SILENCE_ROOT_WARNING" - )) { + if (OS::get_singleton()->get_environment("USER") == "root") { WARN_PRINT( - "Started the engine as `root`/superuser. This is a security risk, " - "and subsystems like audio may not work correctly.\nSet the " - "environment variable `GODOT_SILENCE_ROOT_WARNING` to 1 to silence " - "this warning." + "Started the engine as `root`/superuser.\n" + "This is a security risk, and subsystems like audio may not work " + "correctly.\n" ); } #endif @@ -2144,7 +2141,7 @@ bool Main::start() { || args[i].ends_with(".escn") || args[i].ends_with(".res") || args[i].ends_with(".tres")) { // Only consider the positional argument to be a scene path if - // it ends with a file extension associated with Godot scenes. + // it ends with a file extension associated with Rebel scenes. // This makes it possible for projects to parse command-line // arguments for custom CLI arguments or other file extensions // without trouble. This can be used to implement "drag-and-drop diff --git a/main/main_timer_sync.cpp b/main/main_timer_sync.cpp index f30ca63390..3a1b147423 100644 --- a/main/main_timer_sync.cpp +++ b/main/main_timer_sync.cpp @@ -61,11 +61,6 @@ void MainTimerSync::DeltaSmoother::update_refresh_rate_estimator(int64_t p_delta // dropping loads of frames, so the estimate will be inaccurate if (fps >= 50) { _estimated_fps = fps; -#ifdef GODOT_DEBUG_DELTA_SMOOTHER - print_line( - "initial guess (average measured) refresh rate: " + itos(fps) - ); -#endif } else { // can't get started until above 50 return; @@ -80,9 +75,6 @@ void MainTimerSync::DeltaSmoother::update_refresh_rate_estimator(int64_t p_delta if (_estimate_complete && _hits_at_estimated == 20) { _estimate_locked = true; -#ifdef GODOT_DEBUG_DELTA_SMOOTHER - print_line("estimate LOCKED at " + itos(_estimated_fps) + " fps"); -#endif return; } @@ -94,28 +86,8 @@ void MainTimerSync::DeltaSmoother::update_refresh_rate_estimator(int64_t p_delta if (_estimated_fps) { _estimate_complete = true; _vsync_delta = 1000000 / _estimated_fps; - -#ifdef GODOT_DEBUG_DELTA_SMOOTHER - print_line( - "estimate complete. vsync_delta " + itos(_vsync_delta) - + ", fps " + itos(_estimated_fps) - ); -#endif } } - -#ifdef GODOT_DEBUG_DELTA_SMOOTHER - if ((_hits_at_estimated % (400 / NUM_READINGS)) == 0) { - String sz = "hits at estimated : " + itos(_hits_at_estimated) - + ", above : " + itos(_hits_above_estimated) + "( " - + itos(_hits_one_above_estimated) - + " ), below : " + itos(_hits_below_estimated) + " (" - + itos(_hits_one_below_estimated) + " )"; - - print_line(sz); - } -#endif - return; } diff --git a/main/main_timer_sync.h b/main/main_timer_sync.h index 6eafaa9123..407da11ee8 100644 --- a/main/main_timer_sync.h +++ b/main/main_timer_sync.h @@ -9,9 +9,6 @@ #include "core/engine.h" -// define these to get more debugging logs for the delta smoothing -// #define GODOT_DEBUG_DELTA_SMOOTHER - struct MainFrameTime { float idle_step; // time to advance idles for (argument to process()) int physics_steps; // number of times to iterate the physics engine @@ -75,10 +72,6 @@ class MainTimerSync { _hits_one_below_estimated = 0; _estimate_complete = false; - -#ifdef GODOT_DEBUG_DELTA_SMOOTHER - print_line("estimated fps " + itos(_estimated_fps)); -#endif } } _delta_smoother; diff --git a/main/godotcontrollerdb.txt b/main/rebelcontrollerdb.txt similarity index 98% rename from main/godotcontrollerdb.txt rename to main/rebelcontrollerdb.txt index b2a6160c6c..9d1655f2ad 100644 --- a/main/godotcontrollerdb.txt +++ b/main/rebelcontrollerdb.txt @@ -1,5 +1,5 @@ -# Game Controller DB for Godot in SDL 2.0.16 format -# Source: https://github.com/godotengine/godot +# Game Controller DB for Rebel Engine in SDL 2.0.16 format +# Source: https://github.com/RebelToolbox/RebelEngine # Windows __XINPUT_DEVICE__,XInput Gamepad,a:b12,b:b13,x:b14,y:b15,start:b4,back:b5,leftstick:b6,rightstick:b7,leftshoulder:b8,rightshoulder:b9,dpup:b0,dpdown:b1,dpleft:b2,dpright:b3,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,platform:Windows, diff --git a/main/tests/test_oa_hash_map.cpp b/main/tests/test_oa_hash_map.cpp index 6633a654de..5bdc0e4cf7 100644 --- a/main/tests/test_oa_hash_map.cpp +++ b/main/tests/test_oa_hash_map.cpp @@ -90,7 +90,7 @@ MainLoop* test() { map.set("Hello", 1); map.set("World", 2); - map.set("Godot rocks", 42); + map.set("Rebel Engine is the best", 42); for (OAHashMap::Iterator it = map.iter(); it.valid; it = map.next_iter(it)) { diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp index 4ca1584d0f..45e987c2b3 100644 --- a/main/tests/test_shader_lang.cpp +++ b/main/tests/test_shader_lang.cpp @@ -334,7 +334,7 @@ MainLoop* test() { if (cmdlargs.empty()) { // try editor! - print_line("usage: godot -test shader_lang "); + print_line("usage: rebel -test shader_lang "); return nullptr; } diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index 8460b12631..de97b5028a 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -1332,7 +1332,7 @@ bool test_31() { state = false; } - String b = "Godot"; + String b = "Rebel"; success = b[b.size()] == 0; OS::get_singleton()->print( "Is 0 String[size()]:, %s\n", @@ -1352,7 +1352,7 @@ bool test_31() { state = false; } - const String d = "Godot"; + const String d = "Rebel"; success = d[d.size()] == 0; OS::get_singleton()->print( "Is 0 const String[size()]:, %s\n", @@ -1500,7 +1500,7 @@ bool test_35() { COUNT_TEST(String("Testa").count("Test") == 1); COUNT_TEST(String("TestTestTest").count("Test") == 3); COUNT_TEST(String("TestTestTest").count("TestTest") == 1); - COUNT_TEST(String("TestGodotTestGodotTestGodot").count("Test") == 3); + COUNT_TEST(String("TestRebelTestRebelTestRebel").count("Test") == 3); COUNT_TEST(String("TestTestTestTest").count("Test", 4, 8) == 1); COUNT_TEST(String("TestTestTestTest").count("Test", 4, 12) == 2); diff --git a/main/tests/test_transform.cpp b/main/tests/test_transform.cpp index 2eac77aece..f7e37e4499 100644 --- a/main/tests/test_transform.cpp +++ b/main/tests/test_transform.cpp @@ -12,8 +12,6 @@ #include "core/os/os.h" #include "core/ustring.h" -// #define GODOT_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED - namespace TestTransform { bool test_plane() { @@ -137,13 +135,6 @@ bool test_aabb() { if (!test_aabb_regular()) { pass = false; } - -#ifdef GODOT_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED - if (!test_aabb_non_uniform_scale()) { - pass = false; - } -#endif - return pass; } @@ -244,13 +235,6 @@ bool test_vector3() { if (!test_vector3_regular()) { pass = false; } - -#ifdef GODOT_TEST_TRANSFORM_NON_UNIFORM_SCALE_TESTS_ENABLED - if (!test_vector3_non_uniform_scale()) { - pass = false; - } -#endif - return pass; } From 3b3bd20bd26d95251795d91c8d10acc60e1c6908 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Mon, 26 Aug 2024 10:05:34 +0300 Subject: [PATCH 4/6] Apply Rebel branding to core --- core/SCsub | 2 +- core/bind/core_bind.cpp | 4 +- core/color.cpp | 1 - core/core_builders.py | 2 +- core/crypto/SCsub | 6 +- core/engine.cpp | 2 +- core/image.cpp | 2 +- core/io/file_access_pack.h | 2 +- core/io/file_access_zip.cpp | 52 +++++++------- core/io/http_client.cpp | 4 +- core/make_binders.py | 12 ++-- core/math/bvh.h | 8 +-- core/math/convex_hull.cpp | 12 ++-- core/math/math_funcs.cpp | 5 +- core/method_bind.h | 6 +- core/os/os.cpp | 7 +- core/project_settings.cpp | 2 +- core/reference.h | 8 +-- core/string_builder.cpp | 10 ++- core/string_builder.h | 2 +- core/translation.cpp | 2 +- core/type_info.h | 72 +++++++++---------- core/ustring.cpp | 6 +- editor/editor_about.cpp | 2 +- modules/mono/editor/bindings_generator.cpp | 32 ++++----- modules/mono/editor/bindings_generator.h | 4 +- thirdparty/README.md | 2 +- ...bedtls_config.h => rebel_mbedtls_config.h} | 0 ...ls_platform.c => rebel_mbedtls_platform.c} | 0 29 files changed, 129 insertions(+), 140 deletions(-) rename thirdparty/mbedtls/include/{godot_core_mbedtls_config.h => rebel_mbedtls_config.h} (100%) rename thirdparty/mbedtls/library/{godot_core_mbedtls_platform.c => rebel_mbedtls_platform.c} (100%) diff --git a/core/SCsub b/core/SCsub index 706c117504..12f49b223e 100644 --- a/core/SCsub +++ b/core/SCsub @@ -166,7 +166,7 @@ if env["builtin_zstd"]: env.core_sources += thirdparty_obj -# Godot source files +# Rebel source files env.add_source_files(env.core_sources, "*.cpp") env.add_source_files(env.core_sources, "script_encryption_key.gen.cpp") diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 4667e4af6f..c0f0957d45 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -516,13 +516,13 @@ Error _OS::shell_open(String p_uri) { if (p_uri.begins_with("res://")) { WARN_PRINT( "Attempting to open an URL with the \"res://\" protocol. Use " - "`ProjectSettings.globalize_path()` to convert a Godot-specific " + "`ProjectSettings.globalize_path()` to convert a Rebel-specific " "path to a system path before opening it with `OS.shell_open()`." ); } else if (p_uri.begins_with("user://")) { WARN_PRINT( "Attempting to open an URL with the \"user://\" protocol. Use " - "`ProjectSettings.globalize_path()` to convert a Godot-specific " + "`ProjectSettings.globalize_path()` to convert a Rebel-specific " "path to a system path before opening it with `OS.shell_open()`." ); } diff --git a/core/color.cpp b/core/color.cpp index dc1bb2744e..33405aa346 100644 --- a/core/color.cpp +++ b/core/color.cpp @@ -432,7 +432,6 @@ Color Color::from_hsv(float p_h, float p_s, float p_v, float p_a) const { return c; } -// FIXME: Remove once Godot 3.1 has been released float Color::gray() const { WARN_DEPRECATED_MSG( "'Color.gray()' is deprecated and will be removed in a future version. " diff --git a/core/core_builders.py b/core/core_builders.py index 3c1f5da73f..94e7d01a0f 100644 --- a/core/core_builders.py +++ b/core/core_builders.py @@ -195,7 +195,7 @@ def next_tag(self): f.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n") f.write("#ifndef _EDITOR_LICENSE_H\n") f.write("#define _EDITOR_LICENSE_H\n") - f.write("const char *const GODOT_LICENSE_TEXT =") + f.write("const char *const REBEL_LICENSE_TEXT =") with open_utf8(src_license, "r") as license_file: for line in license_file: diff --git a/core/crypto/SCsub b/core/crypto/SCsub index 519cc0e622..70bbaff312 100644 --- a/core/crypto/SCsub +++ b/core/crypto/SCsub @@ -27,7 +27,7 @@ if not has_module: CPPDEFINES=[ ( "MBEDTLS_CONFIG_FILE", - '\\"thirdparty/mbedtls/include/godot_core_mbedtls_config.h\\"', + '\\"thirdparty/mbedtls/include/rebel_mbedtls_config.h\\"', ) ] ) @@ -39,7 +39,7 @@ if not has_module: "md5.c", "sha1.c", "sha256.c", - "godot_core_mbedtls_platform.c", + "rebel_mbedtls_platform.c", ] thirdparty_mbedtls_sources = [ thirdparty_mbedtls_dir + file for file in thirdparty_mbedtls_sources @@ -48,7 +48,7 @@ if not has_module: env.core_sources += thirdparty_obj -# Godot source files +# Rebel source files core_obj = [] diff --git a/core/engine.cpp b/core/engine.cpp index ec78430c6f..2c0baf4104 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -161,7 +161,7 @@ Dictionary Engine::get_license_info() const { } String Engine::get_license_text() const { - return String(GODOT_LICENSE_TEXT); + return String(REBEL_LICENSE_TEXT); } void Engine::set_print_error_messages(bool p_enabled) { diff --git a/core/image.cpp b/core/image.cpp index a8023fee68..8d6ef17eff 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -4548,7 +4548,7 @@ Error Image::load_bmp_from_buffer(const PoolVector& p_array) { ERR_FAIL_NULL_V_MSG( _bmp_mem_loader_func, ERR_UNAVAILABLE, - "The BMP module isn't enabled. Recompile the Godot editor or export " + "The BMP module isn't enabled. Recompile Rebel Editor or export " "template binary with the `module_bmp_enabled=yes` SCons option." ); return _load_from_buffer(p_array, _bmp_mem_loader_func); diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h index 68c9c6e06b..56c3351446 100644 --- a/core/io/file_access_pack.h +++ b/core/io/file_access_pack.h @@ -14,7 +14,7 @@ #include "core/print_string.h" #include "core/set.h" -// Godot's packed file magic header ("GDPC" in ASCII). +// Rebel's packed file magic header ("GDPC" in ASCII). #define PACK_HEADER_MAGIC 0x43504447 // The current packed file format version number. #define PACK_FORMAT_VERSION 1 diff --git a/core/io/file_access_zip.cpp b/core/io/file_access_zip.cpp index c95dfffa25..4ca284e3e4 100644 --- a/core/io/file_access_zip.cpp +++ b/core/io/file_access_zip.cpp @@ -14,7 +14,7 @@ ZipArchive* ZipArchive::instance = nullptr; extern "C" { -static void* godot_open(void* data, const char* p_fname, int mode) { +static void* zopen_file(void* data, const char* p_fname, int mode) { if (mode & ZLIB_FILEFUNC_MODE_WRITE) { return nullptr; } @@ -25,13 +25,13 @@ static void* godot_open(void* data, const char* p_fname, int mode) { return f; } -static uLong godot_read(void* data, void* fdata, void* buf, uLong size) { +static uLong zread_file(void* data, void* fdata, void* buf, uLong size) { FileAccess* f = (FileAccess*)fdata; f->get_buffer((uint8_t*)buf, size); return size; } -static uLong godot_write( +static uLong zwrite_file( voidpf opaque, voidpf stream, const void* buf, @@ -40,12 +40,12 @@ static uLong godot_write( return 0; } -static long godot_tell(voidpf opaque, voidpf stream) { +static long ztell_file(voidpf opaque, voidpf stream) { FileAccess* f = (FileAccess*)stream; return f->get_position(); } -static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) { +static long zseek_file(voidpf opaque, voidpf stream, uLong offset, int origin) { FileAccess* f = (FileAccess*)stream; uint64_t pos = offset; @@ -64,7 +64,7 @@ static long godot_seek(voidpf opaque, voidpf stream, uLong offset, int origin) { return 0; } -static int godot_close(voidpf opaque, voidpf stream) { +static int zclose_file(voidpf opaque, voidpf stream) { FileAccess* f = (FileAccess*)stream; if (f) { f->close(); @@ -74,16 +74,16 @@ static int godot_close(voidpf opaque, voidpf stream) { return 0; } -static int godot_testerror(voidpf opaque, voidpf stream) { +static int zerror_file(voidpf opaque, voidpf stream) { FileAccess* f = (FileAccess*)stream; return f->get_error() != OK ? 1 : 0; } -static voidpf godot_alloc(voidpf opaque, uInt items, uInt size) { +static voidpf zalloc_mem(voidpf opaque, uInt items, uInt size) { return memalloc(items * size); } -static void godot_free(voidpf opaque, voidpf address) { +static void zfree_mem(voidpf opaque, voidpf address) { memfree(address); } @@ -107,17 +107,17 @@ unzFile ZipArchive::get_file_handle(String p_file) const { memset(&io, 0, sizeof(io)); io.opaque = nullptr; - io.zopen_file = godot_open; - io.zread_file = godot_read; - io.zwrite_file = godot_write; + io.zopen_file = zopen_file; + io.zread_file = zread_file; + io.zwrite_file = zwrite_file; - io.ztell_file = godot_tell; - io.zseek_file = godot_seek; - io.zclose_file = godot_close; - io.zerror_file = godot_testerror; + io.ztell_file = ztell_file; + io.zseek_file = zseek_file; + io.zclose_file = zclose_file; + io.zerror_file = zerror_file; - io.alloc_mem = godot_alloc; - io.free_mem = godot_free; + io.alloc_mem = zalloc_mem; + io.free_mem = zfree_mem; unzFile pkg = unzOpen2(packages[file.package].filename.utf8().get_data(), &io); @@ -160,14 +160,14 @@ bool ZipArchive::try_open_pack( memset(&io, 0, sizeof(io)); io.opaque = nullptr; - io.zopen_file = godot_open; - io.zread_file = godot_read; - io.zwrite_file = godot_write; + io.zopen_file = zopen_file; + io.zread_file = zread_file; + io.zwrite_file = zwrite_file; - io.ztell_file = godot_tell; - io.zseek_file = godot_seek; - io.zclose_file = godot_close; - io.zerror_file = godot_testerror; + io.ztell_file = ztell_file; + io.zseek_file = zseek_file; + io.zclose_file = zclose_file; + io.zerror_file = zerror_file; unzFile zfile = unzOpen2(p_path.utf8().get_data(), &io); ERR_FAIL_COND_V(!zfile, false); @@ -374,4 +374,4 @@ FileAccessZip::~FileAccessZip() { close(); } -#endif +#endif // MINIZIP_ENABLED diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index 4e13efa5c3..cc88829041 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -174,7 +174,7 @@ Error HTTPClient::request_raw( // Should it add utf8 encoding? } if (add_uagent) { - request += "User-Agent: GodotEngine/" + String(VERSION_FULL_BUILD) + request += "User-Agent: RebelEngine/" + String(VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")\r\n"; } if (add_accept) { @@ -257,7 +257,7 @@ Error HTTPClient::request( // Should it add utf8 encoding? } if (add_uagent) { - request += "User-Agent: GodotEngine/" + String(VERSION_FULL_BUILD) + request += "User-Agent: RebelEngine/" + String(VERSION_FULL_BUILD) + " (" + OS::get_singleton()->get_name() + ")\r\n"; } if (add_accept) { diff --git a/core/make_binders.py b/core/make_binders.py index 2011fa1817..ccb527f0d2 100644 --- a/core/make_binders.py +++ b/core/make_binders.py @@ -9,11 +9,11 @@ class MethodBind$argc$$ifret R$$ifconst C$ : public MethodBind { $ifret R$ $ifnoret void$ (T::*method)($arg, P@$) $ifconst const$; #ifdef DEBUG_METHODS_ENABLED virtual Variant::Type _gen_argument_type(int p_arg) const { return _get_argument_type(p_arg); } - virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const { + virtual RebelTypeInfo::Metadata get_argument_meta(int p_arg) const { $ifret if (p_arg==-1) return GetTypeInfo::METADATA;$ $arg if (p_arg==(@-1)) return GetTypeInfo::METADATA; $ - return GodotTypeInfo::METADATA_NONE; + return RebelTypeInfo::METADATA_NONE; } Variant::Type _get_argument_type(int p_argument) const { $ifret if (p_argument==-1) return (Variant::Type)GetTypeInfo::VARIANT_TYPE;$ @@ -100,11 +100,11 @@ class MethodBind$argc$$ifret R$$ifconst C$ : public MethodBind { #ifdef DEBUG_METHODS_ENABLED virtual Variant::Type _gen_argument_type(int p_arg) const { return _get_argument_type(p_arg); } - virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const { + virtual RebelTypeInfo::Metadata get_argument_meta(int p_arg) const { $ifret if (p_arg==-1) return GetTypeInfo::METADATA;$ $arg if (p_arg==(@-1)) return GetTypeInfo::METADATA; $ - return GodotTypeInfo::METADATA_NONE; + return RebelTypeInfo::METADATA_NONE; } Variant::Type _get_argument_type(int p_argument) const { @@ -200,11 +200,11 @@ class FunctionBind$argc$$ifret R$$ifconst C$ : public MethodBind { $ifret R$ $ifnoret void$ (*method) ($ifconst const$ T *$ifargs , $$arg, P@$); #ifdef DEBUG_METHODS_ENABLED virtual Variant::Type _gen_argument_type(int p_arg) const { return _get_argument_type(p_arg); } - virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const { + virtual RebelTypeInfo::Metadata get_argument_meta(int p_arg) const { $ifret if (p_arg==-1) return GetTypeInfo::METADATA;$ $arg if (p_arg==(@-1)) return GetTypeInfo::METADATA; $ - return GodotTypeInfo::METADATA_NONE; + return RebelTypeInfo::METADATA_NONE; } Variant::Type _get_argument_type(int p_argument) const { $ifret if (p_argument==-1) return (Variant::Type)GetTypeInfo::VARIANT_TYPE;$ diff --git a/core/math/bvh.h b/core/math/bvh.h index 7bbf81821f..af97ca84e8 100644 --- a/core/math/bvh.h +++ b/core/math/bvh.h @@ -9,12 +9,10 @@ // BVH // This class provides a wrapper around BVH tree, which contains most of the -// functionality for a dynamic BVH with templated leaf size. However BVH also -// adds facilities for pairing, to maintain compatibility with Godot 3.2. -// Pairing is a collision pairing system, on top of the basic BVH. +// functionality for a dynamic BVH with templated leaf size. +// BVH also adds facilities for pairing. Pairing is a collision pairing system, +// on top of the basic BVH. -// Some notes on the use of BVH / Octree from Godot 3.2. -// This is not well explained elsewhere. // The rendering tree mask and types that are sent to the BVH are NOT layer // masks. They are INSTANCE_TYPES (defined in visual_server.h), e.g. MESH, // MULTIMESH, PARTICLES etc. Thus the lights do no cull by layer mask in the diff --git a/core/math/convex_hull.cpp b/core/math/convex_hull.cpp index 0da8dd3b4d..f6d20bc9ff 100644 --- a/core/math/convex_hull.cpp +++ b/core/math/convex_hull.cpp @@ -5,7 +5,7 @@ // SPDX-License-Identifier: MIT /* - * Based on Godot's patched VHACD-version of Bullet's btConvexHullComputer. + * Based on Rebel's patched VHACD-version of Bullet's btConvexHullComputer. * See /thirdparty/vhacd/btConvexHullComputer.cpp at * 64403ddcab9f1dca2408f0a412a22d899708bbb1 In turn, based on * /src/LinearMath/btConvexHullComputer.cpp in @@ -16,8 +16,8 @@ * - int32_t is consistently used instead of int in some cases * - integrated patch db0d6c92927f5a1358b887f2645c11f3014f0e8a from Bullet * (CWE-190 integer overflow in btConvexHullComputer) - * - adapted to Godot's code style - * - replaced Bullet's types (e.g. vectors) with Godot's + * - adapted to Rebel's code style + * - replaced Bullet's types (e.g. vectors) with Rebel's * - replaced custom Pool implementation with PagedAllocator */ @@ -52,10 +52,10 @@ misrepresented as being the original software. // #define DEBUG_CONVEX_HULL // #define SHOW_ITERATIONS -// -- GODOT start -- +// -- REBEL start -- // Assembly optimizations are not used at the moment. // #define USE_X86_64_ASM -// -- GODOT end -- +// -- REBEL end -- #ifdef DEBUG_ENABLED #define CHULL_ASSERT(m_cond) \ @@ -2586,7 +2586,7 @@ Error ConvexHullComputer::convex_hull( e = e->get_next_edge_of_face(); } while (e != e_start); - // reverse indices: Godot wants clockwise, but this is counter-clockwise + // reverse indices: Rebel wants clockwise, but this is counter-clockwise if (face.indices.size() > 2) { // reverse all but the first index. int* indices = face.indices.ptrw(); diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp index 26afb66456..143e47b147 100644 --- a/core/math/math_funcs.cpp +++ b/core/math/math_funcs.cpp @@ -67,10 +67,7 @@ int Math::range_step_decimals(double p_step) { } double Math::dectime(double p_value, double p_amount, double p_step) { - WARN_DEPRECATED_MSG( - "The `dectime()` function has been deprecated and will be removed in " - "Godot 4.0. Use `move_toward()` instead." - ); + WARN_DEPRECATED_MSG("The `dectime()` function has been deprecated."); double sgn = p_value < 0 ? -1.0 : 1.0; double val = Math::abs(p_value); val -= p_amount * p_step; diff --git a/core/method_bind.h b/core/method_bind.h index 39cd33236b..00021e8525 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -249,7 +249,7 @@ class MethodBind { ); // set by class, db, can't be inferred otherwise Vector get_argument_names() const; - virtual GodotTypeInfo::Metadata get_argument_meta(int p_arg) const = 0; + virtual RebelTypeInfo::Metadata get_argument_meta(int p_arg) const = 0; #endif void set_hint_flags(uint32_t p_hint) { @@ -343,8 +343,8 @@ class MethodBindVarArg : public MethodBind { return _gen_argument_type_info(p_arg).type; } - virtual GodotTypeInfo::Metadata get_argument_meta(int) const { - return GodotTypeInfo::METADATA_NONE; + virtual RebelTypeInfo::Metadata get_argument_meta(int) const { + return RebelTypeInfo::METADATA_NONE; } #else diff --git a/core/os/os.cpp b/core/os/os.cpp index 6a26fc1b89..dedf0756eb 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -853,10 +853,9 @@ void OS::add_frame_delay(bool p_can_draw) { OS::OS() { void* volatile stack_bottom; - restart_on_exit = false; - singleton = this; - _keep_screen_on = true; // set default value to true, because this had been - // true before godot 2.0. + restart_on_exit = false; + singleton = this; + _keep_screen_on = true; low_processor_usage_mode = false; low_processor_usage_mode_sleep_usec = 10000; _verbose_stdout = false; diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 4e7744229b..0c50a317c1 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -415,7 +415,7 @@ Error ProjectSettings::_setup( bool found = _load_resource_pack(exec_path); // Attempt with exec_name.pck. - // (This is the usual case when distributing a Godot game.) + // (This is the usual case when distributing a Rebel game.) String exec_dir = exec_path.get_base_dir(); String exec_filename = exec_path.get_file(); String exec_basename = exec_filename.get_basename(); diff --git a/core/reference.h b/core/reference.h index 566b4229de..45e983ff1e 100644 --- a/core/reference.h +++ b/core/reference.h @@ -343,8 +343,8 @@ struct PtrToArg { template struct GetTypeInfo> { static const Variant::Type VARIANT_TYPE = Variant::OBJECT; - static const GodotTypeInfo::Metadata METADATA = - GodotTypeInfo::METADATA_NONE; + static const RebelTypeInfo::Metadata METADATA = + RebelTypeInfo::METADATA_NONE; static inline PropertyInfo get_class_info() { return PropertyInfo( @@ -359,8 +359,8 @@ struct GetTypeInfo> { template struct GetTypeInfo&> { static const Variant::Type VARIANT_TYPE = Variant::OBJECT; - static const GodotTypeInfo::Metadata METADATA = - GodotTypeInfo::METADATA_NONE; + static const RebelTypeInfo::Metadata METADATA = + RebelTypeInfo::METADATA_NONE; static inline PropertyInfo get_class_info() { return PropertyInfo( diff --git a/core/string_builder.cpp b/core/string_builder.cpp index 53e7155861..0f3f22bd0d 100644 --- a/core/string_builder.cpp +++ b/core/string_builder.cpp @@ -40,14 +40,12 @@ String StringBuilder::as_string() const { CharType* buffer = memnew_arr(CharType, string_length); int current_position = 0; - - int godot_string_elem = 0; - int c_string_elem = 0; + int string_elem = 0; + int c_string_elem = 0; for (int i = 0; i < appended_strings.size(); i++) { if (appended_strings[i] == -1) { - // Godot string - const String& s = strings[godot_string_elem]; + const String& s = strings[string_elem]; memcpy( buffer + current_position, @@ -57,7 +55,7 @@ String StringBuilder::as_string() const { current_position += s.length(); - godot_string_elem++; + string_elem++; } else { const char* s = c_strings[c_string_elem]; diff --git a/core/string_builder.h b/core/string_builder.h index ae73b00189..b586d9d5b0 100644 --- a/core/string_builder.h +++ b/core/string_builder.h @@ -16,7 +16,7 @@ class StringBuilder { Vector strings; Vector c_strings; - // -1 means it's a Godot String + // -1 means it's a Rebel String // a natural number means C string. Vector appended_strings; diff --git a/core/translation.cpp b/core/translation.cpp index b803263afc..a3c78d0e2d 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -786,7 +786,7 @@ static const char* locale_renames[][2] = { {"iw", "he" }, // Hebrew {"no", "nb" }, // Norwegian Bokmål {"C", "en" }, // "C" is the simple/default/untranslated Computer locale. - // ASCII-only, English, no currency symbols. Godot treats this as "en". + // ASCII-only, English, no currency symbols. Rebel treats this as "en". // See https://unix.stackexchange.com/a/87763/164141 "The C locale is"... {nullptr, nullptr} }; diff --git a/core/type_info.h b/core/type_info.h index b40527e25a..4ca5e4fbde 100644 --- a/core/type_info.h +++ b/core/type_info.h @@ -326,7 +326,7 @@ struct TypeInherits { && !TypesAreSame::value; }; -namespace GodotTypeInfo { +namespace RebelTypeInfo { enum Metadata { METADATA_NONE, METADATA_INT_IS_INT8, @@ -340,7 +340,7 @@ enum Metadata { METADATA_REAL_IS_FLOAT, METADATA_REAL_IS_DOUBLE }; -} // namespace GodotTypeInfo +} // namespace RebelTypeInfo // If the compiler fails because it's trying to instantiate the primary // 'GetTypeInfo' template instead of one of the specializations, it's most @@ -356,8 +356,8 @@ struct GetTypeInfo; template <> \ struct GetTypeInfo { \ static const Variant::Type VARIANT_TYPE = m_var_type; \ - static const GodotTypeInfo::Metadata METADATA = \ - GodotTypeInfo::METADATA_NONE; \ + static const RebelTypeInfo::Metadata METADATA = \ + RebelTypeInfo::METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return PropertyInfo(VARIANT_TYPE, String()); \ } \ @@ -365,8 +365,8 @@ struct GetTypeInfo; template <> \ struct GetTypeInfo { \ static const Variant::Type VARIANT_TYPE = m_var_type; \ - static const GodotTypeInfo::Metadata METADATA = \ - GodotTypeInfo::METADATA_NONE; \ + static const RebelTypeInfo::Metadata METADATA = \ + RebelTypeInfo::METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return PropertyInfo(VARIANT_TYPE, String()); \ } \ @@ -376,7 +376,7 @@ struct GetTypeInfo; template <> \ struct GetTypeInfo { \ static const Variant::Type VARIANT_TYPE = m_var_type; \ - static const GodotTypeInfo::Metadata METADATA = m_metadata; \ + static const RebelTypeInfo::Metadata METADATA = m_metadata; \ static inline PropertyInfo get_class_info() { \ return PropertyInfo(VARIANT_TYPE, String()); \ } \ @@ -384,7 +384,7 @@ struct GetTypeInfo; template <> \ struct GetTypeInfo { \ static const Variant::Type VARIANT_TYPE = m_var_type; \ - static const GodotTypeInfo::Metadata METADATA = m_metadata; \ + static const RebelTypeInfo::Metadata METADATA = m_metadata; \ static inline PropertyInfo get_class_info() { \ return PropertyInfo(VARIANT_TYPE, String()); \ } \ @@ -394,53 +394,53 @@ MAKE_TYPE_INFO(bool, Variant::BOOL) MAKE_TYPE_INFO_WITH_META( uint8_t, Variant::INT, - GodotTypeInfo::METADATA_INT_IS_UINT8 + RebelTypeInfo::METADATA_INT_IS_UINT8 ) MAKE_TYPE_INFO_WITH_META( int8_t, Variant::INT, - GodotTypeInfo::METADATA_INT_IS_INT8 + RebelTypeInfo::METADATA_INT_IS_INT8 ) MAKE_TYPE_INFO_WITH_META( uint16_t, Variant::INT, - GodotTypeInfo::METADATA_INT_IS_UINT16 + RebelTypeInfo::METADATA_INT_IS_UINT16 ) MAKE_TYPE_INFO_WITH_META( int16_t, Variant::INT, - GodotTypeInfo::METADATA_INT_IS_INT16 + RebelTypeInfo::METADATA_INT_IS_INT16 ) MAKE_TYPE_INFO_WITH_META( uint32_t, Variant::INT, - GodotTypeInfo::METADATA_INT_IS_UINT32 + RebelTypeInfo::METADATA_INT_IS_UINT32 ) MAKE_TYPE_INFO_WITH_META( int32_t, Variant::INT, - GodotTypeInfo::METADATA_INT_IS_INT32 + RebelTypeInfo::METADATA_INT_IS_INT32 ) MAKE_TYPE_INFO_WITH_META( uint64_t, Variant::INT, - GodotTypeInfo::METADATA_INT_IS_UINT64 + RebelTypeInfo::METADATA_INT_IS_UINT64 ) MAKE_TYPE_INFO_WITH_META( int64_t, Variant::INT, - GodotTypeInfo::METADATA_INT_IS_INT64 + RebelTypeInfo::METADATA_INT_IS_INT64 ) MAKE_TYPE_INFO(wchar_t, Variant::INT) MAKE_TYPE_INFO_WITH_META( float, Variant::REAL, - GodotTypeInfo::METADATA_REAL_IS_FLOAT + RebelTypeInfo::METADATA_REAL_IS_FLOAT ) MAKE_TYPE_INFO_WITH_META( double, Variant::REAL, - GodotTypeInfo::METADATA_REAL_IS_DOUBLE + RebelTypeInfo::METADATA_REAL_IS_DOUBLE ) MAKE_TYPE_INFO(String, Variant::STRING) @@ -476,8 +476,8 @@ MAKE_TYPE_INFO(BSP_Tree, Variant::DICTIONARY) template <> struct GetTypeInfo { static const Variant::Type VARIANT_TYPE = Variant::OBJECT; - static const GodotTypeInfo::Metadata METADATA = - GodotTypeInfo::METADATA_NONE; + static const RebelTypeInfo::Metadata METADATA = + RebelTypeInfo::METADATA_NONE; static inline PropertyInfo get_class_info() { return PropertyInfo( @@ -492,8 +492,8 @@ struct GetTypeInfo { template <> struct GetTypeInfo { static const Variant::Type VARIANT_TYPE = Variant::OBJECT; - static const GodotTypeInfo::Metadata METADATA = - GodotTypeInfo::METADATA_NONE; + static const RebelTypeInfo::Metadata METADATA = + RebelTypeInfo::METADATA_NONE; static inline PropertyInfo get_class_info() { return PropertyInfo( @@ -509,8 +509,8 @@ struct GetTypeInfo { template <> struct GetTypeInfo { static const Variant::Type VARIANT_TYPE = Variant::NIL; - static const GodotTypeInfo::Metadata METADATA = - GodotTypeInfo::METADATA_NONE; + static const RebelTypeInfo::Metadata METADATA = + RebelTypeInfo::METADATA_NONE; static inline PropertyInfo get_class_info() { return PropertyInfo( @@ -526,8 +526,8 @@ struct GetTypeInfo { template <> struct GetTypeInfo { static const Variant::Type VARIANT_TYPE = Variant::NIL; - static const GodotTypeInfo::Metadata METADATA = - GodotTypeInfo::METADATA_NONE; + static const RebelTypeInfo::Metadata METADATA = + RebelTypeInfo::METADATA_NONE; static inline PropertyInfo get_class_info() { return PropertyInfo( @@ -544,8 +544,8 @@ struct GetTypeInfo { template <> \ struct GetTypeInfo> { \ static const Variant::Type VARIANT_TYPE = m_var_type; \ - static const GodotTypeInfo::Metadata METADATA = \ - GodotTypeInfo::METADATA_NONE; \ + static const RebelTypeInfo::Metadata METADATA = \ + RebelTypeInfo::METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return PropertyInfo(VARIANT_TYPE, String()); \ } \ @@ -553,8 +553,8 @@ struct GetTypeInfo { template <> \ struct GetTypeInfo&> { \ static const Variant::Type VARIANT_TYPE = m_var_type; \ - static const GodotTypeInfo::Metadata METADATA = \ - GodotTypeInfo::METADATA_NONE; \ + static const RebelTypeInfo::Metadata METADATA = \ + RebelTypeInfo::METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return PropertyInfo(VARIANT_TYPE, String()); \ } \ @@ -581,8 +581,8 @@ struct GetTypeInfo< T*, typename EnableIf::value>::type> { static const Variant::Type VARIANT_TYPE = Variant::OBJECT; - static const GodotTypeInfo::Metadata METADATA = - GodotTypeInfo::METADATA_NONE; + static const RebelTypeInfo::Metadata METADATA = + RebelTypeInfo::METADATA_NONE; static inline PropertyInfo get_class_info() { return PropertyInfo(StringName(T::get_class_static())); @@ -594,8 +594,8 @@ struct GetTypeInfo< const T*, typename EnableIf::value>::type> { static const Variant::Type VARIANT_TYPE = Variant::OBJECT; - static const GodotTypeInfo::Metadata METADATA = - GodotTypeInfo::METADATA_NONE; + static const RebelTypeInfo::Metadata METADATA = + RebelTypeInfo::METADATA_NONE; static inline PropertyInfo get_class_info() { return PropertyInfo(StringName(T::get_class_static())); @@ -606,8 +606,8 @@ struct GetTypeInfo< template <> \ struct GetTypeInfo { \ static const Variant::Type VARIANT_TYPE = Variant::INT; \ - static const GodotTypeInfo::Metadata METADATA = \ - GodotTypeInfo::METADATA_NONE; \ + static const RebelTypeInfo::Metadata METADATA = \ + RebelTypeInfo::METADATA_NONE; \ static inline PropertyInfo get_class_info() { \ return PropertyInfo( \ Variant::INT, \ diff --git a/core/ustring.cpp b/core/ustring.cpp index 7a5a3338d1..e14154eeba 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -3088,10 +3088,8 @@ String String::format(const Variant& values, String placeholder) const { for (int i = 0; i < values_arr.size(); i++) { String i_as_str = String::num_int64(i); - if (values_arr[i].get_type() - == Variant:: - ARRAY) { // Array in Array structure - // [["name","RobotGuy"],[0,"godot"],["strength",9000.91]] + if (values_arr[i].get_type() == Variant::ARRAY) { + // Array in Array structure Array value_arr = values_arr[i]; if (value_arr.size() == 2) { diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 70782885b6..d4c39f7bf6 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -180,7 +180,7 @@ EditorAbout::EditorAbout() { _license_text->set_name(TTR("License")); _license_text->set_h_size_flags(Control::SIZE_EXPAND_FILL); _license_text->set_v_size_flags(Control::SIZE_EXPAND_FILL); - _license_text->set_text(String::utf8(GODOT_LICENSE_TEXT)); + _license_text->set_text(String::utf8(REBEL_LICENSE_TEXT)); tc->add_child(_license_text); // Thirdparty License diff --git a/modules/mono/editor/bindings_generator.cpp b/modules/mono/editor/bindings_generator.cpp index 6dca7cee21..354bed15e0 100644 --- a/modules/mono/editor/bindings_generator.cpp +++ b/modules/mono/editor/bindings_generator.cpp @@ -2709,31 +2709,31 @@ const BindingsGenerator::TypeInterface* BindingsGenerator:: } StringName BindingsGenerator::_get_int_type_name_from_meta( - GodotTypeInfo::Metadata p_meta + RebelTypeInfo::Metadata p_meta ) { switch (p_meta) { - case GodotTypeInfo::METADATA_INT_IS_INT8: + case RebelTypeInfo::METADATA_INT_IS_INT8: return "sbyte"; break; - case GodotTypeInfo::METADATA_INT_IS_INT16: + case RebelTypeInfo::METADATA_INT_IS_INT16: return "short"; break; - case GodotTypeInfo::METADATA_INT_IS_INT32: + case RebelTypeInfo::METADATA_INT_IS_INT32: return "int"; break; - case GodotTypeInfo::METADATA_INT_IS_INT64: + case RebelTypeInfo::METADATA_INT_IS_INT64: return "long"; break; - case GodotTypeInfo::METADATA_INT_IS_UINT8: + case RebelTypeInfo::METADATA_INT_IS_UINT8: return "byte"; break; - case GodotTypeInfo::METADATA_INT_IS_UINT16: + case RebelTypeInfo::METADATA_INT_IS_UINT16: return "ushort"; break; - case GodotTypeInfo::METADATA_INT_IS_UINT32: + case RebelTypeInfo::METADATA_INT_IS_UINT32: return "uint"; break; - case GodotTypeInfo::METADATA_INT_IS_UINT64: + case RebelTypeInfo::METADATA_INT_IS_UINT64: return "ulong"; break; default: @@ -2743,13 +2743,13 @@ StringName BindingsGenerator::_get_int_type_name_from_meta( } StringName BindingsGenerator::_get_float_type_name_from_meta( - GodotTypeInfo::Metadata p_meta + RebelTypeInfo::Metadata p_meta ) { switch (p_meta) { - case GodotTypeInfo::METADATA_REAL_IS_FLOAT: + case RebelTypeInfo::METADATA_REAL_IS_FLOAT: return "float"; break; - case GodotTypeInfo::METADATA_REAL_IS_DOUBLE: + case RebelTypeInfo::METADATA_REAL_IS_DOUBLE: return "double"; break; default: @@ -3005,12 +3005,12 @@ bool BindingsGenerator::_populate_object_type_interfaces() { if (return_info.type == Variant::INT) { imethod.return_type.cname = _get_int_type_name_from_meta( m ? m->get_argument_meta(-1) - : GodotTypeInfo::METADATA_NONE + : RebelTypeInfo::METADATA_NONE ); } else if (return_info.type == Variant::REAL) { imethod.return_type.cname = _get_float_type_name_from_meta( m ? m->get_argument_meta(-1) - : GodotTypeInfo::METADATA_NONE + : RebelTypeInfo::METADATA_NONE ); } else { imethod.return_type.cname = @@ -3040,12 +3040,12 @@ bool BindingsGenerator::_populate_object_type_interfaces() { if (arginfo.type == Variant::INT) { iarg.type.cname = _get_int_type_name_from_meta( m ? m->get_argument_meta(i) - : GodotTypeInfo::METADATA_NONE + : RebelTypeInfo::METADATA_NONE ); } else if (arginfo.type == Variant::REAL) { iarg.type.cname = _get_float_type_name_from_meta( m ? m->get_argument_meta(i) - : GodotTypeInfo::METADATA_NONE + : RebelTypeInfo::METADATA_NONE ); } else { iarg.type.cname = Variant::get_type_name(arginfo.type); diff --git a/modules/mono/editor/bindings_generator.h b/modules/mono/editor/bindings_generator.h index 0c305e57f8..d5da846e82 100644 --- a/modules/mono/editor/bindings_generator.h +++ b/modules/mono/editor/bindings_generator.h @@ -646,8 +646,8 @@ class BindingsGenerator { const TypeInterface* _get_type_or_placeholder(const TypeReference& p_typeref ); - StringName _get_int_type_name_from_meta(GodotTypeInfo::Metadata p_meta); - StringName _get_float_type_name_from_meta(GodotTypeInfo::Metadata p_meta); + StringName _get_int_type_name_from_meta(RebelTypeInfo::Metadata p_meta); + StringName _get_float_type_name_from_meta(RebelTypeInfo::Metadata p_meta); bool _arg_default_value_from_variant( const Variant& p_val, diff --git a/thirdparty/README.md b/thirdparty/README.md index 2e8f74295e..360e5b9325 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -253,7 +253,7 @@ File extracted from upstream release tarball: - The `LICENSE` file. - Applied the patch in `patches/1453.diff` (upstream PR: https://github.com/ARMmbed/mbedtls/pull/1453). -- Added 2 files `godot_core_mbedtls_platform.c` and `godot_core_mbedtls_config.h` +- Added 2 files `rebel_mbedtls_platform.c` and `rebel_mbedtls_config.h` providing configuration for light bundling with core. diff --git a/thirdparty/mbedtls/include/godot_core_mbedtls_config.h b/thirdparty/mbedtls/include/rebel_mbedtls_config.h similarity index 100% rename from thirdparty/mbedtls/include/godot_core_mbedtls_config.h rename to thirdparty/mbedtls/include/rebel_mbedtls_config.h diff --git a/thirdparty/mbedtls/library/godot_core_mbedtls_platform.c b/thirdparty/mbedtls/library/rebel_mbedtls_platform.c similarity index 100% rename from thirdparty/mbedtls/library/godot_core_mbedtls_platform.c rename to thirdparty/mbedtls/library/rebel_mbedtls_platform.c From 70726e13a1f66401e4d6a391f13174055a1a2081 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Tue, 27 Aug 2024 11:15:01 +0300 Subject: [PATCH 5/6] Apply Rebel branding to editor --- docs/HTTPRequest.xml | 2 +- editor/editor_feature_profile.cpp | 4 ++-- editor/editor_file_dialog.cpp | 3 +-- editor/editor_file_system.cpp | 3 +-- editor/editor_node.cpp | 2 +- editor/editor_run.cpp | 8 +++---- editor/editor_settings.cpp | 6 ++--- editor/editor_themes.cpp | 2 +- editor/export_template_manager.cpp | 4 ++-- editor/icons/README.md | 6 ++--- .../resource_importer_layered_texture.cpp | 2 +- editor/import/resource_importer_texture.cpp | 2 +- editor/plugin_config_dialog.cpp | 2 +- .../plugins/asset_library_editor_plugin.cpp | 11 ++++----- .../plugins/baked_lightmap_editor_plugin.cpp | 2 +- editor/plugins/script_editor_plugin.cpp | 2 +- editor/plugins/spatial_editor_plugin.cpp | 4 ++-- editor/plugins/spatial_editor_plugin.h | 2 +- .../plugins/visual_shader_editor_plugin.cpp | 4 ++-- editor/project_export.cpp | 2 +- editor/project_manager.cpp | 24 +++++++++---------- editor/script_editor_debugger.cpp | 6 +++-- 22 files changed, 50 insertions(+), 53 deletions(-) diff --git a/docs/HTTPRequest.xml b/docs/HTTPRequest.xml index 069d9d9847..7f98a8ceac 100644 --- a/docs/HTTPRequest.xml +++ b/docs/HTTPRequest.xml @@ -30,7 +30,7 @@ SPDX-License-Identifier: MIT # Perform a POST request. The URL below returns JSON as of writing. # Note: Don't make simultaneous requests using a single HTTPRequest node. # The snippet below is provided for reference only. - var body = {"name": "Godette"} + var body = {"name": "Rebel"} error = http_request.request("https://httpbin.org/post", [], true, HTTPClient.METHOD_POST, body) if error != OK: push_error("An error occurred in the HTTP request.") diff --git a/editor/editor_feature_profile.cpp b/editor/editor_feature_profile.cpp index fff8ef777b..e6f6485aa6 100644 --- a/editor/editor_feature_profile.cpp +++ b/editor/editor_feature_profile.cpp @@ -1225,7 +1225,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() { import_profiles = memnew(EditorFileDialog); add_child(import_profiles); import_profiles->set_mode(EditorFileDialog::MODE_OPEN_FILES); - import_profiles->add_filter("*.profile; " + TTR("Godot Feature Profile")); + import_profiles->add_filter("*.profile; " + TTR("Rebel Feature Profile")); import_profiles->connect("files_selected", this, "_import_profiles"); import_profiles->set_title(TTR("Import Profile(s)")); import_profiles->set_access(EditorFileDialog::ACCESS_FILESYSTEM); @@ -1233,7 +1233,7 @@ EditorFeatureProfileManager::EditorFeatureProfileManager() { export_profile = memnew(EditorFileDialog); add_child(export_profile); export_profile->set_mode(EditorFileDialog::MODE_SAVE_FILE); - export_profile->add_filter("*.profile; " + TTR("Godot Feature Profile")); + export_profile->add_filter("*.profile; " + TTR("Rebel Feature Profile")); export_profile->connect("file_selected", this, "_export_profile"); export_profile->set_title(TTR("Export Profile")); export_profile->set_access(EditorFileDialog::ACCESS_FILESYSTEM); diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index c3304cbb82..e693f41cd8 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -578,8 +578,7 @@ void EditorFileDialog::_item_list_item_rmb_selected( // Allow specific actions only on one item. bool single_item_selected = item_list->get_selected_items().size() == 1; - // Disallow deleting the .import folder, Godot kills a cat if you do and it - // is possibly a senseless novice action. + // Disallow deleting the .import folder. bool allow_delete = true; for (int i = 0; i < item_list->get_item_count(); i++) { if (!item_list->is_selected(i)) { diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index e42dd3948d..2976046bbb 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -18,8 +18,7 @@ #include "editor_settings.h" EditorFileSystem* EditorFileSystem::singleton = nullptr; -// the name is the version, to keep compatibility with different versions of -// Godot +// The version, to keep compatibility with different versions of Rebel Engine. #define CACHE_FILE_NAME "filesystem_cache6" void EditorFileSystemDirectory::sort_files() { diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index cedc5e5c21..500bd94197 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -6694,7 +6694,7 @@ bool EditorNode::call_build() { for (int i = 0; i < build_callback_count && builds_successful; i++) { if (!build_callbacks[i]()) { - ERR_PRINT("A Godot Engine build callback failed."); + ERR_PRINT("A Rebel Engine build callback failed."); builds_successful = false; } } diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index dc967f1cbf..2aff8e584d 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -200,7 +200,7 @@ Error EditorRun::run( if (p_custom_args != "") { // Allow the user to specify a command to run, similar to Steam's launch - // options. In this case, Godot will no longer be run directly; it's up + // options. In this case, Rebel will no longer be run directly; it's up // to the underlying command to run it. For instance, this can be used // on Linux to force a running project to use Optimus using `prime-run` // or similar. Example: `prime-run %command% --time-scale 0.5` @@ -218,7 +218,7 @@ Error EditorRun::run( exec = exec_args[0]; exec_args.remove(0); - // Append the Godot executable name before we append executable + // Append the Rebel executable name before we append executable // arguments (since the order is reversed when using // `push_front()`). args.push_front(OS::get_singleton()->get_executable_path()); @@ -230,7 +230,7 @@ Error EditorRun::run( args.push_front(exec_args[i].replace(" ", "%20")); } - // Append Godot-specific custom arguments. + // Append Rebel-specific custom arguments. custom_args = p_custom_args .substr(placeholder_pos + String("%command%").size()) @@ -239,7 +239,7 @@ Error EditorRun::run( args.push_back(custom_args[i].replace(" ", "%20")); } } else { - // Append Godot-specific custom arguments. + // Append Rebel-specific custom arguments. custom_args = p_custom_args.split(" ", false); for (int i = 0; i < custom_args.size(); i++) { args.push_back(custom_args[i].replace(" ", "%20")); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index e57d0725e4..c10bf5a430 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -255,7 +255,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { String host_lang = OS::get_singleton()->get_locale(); host_lang = TranslationServer::standardize_locale(host_lang); - // Some locales are not properly supported currently in Godot due to + // Some locales are not properly supported currently in Rebel due to // lack of font shaping (e.g. Arabic or Hindi), so even though we have // work in progress translations for them, we skip them as they don't // render properly. (GH-28577) @@ -442,7 +442,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { Variant::STRING, "interface/theme/preset", PROPERTY_HINT_ENUM, - "Default,Alien,Arc,Godot 2,Grey,Light,Solarized (Dark),Solarized " + "Default,Alien,Arc,Rebel 2,Grey,Light,Solarized (Dark),Solarized " "(Light),Custom", PROPERTY_USAGE_DEFAULT ); @@ -868,7 +868,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { Variant::INT, "editors/3d/navigation/navigation_scheme", PROPERTY_HINT_ENUM, - "Godot,Maya,Modo" + "Rebel,Maya,Modo" ); _initial_set("editors/3d/navigation/zoom_style", 0); hints["editors/3d/navigation/zoom_style"] = PropertyInfo( diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index bd8f4a815d..fbbc6b994c 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -566,7 +566,7 @@ Ref create_editor_theme(const Ref p_theme) { preset_accent_color = Color(0.32, 0.58, 0.89); preset_base_color = Color(0.22, 0.24, 0.29); preset_contrast = 0.25; - } else if (preset == "Godot 2") { + } else if (preset == "Rebel 2") { preset_accent_color = Color(0.53, 0.67, 0.89); preset_base_color = Color(0.24, 0.23, 0.27); preset_contrast = 0.25; diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index e686a37b4d..afbb3006e5 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -263,7 +263,7 @@ void ExportTemplateManager::_refresh_mirrors() { String current_version = VERSION_FULL_CONFIG; const String mirrors_metadata_url = - "https://godotengine.org/mirrorlist/" + current_version + ".json"; + "https://rebeltoolbox.org/mirrorlist/" + current_version + ".json"; request_mirrors->request(mirrors_metadata_url); } @@ -1271,7 +1271,7 @@ ExportTemplateManager::ExportTemplateManager() { install_file_dialog->set_title(TTR("Select Template File")); install_file_dialog->set_access(FileDialog::ACCESS_FILESYSTEM); install_file_dialog->set_mode(FileDialog::MODE_OPEN_FILE); - install_file_dialog->add_filter("*.tpz ; " + TTR("Godot Export Templates")); + install_file_dialog->add_filter("*.tpz ; " + TTR("Rebel Export Templates")); install_file_dialog->connect( "file_selected", this, diff --git a/editor/icons/README.md b/editor/icons/README.md index 0ae61276e5..a3f402d025 100644 --- a/editor/icons/README.md +++ b/editor/icons/README.md @@ -1,7 +1,7 @@ # Editor icons -This folder contains all the icons used by Godot editor (except for platform -icons which are located in their respective platform folder). +This folder contains all the icons used by Rebel Editor; +except for platform icons which are located in the platform folders. See [Editor icons](https://docs.rebeltoolbox.com/en/latest/development/editor/creating_icons.html) -in the documentation for details on creating icons for the Godot editor. +for details on creating icons for the Rebel Editor. diff --git a/editor/import/resource_importer_layered_texture.cpp b/editor/import/resource_importer_layered_texture.cpp index be4c022c29..32797a3482 100644 --- a/editor/import/resource_importer_layered_texture.cpp +++ b/editor/import/resource_importer_layered_texture.cpp @@ -134,7 +134,7 @@ void ResourceImporterLayeredTexture::_save_tex( } else { f->store_8('A'); } - f->store_8('T'); // godot streamable texture + f->store_8('T'); // Rebel streamable texture f->store_32(p_images[0]->get_width()); f->store_32(p_images[0]->get_height()); diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index 19b45de986..60be3dbfd9 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/editor/import/resource_importer_texture.cpp @@ -325,7 +325,7 @@ void ResourceImporterTexture::_save_stex( f->store_8('G'); f->store_8('D'); f->store_8('S'); - f->store_8('T'); // godot streamable texture + f->store_8('T'); // Rebel streamable texture bool resize_to_po2 = false; diff --git a/editor/plugin_config_dialog.cpp b/editor/plugin_config_dialog.cpp index 88203fd9aa..e1defe7c65 100644 --- a/editor/plugin_config_dialog.cpp +++ b/editor/plugin_config_dialog.cpp @@ -236,7 +236,7 @@ PluginConfigDialog::PluginConfigDialog() { grid->add_child(author_lb); author_edit = memnew(LineEdit); - author_edit->set_placeholder("Godette"); + author_edit->set_placeholder("Rebel"); grid->add_child(author_edit); Label* version_lb = memnew(Label); diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index 732a064864..f5ceac5bc7 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -717,8 +717,7 @@ void EditorAssetLibrary::_notification(int p_what) { void EditorAssetLibrary::_update_repository_options() { Dictionary default_urls; - default_urls["godotengine.org (Official)"] = - "https://godotengine.org/asset-library/api"; + default_urls["Rebel Marketplace"] = "https://marketplace.rebeltoolbox.com"; Dictionary available_urls = _EDITOR_DEF("asset_library/available_urls", default_urls, true); repository->clear(); @@ -779,10 +778,8 @@ const char* EditorAssetLibrary::sort_text[SORT_MAX] = { TTRC("Least Recently Updated"), TTRC("Name (A-Z)"), TTRC("Name (Z-A)"), - TTRC("License (A-Z)" - ), // "cost" stores the SPDX license name in the Godot Asset Library. - TTRC("License (Z-A)" - ), // "cost" stores the SPDX license name in the Godot Asset Library. + TTRC("License (A-Z)"), + TTRC("License (Z-A)"), }; const char* EditorAssetLibrary::support_key[SUPPORT_MAX] = { @@ -1129,7 +1126,7 @@ void EditorAssetLibrary::_search(int p_page) { // We use the "branch" version, i.e. major.minor, as patch releases should // be compatible - args += "&godot_version=" + String(VERSION_BRANCH); + args += "&rebel_version=" + String(VERSION_BRANCH); String support_list; for (int i = 0; i < SUPPORT_MAX; i++) { diff --git a/editor/plugins/baked_lightmap_editor_plugin.cpp b/editor/plugins/baked_lightmap_editor_plugin.cpp index 0f442dbe8f..fa4ee664d1 100644 --- a/editor/plugins/baked_lightmap_editor_plugin.cpp +++ b/editor/plugins/baked_lightmap_editor_plugin.cpp @@ -62,7 +62,7 @@ void BakedLightmapEditorPlugin::_bake_select_file(const String& p_file) { break; case BakedLightmap::BAKE_ERROR_NO_LIGHTMAPPER: EditorNode::get_singleton()->show_warning( - TTR("Godot editor was built without ray tracing support, " + TTR("Rebel Editor was built without ray tracing support, " "lightmaps can't be baked.") ); break; diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index c8aa96ff51..4c80837d5d 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -4221,7 +4221,7 @@ ScriptEditor::ScriptEditor(EditorNode* p_editor) { site_search ->connect("pressed", this, "_menu_option", varray(SEARCH_WEBSITE)); menu_hb->add_child(site_search); - site_search->set_tooltip(TTR("Open Godot online documentation.")); + site_search->set_tooltip(TTR("Open Rebel Documentation online.")); help_search = memnew(ToolButton); help_search->set_text(TTR("Search Help")); diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 9a8bd025d5..8b0f6f3732 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -2357,7 +2357,7 @@ void SpatialEditorViewport::_sinput(const Ref& p_event) { } else if (m->get_button_mask() & BUTTON_MASK_MIDDLE) { const int mod = _get_key_modifier(m); - if (nav_scheme == NAVIGATION_GODOT) { + if (nav_scheme == NAVIGATION_REBEL) { if (mod == _get_key_modifier_setting( "editors/3d/navigation/pan_modifier" @@ -2446,7 +2446,7 @@ void SpatialEditorViewport::_sinput(const Ref& p_event) { operator int(); NavigationMode nav_mode = NAVIGATION_NONE; - if (nav_scheme == NAVIGATION_GODOT) { + if (nav_scheme == NAVIGATION_REBEL) { const int mod = _get_key_modifier(pan_gesture); if (mod diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index 1aaed181da..c7f4400f17 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -264,7 +264,7 @@ class SpatialEditorViewport : public Control { }; enum NavigationScheme { - NAVIGATION_GODOT, + NAVIGATION_REBEL, NAVIGATION_MAYA, NAVIGATION_MODO, }; diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index 5ac18faec3..aca0235448 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -6278,7 +6278,7 @@ VisualShaderEditor::VisualShaderEditor() { "Special", "", "VisualShaderNodeExpression", - TTR("Custom Godot Shader Language expression, with custom amount of " + TTR("Custom Rebel Shader Language expression, with custom amount of " "input and output ports. This is a direct injection of code into " "the vertex/fragment/light function, do not use it to write the " "function declarations inside.") @@ -6298,7 +6298,7 @@ VisualShaderEditor::VisualShaderEditor() { "Special", "", "VisualShaderNodeGlobalExpression", - TTR("Custom Godot Shader Language expression, which is placed on top " + TTR("Custom Rebel Shader Language expression, which is placed on top " "of the resulted shader. You can place various function " "definitions inside and call it later in the Expressions. You can " "also declare varyings, uniforms and constants.") diff --git a/editor/project_export.cpp b/editor/project_export.cpp index 6ba32d6a94..eb9de4426d 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -1383,7 +1383,7 @@ ProjectExportDialog::ProjectExportDialog() { export_pck_zip = memnew(EditorFileDialog); export_pck_zip->add_filter("*.zip ; " + TTR("ZIP File")); - export_pck_zip->add_filter("*.pck ; " + TTR("Godot Game Pack")); + export_pck_zip->add_filter("*.pck ; " + TTR("Rebel Game Pack")); export_pck_zip->set_access(EditorFileDialog::ACCESS_FILESYSTEM); export_pck_zip->set_mode(EditorFileDialog::MODE_SAVE_FILE); add_child(export_pck_zip); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 80ccbdac57..c74eeef513 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -274,7 +274,7 @@ class ProjectDialog : public ConfirmationDialog { } else if (valid_path.ends_with("zip")) { set_message( - TTR("This directory already contains a Godot project."), + TTR("This directory already contains a Rebel project."), MESSAGE_ERROR, INSTALL_PATH ); @@ -1358,7 +1358,7 @@ void ProjectList::load_project_data( } if (config_version > ProjectSettings::CONFIG_VERSION) { - // Comes from an incompatible (more recent) Godot version, grey it out + // It comes from an more recent, non-backward compatible version. grayed = true; } @@ -1436,7 +1436,7 @@ void ProjectList::load_projects() { for (List::Element* E = properties.front(); E; E = E->next()) { // This is actually something like - // "projects/C:::Documents::Godot::Projects::MyGame" + // "projects/C:::Documents::Projects::MyGame" String property_key = E->get().name; if (!property_key.begins_with("projects/")) { continue; @@ -2324,11 +2324,11 @@ void ProjectManager::_open_selected_projects_ask() { if (config_version == 0) { ask_update_settings->set_text(vformat( TTR("The following project settings file does not specify the " - "version of Godot through which it was created.\n\n%s\n\nIf " - "you proceed with opening it, it will be converted to Godot's " - "current configuration file format.\nWarning: You won't be " - "able to open the project with previous versions of the engine " - "anymore."), + "version of Rebel used to create it.\n\n%s\n\n" + "If you proceed with opening it, it will be converted to " + "Rebel's current configuration file format.\n" + "Warning: You won't be able to open the project with previous " + "versions of the engine anymore."), conf )); ask_update_settings->popup_centered_minsize(); @@ -2630,8 +2630,9 @@ void ProjectManager::_files_dropped(PoolStringArray p_files, int p_screen) { varray(folders) ); multi_scan_ask->set_text(vformat( - TTR("Are you sure to scan %s folders for existing Godot " - "projects?\nThis could take a while."), + TTR("Are you sure to scan %s folders for existing Rebel " + "projects?\n" + "This could take a while."), folders.size() )); multi_scan_ask->popup_centered_minsize(); @@ -2854,8 +2855,7 @@ ProjectManager::ProjectManager() { String cp; cp += 0xA9; - // TRANSLATORS: This refers to the application where users manage their - // Godot projects. + // TRANSLATORS: Project Manager is the application used to manage projects. OS::get_singleton()->set_window_title( VERSION_NAME + String(" - ") + TTR("Project Manager") ); diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 6e5b02b003..ad70c62776 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -2617,7 +2617,8 @@ void ScriptEditorDebugger::_item_menu_id_pressed(int p_option) { // Git commit hash information available; use it for greater // accuracy, including for development versions. OS::get_singleton()->shell_open(vformat( - "https://github.com/godotengine/godot/blob/%s/%s#L%d", + "https://github.com/RebelToolbox/RebelEngine/blob/%s/" + "%s#L%d", VERSION_HASH, file, line_number @@ -2626,7 +2627,8 @@ void ScriptEditorDebugger::_item_menu_id_pressed(int p_option) { // Git commit hash information unavailable; fall back to tagged // releases. OS::get_singleton()->shell_open(vformat( - "https://github.com/godotengine/godot/blob/%s-stable/" + "https://github.com/RebelToolbox/RebelEngine/blob/" + "%s-stable/" "%s#L%d", VERSION_NUMBER, file, From 0b48d3179a265c13bda4733cbc3891001fd3daf5 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Sat, 19 Oct 2024 11:42:12 +0200 Subject: [PATCH 6/6] Apply Rebel branding to scene --- scene/3d/portal.cpp | 4 ---- scene/3d/portal.h | 12 +++------- scene/3d/room_manager.cpp | 38 +++++++++++++++----------------- scene/3d/room_manager.h | 12 +++++----- scene/SCsub | 2 +- scene/animation/SCsub | 2 +- scene/gui/graph_edit.cpp | 4 ++-- scene/gui/label.cpp | 4 +--- scene/resources/SCsub | 2 +- scene/resources/surface_tool.cpp | 11 ++++----- scene/resources/tile_set.cpp | 2 +- 11 files changed, 38 insertions(+), 55 deletions(-) diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 01794f9f01..0afc81ef70 100644 --- a/scene/3d/portal.cpp +++ b/scene/3d/portal.cpp @@ -37,10 +37,6 @@ Portal::Portal() { // object _portal_rid = VisualServer::get_singleton()->portal_create(); -#ifdef TOOLS_ENABLED - _room_manager_godot_ID = 0; -#endif - // portals are defined COUNTER clockwise, // because they point OUTWARD from the room in the direction // of the normal diff --git a/scene/3d/portal.h b/scene/3d/portal.h index 3cfd698748..2e71412c88 100644 --- a/scene/3d/portal.h +++ b/scene/3d/portal.h @@ -155,18 +155,12 @@ class Portal : public Spatial { real_t _margin; bool _use_default_margin; - // during conversion, we need to know - // whether this portal is being imported from a mesh - // and is using an explicitly named link room with prefix. - // If this is not the case, and it is already a Godot Portal node, - // we will either use the assigned nodepath, or autolink. + // During conversion, we need to know whether this portal is being imported + // from a mesh and is using an explicitly named link room with prefix. bool _importing_portal = false; - // for editing #ifdef TOOLS_ENABLED - ObjectID _room_manager_godot_ID; - - // warnings + // Warnings bool _warning_outside_room_aabb = false; bool _warning_facing_wrong_way = false; bool _warning_autolink_failed = false; diff --git a/scene/3d/room_manager.cpp b/scene/3d/room_manager.cpp index 10996f03e6..1bc798c888 100644 --- a/scene/3d/room_manager.cpp +++ b/scene/3d/room_manager.cpp @@ -133,12 +133,11 @@ void RoomManager::_preview_camera_update() { Ref world = get_world(); RID scenario = world->get_scenario(); - if (_godot_preview_camera_ID != (ObjectID)-1) { - Camera* cam = Object::cast_to( - ObjectDB::get_instance(_godot_preview_camera_ID) - ); + if (_preview_camera_ID != (ObjectID)-1) { + Camera* cam = + Object::cast_to(ObjectDB::get_instance(_preview_camera_ID)); if (!cam) { - _godot_preview_camera_ID = (ObjectID)-1; + _preview_camera_ID = (ObjectID)-1; } else { // get camera position and direction Vector3 camera_pos = cam->get_global_transform().origin; @@ -150,12 +149,12 @@ void RoomManager::_preview_camera_update() { // and tracking the camera deletes, which might be more error prone // for a debug feature... bool changed = false; - if (camera_pos != _godot_camera_pos) { + if (camera_pos != _camera_pos) { changed = true; } // check planes if (!changed) { - if (planes.size() != _godot_camera_planes.size()) { + if (planes.size() != _camera_planes.size()) { changed = true; } } @@ -163,7 +162,7 @@ void RoomManager::_preview_camera_update() { if (!changed) { // num of planes must be identical for (int n = 0; n < planes.size(); n++) { - if (planes[n] != _godot_camera_planes[n]) { + if (planes[n] != _camera_planes[n]) { changed = true; break; } @@ -171,8 +170,8 @@ void RoomManager::_preview_camera_update() { } if (changed) { - _godot_camera_pos = camera_pos; - _godot_camera_planes = planes; + _camera_pos = camera_pos; + _camera_planes = planes; VisualServer::get_singleton()->rooms_override_camera( scenario, true, @@ -188,7 +187,7 @@ void RoomManager::_notification(int p_what) { switch (p_what) { case NOTIFICATION_ENTER_TREE: { if (Engine::get_singleton()->is_editor_hint()) { - set_process_internal(_godot_preview_camera_ID != (ObjectID)-1); + set_process_internal(_preview_camera_ID != (ObjectID)-1); #ifdef TOOLS_ENABLED // note this mechanism may fail to work correctly if the user // creates two room managers, but should not create major @@ -468,11 +467,11 @@ void RoomManager::set_preview_camera_path(const NodePath& p_path) { resolve_preview_camera_path(); - bool camera_on = _godot_preview_camera_ID != (ObjectID)-1; + bool camera_on = _preview_camera_ID != (ObjectID)-1; // make sure the cached camera planes are invalid, this will // force an update to the visual server on the next internal_process - _godot_camera_planes.clear(); + _camera_planes.clear(); // if in the editor, turn processing on or off // according to whether the camera is overridden @@ -2251,7 +2250,7 @@ bool RoomManager::_bound_findpoints_mesh_instance( r_aabb.position = Vector3(FLT_MAX / 2, FLT_MAX / 2, FLT_MAX / 2); r_aabb.size = Vector3(-FLT_MAX, -FLT_MAX, -FLT_MAX); - // some godot jiggery pokery to get the mesh verts in local space + // Convert the mesh vertices to local space. Ref rmesh = p_mi->get_mesh(); ERR_FAIL_COND_V(!rmesh.is_valid(), false); @@ -2315,10 +2314,10 @@ bool RoomManager::resolve_preview_camera_path() { Camera* camera = _resolve_path(_settings_path_preview_camera); if (camera) { - _godot_preview_camera_ID = camera->get_instance_id(); + _preview_camera_ID = camera->get_instance_id(); return true; } - _godot_preview_camera_ID = -1; + _preview_camera_ID = -1; return false; } @@ -2513,12 +2512,11 @@ String RoomManager::_find_name_before( } } - // because godot doesn't support multiple nodes with the same name, we will - // strip e.g. a number after an * on the end of the name... e.g. - // kitchen*2-portal + // Rebel Engine doesn't support multiple nodes with the same name. + // Therefore, we strip everything after a '*'. + // e.g. kitchen*2-portal -> kitchen* for (int c = 0; c < name.length(); c++) { if (name[c] == GODOT_PORTAL_WILDCARD) { - // remove everything after and including this character name = name.substr(0, c); break; } diff --git a/scene/3d/room_manager.h b/scene/3d/room_manager.h index 8a481fe323..d8d33d06ce 100644 --- a/scene/3d/room_manager.h +++ b/scene/3d/room_manager.h @@ -367,12 +367,12 @@ class RoomManager : public Spatial { real_t _settings_roaming_expansion_margin = 1.0; // debug override camera - ObjectID _godot_preview_camera_ID = -1; - // local version of the godot camera frustum, - // to prevent updating the visual server (and causing - // a screen refresh) where not necessary. - Vector3 _godot_camera_pos; - Vector _godot_camera_planes; + ObjectID _preview_camera_ID = -1; + // Local version of the camera frustum. + // Prevents updating the visual server, which causes a screen refresh, + // if not necessary. + Vector3 _camera_pos; + Vector _camera_planes; protected: static void _bind_methods(); diff --git a/scene/SCsub b/scene/SCsub index ccd2bab8ff..1dc372a784 100644 --- a/scene/SCsub +++ b/scene/SCsub @@ -4,7 +4,7 @@ Import("env") env.scene_sources = [] -# Godot source files +# Rebel source files env.add_source_files(env.scene_sources, "*.cpp") # Chain load SCsubs diff --git a/scene/animation/SCsub b/scene/animation/SCsub index cc33a5af84..20dfcfb4a5 100644 --- a/scene/animation/SCsub +++ b/scene/animation/SCsub @@ -13,7 +13,7 @@ env_thirdparty.disable_warnings() env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) env.scene_sources += thirdparty_obj -# Godot source files +# Rebel source files scene_obj = [] diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 3417c2f361..0fe9407c31 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -276,8 +276,8 @@ void GraphEdit::_scroll_moved(double) { minimap->update(); update(); - if (!setting_scroll_ofs) { // in godot, signals on change value are avoided - // as a convention + if (!setting_scroll_ofs) { + // Signals on value change are avoided by default. emit_signal("scroll_offset_changed", get_scroll_ofs()); } } diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index 710af10c83..6be8e9536d 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -433,9 +433,7 @@ void Label::regenerate_word_cache() { current = String::char_uppercase(current); } - // ranges taken from https://en.wikipedia.org/wiki/Plane_(Unicode) - // if your language is not well supported, consider helping improve - // the unicode support in Godot. + // Ranges taken from https://en.wikipedia.org/wiki/Plane_(Unicode) bool separatable = (current >= 0x2E08 && current <= 0x9FFF) || // CJK scripts and symbols. diff --git a/scene/resources/SCsub b/scene/resources/SCsub index f4dc7a46fb..f3e230ad12 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -13,7 +13,7 @@ env_thirdparty.disable_warnings() env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) env.scene_sources += thirdparty_obj -# Godot source files +# Rebel source files scene_obj = [] diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index 5f1fac7ca0..a14a411f83 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -995,13 +995,10 @@ void SurfaceTool::mikktSetTSpaceDefault( } if (vtx != nullptr) { - vtx->tangent = Vector3(fvTangent[0], fvTangent[1], fvTangent[2]); - vtx->binormal = Vector3( - -fvBiTangent[0], - -fvBiTangent[1], - -fvBiTangent[2] - ); // for some reason these are reversed, something with the coordinate - // system in Godot + vtx->tangent = Vector3(fvTangent[0], fvTangent[1], fvTangent[2]); + // These are reversed, in the Rebel Engine coordinate system. + vtx->binormal = + Vector3(-fvBiTangent[0], -fvBiTangent[1], -fvBiTangent[2]); } } diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index bd272db706..c2f15359d8 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -39,7 +39,7 @@ bool TileSet::_set(const StringName& p_name, const Variant& p_value) { } else if (what == "tile_mode") { tile_set_tile_mode(id, (TileMode)((int)p_value)); } else if (what == "is_autotile") { - // backward compatibility for Godot 3.0.x + // Backward compatibility // autotile used to be a bool, it's now an enum bool is_autotile = p_value; if (is_autotile) {