Commit: ffafa8196549289b527373318f567a2b95194e0a - HotshotIOS (hg)

Commit MetaInfo

• Revisão: ffafa8196549289b527373318f567a2b95194e0a (tree)
• Hora: 2021-06-15 00:05:19
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Mensagem de Log

Node rotation now seems to be working. More testing needed.

Mudança Sumário

• modified: HotshotEditor/src/com/javafx/experiments/jfx3dviewer/ContentModel.java

Diff

diff -r 24caf8381845 -r ffafa8196549 HotshotEditor/src/com/javafx/experiments/jfx3dviewer/ContentModel.java
--- a/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/ContentModel.java	Mon Jun 14 16:50:26 2021 +0300
+++ b/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/ContentModel.java	Mon Jun 14 18:05:19 2021 +0300
@@ -102,7 +102,7 @@
     private AutoScalingGroup                     autoScalingGroup    = new AutoScalingGroup(2);
     private SubdivisionMesh.BoundaryMode         boundaryMode        = SubdivisionMesh.BoundaryMode.CREASE_EDGES;
     private final PerspectiveCamera              camera              = new PerspectiveCamera(true);
-    public static final double                   cameraDistance      = 100;
+    public static final double                   cameraDistance      = 20;
     private final Rotate                         cameraLookXRotate   = new Rotate(0, 0, 0, 0, Rotate.X_AXIS);
     private final Rotate                         cameraLookZRotate   = new Rotate(0, 0, 0, 0, Rotate.Z_AXIS);
 //    private final Translate                      cameraPosition      = new Translate(0, 0,0);
@@ -549,11 +549,12 @@
                         }
                     } else if (currentModifier == Modifier.ROTATION) {
                         if (mouseDeltaX != 0 || mouseDeltaY != 0) {
-                            Point3D zVec = new Point3D(0, 0, 1);
-                            Point3D mouseVec = new Point3D(flip * mouseDeltaX, yFlip * mouseDeltaY, 0);
-                            Point3D rotAxis = mouseVec.crossProduct(zVec);
-                            rotAxis = rotAxis.normalize();
-                            ENG_Quaternion currentRot = ENG_Quaternion.fromAngleAxisDegRet(3.0, new ENG_Vector4D(rotAxis.getX(), rotAxis.getY(), rotAxis.getZ(), 1.0));
+                            ENG_Vector3D zVec = new ENG_Vector3D(0, 0, 1);
+                            ENG_Vector3D mouseVec = new ENG_Vector3D(mouseDeltaX, mouseDeltaY, 0);
+                            ENG_Vector3D rotAxis = mouseVec.crossProduct(zVec);
+                            rotAxis.normalize();
+                            rotAxis = cameraTransform.getOrientation().mul(rotAxis);
+                            ENG_Quaternion currentRot = ENG_Quaternion.fromAngleAxisDegRet(3.0, new ENG_Vector4D(rotAxis.x, rotAxis.y, rotAxis.z, 1.0));
                             currentRot.normalize();
                             ENG_Quaternion nodeRotation = nodeData.getNodeRotation();
                             ENG_Quaternion currentOrientationCopy = new ENG_Quaternion(nodeRotation);
@@ -952,8 +953,8 @@
         root3D.addEventHandler(KeyEvent.ANY, keyEventHandler);
         root3D.setFocusTraversable(true);
 
-        subScene.setOnKeyPressed(event -> System.out.println("subScene keyPressed"));
-        root3D.setOnKeyPressed(event -> System.out.println("root3d key pressed"));
+//        subScene.setOnKeyPressed(event -> System.out.println("subScene keyPressed"));
+//        root3D.setOnKeyPressed(event -> System.out.println("root3d key pressed"));
 
 //        Scene scene = subScene.getScene();
 //        scene.addEventHandler(KeyEvent.ANY, keyEventHandler);