modules/graphics/src/main/java/javafx/scene/Node.java

*** 151,160 ****
--- 151,161 ----
  import com.sun.javafx.scene.NodeEventDispatcher;
  import com.sun.javafx.scene.NodeHelper;
  import com.sun.javafx.scene.SceneHelper;
  import com.sun.javafx.scene.SceneUtils;
  import com.sun.javafx.scene.input.PickResultChooser;
+ import com.sun.javafx.scene.transform.TransformHelper;
  import com.sun.javafx.scene.transform.TransformUtils;
  import com.sun.javafx.scene.traversal.Direction;
  import com.sun.javafx.sg.prism.NGNode;
  import com.sun.javafx.tk.Toolkit;
  import com.sun.prism.impl.PrismSettings;
*** 1863,1873 ****
          }
  
          BaseTransform transform = BaseTransform.IDENTITY_TRANSFORM;
          if (params.getTransform() != null) {
              Affine3D tempTx = new Affine3D();
!             params.getTransform().impl_apply(tempTx);
              transform = tempTx;
          }
          double x;
          double y;
          double w;
--- 1864,1874 ----
          }
  
          BaseTransform transform = BaseTransform.IDENTITY_TRANSFORM;
          if (params.getTransform() != null) {
              Affine3D tempTx = new Affine3D();
!             TransformHelper.apply(params.getTransform(), tempTx);
              transform = tempTx;
          }
          double x;
          double y;
          double w;
*** 3091,3103 ****
  
                  } else {
                      BaseBounds nodeInCameraBounds = new BoxBounds();
  
                      // We need to set tempTx to identity since it is a recycled transform.
!                     // This is because impl_apply is a matrix concatenation operation.
                      tempTx.setToIdentity();
!                     localToSceneTx.impl_apply(tempTx);
  
                      // Convert node from local coordinate to camera coordinate
                      tempTx.preConcatenate(camera.getSceneToLocalTransform());
                      tempTx.transform(localBounds, nodeInCameraBounds);
  
--- 3092,3104 ----
  
                  } else {
                      BaseBounds nodeInCameraBounds = new BoxBounds();
  
                      // We need to set tempTx to identity since it is a recycled transform.
!                     // This is because TransformHelper.apply() is a matrix concatenation operation.
                      tempTx.setToIdentity();
!                     TransformHelper.apply(localToSceneTx, tempTx);
  
                      // Convert node from local coordinate to camera coordinate
                      tempTx.preConcatenate(camera.getSceneToLocalTransform());
                      tempTx.transform(localBounds, nodeInCameraBounds);
  
*** 3111,3123 ****
  
              GeneralTransform3D projViewTx = TempState.getInstance().projViewTx;
              projViewTx.set(camera.getProjViewTransform());
  
              // We need to set tempTx to identity since it is a recycled transform.
!             // This is because impl_apply is a matrix concatenation operation.
              tempTx.setToIdentity();
!             localToSceneTx.impl_apply(tempTx);
  
              // The product of projViewTx * localToSceneTransform
              GeneralTransform3D tx = projViewTx.mul(tempTx);
  
              // Transform localBounds to projected bounds
--- 3112,3124 ----
  
              GeneralTransform3D projViewTx = TempState.getInstance().projViewTx;
              projViewTx.set(camera.getProjViewTransform());
  
              // We need to set tempTx to identity since it is a recycled transform.
!             // This is because TransformHelper.apply() is a matrix concatenation operation.
              tempTx.setToIdentity();
!             TransformHelper.apply(localToSceneTx, tempTx);
  
              // The product of projViewTx * localToSceneTransform
              GeneralTransform3D tx = projViewTx.mul(tempTx);
  
              // Transform localBounds to projected bounds
*** 4820,4830 ****
                          getTranslateZ());
              }
  
              if (impl_hasTransforms()) {
                  for (Transform t : getTransforms()) {
!                     localToParentTx = t.impl_derive(localToParentTx);
                  }
              }
  
              // Check to see whether the node requires mirroring
              if (mirror) {
--- 4821,4831 ----
                          getTranslateZ());
              }
  
              if (impl_hasTransforms()) {
                  for (Transform t : getTransforms()) {
!                     localToParentTx = TransformHelper.derive(t, localToParentTx);
                  }
              }
  
              // Check to see whether the node requires mirroring
              if (mirror) {
*** 6089,6102 ****
                  transforms = new TrackableObservableList<Transform>() {
                      @Override
                      protected void onChanged(Change<Transform> c) {
                          while (c.next()) {
                              for (Transform t : c.getRemoved()) {
!                                 t.impl_remove(Node.this);
                              }
                              for (Transform t : c.getAddedSubList()) {
!                                 t.impl_add(Node.this);
                              }
                          }
  
                          impl_transformsChanged();
                      }
--- 6090,6103 ----
                  transforms = new TrackableObservableList<Transform>() {
                      @Override
                      protected void onChanged(Change<Transform> c) {
                          while (c.next()) {
                              for (Transform t : c.getRemoved()) {
!                                 TransformHelper.remove(t, Node.this);
                              }
                              for (Transform t : c.getAddedSubList()) {
!                                 TransformHelper.add(t, Node.this);
                              }
                          }
  
                          impl_transformsChanged();
                      }