diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-04 01:17:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-04 01:17:41 -0300 |
| commit | 76c2e8583e70e8c976a306e77a40e8e7226aa249 (patch) | |
| tree | fe260ef3c0d00996d537f2fe3b8c78abfb92aa60 /tools/editor/plugins/multimesh_editor_plugin.cpp | |
| parent | b085c40edfac45ec1c8b866c789f6e9bab7e5e08 (diff) | |
| parent | 3a0c19d3f6ddb26359c95d84c376a8e6b1afd04d (diff) | |
| download | redot-engine-76c2e8583e70e8c976a306e77a40e8e7226aa249.tar.gz | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools/editor/plugins/multimesh_editor_plugin.cpp')
| -rw-r--r-- | tools/editor/plugins/multimesh_editor_plugin.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp index e038c83ac8..9b19542268 100644 --- a/tools/editor/plugins/multimesh_editor_plugin.cpp +++ b/tools/editor/plugins/multimesh_editor_plugin.cpp @@ -207,10 +207,10 @@ void MultiMeshEditor::_populate() { Transform axis_xform; if (axis==Vector3::AXIS_Z) { - axis_xform.rotate(Vector3(1,0,0),Math_PI*0.5); + axis_xform.rotate(Vector3(1,0,0),-Math_PI*0.5); } if (axis==Vector3::AXIS_X) { - axis_xform.rotate(Vector3(0,0,1),Math_PI*0.5); + axis_xform.rotate(Vector3(0,0,1),-Math_PI*0.5); } for(int i=0;i<instance_count;i++) { @@ -238,9 +238,9 @@ void MultiMeshEditor::_populate() { Matrix3 post_xform; - post_xform.rotate(xform.basis.get_axis(0),Math::random(-_tilt_random,_tilt_random)*Math_PI); - post_xform.rotate(xform.basis.get_axis(2),Math::random(-_tilt_random,_tilt_random)*Math_PI); - post_xform.rotate(xform.basis.get_axis(1),Math::random(-_rotate_random,_rotate_random)*Math_PI); + post_xform.rotate(xform.basis.get_axis(0),-Math::random(-_tilt_random,_tilt_random)*Math_PI); + post_xform.rotate(xform.basis.get_axis(2),-Math::random(-_tilt_random,_tilt_random)*Math_PI); + post_xform.rotate(xform.basis.get_axis(1),-Math::random(-_rotate_random,_rotate_random)*Math_PI); xform.basis = post_xform * xform.basis; //xform.basis.orthonormalize(); |