From 79285b084df425cadb23da21bc04c08c300d6cad Mon Sep 17 00:00:00 2001 From: Karroffel Date: Fri, 10 Nov 2017 12:36:50 +0100 Subject: [PATCH] [GDNative] rename nativearvr extension to arvr --- modules/gdnative/SCsub | 4 ++-- modules/gdnative/{nativearvr => arvr}/SCsub | 0 .../{nativearvr => arvr}/arvr_interface_gdnative.cpp | 0 .../gdnative/{nativearvr => arvr}/arvr_interface_gdnative.h | 0 modules/gdnative/{nativearvr => arvr}/config.py | 0 modules/gdnative/{nativearvr => arvr}/register_types.cpp | 4 ++-- modules/gdnative/{nativearvr => arvr}/register_types.h | 4 ++-- .../{nativearvr/godot_nativearvr.h => arvr/godot_arvr.h} | 2 +- modules/gdnative/register_types.cpp | 6 +++--- 9 files changed, 10 insertions(+), 10 deletions(-) rename modules/gdnative/{nativearvr => arvr}/SCsub (100%) rename modules/gdnative/{nativearvr => arvr}/arvr_interface_gdnative.cpp (100%) rename modules/gdnative/{nativearvr => arvr}/arvr_interface_gdnative.h (100%) rename modules/gdnative/{nativearvr => arvr}/config.py (100%) rename modules/gdnative/{nativearvr => arvr}/register_types.cpp (96%) rename modules/gdnative/{nativearvr => arvr}/register_types.h (96%) rename modules/gdnative/include/{nativearvr/godot_nativearvr.h => arvr/godot_arvr.h} (98%) diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index cd29140d5db..88588417d1d 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -12,7 +12,7 @@ gdn_env.add_source_files(env.modules_sources, "nativescript/*.cpp") gdn_env.Append(CPPPATH=['#modules/gdnative/include/']) -SConscript("nativearvr/SCsub") +SConscript("arvr/SCsub") SConscript("pluginscript/SCsub") def _spaced(e): @@ -25,7 +25,7 @@ def _build_gdnative_api_struct_header(api): '#define GODOT_GDNATIVE_API_STRUCT_H', '', '#include ', - '#include ', + '#include ', '#include ', '#include ', '', diff --git a/modules/gdnative/nativearvr/SCsub b/modules/gdnative/arvr/SCsub similarity index 100% rename from modules/gdnative/nativearvr/SCsub rename to modules/gdnative/arvr/SCsub diff --git a/modules/gdnative/nativearvr/arvr_interface_gdnative.cpp b/modules/gdnative/arvr/arvr_interface_gdnative.cpp similarity index 100% rename from modules/gdnative/nativearvr/arvr_interface_gdnative.cpp rename to modules/gdnative/arvr/arvr_interface_gdnative.cpp diff --git a/modules/gdnative/nativearvr/arvr_interface_gdnative.h b/modules/gdnative/arvr/arvr_interface_gdnative.h similarity index 100% rename from modules/gdnative/nativearvr/arvr_interface_gdnative.h rename to modules/gdnative/arvr/arvr_interface_gdnative.h diff --git a/modules/gdnative/nativearvr/config.py b/modules/gdnative/arvr/config.py similarity index 100% rename from modules/gdnative/nativearvr/config.py rename to modules/gdnative/arvr/config.py diff --git a/modules/gdnative/nativearvr/register_types.cpp b/modules/gdnative/arvr/register_types.cpp similarity index 96% rename from modules/gdnative/nativearvr/register_types.cpp rename to modules/gdnative/arvr/register_types.cpp index c7d7847a213..139750a02d5 100644 --- a/modules/gdnative/nativearvr/register_types.cpp +++ b/modules/gdnative/arvr/register_types.cpp @@ -31,9 +31,9 @@ #include "register_types.h" #include "arvr_interface_gdnative.h" -void register_nativearvr_types() { +void register_arvr_types() { ClassDB::register_class(); } -void unregister_nativearvr_types() { +void unregister_arvr_types() { } diff --git a/modules/gdnative/nativearvr/register_types.h b/modules/gdnative/arvr/register_types.h similarity index 96% rename from modules/gdnative/nativearvr/register_types.h rename to modules/gdnative/arvr/register_types.h index 5e7557c7e9e..49183199260 100644 --- a/modules/gdnative/nativearvr/register_types.h +++ b/modules/gdnative/arvr/register_types.h @@ -28,5 +28,5 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -void register_nativearvr_types(); -void unregister_nativearvr_types(); +void register_arvr_types(); +void unregister_arvr_types(); diff --git a/modules/gdnative/include/nativearvr/godot_nativearvr.h b/modules/gdnative/include/arvr/godot_arvr.h similarity index 98% rename from modules/gdnative/include/nativearvr/godot_nativearvr.h rename to modules/gdnative/include/arvr/godot_arvr.h index a4f4d6a9f1b..c12251439de 100644 --- a/modules/gdnative/include/nativearvr/godot_nativearvr.h +++ b/modules/gdnative/include/arvr/godot_arvr.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* godot_nativearvr.h */ +/* godot_arvr.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp index 87f9cddaa2d..19a62b9c4fd 100644 --- a/modules/gdnative/register_types.cpp +++ b/modules/gdnative/register_types.cpp @@ -35,7 +35,7 @@ #include "io/resource_loader.h" #include "io/resource_saver.h" -#include "nativearvr/register_types.h" +#include "arvr/register_types.h" #include "nativescript/register_types.h" #include "pluginscript/register_types.h" @@ -157,7 +157,7 @@ void register_gdnative_types() { GDNativeCallRegistry::singleton->register_native_call_type("standard_varcall", cb_standard_varcall); - register_nativearvr_types(); + register_arvr_types(); register_nativescript_types(); register_pluginscript_types(); @@ -214,7 +214,7 @@ void unregister_gdnative_types() { unregister_pluginscript_types(); unregister_nativescript_types(); - unregister_nativearvr_types(); + unregister_arvr_types(); memdelete(GDNativeCallRegistry::singleton);