Relintai/gdnative_cpp
1
0
Fork 0
mirror of https://github.com/Relintai/gdnative_cpp.git synced 2024-11-20 10:57:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some namespace related issues.

Browse Source
This commit is contained in:
Relintai 2023-10-23 21:25:29 +02:00
parent ee393fc5b5
commit 550ba3e366
1 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/pandemonium.h
View File

@ -34,22 +34,22 @@
#include <cstdlib> #include <cstdlib>
#include <cstring> #include <cstring>
#include <gdnative_api_struct.gen.h> #include <type_traits>
#include <nativescript/pandemonium_nativescript.h>
#include <typeinfo> #include <typeinfo>
#include "core_types.h" #include <gdnative_api_struct.gen.h>
#include "reference.h" #include <nativescript/pandemonium_nativescript.h>
#include "tag_db.h"
#include "variant.h"
#include "object.h" #include "core/core_types.h"
#include "core/tag_db.h"
#include "core/variant.h"
#include "gen/reference.h"
#include "pandemonium_global.h" #include "core/pandemonium_global.h"
#include <type_traits> class Object;
namespace detail { namespace PandemoniumDetail {
// Pandemonium classes are wrapped by heap-allocated instances mimicking them through the C API. // Pandemonium classes are wrapped by heap-allocated instances mimicking them through the C API.
// They all inherit `_Wrapped`. // They all inherit `_Wrapped`.
@ -118,7 +118,7 @@ inline T *create_custom_class_instance() {
return (T *)Pandemonium::nativescript_api->pandemonium_nativescript_get_userdata(base_obj); return (T *)Pandemonium::nativescript_api->pandemonium_nativescript_get_userdata(base_obj);
} }
} // namespace detail } // namespace PandemoniumDetail
// Used in the definition of a custom class. // Used in the definition of a custom class.
// //
@ -143,7 +143,7 @@ public:
return Base::___get_pandemonium_class_name(); \ return Base::___get_pandemonium_class_name(); \
} \ } \
inline static Name *_new() { \ inline static Name *_new() { \
return Pandemonium::detail::create_custom_class_instance<Name>(); \ return PandemoniumDetail::create_custom_class_instance<Name>(); \
} \ } \
inline static size_t ___get_id() { \ inline static size_t ___get_id() { \
return typeid(Name).hash_code(); \ return typeid(Name).hash_code(); \
@ -154,16 +154,13 @@ public:
inline static const char *___get_base_class_name() { \ inline static const char *___get_base_class_name() { \
return Base::___get_class_name(); \ return Base::___get_class_name(); \
} \ } \
inline static Pandemonium::Object *___get_from_variant(Pandemonium::Variant a) { \ inline static Object *___get_from_variant(Variant a) { \
return (Pandemonium::Object *)Pandemonium::detail::get_custom_class_instance<Name>( \ return (Object *)PandemoniumDetail::get_custom_class_instance<Name>( \
Pandemonium::Object::___get_from_variant(a)); \ Object::___get_from_variant(a)); \
} \ } \
\ \
private: private:
// Legacy compatibility
#define PANDEMONIUM_SUBCLASS(Name, Base) PANDEMONIUM_CLASS(Name, Base)
template <class T> template <class T>
struct _ArgCast { struct _ArgCast {
static T _arg_cast(Variant a) { static T _arg_cast(Variant a) {
@ -439,7 +436,7 @@ void register_property(const char *name, P(T::*var), P default_value,
usage = (pandemonium_property_usage_flags)((int)usage | PANDEMONIUM_PROPERTY_USAGE_SCRIPT_VARIABLE); usage = (pandemonium_property_usage_flags)((int)usage | PANDEMONIUM_PROPERTY_USAGE_SCRIPT_VARIABLE);
if (def_val.get_type() == Variant::OBJECT) { if (def_val.get_type() == Variant::OBJECT) {
Object *o = detail::get_wrapper<Object>(def_val.operator pandemonium_object *()); Object *o = PandemoniumDetail::get_wrapper<Object>(def_val.operator pandemonium_object *());
if (o && o->is_class("Resource")) { if (o && o->is_class("Resource")) {
hint = (pandemonium_property_hint)((int)hint | PANDEMONIUM_PROPERTY_HINT_RESOURCE_TYPE); hint = (pandemonium_property_hint)((int)hint | PANDEMONIUM_PROPERTY_HINT_RESOURCE_TYPE);
hint_string = o->get_class(); hint_string = o->get_class();
@ -609,7 +606,7 @@ T *Object::cast_to(const Object *obj) {
} }
if (_TagDB::is_type_compatible(T::___get_id(), have_tag)) { if (_TagDB::is_type_compatible(T::___get_id(), have_tag)) {
return detail::get_custom_class_instance<T>(obj); return PandemoniumDetail::get_custom_class_instance<T>(obj);
} }
} else { } else {
if (Pandemonium::api->pandemonium_object_cast_to(obj->_owner, (void *)T::___get_id())) { if (Pandemonium::api->pandemonium_object_cast_to(obj->_owner, (void *)T::___get_id())) {