diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-21 21:16:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-21 21:16:41 +0200 |
| commit | a319d72071eaf0d2e67d88f205c53e1eca331162 (patch) | |
| tree | 58f485292882c98a6e5e8034cce1b2c81ea82af9 | |
| parent | d3de933377d81126c20ca4599da3d3ed2e9c1884 (diff) | |
| parent | a986686ac4b4896fc13feb5a85e64e511e6a4c83 (diff) | |
Merge pull request #21253 from aaronfranke/plane-constants
Rename Plane constants, add to Mono
| -rw-r--r-- | core/variant_call.cpp | 6 | ||||
| -rw-r--r-- | modules/mono/glue/cs_files/Plane.cs | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 45d7748382..1c50df75f5 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -1920,9 +1920,9 @@ void register_variant_methods() { transform_x.set(1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0); _VariantCall::add_variant_constant(Variant::TRANSFORM, "FLIP_Z", transform_z); - _VariantCall::add_variant_constant(Variant::PLANE, "X", Plane(Vector3(1, 0, 0), 0)); - _VariantCall::add_variant_constant(Variant::PLANE, "Y", Plane(Vector3(0, 1, 0), 0)); - _VariantCall::add_variant_constant(Variant::PLANE, "Z", Plane(Vector3(0, 0, 1), 0)); + _VariantCall::add_variant_constant(Variant::PLANE, "PLANE_YZ", Plane(Vector3(1, 0, 0), 0)); + _VariantCall::add_variant_constant(Variant::PLANE, "PLANE_XZ", Plane(Vector3(0, 1, 0), 0)); + _VariantCall::add_variant_constant(Variant::PLANE, "PLANE_XY", Plane(Vector3(0, 0, 1), 0)); _VariantCall::add_variant_constant(Variant::QUAT, "IDENTITY", Quat(0, 0, 0, 1)); } diff --git a/modules/mono/glue/cs_files/Plane.cs b/modules/mono/glue/cs_files/Plane.cs index 1020f06bf5..9611dce11e 100644 --- a/modules/mono/glue/cs_files/Plane.cs +++ b/modules/mono/glue/cs_files/Plane.cs @@ -145,6 +145,15 @@ namespace Godot return point - _normal * DistanceTo(point); } + // Constants + private static readonly Plane _planeYZ = new Plane(1, 0, 0, 0); + private static readonly Plane _planeXZ = new Plane(0, 1, 0, 0); + private static readonly Plane _planeXY = new Plane(0, 0, 1, 0); + + public static Plane PlaneYZ { get { return _planeYZ; } } + public static Plane PlaneXZ { get { return _planeXZ; } } + public static Plane PlaneXY { get { return _planeXY; } } + // Constructors public Plane(real_t a, real_t b, real_t c, real_t d) { |