diff --git a/Libraries/Utilities/MatrixMath.js b/Libraries/Utilities/MatrixMath.js index 23db73811f18..00eaaaad67be 100755 --- a/Libraries/Utilities/MatrixMath.js +++ b/Libraries/Utilities/MatrixMath.js @@ -464,10 +464,10 @@ var MatrixMath = { // Solve the equation by inverting perspectiveMatrix and multiplying // rightHandSide by the inverse. - var inversePerspectiveMatrix = MatrixMath.inverse3x3( + var inversePerspectiveMatrix = MatrixMath.inverse( perspectiveMatrix ); - var transposedInversePerspectiveMatrix = MatrixMath.transpose4x4( + var transposedInversePerspectiveMatrix = MatrixMath.transpose( inversePerspectiveMatrix ); var perspective = MatrixMath.multiplyVectorByMatrix( @@ -575,13 +575,12 @@ var MatrixMath = { // expose both base data and convenience names return { rotationDegrees, - perspective, quaternion, scale, skew, translation, - rotate: rotationDegrees[2], + perspective: perspective[2] != 0 ? -1/perspective[2] : 1280, scaleX: scale[0], scaleY: scale[1], translateX: translation[0], diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java index fbbae4c1b180..0fd53a59b2e0 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java +++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java @@ -7,6 +7,7 @@ import android.view.View; import com.facebook.react.bridge.ReadableMap; +import com.facebook.react.bridge.ReadableArray; /** * Base class that should be suitable for the majority of subclasses of {@link ViewManager}. @@ -17,9 +18,11 @@ public abstract class BaseViewManager