Apple-2-Tools/kegs-android
1
0
Fork 0
mirror of https://github.com/jamessanford/kegs.git synced 2025-08-15 12:27:38 +00:00
Code Issues Projects Releases Wiki Activity

Even with a cropped image, try to show some of the border.

Browse Source
This commit is contained in:
James Sanford
2012-10-23 17:53:44 -07:00
parent 3501d7d0d9
commit f554b07c2e
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/froop/app/kegs/BitmapSize.java
View File

@@ -57,11 +57,18 @@ class BitmapSize {
} }
public int getViewHeight() { public int getViewHeight() {
if (doCropBorder()) { return (int)(getSuggestedHeightUnscaled() * mScaleFactorY);
return (int)(400 * mScaleFactorY); }
} else {
return (int)(Const.A2Height * mScaleFactorY); public int getSuggestedHeightUnscaled() {
if (!doCropBorder()) {
return Const.A2Height;
} }
if (400.0f * mScaleFactorY >= mHeight - 1.0f) { // -1 in case it is 'near'
return 400;
}
// How much of the uncropped image would actually fit on the display.
return Math.min(Const.A2Height, (int)(mHeight / mScaleFactorY));
} }
public boolean doCropBorder() { public boolean doCropBorder() {

12
src/com/froop/app/kegs/KegsRenderer.java
View File

@@ -49,6 +49,7 @@ class KegsRenderer implements GLSurfaceView.Renderer {
private int mWidth = 0; private int mWidth = 0;
private int mHeight = 0; private int mHeight = 0;
private int mHeightUnscaled = 0;
private float mScaleX = 1.0f; private float mScaleX = 1.0f;
private float mScaleY = 1.0f; private float mScaleY = 1.0f;
private boolean mCropBorder = false; private boolean mCropBorder = false;
@@ -88,7 +89,15 @@ class KegsRenderer implements GLSurfaceView.Renderer {
gl.glLoadIdentity(); gl.glLoadIdentity();
// 50.0f is 512-(30+400+32) (the distance from the bottom of the texture to our actual bitmap) // 50.0f is 512-(30+400+32) (the distance from the bottom of the texture to our actual bitmap)
if (mCropBorder) { if (mCropBorder) {
gl.glOrthof(0.0f, (float)mWidth, (50.0f+30.0f) * mScaleY, (50.0f+400.0f+30.0f) * mScaleY, 0.0f, 1.0f); if (mHeightUnscaled > 400) {
// Show as much of the border as we can.
int leftover = (30+400+32) - mHeightUnscaled;
leftover /= 2;
gl.glOrthof(0.0f, (float)mWidth, (50.0f+leftover) * mScaleY, (50.0f+leftover+mHeightUnscaled) * mScaleY, 0.0f, 1.0f);
} else {
// Just show the 400 pixels.
gl.glOrthof(0.0f, (float)mWidth, (50.0f+30.0f) * mScaleY, (50.0f+30.0f+400.0f) * mScaleY, 0.0f, 1.0f);
}
} else { } else {
gl.glOrthof(0.0f, (float)mWidth, 50.0f * mScaleY, (50.0f+30.0f+400.0f+32.0f) * mScaleY, 0.0f, 1.0f); gl.glOrthof(0.0f, (float)mWidth, 50.0f * mScaleY, (50.0f+30.0f+400.0f+32.0f) * mScaleY, 0.0f, 1.0f);
} }
@@ -209,6 +218,7 @@ class KegsRenderer implements GLSurfaceView.Renderer {
// TODO: There should probably be a lock surrounding updating these. // TODO: There should probably be a lock surrounding updating these.
mWidth = bitmapSize.getViewWidth(); mWidth = bitmapSize.getViewWidth();
mHeight = bitmapSize.getViewHeight(); mHeight = bitmapSize.getViewHeight();
mHeightUnscaled = bitmapSize.getSuggestedHeightUnscaled();
mScaleX = bitmapSize.getScaleX(); mScaleX = bitmapSize.getScaleX();
mScaleY = bitmapSize.getScaleY(); mScaleY = bitmapSize.getScaleY();
mCropBorder = bitmapSize.doCropBorder(); mCropBorder = bitmapSize.doCropBorder();