Commit: a76a4e8fc80a61f6223846895715265e27ee2024 - HotshotIOS (hg)

Commit MetaInfo

• Revisão: a76a4e8fc80a61f6223846895715265e27ee2024 (tree)
• Hora: 2021-06-13 20:42:03
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Mensagem de Log

Moved stuff around in preparation for changing from XForm crap to ENG_Quaternion and ENG_Vector3D.

Mudança Sumário

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

Diff

diff -r 9abe6a2fc3b7 -r a76a4e8fc80a HotshotEditor/src/com/javafx/experiments/jfx3dviewer/ContentModel.java
--- a/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/ContentModel.java	Wed Jun 09 01:20:47 2021 +0300
+++ b/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/ContentModel.java	Sun Jun 13 14:42:03 2021 +0300
@@ -504,7 +504,7 @@
 
     {
         mouseEventHandler = event -> {
-            // System.out.println("MouseEvent ...");
+//            System.out.println("MouseEvent ...");
 
             double flip = -1.0;
 
@@ -530,17 +530,22 @@
                     resetCurrentIntersectedNode();
                 } else {
                     currentIntersectedNode = pickResult.getIntersectedNode();
-                    if (currentIntersectedNode.getTransforms().size() == 0) {
-                        currentIntersectedNode.getTransforms().add(new Affine());
+                    Asteroid asteroid = nodeToAsteroidMap.get(currentIntersectedNode);
+                    if (asteroid == null) {
+                        currentIntersectedNode = null;
+                    } else {
+                        if (currentIntersectedNode.getTransforms().size() == 0) {
+                            currentIntersectedNode.getTransforms().add(new Affine());
+                        }
+                        NodeData nodeData = nodeMap.get(currentIntersectedNode);
+                        if (nodeData == null) {
+                            nodeData = new NodeData();
+                            nodeMap.put(currentIntersectedNode, nodeData);
+                        }
+                        currentIntersectedNodeDistance = pickResult.getIntersectedDistance();
+                        currentIntersectedNodeInitialPos = Utility.unProjectDirection(camera, cameraXform.rx, cameraXform.ry, cameraXform.rz, mousePosX, mousePosY,
+                                getSubScene().getWidth(), getSubScene().getHeight());
                     }
-                    NodeData nodeData = nodeMap.get(currentIntersectedNode);
-                    if (nodeData == null) {
-                        nodeData = new NodeData();
-                        nodeMap.put(currentIntersectedNode, nodeData);
-                    }
-                    currentIntersectedNodeDistance = pickResult.getIntersectedDistance();
-                    currentIntersectedNodeInitialPos = Utility.unProjectDirection(camera, cameraXform.rx, cameraXform.ry, mousePosX, mousePosY,
-                            getSubScene().getWidth(), getSubScene().getHeight());
                 }
 
 
@@ -563,20 +568,26 @@
                 mouseDeltaX = (mousePosX - mouseOldX); //*DELTA_MULTIPLIER;
                 mouseDeltaY = (mousePosY - mouseOldY); //*DELTA_MULTIPLIER;
 
-
+                System.out.println("mouseDeltaX: " + mouseDeltaX + " mouseDeltaY: " + mouseDeltaY);
 
                 if (currentIntersectedNode != null) {
                     NodeData nodeData = nodeMap.get(currentIntersectedNode);
                     if (currentModifier == Modifier.TRANSLATION) {
-                        Point3D vecPos = Utility.unProjectDirection(camera, cameraXform.rx, cameraXform.ry, mousePosX, mousePosY,
+                        Point3D vecPos = Utility.unProjectDirection(camera, cameraXform.rx, cameraXform.ry, cameraXform.rz, mousePosX, mousePosY,
                                 getSubScene().getWidth(), getSubScene().getHeight());
-                        Point3D p = vecPos.subtract(currentIntersectedNodeInitialPos).multiply(currentIntersectedNodeDistance);
-                        nodeData.getNodePos().addInPlace(new ENG_Vector4D(p.getX(), -1 * p.getY(), p.getZ(), 1.0));
+                        Point3D subtract = vecPos.subtract(currentIntersectedNodeInitialPos);
+                        ENG_Matrix4 rotationMatrix = nodeData.getNodeRotation().toRotationMatrix();
+                        ENG_Vector4D transformedMousePos = rotationMatrix.transform(new ENG_Vector4D(subtract.getX(), subtract.getY(), subtract.getZ(), 1.0f));
+//                        Point3D p = subtract.multiply(currentIntersectedNodeDistance);
+                        System.out.println("substract: " + subtract + " transformedMousePos: " + transformedMousePos);
+                        nodeData.getNodePos().addInPlace(new ENG_Vector4D(transformedMousePos.x, -1 * transformedMousePos.y, transformedMousePos.z, 1.0));
 //                        getCurrentIntersectedNodeTransform().appendTranslation(p.getX(), -1 * p.getY(), p.getZ());
                         Asteroid asteroid = nodeToAsteroidMap.get(currentIntersectedNode);
-                        asteroid.getPosition().set(nodeData.getNodePos());
-                        currentIntersectedNodeInitialPos = vecPos;
-                        currentIntersectedNodeDistance = event.getPickResult().getIntersectedDistance();
+                        if (asteroid != null) {
+                            asteroid.getPosition().set(nodeData.getNodePos());
+                            currentIntersectedNodeInitialPos = vecPos;
+                            currentIntersectedNodeDistance = event.getPickResult().getIntersectedDistance();
+                        }
                     } else if (currentModifier == Modifier.ROTATION) {
                         if (mouseDeltaX != 0 || mouseDeltaY != 0) {
                             Point3D zVec = new Point3D(0, 0, 1);
@@ -592,7 +603,9 @@
                             nodeRotation.mulInPlace(currentRot);
                             nodeRotation.mulInPlace(currentOrientationCopy);
                             Asteroid asteroid = nodeToAsteroidMap.get(currentIntersectedNode);
-                            asteroid.getOrientation().set(nodeRotation);
+                            if (asteroid != null) {
+                                asteroid.getOrientation().set(nodeRotation);
+                            }
 //                            Point3D pivot = new Point3D(getCurrentIntersectedNodeTransform().getTx(), getCurrentIntersectedNodeTransform().getTy(), getCurrentIntersectedNodeTransform().getTz());
 //                            System.out.println("rot pivot: " + pivot);
 //                            getCurrentIntersectedNodeTransform().appendRotation(1, new Point3D(0, 0, 0), rotAxis);
@@ -605,22 +618,8 @@
                     trans.setTrans(nodeData.getNodePos());
 
                     Affine transform = getCurrentIntersectedNodeTransform();
-                    transform.setMxx(trans.get(0, 0));
-                    transform.setMxy(trans.get(0, 1));
-                    transform.setMxz(trans.get(0, 2));
-                    transform.setTx(trans.get(0, 3));
-                    transform.setMyx(trans.get(1, 0));
-                    transform.setMyy(trans.get(1, 1));
-                    transform.setMyz(trans.get(1, 2));
-                    transform.setTy(trans.get(1, 3));
-                    transform.setMzx(trans.get(2, 0));
-                    transform.setMzy(trans.get(2, 1));
-                    transform.setMzz(trans.get(2, 2));
-                    transform.setTz(trans.get(2, 3));
+                    Utility.setAffine(trans, transform);
                 } else {
-
-
-
                     @SuppressWarnings("unused")
                     boolean alt = (true || event.isAltDown()); // For now, don't require ALT to be pressed
                     if (alt && (event.isMiddleButtonDown()
@@ -634,11 +633,11 @@
                                 * modifier * 0.3); // -
                     } else if (alt && event.isPrimaryButtonDown()) {
                         cameraXform.ry.setAngle(cameraXform.ry.getAngle()
-                                - yFlip * mouseDeltaX
+                                - yFlip * mouseDeltaY
                                 * modifierFactor * modifier
                                 * 2.0); // +
                         cameraXform.rx.setAngle(cameraXform.rx.getAngle()
-                                + flip * mouseDeltaY
+                                + flip * mouseDeltaX
                                 * modifierFactor * modifier
                                 * 2.0); // -
                     } else if (alt && event.isSecondaryButtonDown()) {
@@ -651,11 +650,14 @@
                         // camera.setTranslateZ(newZ);
                     }
                 }
+            } else if (event.getEventType() == MouseEvent.MOUSE_RELEASED) {
 
             }
         };
     }
 
+
+
     private void resetCurrentIntersectedNode() {
         currentIntersectedNode = null;
         currentIntersectedNodeDistance = -1.0;
@@ -668,24 +670,20 @@
         camera.setFarClip(10000.0); // TODO: Workaround as per RT-31255
         camera.setFieldOfView(90);
 
-        camera.getTransforms()
-              .addAll(yUpRotate,
-                      //cameraXRotate,
-                      //cameraYRotate,
-                      cameraPosition, cameraLookXRotate, cameraLookZRotate);
+        camera.getTransforms().addAll(yUpRotate,
+                                      //cameraXRotate,
+                                      //cameraYRotate,
+                                      cameraPosition,
+                                      cameraLookXRotate,
+                                      cameraLookZRotate);
         //root3D.getChildren().add(camera);
-        root3D.getChildren()
-              .add(cameraXform);
-        cameraXform.getChildren()
-                   .add(cameraXform2);
-        cameraXform2.getChildren()
-                    .add(cameraXform3);
-        cameraXform3.getChildren()
-                    .add(camera);
+        root3D.getChildren().add(cameraXform);
+        cameraXform.getChildren().add(cameraXform2);
+        cameraXform2.getChildren().add(cameraXform3);
+        cameraXform3.getChildren().add(camera);
         cameraPosition.setZ(-cameraDistance);
         // camera.setTranslateZ(-cameraDistance);
-        root3D.getChildren()
-              .add(autoScalingGroup);
+        root3D.getChildren().add(autoScalingGroup);
 
         SessionManager sessionManager = SessionManager.getSessionManager();
         sessionManager.bind(cameraLookXRotate.angleProperty(),
@@ -1054,4 +1052,16 @@
 //        asteroidList.add(new Asteroid("Asteroid1", new ENG_Vector3D(1500.0f -200.0f -250.0f), new ENG_Quaternion(true), 50));
         templateContext.put("asteroids", asteroidList);
     }
+
+    public Xform getCameraXform() {
+        return cameraXform;
+    }
+
+    public Xform getCameraXform2() {
+        return cameraXform2;
+    }
+
+    public Xform getCameraXform3() {
+        return cameraXform3;
+    }
 }

diff -r 9abe6a2fc3b7 -r a76a4e8fc80a HotshotEditor/src/com/javafx/experiments/jfx3dviewer/NavigationController.java
--- a/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/NavigationController.java	Wed Jun 09 01:20:47 2021 +0300
+++ b/HotshotEditor/src/com/javafx/experiments/jfx3dviewer/NavigationController.java	Sun Jun 13 14:42:03 2021 +0300
@@ -78,16 +78,16 @@
         camNav.setListener((direction, amount) -> {
             switch (direction) {
                 case TOP:
-                    contentModel.getCameraXRotate().setAngle(contentModel.getCameraXRotate().getAngle()-amount);
+                    contentModel.getCameraXform().rx.setAngle(contentModel.getCameraXform().rx.getAngle()-amount);
                     break;
                 case BOTTOM:
-                    contentModel.getCameraXRotate().setAngle(contentModel.getCameraXRotate().getAngle()+amount);
+                    contentModel.getCameraXform().rx.setAngle(contentModel.getCameraXform().rx.getAngle()+amount);
                     break;
                 case LEFT:
-                    contentModel.getCameraYRotate().setAngle(contentModel.getCameraYRotate().getAngle()+amount);
+                    contentModel.getCameraXform().ry.setAngle(contentModel.getCameraXform().ry.getAngle()+amount);
                     break;
                 case RIGHT:
-                    contentModel.getCameraYRotate().setAngle(contentModel.getCameraYRotate().getAngle()-amount);
+                    contentModel.getCameraXform().ry.setAngle(contentModel.getCameraXform().ry.getAngle()-amount);
                     break;
             }
         });

diff -r 9abe6a2fc3b7 -r a76a4e8fc80a HotshotEditor/src/com/javafx/experiments/utils3d/Utility.java
--- a/HotshotEditor/src/com/javafx/experiments/utils3d/Utility.java	Wed Jun 09 01:20:47 2021 +0300
+++ b/HotshotEditor/src/com/javafx/experiments/utils3d/Utility.java	Sun Jun 13 14:42:03 2021 +0300
@@ -1,7 +1,9 @@
 package com.javafx.experiments.utils3d;
 
+import headwayent.hotshotengine.ENG_Matrix4;
 import javafx.geometry.Point3D;
 import javafx.scene.PerspectiveCamera;
+import javafx.scene.transform.Affine;
 import javafx.scene.transform.Rotate;
 
 public class Utility {
@@ -11,12 +13,32 @@
      * in the Scene space
      */
 
-    public static Point3D unProjectDirection(PerspectiveCamera camera, Rotate cameraXOrientation, Rotate cameraYOrientation, double sceneX, double sceneY,
+    public static Point3D unProjectDirection(PerspectiveCamera camera,
+                                             Rotate cameraXOrientation,
+                                             Rotate cameraYOrientation,
+                                             Rotate cameraZOrientation,
+                                             double sceneX, double sceneY,
                                              double sWidth, double sHeight) {
         double tanOfHalfFOV = Math.tan(Math.toRadians(camera.getFieldOfView()) * 0.5f);
-        Point3D vMouse = new Point3D(tanOfHalfFOV*(2*sceneX/sWidth-1), tanOfHalfFOV*(2*sceneY/sWidth-sHeight/sWidth), 1);
-        vMouse = cameraYOrientation.transform(vMouse);
-        vMouse = cameraXOrientation.transform(vMouse);
+        Point3D vMouse = new Point3D(tanOfHalfFOV*(2*sceneX/sWidth-1), tanOfHalfFOV*(2*sceneY/sWidth-sHeight/sWidth), 0);
+//        vMouse = cameraZOrientation.transform(vMouse);
+//        vMouse = cameraYOrientation.transform(vMouse);
+//        vMouse = cameraXOrientation.transform(vMouse);
         return vMouse;
     }
+
+    public static void setAffine(ENG_Matrix4 trans, Affine transform) {
+        transform.setMxx(trans.get(0, 0));
+        transform.setMxy(trans.get(0, 1));
+        transform.setMxz(trans.get(0, 2));
+        transform.setTx(trans.get(0, 3));
+        transform.setMyx(trans.get(1, 0));
+        transform.setMyy(trans.get(1, 1));
+        transform.setMyz(trans.get(1, 2));
+        transform.setTy(trans.get(1, 3));
+        transform.setMzx(trans.get(2, 0));
+        transform.setMzy(trans.get(2, 1));
+        transform.setMzz(trans.get(2, 2));
+        transform.setTz(trans.get(2, 3));
+    }
 }