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

Merge pull request #30067 from GlaceGwyneth/gridmap-fix 

Fix GridMap transform problems
This commit is contained in:
Rémi Verschelde 2019-06-25 14:58:32 +02:00 committed by GitHub
parent 7a56873271 f1bd1c268e
commit ca084db4aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gridmap/grid_map_editor_plugin.cpp
View File

@ -279,7 +279,7 @@ void GridMapEditor::_update_cursor_transform() {
cursor_transform = Transform(); cursor_transform = Transform();
cursor_transform.origin = cursor_origin; cursor_transform.origin = cursor_origin;
cursor_transform.basis.set_orthogonal_index(cursor_rot); cursor_transform.basis.set_orthogonal_index(cursor_rot);
cursor_transform = node->get_transform() * cursor_transform; cursor_transform = node->get_global_transform() * cursor_transform;
if (cursor_instance.is_valid()) { if (cursor_instance.is_valid()) {
VisualServer::get_singleton()->instance_set_transform(cursor_instance, cursor_transform); VisualServer::get_singleton()->instance_set_transform(cursor_instance, cursor_transform);
@ -420,7 +420,7 @@ bool GridMapEditor::do_input_action(Camera *p_camera, const Point2 &p_point, boo
} }
last_mouseover = Vector3(cell[0], cell[1], cell[2]); last_mouseover = Vector3(cell[0], cell[1], cell[2]);
VS::get_singleton()->instance_set_transform(grid_instance[edit_axis], Transform(Basis(), grid_ofs)); VS::get_singleton()->instance_set_transform(grid_instance[edit_axis], node->get_global_transform() * edit_grid_xform);
if (cursor_instance.is_valid()) { if (cursor_instance.is_valid()) {