aboutsummaryrefslogtreecommitdiff
path: root/extension/src
diff options
context:
space:
mode:
author Hop311 <hop3114@gmail.com>2023-05-16 23:49:52 +0200
committer Hop311 <hop3114@gmail.com>2023-05-17 13:47:02 +0200
commit578eb8c332810656842f72e0bb94bb0d4dcb9f5e (patch)
tree64dd37032c36da8e48d5d519ac840e11cc64dc58 /extension/src
parentaf6a96ed26bca3eaa28c6dca635918061fab7c80 (diff)
Changed from OpenVic2 to OpenVic
Diffstat (limited to 'extension/src')
-rw-r--r--extension/src/Checksum.hpp2
-rw-r--r--extension/src/GameSingleton.cpp4
-rw-r--r--extension/src/GameSingleton.hpp4
-rw-r--r--extension/src/LoadLocalisation.cpp2
-rw-r--r--extension/src/LoadLocalisation.hpp2
-rw-r--r--extension/src/MapMesh.cpp2
-rw-r--r--extension/src/MapMesh.hpp2
-rw-r--r--extension/src/register_types.cpp12
-rw-r--r--extension/src/register_types.h4
9 files changed, 17 insertions, 17 deletions
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 <godot_cpp/core/class_db.hpp>
-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 <godot_cpp/classes/json.hpp>
#include <godot_cpp/variant/utility_functions.hpp>
-#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 <godot_cpp/classes/image_texture.hpp>
#include <godot_cpp/classes/texture2d_array.hpp>
-#include "openvic2/GameManager.hpp"
+#include "openvic/GameManager.hpp"
-namespace OpenVic2 {
+namespace OpenVic {
struct TerrainVariant : HasIdentifier, HasColour {
private:
const godot::Ref<godot::Image> 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 <godot_cpp/variant/utility_functions.hpp>
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 <godot_cpp/classes/translation.hpp>
-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 <godot_cpp/templates/vector.hpp>
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 <godot_cpp/classes/primitive_mesh.hpp>
-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<MapMesh>();
}
-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 <godot_cpp/godot.hpp>
-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