M .hgignore +1 -0
@@ 23,6 23,7 @@ android/libs/armeabi/
android/libs/armeabi-v7a/
android/libs/x86/
android/gen/
+android/.temp/
.idea/
*.ipr
*.iws
M android/build.gradle +34 -13
@@ 1,26 1,26 @@
android {
- buildToolsVersion "22.0.1"
- compileSdkVersion 22
+ buildToolsVersion "23.0.1"
+ compileSdkVersion 23
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
- resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
+ jniLibs.srcDirs = ['libs']
}
instrumentTest.setRoot('tests')
}
+ defaultConfig {
+ applicationId "net.dermetfan.someLibgdxTests"
+ minSdkVersion 8
+ targetSdkVersion 23
+ }
}
-// needed to add JNI shared libraries to APK when compiling on CLI
-tasks.withType(com.android.build.gradle.tasks.PackageApplication) { pkgTask ->
- pkgTask.jniFolders = new HashSet<File>()
- pkgTask.jniFolders.add(new File(projectDir, 'libs'))
-}
// called every time gradle gets executed, takes the native dependencies of
// the natives configuration, and extracts them to the proper libs/ folders
@@ 28,12 28,16 @@ tasks.withType(com.android.build.gradle.
task copyAndroidNatives() {
file("libs/armeabi/").mkdirs();
file("libs/armeabi-v7a/").mkdirs();
+ file("libs/arm64-v8a/").mkdirs();
+ file("libs/x86_64/").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-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
+ 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_64.jar")) outputDir = file("libs/x86_64")
if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
if(outputDir != null) {
copy {
@@ 46,13 50,30 @@ task copyAndroidNatives() {
}
task run(type: Exec) {
- def adb = "$System.env.ANDROID_HOME/platform-tools/adb"
- commandLine "$adb", 'shell', 'am', 'start', '-n', 'net.dermetfan.someLibgdxTests.android/net.dermetfan.someLibgdxTests.android.AndroidLauncher'
+ 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', 'net.dermetfan.someLibgdxTests/net.dermetfan.someLibgdxTests.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
+ // need to specify Java source sets explicitly, SpringSource Gradle Eclipse plugin
// ignores any nodes added in classpath.file.withXml
sourceSets {
main {
@@ 66,7 87,7 @@ eclipse {
}
classpath {
- plusConfigurations += project.configurations.compile
+ plusConfigurations += [ project.configurations.compile ]
containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES'
}
A => android/libs/arm64-v8a/libgdx-box2d.so +0 -0
A => android/libs/arm64-v8a/libgdx-freetype.so +0 -0
A => android/libs/arm64-v8a/libgdx.so +0 -0
M android/libs/armeabi-v7a/libgdx-box2d.so +0 -0
M android/libs/armeabi-v7a/libgdx-freetype.so +0 -0
M android/libs/armeabi-v7a/libgdx.so +0 -0
M android/libs/armeabi/libgdx-box2d.so +0 -0
M android/libs/armeabi/libgdx-freetype.so +0 -0
M android/libs/armeabi/libgdx.so +0 -0
M android/libs/x86/libgdx-box2d.so +0 -0
M android/libs/x86/libgdx-freetype.so +0 -0
M android/libs/x86/libgdx.so +0 -0
A => android/libs/x86_64/libgdx-box2d.so +0 -0
A => android/libs/x86_64/libgdx-freetype.so +0 -0
A => android/libs/x86_64/libgdx.so +0 -0
M build.gradle +98 -93
@@ 1,124 1,129 @@
buildscript {
- repositories {
- mavenCentral()
- maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
- jcenter()
- }
- dependencies {
- classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
- classpath 'com.android.tools.build:gradle:1.2.3'
- classpath 'org.robovm:robovm-gradle-plugin:1.6.0'
- }
+ repositories {
+ mavenCentral()
+ maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+ jcenter()
+ }
+ dependencies {
+ classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
+ classpath 'com.android.tools.build:gradle:1.5.0'
+ classpath 'org.robovm:robovm-gradle-plugin:1.12.0'
+ }
}
allprojects {
- apply plugin: "eclipse"
- apply plugin: "idea"
+ apply plugin: "eclipse"
+ apply plugin: "idea"
- version = '1.0'
- ext {
- appName = 'SomeLibgdxTests'
- gdxVersion = '1.6.4'
- gdxUtilsVersion = '0.13.1'
- roboVMVersion = '1.5.0'
- box2DLightsVersion = '1.3'
- ashleyVersion = '1.3.1'
- aiVersion = '1.5.0'
- kryoNetVersion = '2.22.0-RC1'
- }
+ version = '1.0'
+ ext {
+ appName = "SomeLibgdxTests"
+ gdxVersion = '1.9.2'
+ roboVMVersion = '1.12.0'
+ box2DLightsVersion = '1.4'
+ ashleyVersion = '1.7.0'
+ aiVersion = '1.8.0'
+ gdxUtilsVersion = '0.13.3-SNAPSHOT'
+ kryoNetVersion = '2.22.0-RC1'
+ }
- repositories {
- mavenCentral()
- maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
- maven { url "https://oss.sonatype.org/content/repositories/releases/" }
- }
-
- configurations.all { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' }
+ repositories {
+ mavenCentral()
+ maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+ maven { url "https://oss.sonatype.org/content/repositories/releases/" }
+ }
}
project(":core") {
- apply plugin: "java"
+ apply plugin: "java"
- dependencies {
- compile "com.badlogicgames.gdx:gdx:$gdxVersion"
- compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
- compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
- compile "net.dermetfan.libgdx-utils:libgdx-utils-box2d:$gdxUtilsVersion"
- compile "com.esotericsoftware:kryonet:$kryoNetVersion"
- compile "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"
- compile 'com.github.trixt0r:Spriter:1.1'
- compile fileTree(dir: 'libs', include: '*.jar')
- }
+ dependencies {
+ compile "com.badlogicgames.gdx:gdx:$gdxVersion"
+ compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+ compile "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"
+ compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+ compile "net.dermetfan.libgdx-utils:libgdx-utils:$gdxUtilsVersion"
+ compile "net.dermetfan.libgdx-utils:libgdx-utils-box2d:$gdxUtilsVersion"
+ compile "com.esotericsoftware:kryonet:$kryoNetVersion"
+ // compile 'com.github.trixt0r:Spriter:1.1'
+ compile fileTree(dir: 'libs', include: '*.jar')
+ }
}
project(":desktop") {
- apply plugin: "java"
+ apply plugin: "java"
- dependencies {
- compile project(":core")
- compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
- compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
- compile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
- compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
- compile "com.badlogicgames.gdx:gdx-tools:$gdxVersion"
- }
+ dependencies {
+ compile project(":core")
+ compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion"
+ compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
+ compile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop"
+ compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
+ }
}
project(":android") {
- apply plugin: "android"
+ apply plugin: "android"
- configurations { natives }
+ 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"
- compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
- natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi"
- natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a"
- natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86"
- compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
- natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
- natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
- natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
- }
+ 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-arm64-v8a"
+ natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
+ natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
+ compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion"
+ natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi"
+ natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a"
+ natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-arm64-v8a"
+ natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86"
+ natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86_64"
+ compile "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion"
+ compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
+ natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
+ natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
+ natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
+ natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
+ natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
+ }
}
project(":ios") {
- apply plugin: "java"
- apply plugin: "robovm"
+ apply plugin: "java"
+ apply plugin: "robovm"
- dependencies {
- compile project(":core")
- compile "org.robovm:robovm-rt:${roboVMVersion}"
- compile "org.robovm:robovm-cocoatouch:${roboVMVersion}"
- compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
- compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
- compile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-ios"
- compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
- }
+ dependencies {
+ compile project(":core")
+ compile "org.robovm:robovm-rt:$roboVMVersion"
+ compile "org.robovm:robovm-cocoatouch:$roboVMVersion"
+ compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
+ compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
+ compile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-ios"
+ compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
+ }
}
project(":html") {
- apply plugin: "gwt"
- apply plugin: "war"
+ apply plugin: "gwt"
+ apply plugin: "war"
- dependencies {
- compile project(":core")
- compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
- compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
- compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
- compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion:sources"
- compile "com.badlogicgames.gdx:gdx-box2d-gwt:$gdxVersion:sources"
- compile "net.dermetfan.libgdx-utils:libgdx-utils:$gdxVersion:sources"
- compile "net.dermetfan.libgdx-utils:libgdx-utils-box2d:$gdxVersion:sources"
- compile "net.dermetfan.libgdx-utils:libgdx-utils-box2d-gwt:$gdxVersion:sources"
- compile "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion:sources"
- }
+ dependencies {
+ compile project(":core")
+ compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
+ compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
+ compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
+ compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion:sources"
+ compile "com.badlogicgames.gdx:gdx-box2d-gwt:$gdxVersion:sources"
+ compile "com.badlogicgames.box2dlights:box2dlights:$box2DLightsVersion:sources"
+ compile "net.dermetfan.libgdx-utils:libgdx-utils:$gdxUtilsVersion:sources"
+ compile "net.dermetfan.libgdx-utils:libgdx-utils:$gdxUtilsVersion:sources"
+ compile "net.dermetfan.libgdx-utils:libgdx-utils-box2d:$gdxUtilsVersion:sources"
+ }
}
tasks.eclipse.doLast {
- delete ".project"
+ delete ".project"
}
M core/build.gradle +1 -0
@@ 1,6 1,7 @@
apply plugin: "java"
sourceCompatibility = 1.8
+[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
sourceSets.main.java.srcDirs = ['src', 'straightedge']
M core/src/net/dermetfan/someLibgdxTests/screens/GdxFreetypeExtensionWikiTest.java +11 -5
@@ 9,6 9,7 @@ import com.badlogic.gdx.graphics.GL20;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
+import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
import com.badlogic.gdx.math.MathUtils;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.TimeUtils;
@@ 19,9 20,13 @@ public class GdxFreetypeExtensionWikiTes
private SpriteBatch batch;
private FreeTypeFontGenerator generator;
private BitmapFont font;
- private int fontSize = 12;
+ private FreeTypeFontParameter fontParam = new FreeTypeFontParameter();
private boolean high;
+ {
+ fontParam.size = 12;
+ }
+
@Override
public void render(float delta) {
if(high && TimeUtils.millis() % 7 == 0)
@@ 30,7 35,7 @@ public class GdxFreetypeExtensionWikiTes
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
- String text = "I'm an awesome text generated with the gdx-freetype extension of size " + fontSize + ".\n scroll: change size, r: reset";
+ String text = "I'm an awesome text generated with the gdx-freetype extension of size " + fontParam.size + ".\n scroll: change size, r: reset";
if(high && TimeUtils.millis() % 7 == 0)
font.setColor(MathUtils.random(), MathUtils.random(), MathUtils.random(), 1);
@@ 52,20 57,21 @@ public class GdxFreetypeExtensionWikiTes
batch = new SpriteBatch();
generator = new FreeTypeFontGenerator(Gdx.files.internal(Assets.amiga4everPro2));
- font = generator.generateFont(fontSize);
+ font = generator.generateFont(fontParam);
Gdx.input.setInputProcessor(new InputAdapter() {
@Override
public boolean scrolled(int amount) {
- font = generator.generateFont(fontSize = fontSize + amount < 2 ? 2 : fontSize + amount > 38 ? 38 : fontSize + amount);
+ fontParam.size = fontParam.size + amount < 2 ? 2 : fontParam.size + amount > 38 ? 38 : fontParam.size + amount;
+ font = generator.generateFont(fontParam);
return true;
}
@Override
public boolean keyDown(int keycode) {
if(keycode == Keys.R) {
- fontSize = 12;
+ fontParam.size = 12;
high = false;
} else
high = !high;
M core/src/net/dermetfan/someLibgdxTests/screens/HorizontalScrollPaneWithButtonsTest.java +1 -1
@@ 36,7 36,7 @@ public class HorizontalScrollPaneWithBut
@Override
public void show() {
if(Gdx.app.getType() == ApplicationType.Desktop)
- Gdx.graphics.setDisplayMode(480, 360, false); // just resizing the window to something to show the effect of the ScrollPane (you don't need this at all)
+ Gdx.graphics.setWindowedMode(480, 360); // just resizing the window to something to show the effect of the ScrollPane (you don't need this at all)
stage = new Stage(new FillViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight()));
Gdx.input.setInputProcessor(stage);
M +0 -1
@@ 108,7 108,6 @@ public class Menu extends ScreenAdapter
names.add("KeepWithinTest");
names.add("Box2DChainTest2");
names.add("Box2DRopeTutorial");
names.add("AutopilotRotationTest");
names.add("PlainBox2DMapObjectParserTest");
names.add("RotateSpriteByTouchTest");
names.add("TreeFileChooserTest");
M core/src/net/dermetfan/someLibgdxTests/screens/Profilbearbeiten.java +1 -2
@@ 25,7 25,6 @@ import com.badlogic.gdx.scenes.scene2d.u
import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
import com.badlogic.gdx.utils.viewport.ScreenViewport;
import net.dermetfan.someLibgdxTests.Assets;
-import net.dermetfan.someLibgdxTests.SomeLibgdxTests;
public class Profilbearbeiten implements Screen {
@@ 102,7 101,7 @@ public class Profilbearbeiten implements
table.setBounds(56, 500, Gdx.graphics.getWidth() - 56, Gdx.graphics.getHeight() - 500 - 56);
list = new List(skin);
- list.setItems(new String[] {"one", "two", "three", "and", "so", "on", " and", "even ", "more", "but", "that's", "enough", "dayum"});
+ list.setItems("one", "two", "three", "and", "so", "on", " and", "even ", "more", "but", "that's", "enough", "dayum");
table.add(list).uniformX().expandY().top().left();
stage.addActor(table);
M html/build.gradle +11 -3
@@ 27,10 27,12 @@ task draftRun(type: JettyRunWar) {
task superDev(type: de.richsource.gradle.plugins.gwt.GwtSuperDev) {
dependsOn draftRun
- gwt.modules = gwt.devModules
+ doFirst {
+ gwt.modules = gwt.devModules
+ }
}
-task dist(dependsOn: compileGwt) {
+task dist(dependsOn: [clean, compileGwt]) {
doLast {
file("build/dist").mkdirs()
copy {
@@ 52,9 54,15 @@ draftWar {
from "war"
}
+task addSource << {
+ sourceSets.main.compileClasspath += files(project(':core').sourceSets.main.allJava.srcDirs)
+}
+
+tasks.compileGwt.dependsOn(addSource)
+tasks.draftCompileGwt.dependsOn(addSource)
+
sourceCompatibility = 1.6
sourceSets.main.java.srcDirs = [ "src/" ]
-sourceSets.main.compileClasspath += files(project(':core').sourceSets.main.allJava.srcDirs)
eclipse.project {
M ios/build.gradle +2 -1
@@ 12,7 12,8 @@ launchIPadSimulator.dependsOn build
launchIOSDevice.dependsOn build
createIPA.dependsOn build
+
eclipse.project {
name = appName + "-ios"
natures 'org.robovm.eclipse.RoboVMNature'
-}
No newline at end of file
+}