noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of https://github.com/godotengine/godot

Browse Source
This commit is contained in:
Juan Linietsky
2017-01-04 01:17:41 -03:00
parent b085c40edf 3a0c19d3f6
commit 76c2e8583e
18 changed files with 217 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/editor/plugins/multimesh_editor_plugin.cpp
View File

@@ -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();