From 578eb8c332810656842f72e0bb94bb0d4dcb9f5e Mon Sep 17 00:00:00 2001 From: Hop311 Date: Tue, 16 May 2023 22:49:52 +0100 Subject: Changed from OpenVic2 to OpenVic --- extension/deps/OV-compiler | 1 + extension/deps/OV2-compiler | 1 - extension/deps/openvic-simulation | 1 + extension/deps/openvic2-simulation | 1 - extension/src/Checksum.hpp | 2 +- extension/src/GameSingleton.cpp | 4 ++-- extension/src/GameSingleton.hpp | 4 ++-- extension/src/LoadLocalisation.cpp | 2 +- extension/src/LoadLocalisation.hpp | 2 +- extension/src/MapMesh.cpp | 2 +- extension/src/MapMesh.hpp | 2 +- extension/src/register_types.cpp | 12 ++++++------ extension/src/register_types.h | 4 ++-- 13 files changed, 19 insertions(+), 19 deletions(-) create mode 160000 extension/deps/OV-compiler delete mode 160000 extension/deps/OV2-compiler create mode 160000 extension/deps/openvic-simulation delete mode 160000 extension/deps/openvic2-simulation (limited to 'extension') diff --git a/extension/deps/OV-compiler b/extension/deps/OV-compiler new file mode 160000 index 0000000..65443ef --- /dev/null +++ b/extension/deps/OV-compiler @@ -0,0 +1 @@ +Subproject commit 65443efcc2f4c7d687b2bd9c631f6bb426688bbf diff --git a/extension/deps/OV2-compiler b/extension/deps/OV2-compiler deleted file mode 160000 index 267d38a..0000000 --- a/extension/deps/OV2-compiler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 267d38aab922fa929c0ce649fad699a6468b6c3f diff --git a/extension/deps/openvic-simulation b/extension/deps/openvic-simulation new file mode 160000 index 0000000..15e960f --- /dev/null +++ b/extension/deps/openvic-simulation @@ -0,0 +1 @@ +Subproject commit 15e960f93ced8c94a6a45ebb2b44d0705ff7f8f6 diff --git a/extension/deps/openvic2-simulation b/extension/deps/openvic2-simulation deleted file mode 160000 index 339e027..0000000 --- a/extension/deps/openvic2-simulation +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 339e0278a2064f7eeb152fe8c5778840b609e9f3 diff --git a/extension/src/Checksum.hpp b/extension/src/Checksum.hpp index a0b1504..dc86d5b 100644 --- a/extension/src/Checksum.hpp +++ b/extension/src/Checksum.hpp @@ -2,7 +2,7 @@ #include -namespace OpenVic2 { +namespace OpenVic { class Checksum : public godot::Object { GDCLASS(Checksum, godot::Object) diff --git a/extension/src/GameSingleton.cpp b/extension/src/GameSingleton.cpp index 882bfcf..e067517 100644 --- a/extension/src/GameSingleton.cpp +++ b/extension/src/GameSingleton.cpp @@ -4,10 +4,10 @@ #include #include -#include "openvic2/Logger.hpp" +#include "openvic/Logger.hpp" using namespace godot; -using namespace OpenVic2; +using namespace OpenVic; #define ERR(x) ((x) == SUCCESS ? OK : FAILED) diff --git a/extension/src/GameSingleton.hpp b/extension/src/GameSingleton.hpp index 8321972..99fe7bb 100644 --- a/extension/src/GameSingleton.hpp +++ b/extension/src/GameSingleton.hpp @@ -3,9 +3,9 @@ #include #include -#include "openvic2/GameManager.hpp" +#include "openvic/GameManager.hpp" -namespace OpenVic2 { +namespace OpenVic { struct TerrainVariant : HasIdentifier, HasColour { private: const godot::Ref image; diff --git a/extension/src/LoadLocalisation.cpp b/extension/src/LoadLocalisation.cpp index 789a476..e80d996 100644 --- a/extension/src/LoadLocalisation.cpp +++ b/extension/src/LoadLocalisation.cpp @@ -6,7 +6,7 @@ #include using namespace godot; -using namespace OpenVic2; +using namespace OpenVic; LoadLocalisation* LoadLocalisation::singleton = nullptr; diff --git a/extension/src/LoadLocalisation.hpp b/extension/src/LoadLocalisation.hpp index 49c0313..04ec5c7 100644 --- a/extension/src/LoadLocalisation.hpp +++ b/extension/src/LoadLocalisation.hpp @@ -2,7 +2,7 @@ #include -namespace OpenVic2 { +namespace OpenVic { class LoadLocalisation : public godot::Object { GDCLASS(LoadLocalisation, godot::Object) diff --git a/extension/src/MapMesh.cpp b/extension/src/MapMesh.cpp index 84149b9..269360a 100644 --- a/extension/src/MapMesh.cpp +++ b/extension/src/MapMesh.cpp @@ -3,7 +3,7 @@ #include using namespace godot; -using namespace OpenVic2; +using namespace OpenVic; void MapMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_aspect_ratio", "ratio"), &MapMesh::set_aspect_ratio); diff --git a/extension/src/MapMesh.hpp b/extension/src/MapMesh.hpp index 89c0147..38b208c 100644 --- a/extension/src/MapMesh.hpp +++ b/extension/src/MapMesh.hpp @@ -2,7 +2,7 @@ #include -namespace OpenVic2 { +namespace OpenVic { class MapMesh : public godot::PrimitiveMesh { GDCLASS(MapMesh, godot::PrimitiveMesh) diff --git a/extension/src/register_types.cpp b/extension/src/register_types.cpp index 8ef89ec..3283418 100644 --- a/extension/src/register_types.cpp +++ b/extension/src/register_types.cpp @@ -8,13 +8,13 @@ #include "MapMesh.hpp" using namespace godot; -using namespace OpenVic2; +using namespace OpenVic; static Checksum* _checksum; static LoadLocalisation* _load_localisation; static GameSingleton* _map_singleton; -void initialize_openvic2_types(ModuleInitializationLevel p_level) { +void initialize_openvic_types(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { return; } @@ -34,7 +34,7 @@ void initialize_openvic2_types(ModuleInitializationLevel p_level) { ClassDB::register_class(); } -void uninitialize_openvic2_types(ModuleInitializationLevel p_level) { +void uninitialize_openvic_types(ModuleInitializationLevel p_level) { if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) { return; } @@ -51,11 +51,11 @@ void uninitialize_openvic2_types(ModuleInitializationLevel p_level) { extern "C" { // Initialization. - GDExtensionBool GDE_EXPORT openvic2_library_init(GDExtensionInterface const* p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) { + GDExtensionBool GDE_EXPORT openvic_library_init(GDExtensionInterface const* p_interface, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization* r_initialization) { GDExtensionBinding::InitObject init_obj(p_interface, p_library, r_initialization); - init_obj.register_initializer(initialize_openvic2_types); - init_obj.register_terminator(uninitialize_openvic2_types); + init_obj.register_initializer(initialize_openvic_types); + init_obj.register_terminator(uninitialize_openvic_types); init_obj.set_minimum_library_initialization_level(MODULE_INITIALIZATION_LEVEL_SCENE); return init_obj.init(); diff --git a/extension/src/register_types.h b/extension/src/register_types.h index 1bc96f8..cd20e8d 100644 --- a/extension/src/register_types.h +++ b/extension/src/register_types.h @@ -2,5 +2,5 @@ #include -void initialize_openvic2_types(godot::ModuleInitializationLevel); -void uninitialize_openvic2_types(godot::ModuleInitializationLevel); \ No newline at end of file +void initialize_openvic_types(godot::ModuleInitializationLevel); +void uninitialize_openvic_types(godot::ModuleInitializationLevel); \ No newline at end of file -- cgit v1.2.3-56-ga3b1