Gremlinsoft
/
godot
forked from sascha/godot
2
0
Fork 0
Code Pull Requests Activity

Fixes concaveshape not selecting in viewport 

This PR resolves the issue of ConcaveShapes not being selectable in the Viewport.
3.2
Emmanuel Barroga 2019-10-10 13:35:00 +07:00
parent 781e4f8673
commit 29690f6aec
21 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/spatial_editor_gizmos.cpp
Unescape Escape View File

@ -3730,6 +3730,7 @@ void CollisionShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
Ref<ConcavePolygonShape> cs2 = s;
Ref<ArrayMesh> mesh = cs2->get_debug_mesh();
p_gizmo->add_mesh(mesh, false, Ref<SkinReference>(), material);
p_gizmo->add_collision_segments(cs2->get_debug_mesh_lines());
}
if (Object::cast_to<RayShape>(*s)) {

2
scene/resources/box_shape.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include "box_shape.h"
#include "servers/physics_server.h"
Vector<Vector3> BoxShape::_gen_debug_mesh_lines() {
Vector<Vector3> BoxShape::get_debug_mesh_lines() {
Vector<Vector3> lines;
AABB aabb;

3
scene/resources/box_shape.h
Unescape Escape View File

@ -42,12 +42,13 @@ protected:
static void _bind_methods();
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_extents(const Vector3 &p_extents);
Vector3 get_extents() const;
virtual Vector<Vector3> get_debug_mesh_lines();
BoxShape();
};

2
scene/resources/capsule_shape.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include "capsule_shape.h"
#include "servers/physics_server.h"
Vector<Vector3> CapsuleShape::_gen_debug_mesh_lines() {
Vector<Vector3> CapsuleShape::get_debug_mesh_lines() {
float radius = get_radius();
float height = get_height();

4
scene/resources/capsule_shape.h
Unescape Escape View File

@ -44,14 +44,14 @@ protected:
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_radius(float p_radius);
float get_radius() const;
void set_height(float p_height);
float get_height() const;
virtual Vector<Vector3> get_debug_mesh_lines();
CapsuleShape();
};

2
scene/resources/concave_polygon_shape.cpp
Unescape Escape View File

@ -32,7 +32,7 @@
#include "servers/physics_server.h"
Vector<Vector3> ConcavePolygonShape::_gen_debug_mesh_lines() {
Vector<Vector3> ConcavePolygonShape::get_debug_mesh_lines() {
Set<DrawEdge> edges;

3
scene/resources/concave_polygon_shape.h
Unescape Escape View File

@ -61,12 +61,13 @@ protected:
static void _bind_methods();
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_faces(const PoolVector<Vector3> &p_faces);
PoolVector<Vector3> get_faces() const;
Vector<Vector3> get_debug_mesh_lines();
ConcavePolygonShape();
};

2
scene/resources/convex_polygon_shape.cpp
Unescape Escape View File

@ -32,7 +32,7 @@
#include "core/math/quick_hull.h"
#include "servers/physics_server.h"
Vector<Vector3> ConvexPolygonShape::_gen_debug_mesh_lines() {
Vector<Vector3> ConvexPolygonShape::get_debug_mesh_lines() {
PoolVector<Vector3> points = get_points();

4
scene/resources/convex_polygon_shape.h
Unescape Escape View File

@ -43,12 +43,12 @@ protected:
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_points(const PoolVector<Vector3> &p_points);
PoolVector<Vector3> get_points() const;
virtual Vector<Vector3> get_debug_mesh_lines();
ConvexPolygonShape();
};

2
scene/resources/cylinder_shape.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include "cylinder_shape.h"
#include "servers/physics_server.h"
Vector<Vector3> CylinderShape::_gen_debug_mesh_lines() {
Vector<Vector3> CylinderShape::get_debug_mesh_lines() {
float radius = get_radius();
float height = get_height();

4
scene/resources/cylinder_shape.h
Unescape Escape View File

@ -43,14 +43,14 @@ protected:
static void _bind_methods();
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_radius(float p_radius);
float get_radius() const;
void set_height(float p_height);
float get_height() const;
virtual Vector<Vector3> get_debug_mesh_lines();
CylinderShape();
};

2
scene/resources/height_map_shape.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include "height_map_shape.h"
#include "servers/physics_server.h"
Vector<Vector3> HeightMapShape::_gen_debug_mesh_lines() {
Vector<Vector3> HeightMapShape::get_debug_mesh_lines() {
Vector<Vector3> points;
if ((map_width != 0) && (map_depth != 0)) {

4
scene/resources/height_map_shape.h
Unescape Escape View File

@ -46,8 +46,6 @@ protected:
static void _bind_methods();
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_map_width(int p_new);
int get_map_width() const;
@ -56,6 +54,8 @@ public:
void set_map_data(PoolRealArray p_new);
PoolRealArray get_map_data() const;
virtual Vector<Vector3> get_debug_mesh_lines();
HeightMapShape();
};

2
scene/resources/plane_shape.cpp
Unescape Escape View File

@ -32,7 +32,7 @@
#include "servers/physics_server.h"
Vector<Vector3> PlaneShape::_gen_debug_mesh_lines() {
Vector<Vector3> PlaneShape::get_debug_mesh_lines() {
Plane p = get_plane();
Vector<Vector3> points;

4
scene/resources/plane_shape.h
Unescape Escape View File

@ -42,12 +42,12 @@ protected:
static void _bind_methods();
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_plane(Plane p_plane);
Plane get_plane() const;
virtual Vector<Vector3> get_debug_mesh_lines();
PlaneShape();
};
#endif // PLANE_SHAPE_H

2
scene/resources/ray_shape.cpp
Unescape Escape View File

@ -32,7 +32,7 @@
#include "servers/physics_server.h"
Vector<Vector3> RayShape::_gen_debug_mesh_lines() {
Vector<Vector3> RayShape::get_debug_mesh_lines() {
Vector<Vector3> points;
points.push_back(Vector3());

3
scene/resources/ray_shape.h
Unescape Escape View File

@ -41,7 +41,6 @@ class RayShape : public Shape {
protected:
static void _bind_methods();
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_length(float p_length);
@ -50,6 +49,8 @@ public:
void set_slips_on_slope(bool p_active);
bool get_slips_on_slope() const;
virtual Vector<Vector3> get_debug_mesh_lines();
RayShape();
};
#endif // RAY_SHAPE_H

4
scene/resources/shape.cpp
Unescape Escape View File

@ -37,7 +37,7 @@
void Shape::add_vertices_to_array(PoolVector<Vector3> &array, const Transform &p_xform) {
Vector<Vector3> toadd = _gen_debug_mesh_lines();
Vector<Vector3> toadd = get_debug_mesh_lines();
if (toadd.size()) {
@ -64,7 +64,7 @@ Ref<ArrayMesh> Shape::get_debug_mesh() {
if (debug_mesh_cache.is_valid())
return debug_mesh_cache;
Vector<Vector3> lines = _gen_debug_mesh_lines();
Vector<Vector3> lines = get_debug_mesh_lines();
debug_mesh_cache = Ref<ArrayMesh>(memnew(ArrayMesh));

2
scene/resources/shape.h
Unescape Escape View File

@ -50,13 +50,13 @@ protected:
_FORCE_INLINE_ RID get_shape() const { return shape; }
Shape(RID p_shape);
virtual Vector<Vector3> _gen_debug_mesh_lines() = 0; // { return Vector<Vector3>(); }
virtual void _update_shape();
public:
virtual RID get_rid() const { return shape; }
Ref<ArrayMesh> get_debug_mesh();
virtual Vector<Vector3> get_debug_mesh_lines() = 0; // { return Vector<Vector3>(); }
void add_vertices_to_array(PoolVector<Vector3> &array, const Transform &p_xform);

2
scene/resources/sphere_shape.cpp
Unescape Escape View File

@ -31,7 +31,7 @@
#include "sphere_shape.h"
#include "servers/physics_server.h"
Vector<Vector3> SphereShape::_gen_debug_mesh_lines() {
Vector<Vector3> SphereShape::get_debug_mesh_lines() {
float r = get_radius();

3
scene/resources/sphere_shape.h
Unescape Escape View File

@ -42,12 +42,13 @@ protected:
static void _bind_methods();
virtual void _update_shape();
virtual Vector<Vector3> _gen_debug_mesh_lines();
public:
void set_radius(float p_radius);
float get_radius() const;
virtual Vector<Vector3> get_debug_mesh_lines();
SphereShape();
};