checamon/Virtua-Cards
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small changes to clean the code and differenciate between touchdragged and touchcard.

Browse Source
This commit is contained in:
Angel C Monroy
2015-11-23 22:08:36 +00:00
parent bbe2ae3be5
commit c6298f9829
4 changed files with 136 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/src/checamon/games/virtuacards/Card.java
View File

@@ -14,10 +14,11 @@ public class Card {
private TextureRegion card;
private Point position;
private Sprite cardSprite;
private Sprite backSprite;
private float sizeX;
private float sizeY;
private int id;
//private boolean faceUp;
private boolean faceUp;
//private boolean onTable;
//private float orientation;
@@ -43,18 +44,23 @@ public class Card {
this.position = new Point(100f, 100f);
}
public Card(TextureRegion region, int id) {
public Card(TextureRegion region, int id, TextureRegion backRegion) {
this.card = region;
this.cardSprite = new Sprite(region);
this.sizeX = 100f;
this.sizeY = 130f;
this.cardSprite.setSize(sizeX, sizeY);
this.position = new Point(100f, 100f);
this.cardSprite = new Sprite(region);
this.cardSprite.setSize(sizeX, sizeY);
this.cardSprite.setPosition(position.getX(), position.getY());
this.backSprite = new Sprite(backRegion);
this.backSprite.setSize(sizeX, sizeY);
this.backSprite.setPosition(position.getX(), position.getY());
this.id = id;
this.faceUp = false;
}
/*
public void drawCardSprite(SpriteBatch batch,Point point, float sizeX, float sizeY){
this.cardSprite.setPosition(point.getX(), point.getY());
this.cardSprite.setSize(sizeX, sizeY);
@@ -69,10 +75,14 @@ public class Card {
//this.sizeX = sizeX;
//this.sizeY = sizeY;
}
*/
public void drawCardSprite(SpriteBatch batch){
//this.cardSprite.setCenter(this.cardSprite.getX() + 1, this.cardSprite.getY() + 1);
if (faceUp)
this.cardSprite.draw(batch);
else
this.backSprite.draw(batch);
}
public boolean isTouched(float x, float y){
@@ -91,7 +101,12 @@ public class Card {
}
public Rectangle getCardRectangle(){
return this.cardSprite.getBoundingRectangle();
Rectangle r;
if (faceUp)
r = this.cardSprite.getBoundingRectangle();
else
r = this.backSprite.getBoundingRectangle();
return r;
}
public void setSize(float sizeX, float sizeY){
@@ -109,17 +124,21 @@ public class Card {
}
public void setPosition(Point position) {
this.cardSprite.setPosition(position.getX(), position.getY());
this.backSprite.setPosition(position.getX(), position.getY());
this.position.setCoordinates(position.getX(),position.getY());
}
public void setCenter(Point position) {
this.cardSprite.setCenter(position.getX(), position.getY());
this.backSprite.setCenter(position.getX(), position.getY());
this.position.setCoordinates(position.getX(),position.getY());
}
public void toggleFaceUp(){
faceUp = !faceUp;
}
public Sprite getCardSprite() {
return this.cardSprite;
}
@@ -127,4 +146,20 @@ public class Card {
public int getId() {
return id;
}
public boolean isFaceUp() {
return faceUp;
}
public void setFaceUp(boolean faceUp) {
this.faceUp = faceUp;
}
public Sprite getBackSprite() {
return backSprite;
}
public void setBackSprite(Sprite backSprite) {
this.backSprite = backSprite;
}
}

79
core/src/checamon/games/virtuacards/Deck.java
View File

@@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -16,6 +17,7 @@ public class Deck {
private ArrayList<Card> cards;
private HashMap<Integer,Integer> drawOrder;
private int numberOfCards;
//private ArrayList<Deck> subdecks;
public Deck(Texture texture) {
try {
@@ -27,7 +29,7 @@ public class Deck {
int index = 0;
for (int i = 0; i < 5; i++) {
for (int j = 0; j < 13; j++){
this.cards.add(index, new Card(cc[i][j], index));
this.cards.add(index, new Card(cc[i][j], index, cc[4][2]));
this.drawOrder.put(index, -1);
index++;
}
@@ -141,10 +143,79 @@ public class Deck {
return cardResult;
}
public Card getTouchedCard(float x, float y, int top){
Card cardResult = null;
int i = top;
boolean exit = false;
while (i >= 0 && !exit){
if (drawOrder.get(i) > -1 && cards.get(drawOrder.get(i)).isTouched(x, y)) {
cardResult = cards.get(drawOrder.get(i));
exit = true;
}else{
i--;
}
}
return cardResult;
}
private void setCardDrawOrderOnTop(int index){
int replace = drawOrder.get(numberOfCards);
drawOrder.put(numberOfCards,drawOrder.get(index));
drawOrder.put(index, replace);
int i = index;
int next = 0;
int replace = drawOrder.get(index);;
while (i <= numberOfCards){
if (i < numberOfCards) {
next = drawOrder.get(i + 1);
drawOrder.put(i,next);
i++;
}else{
drawOrder.put(i,replace);
i++;
}
}
}
private void setRandomCardDraw(ArrayList<Integer> subDeck){
ArrayList<Integer> originalOrder = (ArrayList<Integer>) subDeck.clone();
Collections.shuffle(subDeck);
Integer replace;
for (int i = 0; i < originalOrder.size(); i++){
replace = drawOrder.get(originalOrder.get(i));
drawOrder.put(originalOrder.get(i),drawOrder.get(subDeck.get(i)));
if (i < originalOrder.size() - 1)
drawOrder.put(subDeck.get(i),replace);
}
}
public void shuffle(float x, float y){
ArrayList<Integer> subDeck = new ArrayList<Integer>();
Card c;
int top = numberOfCards - 1;
int i = numberOfCards - 1;
int index = 0;
boolean exit = false;
while (i >= 0 && !exit){
c = this.getTouchedCard(x,y,top);
if (c == null)
exit = true;
else{
subDeck.add(index,c.getId());
top = c.getId() - 1;
index++;
}
}
if (!subDeck.isEmpty()){
setRandomCardDraw(subDeck);
}
}
public HashMap<Integer,Integer> getDrawOrder() {

12
core/src/checamon/games/virtuacards/Point.java
View File

@@ -35,19 +35,19 @@ public class Point {
return result;
}
public boolean insideRightSquare(float deltaX, float deltaY)
public boolean insideRightSquare(float deltaX, float deltaY, float originalY)
{
boolean result = false;
if (x <= x + deltaX && y <= y + (deltaY/2) && y > y - (deltaY/2))
if (x <= x + deltaX && y <= originalY + (deltaY/2) && y > originalY - (deltaY/2))
result = true;
return result;
}
public boolean insideLeftSquare(float deltaX, float deltaY)
public boolean insideLeftSquare(float deltaX, float deltaY, float originalY)
{
boolean result = false;
if (x >= x - deltaX && y <= y + (deltaY/2) && y > y - (deltaY/2))
if (x >= x - deltaX && y <= originalY + (deltaY/2) && y > originalY - (deltaY/2))
result = true;
return result;
@@ -69,7 +69,7 @@ public class Point {
if (direction == 0)
direction++; // Always 1 when going to the right
if (!p.insideRightSquare(deltaX,deltaY) || direction > 1) //Already changed direction to the left and now has come back to the right or outside the range
if (!p.insideRightSquare(deltaX,deltaY, points.get(0).getY()) || direction > 1) //Already changed direction to the left and now has come back to the right or outside the range
{
result = false;
break;
@@ -79,7 +79,7 @@ public class Point {
if (direction == 1)
direction++; // Always 2 when going to the left
if (!p.insideLeftSquare(deltaX, deltaY) || direction == 0 || direction > 2) //Already changed direction several times or has started going left or outside range
if (!p.insideLeftSquare(deltaX, deltaY, points.get(0).getY()) || direction == 0 || direction > 2) //Already changed direction several times or has started going left or outside range
{
result = false;
break;

17
core/src/checamon/games/virtuacards/VirtuaCards.java
View File

@@ -30,9 +30,13 @@ public class VirtuaCards extends ApplicationAdapter implements InputProcessor {
fullDeck = new Deck(new Texture("full_french_deck.png"));
//init drawn cards
fullDeck.getDrawOrder().put(0,11);
fullDeck.getDrawOrder().put(1,2);
fullDeck.getCards().get(2).setPosition(new Point (200f,300f));
for (int i = 0; i <= 53; i++)
fullDeck.getDrawOrder().put(i,i);
fullDeck.getCards().get(52).setPosition(new Point(300f,100f));
fullDeck.shuffle(110f, 110f);
}
@Override
@@ -127,6 +131,7 @@ public class VirtuaCards extends ApplicationAdapter implements InputProcessor {
dragBuffer.clear();
cardCounter = 0;
return true;
}
@@ -140,8 +145,10 @@ public class VirtuaCards extends ApplicationAdapter implements InputProcessor {
@Override
public boolean touchUp(int screenX, int screenY, int pointer, int button) {
//if (Point.pointListInsideDoubleTouchedDrag(dragBuffer, 75, 50) && dragCounter > 0)
if (Point.pointListInsideDoubleTouchedDrag(dragBuffer, 75, 120) && dragCounter > 0) { //flip card
//fullDeck.getCards().get(52).setFaceUp(true);
fullDeck.getTouchedDraggedCard(screenX, Gdx.graphics.getHeight() - screenY).toggleFaceUp();
}
dragCounter = 0;
dragBuffer.clear();
cardCounter = 0;