diff options
Diffstat (limited to 'platform')
384 files changed, 2168 insertions, 1024 deletions
diff --git a/platform/android/android_input_handler.cpp b/platform/android/android_input_handler.cpp index 41edc35276..efabc2e565 100644 --- a/platform/android/android_input_handler.cpp +++ b/platform/android/android_input_handler.cpp @@ -2,9 +2,11 @@ /* android_input_handler.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/android_input_handler.h b/platform/android/android_input_handler.h index e3365d8cb8..c8c7d459dd 100644 --- a/platform/android/android_input_handler.h +++ b/platform/android/android_input_handler.h @@ -2,9 +2,11 @@ /* android_input_handler.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/android_keys_utils.cpp b/platform/android/android_keys_utils.cpp index 83ee98e8bc..bae81f873f 100644 --- a/platform/android/android_keys_utils.cpp +++ b/platform/android/android_keys_utils.cpp @@ -2,9 +2,11 @@ /* android_keys_utils.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/android_keys_utils.h b/platform/android/android_keys_utils.h index 77c0911f2b..f3cd5056fb 100644 --- a/platform/android/android_keys_utils.h +++ b/platform/android/android_keys_utils.h @@ -2,9 +2,11 @@ /* android_keys_utils.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/api/api.cpp b/platform/android/api/api.cpp index 60c369951c..f90650dc00 100644 --- a/platform/android/api/api.cpp +++ b/platform/android/api/api.cpp @@ -2,9 +2,11 @@ /* api.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/api/api.h b/platform/android/api/api.h index c744e464d5..004daa8cbc 100644 --- a/platform/android/api/api.h +++ b/platform/android/api/api.h @@ -2,9 +2,11 @@ /* api.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/api/java_class_wrapper.h b/platform/android/api/java_class_wrapper.h index e21a331ab9..cbcb4bf49a 100644 --- a/platform/android/api/java_class_wrapper.h +++ b/platform/android/api/java_class_wrapper.h @@ -2,9 +2,11 @@ /* java_class_wrapper.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/api/jni_singleton.h b/platform/android/api/jni_singleton.h index 087fd1bace..f3efbe9fbe 100644 --- a/platform/android/api/jni_singleton.h +++ b/platform/android/api/jni_singleton.h @@ -2,9 +2,11 @@ /* jni_singleton.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/audio_driver_opensl.cpp b/platform/android/audio_driver_opensl.cpp index ef9c51db07..a2877bcb93 100644 --- a/platform/android/audio_driver_opensl.cpp +++ b/platform/android/audio_driver_opensl.cpp @@ -2,9 +2,11 @@ /* audio_driver_opensl.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/audio_driver_opensl.h b/platform/android/audio_driver_opensl.h index bcd173826a..c752c2ab3d 100644 --- a/platform/android/audio_driver_opensl.h +++ b/platform/android/audio_driver_opensl.h @@ -2,9 +2,11 @@ /* audio_driver_opensl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp index ab90527bfa..f17b3ff787 100644 --- a/platform/android/dir_access_jandroid.cpp +++ b/platform/android/dir_access_jandroid.cpp @@ -2,9 +2,11 @@ /* dir_access_jandroid.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/dir_access_jandroid.h b/platform/android/dir_access_jandroid.h index 68578b0fa9..c9bc6f7931 100644 --- a/platform/android/dir_access_jandroid.h +++ b/platform/android/dir_access_jandroid.h @@ -2,9 +2,11 @@ /* dir_access_jandroid.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/display_server_android.cpp b/platform/android/display_server_android.cpp index 1d6e9e8a15..ba5ab60bc6 100644 --- a/platform/android/display_server_android.cpp +++ b/platform/android/display_server_android.cpp @@ -2,9 +2,11 @@ /* display_server_android.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/display_server_android.h b/platform/android/display_server_android.h index 90bda18cfa..fd546cd1a2 100644 --- a/platform/android/display_server_android.h +++ b/platform/android/display_server_android.h @@ -2,9 +2,11 @@ /* display_server_android.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 6a6d7149ff..308446e1b5 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -2,9 +2,11 @@ /* export.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/export/export.h b/platform/android/export/export.h index bd689a400d..67dd71fbc6 100644 --- a/platform/android/export/export.h +++ b/platform/android/export/export.h @@ -2,9 +2,11 @@ /* export.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/export/export_plugin.cpp b/platform/android/export/export_plugin.cpp index d5153fb6c0..2f45c12a53 100644 --- a/platform/android/export/export_plugin.cpp +++ b/platform/android/export/export_plugin.cpp @@ -2,9 +2,11 @@ /* export_plugin.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -1782,7 +1784,7 @@ String EditorExportPlatformAndroid::get_export_option_warning(const EditorExport } else { min_sdk_int = min_sdk_str.to_int(); if (min_sdk_int < OPENGL_MIN_SDK_VERSION) { - return vformat(TTR("\"Min SDK\" cannot be lower than %d, which is the version needed by the Godot library."), OPENGL_MIN_SDK_VERSION); + return vformat(TTR("\"Min SDK\" cannot be lower than %d, which is the version needed by the Redot library."), OPENGL_MIN_SDK_VERSION); } } } diff --git a/platform/android/export/export_plugin.h b/platform/android/export/export_plugin.h index 97bbd0c7bc..366a9be196 100644 --- a/platform/android/export/export_plugin.h +++ b/platform/android/export/export_plugin.h @@ -2,9 +2,11 @@ /* export_plugin.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/export/godot_plugin_config.cpp b/platform/android/export/godot_plugin_config.cpp index cdec5f55b7..17ead2cda7 100644 --- a/platform/android/export/godot_plugin_config.cpp +++ b/platform/android/export/godot_plugin_config.cpp @@ -2,9 +2,11 @@ /* godot_plugin_config.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/export/godot_plugin_config.h b/platform/android/export/godot_plugin_config.h index 8c56d00187..68218824b9 100644 --- a/platform/android/export/godot_plugin_config.h +++ b/platform/android/export/godot_plugin_config.h @@ -2,9 +2,11 @@ /* godot_plugin_config.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/export/gradle_export_util.cpp b/platform/android/export/gradle_export_util.cpp index 9eddef6a4c..01ac937606 100644 --- a/platform/android/export/gradle_export_util.cpp +++ b/platform/android/export/gradle_export_util.cpp @@ -2,9 +2,11 @@ /* gradle_export_util.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/export/gradle_export_util.h b/platform/android/export/gradle_export_util.h index 9f8e476f73..aa272e2b4e 100644 --- a/platform/android/export/gradle_export_util.h +++ b/platform/android/export/gradle_export_util.h @@ -2,9 +2,11 @@ /* gradle_export_util.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp index ae336d6f9d..fb34adf6fe 100644 --- a/platform/android/file_access_android.cpp +++ b/platform/android/file_access_android.cpp @@ -2,9 +2,11 @@ /* file_access_android.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/file_access_android.h b/platform/android/file_access_android.h index e79daeafb3..9f03998522 100644 --- a/platform/android/file_access_android.h +++ b/platform/android/file_access_android.h @@ -2,9 +2,11 @@ /* file_access_android.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/file_access_filesystem_jandroid.cpp b/platform/android/file_access_filesystem_jandroid.cpp index f28d469d07..6a1577ed1b 100644 --- a/platform/android/file_access_filesystem_jandroid.cpp +++ b/platform/android/file_access_filesystem_jandroid.cpp @@ -2,9 +2,11 @@ /* file_access_filesystem_jandroid.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/file_access_filesystem_jandroid.h b/platform/android/file_access_filesystem_jandroid.h index 6a8fc524b7..82d4e4550b 100644 --- a/platform/android/file_access_filesystem_jandroid.h +++ b/platform/android/file_access_filesystem_jandroid.h @@ -2,9 +2,11 @@ /* file_access_filesystem_jandroid.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/AndroidManifest.xml index 0cc929d226..671d46fbe3 100644 --- a/platform/android/java/app/AndroidManifest.xml +++ b/platform/android/java/app/AndroidManifest.xml @@ -31,7 +31,7 @@ <!-- Records the version of the Godot editor used for building --> <meta-data - android:name="org.godotengine.editor.version" + android:name="org.redotengine.editor.version" android:value="${godotEditorVersion}" /> <activity diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index 01d5d9ef92..170d9a4376 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -282,7 +282,7 @@ task copyAndRenameReleaseAab(type: Copy) { */ task validateJavaVersion { if (JavaVersion.current() != versions.javaVersion) { - throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the required Java version for Godot gradle builds.") + throw new GradleException("Invalid Java version ${JavaVersion.current()}. Version ${versions.javaVersion} is the required Java version for Redot gradle builds.") } } diff --git a/platform/android/java/app/src/com/godot/game/GodotApp.java b/platform/android/java/app/src/com/godot/game/GodotApp.java index 22e617f6e7..a947b617b6 100644 --- a/platform/android/java/app/src/com/godot/game/GodotApp.java +++ b/platform/android/java/app/src/com/godot/game/GodotApp.java @@ -2,9 +2,11 @@ /* GodotApp.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -30,12 +32,12 @@ package com.godot.game; -import org.godotengine.godot.GodotActivity; - import android.os.Bundle; import androidx.core.splashscreen.SplashScreen; +import org.redotengine.godot.GodotActivity; + /** * Template activity for Godot Android builds. * Feel free to extend and modify this class for your custom logic. diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index f5555289fd..1ee87b99d9 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -152,7 +152,7 @@ task copyReleaseAARToBin(type: Copy) { task zipGradleBuild(type: Zip) { onlyIf { generateGodotTemplates.state.executed || generateDevTemplate.state.executed } doFirst { - logger.lifecycle("Generating Godot gradle build template") + logger.lifecycle("Generating Redot gradle build template") } from(fileTree(dir: 'app', excludes: ['**/build/**', '**/.gradle/**', '**/*.iml']), fileTree(dir: '.', includes: ['gradlew', 'gradlew.bat', 'gradle/**'])) include '**/*' diff --git a/platform/android/java/editor/build.gradle b/platform/android/java/editor/build.gradle index 37f68d295a..d8ef1bc038 100644 --- a/platform/android/java/editor/build.gradle +++ b/platform/android/java/editor/build.gradle @@ -83,11 +83,11 @@ android { buildToolsVersion versions.buildTools ndkVersion versions.ndkVersion - namespace = "org.godotengine.editor" + namespace = "org.redotengine.editor" defaultConfig { - // The 'applicationId' suffix allows to install Godot 3.x(v3) and 4.x(v4) on the same device - applicationId "org.godotengine.editor.v4" + // The 'applicationId' suffix allows to install Redot 3.x(v3) and 4.x(v4) on the same device + applicationId "org.redotengine.editor.v4" versionCode generateVersionCode() versionName generateVersionName() minSdkVersion versions.minSdk @@ -95,7 +95,7 @@ android { missingDimensionStrategy 'products', 'editor' manifestPlaceholders += [ - editorAppName: "Godot Editor 4", + editorAppName: "Redot Editor 4", editorBuildSuffix: "" ] } diff --git a/platform/android/java/editor/src/main/AndroidManifest.xml b/platform/android/java/editor/src/main/AndroidManifest.xml index c7d14a3f49..a875745860 100644 --- a/platform/android/java/editor/src/main/AndroidManifest.xml +++ b/platform/android/java/editor/src/main/AndroidManifest.xml @@ -42,6 +42,7 @@ android:name=".GodotEditor" android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode" android:exported="true" + android:icon="@mipmap/icon" android:launchMode="singleTask" android:screenOrientation="userLandscape"> <layout @@ -59,9 +60,11 @@ android:name=".GodotGame" android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode" android:exported="false" - android:label="@string/godot_project_name_string" + android:icon="@mipmap/ic_play_window" + android:label="@string/godot_game_activity_name" android:launchMode="singleTask" android:process=":GodotGame" + android:supportsPictureInPicture="true" android:screenOrientation="userLandscape"> <layout android:defaultWidth="@dimen/editor_default_window_width" diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorMessageDispatcher.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorMessageDispatcher.kt new file mode 100644 index 0000000000..920c7d8bac --- /dev/null +++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorMessageDispatcher.kt @@ -0,0 +1,194 @@ +/**************************************************************************/ +/* EditorMessageDispatcher.kt */ +/**************************************************************************/ +/* This file is part of: */ +/* REDOT ENGINE */ +/* https://redotengine.org */ +/**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ +/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ +/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/**************************************************************************/ + +package org.redotengine.editor + +import android.annotation.SuppressLint +import android.content.Intent +import android.content.pm.PackageManager +import android.os.Bundle +import android.os.Handler +import android.os.Message +import android.os.Messenger +import android.os.RemoteException +import android.util.Log +import java.util.concurrent.ConcurrentHashMap + +/** + * Used by the [GodotEditor] classes to dispatch messages across processes. + */ +internal class EditorMessageDispatcher(private val editor: GodotEditor) { + + companion object { + private val TAG = EditorMessageDispatcher::class.java.simpleName + + /** + * Extra used to pass the message dispatcher payload through an [Intent] + */ + const val EXTRA_MSG_DISPATCHER_PAYLOAD = "message_dispatcher_payload" + + /** + * Key used to pass the editor id through a [Bundle] + */ + private const val KEY_EDITOR_ID = "editor_id" + + /** + * Key used to pass the editor messenger through a [Bundle] + */ + private const val KEY_EDITOR_MESSENGER = "editor_messenger" + + /** + * Requests the recipient to quit right away. + */ + private const val MSG_FORCE_QUIT = 0 + + /** + * Requests the recipient to store the passed [android.os.Messenger] instance. + */ + private const val MSG_REGISTER_MESSENGER = 1 + } + + private val recipientsMessengers = ConcurrentHashMap<Int, Messenger>() + + @SuppressLint("HandlerLeak") + private val dispatcherHandler = object : Handler() { + override fun handleMessage(msg: Message) { + when (msg.what) { + MSG_FORCE_QUIT -> editor.finish() + + MSG_REGISTER_MESSENGER -> { + val editorId = msg.arg1 + val messenger = msg.replyTo + registerMessenger(editorId, messenger) + } + + else -> super.handleMessage(msg) + } + } + } + + /** + * Request the window with the given [editorId] to force quit. + */ + fun requestForceQuit(editorId: Int): Boolean { + val messenger = recipientsMessengers[editorId] ?: return false + return try { + Log.v(TAG, "Requesting 'forceQuit' for $editorId") + val msg = Message.obtain(null, MSG_FORCE_QUIT) + messenger.send(msg) + true + } catch (e: RemoteException) { + Log.e(TAG, "Error requesting 'forceQuit' to $editorId", e) + recipientsMessengers.remove(editorId) + false + } + } + + /** + * Utility method to register a receiver messenger. + */ + private fun registerMessenger(editorId: Int, messenger: Messenger?, messengerDeathCallback: Runnable? = null) { + try { + if (messenger == null) { + Log.w(TAG, "Invalid 'replyTo' payload") + } else if (messenger.binder.isBinderAlive) { + messenger.binder.linkToDeath({ + Log.v(TAG, "Removing messenger for $editorId") + recipientsMessengers.remove(editorId) + messengerDeathCallback?.run() + }, 0) + recipientsMessengers[editorId] = messenger + } + } catch (e: RemoteException) { + Log.e(TAG, "Unable to register messenger from $editorId", e) + recipientsMessengers.remove(editorId) + } + } + + /** + * Utility method to register a [Messenger] attached to this handler with a host. + * + * This is done so that the host can send request to the editor instance attached to this handle. + * + * Note that this is only done when the editor instance is internal (not exported) to prevent + * arbitrary apps from having the ability to send requests. + */ + private fun registerSelfTo(pm: PackageManager, host: Messenger?, selfId: Int) { + try { + if (host == null || !host.binder.isBinderAlive) { + Log.v(TAG, "Host is unavailable") + return + } + + val activityInfo = pm.getActivityInfo(editor.componentName, 0) + if (activityInfo.exported) { + Log.v(TAG, "Not registering self to host as we're exported") + return + } + + Log.v(TAG, "Registering self $selfId to host") + val msg = Message.obtain(null, MSG_REGISTER_MESSENGER) + msg.arg1 = selfId + msg.replyTo = Messenger(dispatcherHandler) + host.send(msg) + } catch (e: RemoteException) { + Log.e(TAG, "Unable to register self with host", e) + } + } + + /** + * Parses the starting intent and retrieve an editor messenger if available + */ + fun parseStartIntent(pm: PackageManager, intent: Intent) { + val messengerBundle = intent.getBundleExtra(EXTRA_MSG_DISPATCHER_PAYLOAD) ?: return + + // Retrieve the sender messenger payload and store it. This can be used to communicate back + // to the sender. + val senderId = messengerBundle.getInt(KEY_EDITOR_ID) + val senderMessenger: Messenger? = messengerBundle.getParcelable(KEY_EDITOR_MESSENGER) + registerMessenger(senderId, senderMessenger) + + // Register ourselves to the sender so that it can communicate with us. + registerSelfTo(pm, senderMessenger, editor.getEditorId()) + } + + /** + * Returns the payload used by the [EditorMessageDispatcher] class to establish an IPC bridge + * across editor instances. + */ + fun getMessageDispatcherPayload(): Bundle { + return Bundle().apply { + putInt(KEY_EDITOR_ID, editor.getEditorId()) + putParcelable(KEY_EDITOR_MESSENGER, Messenger(dispatcherHandler)) + } + } +} diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorWindowInfo.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorWindowInfo.kt index 0da1d01aed..029e3e6043 100644 --- a/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorWindowInfo.kt +++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/EditorWindowInfo.kt @@ -2,9 +2,11 @@ /* EditorWindowInfo.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,26 +30,27 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.editor +package org.redotengine.editor /** - * Specifies the policy for adjacent launches. + * Specifies the policy for launches. */ -enum class LaunchAdjacentPolicy { +enum class LaunchPolicy { /** - * Adjacent launches are disabled. + * Launch policy is determined by the editor settings or based on the device and screen metrics. */ - DISABLED, + AUTO, + /** - * Adjacent launches are enabled / disabled based on the device and screen metrics. + * Launches happen in the same window. */ - AUTO, + SAME, /** * Adjacent launches are enabled. */ - ENABLED + ADJACENT } /** @@ -57,12 +60,14 @@ data class EditorWindowInfo( val windowClassName: String, val windowId: Int, val processNameSuffix: String, - val launchAdjacentPolicy: LaunchAdjacentPolicy = LaunchAdjacentPolicy.DISABLED + val launchPolicy: LaunchPolicy = LaunchPolicy.SAME, + val supportsPiPMode: Boolean = false ) { constructor( windowClass: Class<*>, windowId: Int, processNameSuffix: String, - launchAdjacentPolicy: LaunchAdjacentPolicy = LaunchAdjacentPolicy.DISABLED - ) : this(windowClass.name, windowId, processNameSuffix, launchAdjacentPolicy) + launchPolicy: LaunchPolicy = LaunchPolicy.SAME, + supportsPiPMode: Boolean = false + ) : this(windowClass.name, windowId, processNameSuffix, launchPolicy, supportsPiPMode) } diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt index 7c11d69609..5f5f84afd8 100644 --- a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt +++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotEditor.kt @@ -2,9 +2,11 @@ /* GodotEditor.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,10 +30,11 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.editor +package org.redotengine.editor import android.Manifest import android.app.ActivityManager +import android.app.ActivityOptions import android.content.ComponentName import android.content.Context import android.content.Intent @@ -43,10 +46,10 @@ import android.widget.Toast import androidx.annotation.CallSuper import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.window.layout.WindowMetricsCalculator -import org.godotengine.godot.GodotActivity -import org.godotengine.godot.GodotLib -import org.godotengine.godot.utils.PermissionsUtil -import org.godotengine.godot.utils.ProcessPhoenix +import org.redotengine.godot.GodotActivity +import org.redotengine.godot.GodotLib +import org.redotengine.godot.utils.PermissionsUtil +import org.redotengine.godot.utils.ProcessPhoenix import java.util.* import kotlin.math.min @@ -66,17 +69,24 @@ open class GodotEditor : GodotActivity() { private const val WAIT_FOR_DEBUGGER = false - private const val EXTRA_COMMAND_LINE_PARAMS = "command_line_params" + @JvmStatic + protected val EXTRA_COMMAND_LINE_PARAMS = "command_line_params" + @JvmStatic + protected val EXTRA_PIP_AVAILABLE = "pip_available" + @JvmStatic + protected val EXTRA_LAUNCH_IN_PIP = "launch_in_pip_requested" // Command line arguments private const val EDITOR_ARG = "--editor" private const val EDITOR_ARG_SHORT = "-e" private const val EDITOR_PROJECT_MANAGER_ARG = "--project-manager" private const val EDITOR_PROJECT_MANAGER_ARG_SHORT = "-p" + private const val BREAKPOINTS_ARG = "--breakpoints" + private const val BREAKPOINTS_ARG_SHORT = "-b" // Info for the various classes used by the editor internal val EDITOR_MAIN_INFO = EditorWindowInfo(GodotEditor::class.java, 777, "") - internal val RUN_GAME_INFO = EditorWindowInfo(GodotGame::class.java, 667, ":GodotGame", LaunchAdjacentPolicy.AUTO) + internal val RUN_GAME_INFO = EditorWindowInfo(GodotGame::class.java, 667, ":GodotGame", LaunchPolicy.AUTO, true) /** * Sets of constants to specify the window to use to run the project. @@ -87,13 +97,26 @@ open class GodotEditor : GodotActivity() { private const val ANDROID_WINDOW_AUTO = 0 private const val ANDROID_WINDOW_SAME_AS_EDITOR = 1 private const val ANDROID_WINDOW_SIDE_BY_SIDE_WITH_EDITOR = 2 + + /** + * Sets of constants to specify the Play window PiP mode. + * + * Should match the values in `editor/editor_settings.cpp'` for the + * 'run/window_placement/play_window_pip_mode' setting. + */ + private const val PLAY_WINDOW_PIP_DISABLED = 0 + private const val PLAY_WINDOW_PIP_ENABLED = 1 + private const val PLAY_WINDOW_PIP_ENABLED_FOR_SAME_AS_EDITOR = 2 } + private val editorMessageDispatcher = EditorMessageDispatcher(this) private val commandLineParams = ArrayList<String>() private val editorLoadingIndicator: View? by lazy { findViewById(R.id.editor_loading_indicator) } override fun getGodotAppLayout() = R.layout.godot_editor_layout + internal open fun getEditorId() = EDITOR_MAIN_INFO.windowId + override fun onCreate(savedInstanceState: Bundle?) { installSplashScreen() @@ -105,6 +128,8 @@ open class GodotEditor : GodotActivity() { Log.d(TAG, "Starting intent $intent with parameters ${params.contentToString()}") updateCommandLineParams(params?.asList() ?: emptyList()) + editorMessageDispatcher.parseStartIntent(packageManager, intent) + if (BuildConfig.BUILD_TYPE == "dev" && WAIT_FOR_DEBUGGER) { Debug.waitForDebugger() } @@ -186,35 +211,67 @@ open class GodotEditor : GodotActivity() { } } - override fun onNewGodotInstanceRequested(args: Array<String>): Int { - val editorWindowInfo = getEditorWindowInfo(args) - - // Launch a new activity + protected fun getNewGodotInstanceIntent(editorWindowInfo: EditorWindowInfo, args: Array<String>): Intent { val newInstance = Intent() .setComponent(ComponentName(this, editorWindowInfo.windowClassName)) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .putExtra(EXTRA_COMMAND_LINE_PARAMS, args) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - if (editorWindowInfo.launchAdjacentPolicy == LaunchAdjacentPolicy.ENABLED || - (editorWindowInfo.launchAdjacentPolicy == LaunchAdjacentPolicy.AUTO && shouldGameLaunchAdjacent())) { + + val launchPolicy = resolveLaunchPolicyIfNeeded(editorWindowInfo.launchPolicy) + val isPiPAvailable = if (editorWindowInfo.supportsPiPMode && hasPiPSystemFeature()) { + val pipMode = getPlayWindowPiPMode() + pipMode == PLAY_WINDOW_PIP_ENABLED || + (pipMode == PLAY_WINDOW_PIP_ENABLED_FOR_SAME_AS_EDITOR && launchPolicy == LaunchPolicy.SAME) + } else { + false + } + newInstance.putExtra(EXTRA_PIP_AVAILABLE, isPiPAvailable) + + if (launchPolicy == LaunchPolicy.ADJACENT) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { Log.v(TAG, "Adding flag for adjacent launch") newInstance.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT) } + } else if (launchPolicy == LaunchPolicy.SAME) { + if (isPiPAvailable && + (args.contains(BREAKPOINTS_ARG) || args.contains(BREAKPOINTS_ARG_SHORT))) { + Log.v(TAG, "Launching in PiP mode because of breakpoints") + newInstance.putExtra(EXTRA_LAUNCH_IN_PIP, true) + } } + + return newInstance + } + + override fun onNewGodotInstanceRequested(args: Array<String>): Int { + val editorWindowInfo = getEditorWindowInfo(args) + + // Launch a new activity + val sourceView = godotFragment?.view + val activityOptions = if (sourceView == null) { + null + } else { + val startX = sourceView.width / 2 + val startY = sourceView.height / 2 + ActivityOptions.makeScaleUpAnimation(sourceView, startX, startY, 0, 0) + } + + val newInstance = getNewGodotInstanceIntent(editorWindowInfo, args) if (editorWindowInfo.windowClassName == javaClass.name) { Log.d(TAG, "Restarting ${editorWindowInfo.windowClassName} with parameters ${args.contentToString()}") val godot = godot if (godot != null) { godot.destroyAndKillProcess { - ProcessPhoenix.triggerRebirth(this, newInstance) + ProcessPhoenix.triggerRebirth(this, activityOptions?.toBundle(), newInstance) } } else { - ProcessPhoenix.triggerRebirth(this, newInstance) + ProcessPhoenix.triggerRebirth(this, activityOptions?.toBundle(), newInstance) } } else { Log.d(TAG, "Starting ${editorWindowInfo.windowClassName} with parameters ${args.contentToString()}") newInstance.putExtra(EXTRA_NEW_LAUNCH, true) - startActivity(newInstance) + .putExtra(EditorMessageDispatcher.EXTRA_MSG_DISPATCHER_PAYLOAD, editorMessageDispatcher.getMessageDispatcherPayload()) + startActivity(newInstance, activityOptions?.toBundle()) } return editorWindowInfo.windowId } @@ -228,6 +285,12 @@ open class GodotEditor : GodotActivity() { return true } + // Send an inter-process message to request the target editor window to force quit. + if (editorMessageDispatcher.requestForceQuit(editorWindowInfo.windowId)) { + return true + } + + // Fallback to killing the target process. val processName = packageName + editorWindowInfo.processNameSuffix val activityManager = getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager val runningProcesses = activityManager.runningAppProcesses @@ -282,29 +345,65 @@ open class GodotEditor : GodotActivity() { java.lang.Boolean.parseBoolean(GodotLib.getEditorSetting("interface/touchscreen/enable_pan_and_scale_gestures")) /** - * Whether we should launch the new godot instance in an adjacent window - * @see https://developer.android.com/reference/android/content/Intent#FLAG_ACTIVITY_LAUNCH_ADJACENT + * Retrieves the play window pip mode editor setting. + */ + private fun getPlayWindowPiPMode(): Int { + return try { + Integer.parseInt(GodotLib.getEditorSetting("run/window_placement/play_window_pip_mode")) + } catch (e: NumberFormatException) { + PLAY_WINDOW_PIP_ENABLED_FOR_SAME_AS_EDITOR + } + } + + /** + * If the launch policy is [LaunchPolicy.AUTO], resolve it into a specific policy based on the + * editor setting or device and screen metrics. + * + * If the launch policy is [LaunchPolicy.PIP] but PIP is not supported, fallback to the default + * launch policy. */ - private fun shouldGameLaunchAdjacent(): Boolean { - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - try { - when (Integer.parseInt(GodotLib.getEditorSetting("run/window_placement/android_window"))) { - ANDROID_WINDOW_SAME_AS_EDITOR -> false - ANDROID_WINDOW_SIDE_BY_SIDE_WITH_EDITOR -> true - else -> { - // ANDROID_WINDOW_AUTO - isInMultiWindowMode || isLargeScreen + private fun resolveLaunchPolicyIfNeeded(policy: LaunchPolicy): LaunchPolicy { + val inMultiWindowMode = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + isInMultiWindowMode + } else { + false + } + val defaultLaunchPolicy = if (inMultiWindowMode || isLargeScreen) { + LaunchPolicy.ADJACENT + } else { + LaunchPolicy.SAME + } + + return when (policy) { + LaunchPolicy.AUTO -> { + try { + when (Integer.parseInt(GodotLib.getEditorSetting("run/window_placement/android_window"))) { + ANDROID_WINDOW_SAME_AS_EDITOR -> LaunchPolicy.SAME + ANDROID_WINDOW_SIDE_BY_SIDE_WITH_EDITOR -> LaunchPolicy.ADJACENT + else -> { + // ANDROID_WINDOW_AUTO + defaultLaunchPolicy + } } + } catch (e: NumberFormatException) { + Log.w(TAG, "Error parsing the Android window placement editor setting", e) + // Fall-back to the default launch policy + defaultLaunchPolicy } - } catch (e: NumberFormatException) { - // Fall-back to the 'Auto' behavior - isInMultiWindowMode || isLargeScreen } - } else { - false + + else -> { + policy + } } } + /** + * Returns true the if the device supports picture-in-picture (PiP) + */ + protected open fun hasPiPSystemFeature() = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && + packageManager.hasSystemFeature(PackageManager.FEATURE_PICTURE_IN_PICTURE) + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) // Check if we got the MANAGE_EXTERNAL_STORAGE permission diff --git a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt index 2bcfba559c..4fe93da4d8 100644 --- a/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt +++ b/platform/android/java/editor/src/main/java/org/godotengine/editor/GodotGame.kt @@ -2,9 +2,11 @@ /* GodotGame.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,16 +30,107 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.editor +package org.redotengine.editor -import org.godotengine.godot.GodotLib +import android.annotation.SuppressLint +import android.app.PictureInPictureParams +import android.content.Intent +import android.graphics.Rect +import android.os.Build +import android.os.Bundle +import android.util.Log +import android.view.View +import org.redotengine.godot.GodotLib /** * Drives the 'run project' window of the Godot Editor. */ class GodotGame : GodotEditor() { - override fun getGodotAppLayout() = org.godotengine.godot.R.layout.godot_app_layout + companion object { + private val TAG = GodotGame::class.java.simpleName + } + + private val gameViewSourceRectHint = Rect() + private val pipButton: View? by lazy { + findViewById(R.id.godot_pip_button) + } + + private var pipAvailable = false + + @SuppressLint("ClickableViewAccessibility") + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val gameView = findViewById<View>(R.id.godot_fragment_container) + gameView?.addOnLayoutChangeListener { v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom -> + gameView.getGlobalVisibleRect(gameViewSourceRectHint) + } + } + + pipButton?.setOnClickListener { enterPiPMode() } + + handleStartIntent(intent) + } + + override fun onNewIntent(newIntent: Intent) { + super.onNewIntent(newIntent) + handleStartIntent(newIntent) + } + + private fun handleStartIntent(intent: Intent) { + pipAvailable = intent.getBooleanExtra(EXTRA_PIP_AVAILABLE, pipAvailable) + updatePiPButtonVisibility() + + val pipLaunchRequested = intent.getBooleanExtra(EXTRA_LAUNCH_IN_PIP, false) + if (pipLaunchRequested) { + enterPiPMode() + } + } + + private fun updatePiPButtonVisibility() { + pipButton?.visibility = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && pipAvailable && !isInPictureInPictureMode) { + View.VISIBLE + } else { + View.GONE + } + } + + private fun enterPiPMode() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && pipAvailable) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { + val builder = PictureInPictureParams.Builder().setSourceRectHint(gameViewSourceRectHint) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + builder.setSeamlessResizeEnabled(false) + } + setPictureInPictureParams(builder.build()) + } + + Log.v(TAG, "Entering PiP mode") + enterPictureInPictureMode() + } + } + + override fun onPictureInPictureModeChanged(isInPictureInPictureMode: Boolean) { + super.onPictureInPictureModeChanged(isInPictureInPictureMode) + Log.v(TAG, "onPictureInPictureModeChanged: $isInPictureInPictureMode") + updatePiPButtonVisibility() + } + + override fun onStop() { + super.onStop() + + val isInPiPMode = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && isInPictureInPictureMode + if (isInPiPMode && !isFinishing) { + // We get in this state when PiP is closed, so we terminate the activity. + finish() + } + } + + override fun getGodotAppLayout() = R.layout.godot_game_layout + + override fun getEditorId() = RUN_GAME_INFO.windowId override fun overrideOrientationRequest() = false diff --git a/platform/android/java/editor/src/main/res/drawable/ic_play_window_foreground.xml b/platform/android/java/editor/src/main/res/drawable/ic_play_window_foreground.xml new file mode 100644 index 0000000000..41bc5475c8 --- /dev/null +++ b/platform/android/java/editor/src/main/res/drawable/ic_play_window_foreground.xml @@ -0,0 +1,25 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="108dp" + android:height="108dp" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> + <group + android:scaleX="0.522" + android:scaleY="0.522" + android:translateX="5.736" + android:translateY="5.736"> + <path + android:fillColor="@android:color/white" + android:pathData="M21.58,16.09l-1.09,-7.66C20.21,6.46 18.52,5 16.53,5H7.47C5.48,5 3.79,6.46 3.51,8.43l-1.09,7.66C2.2,17.63 3.39,19 4.94,19h0c0.68,0 1.32,-0.27 1.8,-0.75L9,16h6l2.25,2.25c0.48,0.48 1.13,0.75 1.8,0.75h0C20.61,19 21.8,17.63 21.58,16.09zM19.48,16.81C19.4,16.9 19.27,17 19.06,17c-0.15,0 -0.29,-0.06 -0.39,-0.16L15.83,14H8.17l-2.84,2.84C5.23,16.94 5.09,17 4.94,17c-0.21,0 -0.34,-0.1 -0.42,-0.19c-0.08,-0.09 -0.16,-0.23 -0.13,-0.44l1.09,-7.66C5.63,7.74 6.48,7 7.47,7h9.06c0.99,0 1.84,0.74 1.98,1.72l1.09,7.66C19.63,16.58 19.55,16.72 19.48,16.81z" /> + <path + android:fillColor="@android:color/white" + android:pathData="M9,8l-1,0l0,2l-2,0l0,1l2,0l0,2l1,0l0,-2l2,0l0,-1l-2,0z" /> + <path + android:fillColor="@android:color/white" + android:pathData="M17,12m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" /> + <path + android:fillColor="@android:color/white" + android:pathData="M15,9m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0" /> + </group> +</vector> diff --git a/platform/android/java/editor/src/main/res/drawable/outline_fullscreen_exit_48.xml b/platform/android/java/editor/src/main/res/drawable/outline_fullscreen_exit_48.xml new file mode 100644 index 0000000000..c8b5a15d19 --- /dev/null +++ b/platform/android/java/editor/src/main/res/drawable/outline_fullscreen_exit_48.xml @@ -0,0 +1,12 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="48dp" + android:height="48dp" + android:tint="#FFFFFF" + android:viewportWidth="24" + android:viewportHeight="24"> + + <path + android:fillColor="@android:color/white" + android:pathData="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z" /> + +</vector> diff --git a/platform/android/java/editor/src/main/res/drawable/pip_button_activated_bg_drawable.xml b/platform/android/java/editor/src/main/res/drawable/pip_button_activated_bg_drawable.xml new file mode 100644 index 0000000000..aeaa96ce54 --- /dev/null +++ b/platform/android/java/editor/src/main/res/drawable/pip_button_activated_bg_drawable.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + + <size + android:width="60dp" + android:height="60dp" /> + + <solid android:color="#44000000" /> +</shape> diff --git a/platform/android/java/editor/src/main/res/drawable/pip_button_bg_drawable.xml b/platform/android/java/editor/src/main/res/drawable/pip_button_bg_drawable.xml new file mode 100644 index 0000000000..e9b2959275 --- /dev/null +++ b/platform/android/java/editor/src/main/res/drawable/pip_button_bg_drawable.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:drawable="@drawable/pip_button_activated_bg_drawable" android:state_pressed="true" /> + <item android:drawable="@drawable/pip_button_activated_bg_drawable" android:state_hovered="true" /> + + <item android:drawable="@drawable/pip_button_default_bg_drawable" /> + +</selector> diff --git a/platform/android/java/editor/src/main/res/drawable/pip_button_default_bg_drawable.xml b/platform/android/java/editor/src/main/res/drawable/pip_button_default_bg_drawable.xml new file mode 100644 index 0000000000..a8919689fe --- /dev/null +++ b/platform/android/java/editor/src/main/res/drawable/pip_button_default_bg_drawable.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval"> + + <size + android:width="60dp" + android:height="60dp" /> + + <solid android:color="#13000000" /> +</shape> diff --git a/platform/android/java/editor/src/main/res/layout/godot_game_layout.xml b/platform/android/java/editor/src/main/res/layout/godot_game_layout.xml new file mode 100644 index 0000000000..d53787c87e --- /dev/null +++ b/platform/android/java/editor/src/main/res/layout/godot_game_layout.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/godot_fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + + <ImageView + android:id="@+id/godot_pip_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="36dp" + android:contentDescription="@string/pip_button_description" + android:background="@drawable/pip_button_bg_drawable" + android:scaleType="center" + android:src="@drawable/outline_fullscreen_exit_48" + android:visibility="gone" + android:layout_gravity="end|top" + tools:visibility="visible" /> + +</FrameLayout> diff --git a/platform/android/java/editor/src/main/res/mipmap-anydpi-v26/ic_play_window.xml b/platform/android/java/editor/src/main/res/mipmap-anydpi-v26/ic_play_window.xml new file mode 100644 index 0000000000..a3aabf2ee0 --- /dev/null +++ b/platform/android/java/editor/src/main/res/mipmap-anydpi-v26/ic_play_window.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> + <background android:drawable="@mipmap/icon_background"/> + <foreground android:drawable="@drawable/ic_play_window_foreground"/> +</adaptive-icon> diff --git a/platform/android/java/editor/src/main/res/mipmap-hdpi/ic_play_window.png b/platform/android/java/editor/src/main/res/mipmap-hdpi/ic_play_window.png Binary files differnew file mode 100644 index 0000000000..a5ce40241f --- /dev/null +++ b/platform/android/java/editor/src/main/res/mipmap-hdpi/ic_play_window.png diff --git a/platform/android/java/editor/src/main/res/mipmap-mdpi/ic_play_window.png b/platform/android/java/editor/src/main/res/mipmap-mdpi/ic_play_window.png Binary files differnew file mode 100644 index 0000000000..147adb6127 --- /dev/null +++ b/platform/android/java/editor/src/main/res/mipmap-mdpi/ic_play_window.png diff --git a/platform/android/java/editor/src/main/res/mipmap-xhdpi/ic_play_window.png b/platform/android/java/editor/src/main/res/mipmap-xhdpi/ic_play_window.png Binary files differnew file mode 100644 index 0000000000..0b1db1b923 --- /dev/null +++ b/platform/android/java/editor/src/main/res/mipmap-xhdpi/ic_play_window.png diff --git a/platform/android/java/editor/src/main/res/mipmap-xxhdpi/ic_play_window.png b/platform/android/java/editor/src/main/res/mipmap-xxhdpi/ic_play_window.png Binary files differnew file mode 100644 index 0000000000..39d7450390 --- /dev/null +++ b/platform/android/java/editor/src/main/res/mipmap-xxhdpi/ic_play_window.png diff --git a/platform/android/java/editor/src/main/res/mipmap-xxxhdpi/ic_play_window.png b/platform/android/java/editor/src/main/res/mipmap-xxxhdpi/ic_play_window.png Binary files differnew file mode 100644 index 0000000000..b7a09a15b5 --- /dev/null +++ b/platform/android/java/editor/src/main/res/mipmap-xxxhdpi/ic_play_window.png diff --git a/platform/android/java/editor/src/main/res/values/dimens.xml b/platform/android/java/editor/src/main/res/values/dimens.xml index 98bfe40179..1e486872e6 100644 --- a/platform/android/java/editor/src/main/res/values/dimens.xml +++ b/platform/android/java/editor/src/main/res/values/dimens.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <dimen name="editor_default_window_height">600dp</dimen> + <dimen name="editor_default_window_height">640dp</dimen> <dimen name="editor_default_window_width">1024dp</dimen> </resources> diff --git a/platform/android/java/editor/src/main/res/values/strings.xml b/platform/android/java/editor/src/main/res/values/strings.xml index 909711ab18..0ad54ac3a1 100644 --- a/platform/android/java/editor/src/main/res/values/strings.xml +++ b/platform/android/java/editor/src/main/res/values/strings.xml @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <string name="godot_game_activity_name">Godot Play window</string> <string name="denied_storage_permission_error_msg">Missing storage access permission!</string> + <string name="pip_button_description">Button used to toggle picture-in-picture mode for the Play window</string> </resources> diff --git a/platform/android/java/lib/AndroidManifest.xml b/platform/android/java/lib/AndroidManifest.xml index 8240843876..bb24e6249e 100644 --- a/platform/android/java/lib/AndroidManifest.xml +++ b/platform/android/java/lib/AndroidManifest.xml @@ -7,7 +7,7 @@ <!-- Records the version of the Godot library --> <meta-data - android:name="org.godotengine.library.version" + android:name="org.redotengine.library.version" android:value="${godotLibraryVersion}" /> <service android:name=".GodotDownloaderService" /> diff --git a/platform/android/java/lib/build.gradle b/platform/android/java/lib/build.gradle index 81ab598b90..c139a9f194 100644 --- a/platform/android/java/lib/build.gradle +++ b/platform/android/java/lib/build.gradle @@ -29,7 +29,7 @@ android { manifestPlaceholders = [godotLibraryVersion: getGodotLibraryVersionName()] } - namespace = "org.godotengine.godot" + namespace = "org.redotengine.godot" compileOptions { sourceCompatibility versions.javaVersion diff --git a/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch b/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch index 49cc41e817..16c2f50b56 100644 --- a/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch +++ b/platform/android/java/lib/patches/com.google.android.vending.expansion.downloader.patch @@ -175,7 +175,7 @@ index e4b1b0f1c..36cd6aacf 100644 -import com.android.vending.expansion.downloader.R; +// -- GODOT start -- +//import com.android.vending.expansion.downloader.R; -+import org.godotengine.godot.R; ++import org.redotengine.godot.R; +// -- GODOT end -- import java.io.File; @@ -250,7 +250,7 @@ index f1536e80e..4b214b22d 100644 -import com.android.vending.expansion.downloader.R; +// -- GODOT start -- +//import com.android.vending.expansion.downloader.R; -+import org.godotengine.godot.R; ++import org.redotengine.godot.R; +// -- GODOT end -- + import com.google.android.vending.expansion.downloader.DownloadProgressInfo; diff --git a/platform/android/java/lib/patches/com.google.android.vending.licensing.patch b/platform/android/java/lib/patches/com.google.android.vending.licensing.patch index 4adb81d951..bd000670a6 100644 --- a/platform/android/java/lib/patches/com.google.android.vending.licensing.patch +++ b/platform/android/java/lib/patches/com.google.android.vending.licensing.patch @@ -21,7 +21,7 @@ index a0d2779af..a8bf65f9c 100644 */ +// -- GODOT start -- -import org.godotengine.godot.BuildConfig; +import org.redotengine.godot.BuildConfig; +// -- GODOT end -- + /** diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon.png b/platform/android/java/lib/res/mipmap-hdpi/icon.png Binary files differindex cc6e113e89..8f5f2471f1 100644 --- a/platform/android/java/lib/res/mipmap-hdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-hdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png Binary files differindex 75e409ff74..cd15cc55e3 100644 --- a/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-hdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon.png b/platform/android/java/lib/res/mipmap-mdpi/icon.png Binary files differindex e1968fe142..249dea1ce5 100644 --- a/platform/android/java/lib/res/mipmap-mdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-mdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png Binary files differindex 982b69be1e..68737ef0b3 100644 --- a/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-mdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon.png b/platform/android/java/lib/res/mipmap-xhdpi/icon.png Binary files differindex 9281d8da48..122c219716 100644 --- a/platform/android/java/lib/res/mipmap-xhdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-xhdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png Binary files differindex 726b267ad6..a84f25f82d 100644 --- a/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-xhdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon.png b/platform/android/java/lib/res/mipmap-xxhdpi/icon.png Binary files differindex 7a6b67d273..63287d1f36 100644 --- a/platform/android/java/lib/res/mipmap-xxhdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-xxhdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png Binary files differindex b0c727f74c..9b005204f1 100644 --- a/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-xxhdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png b/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png Binary files differindex 0881245802..d2b14a6830 100644 --- a/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png +++ b/platform/android/java/lib/res/mipmap-xxxhdpi/icon.png diff --git a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png b/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png Binary files differindex 72e6f92b6e..c2c98811bb 100644 --- a/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap-xxxhdpi/icon_foreground.png diff --git a/platform/android/java/lib/res/mipmap/icon.png b/platform/android/java/lib/res/mipmap/icon.png Binary files differindex 0881245802..9134bb24eb 100644 --- a/platform/android/java/lib/res/mipmap/icon.png +++ b/platform/android/java/lib/res/mipmap/icon.png diff --git a/platform/android/java/lib/res/mipmap/icon_foreground.png b/platform/android/java/lib/res/mipmap/icon_foreground.png Binary files differindex 982b69be1e..d37f142621 100644 --- a/platform/android/java/lib/res/mipmap/icon_foreground.png +++ b/platform/android/java/lib/res/mipmap/icon_foreground.png diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java index 9aa65fd786..4d00162d02 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/Helpers.java @@ -26,7 +26,7 @@ import android.util.Log; // -- GODOT start -- //import com.android.vending.expansion.downloader.R; -import org.godotengine.godot.R; +import org.redotengine.godot.R; // -- GODOT end -- import java.io.File; diff --git a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java index d481c22204..7f75eb1aa2 100644 --- a/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java +++ b/platform/android/java/lib/src/com/google/android/vending/expansion/downloader/impl/DownloadNotification.java @@ -18,7 +18,7 @@ package com.google.android.vending.expansion.downloader.impl; // -- GODOT start -- //import com.android.vending.expansion.downloader.R; -import org.godotengine.godot.R; +import org.redotengine.godot.R; // -- GODOT end -- import com.google.android.vending.expansion.downloader.DownloadProgressInfo; diff --git a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java b/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java index 79efca9621..2e349b5ef8 100644 --- a/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java +++ b/platform/android/java/lib/src/com/google/android/vending/licensing/util/Base64.java @@ -32,7 +32,7 @@ package com.google.android.vending.licensing.util; */ // -- GODOT start -- -import org.godotengine.godot.BuildConfig; +import org.redotengine.godot.BuildConfig; // -- GODOT end -- /** diff --git a/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java b/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java index 699e19fcf0..2fbf92e44e 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java +++ b/platform/android/java/lib/src/org/godotengine/godot/Dictionary.java @@ -2,9 +2,11 @@ /* Dictionary.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; +package org.redotengine.godot; import java.util.HashMap; import java.util.Set; diff --git a/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java b/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java index 91d272735e..6df884e99b 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java +++ b/platform/android/java/lib/src/org/godotengine/godot/FullScreenGodotApp.java @@ -2,9 +2,11 @@ /* FullScreenGodotApp.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; +package org.redotengine.godot; /** * Base abstract activity for Android apps intending to use Godot as the primary screen. diff --git a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt index fa39ccb546..b344894f51 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/Godot.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/Godot.kt @@ -2,9 +2,11 @@ /* Godot.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot +package org.redotengine.godot import android.annotation.SuppressLint import android.app.Activity @@ -52,21 +54,21 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsAnimationCompat import androidx.core.view.WindowInsetsCompat import com.google.android.vending.expansion.downloader.* -import org.godotengine.godot.input.GodotEditText -import org.godotengine.godot.io.directory.DirectoryAccessHandler -import org.godotengine.godot.io.file.FileAccessHandler -import org.godotengine.godot.plugin.GodotPluginRegistry -import org.godotengine.godot.tts.GodotTTS -import org.godotengine.godot.utils.CommandLineFileParser -import org.godotengine.godot.utils.GodotNetUtils -import org.godotengine.godot.utils.PermissionsUtil -import org.godotengine.godot.utils.PermissionsUtil.requestPermission -import org.godotengine.godot.utils.beginBenchmarkMeasure -import org.godotengine.godot.utils.benchmarkFile -import org.godotengine.godot.utils.dumpBenchmark -import org.godotengine.godot.utils.endBenchmarkMeasure -import org.godotengine.godot.utils.useBenchmark -import org.godotengine.godot.xr.XRMode +import org.redotengine.godot.input.GodotEditText +import org.redotengine.godot.io.directory.DirectoryAccessHandler +import org.redotengine.godot.io.file.FileAccessHandler +import org.redotengine.godot.plugin.GodotPluginRegistry +import org.redotengine.godot.tts.GodotTTS +import org.redotengine.godot.utils.CommandLineFileParser +import org.redotengine.godot.utils.GodotNetUtils +import org.redotengine.godot.utils.PermissionsUtil +import org.redotengine.godot.utils.PermissionsUtil.requestPermission +import org.redotengine.godot.utils.beginBenchmarkMeasure +import org.redotengine.godot.utils.benchmarkFile +import org.redotengine.godot.utils.dumpBenchmark +import org.redotengine.godot.utils.endBenchmarkMeasure +import org.redotengine.godot.utils.useBenchmark +import org.redotengine.godot.xr.XRMode import java.io.File import java.io.FileInputStream import java.io.InputStream @@ -353,15 +355,15 @@ class Godot(private val context: Context) : SensorEventListener { fileAccessHandler, useApkExpansion, ) - Log.v(TAG, "Godot native layer initialization completed: $nativeLayerInitializeCompleted") + Log.v(TAG, "Redot native layer initialization completed: $nativeLayerInitializeCompleted") } if (nativeLayerInitializeCompleted && !nativeLayerSetupCompleted) { nativeLayerSetupCompleted = GodotLib.setup(commandLine.toTypedArray(), tts) if (!nativeLayerSetupCompleted) { - throw IllegalStateException("Unable to setup the Godot engine! Aborting...") + throw IllegalStateException("Unable to setup the Redot engine! Aborting...") } else { - Log.v(TAG, "Godot native layer setup completed") + Log.v(TAG, "Redot native layer setup completed") } } } finally { diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt index 913e3d04c5..370f37f872 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotActivity.kt @@ -2,9 +2,11 @@ /* GodotActivity.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot +package org.redotengine.godot import android.app.Activity import android.content.Intent @@ -38,8 +40,8 @@ import android.util.Log import androidx.annotation.CallSuper import androidx.annotation.LayoutRes import androidx.fragment.app.FragmentActivity -import org.godotengine.godot.utils.PermissionsUtil -import org.godotengine.godot.utils.ProcessPhoenix +import org.redotengine.godot.utils.PermissionsUtil +import org.redotengine.godot.utils.ProcessPhoenix /** * Base abstract activity for Android apps intending to use Godot as the primary screen. @@ -53,8 +55,6 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { private val TAG = GodotActivity::class.java.simpleName @JvmStatic - protected val EXTRA_FORCE_QUIT = "force_quit_requested" - @JvmStatic protected val EXTRA_NEW_LAUNCH = "new_launch_requested" } @@ -72,10 +72,10 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { val currentFragment = supportFragmentManager.findFragmentById(R.id.godot_fragment_container) if (currentFragment is GodotFragment) { - Log.v(TAG, "Reusing existing Godot fragment instance.") + Log.v(TAG, "Reusing existing Redot fragment instance.") godotFragment = currentFragment } else { - Log.v(TAG, "Creating new Godot fragment instance.") + Log.v(TAG, "Creating new Redot fragment instance.") godotFragment = initGodotInstance() supportFragmentManager.beginTransaction().replace(R.id.godot_fragment_container, godotFragment!!).setPrimaryNavigationFragment(godotFragment).commitNowAllowingStateLoss() } @@ -85,7 +85,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { protected open fun getGodotAppLayout() = R.layout.godot_app_layout override fun onDestroy() { - Log.v(TAG, "Destroying GodotActivity $this...") + Log.v(TAG, "Destroying RedotActivity $this...") super.onDestroy() } @@ -96,7 +96,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { private fun terminateGodotInstance(instance: Godot) { godotFragment?.let { if (instance === it.godot) { - Log.v(TAG, "Force quitting Godot instance") + Log.v(TAG, "Force quitting Redot instance") ProcessPhoenix.forceQuit(this) } } @@ -111,7 +111,7 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { // // Restarting only the activity, wouldn't be enough unless it did proper cleanup (including // releasing and reloading native libs or resetting their state somehow and clearing static data). - Log.v(TAG, "Restarting Godot instance...") + Log.v(TAG, "Restarting Redot instance...") ProcessPhoenix.triggerRebirth(this) } } @@ -128,12 +128,6 @@ abstract class GodotActivity : FragmentActivity(), GodotHost { } private fun handleStartIntent(intent: Intent, newLaunch: Boolean) { - val forceQuitRequested = intent.getBooleanExtra(EXTRA_FORCE_QUIT, false) - if (forceQuitRequested) { - Log.d(TAG, "Force quit requested, terminating..") - ProcessPhoenix.forceQuit(this) - return - } if (!newLaunch) { val newLaunchRequested = intent.getBooleanExtra(EXTRA_NEW_LAUNCH, false) if (newLaunchRequested) { diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java index d447e449e1..748fb51749 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java @@ -2,9 +2,11 @@ /* GodotDownloaderAlarmReceiver.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; +package org.redotengine.godot; import android.content.BroadcastReceiver; import android.content.Context; @@ -48,12 +50,12 @@ import com.google.android.vending.expansion.downloader.DownloaderClientMarshalle public class GodotDownloaderAlarmReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - Log.d("GODOT", "Alarma recivida"); + Log.d("REDOT", "Alarma recivida"); try { DownloaderClientMarshaller.startDownloadServiceIfRequired(context, intent, GodotDownloaderService.class); } catch (NameNotFoundException e) { e.printStackTrace(); - Log.d("GODOT", "Exception: " + e.getClass().getName() + ":" + e.getMessage()); + Log.d("REDOT", "Exception: " + e.getClass().getName() + ":" + e.getMessage()); } } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java index 8e3fb85cde..357c758de1 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotDownloaderService.java @@ -2,9 +2,11 @@ /* GodotDownloaderService.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; +package org.redotengine.godot; import android.content.Context; import android.content.SharedPreferences; @@ -56,7 +58,7 @@ public class GodotDownloaderService extends DownloaderService { @Override public String getPublicKey() { SharedPreferences prefs = getApplicationContext().getSharedPreferences("app_data_keys", Context.MODE_PRIVATE); - Log.d("GODOT", "getting public key:" + prefs.getString("store_public_key", null)); + Log.d("REDOT", "getting public key:" + prefs.getString("store_public_key", null)); return prefs.getString("store_public_key", null); //return BASE64_PUBLIC_KEY; @@ -79,7 +81,7 @@ public class GodotDownloaderService extends DownloaderService { */ @Override public String getAlarmReceiverClassName() { - Log.d("GODOT", "getAlarmReceiverClassName()"); + Log.d("REDOT", "getAlarmReceiverClassName()"); return GodotDownloaderAlarmReceiver.class.getName(); } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java b/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java index fdda766594..8d59716f30 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotFragment.java @@ -2,9 +2,11 @@ /* GodotFragment.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,10 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; - -import org.godotengine.godot.plugin.GodotPlugin; -import org.godotengine.godot.utils.BenchmarkUtils; +package org.redotengine.godot; import android.app.Activity; import android.app.PendingIntent; @@ -70,6 +69,9 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import org.redotengine.godot.plugin.GodotPlugin; +import org.redotengine.godot.utils.BenchmarkUtils; + /** * Base fragment for Android apps intending to use Godot for part of the app's UI. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java b/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java index 7fbdb34047..4ebe2ee8f8 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotGLRenderView.java @@ -2,9 +2,11 @@ /* GodotGLRenderView.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,18 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; - -import org.godotengine.godot.gl.GLSurfaceView; -import org.godotengine.godot.gl.GodotRenderer; -import org.godotengine.godot.input.GodotInputHandler; -import org.godotengine.godot.xr.XRMode; -import org.godotengine.godot.xr.ovr.OvrConfigChooser; -import org.godotengine.godot.xr.ovr.OvrContextFactory; -import org.godotengine.godot.xr.ovr.OvrWindowSurfaceFactory; -import org.godotengine.godot.xr.regular.RegularConfigChooser; -import org.godotengine.godot.xr.regular.RegularContextFactory; -import org.godotengine.godot.xr.regular.RegularFallbackConfigChooser; +package org.redotengine.godot; import android.annotation.SuppressLint; import android.content.res.AssetManager; @@ -58,6 +49,17 @@ import androidx.annotation.Keep; import java.io.InputStream; +import org.redotengine.godot.gl.GLSurfaceView; +import org.redotengine.godot.gl.GodotRenderer; +import org.redotengine.godot.input.GodotInputHandler; +import org.redotengine.godot.xr.XRMode; +import org.redotengine.godot.xr.ovr.OvrConfigChooser; +import org.redotengine.godot.xr.ovr.OvrContextFactory; +import org.redotengine.godot.xr.ovr.OvrWindowSurfaceFactory; +import org.redotengine.godot.xr.regular.RegularConfigChooser; +import org.redotengine.godot.xr.regular.RegularContextFactory; +import org.redotengine.godot.xr.regular.RegularFallbackConfigChooser; + /** * A simple GLSurfaceView sub-class that demonstrate how to perform * OpenGL ES 2.0 rendering into a GL Surface. Note the following important diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java b/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java index 1862b9fa9b..b031306d30 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotHost.java @@ -2,9 +2,11 @@ /* GodotHost.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,9 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; - -import org.godotengine.godot.plugin.GodotPlugin; +package org.redotengine.godot; import android.app.Activity; @@ -38,6 +38,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import org.redotengine.godot.plugin.GodotPlugin; + /** * Denotate a component (e.g: Activity, Fragment) that hosts the {@link Godot} engine. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java b/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java index 219631284a..e444c6b62d 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotIO.java @@ -2,9 +2,11 @@ /* GodotIO.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,9 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; - -import org.godotengine.godot.input.GodotEditText; +package org.redotengine.godot; import android.app.Activity; import android.content.ActivityNotFoundException; @@ -55,6 +55,8 @@ import java.io.File; import java.util.List; import java.util.Locale; +import org.redotengine.godot.input.GodotEditText; + // Wrapper for native library public class GodotIO { diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java b/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java index 909daf05c9..0d1d628906 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotLib.java @@ -2,9 +2,11 @@ /* GodotLib.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,13 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; - -import org.godotengine.godot.gl.GodotRenderer; -import org.godotengine.godot.io.directory.DirectoryAccessHandler; -import org.godotengine.godot.io.file.FileAccessHandler; -import org.godotengine.godot.tts.GodotTTS; -import org.godotengine.godot.utils.GodotNetUtils; +package org.redotengine.godot; import android.app.Activity; import android.content.res.AssetManager; @@ -43,6 +39,12 @@ import android.view.Surface; import javax.microedition.khronos.opengles.GL10; +import org.redotengine.godot.gl.GodotRenderer; +import org.redotengine.godot.io.directory.DirectoryAccessHandler; +import org.redotengine.godot.io.file.FileAccessHandler; +import org.redotengine.godot.tts.GodotTTS; +import org.redotengine.godot.utils.GodotNetUtils; + /** * Wrapper for native library */ @@ -80,7 +82,7 @@ public class GodotLib { * @param p_surface * @param p_width * @param p_height - * @see org.godotengine.godot.gl.GLSurfaceView.Renderer#onSurfaceChanged(GL10, int, int) + * @see org.redotengine.godot.gl.GLSurfaceView.Renderer#onSurfaceChanged(GL10, int, int) */ public static native void resize(Surface p_surface, int p_width, int p_height); @@ -97,7 +99,7 @@ public class GodotLib { /** * Invoked on the GL thread to draw the current frame. - * @see org.godotengine.godot.gl.GLSurfaceView.Renderer#onDrawFrame(GL10) + * @see org.redotengine.godot.gl.GLSurfaceView.Renderer#onDrawFrame(GL10) */ public static native boolean step(); diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java b/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java index 19ec0fd1a4..ddf0f00050 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotRenderView.java @@ -2,9 +2,11 @@ /* GodotRenderView.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,12 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; - -import org.godotengine.godot.input.GodotInputHandler; +package org.redotengine.godot; import android.view.SurfaceView; +import org.redotengine.godot.input.GodotInputHandler; + public interface GodotRenderView { SurfaceView getView(); diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotService.kt b/platform/android/java/lib/src/org/godotengine/godot/GodotService.kt index 795dc921c7..2d49cb5725 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotService.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotService.kt @@ -1,4 +1,4 @@ -package org.godotengine.godot +package org.redotengine.godot import android.app.Service import android.content.Intent diff --git a/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java b/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java index f4411ddf2c..594a9f6feb 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/GodotVulkanRenderView.java @@ -2,9 +2,11 @@ /* GodotVulkanRenderView.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,11 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot; - -import org.godotengine.godot.input.GodotInputHandler; -import org.godotengine.godot.vulkan.VkRenderer; -import org.godotengine.godot.vulkan.VkSurfaceView; +package org.redotengine.godot; import android.annotation.SuppressLint; import android.content.res.AssetManager; @@ -50,6 +48,10 @@ import androidx.annotation.Keep; import java.io.InputStream; +import org.redotengine.godot.input.GodotInputHandler; +import org.redotengine.godot.vulkan.VkRenderer; +import org.redotengine.godot.vulkan.VkSurfaceView; + class GodotVulkanRenderView extends VkSurfaceView implements GodotRenderView { private final GodotHost host; private final Godot godot; diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java b/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java index af16cfce74..b82b72bdc8 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/EGLLogWrapper.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.godotengine.godot.gl; +package org.redotengine.godot.gl; import android.opengl.GLDebugHelper; import android.opengl.GLException; diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java b/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java index 6a4e9da699..9001ff6fec 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/GLSurfaceView.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.godotengine.godot.gl; +package org.redotengine.godot.gl; import android.content.Context; import android.opengl.EGL14; diff --git a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java b/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java index 7e5e262b2d..a696c3596f 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java +++ b/platform/android/java/lib/src/org/godotengine/godot/gl/GodotRenderer.java @@ -2,9 +2,11 @@ /* GodotRenderer.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,17 +30,17 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.gl; - -import org.godotengine.godot.GodotLib; -import org.godotengine.godot.plugin.GodotPlugin; -import org.godotengine.godot.plugin.GodotPluginRegistry; +package org.redotengine.godot.gl; import android.util.Log; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; +import org.redotengine.godot.GodotLib; +import org.redotengine.godot.plugin.GodotPlugin; +import org.redotengine.godot.plugin.GodotPluginRegistry; + /** * Godot's GL renderer implementation. */ @@ -68,7 +70,7 @@ public class GodotRenderer implements GLSurfaceView.Renderer { @Override public void onRenderThreadExiting() { - Log.d(TAG, "Destroying Godot Engine"); + Log.d(TAG, "Destroying Redot Engine"); GodotLib.ondestroy(); } diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java index c085bb8886..b82f63746d 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotEditText.java @@ -2,9 +2,11 @@ /* GodotEditText.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,9 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.input; - -import org.godotengine.godot.*; +package org.redotengine.godot.input; import android.content.Context; import android.content.res.Configuration; @@ -50,6 +50,8 @@ import android.widget.EditText; import java.lang.ref.WeakReference; import java.util.Locale; +import org.redotengine.godot.*; + public class GodotEditText extends EditText { // =========================================================== // Constants diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt index 2929a0a0b0..d52bca49c8 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotGestureHandler.kt @@ -2,9 +2,11 @@ /* GodotGestureHandler.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.input +package org.redotengine.godot.input import android.os.Build import android.view.GestureDetector.SimpleOnGestureListener @@ -36,7 +38,7 @@ import android.view.InputDevice import android.view.MotionEvent import android.view.ScaleGestureDetector import android.view.ScaleGestureDetector.OnScaleGestureListener -import org.godotengine.godot.GodotLib +import org.redotengine.godot.GodotLib /** * Handles regular and scale gesture input related events for the [GodotView] view. diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java index 273774a33d..3fe561e957 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotInputHandler.java @@ -2,9 +2,11 @@ /* GodotInputHandler.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,12 +30,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.input; +package org.redotengine.godot.input; -import static org.godotengine.godot.utils.GLUtils.DEBUG; - -import org.godotengine.godot.GodotLib; -import org.godotengine.godot.GodotRenderView; +import static org.redotengine.godot.utils.GLUtils.DEBUG; import android.content.Context; import android.hardware.input.InputManager; @@ -51,6 +50,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; +import org.redotengine.godot.GodotLib; +import org.redotengine.godot.GodotRenderView; + /** * Handles input related events for the {@link GodotRenderView} view. */ @@ -370,7 +372,7 @@ public class GodotInputHandler implements InputManager.InputDeviceListener { Collections.sort(joystick.axes); for (int idx = 0; idx < joystick.axes.size(); idx++) { //Helps with creating new joypad mappings. - Log.i(TAG, " - Mapping Android axis " + joystick.axes.get(idx) + " to Godot axis " + idx); + Log.i(TAG, " - Mapping Android axis " + joystick.axes.get(idx) + " to Redot axis " + idx); } mJoysticksDevices.put(deviceId, joystick); diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java b/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java index e545669970..16fa454250 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/GodotTextInputWrapper.java @@ -2,9 +2,11 @@ /* GodotTextInputWrapper.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,9 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.input; - -import org.godotengine.godot.*; +package org.redotengine.godot.input; import android.content.Context; import android.text.Editable; @@ -41,6 +41,8 @@ import android.view.inputmethod.InputMethodManager; import android.widget.TextView; import android.widget.TextView.OnEditorActionListener; +import org.redotengine.godot.*; + public class GodotTextInputWrapper implements TextWatcher, OnEditorActionListener { // =========================================================== // Constants diff --git a/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java b/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java index 9e13a1aca6..528c6d55eb 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java +++ b/platform/android/java/lib/src/org/godotengine/godot/input/Joystick.java @@ -2,9 +2,11 @@ /* Joystick.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.input; +package org.redotengine.godot.input; import android.util.SparseArray; diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt b/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt index 8ee3d5f48f..04019602c9 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/StorageScope.kt @@ -2,9 +2,11 @@ /* StorageScope.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io +package org.redotengine.godot.io import android.content.Context import android.os.Build diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt b/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt index b9b7ebac6e..9991783f55 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/directory/AssetsDirectoryAccess.kt @@ -2,9 +2,11 @@ /* AssetsDirectoryAccess.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,13 +30,13 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.directory +package org.redotengine.godot.io.directory import android.content.Context import android.util.Log import android.util.SparseArray -import org.godotengine.godot.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID -import org.godotengine.godot.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID +import org.redotengine.godot.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID +import org.redotengine.godot.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID import java.io.File import java.io.IOException diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt index dd6d5180c5..5309ba4797 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/directory/DirectoryAccessHandler.kt @@ -2,9 +2,11 @@ /* DirectoryAccessHandler.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,12 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.directory +package org.redotengine.godot.io.directory import android.content.Context import android.util.Log -import org.godotengine.godot.io.directory.DirectoryAccessHandler.AccessType.ACCESS_FILESYSTEM -import org.godotengine.godot.io.directory.DirectoryAccessHandler.AccessType.ACCESS_RESOURCES +import org.redotengine.godot.io.directory.DirectoryAccessHandler.AccessType.ACCESS_FILESYSTEM +import org.redotengine.godot.io.directory.DirectoryAccessHandler.AccessType.ACCESS_RESOURCES /** * Handles files and directories access and manipulation for the Android platform diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt b/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt index c8b4f79f30..9c55e34f74 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/directory/FilesystemDirectoryAccess.kt @@ -2,9 +2,11 @@ /* FilesystemDirectoryAccess.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.directory +package org.redotengine.godot.io.directory import android.annotation.SuppressLint import android.content.Context @@ -36,10 +38,10 @@ import android.os.Build import android.os.storage.StorageManager import android.util.Log import android.util.SparseArray -import org.godotengine.godot.io.StorageScope -import org.godotengine.godot.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID -import org.godotengine.godot.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID -import org.godotengine.godot.io.file.FileAccessHandler +import org.redotengine.godot.io.StorageScope +import org.redotengine.godot.io.directory.DirectoryAccessHandler.Companion.INVALID_DIR_ID +import org.redotengine.godot.io.directory.DirectoryAccessHandler.Companion.STARTING_DIR_ID +import org.redotengine.godot.io.file.FileAccessHandler import java.io.File /** diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt index 11cf7b3566..0f19075203 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/DataAccess.kt @@ -2,9 +2,11 @@ /* DataAccess.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,12 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.file +package org.redotengine.godot.io.file import android.content.Context import android.os.Build import android.util.Log -import org.godotengine.godot.io.StorageScope +import org.redotengine.godot.io.StorageScope import java.io.IOException import java.nio.ByteBuffer import java.nio.channels.ClosedChannelException diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt index 38974af753..bf3dc9d96a 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessFlags.kt @@ -2,9 +2,11 @@ /* FileAccessFlags.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.file +package org.redotengine.godot.io.file /** * Android representation of Godot native access flags. diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt index 1d773467e8..9c0a187c24 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileAccessHandler.kt @@ -2,9 +2,11 @@ /* FileAccessHandler.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,12 +30,12 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.file +package org.redotengine.godot.io.file import android.content.Context import android.util.Log import android.util.SparseArray -import org.godotengine.godot.io.StorageScope +import org.redotengine.godot.io.StorageScope import java.io.FileNotFoundException import java.nio.ByteBuffer diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt index d0b8a8dffa..14b3dddccf 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileData.kt @@ -2,9 +2,11 @@ /* FileData.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.file +package org.redotengine.godot.io.file import java.io.File import java.io.FileOutputStream diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileErrors.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileErrors.kt index 2df0195de7..e37923ca2f 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/FileErrors.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/FileErrors.kt @@ -2,9 +2,11 @@ /* FileErrors.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.file +package org.redotengine.godot.io.file /** * Set of errors that may occur when performing data access. diff --git a/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt b/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt index 146fc04da4..d989f710df 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/io/file/MediaStoreData.kt @@ -2,9 +2,11 @@ /* MediaStoreData.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.io.file +package org.redotengine.godot.io.file import android.content.ContentUris import android.content.ContentValues diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java index c975c29e96..35ecaf106b 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPlugin.java @@ -2,9 +2,11 @@ /* GodotPlugin.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,10 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.plugin; - -import org.godotengine.godot.BuildConfig; -import org.godotengine.godot.Godot; +package org.redotengine.godot.plugin; import android.app.Activity; import android.content.Intent; @@ -56,6 +55,9 @@ import java.util.concurrent.ConcurrentHashMap; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10; +import org.redotengine.godot.BuildConfig; +import org.redotengine.godot.Godot; + /** * Base class for Godot Android plugins. * <p> @@ -64,7 +66,7 @@ import javax.microedition.khronos.opengles.GL10; * - The plugin must have a dependency on the Godot Android library: `implementation "org.godotengine:godot:<godotLibVersion>"` * <p> * - The plugin must include a <meta-data> tag in its Android manifest with the following format: - * <meta-data android:name="org.godotengine.plugin.v2.[PluginName]" android:value="[plugin.init.ClassFullName]" /> + * <meta-data android:name="org.redotengine.plugin.v2.[PluginName]" android:value="[plugin.init.ClassFullName]" /> * <p> * Where: * <p> @@ -167,7 +169,7 @@ public abstract class GodotPlugin { /** * Invoked once during the initialization process after creation of the - * {@link org.godotengine.godot.GodotRenderView} view. + * {@link org.redotengine.godot.GodotRenderView} view. * <p> * The plugin can return a non-null {@link View} layout which will be added to the Godot view * hierarchy. diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java index 711bca02e7..3e7887072a 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/GodotPluginRegistry.java @@ -2,9 +2,11 @@ /* GodotPluginRegistry.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,9 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.plugin; - -import org.godotengine.godot.Godot; +package org.redotengine.godot.plugin; import android.app.Activity; import android.content.pm.ApplicationInfo; @@ -46,6 +46,8 @@ import java.util.Collection; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import org.redotengine.godot.Godot; + /** * Registry used to load and access the registered Godot Android plugins. */ @@ -55,11 +57,11 @@ public final class GodotPluginRegistry { /** * Prefix used for version 1 of the Godot plugin, mostly compatible with Godot 3.x */ - private static final String GODOT_PLUGIN_V1_NAME_PREFIX = "org.godotengine.plugin.v1."; + private static final String GODOT_PLUGIN_V1_NAME_PREFIX = "org.redotengine.plugin.v1."; /** * Prefix used for version 2 of the Godot plugin, compatible with Godot 4.2+ */ - private static final String GODOT_PLUGIN_V2_NAME_PREFIX = "org.godotengine.plugin.v2."; + private static final String GODOT_PLUGIN_V2_NAME_PREFIX = "org.redotengine.plugin.v2."; private static GodotPluginRegistry instance; private final ConcurrentHashMap<String, GodotPlugin> registry; @@ -147,11 +149,11 @@ public final class GodotPluginRegistry { pluginName = metaDataName.substring(GODOT_PLUGIN_V2_NAME_PREFIX.length()).trim(); } else if (metaDataName.startsWith(GODOT_PLUGIN_V1_NAME_PREFIX)) { pluginName = metaDataName.substring(GODOT_PLUGIN_V1_NAME_PREFIX.length()).trim(); - Log.w(TAG, "Godot v1 plugin are deprecated in Godot 4.2 and higher: " + pluginName); + Log.w(TAG, "Redot v1 plugin are deprecated in Redot 4.2 and higher: " + pluginName); } if (!TextUtils.isEmpty(pluginName)) { - Log.i(TAG, "Initializing Godot plugin " + pluginName); + Log.i(TAG, "Initializing Redot plugin " + pluginName); // Retrieve the plugin class full name. String pluginHandleClassFullName = metaData.getString(metaDataName); @@ -171,9 +173,9 @@ public final class GodotPluginRegistry { "Meta-data plugin name does not match the value returned by the plugin handle: " + pluginName + " =/= " + pluginHandle.getPluginName()); } registry.put(pluginName, pluginHandle); - Log.i(TAG, "Completed initialization for Godot plugin " + pluginHandle.getPluginName()); + Log.i(TAG, "Completed initialization for Redot plugin " + pluginHandle.getPluginName()); } catch (Exception e) { - Log.w(TAG, "Unable to load Godot plugin " + pluginName, e); + Log.w(TAG, "Unable to load Redot plugin " + pluginName, e); } } else { Log.w(TAG, "Invalid plugin loader class for " + pluginName); @@ -181,7 +183,7 @@ public final class GodotPluginRegistry { } } } catch (Exception e) { - Log.e(TAG, "Unable load Godot Android plugins from the manifest file.", e); + Log.e(TAG, "Unable load Redot Android plugins from the manifest file.", e); } } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java index 4a166112ab..491c7a18b3 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/SignalInfo.java @@ -2,9 +2,11 @@ /* SignalInfo.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.plugin; +package org.redotengine.godot.plugin; import android.text.TextUtils; diff --git a/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java b/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java index 8beb28ab9a..3e2047ad55 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java +++ b/platform/android/java/lib/src/org/godotengine/godot/plugin/UsedByGodot.java @@ -2,9 +2,11 @@ /* UsedByGodot.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.plugin; +package org.redotengine.godot.plugin; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java index dce6753b7a..8e290963dc 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java +++ b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotTTS.java @@ -2,9 +2,11 @@ /* GodotTTS.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,9 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.tts; - -import org.godotengine.godot.GodotLib; +package org.redotengine.godot.tts; import android.app.Activity; import android.content.Context; @@ -45,6 +45,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Set; +import org.redotengine.godot.GodotLib; + /** * Wrapper for Android Text to Speech API and custom utterance query implementation. * <p> diff --git a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java index 8128716f8c..0ba9d354ab 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java +++ b/platform/android/java/lib/src/org/godotengine/godot/tts/GodotUtterance.java @@ -2,9 +2,11 @@ /* GodotUtterance.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.tts; +package org.redotengine.godot.tts; /** * A speech request for GodotTTS. diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt b/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt index d39f2309b8..faa7e39c1a 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/BenchmarkUtils.kt @@ -2,9 +2,11 @@ /* BenchmarkUtils.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -30,15 +32,15 @@ @file:JvmName("BenchmarkUtils") -package org.godotengine.godot.utils +package org.redotengine.godot.utils import android.os.Build import android.os.SystemClock import android.os.Trace import android.util.Log -import org.godotengine.godot.BuildConfig -import org.godotengine.godot.io.file.FileAccessFlags -import org.godotengine.godot.io.file.FileAccessHandler +import org.redotengine.godot.BuildConfig +import org.redotengine.godot.io.file.FileAccessFlags +import org.redotengine.godot.io.file.FileAccessHandler import org.json.JSONObject import java.nio.ByteBuffer import java.util.Collections diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt b/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt index ce5c5b6714..421f36828e 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/CommandLineFileParser.kt @@ -2,9 +2,11 @@ /* CommandLineFileParser.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.utils +package org.redotengine.godot.utils import java.io.InputStream import java.nio.charset.StandardCharsets diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java b/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java index 315ca2b25d..57250ce170 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/Crypt.java @@ -2,9 +2,11 @@ /* Crypt.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.utils; +package org.redotengine.godot.utils; import java.security.MessageDigest; import java.util.Random; diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java b/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java index 2c7b73ae4d..af95a19834 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/GLUtils.java @@ -2,9 +2,11 @@ /* GLUtils.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.utils; +package org.redotengine.godot.utils; import android.util.Log; diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java b/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java index dca190a2fc..779b0c46ef 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/GodotNetUtils.java @@ -2,9 +2,11 @@ /* GodotNetUtils.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.utils; +package org.redotengine.godot.utils; import android.app.Activity; import android.content.Context; @@ -69,7 +71,7 @@ public class GodotNetUtils { try { multicastLock.acquire(); } catch (RuntimeException e) { - Log.e("Godot", "Exception during multicast lock acquire: " + e); + Log.e("Redot", "Exception during multicast lock acquire: " + e); } } @@ -83,7 +85,7 @@ public class GodotNetUtils { try { multicastLock.release(); } catch (RuntimeException e) { - Log.e("Godot", "Exception during multicast lock release: " + e); + Log.e("Redot", "Exception during multicast lock release: " + e); } } @@ -112,7 +114,7 @@ public class GodotNetUtils { } return writer.toString(); } catch (Exception e) { - Log.e("Godot", "Exception while reading CA certificates: " + e); + Log.e("Redot", "Exception while reading CA certificates: " + e); return ""; } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java b/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java index 4e8e82a70a..5db2bb94ec 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java @@ -2,9 +2,11 @@ /* PermissionsUtil.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.utils; +package org.redotengine.godot.utils; import android.Manifest; import android.app.Activity; @@ -108,7 +110,7 @@ public final class PermissionsUtil { } else { PermissionInfo permissionInfo = getPermissionInfo(activity, permission); int protectionLevel = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P ? permissionInfo.getProtection() : permissionInfo.protectionLevel; - if (protectionLevel == PermissionInfo.PROTECTION_DANGEROUS && ContextCompat.checkSelfPermission(activity, permission) != PackageManager.PERMISSION_GRANTED) { + if ((protectionLevel & PermissionInfo.PROTECTION_DANGEROUS) == PermissionInfo.PROTECTION_DANGEROUS && ContextCompat.checkSelfPermission(activity, permission) != PackageManager.PERMISSION_GRANTED) { Log.d(TAG, "Requesting permission " + permission); requestedPermissions.add(permission); } @@ -174,7 +176,7 @@ public final class PermissionsUtil { try { PermissionInfo permissionInfo = getPermissionInfo(activity, permissionName); int protectionLevel = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P ? permissionInfo.getProtection() : permissionInfo.protectionLevel; - if (protectionLevel == PermissionInfo.PROTECTION_DANGEROUS && ContextCompat.checkSelfPermission(activity, permissionName) != PackageManager.PERMISSION_GRANTED) { + if ((protectionLevel & PermissionInfo.PROTECTION_DANGEROUS) == PermissionInfo.PROTECTION_DANGEROUS && ContextCompat.checkSelfPermission(activity, permissionName) != PackageManager.PERMISSION_GRANTED) { activity.requestPermissions(new String[] { permissionName }, REQUEST_SINGLE_PERMISSION_REQ_CODE); return false; } @@ -259,7 +261,7 @@ public final class PermissionsUtil { } else { PermissionInfo permissionInfo = getPermissionInfo(context, manifestPermission); int protectionLevel = Build.VERSION.SDK_INT >= Build.VERSION_CODES.P ? permissionInfo.getProtection() : permissionInfo.protectionLevel; - if (protectionLevel == PermissionInfo.PROTECTION_DANGEROUS && ContextCompat.checkSelfPermission(context, manifestPermission) == PackageManager.PERMISSION_GRANTED) { + if ((protectionLevel & PermissionInfo.PROTECTION_DANGEROUS) == PermissionInfo.PROTECTION_DANGEROUS && ContextCompat.checkSelfPermission(context, manifestPermission) == PackageManager.PERMISSION_GRANTED) { grantedPermissions.add(manifestPermission); } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java b/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java index b1bce45fbb..f9a53177ea 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java +++ b/platform/android/java/lib/src/org/godotengine/godot/utils/ProcessPhoenix.java @@ -20,10 +20,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.godotengine.godot.utils; +package org.redotengine.godot.utils; import android.app.Activity; import android.app.ActivityManager; +import android.app.ActivityOptions; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -44,6 +45,9 @@ import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; */ public final class ProcessPhoenix extends Activity { private static final String KEY_RESTART_INTENTS = "phoenix_restart_intents"; + // -- GODOT start -- + private static final String KEY_RESTART_ACTIVITY_OPTIONS = "phoenix_restart_activity_options"; + // -- GODOT end -- private static final String KEY_MAIN_PROCESS_PID = "phoenix_main_process_pid"; /** @@ -56,12 +60,23 @@ public final class ProcessPhoenix extends Activity { triggerRebirth(context, getRestartIntent(context)); } + // -- GODOT start -- /** * Call to restart the application process using the specified intents. * <p> * Behavior of the current process after invoking this method is undefined. */ public static void triggerRebirth(Context context, Intent... nextIntents) { + triggerRebirth(context, null, nextIntents); + } + + /** + * Call to restart the application process using the specified intents launched with the given + * {@link ActivityOptions}. + * <p> + * Behavior of the current process after invoking this method is undefined. + */ + public static void triggerRebirth(Context context, Bundle activityOptions, Intent... nextIntents) { if (nextIntents.length < 1) { throw new IllegalArgumentException("intents cannot be empty"); } @@ -72,10 +87,12 @@ public final class ProcessPhoenix extends Activity { intent.addFlags(FLAG_ACTIVITY_NEW_TASK); // In case we are called with non-Activity context. intent.putParcelableArrayListExtra(KEY_RESTART_INTENTS, new ArrayList<>(Arrays.asList(nextIntents))); intent.putExtra(KEY_MAIN_PROCESS_PID, Process.myPid()); + if (activityOptions != null) { + intent.putExtra(KEY_RESTART_ACTIVITY_OPTIONS, activityOptions); + } context.startActivity(intent); } - // -- GODOT start -- /** * Finish the activity and kill its process */ @@ -112,9 +129,11 @@ public final class ProcessPhoenix extends Activity { super.onCreate(savedInstanceState); // -- GODOT start -- - ArrayList<Intent> intents = getIntent().getParcelableArrayListExtra(KEY_RESTART_INTENTS); - startActivities(intents.toArray(new Intent[intents.size()])); - forceQuit(this, getIntent().getIntExtra(KEY_MAIN_PROCESS_PID, -1)); + Intent launchIntent = getIntent(); + ArrayList<Intent> intents = launchIntent.getParcelableArrayListExtra(KEY_RESTART_INTENTS); + Bundle activityOptions = launchIntent.getBundleExtra(KEY_RESTART_ACTIVITY_OPTIONS); + startActivities(intents.toArray(new Intent[intents.size()]), activityOptions); + forceQuit(this, launchIntent.getIntExtra(KEY_MAIN_PROCESS_PID, -1)); // -- GODOT end -- } diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt index a93a7dbe09..3d06ebf90b 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkRenderer.kt @@ -2,9 +2,11 @@ /* VkRenderer.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -29,12 +31,12 @@ /**************************************************************************/ @file:JvmName("VkRenderer") -package org.godotengine.godot.vulkan +package org.redotengine.godot.vulkan import android.util.Log import android.view.Surface -import org.godotengine.godot.GodotLib -import org.godotengine.godot.plugin.GodotPluginRegistry +import org.redotengine.godot.GodotLib +import org.redotengine.godot.plugin.GodotPluginRegistry /** * Responsible to setting up and driving the Vulkan rendering logic. @@ -107,7 +109,7 @@ internal class VkRenderer { * Invoked when the render thread is in the process of shutting down. */ fun onRenderThreadExiting() { - Log.d(TAG, "Destroying Godot Engine") + Log.d(TAG, "Destroying Redot Engine") GodotLib.ondestroy() } } diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt index 9e30de6a15..c24b5ac848 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkSurfaceView.kt @@ -2,9 +2,11 @@ /* VkSurfaceView.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -29,7 +31,7 @@ /**************************************************************************/ @file:JvmName("VkSurfaceView") -package org.godotengine.godot.vulkan +package org.redotengine.godot.vulkan import android.content.Context import android.view.SurfaceHolder diff --git a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt index c7cb97d911..36d5972161 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt +++ b/platform/android/java/lib/src/org/godotengine/godot/vulkan/VkThread.kt @@ -2,9 +2,11 @@ /* VkThread.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -29,7 +31,7 @@ /**************************************************************************/ @file:JvmName("VkThread") -package org.godotengine.godot.vulkan +package org.redotengine.godot.vulkan import android.util.Log import java.util.concurrent.locks.ReentrantLock diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java b/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java index 2c2c9f39d6..09c35e8aee 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/XRMode.java @@ -2,9 +2,11 @@ /* XRMode.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.xr; +package org.redotengine.godot.xr; /** * Godot available XR modes. diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java index 942e57308c..91e32b7476 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrConfigChooser.java @@ -2,9 +2,11 @@ /* OvrConfigChooser.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,9 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.xr.ovr; - -import org.godotengine.godot.gl.GLSurfaceView; +package org.redotengine.godot.xr.ovr; import android.opengl.EGLExt; @@ -38,6 +38,8 @@ import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLDisplay; +import org.redotengine.godot.gl.GLSurfaceView; + /** * EGL config chooser for the Oculus Mobile VR SDK. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java index 1f1034dacf..e6a0df2cc1 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrContextFactory.java @@ -2,9 +2,11 @@ /* OvrContextFactory.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,9 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.xr.ovr; - -import org.godotengine.godot.gl.GLSurfaceView; +package org.redotengine.godot.xr.ovr; import android.opengl.EGL14; @@ -39,6 +39,8 @@ import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLContext; import javax.microedition.khronos.egl.EGLDisplay; +import org.redotengine.godot.gl.GLSurfaceView; + /** * EGL Context factory for the Oculus mobile VR SDK. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java index 60774eb241..4fe9d06ebd 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/ovr/OvrWindowSurfaceFactory.java @@ -2,9 +2,11 @@ /* OvrWindowSurfaceFactory.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,15 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.xr.ovr; - -import org.godotengine.godot.gl.GLSurfaceView; +package org.redotengine.godot.xr.ovr; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLDisplay; import javax.microedition.khronos.egl.EGLSurface; +import org.redotengine.godot.gl.GLSurfaceView; + /** * EGL window surface factory for the Oculus mobile VR SDK. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java index 147b4ea676..c95e25708c 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularConfigChooser.java @@ -2,9 +2,11 @@ /* RegularConfigChooser.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,15 +30,15 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.xr.regular; - -import org.godotengine.godot.gl.GLSurfaceView; -import org.godotengine.godot.utils.GLUtils; +package org.redotengine.godot.xr.regular; import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLDisplay; +import org.redotengine.godot.gl.GLSurfaceView; +import org.redotengine.godot.utils.GLUtils; + /** * Used to select the egl config for pancake games. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java index 1f0d8592b3..2ec2a7a1be 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularContextFactory.java @@ -2,9 +2,11 @@ /* RegularContextFactory.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,10 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.xr.regular; - -import org.godotengine.godot.gl.GLSurfaceView; -import org.godotengine.godot.utils.GLUtils; +package org.redotengine.godot.xr.regular; import android.util.Log; @@ -40,6 +39,9 @@ import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.egl.EGLContext; import javax.microedition.khronos.egl.EGLDisplay; +import org.redotengine.godot.gl.GLSurfaceView; +import org.redotengine.godot.utils.GLUtils; + /** * Factory used to setup the opengl context for pancake games. */ diff --git a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java index ed5e5ec561..f789c726ba 100644 --- a/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java +++ b/platform/android/java/lib/src/org/godotengine/godot/xr/regular/RegularFallbackConfigChooser.java @@ -2,9 +2,11 @@ /* RegularFallbackConfigChooser.java */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.xr.regular; +package org.redotengine.godot.xr.regular; import android.util.Log; diff --git a/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt b/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt index 8b0466848a..f9e858edef 100644 --- a/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt +++ b/platform/android/java/lib/srcTest/java/org/godotengine/godot/utils/CommandLineFileParserTest.kt @@ -2,9 +2,11 @@ /* CommandLineFileParserTest.kt */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -28,7 +30,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /**************************************************************************/ -package org.godotengine.godot.utils +package org.redotengine.godot.utils import org.junit.Test import org.junit.runner.RunWith diff --git a/platform/android/java/nativeSrcsConfigs/build.gradle b/platform/android/java/nativeSrcsConfigs/build.gradle index a728241181..bb9df54f69 100644 --- a/platform/android/java/nativeSrcsConfigs/build.gradle +++ b/platform/android/java/nativeSrcsConfigs/build.gradle @@ -9,7 +9,7 @@ android { buildToolsVersion versions.buildTools ndkVersion versions.ndkVersion - namespace = "org.godotengine.godot" + namespace = "org.redotengine.godot" defaultConfig { minSdkVersion versions.minSdk diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp index a309a6ab74..12dedd4c0c 100644 --- a/platform/android/java_class_wrapper.cpp +++ b/platform/android/java_class_wrapper.cpp @@ -2,9 +2,11 @@ /* java_class_wrapper.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/java_godot_io_wrapper.cpp b/platform/android/java_godot_io_wrapper.cpp index 49913b9c30..44b293f93d 100644 --- a/platform/android/java_godot_io_wrapper.cpp +++ b/platform/android/java_godot_io_wrapper.cpp @@ -2,9 +2,11 @@ /* java_godot_io_wrapper.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/java_godot_io_wrapper.h b/platform/android/java_godot_io_wrapper.h index c113a13040..002ac98e8d 100644 --- a/platform/android/java_godot_io_wrapper.h +++ b/platform/android/java_godot_io_wrapper.h @@ -2,9 +2,11 @@ /* java_godot_io_wrapper.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/java_godot_lib_jni.cpp b/platform/android/java_godot_lib_jni.cpp index ec42e5bbd8..e6c8fe82d0 100644 --- a/platform/android/java_godot_lib_jni.cpp +++ b/platform/android/java_godot_lib_jni.cpp @@ -2,9 +2,11 @@ /* java_godot_lib_jni.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -132,13 +134,13 @@ static void _terminate(JNIEnv *env, bool p_restart = false) { extern "C" { -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height) { if (godot_io_java) { godot_io_java->set_vk_height(p_height); } } -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion) { +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion) { JavaVM *jvm; env->GetJavaVM(&jvm); @@ -158,11 +160,11 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv return true; } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz) { _terminate(env, false); } -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts) { +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts) { setup_android_thread(); const char **cmdline = nullptr; @@ -210,7 +212,7 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env return true; } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv *env, jclass clazz, jobject p_surface, jint p_width, jint p_height) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_resize(JNIEnv *env, jclass clazz, jobject p_surface, jint p_width, jint p_height) { if (os_android) { os_android->set_display_size(Size2i(p_width, p_height)); @@ -226,7 +228,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv *env, j } } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv *env, jclass clazz, jobject p_surface) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_newcontext(JNIEnv *env, jclass clazz, jobject p_surface) { if (os_android) { if (step.get() == STEP_SETUP) { // During startup @@ -241,7 +243,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv *en } } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_back(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -251,11 +253,11 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jcl } } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos) { TTS_Android::_java_utterance_callback(event, id, pos); } -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, jclass clazz) { +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_step(JNIEnv *env, jclass clazz) { if (step.get() == STEP_TERMINATED) { return true; } @@ -300,7 +302,7 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchMouseEvent(JNIEnv *env, jclass clazz, jint p_event_type, jint p_button_mask, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y, jboolean p_double_click, jboolean p_source_mouse_relative, jfloat p_pressure, jfloat p_tilt_x, jfloat p_tilt_y) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchMouseEvent(JNIEnv *env, jclass clazz, jint p_event_type, jint p_button_mask, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y, jboolean p_double_click, jboolean p_source_mouse_relative, jfloat p_pressure, jfloat p_tilt_x, jfloat p_tilt_y) { if (step.get() <= STEP_SETUP) { return; } @@ -309,7 +311,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchMouseEvent(JN } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchTouchEvent(JNIEnv *env, jclass clazz, jint ev, jint pointer, jint pointer_count, jfloatArray position, jboolean p_double_tap) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchTouchEvent(JNIEnv *env, jclass clazz, jint ev, jint pointer, jint pointer_count, jfloatArray position, jboolean p_double_tap) { if (step.get() <= STEP_SETUP) { return; } @@ -330,7 +332,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchTouchEvent(JN } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnify(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_factor) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnify(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_factor) { if (step.get() <= STEP_SETUP) { return; } @@ -338,7 +340,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnify(JNIEnv *env, } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_pan(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_pan(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y) { if (step.get() <= STEP_SETUP) { return; } @@ -346,7 +348,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_pan(JNIEnv *env, jcla } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed) { if (step.get() <= STEP_SETUP) { return; } @@ -361,7 +363,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value) { if (step.get() <= STEP_SETUP) { return; } @@ -376,7 +378,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y) { if (step.get() <= STEP_SETUP) { return; } @@ -405,7 +407,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, j } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name) { if (os_android) { String name = jstring_to_string(p_name, env); Input::get_singleton()->joy_connection_changed(p_device, p_connected, name); @@ -413,30 +415,30 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged( } // Called on the UI thread -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_physical_keycode, jint p_unicode, jint p_key_label, jboolean p_pressed, jboolean p_echo) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_physical_keycode, jint p_unicode, jint p_key_label, jboolean p_pressed, jboolean p_echo) { if (step.get() <= STEP_SETUP) { return; } input_handler->process_key_event(p_physical_keycode, p_unicode, p_key_label, p_pressed, p_echo); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { accelerometer = Vector3(x, y, z); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gravity(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_gravity(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { gravity = Vector3(x, y, z); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnetometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnetometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { magnetometer = Vector3(x, y, z); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_gyroscope(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z) { gyroscope = Vector3(x, y, z); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -444,7 +446,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv *env, os_android->main_loop_focusin(); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -452,13 +454,13 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env, os_android->main_loop_focusout(); } -JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path) { +JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path) { String js = jstring_to_string(path, env); return env->NewStringUTF(GLOBAL_GET(js).operator String().utf8().get_data()); } -JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key) { +JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key) { String editor_setting = ""; #ifdef TOOLS_ENABLED String godot_setting_key = jstring_to_string(p_setting_key, env); @@ -470,7 +472,7 @@ JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getEditorSetting(J return env->NewStringUTF(editor_setting.utf8().get_data()); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_callobject(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params) { Object *obj = ObjectDB::get_instance(ObjectID(ID)); ERR_FAIL_NULL(obj); @@ -493,7 +495,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *en obj->callp(str_method, vptr, count, err); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_calldeferred(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params) { Object *obj = ObjectDB::get_instance(ObjectID(ID)); ERR_FAIL_NULL(obj); @@ -515,14 +517,14 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv * Callable(obj, str_method).call_deferredp(argptrs, count); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz) { DisplayServerAndroid *ds = (DisplayServerAndroid *)DisplayServer::get_singleton(); if (ds) { ds->emit_system_theme_changed(); } } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result) { String permission = jstring_to_string(p_permission, env); if (permission == "android.permission.RECORD_AUDIO" && p_result) { AudioDriver::get_singleton()->input_start(); @@ -533,7 +535,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_requestPermissionResu } } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -545,7 +547,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNI } } -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz) { if (step.get() <= STEP_SETUP) { return; } @@ -555,7 +557,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIE } } -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz) { +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz) { Input *input = Input::get_singleton(); if (input) { return !input->is_agile_input_event_flushing(); diff --git a/platform/android/java_godot_lib_jni.h b/platform/android/java_godot_lib_jni.h index d027da31fa..cfea386df8 100644 --- a/platform/android/java_godot_lib_jni.h +++ b/platform/android/java_godot_lib_jni.h @@ -2,9 +2,11 @@ /* java_godot_lib_jni.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -37,39 +39,39 @@ // These functions can be called from within JAVA and are the means by which our JAVA implementation calls back into our C++ code. // See java/src/org/godotengine/godot/GodotLib.java for the JAVA side of this (yes that's why we have the long names) extern "C" { -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz); -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_resize(JNIEnv *env, jclass clazz, jobject p_surface, jint p_width, jint p_height); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_newcontext(JNIEnv *env, jclass clazz, jobject p_surface); -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_step(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_back(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchMouseEvent(JNIEnv *env, jclass clazz, jint p_event_type, jint p_button_mask, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y, jboolean p_double_click, jboolean p_source_mouse_relative, jfloat p_pressure, jfloat p_tilt_x, jfloat p_tilt_y); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_dispatchTouchEvent(JNIEnv *env, jclass clazz, jint ev, jint pointer, jint pointer_count, jfloatArray positions, jboolean p_double_tap); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnify(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_factor); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_pan(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_physical_keycode, jint p_unicode, jint p_key_label, jboolean p_pressed, jboolean p_echo); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gravity(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_magnetometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_gyroscope(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz); -JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path); -JNIEXPORT jstring JNICALL Java_org_godotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_callobject(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_calldeferred(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz); -JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz); -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz); +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_initialize(JNIEnv *env, jclass clazz, jobject p_activity, jobject p_godot_instance, jobject p_asset_manager, jobject p_godot_io, jobject p_net_utils, jobject p_directory_access_handler, jobject p_file_access_handler, jboolean p_use_apk_expansion); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_ondestroy(JNIEnv *env, jclass clazz); +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_setup(JNIEnv *env, jclass clazz, jobjectArray p_cmdline, jobject p_godot_tts); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_resize(JNIEnv *env, jclass clazz, jobject p_surface, jint p_width, jint p_height); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_newcontext(JNIEnv *env, jclass clazz, jobject p_surface); +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_step(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_ttsCallback(JNIEnv *env, jclass clazz, jint event, jint id, jint pos); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_back(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchMouseEvent(JNIEnv *env, jclass clazz, jint p_event_type, jint p_button_mask, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y, jboolean p_double_click, jboolean p_source_mouse_relative, jfloat p_pressure, jfloat p_tilt_x, jfloat p_tilt_y); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_dispatchTouchEvent(JNIEnv *env, jclass clazz, jint ev, jint pointer, jint pointer_count, jfloatArray positions, jboolean p_double_tap); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnify(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_factor); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_pan(JNIEnv *env, jclass clazz, jfloat p_x, jfloat p_y, jfloat p_delta_x, jfloat p_delta_y); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_key(JNIEnv *env, jclass clazz, jint p_physical_keycode, jint p_unicode, jint p_key_label, jboolean p_pressed, jboolean p_echo); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joybutton(JNIEnv *env, jclass clazz, jint p_device, jint p_button, jboolean p_pressed); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyaxis(JNIEnv *env, jclass clazz, jint p_device, jint p_axis, jfloat p_value); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyhat(JNIEnv *env, jclass clazz, jint p_device, jint p_hat_x, jint p_hat_y); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_joyconnectionchanged(JNIEnv *env, jclass clazz, jint p_device, jboolean p_connected, jstring p_name); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_accelerometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_gravity(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_magnetometer(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_gyroscope(JNIEnv *env, jclass clazz, jfloat x, jfloat y, jfloat z); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusin(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_focusout(JNIEnv *env, jclass clazz); +JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getGlobal(JNIEnv *env, jclass clazz, jstring path); +JNIEXPORT jstring JNICALL Java_org_redotengine_godot_GodotLib_getEditorSetting(JNIEnv *env, jclass clazz, jstring p_setting_key); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_callobject(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_calldeferred(JNIEnv *env, jclass clazz, jlong ID, jstring method, jobjectArray params); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_setVirtualKeyboardHeight(JNIEnv *env, jclass clazz, jint p_height); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_requestPermissionResult(JNIEnv *env, jclass clazz, jstring p_permission, jboolean p_result); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onNightModeChanged(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererResumed(JNIEnv *env, jclass clazz); +JNIEXPORT void JNICALL Java_org_redotengine_godot_GodotLib_onRendererPaused(JNIEnv *env, jclass clazz); +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_GodotLib_shouldDispatchInputToRenderThread(JNIEnv *env, jclass clazz); } #endif // JAVA_GODOT_LIB_JNI_H diff --git a/platform/android/java_godot_view_wrapper.cpp b/platform/android/java_godot_view_wrapper.cpp index 04424c1179..04b14253cb 100644 --- a/platform/android/java_godot_view_wrapper.cpp +++ b/platform/android/java_godot_view_wrapper.cpp @@ -2,9 +2,11 @@ /* java_godot_view_wrapper.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/java_godot_view_wrapper.h b/platform/android/java_godot_view_wrapper.h index 5f554aa2d6..df69aed66f 100644 --- a/platform/android/java_godot_view_wrapper.h +++ b/platform/android/java_godot_view_wrapper.h @@ -2,9 +2,11 @@ /* java_godot_view_wrapper.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/java_godot_wrapper.cpp b/platform/android/java_godot_wrapper.cpp index 70ea4b09c1..8bbcb5b742 100644 --- a/platform/android/java_godot_wrapper.cpp +++ b/platform/android/java_godot_wrapper.cpp @@ -2,9 +2,11 @@ /* java_godot_wrapper.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -42,7 +44,7 @@ GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_activity, jobject p_ activity = p_env->NewGlobalRef(p_activity); // get info about our Godot class so we can get pointers and stuff... - godot_class = p_env->FindClass("org/godotengine/godot/Godot"); + godot_class = p_env->FindClass("org/redotengine/godot/Godot"); if (godot_class) { godot_class = (jclass)p_env->NewGlobalRef(godot_class); } else { @@ -78,7 +80,7 @@ GodotJavaWrapper::GodotJavaWrapper(JNIEnv *p_env, jobject p_activity, jobject p_ _on_godot_main_loop_started = p_env->GetMethodID(godot_class, "onGodotMainLoopStarted", "()V"); _on_godot_terminating = p_env->GetMethodID(godot_class, "onGodotTerminating", "()V"); _create_new_godot_instance = p_env->GetMethodID(godot_class, "createNewGodotInstance", "([Ljava/lang/String;)I"); - _get_render_view = p_env->GetMethodID(godot_class, "getRenderView", "()Lorg/godotengine/godot/GodotRenderView;"); + _get_render_view = p_env->GetMethodID(godot_class, "getRenderView", "()Lorg/redotengine/godot/GodotRenderView;"); _begin_benchmark_measure = p_env->GetMethodID(godot_class, "nativeBeginBenchmarkMeasure", "(Ljava/lang/String;Ljava/lang/String;)V"); _end_benchmark_measure = p_env->GetMethodID(godot_class, "nativeEndBenchmarkMeasure", "(Ljava/lang/String;Ljava/lang/String;)V"); _dump_benchmark = p_env->GetMethodID(godot_class, "nativeDumpBenchmark", "(Ljava/lang/String;)V"); diff --git a/platform/android/java_godot_wrapper.h b/platform/android/java_godot_wrapper.h index 358cf3261d..c2c579d7ae 100644 --- a/platform/android/java_godot_wrapper.h +++ b/platform/android/java_godot_wrapper.h @@ -2,9 +2,11 @@ /* java_godot_wrapper.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/jni_utils.cpp b/platform/android/jni_utils.cpp index fc97d6eca4..38f73cf9a7 100644 --- a/platform/android/jni_utils.cpp +++ b/platform/android/jni_utils.cpp @@ -2,9 +2,11 @@ /* jni_utils.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -100,7 +102,7 @@ jvalret _variant_to_jvalue(JNIEnv *env, Variant::Type p_type, const Variant *p_a case Variant::DICTIONARY: { Dictionary dict = *p_arg; - jclass dclass = env->FindClass("org/godotengine/godot/Dictionary"); + jclass dclass = env->FindClass("org/redotengine/godot/Dictionary"); jmethodID ctor = env->GetMethodID(dclass, "<init>", "()V"); jobject jdict = env->NewObject(dclass, ctor); @@ -336,7 +338,7 @@ Variant _jobject_to_variant(JNIEnv *env, jobject obj) { return varr; } - if (name == "java.util.HashMap" || name == "org.godotengine.godot.Dictionary") { + if (name == "java.util.HashMap" || name == "org.redotengine.godot.Dictionary") { Dictionary ret; jclass oclass = c; jmethodID get_keys = env->GetMethodID(oclass, "get_keys", "()[Ljava/lang/String;"); @@ -381,7 +383,7 @@ Variant::Type get_jni_type(const String &p_type) { { "[F", Variant::PACKED_FLOAT32_ARRAY }, { "[D", Variant::PACKED_FLOAT64_ARRAY }, { "[Ljava.lang.String;", Variant::PACKED_STRING_ARRAY }, - { "org.godotengine.godot.Dictionary", Variant::DICTIONARY }, + { "org.redotengine.godot.Dictionary", Variant::DICTIONARY }, { nullptr, Variant::NIL } }; @@ -410,7 +412,7 @@ const char *get_jni_sig(const String &p_type) { { "float", "F" }, { "double", "D" }, { "java.lang.String", "Ljava/lang/String;" }, - { "org.godotengine.godot.Dictionary", "Lorg/godotengine/godot/Dictionary;" }, + { "org.redotengine.godot.Dictionary", "Lorg/godotengine/godot/Dictionary;" }, { "[I", "[I" }, { "[J", "[J" }, { "[B", "[B" }, diff --git a/platform/android/jni_utils.h b/platform/android/jni_utils.h index c608f9ebaa..9f7c5845f3 100644 --- a/platform/android/jni_utils.h +++ b/platform/android/jni_utils.h @@ -2,9 +2,11 @@ /* jni_utils.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/net_socket_android.cpp b/platform/android/net_socket_android.cpp index 8f0ee51fac..2a9fc65ac3 100644 --- a/platform/android/net_socket_android.cpp +++ b/platform/android/net_socket_android.cpp @@ -2,9 +2,11 @@ /* net_socket_android.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/net_socket_android.h b/platform/android/net_socket_android.h index 26cb2d4e3d..9dcf7c11da 100644 --- a/platform/android/net_socket_android.h +++ b/platform/android/net_socket_android.h @@ -2,9 +2,11 @@ /* net_socket_android.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 764959eef3..891bfdb3d2 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -2,9 +2,11 @@ /* os_android.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -72,7 +74,7 @@ String _remove_symlink(const String &dir) { class AndroidLogger : public Logger { public: virtual void logv(const char *p_format, va_list p_list, bool p_err) { - __android_log_vprint(p_err ? ANDROID_LOG_ERROR : ANDROID_LOG_INFO, "godot", p_format, p_list); + __android_log_vprint(p_err ? ANDROID_LOG_ERROR : ANDROID_LOG_INFO, "redot", p_format, p_list); } virtual ~AndroidLogger() {} diff --git a/platform/android/os_android.h b/platform/android/os_android.h index b150ef4f61..e71ee98d5c 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -2,9 +2,11 @@ /* os_android.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/platform_config.h b/platform/android/platform_config.h index d2376d2de7..7405a32ef1 100644 --- a/platform/android/platform_config.h +++ b/platform/android/platform_config.h @@ -2,9 +2,11 @@ /* platform_config.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/platform_gl.h b/platform/android/platform_gl.h index af6edb103d..65a63939a6 100644 --- a/platform/android/platform_gl.h +++ b/platform/android/platform_gl.h @@ -2,9 +2,11 @@ /* platform_gl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/plugin/godot_plugin_jni.cpp b/platform/android/plugin/godot_plugin_jni.cpp index e3cde145cb..2cfccf6f7b 100644 --- a/platform/android/plugin/godot_plugin_jni.cpp +++ b/platform/android/plugin/godot_plugin_jni.cpp @@ -2,9 +2,11 @@ /* godot_plugin_jni.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -54,7 +56,7 @@ void unregister_plugins_singletons() { extern "C" { -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSingleton(JNIEnv *env, jclass clazz, jstring name, jobject obj) { +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterSingleton(JNIEnv *env, jclass clazz, jstring name, jobject obj) { String singname = jstring_to_string(name, env); ERR_FAIL_COND_V(jni_singletons.has(singname), false); @@ -68,7 +70,7 @@ JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeR return true; } -JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterMethod(JNIEnv *env, jclass clazz, jstring sname, jstring name, jstring ret, jobjectArray args) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterMethod(JNIEnv *env, jclass clazz, jstring sname, jstring name, jstring ret, jobjectArray args) { String singname = jstring_to_string(sname, env); ERR_FAIL_COND(!jni_singletons.has(singname)); @@ -100,7 +102,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegis s->add_method(mname, mid, types, get_jni_type(retval)); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types) { String singleton_name = jstring_to_string(j_plugin_name, env); ERR_FAIL_COND(!jni_singletons.has(singleton_name)); @@ -121,7 +123,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegis singleton->add_signal(signal_name, types); } -JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params) { +JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params) { String singleton_name = jstring_to_string(j_plugin_name, env); ERR_FAIL_COND(!jni_singletons.has(singleton_name)); diff --git a/platform/android/plugin/godot_plugin_jni.h b/platform/android/plugin/godot_plugin_jni.h index 8c62fb0f68..cb1d2e6842 100644 --- a/platform/android/plugin/godot_plugin_jni.h +++ b/platform/android/plugin/godot_plugin_jni.h @@ -2,9 +2,11 @@ /* godot_plugin_jni.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -37,10 +39,10 @@ void unregister_plugins_singletons(); extern "C" { -JNIEXPORT jboolean JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSingleton(JNIEnv *env, jclass clazz, jstring name, jobject obj); -JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterMethod(JNIEnv *env, jclass clazz, jstring sname, jstring name, jstring ret, jobjectArray args); -JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types); -JNIEXPORT void JNICALL Java_org_godotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params); +JNIEXPORT jboolean JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterSingleton(JNIEnv *env, jclass clazz, jstring name, jobject obj); +JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterMethod(JNIEnv *env, jclass clazz, jstring sname, jstring name, jstring ret, jobjectArray args); +JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeRegisterSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_param_types); +JNIEXPORT void JNICALL Java_org_redotengine_godot_plugin_GodotPlugin_nativeEmitSignal(JNIEnv *env, jclass clazz, jstring j_plugin_name, jstring j_signal_name, jobjectArray j_signal_params); } #endif // GODOT_PLUGIN_JNI_H diff --git a/platform/android/rendering_context_driver_vulkan_android.cpp b/platform/android/rendering_context_driver_vulkan_android.cpp index 9232126b04..6c946570a9 100644 --- a/platform/android/rendering_context_driver_vulkan_android.cpp +++ b/platform/android/rendering_context_driver_vulkan_android.cpp @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_android.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/rendering_context_driver_vulkan_android.h b/platform/android/rendering_context_driver_vulkan_android.h index a2a42eef24..1497fdbd79 100644 --- a/platform/android/rendering_context_driver_vulkan_android.h +++ b/platform/android/rendering_context_driver_vulkan_android.h @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_android.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/string_android.h b/platform/android/string_android.h index 3f30b8ec3d..35f1a0bcfc 100644 --- a/platform/android/string_android.h +++ b/platform/android/string_android.h @@ -2,9 +2,11 @@ /* string_android.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/thread_jandroid.cpp b/platform/android/thread_jandroid.cpp index 9f4140f70f..dfe7b854cb 100644 --- a/platform/android/thread_jandroid.cpp +++ b/platform/android/thread_jandroid.cpp @@ -2,9 +2,11 @@ /* thread_jandroid.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/thread_jandroid.h b/platform/android/thread_jandroid.h index e3d1df5e59..bfed32fb52 100644 --- a/platform/android/thread_jandroid.h +++ b/platform/android/thread_jandroid.h @@ -2,9 +2,11 @@ /* thread_jandroid.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/tts_android.cpp b/platform/android/tts_android.cpp index be85e47972..25106099c8 100644 --- a/platform/android/tts_android.cpp +++ b/platform/android/tts_android.cpp @@ -2,9 +2,11 @@ /* tts_android.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/android/tts_android.h b/platform/android/tts_android.h index 4cc7c12846..a82389dd29 100644 --- a/platform/android/tts_android.h +++ b/platform/android/tts_android.h @@ -2,9 +2,11 @@ /* tts_android.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/api/api.cpp b/platform/ios/api/api.cpp index b8c9e7e9aa..01a591ae83 100644 --- a/platform/ios/api/api.cpp +++ b/platform/ios/api/api.cpp @@ -2,9 +2,11 @@ /* api.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/api/api.h b/platform/ios/api/api.h index 15634722bf..403c9cac3b 100644 --- a/platform/ios/api/api.h +++ b/platform/ios/api/api.h @@ -2,9 +2,11 @@ /* api.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/app_delegate.h b/platform/ios/app_delegate.h index d8310792aa..0b2e24cb1c 100644 --- a/platform/ios/app_delegate.h +++ b/platform/ios/app_delegate.h @@ -2,9 +2,11 @@ /* app_delegate.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/app_delegate.mm b/platform/ios/app_delegate.mm index 37d2696434..d2b86ac658 100644 --- a/platform/ios/app_delegate.mm +++ b/platform/ios/app_delegate.mm @@ -2,9 +2,11 @@ /* app_delegate.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/device_metrics.h b/platform/ios/device_metrics.h index 2eb9e003a0..1092ce220b 100644 --- a/platform/ios/device_metrics.h +++ b/platform/ios/device_metrics.h @@ -2,9 +2,11 @@ /* device_metrics.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/device_metrics.m b/platform/ios/device_metrics.m index d6f5ec8e42..09f255a9bb 100644 --- a/platform/ios/device_metrics.m +++ b/platform/ios/device_metrics.m @@ -2,9 +2,11 @@ /* device_metrics.m */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/display_layer.h b/platform/ios/display_layer.h index e719a42cd9..53aa115517 100644 --- a/platform/ios/display_layer.h +++ b/platform/ios/display_layer.h @@ -2,9 +2,11 @@ /* display_layer.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/display_layer.mm b/platform/ios/display_layer.mm index 27cde1c6c2..daeebb47cc 100644 --- a/platform/ios/display_layer.mm +++ b/platform/ios/display_layer.mm @@ -2,9 +2,11 @@ /* display_layer.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/display_server_ios.h b/platform/ios/display_server_ios.h index 4dded5aa29..19c87e3c8a 100644 --- a/platform/ios/display_server_ios.h +++ b/platform/ios/display_server_ios.h @@ -2,9 +2,11 @@ /* display_server_ios.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/display_server_ios.mm b/platform/ios/display_server_ios.mm index 802fbefc0d..45207feba5 100644 --- a/platform/ios/display_server_ios.mm +++ b/platform/ios/display_server_ios.mm @@ -2,9 +2,11 @@ /* display_server_ios.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/export/export.cpp b/platform/ios/export/export.cpp index 98cc80e4a0..9e7ad8345f 100644 --- a/platform/ios/export/export.cpp +++ b/platform/ios/export/export.cpp @@ -2,9 +2,11 @@ /* export.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/export/export.h b/platform/ios/export/export.h index 355811054a..dd2c7a58ac 100644 --- a/platform/ios/export/export.h +++ b/platform/ios/export/export.h @@ -2,9 +2,11 @@ /* export.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/export/export_plugin.cpp b/platform/ios/export/export_plugin.cpp index 580e3ba789..78d16e99bf 100644 --- a/platform/ios/export/export_plugin.cpp +++ b/platform/ios/export/export_plugin.cpp @@ -2,9 +2,11 @@ /* export_plugin.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -1977,7 +1979,7 @@ Error EditorExportPlatformIOS::_export_ios_plugins(const Ref<EditorExportPreset> plugin_format["initialization"] = plugin_initialization_cpp_code; plugin_format["deinitialization"] = plugin_deinitialization_cpp_code; - String plugin_cpp_code = "\n// Godot Plugins\n" + String plugin_cpp_code = "\n// Redot Plugins\n" "void godot_ios_plugins_initialize();\n" "void godot_ios_plugins_deinitialize();\n" "// Exported Plugins\n\n" diff --git a/platform/ios/export/export_plugin.h b/platform/ios/export/export_plugin.h index 1964906c27..acaa55143f 100644 --- a/platform/ios/export/export_plugin.h +++ b/platform/ios/export/export_plugin.h @@ -2,9 +2,11 @@ /* export_plugin.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/export/godot_plugin_config.cpp b/platform/ios/export/godot_plugin_config.cpp index 90e40b7c42..ae033664c3 100644 --- a/platform/ios/export/godot_plugin_config.cpp +++ b/platform/ios/export/godot_plugin_config.cpp @@ -2,9 +2,11 @@ /* godot_plugin_config.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/export/godot_plugin_config.h b/platform/ios/export/godot_plugin_config.h index 5ff5b26ab3..a81bd7f52a 100644 --- a/platform/ios/export/godot_plugin_config.h +++ b/platform/ios/export/godot_plugin_config.h @@ -2,9 +2,11 @@ /* godot_plugin_config.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/godot_app_delegate.h b/platform/ios/godot_app_delegate.h index a9bfcbb0b2..329e82b63e 100644 --- a/platform/ios/godot_app_delegate.h +++ b/platform/ios/godot_app_delegate.h @@ -2,9 +2,11 @@ /* godot_app_delegate.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/godot_app_delegate.m b/platform/ios/godot_app_delegate.m index 74e8705bc3..2fb2ff473a 100644 --- a/platform/ios/godot_app_delegate.m +++ b/platform/ios/godot_app_delegate.m @@ -2,9 +2,11 @@ /* godot_app_delegate.m */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/godot_ios.mm b/platform/ios/godot_ios.mm index 9d35d43344..8e87683dcc 100644 --- a/platform/ios/godot_ios.mm +++ b/platform/ios/godot_ios.mm @@ -2,9 +2,11 @@ /* godot_ios.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/godot_view.h b/platform/ios/godot_view.h index b00ca37ebe..0d965c8b72 100644 --- a/platform/ios/godot_view.h +++ b/platform/ios/godot_view.h @@ -2,9 +2,11 @@ /* godot_view.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/godot_view.mm b/platform/ios/godot_view.mm index 1dddc9306e..3c09c5fc86 100644 --- a/platform/ios/godot_view.mm +++ b/platform/ios/godot_view.mm @@ -2,9 +2,11 @@ /* godot_view.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/godot_view_renderer.h b/platform/ios/godot_view_renderer.h index 47e615ca02..6b7f64442f 100644 --- a/platform/ios/godot_view_renderer.h +++ b/platform/ios/godot_view_renderer.h @@ -2,9 +2,11 @@ /* godot_view_renderer.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/godot_view_renderer.mm b/platform/ios/godot_view_renderer.mm index 9c56ca342f..b648a1dccc 100644 --- a/platform/ios/godot_view_renderer.mm +++ b/platform/ios/godot_view_renderer.mm @@ -2,9 +2,11 @@ /* godot_view_renderer.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/ios.h b/platform/ios/ios.h index cb5be64cee..4287d20f72 100644 --- a/platform/ios/ios.h +++ b/platform/ios/ios.h @@ -2,9 +2,11 @@ /* ios.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/ios.mm b/platform/ios/ios.mm index 6943de5ac8..f4afb10817 100644 --- a/platform/ios/ios.mm +++ b/platform/ios/ios.mm @@ -2,9 +2,11 @@ /* ios.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/ios_terminal_logger.h b/platform/ios/ios_terminal_logger.h index 7f0bc37a07..0088a206b7 100644 --- a/platform/ios/ios_terminal_logger.h +++ b/platform/ios/ios_terminal_logger.h @@ -2,9 +2,11 @@ /* ios_terminal_logger.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/ios_terminal_logger.mm b/platform/ios/ios_terminal_logger.mm index b4c9821cdc..202896fbb7 100644 --- a/platform/ios/ios_terminal_logger.mm +++ b/platform/ios/ios_terminal_logger.mm @@ -2,9 +2,11 @@ /* ios_terminal_logger.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/joypad_ios.h b/platform/ios/joypad_ios.h index a61e9afafb..8bd4bd78f4 100644 --- a/platform/ios/joypad_ios.h +++ b/platform/ios/joypad_ios.h @@ -2,9 +2,11 @@ /* joypad_ios.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/joypad_ios.mm b/platform/ios/joypad_ios.mm index 38d3ce728a..55074bb272 100644 --- a/platform/ios/joypad_ios.mm +++ b/platform/ios/joypad_ios.mm @@ -2,9 +2,11 @@ /* joypad_ios.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/key_mapping_ios.h b/platform/ios/key_mapping_ios.h index 8874da3024..4328b1eebf 100644 --- a/platform/ios/key_mapping_ios.h +++ b/platform/ios/key_mapping_ios.h @@ -2,9 +2,11 @@ /* key_mapping_ios.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/key_mapping_ios.mm b/platform/ios/key_mapping_ios.mm index 61f28aa84b..fb2bb2b242 100644 --- a/platform/ios/key_mapping_ios.mm +++ b/platform/ios/key_mapping_ios.mm @@ -2,9 +2,11 @@ /* key_mapping_ios.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/keyboard_input_view.h b/platform/ios/keyboard_input_view.h index 4132afe641..f2c4d229de 100644 --- a/platform/ios/keyboard_input_view.h +++ b/platform/ios/keyboard_input_view.h @@ -2,9 +2,11 @@ /* keyboard_input_view.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/keyboard_input_view.mm b/platform/ios/keyboard_input_view.mm index 4067701a41..b9a28d7eb1 100644 --- a/platform/ios/keyboard_input_view.mm +++ b/platform/ios/keyboard_input_view.mm @@ -2,9 +2,11 @@ /* keyboard_input_view.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/main.m b/platform/ios/main.m index 33b1034d98..98f20cba03 100644 --- a/platform/ios/main.m +++ b/platform/ios/main.m @@ -2,9 +2,11 @@ /* main.m */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/os_ios.h b/platform/ios/os_ios.h index b7c5a73065..0bb11aa83e 100644 --- a/platform/ios/os_ios.h +++ b/platform/ios/os_ios.h @@ -2,9 +2,11 @@ /* os_ios.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/os_ios.mm b/platform/ios/os_ios.mm index 35b87ea647..eb6599340b 100644 --- a/platform/ios/os_ios.mm +++ b/platform/ios/os_ios.mm @@ -2,9 +2,11 @@ /* os_ios.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/platform_config.h b/platform/ios/platform_config.h index 01b0a12b5d..2ab710d729 100644 --- a/platform/ios/platform_config.h +++ b/platform/ios/platform_config.h @@ -2,9 +2,11 @@ /* platform_config.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/platform_gl.h b/platform/ios/platform_gl.h index 974ea9d2c2..63f67d9455 100644 --- a/platform/ios/platform_gl.h +++ b/platform/ios/platform_gl.h @@ -2,9 +2,11 @@ /* platform_gl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/rendering_context_driver_vulkan_ios.h b/platform/ios/rendering_context_driver_vulkan_ios.h index dc85ff738d..acf56e632f 100644 --- a/platform/ios/rendering_context_driver_vulkan_ios.h +++ b/platform/ios/rendering_context_driver_vulkan_ios.h @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_ios.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/rendering_context_driver_vulkan_ios.mm b/platform/ios/rendering_context_driver_vulkan_ios.mm index 6a6af1bc41..1c74312a80 100644 --- a/platform/ios/rendering_context_driver_vulkan_ios.mm +++ b/platform/ios/rendering_context_driver_vulkan_ios.mm @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_ios.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/tts_ios.h b/platform/ios/tts_ios.h index 217f55da66..d09eea1740 100644 --- a/platform/ios/tts_ios.h +++ b/platform/ios/tts_ios.h @@ -2,9 +2,11 @@ /* tts_ios.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/tts_ios.mm b/platform/ios/tts_ios.mm index 33b30b17c9..b07c419e48 100644 --- a/platform/ios/tts_ios.mm +++ b/platform/ios/tts_ios.mm @@ -2,9 +2,11 @@ /* tts_ios.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/view_controller.h b/platform/ios/view_controller.h index e641d761d9..ff6d70a772 100644 --- a/platform/ios/view_controller.h +++ b/platform/ios/view_controller.h @@ -2,9 +2,11 @@ /* view_controller.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/ios/view_controller.mm b/platform/ios/view_controller.mm index 787e767109..588233a07d 100644 --- a/platform/ios/view_controller.mm +++ b/platform/ios/view_controller.mm @@ -2,9 +2,11 @@ /* view_controller.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/SCsub b/platform/linuxbsd/SCsub index 0802b528f4..d975273bb7 100644 --- a/platform/linuxbsd/SCsub +++ b/platform/linuxbsd/SCsub @@ -38,7 +38,7 @@ if env["dbus"]: if env["use_sowrap"]: common_linuxbsd.append("dbus-so_wrap.c") -prog = env.add_program("#bin/godot", ["godot_linuxbsd.cpp"] + common_linuxbsd) +prog = env.add_program("#bin/redot", ["godot_linuxbsd.cpp"] + common_linuxbsd) if env["debug_symbols"] and env["separate_debug_symbols"]: env.AddPostAction(prog, env.Run(platform_linuxbsd_builders.make_debug_linuxbsd)) diff --git a/platform/linuxbsd/crash_handler_linuxbsd.cpp b/platform/linuxbsd/crash_handler_linuxbsd.cpp index 446fe5c7a1..c46b5f5a1c 100644 --- a/platform/linuxbsd/crash_handler_linuxbsd.cpp +++ b/platform/linuxbsd/crash_handler_linuxbsd.cpp @@ -2,9 +2,11 @@ /* crash_handler_linuxbsd.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/crash_handler_linuxbsd.h b/platform/linuxbsd/crash_handler_linuxbsd.h index 684f62b249..ab382ada90 100644 --- a/platform/linuxbsd/crash_handler_linuxbsd.h +++ b/platform/linuxbsd/crash_handler_linuxbsd.h @@ -2,9 +2,11 @@ /* crash_handler_linuxbsd.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py index d1de760f34..eba26a3630 100644 --- a/platform/linuxbsd/detect.py +++ b/platform/linuxbsd/detect.py @@ -33,7 +33,7 @@ def get_opts(): EnumVariable("linker", "Linker program", "default", ("default", "bfd", "gold", "lld", "mold")), BoolVariable("use_llvm", "Use the LLVM compiler", False), BoolVariable("use_static_cpp", "Link libgcc and libstdc++ statically for better portability", True), - BoolVariable("use_coverage", "Test Godot coverage", False), + BoolVariable("use_coverage", "Test Redot coverage", False), BoolVariable("use_ubsan", "Use LLVM/GCC compiler undefined behavior sanitizer (UBSAN)", False), BoolVariable("use_asan", "Use LLVM/GCC compiler address sanitizer (ASAN)", False), BoolVariable("use_lsan", "Use LLVM/GCC compiler leak sanitizer (LSAN)", False), diff --git a/platform/linuxbsd/export/export.cpp b/platform/linuxbsd/export/export.cpp index a512714758..37796cebc0 100644 --- a/platform/linuxbsd/export/export.cpp +++ b/platform/linuxbsd/export/export.cpp @@ -2,9 +2,11 @@ /* export.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/export/export.h b/platform/linuxbsd/export/export.h index f493047815..e10f72c1b5 100644 --- a/platform/linuxbsd/export/export.h +++ b/platform/linuxbsd/export/export.h @@ -2,9 +2,11 @@ /* export.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/export/export_plugin.cpp b/platform/linuxbsd/export/export_plugin.cpp index 936adddda3..3563350423 100644 --- a/platform/linuxbsd/export/export_plugin.cpp +++ b/platform/linuxbsd/export/export_plugin.cpp @@ -2,9 +2,11 @@ /* export_plugin.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/export/export_plugin.h b/platform/linuxbsd/export/export_plugin.h index 21bd81ed2f..1c4bb4a58e 100644 --- a/platform/linuxbsd/export/export_plugin.h +++ b/platform/linuxbsd/export/export_plugin.h @@ -2,9 +2,11 @@ /* export_plugin.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/freedesktop_portal_desktop.cpp b/platform/linuxbsd/freedesktop_portal_desktop.cpp index 671da7fc2a..23c88bd995 100644 --- a/platform/linuxbsd/freedesktop_portal_desktop.cpp +++ b/platform/linuxbsd/freedesktop_portal_desktop.cpp @@ -2,9 +2,11 @@ /* freedesktop_portal_desktop.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/freedesktop_portal_desktop.h b/platform/linuxbsd/freedesktop_portal_desktop.h index 96c38de2c2..c6e0fd84cc 100644 --- a/platform/linuxbsd/freedesktop_portal_desktop.h +++ b/platform/linuxbsd/freedesktop_portal_desktop.h @@ -2,9 +2,11 @@ /* freedesktop_portal_desktop.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/freedesktop_screensaver.cpp b/platform/linuxbsd/freedesktop_screensaver.cpp index cf179b5735..a971ddb98b 100644 --- a/platform/linuxbsd/freedesktop_screensaver.cpp +++ b/platform/linuxbsd/freedesktop_screensaver.cpp @@ -2,9 +2,11 @@ /* freedesktop_screensaver.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -61,9 +63,9 @@ void FreeDesktopScreenSaver::inhibit() { String app_name_string = GLOBAL_GET("application/config/name"); CharString app_name_utf8 = app_name_string.utf8(); - const char *app_name = app_name_string.is_empty() ? "Godot Engine" : app_name_utf8.get_data(); + const char *app_name = app_name_string.is_empty() ? "Redot Engine" : app_name_utf8.get_data(); - const char *reason = "Running Godot Engine project"; + const char *reason = "Running Redot Engine project"; DBusMessage *message = dbus_message_new_method_call( BUS_OBJECT_NAME, BUS_OBJECT_PATH, BUS_INTERFACE, diff --git a/platform/linuxbsd/freedesktop_screensaver.h b/platform/linuxbsd/freedesktop_screensaver.h index e9f0c566a5..818383b800 100644 --- a/platform/linuxbsd/freedesktop_screensaver.h +++ b/platform/linuxbsd/freedesktop_screensaver.h @@ -2,9 +2,11 @@ /* freedesktop_screensaver.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/godot_linuxbsd.cpp b/platform/linuxbsd/godot_linuxbsd.cpp index b0880c86b8..b7d589bea4 100644 --- a/platform/linuxbsd/godot_linuxbsd.cpp +++ b/platform/linuxbsd/godot_linuxbsd.cpp @@ -2,9 +2,11 @@ /* godot_linuxbsd.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/joypad_linux.cpp b/platform/linuxbsd/joypad_linux.cpp index a67428b9a4..63f1e08dd7 100644 --- a/platform/linuxbsd/joypad_linux.cpp +++ b/platform/linuxbsd/joypad_linux.cpp @@ -2,9 +2,11 @@ /* joypad_linux.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/joypad_linux.h b/platform/linuxbsd/joypad_linux.h index bf24d8e5a5..49a90a94c9 100644 --- a/platform/linuxbsd/joypad_linux.h +++ b/platform/linuxbsd/joypad_linux.h @@ -2,9 +2,11 @@ /* joypad_linux.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/os_linuxbsd.cpp b/platform/linuxbsd/os_linuxbsd.cpp index 6355562feb..db2ac3db05 100644 --- a/platform/linuxbsd/os_linuxbsd.cpp +++ b/platform/linuxbsd/os_linuxbsd.cpp @@ -2,9 +2,11 @@ /* os_linuxbsd.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/os_linuxbsd.h b/platform/linuxbsd/os_linuxbsd.h index 9084061eb9..4a0f6c948b 100644 --- a/platform/linuxbsd/os_linuxbsd.h +++ b/platform/linuxbsd/os_linuxbsd.h @@ -2,9 +2,11 @@ /* os_linuxbsd.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/platform_config.h b/platform/linuxbsd/platform_config.h index c372ef28f6..d51ce94b82 100644 --- a/platform/linuxbsd/platform_config.h +++ b/platform/linuxbsd/platform_config.h @@ -2,9 +2,11 @@ /* platform_config.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/platform_gl.h b/platform/linuxbsd/platform_gl.h index 5d4c2d8978..c627179e58 100644 --- a/platform/linuxbsd/platform_gl.h +++ b/platform/linuxbsd/platform_gl.h @@ -2,9 +2,11 @@ /* platform_gl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/tts_linux.cpp b/platform/linuxbsd/tts_linux.cpp index 6c1f49f046..2536a6bbff 100644 --- a/platform/linuxbsd/tts_linux.cpp +++ b/platform/linuxbsd/tts_linux.cpp @@ -2,9 +2,11 @@ /* tts_linux.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/tts_linux.h b/platform/linuxbsd/tts_linux.h index 2a3d33221d..24b70ed162 100644 --- a/platform/linuxbsd/tts_linux.h +++ b/platform/linuxbsd/tts_linux.h @@ -2,9 +2,11 @@ /* tts_linux.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/detect_prime_egl.cpp b/platform/linuxbsd/wayland/detect_prime_egl.cpp index e24c03c869..340e5888de 100644 --- a/platform/linuxbsd/wayland/detect_prime_egl.cpp +++ b/platform/linuxbsd/wayland/detect_prime_egl.cpp @@ -2,9 +2,11 @@ /* detect_prime_egl.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/detect_prime_egl.h b/platform/linuxbsd/wayland/detect_prime_egl.h index 3391e020d8..8bb493340e 100644 --- a/platform/linuxbsd/wayland/detect_prime_egl.h +++ b/platform/linuxbsd/wayland/detect_prime_egl.h @@ -2,9 +2,11 @@ /* detect_prime_egl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/display_server_wayland.cpp b/platform/linuxbsd/wayland/display_server_wayland.cpp index 93096fcdcc..e56e2a9bac 100644 --- a/platform/linuxbsd/wayland/display_server_wayland.cpp +++ b/platform/linuxbsd/wayland/display_server_wayland.cpp @@ -2,9 +2,11 @@ /* display_server_wayland.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -55,11 +57,11 @@ String DisplayServerWayland::_get_app_id_from_context(Context p_context) { switch (p_context) { case CONTEXT_EDITOR: { - app_id = "org.godotengine.Editor"; + app_id = "org.redotengine.Editor"; } break; case CONTEXT_PROJECTMAN: { - app_id = "org.godotengine.ProjectManager"; + app_id = "org.redotengine.ProjectManager"; } break; case CONTEXT_ENGINE: @@ -68,7 +70,7 @@ String DisplayServerWayland::_get_app_id_from_context(Context p_context) { if (config_name.length() != 0) { app_id = config_name; } else { - app_id = "org.godotengine.Godot"; + app_id = "org.redotengine.Redot"; } } } @@ -1413,7 +1415,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win if (prime_idx) { print_line(vformat("Found discrete GPU, setting DRI_PRIME=%d to use it.", prime_idx)); - print_line("Note: Set DRI_PRIME=0 in the environment to disable Godot from using the discrete GPU."); + print_line("Note: Set DRI_PRIME=0 in the environment to disable Redot from using the discrete GPU."); setenv("DRI_PRIME", itos(prime_idx).utf8().ptr(), 1); } } @@ -1462,7 +1464,7 @@ DisplayServerWayland::DisplayServerWayland(const String &p_rendering_driver, Win wd.flags = p_flags; wd.vsync_mode = p_vsync_mode; wd.rect.size = p_resolution; - wd.title = "Godot"; + wd.title = "Redot"; _show_window(); diff --git a/platform/linuxbsd/wayland/display_server_wayland.h b/platform/linuxbsd/wayland/display_server_wayland.h index e611533664..593ad853bb 100644 --- a/platform/linuxbsd/wayland/display_server_wayland.h +++ b/platform/linuxbsd/wayland/display_server_wayland.h @@ -2,9 +2,11 @@ /* display_server_wayland.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/egl_manager_wayland.cpp b/platform/linuxbsd/wayland/egl_manager_wayland.cpp index 6cf24277a0..d4650ff2c7 100644 --- a/platform/linuxbsd/wayland/egl_manager_wayland.cpp +++ b/platform/linuxbsd/wayland/egl_manager_wayland.cpp @@ -2,9 +2,11 @@ /* egl_manager_wayland.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/egl_manager_wayland.h b/platform/linuxbsd/wayland/egl_manager_wayland.h index 551c126760..81d69c07a7 100644 --- a/platform/linuxbsd/wayland/egl_manager_wayland.h +++ b/platform/linuxbsd/wayland/egl_manager_wayland.h @@ -2,9 +2,11 @@ /* egl_manager_wayland.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/egl_manager_wayland_gles.cpp b/platform/linuxbsd/wayland/egl_manager_wayland_gles.cpp index 9431b18f05..c77992965a 100644 --- a/platform/linuxbsd/wayland/egl_manager_wayland_gles.cpp +++ b/platform/linuxbsd/wayland/egl_manager_wayland_gles.cpp @@ -2,9 +2,11 @@ /* egl_manager_wayland_gles.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/egl_manager_wayland_gles.h b/platform/linuxbsd/wayland/egl_manager_wayland_gles.h index f526f18277..6526d61236 100644 --- a/platform/linuxbsd/wayland/egl_manager_wayland_gles.h +++ b/platform/linuxbsd/wayland/egl_manager_wayland_gles.h @@ -2,9 +2,11 @@ /* egl_manager_wayland_gles.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/key_mapping_xkb.cpp b/platform/linuxbsd/wayland/key_mapping_xkb.cpp index bd1a1e3835..f740433188 100644 --- a/platform/linuxbsd/wayland/key_mapping_xkb.cpp +++ b/platform/linuxbsd/wayland/key_mapping_xkb.cpp @@ -2,9 +2,11 @@ /* key_mapping_xkb.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/key_mapping_xkb.h b/platform/linuxbsd/wayland/key_mapping_xkb.h index 306a8f25b5..f7ab9f5cae 100644 --- a/platform/linuxbsd/wayland/key_mapping_xkb.h +++ b/platform/linuxbsd/wayland/key_mapping_xkb.h @@ -2,9 +2,11 @@ /* key_mapping_xkb.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp b/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp index c874c45a8a..6548d8839a 100644 --- a/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp +++ b/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.cpp @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_wayland.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h b/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h index dfebca1890..ea3aeb9367 100644 --- a/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h +++ b/platform/linuxbsd/wayland/rendering_context_driver_vulkan_wayland.h @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_wayland.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/wayland_thread.cpp b/platform/linuxbsd/wayland/wayland_thread.cpp index 975d384bad..c797ea72ed 100644 --- a/platform/linuxbsd/wayland/wayland_thread.cpp +++ b/platform/linuxbsd/wayland/wayland_thread.cpp @@ -2,9 +2,11 @@ /* wayland_thread.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/wayland/wayland_thread.h b/platform/linuxbsd/wayland/wayland_thread.h index 76a14dbd6a..a318e783cf 100644 --- a/platform/linuxbsd/wayland/wayland_thread.h +++ b/platform/linuxbsd/wayland/wayland_thread.h @@ -2,9 +2,11 @@ /* wayland_thread.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/detect_prime_x11.cpp b/platform/linuxbsd/x11/detect_prime_x11.cpp index c2cb02b937..8d23e0b3af 100644 --- a/platform/linuxbsd/x11/detect_prime_x11.cpp +++ b/platform/linuxbsd/x11/detect_prime_x11.cpp @@ -2,9 +2,11 @@ /* detect_prime_x11.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/detect_prime_x11.h b/platform/linuxbsd/x11/detect_prime_x11.h index 62fe426026..ed191dd0ae 100644 --- a/platform/linuxbsd/x11/detect_prime_x11.h +++ b/platform/linuxbsd/x11/detect_prime_x11.h @@ -2,9 +2,11 @@ /* detect_prime_x11.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/display_server_x11.cpp b/platform/linuxbsd/x11/display_server_x11.cpp index 8a2f83be2d..6ec8e732fc 100644 --- a/platform/linuxbsd/x11/display_server_x11.cpp +++ b/platform/linuxbsd/x11/display_server_x11.cpp @@ -2,9 +2,11 @@ /* display_server_x11.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -5228,13 +5230,13 @@ void DisplayServerX11::_update_context(WindowData &wd) { CharString name_str; switch (context) { case CONTEXT_EDITOR: - name_str = "Godot_Editor"; + name_str = "Redot_Editor"; break; case CONTEXT_PROJECTMAN: - name_str = "Godot_ProjectList"; + name_str = "Redot_ProjectList"; break; case CONTEXT_ENGINE: - name_str = "Godot_Engine"; + name_str = "Redot_Engine"; break; } @@ -5242,12 +5244,12 @@ void DisplayServerX11::_update_context(WindowData &wd) { if (context == CONTEXT_ENGINE) { String config_name = GLOBAL_GET("application/config/name"); if (config_name.length() == 0) { - class_str = "Godot_Engine"; + class_str = "Redot_Engine"; } else { class_str = config_name.utf8(); } } else { - class_str = "Godot"; + class_str = "Redot"; } classHint->res_class = class_str.ptrw(); @@ -5638,7 +5640,7 @@ DisplayServerX11::WindowID DisplayServerX11::_create_window(WindowMode p_mode, V } /* set the titlebar name */ - XStoreName(x11_display, wd.x11_window, "Godot"); + XStoreName(x11_display, wd.x11_window, "Redot"); XSetWMProtocols(x11_display, wd.x11_window, &wm_delete, 1); if (xdnd_aware != None) { XChangeProperty(x11_display, wd.x11_window, xdnd_aware, XA_ATOM, 32, PropModeReplace, (unsigned char *)&xdnd_version, 1); @@ -6217,7 +6219,7 @@ DisplayServerX11::DisplayServerX11(const String &p_rendering_driver, WindowMode if (use_prime) { print_line("Found discrete GPU, setting DRI_PRIME=1 to use it."); - print_line("Note: Set DRI_PRIME=0 in the environment to disable Godot from using the discrete GPU."); + print_line("Note: Set DRI_PRIME=0 in the environment to disable Redot from using the discrete GPU."); setenv("DRI_PRIME", "1", 1); } } diff --git a/platform/linuxbsd/x11/display_server_x11.h b/platform/linuxbsd/x11/display_server_x11.h index 0cbfbe51ef..02ae3a2179 100644 --- a/platform/linuxbsd/x11/display_server_x11.h +++ b/platform/linuxbsd/x11/display_server_x11.h @@ -2,9 +2,11 @@ /* display_server_x11.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/gl_manager_x11.cpp b/platform/linuxbsd/x11/gl_manager_x11.cpp index 738ebffa02..f094e67c80 100644 --- a/platform/linuxbsd/x11/gl_manager_x11.cpp +++ b/platform/linuxbsd/x11/gl_manager_x11.cpp @@ -2,9 +2,11 @@ /* gl_manager_x11.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/gl_manager_x11.h b/platform/linuxbsd/x11/gl_manager_x11.h index 06e147e39f..dd1ef5e420 100644 --- a/platform/linuxbsd/x11/gl_manager_x11.h +++ b/platform/linuxbsd/x11/gl_manager_x11.h @@ -2,9 +2,11 @@ /* gl_manager_x11.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/gl_manager_x11_egl.cpp b/platform/linuxbsd/x11/gl_manager_x11_egl.cpp index 544684ebf1..9b092da80c 100644 --- a/platform/linuxbsd/x11/gl_manager_x11_egl.cpp +++ b/platform/linuxbsd/x11/gl_manager_x11_egl.cpp @@ -2,9 +2,11 @@ /* gl_manager_x11_egl.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/gl_manager_x11_egl.h b/platform/linuxbsd/x11/gl_manager_x11_egl.h index b9c96619c4..ff2c156650 100644 --- a/platform/linuxbsd/x11/gl_manager_x11_egl.h +++ b/platform/linuxbsd/x11/gl_manager_x11_egl.h @@ -2,9 +2,11 @@ /* gl_manager_x11_egl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/key_mapping_x11.cpp b/platform/linuxbsd/x11/key_mapping_x11.cpp index b589a2a573..414fa8e7f0 100644 --- a/platform/linuxbsd/x11/key_mapping_x11.cpp +++ b/platform/linuxbsd/x11/key_mapping_x11.cpp @@ -2,9 +2,11 @@ /* key_mapping_x11.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/key_mapping_x11.h b/platform/linuxbsd/x11/key_mapping_x11.h index a51ee5f48e..58198c56aa 100644 --- a/platform/linuxbsd/x11/key_mapping_x11.h +++ b/platform/linuxbsd/x11/key_mapping_x11.h @@ -2,9 +2,11 @@ /* key_mapping_x11.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp b/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp index bf44062266..ad80557d0d 100644 --- a/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp +++ b/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.cpp @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_x11.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.h b/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.h index d525b69ec7..64092cf27f 100644 --- a/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.h +++ b/platform/linuxbsd/x11/rendering_context_driver_vulkan_x11.h @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_x11.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/SCsub b/platform/macos/SCsub index a10262c524..505e8b3cc2 100644 --- a/platform/macos/SCsub +++ b/platform/macos/SCsub @@ -126,7 +126,7 @@ files = [ "gl_manager_macos_legacy.mm", ] -prog = env.add_program("#bin/godot", files) +prog = env.add_program("#bin/redot", files) if env["debug_symbols"] and env["separate_debug_symbols"]: env.AddPostAction(prog, env.Run(platform_macos_builders.make_debug_macos)) diff --git a/platform/macos/crash_handler_macos.h b/platform/macos/crash_handler_macos.h index f821283167..3f8a5c8868 100644 --- a/platform/macos/crash_handler_macos.h +++ b/platform/macos/crash_handler_macos.h @@ -2,9 +2,11 @@ /* crash_handler_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/crash_handler_macos.mm b/platform/macos/crash_handler_macos.mm index c370422bfa..882a21e436 100644 --- a/platform/macos/crash_handler_macos.mm +++ b/platform/macos/crash_handler_macos.mm @@ -2,9 +2,11 @@ /* crash_handler_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/dir_access_macos.h b/platform/macos/dir_access_macos.h index 167c162200..c2ee88b3ef 100644 --- a/platform/macos/dir_access_macos.h +++ b/platform/macos/dir_access_macos.h @@ -2,9 +2,11 @@ /* dir_access_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/dir_access_macos.mm b/platform/macos/dir_access_macos.mm index 37f717c9de..fd154cb3f6 100644 --- a/platform/macos/dir_access_macos.mm +++ b/platform/macos/dir_access_macos.mm @@ -2,9 +2,11 @@ /* dir_access_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/display_server_macos.h b/platform/macos/display_server_macos.h index bd3c6af273..c4a9fd1491 100644 --- a/platform/macos/display_server_macos.h +++ b/platform/macos/display_server_macos.h @@ -2,9 +2,11 @@ /* display_server_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/display_server_macos.mm b/platform/macos/display_server_macos.mm index cd2d8a60ac..ac8ca0dedf 100644 --- a/platform/macos/display_server_macos.mm +++ b/platform/macos/display_server_macos.mm @@ -2,9 +2,11 @@ /* display_server_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -3379,7 +3381,7 @@ void DisplayServerMacOS::popup_open(WindowID p_window) { if (was_empty && popup_list.is_empty()) { // Inform OS that popup was opened, to close other native popups. - [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.beginMenuTrackingNotification" object:@"org.godotengine.godot.popup_window"]; + [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.beginMenuTrackingNotification" object:@"org.redotengine.godot.popup_window"]; } time_since_popup = OS::get_singleton()->get_ticks_msec(); popup_list.push_back(p_window); @@ -3404,7 +3406,7 @@ void DisplayServerMacOS::popup_close(WindowID p_window) { } if (!was_empty && popup_list.is_empty()) { // Inform OS that all popups are closed. - [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.godotengine.godot.popup_window"]; + [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.redotengine.godot.popup_window"]; } } @@ -3422,7 +3424,7 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) { } if (!was_empty) { // Inform OS that all popups are closed. - [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.godotengine.godot.popup_window"]; + [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.redotengine.godot.popup_window"]; } } else { uint64_t delta = OS::get_singleton()->get_ticks_msec() - time_since_popup; @@ -3454,7 +3456,7 @@ bool DisplayServerMacOS::mouse_process_popups(bool p_close) { } if (!was_empty && popup_list.is_empty()) { // Inform OS that all popups are closed. - [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.godotengine.godot.popup_window"]; + [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.HIToolbox.endMenuTrackingNotification" object:@"org.redotengine.godot.popup_window"]; } } return closed; diff --git a/platform/macos/doc_classes/EditorExportPlatformMacOS.xml b/platform/macos/doc_classes/EditorExportPlatformMacOS.xml index 34ad52bbf6..22ad664f58 100644 --- a/platform/macos/doc_classes/EditorExportPlatformMacOS.xml +++ b/platform/macos/doc_classes/EditorExportPlatformMacOS.xml @@ -7,7 +7,7 @@ </description> <tutorials> <link title="Exporting for macOS">$DOCS_URL/tutorials/export/exporting_for_macos.html</link> - <link title="Running Godot apps on macOS">$DOCS_URL/tutorials//export/running_on_macos.html</link> + <link title="Running Redot apps on macOS">$DOCS_URL/tutorials//export/running_on_macos.html</link> </tutorials> <members> <member name="application/additional_plist_content" type="String" setter="" getter=""> diff --git a/platform/macos/export/export.cpp b/platform/macos/export/export.cpp index 8930974df9..c807a10701 100644 --- a/platform/macos/export/export.cpp +++ b/platform/macos/export/export.cpp @@ -2,9 +2,11 @@ /* export.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/export/export.h b/platform/macos/export/export.h index a7a7dcad16..60546d681b 100644 --- a/platform/macos/export/export.h +++ b/platform/macos/export/export.h @@ -2,9 +2,11 @@ /* export.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/export/export_plugin.cpp b/platform/macos/export/export_plugin.cpp index 057fb4ec16..e75d41b39a 100644 --- a/platform/macos/export/export_plugin.cpp +++ b/platform/macos/export/export_plugin.cpp @@ -2,9 +2,11 @@ /* export_plugin.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -1548,7 +1550,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p int ret = unzGoToFirstFile(src_pkg_zip); String architecture = p_preset->get("binary_format/architecture"); - String binary_to_use = "godot_macos_" + String(p_debug ? "debug" : "release") + "." + architecture; + String binary_to_use = "redot_macos_" + String(p_debug ? "debug" : "release") + "." + architecture; String pkg_name; if (String(GLOBAL_GET("application/config/name")) != "") { @@ -1840,7 +1842,7 @@ Error EditorExportPlatformMacOS::export_project(const Ref<EditorExportPreset> &p _fix_privacy_manifest(p_preset, data); } - if (file.begins_with("Contents/MacOS/godot_")) { + if (file.begins_with("Contents/MacOS/redot_")) { if (file != "Contents/MacOS/" + binary_to_use) { ret = unzGoToNextFile(src_pkg_zip); continue; // skip diff --git a/platform/macos/export/export_plugin.h b/platform/macos/export/export_plugin.h index 062a2e5f95..f088b1b31c 100644 --- a/platform/macos/export/export_plugin.h +++ b/platform/macos/export/export_plugin.h @@ -2,9 +2,11 @@ /* export_plugin.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/gl_manager_macos_angle.h b/platform/macos/gl_manager_macos_angle.h index 919b8ec9c8..fbbd9ec216 100644 --- a/platform/macos/gl_manager_macos_angle.h +++ b/platform/macos/gl_manager_macos_angle.h @@ -2,9 +2,11 @@ /* gl_manager_macos_angle.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/gl_manager_macos_angle.mm b/platform/macos/gl_manager_macos_angle.mm index ac2f20ee7e..5c97eecf4a 100644 --- a/platform/macos/gl_manager_macos_angle.mm +++ b/platform/macos/gl_manager_macos_angle.mm @@ -2,9 +2,11 @@ /* gl_manager_macos_angle.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/gl_manager_macos_legacy.h b/platform/macos/gl_manager_macos_legacy.h index 383c5c3306..b320fd55a4 100644 --- a/platform/macos/gl_manager_macos_legacy.h +++ b/platform/macos/gl_manager_macos_legacy.h @@ -2,9 +2,11 @@ /* gl_manager_macos_legacy.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/gl_manager_macos_legacy.mm b/platform/macos/gl_manager_macos_legacy.mm index a0d037144e..0eccffd43f 100644 --- a/platform/macos/gl_manager_macos_legacy.mm +++ b/platform/macos/gl_manager_macos_legacy.mm @@ -2,9 +2,11 @@ /* gl_manager_macos_legacy.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_application.h b/platform/macos/godot_application.h index 8749c8fbb0..de6def8855 100644 --- a/platform/macos/godot_application.h +++ b/platform/macos/godot_application.h @@ -2,9 +2,11 @@ /* godot_application.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_application.mm b/platform/macos/godot_application.mm index f5e1bb43bf..9dddb7fa1b 100644 --- a/platform/macos/godot_application.mm +++ b/platform/macos/godot_application.mm @@ -2,9 +2,11 @@ /* godot_application.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_application_delegate.h b/platform/macos/godot_application_delegate.h index 45bd85c45c..1199945d63 100644 --- a/platform/macos/godot_application_delegate.h +++ b/platform/macos/godot_application_delegate.h @@ -2,9 +2,11 @@ /* godot_application_delegate.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_application_delegate.mm b/platform/macos/godot_application_delegate.mm index 02466bab97..8f0ee36485 100644 --- a/platform/macos/godot_application_delegate.mm +++ b/platform/macos/godot_application_delegate.mm @@ -2,9 +2,11 @@ /* godot_application_delegate.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_button_view.h b/platform/macos/godot_button_view.h index cbf13f7e5e..e7a7ef28f3 100644 --- a/platform/macos/godot_button_view.h +++ b/platform/macos/godot_button_view.h @@ -2,9 +2,11 @@ /* godot_button_view.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_button_view.mm b/platform/macos/godot_button_view.mm index db4be0441d..31f290984e 100644 --- a/platform/macos/godot_button_view.mm +++ b/platform/macos/godot_button_view.mm @@ -2,9 +2,11 @@ /* godot_button_view.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_content_view.h b/platform/macos/godot_content_view.h index dc8d11be54..9a75c673d4 100644 --- a/platform/macos/godot_content_view.h +++ b/platform/macos/godot_content_view.h @@ -2,9 +2,11 @@ /* godot_content_view.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_content_view.mm b/platform/macos/godot_content_view.mm index 7d43ac9fe6..8ecae3702d 100644 --- a/platform/macos/godot_content_view.mm +++ b/platform/macos/godot_content_view.mm @@ -2,9 +2,11 @@ /* godot_content_view.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_main_macos.mm b/platform/macos/godot_main_macos.mm index eebaed0eaf..7f67fe05d3 100644 --- a/platform/macos/godot_main_macos.mm +++ b/platform/macos/godot_main_macos.mm @@ -2,9 +2,11 @@ /* godot_main_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_menu_delegate.h b/platform/macos/godot_menu_delegate.h index c2da3ad09e..43279266ef 100644 --- a/platform/macos/godot_menu_delegate.h +++ b/platform/macos/godot_menu_delegate.h @@ -2,9 +2,11 @@ /* godot_menu_delegate.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_menu_delegate.mm b/platform/macos/godot_menu_delegate.mm index 3f7dfac3de..eb119fa78b 100644 --- a/platform/macos/godot_menu_delegate.mm +++ b/platform/macos/godot_menu_delegate.mm @@ -2,9 +2,11 @@ /* godot_menu_delegate.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_menu_item.h b/platform/macos/godot_menu_item.h index e1af317259..0e9248d9db 100644 --- a/platform/macos/godot_menu_item.h +++ b/platform/macos/godot_menu_item.h @@ -2,9 +2,11 @@ /* godot_menu_item.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_menu_item.mm b/platform/macos/godot_menu_item.mm index 479542113a..05cbb6b074 100644 --- a/platform/macos/godot_menu_item.mm +++ b/platform/macos/godot_menu_item.mm @@ -2,9 +2,11 @@ /* godot_menu_item.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_open_save_delegate.h b/platform/macos/godot_open_save_delegate.h index 8857ef1fa9..19630700ef 100644 --- a/platform/macos/godot_open_save_delegate.h +++ b/platform/macos/godot_open_save_delegate.h @@ -2,9 +2,11 @@ /* godot_open_save_delegate.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_open_save_delegate.mm b/platform/macos/godot_open_save_delegate.mm index 6ffd939545..2365dc0818 100644 --- a/platform/macos/godot_open_save_delegate.mm +++ b/platform/macos/godot_open_save_delegate.mm @@ -2,9 +2,11 @@ /* godot_open_save_delegate.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_status_item.h b/platform/macos/godot_status_item.h index 5bc790956e..80a3a396fa 100644 --- a/platform/macos/godot_status_item.h +++ b/platform/macos/godot_status_item.h @@ -2,9 +2,11 @@ /* godot_status_item.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_status_item.mm b/platform/macos/godot_status_item.mm index 1b16d496a2..3ccb848b2e 100644 --- a/platform/macos/godot_status_item.mm +++ b/platform/macos/godot_status_item.mm @@ -2,9 +2,11 @@ /* godot_status_item.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_window.h b/platform/macos/godot_window.h index 72aa042069..50c368263b 100644 --- a/platform/macos/godot_window.h +++ b/platform/macos/godot_window.h @@ -2,9 +2,11 @@ /* godot_window.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_window.mm b/platform/macos/godot_window.mm index f4516e5c85..4da434c71f 100644 --- a/platform/macos/godot_window.mm +++ b/platform/macos/godot_window.mm @@ -2,9 +2,11 @@ /* godot_window.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_window_delegate.h b/platform/macos/godot_window_delegate.h index de80102958..4c1c9b62ae 100644 --- a/platform/macos/godot_window_delegate.h +++ b/platform/macos/godot_window_delegate.h @@ -2,9 +2,11 @@ /* godot_window_delegate.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/godot_window_delegate.mm b/platform/macos/godot_window_delegate.mm index 7749debfd6..1ec313bc39 100644 --- a/platform/macos/godot_window_delegate.mm +++ b/platform/macos/godot_window_delegate.mm @@ -2,9 +2,11 @@ /* godot_window_delegate.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/joypad_macos.h b/platform/macos/joypad_macos.h index b37a1b24f3..4a2542c1be 100644 --- a/platform/macos/joypad_macos.h +++ b/platform/macos/joypad_macos.h @@ -2,9 +2,11 @@ /* joypad_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/joypad_macos.mm b/platform/macos/joypad_macos.mm index beb32d9129..d7bc2e77cd 100644 --- a/platform/macos/joypad_macos.mm +++ b/platform/macos/joypad_macos.mm @@ -2,9 +2,11 @@ /* joypad_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/key_mapping_macos.h b/platform/macos/key_mapping_macos.h index f5b0ff8d02..10c3e7150e 100644 --- a/platform/macos/key_mapping_macos.h +++ b/platform/macos/key_mapping_macos.h @@ -2,9 +2,11 @@ /* key_mapping_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/key_mapping_macos.mm b/platform/macos/key_mapping_macos.mm index b5e72048e7..8e2db7236f 100644 --- a/platform/macos/key_mapping_macos.mm +++ b/platform/macos/key_mapping_macos.mm @@ -2,9 +2,11 @@ /* key_mapping_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/macos_terminal_logger.h b/platform/macos/macos_terminal_logger.h index 0120240c4f..a42202592c 100644 --- a/platform/macos/macos_terminal_logger.h +++ b/platform/macos/macos_terminal_logger.h @@ -2,9 +2,11 @@ /* macos_terminal_logger.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/macos_terminal_logger.mm b/platform/macos/macos_terminal_logger.mm index 44f37dc396..980e5d1d4b 100644 --- a/platform/macos/macos_terminal_logger.mm +++ b/platform/macos/macos_terminal_logger.mm @@ -2,9 +2,11 @@ /* macos_terminal_logger.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/native_menu_macos.h b/platform/macos/native_menu_macos.h index 42cf6740d9..8d2e3feaea 100644 --- a/platform/macos/native_menu_macos.h +++ b/platform/macos/native_menu_macos.h @@ -2,9 +2,11 @@ /* native_menu_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/native_menu_macos.mm b/platform/macos/native_menu_macos.mm index 802d58dc26..72af7868be 100644 --- a/platform/macos/native_menu_macos.mm +++ b/platform/macos/native_menu_macos.mm @@ -2,9 +2,11 @@ /* native_menu_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/os_macos.h b/platform/macos/os_macos.h index 303fc112bf..d7162b12a9 100644 --- a/platform/macos/os_macos.h +++ b/platform/macos/os_macos.h @@ -2,9 +2,11 @@ /* os_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/os_macos.mm b/platform/macos/os_macos.mm index 3a82514766..ab23e2755a 100644 --- a/platform/macos/os_macos.mm +++ b/platform/macos/os_macos.mm @@ -2,9 +2,11 @@ /* os_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/platform_config.h b/platform/macos/platform_config.h index 01b0a12b5d..2ab710d729 100644 --- a/platform/macos/platform_config.h +++ b/platform/macos/platform_config.h @@ -2,9 +2,11 @@ /* platform_config.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/platform_gl.h b/platform/macos/platform_gl.h index 3bad9d5a5f..f29e537a11 100644 --- a/platform/macos/platform_gl.h +++ b/platform/macos/platform_gl.h @@ -2,9 +2,11 @@ /* platform_gl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/rendering_context_driver_vulkan_macos.h b/platform/macos/rendering_context_driver_vulkan_macos.h index 32f8891a2e..b4780aa70e 100644 --- a/platform/macos/rendering_context_driver_vulkan_macos.h +++ b/platform/macos/rendering_context_driver_vulkan_macos.h @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/rendering_context_driver_vulkan_macos.mm b/platform/macos/rendering_context_driver_vulkan_macos.mm index afefe5a6f7..0ad8681986 100644 --- a/platform/macos/rendering_context_driver_vulkan_macos.mm +++ b/platform/macos/rendering_context_driver_vulkan_macos.mm @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/tts_macos.h b/platform/macos/tts_macos.h index 35205bd1ae..6bd9f65633 100644 --- a/platform/macos/tts_macos.h +++ b/platform/macos/tts_macos.h @@ -2,9 +2,11 @@ /* tts_macos.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/macos/tts_macos.mm b/platform/macos/tts_macos.mm index 4e6744e211..1bcc139526 100644 --- a/platform/macos/tts_macos.mm +++ b/platform/macos/tts_macos.mm @@ -2,9 +2,11 @@ /* tts_macos.mm */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/register_platform_apis.h b/platform/register_platform_apis.h index bce486881e..1ab58b48e7 100644 --- a/platform/register_platform_apis.h +++ b/platform/register_platform_apis.h @@ -2,9 +2,11 @@ /* register_platform_apis.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/SCsub b/platform/web/SCsub index e81f2ec516..daccd22bbf 100644 --- a/platform/web/SCsub +++ b/platform/web/SCsub @@ -58,7 +58,7 @@ for ext in sys_env["JS_EXTERNS"]: sys_env["ENV"]["EMCC_CLOSURE_ARGS"] += " --externs " + ext.abspath build = [] -build_targets = ["#bin/godot${PROGSUFFIX}.js", "#bin/godot${PROGSUFFIX}.wasm", "#bin/godot${PROGSUFFIX}.worker.js"] +build_targets = ["#bin/redot${PROGSUFFIX}.js", "#bin/redot${PROGSUFFIX}.wasm", "#bin/redot${PROGSUFFIX}.worker.js"] if env["dlink_enabled"]: # Reset libraries. The main runtime will only link emscripten libraries, not godot ones. sys_env["LIBS"] = [] @@ -78,7 +78,7 @@ if env["dlink_enabled"]: sys = sys_env.Program(build_targets, ["web_runtime.cpp"]) # The side library, containing all Godot code. - wasm = env.add_program("#bin/godot.side${PROGSUFFIX}.wasm", web_files) + wasm = env.add_program("#bin/redot.side${PROGSUFFIX}.wasm", web_files) build = sys + [wasm[0]] else: # We use IDBFS. Since Emscripten 1.39.1 it needs to be linked explicitly. @@ -96,14 +96,14 @@ engine = [ "js/engine/engine.js", ] externs = [env.File("#platform/web/js/engine/engine.externs.js")] -js_engine = env.CreateEngineFile("#bin/godot${PROGSUFFIX}.engine.js", engine, externs, env["threads"]) +js_engine = env.CreateEngineFile("#bin/redot${PROGSUFFIX}.engine.js", engine, externs, env["threads"]) env.Depends(js_engine, externs) wrap_list = [ build[0], js_engine, ] -js_wrapped = env.Textfile("#bin/godot", [env.File(f) for f in wrap_list], TEXTFILESUFFIX="${PROGSUFFIX}.wrapped.js") +js_wrapped = env.Textfile("#bin/redot", [env.File(f) for f in wrap_list], TEXTFILESUFFIX="${PROGSUFFIX}.wrapped.js") # 0 - unwrapped js file (use wrapped one instead) # 1 - wasm file diff --git a/platform/web/api/api.cpp b/platform/web/api/api.cpp index a695091a04..75fbc57be9 100644 --- a/platform/web/api/api.cpp +++ b/platform/web/api/api.cpp @@ -2,9 +2,11 @@ /* api.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/api/api.h b/platform/web/api/api.h index 234bc6b326..de1e3e12fd 100644 --- a/platform/web/api/api.h +++ b/platform/web/api/api.h @@ -2,9 +2,11 @@ /* api.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/api/javascript_bridge_singleton.h b/platform/web/api/javascript_bridge_singleton.h index 456fa6b313..20030efb64 100644 --- a/platform/web/api/javascript_bridge_singleton.h +++ b/platform/web/api/javascript_bridge_singleton.h @@ -2,9 +2,11 @@ /* javascript_bridge_singleton.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/api/web_tools_editor_plugin.cpp b/platform/web/api/web_tools_editor_plugin.cpp index d39773bde2..ae5ab85cd9 100644 --- a/platform/web/api/web_tools_editor_plugin.cpp +++ b/platform/web/api/web_tools_editor_plugin.cpp @@ -2,9 +2,11 @@ /* web_tools_editor_plugin.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -71,7 +73,7 @@ void WebToolsEditorPlugin::_download_zip() { // Name the downloaded ZIP file to contain the project name and download date for easier organization. // Replace characters not allowed (or risky) in Windows file names with safe characters. // In the project name, all invalid characters become an empty string so that a name - // like "Platformer 2: Godette's Revenge" becomes "platformer_2-_godette-s_revenge". + // like "Platformer 2: Redot-chan's Revenge" becomes "platformer_2-_redot-chan-s_revenge". const String project_name = GLOBAL_GET("application/config/name"); const String project_name_safe = project_name.to_lower().replace(" ", "_"); const String datetime_safe = diff --git a/platform/web/api/web_tools_editor_plugin.h b/platform/web/api/web_tools_editor_plugin.h index 2902f60f24..478d9b86c3 100644 --- a/platform/web/api/web_tools_editor_plugin.h +++ b/platform/web/api/web_tools_editor_plugin.h @@ -2,9 +2,11 @@ /* web_tools_editor_plugin.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/audio_driver_web.cpp b/platform/web/audio_driver_web.cpp index 0108f40726..f51817bd16 100644 --- a/platform/web/audio_driver_web.cpp +++ b/platform/web/audio_driver_web.cpp @@ -2,9 +2,11 @@ /* audio_driver_web.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/audio_driver_web.h b/platform/web/audio_driver_web.h index d352fa4692..407596ad68 100644 --- a/platform/web/audio_driver_web.h +++ b/platform/web/audio_driver_web.h @@ -2,9 +2,11 @@ /* audio_driver_web.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/detect.py b/platform/web/detect.py index bf75c2f9fc..d0a4bdb774 100644 --- a/platform/web/detect.py +++ b/platform/web/detect.py @@ -32,7 +32,7 @@ def get_opts(): return [ ("initial_memory", "Initial WASM memory (in MiB)", 32), - # Matches default values from before Emscripten 3.1.27. New defaults are too low for Godot. + # Matches default values from before Emscripten 3.1.27. New defaults are too low for Redot. ("stack_size", "WASM stack size (in KiB)", 5120), ("default_pthread_stack_size", "WASM pthread default stack size (in KiB)", 2048), BoolVariable("use_assertions", "Use Emscripten runtime assertions", False), @@ -278,8 +278,8 @@ def configure(env: "SConsEnvironment"): # Reduce code size by generating less support code (e.g. skip NodeJS support). env.Append(LINKFLAGS=["-sENVIRONMENT=web,worker"]) - # Wrap the JavaScript support code around a closure named Godot. - env.Append(LINKFLAGS=["-sMODULARIZE=1", "-sEXPORT_NAME='Godot'"]) + # Wrap the JavaScript support code around a closure named Redot. + env.Append(LINKFLAGS=["-sMODULARIZE=1", "-sEXPORT_NAME='Redot'"]) # Force long jump mode to 'wasm' env.Append(CCFLAGS=["-sSUPPORT_LONGJMP='wasm'"]) diff --git a/platform/web/display_server_web.cpp b/platform/web/display_server_web.cpp index 4e55cc137a..0161d95d88 100644 --- a/platform/web/display_server_web.cpp +++ b/platform/web/display_server_web.cpp @@ -2,9 +2,11 @@ /* display_server_web.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/display_server_web.h b/platform/web/display_server_web.h index 352b3fe523..61e8321d38 100644 --- a/platform/web/display_server_web.h +++ b/platform/web/display_server_web.h @@ -2,9 +2,11 @@ /* display_server_web.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/dom_keys.inc b/platform/web/dom_keys.inc index b20a3a46b9..871ef5ece7 100644 --- a/platform/web/dom_keys.inc +++ b/platform/web/dom_keys.inc @@ -2,9 +2,11 @@ /* dom_keys.inc */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/eslint.config.cjs b/platform/web/eslint.config.cjs index 8913a738f6..358c5c30a2 100644 --- a/platform/web/eslint.config.cjs +++ b/platform/web/eslint.config.cjs @@ -130,6 +130,7 @@ module.exports = [ ...globals.browser, 'Features': true, 'Godot': true, + 'Redot': true, 'InternalConfig': true, 'Preloader': true, }, diff --git a/platform/web/export/editor_http_server.cpp b/platform/web/export/editor_http_server.cpp index 9cf862eb1e..878c9dc477 100644 --- a/platform/web/export/editor_http_server.cpp +++ b/platform/web/export/editor_http_server.cpp @@ -2,9 +2,11 @@ /* editor_http_server.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/export/editor_http_server.h b/platform/web/export/editor_http_server.h index 4437492b5a..d45056edb1 100644 --- a/platform/web/export/editor_http_server.h +++ b/platform/web/export/editor_http_server.h @@ -2,9 +2,11 @@ /* editor_http_server.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/export/export.cpp b/platform/web/export/export.cpp index 168310c078..fdd226ed82 100644 --- a/platform/web/export/export.cpp +++ b/platform/web/export/export.cpp @@ -2,9 +2,11 @@ /* export.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/export/export.h b/platform/web/export/export.h index da02bd8d93..f02c673536 100644 --- a/platform/web/export/export.h +++ b/platform/web/export/export.h @@ -2,9 +2,11 @@ /* export.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/export/export_plugin.cpp b/platform/web/export/export_plugin.cpp index d8c1b6033d..221d251727 100644 --- a/platform/web/export/export_plugin.cpp +++ b/platform/web/export/export_plugin.cpp @@ -2,9 +2,11 @@ /* export_plugin.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -217,7 +219,7 @@ Error EditorExportPlatformWeb::_add_manifest_icon(const String &p_path, const St Error EditorExportPlatformWeb::_build_pwa(const Ref<EditorExportPreset> &p_preset, const String p_path, const Vector<SharedObject> &p_shared_objects) { String proj_name = GLOBAL_GET("application/config/name"); if (proj_name.is_empty()) { - proj_name = "Godot Game"; + proj_name = "Redot Game"; } // Service worker @@ -387,7 +389,7 @@ Ref<Texture2D> EditorExportPlatformWeb::get_logo() const { bool EditorExportPlatformWeb::has_valid_export_configuration(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates, bool p_debug) const { #ifdef MODULE_MONO_ENABLED // Don't check for additional errors, as this particular error cannot be resolved. - r_error += TTR("Exporting to Web is currently not supported in Godot 4 when using C#/.NET. Use Godot 3 to target Web with C#/Mono instead.") + "\n"; + r_error += TTR("Exporting to Web is currently not supported in Redot 4 when using C#/.NET. Use Redot 3 to target Web with C#/Mono instead.") + "\n"; r_error += TTR("If this project does not use C#, use a non-C# editor build to export the project.") + "\n"; return false; #else diff --git a/platform/web/export/export_plugin.h b/platform/web/export/export_plugin.h index 2f67d8107f..1a9efc5ef4 100644 --- a/platform/web/export/export_plugin.h +++ b/platform/web/export/export_plugin.h @@ -2,9 +2,11 @@ /* export_plugin.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/godot_audio.h b/platform/web/godot_audio.h index f5a2a85605..fd4a19d9e4 100644 --- a/platform/web/godot_audio.h +++ b/platform/web/godot_audio.h @@ -2,9 +2,11 @@ /* godot_audio.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/godot_js.h b/platform/web/godot_js.h index a3d2632f17..df04b73e30 100644 --- a/platform/web/godot_js.h +++ b/platform/web/godot_js.h @@ -2,9 +2,11 @@ /* godot_js.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/godot_webgl2.h b/platform/web/godot_webgl2.h index 2c9af4313f..82bb870e8e 100644 --- a/platform/web/godot_webgl2.h +++ b/platform/web/godot_webgl2.h @@ -2,9 +2,11 @@ /* godot_webgl2.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/http_client_web.cpp b/platform/web/http_client_web.cpp index ea9226a5a4..11e5fbc549 100644 --- a/platform/web/http_client_web.cpp +++ b/platform/web/http_client_web.cpp @@ -2,9 +2,11 @@ /* http_client_web.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/http_client_web.h b/platform/web/http_client_web.h index 4d3c457a7d..e28039dc7b 100644 --- a/platform/web/http_client_web.h +++ b/platform/web/http_client_web.h @@ -2,9 +2,11 @@ /* http_client_web.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/javascript_bridge_singleton.cpp b/platform/web/javascript_bridge_singleton.cpp index c4dbb405a3..416d54161c 100644 --- a/platform/web/javascript_bridge_singleton.cpp +++ b/platform/web/javascript_bridge_singleton.cpp @@ -2,9 +2,11 @@ /* javascript_bridge_singleton.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/engine/config.js b/platform/web/js/engine/config.js index 61b488cf81..e4aec319c5 100644 --- a/platform/web/js/engine/config.js +++ b/platform/web/js/engine/config.js @@ -293,7 +293,7 @@ const InternalConfig = function (initConfig) { // eslint-disable-line no-unused- return {}; }, 'locateFile': function (path) { - if (!path.startsWith('godot.')) { + if (!path.startsWith('godot.') && !path.startsWith('redot.')) { return path; } else if (path.endsWith('.worker.js')) { return `${loadPath}.worker.js`; diff --git a/platform/web/js/engine/engine.externs.js b/platform/web/js/engine/engine.externs.js index 35a66a93ae..a0d38fcd3b 100644 --- a/platform/web/js/engine/engine.externs.js +++ b/platform/web/js/engine/engine.externs.js @@ -1,4 +1,4 @@ -var Godot; +var Redot; var WebAssembly = {}; WebAssembly.instantiate = function(buffer, imports) {}; WebAssembly.instantiateStreaming = function(response, imports) {}; diff --git a/platform/web/js/engine/engine.js b/platform/web/js/engine/engine.js index 04c4c44c5e..9718c9fd5a 100644 --- a/platform/web/js/engine/engine.js +++ b/platform/web/js/engine/engine.js @@ -93,7 +93,7 @@ const Engine = (function () { return new Promise(function (resolve, reject) { promise.then(function (response) { const cloned = new Response(response.clone().body, { 'headers': [['content-type', 'application/wasm']] }); - Godot(me.config.getModuleConfig(loadPath, cloned)).then(function (module) { + Redot(me.config.getModuleConfig(loadPath, cloned)).then(function (module) { const paths = me.config.persistentPaths; module['initFS'](paths).then(function (err) { me.rtenv = module; diff --git a/platform/web/js/libs/audio.position.worklet.js b/platform/web/js/libs/audio.position.worklet.js index bf3ac4ae2d..7d2c34d7cc 100644 --- a/platform/web/js/libs/audio.position.worklet.js +++ b/platform/web/js/libs/audio.position.worklet.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/audio.worklet.js b/platform/web/js/libs/audio.worklet.js index 3b94cab85c..5a8c1d5f87 100644 --- a/platform/web/js/libs/audio.worklet.js +++ b/platform/web/js/libs/audio.worklet.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/library_godot_audio.js b/platform/web/js/libs/library_godot_audio.js index 40fb0c356c..d1835f1203 100644 --- a/platform/web/js/libs/library_godot_audio.js +++ b/platform/web/js/libs/library_godot_audio.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/library_godot_display.js b/platform/web/js/libs/library_godot_display.js index 9445ec7ae5..c6b2a52fa7 100644 --- a/platform/web/js/libs/library_godot_display.js +++ b/platform/web/js/libs/library_godot_display.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/library_godot_fetch.js b/platform/web/js/libs/library_godot_fetch.js index 00616bc1a5..220f1d32cf 100644 --- a/platform/web/js/libs/library_godot_fetch.js +++ b/platform/web/js/libs/library_godot_fetch.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/library_godot_input.js b/platform/web/js/libs/library_godot_input.js index 6e3b97023d..fe99f55141 100644 --- a/platform/web/js/libs/library_godot_input.js +++ b/platform/web/js/libs/library_godot_input.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/library_godot_javascript_singleton.js b/platform/web/js/libs/library_godot_javascript_singleton.js index 6bb69bca95..f754406863 100644 --- a/platform/web/js/libs/library_godot_javascript_singleton.js +++ b/platform/web/js/libs/library_godot_javascript_singleton.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/library_godot_os.js b/platform/web/js/libs/library_godot_os.js index 568212275b..44617cbadc 100644 --- a/platform/web/js/libs/library_godot_os.js +++ b/platform/web/js/libs/library_godot_os.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/library_godot_runtime.js b/platform/web/js/libs/library_godot_runtime.js index 4114aa566e..4da41abdea 100644 --- a/platform/web/js/libs/library_godot_runtime.js +++ b/platform/web/js/libs/library_godot_runtime.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/js/libs/library_godot_webgl2.js b/platform/web/js/libs/library_godot_webgl2.js index 4621b2e3c2..e3cb74ef3e 100644 --- a/platform/web/js/libs/library_godot_webgl2.js +++ b/platform/web/js/libs/library_godot_webgl2.js @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/os_web.cpp b/platform/web/os_web.cpp index ef8f90421b..12531c0ddc 100644 --- a/platform/web/os_web.cpp +++ b/platform/web/os_web.cpp @@ -2,9 +2,11 @@ /* os_web.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/os_web.h b/platform/web/os_web.h index 55a5fcc6c6..09306213f3 100644 --- a/platform/web/os_web.h +++ b/platform/web/os_web.h @@ -2,9 +2,11 @@ /* os_web.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/platform_config.h b/platform/web/platform_config.h index c3189bccfb..f11edf2139 100644 --- a/platform/web/platform_config.h +++ b/platform/web/platform_config.h @@ -2,9 +2,11 @@ /* platform_config.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/platform_gl.h b/platform/web/platform_gl.h index 8aadab81de..5371a0a0a5 100644 --- a/platform/web/platform_gl.h +++ b/platform/web/platform_gl.h @@ -2,9 +2,11 @@ /* platform_gl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/web_main.cpp b/platform/web/web_main.cpp index d0c3bd7c0e..ac8e11f400 100644 --- a/platform/web/web_main.cpp +++ b/platform/web/web_main.cpp @@ -2,9 +2,11 @@ /* web_main.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/web/web_runtime.cpp b/platform/web/web_runtime.cpp index 3c014b36a1..a2c9b21bb5 100644 --- a/platform/web/web_runtime.cpp +++ b/platform/web/web_runtime.cpp @@ -2,9 +2,11 @@ /* web_runtime.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/SCsub b/platform/windows/SCsub index f8ed8b73f5..6902d63cc7 100644 --- a/platform/windows/SCsub +++ b/platform/windows/SCsub @@ -55,7 +55,7 @@ env.Depends(res_obj, "#core/version_generated.gen.h") env.add_source_files(sources, common_win) sources += res_obj -prog = env.add_program("#bin/godot", sources, PROGSUFFIX=env["PROGSUFFIX"]) +prog = env.add_program("#bin/redot", sources, PROGSUFFIX=env["PROGSUFFIX"]) arrange_program_clean(prog) # Build console wrapper app. @@ -73,7 +73,7 @@ if env["windows_subsystem"] == "gui": env_wrap.Append(LINKFLAGS=["-Wl,--subsystem,console"]) env_wrap.Append(LIBS=["version"]) - prog_wrap = env_wrap.add_program("#bin/godot", common_win_wrap + res_wrap_obj, PROGSUFFIX=env["PROGSUFFIX_WRAP"]) + prog_wrap = env_wrap.add_program("#bin/redot", common_win_wrap + res_wrap_obj, PROGSUFFIX=env["PROGSUFFIX_WRAP"]) arrange_program_clean(prog_wrap) env_wrap.Depends(prog_wrap, prog) sources += common_win_wrap + res_wrap_obj diff --git a/platform/windows/console_wrapper_windows.cpp b/platform/windows/console_wrapper_windows.cpp index 133711a9ea..e458bb776a 100644 --- a/platform/windows/console_wrapper_windows.cpp +++ b/platform/windows/console_wrapper_windows.cpp @@ -2,9 +2,11 @@ /* console_wrapper_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/crash_handler_windows.h b/platform/windows/crash_handler_windows.h index a0a0b610d0..62bf07c8e6 100644 --- a/platform/windows/crash_handler_windows.h +++ b/platform/windows/crash_handler_windows.h @@ -2,9 +2,11 @@ /* crash_handler_windows.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/crash_handler_windows_seh.cpp b/platform/windows/crash_handler_windows_seh.cpp index 2abe285d31..c5bff54a8a 100644 --- a/platform/windows/crash_handler_windows_seh.cpp +++ b/platform/windows/crash_handler_windows_seh.cpp @@ -2,9 +2,11 @@ /* crash_handler_windows_seh.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/crash_handler_windows_signal.cpp b/platform/windows/crash_handler_windows_signal.cpp index e11a60bdc7..759b620e26 100644 --- a/platform/windows/crash_handler_windows_signal.cpp +++ b/platform/windows/crash_handler_windows_signal.cpp @@ -2,9 +2,11 @@ /* crash_handler_windows_signal.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/display_server_windows.cpp b/platform/windows/display_server_windows.cpp index 74d651d495..c8a15c814d 100644 --- a/platform/windows/display_server_windows.cpp +++ b/platform/windows/display_server_windows.cpp @@ -2,9 +2,11 @@ /* display_server_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -1388,7 +1390,7 @@ void DisplayServerWindows::screen_set_keep_on(bool p_enable) { } if (p_enable) { - const String reason = "Godot Engine running with display/window/energy_saving/keep_screen_on = true"; + const String reason = "Redot Engine running with display/window/energy_saving/keep_screen_on = true"; Char16String reason_utf16 = reason.utf16(); REASON_CONTEXT context; diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h index 03132bb0db..4249e7ba9d 100644 --- a/platform/windows/display_server_windows.h +++ b/platform/windows/display_server_windows.h @@ -2,9 +2,11 @@ /* display_server_windows.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index 7a65f74f0d..c5c3669647 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -2,9 +2,11 @@ /* export.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/export/export.h b/platform/windows/export/export.h index 6c4020f0c8..7339256e0d 100644 --- a/platform/windows/export/export.h +++ b/platform/windows/export/export.h @@ -2,9 +2,11 @@ /* export.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/export/export_plugin.cpp b/platform/windows/export/export_plugin.cpp index 12694b0155..d50e8dbeae 100644 --- a/platform/windows/export/export_plugin.cpp +++ b/platform/windows/export/export_plugin.cpp @@ -2,9 +2,11 @@ /* export_plugin.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -433,13 +435,13 @@ void EditorExportPlatformWindows::get_export_options(List<ExportOption> *r_optio "$trigger = New-ScheduledTaskTrigger -Once -At 00:00\n" "$settings = New-ScheduledTaskSettingsSet\n" "$task = New-ScheduledTask -Action $action -Trigger $trigger -Settings $settings\n" - "Register-ScheduledTask godot_remote_debug -InputObject $task -Force:$true\n" - "Start-ScheduledTask -TaskName godot_remote_debug\n" - "while (Get-ScheduledTask -TaskName godot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }\n" - "Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"; + "Register-ScheduledTask redot_remote_debug -InputObject $task -Force:$true\n" + "Start-ScheduledTask -TaskName redot_remote_debug\n" + "while (Get-ScheduledTask -TaskName redot_remote_debug | ? State -eq running) { Start-Sleep -Milliseconds 100 }\n" + "Unregister-ScheduledTask -TaskName redot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue"; - String cleanup_script = "Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue\n" - "Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue\n" + String cleanup_script = "Stop-ScheduledTask -TaskName redot_remote_debug -ErrorAction:SilentlyContinue\n" + "Unregister-ScheduledTask -TaskName redot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue\n" "Remove-Item -Recurse -Force '{temp_dir}'"; r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "ssh_remote_deploy/enabled"), false, true)); diff --git a/platform/windows/export/export_plugin.h b/platform/windows/export/export_plugin.h index c644b1f9e1..db5d9ec11b 100644 --- a/platform/windows/export/export_plugin.h +++ b/platform/windows/export/export_plugin.h @@ -2,9 +2,11 @@ /* export_plugin.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/gl_manager_windows_angle.cpp b/platform/windows/gl_manager_windows_angle.cpp index c52564676f..666bc54f32 100644 --- a/platform/windows/gl_manager_windows_angle.cpp +++ b/platform/windows/gl_manager_windows_angle.cpp @@ -2,9 +2,11 @@ /* gl_manager_windows_angle.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/gl_manager_windows_angle.h b/platform/windows/gl_manager_windows_angle.h index f43a6fbe02..0e13971bb1 100644 --- a/platform/windows/gl_manager_windows_angle.h +++ b/platform/windows/gl_manager_windows_angle.h @@ -2,9 +2,11 @@ /* gl_manager_windows_angle.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/gl_manager_windows_native.cpp b/platform/windows/gl_manager_windows_native.cpp index 8590c46d12..a78a7da8fb 100644 --- a/platform/windows/gl_manager_windows_native.cpp +++ b/platform/windows/gl_manager_windows_native.cpp @@ -2,9 +2,11 @@ /* gl_manager_windows_native.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/gl_manager_windows_native.h b/platform/windows/gl_manager_windows_native.h index 532092ae74..1b68b1ba9a 100644 --- a/platform/windows/gl_manager_windows_native.h +++ b/platform/windows/gl_manager_windows_native.h @@ -2,9 +2,11 @@ /* gl_manager_windows_native.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/godot.ico b/platform/windows/godot.ico Binary files differdeleted file mode 100644 index f0bb68225d..0000000000 --- a/platform/windows/godot.ico +++ /dev/null diff --git a/platform/windows/godot_console.ico b/platform/windows/godot_console.ico Binary files differdeleted file mode 100644 index 1d27e3d6ae..0000000000 --- a/platform/windows/godot_console.ico +++ /dev/null diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc index 86191ad9d9..a3f42dfc66 100644 --- a/platform/windows/godot_res.rc +++ b/platform/windows/godot_res.rc @@ -4,7 +4,7 @@ #define RT_MANIFEST 24 #endif -GODOT_ICON ICON platform/windows/godot.ico +GODOT_ICON ICON platform/windows/redot.ico 1 RT_MANIFEST "godot.manifest" 1 VERSIONINFO @@ -17,13 +17,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Godot Engine" + VALUE "CompanyName", "Redot Engine" VALUE "FileDescription", VERSION_NAME VALUE "FileVersion", VERSION_NUMBER VALUE "ProductName", VERSION_NAME VALUE "Licence", "MIT" - VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors" - VALUE "Info", "https://godotengine.org" + VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Redot Engine and Godot Engine contributors" + VALUE "Info", "https://redotengine.org" VALUE "ProductVersion", VERSION_FULL_BUILD END END diff --git a/platform/windows/godot_res_wrap.rc b/platform/windows/godot_res_wrap.rc index 27ad26cbc5..0775cbd4eb 100644 --- a/platform/windows/godot_res_wrap.rc +++ b/platform/windows/godot_res_wrap.rc @@ -1,6 +1,6 @@ #include "core/version.h" -GODOT_ICON ICON platform/windows/godot_console.ico +GODOT_ICON ICON platform/windows/redot_console.ico 1 VERSIONINFO FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_PATCH,0 @@ -12,13 +12,13 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "Godot Engine" + VALUE "CompanyName", "Redot Engine" VALUE "FileDescription", VERSION_NAME " (Console)" VALUE "FileVersion", VERSION_NUMBER VALUE "ProductName", VERSION_NAME " (Console)" VALUE "Licence", "MIT" - VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Godot Engine contributors" - VALUE "Info", "https://godotengine.org" + VALUE "LegalCopyright", "(c) 2007-present Juan Linietsky, Ariel Manzur and Redot Engine and Godot Engine contributors" + VALUE "Info", "https://redotengine.org" VALUE "ProductVersion", VERSION_FULL_BUILD END END diff --git a/platform/windows/godot_windows.cpp b/platform/windows/godot_windows.cpp index 486c3120fc..1ff23fd76b 100644 --- a/platform/windows/godot_windows.cpp +++ b/platform/windows/godot_windows.cpp @@ -2,9 +2,11 @@ /* godot_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/joypad_windows.cpp b/platform/windows/joypad_windows.cpp index a5f1629cf0..922c2da774 100644 --- a/platform/windows/joypad_windows.cpp +++ b/platform/windows/joypad_windows.cpp @@ -2,9 +2,11 @@ /* joypad_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/joypad_windows.h b/platform/windows/joypad_windows.h index 87c7af7657..3feab86e6b 100644 --- a/platform/windows/joypad_windows.h +++ b/platform/windows/joypad_windows.h @@ -2,9 +2,11 @@ /* joypad_windows.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/key_mapping_windows.cpp b/platform/windows/key_mapping_windows.cpp index 20905d0fe9..7af798fa9f 100644 --- a/platform/windows/key_mapping_windows.cpp +++ b/platform/windows/key_mapping_windows.cpp @@ -2,9 +2,11 @@ /* key_mapping_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/key_mapping_windows.h b/platform/windows/key_mapping_windows.h index e6f184a2cc..61048bc18d 100644 --- a/platform/windows/key_mapping_windows.h +++ b/platform/windows/key_mapping_windows.h @@ -2,9 +2,11 @@ /* key_mapping_windows.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/lang_table.h b/platform/windows/lang_table.h index e1f4f72746..314a3d5217 100644 --- a/platform/windows/lang_table.h +++ b/platform/windows/lang_table.h @@ -2,9 +2,11 @@ /* lang_table.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/native_menu_windows.cpp b/platform/windows/native_menu_windows.cpp index fde55918e4..10af1f5a33 100644 --- a/platform/windows/native_menu_windows.cpp +++ b/platform/windows/native_menu_windows.cpp @@ -2,9 +2,11 @@ /* native_menu_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/native_menu_windows.h b/platform/windows/native_menu_windows.h index 235a4b332a..b0a16af880 100644 --- a/platform/windows/native_menu_windows.h +++ b/platform/windows/native_menu_windows.h @@ -2,9 +2,11 @@ /* native_menu_windows.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 27a7e4573d..3d9f42d61b 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2,9 +2,11 @@ /* os_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index a2d1e2fa6a..df4588ffe2 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -2,9 +2,11 @@ /* os_windows.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/platform_config.h b/platform/windows/platform_config.h index 964e341ce4..8dbe1feb48 100644 --- a/platform/windows/platform_config.h +++ b/platform/windows/platform_config.h @@ -2,9 +2,11 @@ /* platform_config.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/platform_gl.h b/platform/windows/platform_gl.h index e4af8b0ccd..4da481d09e 100644 --- a/platform/windows/platform_gl.h +++ b/platform/windows/platform_gl.h @@ -2,9 +2,11 @@ /* platform_gl.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/redot.ico b/platform/windows/redot.ico Binary files differnew file mode 100644 index 0000000000..e7ff03dfb8 --- /dev/null +++ b/platform/windows/redot.ico diff --git a/platform/windows/redot_console.ico b/platform/windows/redot_console.ico Binary files differnew file mode 100644 index 0000000000..542d8e3a49 --- /dev/null +++ b/platform/windows/redot_console.ico diff --git a/platform/windows/rendering_context_driver_vulkan_windows.cpp b/platform/windows/rendering_context_driver_vulkan_windows.cpp index f968ffc1d7..27150ebce1 100644 --- a/platform/windows/rendering_context_driver_vulkan_windows.cpp +++ b/platform/windows/rendering_context_driver_vulkan_windows.cpp @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/rendering_context_driver_vulkan_windows.h b/platform/windows/rendering_context_driver_vulkan_windows.h index 1bb70cb0ff..1f60932618 100644 --- a/platform/windows/rendering_context_driver_vulkan_windows.h +++ b/platform/windows/rendering_context_driver_vulkan_windows.h @@ -2,9 +2,11 @@ /* rendering_context_driver_vulkan_windows.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/tts_windows.cpp b/platform/windows/tts_windows.cpp index 39a8f3e120..82704a5d6e 100644 --- a/platform/windows/tts_windows.cpp +++ b/platform/windows/tts_windows.cpp @@ -2,9 +2,11 @@ /* tts_windows.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/tts_windows.h b/platform/windows/tts_windows.h index 33b597c612..cf315b988d 100644 --- a/platform/windows/tts_windows.h +++ b/platform/windows/tts_windows.h @@ -2,9 +2,11 @@ /* tts_windows.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/wgl_detect_version.cpp b/platform/windows/wgl_detect_version.cpp index 12dd6f6ee6..0728b96236 100644 --- a/platform/windows/wgl_detect_version.cpp +++ b/platform/windows/wgl_detect_version.cpp @@ -2,9 +2,11 @@ /* wgl_detect_version.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/wgl_detect_version.h b/platform/windows/wgl_detect_version.h index c110b1219e..a620430f7d 100644 --- a/platform/windows/wgl_detect_version.h +++ b/platform/windows/wgl_detect_version.h @@ -2,9 +2,11 @@ /* wgl_detect_version.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/windows_terminal_logger.cpp b/platform/windows/windows_terminal_logger.cpp index 6c54faa13a..7be5e494d4 100644 --- a/platform/windows/windows_terminal_logger.cpp +++ b/platform/windows/windows_terminal_logger.cpp @@ -2,9 +2,11 @@ /* windows_terminal_logger.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/windows_terminal_logger.h b/platform/windows/windows_terminal_logger.h index 60d82bb935..03e5a192d8 100644 --- a/platform/windows/windows_terminal_logger.h +++ b/platform/windows/windows_terminal_logger.h @@ -2,9 +2,11 @@ /* windows_terminal_logger.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/windows_utils.cpp b/platform/windows/windows_utils.cpp index 30743c6900..38c7f189c1 100644 --- a/platform/windows/windows_utils.cpp +++ b/platform/windows/windows_utils.cpp @@ -2,9 +2,11 @@ /* windows_utils.cpp */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ diff --git a/platform/windows/windows_utils.h b/platform/windows/windows_utils.h index 3f5d75294e..1f52f01f5e 100644 --- a/platform/windows/windows_utils.h +++ b/platform/windows/windows_utils.h @@ -2,9 +2,11 @@ /* windows_utils.h */ /**************************************************************************/ /* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ +/* REDOT ENGINE */ +/* https://redotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ |
