zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-04 15:44:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement transform matrix property for ImageShadowNode

Browse Source 
Add conditional translation.preConcat(mMatrix) statement
This commit is contained in:
Mikael Sand
2017-06-08 17:52:47 +03:00
parent 77e54cfcfb
commit 49c95f5a30
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/ImageShadowNode.java
+35
View File
@@ -38,6 +38,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import com.facebook.react.bridge.ReadableArray;
/** /**
* Shadow node for virtual Image view * Shadow node for virtual Image view
*/ */
@@ -53,6 +55,10 @@ public class ImageShadowNode extends RenderableShadowNode {
private int mMeetOrSlice; private int mMeetOrSlice;
private AtomicBoolean mLoading = new AtomicBoolean(false); private AtomicBoolean mLoading = new AtomicBoolean(false);
private static final float[] sMatrixData = new float[9];
private static final float[] sRawMatrix = new float[9];
protected Matrix mMatrix = new Matrix();
@ReactProp(name = "x") @ReactProp(name = "x")
public void setX(String x) { public void setX(String x) {
mX = x; mX = x;
@@ -109,6 +115,32 @@ public class ImageShadowNode extends RenderableShadowNode {
markUpdated(); markUpdated();
} }
@ReactProp(name = "matrix")
public void setMatrix(@Nullable ReadableArray matrixArray) {
if (matrixArray != null) {
int matrixSize = PropHelper.toFloatArray(matrixArray, sMatrixData);
if (matrixSize == 6) {
sRawMatrix[0] = sMatrixData[0];
sRawMatrix[1] = sMatrixData[2];
sRawMatrix[2] = sMatrixData[4] * mScale;
sRawMatrix[3] = sMatrixData[1];
sRawMatrix[4] = sMatrixData[3];
sRawMatrix[5] = sMatrixData[5] * mScale;
sRawMatrix[6] = 0;
sRawMatrix[7] = 0;
sRawMatrix[8] = 1;
mMatrix.setValues(sRawMatrix);
} else if (matrixSize != -1) {
FLog.w(ReactConstants.TAG, "RNSVG: Transform matrices must be of size 6");
}
} else {
mMatrix = null;
}
markUpdated();
}
@Override @Override
public void draw(final Canvas canvas, final Paint paint, final float opacity) { public void draw(final Canvas canvas, final Paint paint, final float opacity) {
if (!mLoading.get()) { if (!mLoading.get()) {
@@ -187,6 +219,9 @@ public class ImageShadowNode extends RenderableShadowNode {
transform.mapRect(renderRect); transform.mapRect(renderRect);
Matrix translation = new Matrix(); Matrix translation = new Matrix();
translation.postTranslate(rectX, rectY); translation.postTranslate(rectX, rectY);
if (mMatrix != null) {
translation.preConcat(mMatrix);
}
translation.mapRect(renderRect); translation.mapRect(renderRect);
Path clip = new Path(); Path clip = new Path();