commit 384c2727fd673241fdd8ae7aa955278cb43d4228 Author: Angel Checa Monroy Date: Mon Nov 23 16:40:24 2015 +0000 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..47454ee --- /dev/null +++ b/.gitignore @@ -0,0 +1,64 @@ +## Java + +*.class +*.war +*.ear +hs_err_pid* + +## GWT +war/ +html/war/gwt_bree/ +html/gwt-unitCache/ +.apt_generated/ +html/war/WEB-INF/deploy/ +html/war/WEB-INF/classes/ +.gwt/ +gwt-unitCache/ +www-test/ +.gwt-tmp/ + +## Android Studio and Intellij and Android in general +android/libs/armeabi/ +android/libs/armeabi-v7a/ +android/libs/x86/ +android/gen/ +.idea/ +*.ipr +*.iws +*.iml +out/ +com_crashlytics_export_strings.xml + +## Eclipse +.classpath +.project +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle + +.gradle +gradle-app.setting +build/ + +## OS Specific +.DS_Store diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml new file mode 100644 index 0000000..5fe0cf1 --- /dev/null +++ b/android/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + diff --git a/android/assets/badlogic.jpg b/android/assets/badlogic.jpg new file mode 100644 index 0000000..4390da6 Binary files /dev/null and b/android/assets/badlogic.jpg differ diff --git a/android/assets/deck1.png b/android/assets/deck1.png new file mode 100644 index 0000000..b0841e9 Binary files /dev/null and b/android/assets/deck1.png differ diff --git a/android/assets/deck1pic.png b/android/assets/deck1pic.png new file mode 100644 index 0000000..584fe2e Binary files /dev/null and b/android/assets/deck1pic.png differ diff --git a/android/assets/full_french_deck.png b/android/assets/full_french_deck.png new file mode 100755 index 0000000..5df8ef0 Binary files /dev/null and b/android/assets/full_french_deck.png differ diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 0000000..fe99207 --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,117 @@ +android { + buildToolsVersion "23.0.1" + compileSdkVersion 21 + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + jniLibs.srcDirs = ['libs'] + } + + instrumentTest.setRoot('tests') + } +} + + +// called every time gradle gets executed, takes the native dependencies of +// the natives configuration, and extracts them to the proper libs/ folders +// so they get packed with the APK. +task copyAndroidNatives() { + file("libs/armeabi/").mkdirs(); + file("libs/armeabi-v7a/").mkdirs(); + file("libs/x86/").mkdirs(); + + configurations.natives.files.each { jar -> + def outputDir = null + if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") + if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") + if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") + if(outputDir != null) { + copy { + from zipTree(jar) + into outputDir + include "*.so" + } + } + } +} + +task run(type: Exec) { + def path + def localProperties = project.file("../local.properties") + if (localProperties.exists()) { + Properties properties = new Properties() + localProperties.withInputStream { instr -> + properties.load(instr) + } + def sdkDir = properties.getProperty('sdk.dir') + if (sdkDir) { + path = sdkDir + } else { + path = "$System.env.ANDROID_HOME" + } + } else { + path = "$System.env.ANDROID_HOME" + } + + def adb = path + "/platform-tools/adb" + commandLine "$adb", 'shell', 'am', 'start', '-n', 'checamon.games.virtuacards.android/checamon.games.virtuacards.android.AndroidLauncher' +} + +// sets up the Android Eclipse project, using the old Ant based build. +eclipse { + // need to specify Java source sets explicitely, SpringSource Gradle Eclipse plugin + // ignores any nodes added in classpath.file.withXml + sourceSets { + main { + java.srcDirs "src", 'gen' + } + } + + jdt { + sourceCompatibility = 1.6 + targetCompatibility = 1.6 + } + + classpath { + plusConfigurations += [ project.configurations.compile ] + containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES' + } + + project { + name = appName + "-android" + natures 'com.android.ide.eclipse.adt.AndroidNature' + buildCommands.clear(); + buildCommand "com.android.ide.eclipse.adt.ResourceManagerBuilder" + buildCommand "com.android.ide.eclipse.adt.PreCompilerBuilder" + buildCommand "org.eclipse.jdt.core.javabuilder" + buildCommand "com.android.ide.eclipse.adt.ApkBuilder" + } +} + +// sets up the Android Idea project, using the old Ant based build. +idea { + module { + sourceDirs += file("src"); + scopes = [ COMPILE: [plus:[project.configurations.compile]]] + + iml { + withXml { + def node = it.asNode() + def builder = NodeBuilder.newInstance(); + builder.current = node; + builder.component(name: "FacetManager") { + facet(type: "android", name: "Android") { + configuration { + option(name: "UPDATE_PROPERTY_FILES", value:"true") + } + } + } + } + } + } +} diff --git a/android/ic_launcher-web.png b/android/ic_launcher-web.png new file mode 100644 index 0000000..1345ede Binary files /dev/null and b/android/ic_launcher-web.png differ diff --git a/android/proguard-project.txt b/android/proguard-project.txt new file mode 100644 index 0000000..b166b1e --- /dev/null +++ b/android/proguard-project.txt @@ -0,0 +1,45 @@ +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +-verbose + +-dontwarn android.support.** +-dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication +-dontwarn com.badlogic.gdx.utils.GdxBuild +-dontwarn com.badlogic.gdx.physics.box2d.utils.Box2DBuild +-dontwarn com.badlogic.gdx.jnigen.BuildTarget* +-dontwarn com.badlogic.gdx.graphics.g2d.freetype.FreetypeBuild + +-keep class com.badlogic.gdx.controllers.android.AndroidControllers + +-keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* { + (com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration); +} + +-keepclassmembers class com.badlogic.gdx.physics.box2d.World { + boolean contactFilter(long, long); + void beginContact(long); + void endContact(long); + void preSolve(long, long); + void postSolve(long, long); + boolean reportFixture(long); + float reportRayFixture(long, float, float, float, float, float); +} diff --git a/android/project.properties b/android/project.properties new file mode 100644 index 0000000..4ab1256 --- /dev/null +++ b/android/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-19 diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..288b665 Binary files /dev/null and b/android/res/drawable-hdpi/ic_launcher.png differ diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..6ae570b Binary files /dev/null and b/android/res/drawable-mdpi/ic_launcher.png differ diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..d4fb7cd Binary files /dev/null and b/android/res/drawable-xhdpi/ic_launcher.png differ diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..85a6081 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-hdpi/ic_launcher.png b/android/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..ac83c1e Binary files /dev/null and b/android/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/res/mipmap-mdpi/ic_launcher.png b/android/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..8e136ba Binary files /dev/null and b/android/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xhdpi/ic_launcher.png b/android/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..5cbaa9d Binary files /dev/null and b/android/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xxhdpi/ic_launcher.png b/android/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..119f524 Binary files /dev/null and b/android/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/res/mipmap-xxxhdpi/ic_launcher.png b/android/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..bc87a1b Binary files /dev/null and b/android/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml new file mode 100644 index 0000000..8ff0dea --- /dev/null +++ b/android/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + Virtua Cards + + diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml new file mode 100644 index 0000000..3f00fc5 --- /dev/null +++ b/android/res/values/styles.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/android/src/checamon/games/virtuacards/android/AndroidLauncher.java b/android/src/checamon/games/virtuacards/android/AndroidLauncher.java new file mode 100644 index 0000000..0636adb --- /dev/null +++ b/android/src/checamon/games/virtuacards/android/AndroidLauncher.java @@ -0,0 +1,20 @@ +package checamon.games.virtuacards.android; + +import android.os.Bundle; +import android.util.Log; + +import com.badlogic.gdx.backends.android.AndroidApplication; +import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; + +import checamon.games.virtuacards.VirtuaCards; + +public class AndroidLauncher extends AndroidApplication { + @Override + protected void onCreate (Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); + initialize(new VirtuaCards(), config); + + Log.e("Error", "Error Test"); + } +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..fe122ec --- /dev/null +++ b/build.gradle @@ -0,0 +1,57 @@ +buildscript { + repositories { + mavenCentral() + maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } + } + dependencies { + classpath 'com.android.tools.build:gradle:1.2.3' + } +} + +allprojects { + apply plugin: "eclipse" + apply plugin: "idea" + + version = '1.0' + ext { + appName = "Virtua Cards" + gdxVersion = '1.7.1' + roboVMVersion = '1.9.0' + box2DLightsVersion = '1.4' + ashleyVersion = '1.6.0' + aiVersion = '1.6.0' + } + + repositories { + mavenCentral() + maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } + maven { url "https://oss.sonatype.org/content/repositories/releases/" } + } +} + +project(":android") { + apply plugin: "android" + + configurations { natives } + + dependencies { + compile project(":core") + compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86" + } +} + +project(":core") { + apply plugin: "java" + + + dependencies { + compile "com.badlogicgames.gdx:gdx:$gdxVersion" + } +} + +tasks.eclipse.doLast { + delete ".project" +} \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle new file mode 100644 index 0000000..03cd1be --- /dev/null +++ b/core/build.gradle @@ -0,0 +1,11 @@ +apply plugin: "java" + +sourceCompatibility = 1.6 +[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' + +sourceSets.main.java.srcDirs = [ "src/" ] + + +eclipse.project { + name = appName + "-core" +} diff --git a/core/src/checamon/games/virtuacards/Card.java b/core/src/checamon/games/virtuacards/Card.java new file mode 100644 index 0000000..76a7d58 --- /dev/null +++ b/core/src/checamon/games/virtuacards/Card.java @@ -0,0 +1,114 @@ +package checamon.games.virtuacards; + +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.Sprite; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import com.badlogic.gdx.math.Rectangle; + + +/** + * Created by angelcheca on 17/11/15. + */ +public class Card { + private TextureRegion card; + private Point position; + private Sprite cardSprite; + private float sizeX; + private float sizeY; + //private boolean faceUp; + //private boolean onTable; + //private float orientation; + + public Card(Texture deckImage, Point p, float sizeX, float sizeY, float u, float v, float u2, float v2) { + + TextureRegion c = new TextureRegion(deckImage,u,v,u2,v2); + this.cardSprite = new Sprite(c); + this.card = c; + this.sizeX = sizeX; + this.sizeY = sizeY; + this.position = p; + this.cardSprite.setPosition(p.getX(),p.getY()); + this.cardSprite.setSize(sizeX,sizeY); + } + + public Card(Texture deckImage, float u, float v, float u2, float v2) { + + TextureRegion c = new TextureRegion(deckImage,u,v,u2,v2); + this.cardSprite = new Sprite(c); + this.card = c; + this.sizeX = 100f; + this.sizeY = 130f; + this.position = new Point(100f, 100f); + } + + public Card(TextureRegion region) { + + 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.setPosition(position.getX(), position.getY()); + } + + public void drawCardSprite(SpriteBatch batch,Point point, float sizeX, float sizeY){ + this.cardSprite.setPosition(point.getX(), point.getY()); + this.cardSprite.setSize(sizeX, sizeY); + this.cardSprite.draw(batch); + //this.position = point; + } + + public void drawCardSprite(SpriteBatch batch, float sizeX, float sizeY){ + this.cardSprite.setPosition(this.position.getX(), this.position.getY()); + this.cardSprite.setSize(sizeX, sizeY); + this.cardSprite.draw(batch); + //this.sizeX = sizeX; + //this.sizeY = sizeY; + } + + public void drawCardSprite(SpriteBatch batch){ + //this.cardSprite.setCenter(this.cardSprite.getX() + 1, this.cardSprite.getY() + 1); + this.cardSprite.draw(batch); + } + + public boolean isTouched(float x, float y){ + Rectangle r = this.getCardRectangle(); + float h = r.getHeight(); + float w = r.getWidth(); + r.setHeight(r.getHeight() * 20); + r.setWidth(r.getWidth() * 20); + + r.setPosition(r.getX() - (r.getWidth() - w)/2, r.getY() - (r.getHeight() - h)/2); + return r.contains(x, y); + } + + public Rectangle getCardRectangle(){ + return this.cardSprite.getBoundingRectangle(); + } + + public void setSize(float sizeX, float sizeY){ + this.sizeX = sizeX; + this.sizeY = sizeY; + } + + public TextureRegion getCard() { + + return card; + } + + public Point getPosition() { + return position; + } + + public void setPosition(Point position) { + + this.cardSprite.setCenter(position.getX(), position.getY()); + this.position.setCoordinates(position.getX(),position.getY()); + } + + public Sprite getCardSprite() { + return this.cardSprite; + } +} diff --git a/core/src/checamon/games/virtuacards/Deck.java b/core/src/checamon/games/virtuacards/Deck.java new file mode 100644 index 0000000..8ab7125 --- /dev/null +++ b/core/src/checamon/games/virtuacards/Deck.java @@ -0,0 +1,123 @@ +package checamon.games.virtuacards; + +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.Sprite; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.graphics.g2d.TextureRegion; + +import java.util.ArrayList; +import java.util.HashMap; + + + +/** + * Created by angelcheca on 17/11/15. + */ +public class Deck { + private ArrayList cards; + private HashMap drawOrder; + private int numberOfCards; + private Sprite result; + + public Deck(Texture texture) { + try { + TextureRegion[][] cc = new TextureRegion(texture).split(texture.getWidth()/13,texture.getHeight()/5); + + + this.cards = new ArrayList(); + this.drawOrder = new HashMap(); + 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])); + this.drawOrder.put(index, -1); + index++; + } + } + + this.numberOfCards = 54; + + }catch (Exception e) + { + e.printStackTrace(); + } + + } + + public ArrayList getCards() { + return cards; + } + + public void drawCard(SpriteBatch batch, int cardIndex, float x, float y, float sizeX, float sizeY){ + try { + batch.draw(cards.get(cardIndex).getCard(),x,y,sizeX, sizeY); + cards.get(cardIndex).setPosition(new Point(x,y)); + }catch (Exception e) + { + e.printStackTrace(); + } + } + + public void drawCards(SpriteBatch batch) + { + boolean exit = false; + Sprite aux; + int i = 0; + while (i < numberOfCards && !exit){ + if (drawOrder.get(i) > -1){ + cards.get(drawOrder.get(i)).drawCardSprite(batch); + i++; + } + else + exit = true; + } + + } + + public boolean isTouchingCard(float x, float y){ + + boolean exit = false; + boolean result = false; + int i = 0; + + while (i < numberOfCards && !exit){ + if (drawOrder.get(i) > -1){ + if (cards.get(drawOrder.get(i)).isTouched(x,y)) { + result = true; + exit = true; + } + i++; + } + else + exit = true; + } + return result; + } + + public Card getTouchedCard(float x, float y){ + + boolean exit = false; + this.result = null; + Card cardResult = null; + int i = 0; + + while (i < numberOfCards && !exit){ + if (drawOrder.get(i) > -1){ + if (cards.get(drawOrder.get(i)).isTouched(x,y)) { + + this.result = cards.get(drawOrder.get(i)).getCardSprite(); + cardResult = cards.get(drawOrder.get(i)); + exit = true; + } + i++; + } + else + exit = true; + } + return cardResult; + } + + public HashMap getDrawOrder() { + return drawOrder; + } +} diff --git a/core/src/checamon/games/virtuacards/Hand.java b/core/src/checamon/games/virtuacards/Hand.java new file mode 100644 index 0000000..d87845f --- /dev/null +++ b/core/src/checamon/games/virtuacards/Hand.java @@ -0,0 +1,7 @@ +package checamon.games.virtuacards; + +/** + * Created by angelcheca on 17/11/15. + */ +public class Hand { +} diff --git a/core/src/checamon/games/virtuacards/Player.java b/core/src/checamon/games/virtuacards/Player.java new file mode 100644 index 0000000..53af3d7 --- /dev/null +++ b/core/src/checamon/games/virtuacards/Player.java @@ -0,0 +1,7 @@ +package checamon.games.virtuacards; + +/** + * Created by angelcheca on 17/11/15. + */ +public class Player { +} diff --git a/core/src/checamon/games/virtuacards/Point.java b/core/src/checamon/games/virtuacards/Point.java new file mode 100644 index 0000000..2aac1ed --- /dev/null +++ b/core/src/checamon/games/virtuacards/Point.java @@ -0,0 +1,101 @@ +package checamon.games.virtuacards; + +import java.util.Iterator; +import java.util.List; + +/** + * Created by angelcheca on 16/11/15. + */ +public class Point { + private float x; + private float y; + + public Point (float xNew, float yNew) + { + x = xNew; + y = yNew; + } + + public float getX () + { + return x; + } + + public float getY () + { + return y; + } + + public boolean insideSquare(int deltaX, int deltaY) + { + boolean result = false; + if (x <= deltaX && y <= deltaY) + result = true; + + return result; + } + + public boolean insideRightSquare(float deltaX, float deltaY) + { + boolean result = false; + if (x <= x + deltaX && y <= y + (deltaY/2) && y > y - (deltaY/2)) + result = true; + + return result; + } + + public boolean insideLeftSquare(float deltaX, float deltaY) + { + boolean result = false; + if (x >= x - deltaX && y <= y + (deltaY/2) && y > y - (deltaY/2)) + result = true; + + return result; + } + + public static boolean pointListInsideDoubleTouchedDrag(List points, float deltaX, float deltaY){ + boolean result = true; + Point p0 = null; + Point p1 = null; + int direction = 0; + for (Iterator it = points.iterator(); it.hasNext();){ + Point p = it.next(); + + if (p1 == null) + p1 = p; + + if (p0 != null) { + if (p.getX() >= p0.getX()) { + 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 + { + result = false; + break; + } + } else + { + 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 + { + result = false; + break; + } + } + } + p0 = p; + } + if (direction < 2) // less than two changes of direction + result = false; + + return result; + } + + public void setCoordinates(float x, float y) { + this.x = x; + this.y = y; + } +} diff --git a/core/src/checamon/games/virtuacards/VirtuaCards.java b/core/src/checamon/games/virtuacards/VirtuaCards.java new file mode 100644 index 0000000..fae3d3b --- /dev/null +++ b/core/src/checamon/games/virtuacards/VirtuaCards.java @@ -0,0 +1,246 @@ +package checamon.games.virtuacards; + + +import com.badlogic.gdx.ApplicationAdapter; +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.InputProcessor; +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.GL20; +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.BitmapFont; +import com.badlogic.gdx.graphics.g2d.Sprite; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.graphics.g2d.TextureRegion; + +import java.util.ArrayList; + + +public class VirtuaCards extends ApplicationAdapter implements InputProcessor { + SpriteBatch batch; + Sprite sprite; + Texture img, deck1; + BitmapFont font; + String debugText; + + TextureRegion deck1region; + TextureRegion[][] regions; + TextureRegion deck2region; + Sprite sprite2; + + private float x, y; + private int dragCounter; + private ArrayList dragBuffer; + private Sprite touchedSprite; + + Deck fullDeck; + Texture deck; + + int cardCounter = 0; + + @Override + public void create () { + batch = new SpriteBatch(); + //img = new Texture("badlogic.jpg"); + deck1 = new Texture("deck1pic.png"); + TextureRegion[][] cc = new TextureRegion(deck1).split(deck1.getWidth()/2,deck1.getHeight()/2); + deck1region = new TextureRegion(cc[0][0]); + deck2region = new TextureRegion(cc[0][1]); + + try { + deck = new Texture("full_french_deck.png"); + } catch (Throwable e) { + e.printStackTrace(); + } + font = new BitmapFont(); + font.setColor(Color.BLUE); + //sprite = new Sprite(deck1); + sprite = new Sprite(deck1region); + + sprite2 = new Sprite(deck2region); + sprite2.setPosition(50f, 50f); + sprite2.scale(-0.75f); + + x = 0; + y = 0; + sprite.setPosition(x, y); + sprite.scale(-0.75f); + + debugText = "LOADING ..."; + if (deck == null) + debugText += " DECK IS NULL"; + dragCounter = 0; + dragBuffer = new ArrayList(); + + fullDeck = new Deck(deck); + touchedSprite = null; + + fullDeck.getDrawOrder().put(0, 13); + } + + @Override + public void render() { + Gdx.gl.glClearColor(0.2f, 0.6f, 0.2f, 0); + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + Gdx.input.setInputProcessor(this); + batch.begin(); + //sprite.draw(batch); + //sprite2.draw(batch); + + fullDeck.drawCards(batch); + +/* + if (touchedSprite != null) + touchedSprite.draw(batch); +*/ + + + //font.draw(batch, debugText, 20, 40); + batch.end(); + + } + + /** + * Called when a finger or the mouse was dragged. + * + * @param screenX + * @param screenY + * @param pointer the pointer for the event. @return whether the input was processed + */ + @Override + public boolean touchDragged(int screenX, int screenY, int pointer) { + //deck + if (fullDeck.isTouchingCard(screenX, Gdx.graphics.getHeight() - screenY)){ + fullDeck.getTouchedCard(screenX, Gdx.graphics.getHeight() - screenY).setPosition(new Point(screenX, Gdx.graphics.getHeight() - screenY)); + /*touchedSprite = fullDeck.getTouchedCard(screenX, Gdx.graphics.getHeight() - screenY).getCardSprite(); + if (touchedSprite != null) + touchedSprite.setCenter(screenX, Gdx.graphics.getHeight() - screenY);*/ + cardCounter++; +/* + debugText = "Card: X=" + String.valueOf(touchedSprite.getX()) + ", Y=" + String.valueOf(touchedSprite.getY()) + + "; Touch X=" + String.valueOf(screenX) + ", Y=" + String.valueOf( Gdx.graphics.getHeight() - screenY) + " DragCounter=" + String.valueOf(dragCounter) + + " DragBuffer Length: " + String.valueOf(dragBuffer.size()) + " Touch Card Counter = " + toString().valueOf(cardCounter); +*/ + } + else if (dragCounter > 0) { + dragCounter = 0; + dragBuffer.clear(); + } + + return true; + } + + + /** + * Called when a key was pressed + * + */ + @Override + public boolean keyDown(int keycode) { + return false; + } + + /** + * Called when a key was released + * + */ + @Override + public boolean keyUp(int keycode) { + return false; + } + + /** + * Called when a key was typed + * + * @param character The character + * @return whether the input was processed + */ + @Override + public boolean keyTyped(char character) { + return false; + } + + /** + * + * @param screenX The x coordinate, origin is in the upper left corner + * @param screenY The y coordinate, origin is in the upper left corner + * @param pointer the pointer for the event. + * @param button the button + * @return whether the input was processed + */ + @Override + public boolean touchDown(int screenX, int screenY, int pointer, int button) { + debugText = "Touch DOWN X=" + String.valueOf(screenX) + ", Y=" + String.valueOf(screenY) + " Image X=" + + String.valueOf(sprite.getX()) + " Y=" + String.valueOf(sprite.getY()) + " DragCounter=" + String.valueOf(dragCounter) + " DragBuffer Length: " + String.valueOf(dragBuffer.size());; + + /*Rectangle r = sprite.getBoundingRectangle(); + + if (r.contains(screenX,Gdx.graphics.getHeight() - screenY)) // It is touching the deck + { + batch.begin(); + sprite.draw(batch); + batch.end(); + } +*/ + + dragCounter = 0; + dragBuffer.clear(); + cardCounter = 0; + + return true; + } + + /** + * + * @param screenX + * @param screenY + * @param pointer the pointer for the event. + * @param button the button @return whether the input was processed + */ + @Override + public boolean touchUp(int screenX, int screenY, int pointer, int button) { + + if (Point.pointListInsideDoubleTouchedDrag(dragBuffer, 75, 50) && dragCounter > 0) + {//double swipe, left/right recognised + debugText = "DoubleSwipe UP X=" + String.valueOf(screenX) + ", Y=" + String.valueOf(screenY) + " Image X=" + + String.valueOf(sprite.getX()) + " Y=" + String.valueOf(sprite.getY()) + " DragCounter=" + String.valueOf(dragCounter) + " DragBuffer Length: " + String.valueOf(dragBuffer.size()); + + //fullDeck.getDrawOrder().put(0, 11); + } + else + { + debugText = "Touch UP X=" + String.valueOf(screenX) + ", Y=" + String.valueOf(screenY) + " Image X=" + + String.valueOf(sprite.getX()) + " Y=" + String.valueOf(sprite.getY()) + " DragCounter=" + String.valueOf(dragCounter) + " DragBuffer Length: " + String.valueOf(dragBuffer.size()); + + } + + dragCounter = 0; + dragBuffer.clear(); + cardCounter = 0; + + return true; + } + + /** + * Called when the mouse was moved without any buttons being pressed. Will not be called on iOS. + * + * @param screenX + * @param screenY + * @return whether the input was processed + */ + @Override + public boolean mouseMoved(int screenX, int screenY) { + return false; + } + + /** + * Called when the mouse wheel was scrolled. Will not be called on iOS. + * + * @param amount the scroll amount, -1 or 1 depending on the direction the wheel was scrolled. + * @return whether the input was processed. + */ + @Override + public boolean scrolled(int amount) { + return false; + } + +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..fa55fd1 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.daemon=true +org.gradle.jvmargs=-Xms128m -Xmx512m +org.gradle.configureondemand=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..b979729 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..59b73af --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Sep 21 13:08:26 CEST 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..aec9973 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..54d7466 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include 'android', 'core' \ No newline at end of file