external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent mana tapping for second human player causing issues

Browse Source
This commit is contained in:
drdev
2014-09-25 14:04:26 +00:00
parent d701242e65
commit 28dfb26329
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/Forge.java
View File

@@ -240,11 +240,11 @@ public class Forge implements ApplicationListener {
for (FOverlay overlay : FOverlay.getOverlays()) { for (FOverlay overlay : FOverlay.getOverlays()) {
overlay.setSize(screenWidth, screenHeight); //update overlay sizes as they're rendered overlay.setSize(screenWidth, screenHeight); //update overlay sizes as they're rendered
if (overlay.getRotate180()) { if (overlay.getRotate180()) {
graphics.setRotateTransform(screenWidth / 2, screenHeight / 2, 180); graphics.startRotateTransform(screenWidth / 2, screenHeight / 2, 180);
} }
overlay.draw(graphics); overlay.draw(graphics);
if (overlay.getRotate180()) { if (overlay.getRotate180()) {
graphics.clearTransform(); graphics.endTransform();
} }
} }
graphics.end(); graphics.end();

24
forge-gui-mobile/src/forge/Graphics.java
View File

@@ -1,5 +1,7 @@
package forge; package forge;
import java.util.Stack;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.GL20;
@@ -28,6 +30,7 @@ public class Graphics {
private final SpriteBatch batch = new SpriteBatch(); private final SpriteBatch batch = new SpriteBatch();
private final ShapeRenderer shapeRenderer = new ShapeRenderer(); private final ShapeRenderer shapeRenderer = new ShapeRenderer();
private final Stack<Matrix4> transforms = new Stack<Matrix4>();
private final Vector3 tmp = new Vector3(); private final Vector3 tmp = new Vector3();
private float regionHeight; private float regionHeight;
private Rectangle bounds; private Rectangle bounds;
@@ -66,7 +69,7 @@ public class Graphics {
batch.flush(); //must flush batch to prevent other things not rendering batch.flush(); //must flush batch to prevent other things not rendering
Rectangle clip = new Rectangle(adjustX(x), adjustY(y, h), w, h); Rectangle clip = new Rectangle(adjustX(x), adjustY(y, h), w, h);
if (isTransformed) { //transform position if needed if (!transforms.isEmpty()) { //transform position if needed
tmp.set(clip.x + clip.width / 2, clip.y + clip.height / 2, 0); tmp.set(clip.x + clip.width / 2, clip.y + clip.height / 2, 0);
tmp.mul(batch.getTransformMatrix()); tmp.mul(batch.getTransformMatrix());
clip.x = tmp.x - clip.width / 2; clip.x = tmp.x - clip.width / 2;
@@ -95,7 +98,7 @@ public class Graphics {
final Rectangle parentBounds = bounds; final Rectangle parentBounds = bounds;
bounds = new Rectangle(parentBounds.x + displayObj.getLeft(), parentBounds.y + displayObj.getTop(), displayObj.getWidth(), displayObj.getHeight()); bounds = new Rectangle(parentBounds.x + displayObj.getLeft(), parentBounds.y + displayObj.getTop(), displayObj.getWidth(), displayObj.getHeight());
if (isTransformed) { //transform screen position if needed if (!transforms.isEmpty()) { //transform screen position if needed
tmp.set(bounds.x + bounds.width / 2, regionHeight - bounds.y - bounds.height / 2, 0); tmp.set(bounds.x + bounds.width / 2, regionHeight - bounds.y - bounds.height / 2, 0);
tmp.mul(batch.getTransformMatrix()); tmp.mul(batch.getTransformMatrix());
displayObj.setScreenPosition(tmp.x - bounds.width / 2, regionHeight - tmp.y - bounds.height / 2); displayObj.setScreenPosition(tmp.x - bounds.width / 2, regionHeight - tmp.y - bounds.height / 2);
@@ -110,13 +113,13 @@ public class Graphics {
visibleBounds = intersection; visibleBounds = intersection;
if (displayObj.getRotate180()) { if (displayObj.getRotate180()) {
setRotateTransform(displayObj.getWidth() / 2, displayObj.getHeight() / 2, 180); startRotateTransform(displayObj.getWidth() / 2, displayObj.getHeight() / 2, 180);
} }
displayObj.draw(this); displayObj.draw(this);
if (displayObj.getRotate180()) { if (displayObj.getRotate180()) {
clearTransform(); endTransform();
} }
visibleBounds = backup; visibleBounds = backup;
@@ -452,7 +455,7 @@ public class Graphics {
} }
private void startShape(ShapeType shapeType) { private void startShape(ShapeType shapeType) {
if (isTransformed) { if (!transforms.isEmpty()) {
//must copy matrix before starting shape if transformed //must copy matrix before starting shape if transformed
shapeRenderer.setTransformMatrix(batch.getTransformMatrix()); shapeRenderer.setTransformMatrix(batch.getTransformMatrix());
} }
@@ -504,25 +507,22 @@ public class Graphics {
shapeRenderer.setProjectionMatrix(matrix); shapeRenderer.setProjectionMatrix(matrix);
} }
private boolean isTransformed; public void startRotateTransform(float originX, float originY, float rotation) {
public void setRotateTransform(float originX, float originY, float rotation) {
batch.end(); batch.end();
float dx = adjustX(originX); float dx = adjustX(originX);
float dy = adjustY(originY, 0); float dy = adjustY(originY, 0);
transforms.add(new Matrix4(batch.getTransformMatrix())); //backup current transform matrix
batch.getTransformMatrix().translate(dx, dy, 0); batch.getTransformMatrix().translate(dx, dy, 0);
batch.getTransformMatrix().rotate(Vector3.Z, rotation); batch.getTransformMatrix().rotate(Vector3.Z, rotation);
batch.getTransformMatrix().translate(-dx, -dy, 0); batch.getTransformMatrix().translate(-dx, -dy, 0);
batch.begin(); batch.begin();
isTransformed = true;
} }
public void clearTransform() { public void endTransform() {
batch.end(); batch.end();
batch.getTransformMatrix().idt(); batch.getTransformMatrix().set(transforms.pop());
shapeRenderer.setTransformMatrix(batch.getTransformMatrix()); shapeRenderer.setTransformMatrix(batch.getTransformMatrix());
batch.begin(); batch.begin();
isTransformed = false;
} }
public void drawRotatedImage(Texture image, float x, float y, float w, float h, float originX, float originY, float rotation) { public void drawRotatedImage(Texture image, float x, float y, float w, float h, float originX, float originY, float rotation) {

4
forge-gui-mobile/src/forge/toolbox/FCardPanel.java
View File

@@ -90,13 +90,13 @@ public class FCardPanel extends FDisplayObject {
if (tapped) { if (tapped) {
float edgeOffset = w / 2f; float edgeOffset = w / 2f;
g.setRotateTransform(x + edgeOffset, y + h - edgeOffset, tappedAngle); g.startRotateTransform(x + edgeOffset, y + h - edgeOffset, tappedAngle);
} }
CardRenderer.drawCardWithOverlays(g, card, x, y, w, h); CardRenderer.drawCardWithOverlays(g, card, x, y, w, h);
if (tapped) { if (tapped) {
g.clearTransform(); g.endTransform();
} }
} }
} }