diff options
author | Aaron Franke <arnfranke@yahoo.com> | 2022-10-05 01:03:52 -0500 |
---|---|---|
committer | Aaron Franke <arnfranke@yahoo.com> | 2022-10-05 01:46:15 -0500 |
commit | 0455f72ede289b218c4e7830210278ad8c7f3887 (patch) | |
tree | ef1357d58daee9d2ca969dc5ae5ccc2f1568737c /include/godot_cpp/variant | |
parent | 4e5d0ee3a8707f7065dbac6b36fcd0e77b721706 (diff) | |
download | redot-cpp-0455f72ede289b218c4e7830210278ad8c7f3887.tar.gz |
Use struct instead of class for core structures
Diffstat (limited to 'include/godot_cpp/variant')
-rw-r--r-- | include/godot_cpp/variant/aabb.hpp | 7 | ||||
-rw-r--r-- | include/godot_cpp/variant/basis.hpp | 7 | ||||
-rw-r--r-- | include/godot_cpp/variant/color.hpp | 7 | ||||
-rw-r--r-- | include/godot_cpp/variant/plane.hpp | 7 | ||||
-rw-r--r-- | include/godot_cpp/variant/projection.hpp | 17 | ||||
-rw-r--r-- | include/godot_cpp/variant/quaternion.hpp | 7 | ||||
-rw-r--r-- | include/godot_cpp/variant/rect2.hpp | 11 | ||||
-rw-r--r-- | include/godot_cpp/variant/rect2i.hpp | 9 | ||||
-rw-r--r-- | include/godot_cpp/variant/transform2d.hpp | 7 | ||||
-rw-r--r-- | include/godot_cpp/variant/transform3d.hpp | 7 | ||||
-rw-r--r-- | include/godot_cpp/variant/vector2.hpp | 9 | ||||
-rw-r--r-- | include/godot_cpp/variant/vector2i.hpp | 9 | ||||
-rw-r--r-- | include/godot_cpp/variant/vector3.hpp | 13 | ||||
-rw-r--r-- | include/godot_cpp/variant/vector3i.hpp | 9 | ||||
-rw-r--r-- | include/godot_cpp/variant/vector4.hpp | 7 | ||||
-rw-r--r-- | include/godot_cpp/variant/vector4i.hpp | 9 |
16 files changed, 31 insertions, 111 deletions
diff --git a/include/godot_cpp/variant/aabb.hpp b/include/godot_cpp/variant/aabb.hpp index eaea36d..06ddc15 100644 --- a/include/godot_cpp/variant/aabb.hpp +++ b/include/godot_cpp/variant/aabb.hpp @@ -43,12 +43,7 @@ namespace godot { -class AABB { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ AABB { Vector3 position; Vector3 size; diff --git a/include/godot_cpp/variant/basis.hpp b/include/godot_cpp/variant/basis.hpp index 05881f8..48c3b0c 100644 --- a/include/godot_cpp/variant/basis.hpp +++ b/include/godot_cpp/variant/basis.hpp @@ -37,12 +37,7 @@ namespace godot { -class Basis { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Basis { Vector3 rows[3] = { Vector3(1, 0, 0), Vector3(0, 1, 0), diff --git a/include/godot_cpp/variant/color.hpp b/include/godot_cpp/variant/color.hpp index 5d141a2..f328d7f 100644 --- a/include/godot_cpp/variant/color.hpp +++ b/include/godot_cpp/variant/color.hpp @@ -37,12 +37,7 @@ namespace godot { class String; -class Color { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Color { union { struct { float r; diff --git a/include/godot_cpp/variant/plane.hpp b/include/godot_cpp/variant/plane.hpp index 3b1ec85..3a13ed2 100644 --- a/include/godot_cpp/variant/plane.hpp +++ b/include/godot_cpp/variant/plane.hpp @@ -37,12 +37,7 @@ namespace godot { -class Plane { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Plane { Vector3 normal; real_t d = 0; diff --git a/include/godot_cpp/variant/projection.hpp b/include/godot_cpp/variant/projection.hpp index f26ce5a..5472490 100644 --- a/include/godot_cpp/variant/projection.hpp +++ b/include/godot_cpp/variant/projection.hpp @@ -39,18 +39,13 @@ namespace godot { -class AABB; -class Plane; -class Rect2; -class Transform3D; -class Vector2; +struct AABB; +struct Plane; +struct Rect2; +struct Transform3D; +struct Vector2; -class Projection { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Projection { enum Planes { PLANE_NEAR, PLANE_FAR, diff --git a/include/godot_cpp/variant/quaternion.hpp b/include/godot_cpp/variant/quaternion.hpp index 815b116..e84202d 100644 --- a/include/godot_cpp/variant/quaternion.hpp +++ b/include/godot_cpp/variant/quaternion.hpp @@ -36,12 +36,7 @@ namespace godot { -class Quaternion { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Quaternion { union { struct { real_t x; diff --git a/include/godot_cpp/variant/rect2.hpp b/include/godot_cpp/variant/rect2.hpp index 70b041d..6be075d 100644 --- a/include/godot_cpp/variant/rect2.hpp +++ b/include/godot_cpp/variant/rect2.hpp @@ -37,16 +37,11 @@ namespace godot { -class Rect2i; class String; -class Transform2D; +struct Rect2i; +struct Transform2D; -class Rect2 { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Rect2 { Point2 position; Size2 size; diff --git a/include/godot_cpp/variant/rect2i.hpp b/include/godot_cpp/variant/rect2i.hpp index a930cbd..30c7d2d 100644 --- a/include/godot_cpp/variant/rect2i.hpp +++ b/include/godot_cpp/variant/rect2i.hpp @@ -37,15 +37,10 @@ namespace godot { -class Rect2; class String; +struct Rect2; -class Rect2i { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Rect2i { Point2i position; Size2i size; diff --git a/include/godot_cpp/variant/transform2d.hpp b/include/godot_cpp/variant/transform2d.hpp index be81687..dd0c409 100644 --- a/include/godot_cpp/variant/transform2d.hpp +++ b/include/godot_cpp/variant/transform2d.hpp @@ -39,12 +39,7 @@ namespace godot { -class Transform2D { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Transform2D { // Warning #1: basis of Transform2D is stored differently from Basis. In terms of columns array, the basis matrix looks like "on paper": // M = (columns[0][0] columns[1][0]) // (columns[0][1] columns[1][1]) diff --git a/include/godot_cpp/variant/transform3d.hpp b/include/godot_cpp/variant/transform3d.hpp index c6220f3..e4c8c74 100644 --- a/include/godot_cpp/variant/transform3d.hpp +++ b/include/godot_cpp/variant/transform3d.hpp @@ -39,12 +39,7 @@ namespace godot { -class Transform3D { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Transform3D { Basis basis; Vector3 origin; diff --git a/include/godot_cpp/variant/vector2.hpp b/include/godot_cpp/variant/vector2.hpp index b210c7d..725a283 100644 --- a/include/godot_cpp/variant/vector2.hpp +++ b/include/godot_cpp/variant/vector2.hpp @@ -37,14 +37,9 @@ namespace godot { class String; -class Vector2i; +struct Vector2i; -class Vector2 { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Vector2 { static const int AXIS_COUNT = 2; enum Axis { diff --git a/include/godot_cpp/variant/vector2i.hpp b/include/godot_cpp/variant/vector2i.hpp index 5c9d6ad..3428e1f 100644 --- a/include/godot_cpp/variant/vector2i.hpp +++ b/include/godot_cpp/variant/vector2i.hpp @@ -37,14 +37,9 @@ namespace godot { class String; -class Vector2; +struct Vector2; -class Vector2i { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Vector2i { static const int AXIS_COUNT = 2; enum Axis { diff --git a/include/godot_cpp/variant/vector3.hpp b/include/godot_cpp/variant/vector3.hpp index 4c9213d..85c89d8 100644 --- a/include/godot_cpp/variant/vector3.hpp +++ b/include/godot_cpp/variant/vector3.hpp @@ -36,17 +36,12 @@ namespace godot { -class Basis; class String; -class Vector2; -class Vector3i; +struct Basis; +struct Vector2; +struct Vector3i; -class Vector3 { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Vector3 { static const int AXIS_COUNT = 3; enum Axis { diff --git a/include/godot_cpp/variant/vector3i.hpp b/include/godot_cpp/variant/vector3i.hpp index c5526e0..913ea3d 100644 --- a/include/godot_cpp/variant/vector3i.hpp +++ b/include/godot_cpp/variant/vector3i.hpp @@ -37,14 +37,9 @@ namespace godot { class String; -class Vector3; +struct Vector3; -class Vector3i { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Vector3i { static const int AXIS_COUNT = 3; enum Axis { diff --git a/include/godot_cpp/variant/vector4.hpp b/include/godot_cpp/variant/vector4.hpp index 2c1403c..4b4f6f1 100644 --- a/include/godot_cpp/variant/vector4.hpp +++ b/include/godot_cpp/variant/vector4.hpp @@ -38,12 +38,7 @@ namespace godot { class String; -class Vector4 { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Vector4 { static const int AXIS_COUNT = 4; enum Axis { diff --git a/include/godot_cpp/variant/vector4i.hpp b/include/godot_cpp/variant/vector4i.hpp index 979fc83..773198b 100644 --- a/include/godot_cpp/variant/vector4i.hpp +++ b/include/godot_cpp/variant/vector4i.hpp @@ -37,14 +37,9 @@ namespace godot { class String; -class Vector4; +struct Vector4; -class Vector4i { - _FORCE_INLINE_ GDNativeTypePtr _native_ptr() const { return (void *)this; } - - friend class Variant; - -public: +struct _NO_DISCARD_ Vector4i { static const int AXIS_COUNT = 4; enum Axis { |