TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-11 13:45:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Opt[bitmap_pan]: change pan behaviour to be more efficient

Browse Source 
Also: fix typos
This commit is contained in:
artdeell 2024-01-02 13:45:27 +03:00 committed by Maksim Belov
parent e581699961
commit 1fd64e0a3a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/BitmapCropBehaviour.java
View File

@ -21,13 +21,13 @@ public class BitmapCropBehaviour implements CropperBehaviour{
public void pan(float panX, float panY) { public void pan(float panX, float panY) {
if(mHostView.horizontalLock) panX = 0; if(mHostView.horizontalLock) panX = 0;
if(mHostView.verticalLock) panY = 0; if(mHostView.verticalLock) panY = 0;
mTranslateMatrix.postTranslate(panX, panY);
if(panX != 0 || panY != 0) { if(panX != 0 || panY != 0) {
// Only mark the matrix as outdated if any amount of panning has occured // Actually translate and refresh only if either of the pan deltas are nonzero
mTranslateMatrix.postTranslate(panX, panY);
mTranslateInverseOutdated = true; mTranslateInverseOutdated = true;
}
refresh(); refresh();
} }
}
public void zoom(float zoomLevel, float midpointX, float midpointY) { public void zoom(float zoomLevel, float midpointX, float midpointY) {
// Do this to avoid constantly inverting the same matrix on each touch event. // Do this to avoid constantly inverting the same matrix on each touch event.
@ -83,7 +83,7 @@ public class BitmapCropBehaviour implements CropperBehaviour{
Matrix imageInverse = new Matrix(); Matrix imageInverse = new Matrix();
inverse(mImageMatrix, imageInverse); inverse(mImageMatrix, imageInverse);
// By inverting the matrix we will effectively "divide" our rectangle by it, thus getting // By inverting the matrix we will effectively "divide" our rectangle by it, thus getting
// its two points on the bitmap's surface. Math be cool indeed. // its two points on the surface of the bitmap. Math be cool indeed.
float[] src = new float[] { float[] src = new float[] {
mHostView.mSelectionRect.left, mHostView.mSelectionRect.left,
mHostView.mSelectionRect.top, mHostView.mSelectionRect.top,

4
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/CropperView.java
View File

@ -139,8 +139,8 @@ public class CropperView extends View {
} }
@Override @Override
protected void onSizeChanged(int w, int h, int oldw, int oldh) { protected void onSizeChanged(int w, int h, int oldW, int oldH) {
super.onSizeChanged(w, h, oldw, oldh); super.onSizeChanged(w, h, oldW, oldH);
int lesserDimension = (int)(Math.min(w, h) - mSelectionPadding); int lesserDimension = (int)(Math.min(w, h) - mSelectionPadding);
// Calculate the corners of the new selection frame. It should always appear at the center of the view. // Calculate the corners of the new selection frame. It should always appear at the center of the view.
int centerShiftX = (w - lesserDimension) / 2; int centerShiftX = (w - lesserDimension) / 2;

6
app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/imgcropper/RegionDecoderCropBehaviour.java
View File

@ -38,7 +38,7 @@ public class RegionDecoderCropBehaviour extends BitmapCropBehaviour {
}; };
/** /**
* Decoade a region from this Bitmap based on a subsection in the View coordinate space. * Decode a region from this Bitmap based on a subsection in the View coordinate space.
* @param targetDrawRect an output Rect. This Rect is the position at which the region must * @param targetDrawRect an output Rect. This Rect is the position at which the region must
* be rendered within subsectionRect. * be rendered within subsectionRect.
* @param subsectionRect the subsection in View coordinate space. Note that this Rect is modified * @param subsectionRect the subsection in View coordinate space. Note that this Rect is modified
@ -46,7 +46,7 @@ public class RegionDecoderCropBehaviour extends BitmapCropBehaviour {
* @return null if the resulting region is bigger than the original image * @return null if the resulting region is bigger than the original image
* null if the resulting region is completely out of the original image bounds * null if the resulting region is completely out of the original image bounds
* null if the resulting region is smaller than 16x16 pixels * null if the resulting region is smaller than 16x16 pixels
* null if a region decoding error has occured * null if a region decoding error has occurred
* the resulting Bitmap region otherwise. * the resulting Bitmap region otherwise.
*/ */
private Bitmap decodeRegionBitmap(RectF targetDrawRect, RectF subsectionRect) { private Bitmap decodeRegionBitmap(RectF targetDrawRect, RectF subsectionRect) {
@ -189,7 +189,7 @@ public class RegionDecoderCropBehaviour extends BitmapCropBehaviour {
/** /**
* Transform the coordinates of the Rect using the supplied Matrix. * Transform the coordinates of the Rect using the supplied Matrix.
* @param rect the input/ouput Rect for this operation * @param rect the input/output Rect for this operation
* @param regionImageInverse the Matrix for transforming the Rect. * @param regionImageInverse the Matrix for transforming the Rect.
*/ */
private void transformRect(RectF rect, Matrix regionImageInverse) { private void transformRect(RectF rect, Matrix regionImageInverse) {