godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29424 from JFonS/add_heightmap_gizmo 

Add HeightMapShape mesh in CollisionShape gizmo
This commit is contained in:
Rémi Verschelde 2019-06-03 12:18:28 +02:00 committed by GitHub
parent 587c2608c0 6f31143996
commit 7da9f28035
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/spatial_editor_gizmos.cpp
View File

@ -58,6 +58,7 @@
#include "scene/resources/concave_polygon_shape.h" #include "scene/resources/concave_polygon_shape.h"
#include "scene/resources/convex_polygon_shape.h" #include "scene/resources/convex_polygon_shape.h"
#include "scene/resources/cylinder_shape.h" #include "scene/resources/cylinder_shape.h"
#include "scene/resources/height_map_shape.h"
#include "scene/resources/plane_shape.h" #include "scene/resources/plane_shape.h"
#include "scene/resources/primitive_meshes.h" #include "scene/resources/primitive_meshes.h"
#include "scene/resources/ray_shape.h" #include "scene/resources/ray_shape.h"
@ -3637,6 +3638,14 @@ void CollisionShapeSpatialGizmoPlugin::redraw(EditorSpatialGizmo *p_gizmo) {
handles.push_back(Vector3(0, 0, rs->get_length())); handles.push_back(Vector3(0, 0, rs->get_length()));
p_gizmo->add_handles(handles, handles_material); p_gizmo->add_handles(handles, handles_material);
} }
if (Object::cast_to<HeightMapShape>(*s)) {
Ref<HeightMapShape> hms = s;
Ref<ArrayMesh> mesh = hms->get_debug_mesh();
p_gizmo->add_mesh(mesh, false, RID(), material);
}
} }
///// /////

1
scene/resources/height_map_shape.cpp
View File

@ -85,6 +85,7 @@ void HeightMapShape::_update_shape() {
d["min_height"] = min_height; d["min_height"] = min_height;
d["max_height"] = max_height; d["max_height"] = max_height;
PhysicsServer::get_singleton()->shape_set_data(get_shape(), d); PhysicsServer::get_singleton()->shape_set_data(get_shape(), d);
Shape::_update_shape();
} }
void HeightMapShape::set_map_width(int p_new) { void HeightMapShape::set_map_width(int p_new) {