From 8e1c9ff1c12f2a668b7e9b6cedaac84e5e340ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arkadiusz=20Marcin=20Ko=C5=82ek?= Date: Sun, 2 Aug 2020 11:10:43 +0200 Subject: [PATCH] Shape3D::get_debug_mesh_lines const methods --- scene/resources/box_shape_3d.cpp | 2 +- scene/resources/box_shape_3d.h | 2 +- scene/resources/capsule_shape_3d.cpp | 2 +- scene/resources/capsule_shape_3d.h | 2 +- scene/resources/concave_polygon_shape_3d.cpp | 2 +- scene/resources/concave_polygon_shape_3d.h | 2 +- scene/resources/convex_polygon_shape_3d.cpp | 2 +- scene/resources/convex_polygon_shape_3d.h | 2 +- scene/resources/cylinder_shape_3d.cpp | 2 +- scene/resources/cylinder_shape_3d.h | 2 +- scene/resources/height_map_shape_3d.cpp | 2 +- scene/resources/height_map_shape_3d.h | 2 +- scene/resources/ray_shape_3d.cpp | 2 +- scene/resources/ray_shape_3d.h | 2 +- scene/resources/shape_3d.h | 2 +- scene/resources/sphere_shape_3d.cpp | 2 +- scene/resources/sphere_shape_3d.h | 2 +- scene/resources/world_margin_shape_3d.cpp | 2 +- scene/resources/world_margin_shape_3d.h | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/scene/resources/box_shape_3d.cpp b/scene/resources/box_shape_3d.cpp index 69339faf763..e1c8a377c07 100644 --- a/scene/resources/box_shape_3d.cpp +++ b/scene/resources/box_shape_3d.cpp @@ -31,7 +31,7 @@ #include "box_shape_3d.h" #include "servers/physics_server_3d.h" -Vector BoxShape3D::get_debug_mesh_lines() { +Vector BoxShape3D::get_debug_mesh_lines() const { Vector lines; AABB aabb; aabb.position = -get_extents(); diff --git a/scene/resources/box_shape_3d.h b/scene/resources/box_shape_3d.h index 99b6410799a..fe634ce5689 100644 --- a/scene/resources/box_shape_3d.h +++ b/scene/resources/box_shape_3d.h @@ -46,7 +46,7 @@ public: void set_extents(const Vector3 &p_extents); Vector3 get_extents() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override; BoxShape3D(); diff --git a/scene/resources/capsule_shape_3d.cpp b/scene/resources/capsule_shape_3d.cpp index 28fc0d470cb..9d1355eec67 100644 --- a/scene/resources/capsule_shape_3d.cpp +++ b/scene/resources/capsule_shape_3d.cpp @@ -31,7 +31,7 @@ #include "capsule_shape_3d.h" #include "servers/physics_server_3d.h" -Vector CapsuleShape3D::get_debug_mesh_lines() { +Vector CapsuleShape3D::get_debug_mesh_lines() const { float radius = get_radius(); float height = get_height(); diff --git a/scene/resources/capsule_shape_3d.h b/scene/resources/capsule_shape_3d.h index a638618c48b..432ca5654e2 100644 --- a/scene/resources/capsule_shape_3d.h +++ b/scene/resources/capsule_shape_3d.h @@ -49,7 +49,7 @@ public: void set_height(float p_height); float get_height() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override; CapsuleShape3D(); diff --git a/scene/resources/concave_polygon_shape_3d.cpp b/scene/resources/concave_polygon_shape_3d.cpp index 7315945c035..7cbafcbc4df 100644 --- a/scene/resources/concave_polygon_shape_3d.cpp +++ b/scene/resources/concave_polygon_shape_3d.cpp @@ -32,7 +32,7 @@ #include "servers/physics_server_3d.h" -Vector ConcavePolygonShape3D::get_debug_mesh_lines() { +Vector ConcavePolygonShape3D::get_debug_mesh_lines() const { Set edges; Vector data = get_faces(); diff --git a/scene/resources/concave_polygon_shape_3d.h b/scene/resources/concave_polygon_shape_3d.h index a3c10adce29..c17765b9ef8 100644 --- a/scene/resources/concave_polygon_shape_3d.h +++ b/scene/resources/concave_polygon_shape_3d.h @@ -65,7 +65,7 @@ public: void set_faces(const Vector &p_faces); Vector get_faces() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override; ConcavePolygonShape3D(); diff --git a/scene/resources/convex_polygon_shape_3d.cpp b/scene/resources/convex_polygon_shape_3d.cpp index affeb05a8f5..29549e1114b 100644 --- a/scene/resources/convex_polygon_shape_3d.cpp +++ b/scene/resources/convex_polygon_shape_3d.cpp @@ -32,7 +32,7 @@ #include "core/math/quick_hull.h" #include "servers/physics_server_3d.h" -Vector ConvexPolygonShape3D::get_debug_mesh_lines() { +Vector ConvexPolygonShape3D::get_debug_mesh_lines() const { Vector points = get_points(); if (points.size() > 3) { diff --git a/scene/resources/convex_polygon_shape_3d.h b/scene/resources/convex_polygon_shape_3d.h index 43d8b907408..f436d2f5d4f 100644 --- a/scene/resources/convex_polygon_shape_3d.h +++ b/scene/resources/convex_polygon_shape_3d.h @@ -46,7 +46,7 @@ public: void set_points(const Vector &p_points); Vector get_points() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override; ConvexPolygonShape3D(); diff --git a/scene/resources/cylinder_shape_3d.cpp b/scene/resources/cylinder_shape_3d.cpp index 44786d60255..ad645412475 100644 --- a/scene/resources/cylinder_shape_3d.cpp +++ b/scene/resources/cylinder_shape_3d.cpp @@ -31,7 +31,7 @@ #include "cylinder_shape_3d.h" #include "servers/physics_server_3d.h" -Vector CylinderShape3D::get_debug_mesh_lines() { +Vector CylinderShape3D::get_debug_mesh_lines() const { float radius = get_radius(); float height = get_height(); diff --git a/scene/resources/cylinder_shape_3d.h b/scene/resources/cylinder_shape_3d.h index 2564a04a97b..e579e1f7cf2 100644 --- a/scene/resources/cylinder_shape_3d.h +++ b/scene/resources/cylinder_shape_3d.h @@ -48,7 +48,7 @@ public: void set_height(float p_height); float get_height() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override; CylinderShape3D(); diff --git a/scene/resources/height_map_shape_3d.cpp b/scene/resources/height_map_shape_3d.cpp index e112c6b4367..2ae47bcf3cc 100644 --- a/scene/resources/height_map_shape_3d.cpp +++ b/scene/resources/height_map_shape_3d.cpp @@ -31,7 +31,7 @@ #include "height_map_shape_3d.h" #include "servers/physics_server_3d.h" -Vector HeightMapShape3D::get_debug_mesh_lines() { +Vector HeightMapShape3D::get_debug_mesh_lines() const { Vector points; if ((map_width != 0) && (map_depth != 0)) { diff --git a/scene/resources/height_map_shape_3d.h b/scene/resources/height_map_shape_3d.h index c5715a57b16..9ee8b49689b 100644 --- a/scene/resources/height_map_shape_3d.h +++ b/scene/resources/height_map_shape_3d.h @@ -54,7 +54,7 @@ public: void set_map_data(PackedFloat32Array p_new); PackedFloat32Array get_map_data() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override; HeightMapShape3D(); diff --git a/scene/resources/ray_shape_3d.cpp b/scene/resources/ray_shape_3d.cpp index 17205a500ad..39df4c22f94 100644 --- a/scene/resources/ray_shape_3d.cpp +++ b/scene/resources/ray_shape_3d.cpp @@ -32,7 +32,7 @@ #include "servers/physics_server_3d.h" -Vector RayShape3D::get_debug_mesh_lines() { +Vector RayShape3D::get_debug_mesh_lines() const { Vector points; points.push_back(Vector3()); points.push_back(Vector3(0, 0, get_length())); diff --git a/scene/resources/ray_shape_3d.h b/scene/resources/ray_shape_3d.h index 6d974a0a4c1..a1a67025648 100644 --- a/scene/resources/ray_shape_3d.h +++ b/scene/resources/ray_shape_3d.h @@ -48,7 +48,7 @@ public: void set_slips_on_slope(bool p_active); bool get_slips_on_slope() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override; RayShape3D(); diff --git a/scene/resources/shape_3d.h b/scene/resources/shape_3d.h index 8a78b414617..eb9607e3a63 100644 --- a/scene/resources/shape_3d.h +++ b/scene/resources/shape_3d.h @@ -56,7 +56,7 @@ public: virtual RID get_rid() const override { return shape; } Ref get_debug_mesh(); - virtual Vector get_debug_mesh_lines() = 0; // { return Vector(); } + virtual Vector get_debug_mesh_lines() const = 0; // { return Vector(); } /// Returns the radius of a sphere that fully enclose this shape virtual real_t get_enclosing_radius() const = 0; diff --git a/scene/resources/sphere_shape_3d.cpp b/scene/resources/sphere_shape_3d.cpp index d24998ff187..fd33387df65 100644 --- a/scene/resources/sphere_shape_3d.cpp +++ b/scene/resources/sphere_shape_3d.cpp @@ -31,7 +31,7 @@ #include "sphere_shape_3d.h" #include "servers/physics_server_3d.h" -Vector SphereShape3D::get_debug_mesh_lines() { +Vector SphereShape3D::get_debug_mesh_lines() const { float r = get_radius(); Vector points; diff --git a/scene/resources/sphere_shape_3d.h b/scene/resources/sphere_shape_3d.h index 78d45b5058c..5cad67aea5e 100644 --- a/scene/resources/sphere_shape_3d.h +++ b/scene/resources/sphere_shape_3d.h @@ -46,7 +46,7 @@ public: void set_radius(float p_radius); float get_radius() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override; SphereShape3D(); diff --git a/scene/resources/world_margin_shape_3d.cpp b/scene/resources/world_margin_shape_3d.cpp index d613413b331..0936fcc6579 100644 --- a/scene/resources/world_margin_shape_3d.cpp +++ b/scene/resources/world_margin_shape_3d.cpp @@ -32,7 +32,7 @@ #include "servers/physics_server_3d.h" -Vector WorldMarginShape3D::get_debug_mesh_lines() { +Vector WorldMarginShape3D::get_debug_mesh_lines() const { Plane p = get_plane(); Vector points; diff --git a/scene/resources/world_margin_shape_3d.h b/scene/resources/world_margin_shape_3d.h index c920dc513cf..8099592d804 100644 --- a/scene/resources/world_margin_shape_3d.h +++ b/scene/resources/world_margin_shape_3d.h @@ -45,7 +45,7 @@ public: void set_plane(Plane p_plane); Plane get_plane() const; - virtual Vector get_debug_mesh_lines() override; + virtual Vector get_debug_mesh_lines() const override; virtual real_t get_enclosing_radius() const override { // Should be infinite? return 0;