diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-30 12:45:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 12:45:01 +0200 |
| commit | aac077774ecc5364a9705f0095ce57bf9db5364d (patch) | |
| tree | a232ef9aaa39b75ab68107e4f8e883d91e9c5e1c | |
| parent | e59b1212daec0462660dc9950e23bdb626a690c6 (diff) | |
| parent | b61374e5bd2ee42bbbab6a61eb2e701755d5d588 (diff) | |
Merge pull request #10774 from djrm/pr_gizmo_fixes
Fixed problem with highlight boxes not updating on translation
| -rw-r--r-- | editor/spatial_editor_gizmos.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index d86b255f38..c127b9a2f1 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -298,12 +298,23 @@ void EditorSpatialGizmo::add_handles(const Vector<Vector3> &p_handles, bool p_bi } void EditorSpatialGizmo::add_solid_box(Ref<Material> &p_material, Vector3 size) { + ERR_FAIL_COND(!spatial_node); + CubeMesh cubem; cubem.set_size(size); Ref<ArrayMesh> m = memnew(ArrayMesh); m->add_surface_from_arrays(cubem.surface_get_primitive_type(0), cubem.surface_get_arrays(0)); m->surface_set_material(0, p_material); add_mesh(m); + + Instance ins; + ins.mesh = m; + if (valid) { + ins.create_instance(spatial_node); + VS::get_singleton()->instance_set_transform(ins.instance, spatial_node->get_global_transform()); + } + + instances.push_back(ins); } void EditorSpatialGizmo::set_spatial_node(Spatial *p_node) { @@ -877,10 +888,6 @@ void LightSpatialGizmo::redraw() { Point2 a = Vector2(Math::sin(ra), Math::cos(ra)) * w; Point2 b = Vector2(Math::sin(rb), Math::cos(rb)) * w; - /*points.push_back(Vector3(a.x,0,a.y)); - points.push_back(Vector3(b.x,0,b.y)); - points.push_back(Vector3(0,a.x,a.y)); - points.push_back(Vector3(0,b.x,b.y));*/ points.push_back(Vector3(a.x, a.y, -d)); points.push_back(Vector3(b.x, b.y, -d)); |