Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2024-12-22 11:56:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Backported some improvements to Plane from Godot4. Also bound all eligible methods.

Browse Source
This commit is contained in:
Relintai 2022-08-14 10:52:57 +02:00
parent c7d2307bd5
commit 7650103ce7
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/math/plane.cpp
View File

@ -31,6 +31,7 @@
#include "plane.h" #include "plane.h"
#include "core/math/math_funcs.h" #include "core/math/math_funcs.h"
#include "core/variant.h"
void Plane::set_normal(const Vector3 &p_normal) { void Plane::set_normal(const Vector3 &p_normal) {
normal = p_normal; normal = p_normal;
@ -148,6 +149,10 @@ bool Plane::is_equal_approx(const Plane &p_plane) const {
return normal.is_equal_approx(p_plane.normal) && Math::is_equal_approx(d, p_plane.d); return normal.is_equal_approx(p_plane.normal) && Math::is_equal_approx(d, p_plane.d);
} }
bool Plane::is_equal_approx_any_side(const Plane &p_plane) const {
return (normal.is_equal_approx(p_plane.normal) && Math::is_equal_approx(d, p_plane.d)) || (normal.is_equal_approx(-p_plane.normal) && Math::is_equal_approx(d, -p_plane.d));
}
Plane::operator String() const { Plane::operator String() const {
return normal.operator String() + ", " + rtos(d); return normal.operator String() + ", " + rtos(d);
} }

3
core/math/plane.h
View File

@ -32,6 +32,8 @@
#include "core/math/vector3.h" #include "core/math/vector3.h"
class Variant;
class _NO_DISCARD_CLASS_ Plane { class _NO_DISCARD_CLASS_ Plane {
public: public:
Vector3 normal; Vector3 normal;
@ -67,6 +69,7 @@ public:
Plane operator-() const { return Plane(-normal, -d); } Plane operator-() const { return Plane(-normal, -d); }
bool is_equal_approx(const Plane &p_plane) const; bool is_equal_approx(const Plane &p_plane) const;
bool is_equal_approx_any_side(const Plane &p_plane) const;
_FORCE_INLINE_ bool operator==(const Plane &p_plane) const; _FORCE_INLINE_ bool operator==(const Plane &p_plane) const;
_FORCE_INLINE_ bool operator!=(const Plane &p_plane) const; _FORCE_INLINE_ bool operator!=(const Plane &p_plane) const;

21
core/variant_call.cpp
View File

@ -527,15 +527,16 @@ struct _VariantCall {
VCALL_LOCALMEM0R(Vector3i, abs); VCALL_LOCALMEM0R(Vector3i, abs);
VCALL_LOCALMEM0R(Vector3i, sign); VCALL_LOCALMEM0R(Vector3i, sign);
VCALL_LOCALMEM1(Plane, set_normal);
VCALL_LOCALMEM0R(Plane, get_normal);
VCALL_LOCALMEM0(Plane, normalize);
VCALL_LOCALMEM0R(Plane, normalized); VCALL_LOCALMEM0R(Plane, normalized);
VCALL_LOCALMEM0R(Plane, center); VCALL_LOCALMEM0R(Plane, center);
VCALL_LOCALMEM0R(Plane, get_any_point); VCALL_LOCALMEM0R(Plane, get_any_point);
VCALL_LOCALMEM1R(Plane, is_equal_approx); VCALL_LOCALMEM0R(Plane, get_any_perpendicular_normal);
VCALL_LOCALMEM1R(Plane, is_point_over); VCALL_LOCALMEM1R(Plane, is_point_over);
VCALL_LOCALMEM1R(Plane, distance_to); VCALL_LOCALMEM1R(Plane, distance_to);
VCALL_LOCALMEM2R(Plane, has_point); VCALL_LOCALMEM2R(Plane, has_point);
VCALL_LOCALMEM1R(Plane, project);
//return vector3 if intersected, nil if not //return vector3 if intersected, nil if not
static void _call_Plane_intersect_3(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_Plane_intersect_3(Variant &r_ret, Variant &p_self, const Variant **p_args) {
Vector3 result; Vector3 result;
@ -545,7 +546,6 @@ struct _VariantCall {
r_ret = Variant(); r_ret = Variant();
} }
} }
static void _call_Plane_intersects_ray(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_Plane_intersects_ray(Variant &r_ret, Variant &p_self, const Variant **p_args) {
Vector3 result; Vector3 result;
if (reinterpret_cast<Plane *>(p_self._data._mem)->intersects_ray(*p_args[0], *p_args[1], &result)) { if (reinterpret_cast<Plane *>(p_self._data._mem)->intersects_ray(*p_args[0], *p_args[1], &result)) {
@ -554,7 +554,6 @@ struct _VariantCall {
r_ret = Variant(); r_ret = Variant();
} }
} }
static void _call_Plane_intersects_segment(Variant &r_ret, Variant &p_self, const Variant **p_args) { static void _call_Plane_intersects_segment(Variant &r_ret, Variant &p_self, const Variant **p_args) {
Vector3 result; Vector3 result;
if (reinterpret_cast<Plane *>(p_self._data._mem)->intersects_segment(*p_args[0], *p_args[1], &result)) { if (reinterpret_cast<Plane *>(p_self._data._mem)->intersects_segment(*p_args[0], *p_args[1], &result)) {
@ -563,6 +562,9 @@ struct _VariantCall {
r_ret = Variant(); r_ret = Variant();
} }
} }
VCALL_LOCALMEM1R(Plane, project);
VCALL_LOCALMEM1R(Plane, is_equal_approx);
VCALL_LOCALMEM1R(Plane, is_equal_approx_any_side);
VCALL_LOCALMEM0R(Quaternion, length); VCALL_LOCALMEM0R(Quaternion, length);
VCALL_LOCALMEM0R(Quaternion, length_squared); VCALL_LOCALMEM0R(Quaternion, length_squared);
@ -2238,17 +2240,22 @@ void register_variant_methods() {
ADDFUNC0R(VECTOR3I, REAL, Vector3, length_squared, varray()); ADDFUNC0R(VECTOR3I, REAL, Vector3, length_squared, varray());
ADDFUNC2R(VECTOR3I, VECTOR3I, Vector3, linear_interpolate, VECTOR3I, "to", REAL, "weight", varray()); ADDFUNC2R(VECTOR3I, VECTOR3I, Vector3, linear_interpolate, VECTOR3I, "to", REAL, "weight", varray());
ADDFUNC1(PLANE, NIL, Plane, set_normal, VECTOR3, "normal", varray());
ADDFUNC0R(PLANE, VECTOR3, Plane, get_normal, varray());
ADDFUNC0(PLANE, NIL, Plane, normalize, varray());
ADDFUNC0R(PLANE, PLANE, Plane, normalized, varray()); ADDFUNC0R(PLANE, PLANE, Plane, normalized, varray());
ADDFUNC0R(PLANE, VECTOR3, Plane, center, varray()); ADDFUNC0R(PLANE, VECTOR3, Plane, center, varray());
ADDFUNC0R(PLANE, VECTOR3, Plane, get_any_point, varray()); ADDFUNC0R(PLANE, VECTOR3, Plane, get_any_point, varray());
ADDFUNC1R(PLANE, BOOL, Plane, is_equal_approx, PLANE, "plane", varray()); ADDFUNC0R(PLANE, VECTOR3, Plane, get_any_perpendicular_normal, varray());
ADDFUNC1R(PLANE, BOOL, Plane, is_point_over, VECTOR3, "point", varray()); ADDFUNC1R(PLANE, BOOL, Plane, is_point_over, VECTOR3, "point", varray());
ADDFUNC1R(PLANE, REAL, Plane, distance_to, VECTOR3, "point", varray()); ADDFUNC1R(PLANE, REAL, Plane, distance_to, VECTOR3, "point", varray());
ADDFUNC2R(PLANE, BOOL, Plane, has_point, VECTOR3, "point", REAL, "epsilon", varray(CMP_EPSILON)); ADDFUNC2R(PLANE, BOOL, Plane, has_point, VECTOR3, "point", REAL, "epsilon", varray(CMP_EPSILON));
ADDFUNC1R(PLANE, VECTOR3, Plane, project, VECTOR3, "point", varray());
ADDFUNC2R(PLANE, VECTOR3, Plane, intersect_3, PLANE, "b", PLANE, "c", varray()); ADDFUNC2R(PLANE, VECTOR3, Plane, intersect_3, PLANE, "b", PLANE, "c", varray());
ADDFUNC2R(PLANE, VECTOR3, Plane, intersects_ray, VECTOR3, "from", VECTOR3, "dir", varray()); ADDFUNC2R(PLANE, VECTOR3, Plane, intersects_ray, VECTOR3, "from", VECTOR3, "dir", varray());
ADDFUNC2R(PLANE, VECTOR3, Plane, intersects_segment, VECTOR3, "begin", VECTOR3, "end", varray()); ADDFUNC2R(PLANE, VECTOR3, Plane, intersects_segment, VECTOR3, "begin", VECTOR3, "end", varray());
ADDFUNC1R(PLANE, VECTOR3, Plane, project, VECTOR3, "point", varray());
ADDFUNC1R(PLANE, BOOL, Plane, is_equal_approx, PLANE, "plane", varray());
ADDFUNC1R(PLANE, BOOL, Plane, is_equal_approx_any_side, PLANE, "plane", varray());
ADDFUNC0R(QUATERNION, REAL, Quaternion, length, varray()); ADDFUNC0R(QUATERNION, REAL, Quaternion, length, varray());
ADDFUNC0R(QUATERNION, REAL, Quaternion, length_squared, varray()); ADDFUNC0R(QUATERNION, REAL, Quaternion, length_squared, varray());