Skip to content

Commit 20bef75

Browse files
committed
Configure build
1 parent 73ab778 commit 20bef75

File tree

6 files changed

+21
-12
lines changed

6 files changed

+21
-12
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,5 @@
4646
/buildMaven.bat
4747
/blastback_client/build/
4848
/blastback_server/build/
49-
/blastback_server/dist/
49+
/blastback_server/dist/
50+
/blastback_client/dist/

blastback_client/nbproject/build-impl.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ is divided into following sections:
2020
2121
-->
2222
<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="blastback_client-impl">
23+
<import file="assets-impl.xml"/>
2324
<fail message="Please build using Ant 1.8.0 or higher.">
2425
<condition>
2526
<not>
@@ -53,7 +54,7 @@ is divided into following sections:
5354
<property file="nbproject/configs/${config}.properties"/>
5455
<property file="nbproject/project.properties"/>
5556
</target>
56-
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
57+
<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-init-assets" name="-do-init">
5758
<property name="platform.java" value="${java.home}/bin/java"/>
5859
<available file="${manifest.file}" property="manifest.available"/>
5960
<condition property="splashscreen.available">
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
$label=Android Device
2+
$target.clean=clean clean-android
3+
$target.debug=run-android
4+
$target.run=run-android

blastback_client/nbproject/genfiles.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ [email protected]
44
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
55
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
66
nbproject/build-impl.xml.data.CRC32=0d70f6a9
7-
nbproject/build-impl.xml.script.CRC32=2ab46ff3
7+
nbproject/build-impl.xml.script.CRC32=1085eb06
88
nbproject/build-impl.xml.stylesheet.CRC32=[email protected]

blastback_client/nbproject/project.properties

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ annotation.processing.enabled=true
22
annotation.processing.enabled.in.editor=false
33
annotation.processing.processors.list=
44
annotation.processing.run.all.processors=true
5-
application.title=MyGame
6-
application.vendor=MyCompany
5+
application.splash=C:\\Users\\Eryk\\Desktop\\Splash.png
6+
application.title=BLASTBACK
7+
application.vendor=BLASTBACK
78
assets.jar.name=assets.jar
8-
assets.excludes=**/*.j3odata,**/*.mesh,**/*.skeleton,**/*.mesh\.xml,**/*.skeleton\.xml,**/*.scene,**/*.material,**/*.obj,**/*.mtl,**/*.3ds,**/*.dae,**/*.blend,**/*.blend*[0-9]
9+
assets.excludes=**/*.j3odata,**/*.mesh,**/*.skeleton,**/*.mesh.xml,**/*.skeleton.xml,**/*.scene,**/*.material,**/*.obj,**/*.mtl,**/*.3ds,**/*.dae,**/*.blend,**/*.blend*[0-9]
910
assets.folder.name=assets
1011
assets.compress=true
12+
auxiliary.org-netbeans-spi-editor-hints-projects.perProjectHintSettingsFile=nbproject/cfg_hints.xml
1113
build.classes.dir=${build.dir}/classes
1214
build.classes.excludes=**/*.java,**/*.form
1315
# This directory is removed when the project is cleaned:
@@ -79,6 +81,8 @@ jnlp.signed=false
7981
jnlp.signing=
8082
jnlp.signing.alias=
8183
jnlp.signing.keystore=
84+
lwjgl.applet.height=480
85+
lwjgl.applet.width=640
8286
main.class=com.blastback.Main
8387
# Optional override of default Application-Library-Allowable-Codebase attribute identifying the locations where your signed RIA is expected to be found.
8488
manifest.custom.application.library.allowable.codebase=
@@ -91,6 +95,8 @@ manifest.custom.permissions=
9195
meta.inf.dir=${src.dir}/META-INF
9296
manifest.file=MANIFEST.MF
9397
mkdist.disabled=false
98+
mobile.android.package=com.blastback
99+
obfuscate.options=-keep public class * extends com.jme3.app.Application{public *;}\n-keep public class * extends com.jme3.system.JmeSystemDelegate{public *;}\n-keep public class * implements com.jme3.renderer.Renderer{public *;}\n-keep public class * implements com.jme3.asset.AssetLoader{public *;}\n-keep public class * implements com.jme3.asset.AssetLocator{public *;}\n-keep public class * implements de.lessvoid.nifty.screen.ScreenController{public *;}\n-dontwarn\n-dontnote\n
94100
platform.active=default_platform
95101
run.classpath=\
96102
${javac.classpath}:\

blastback_client/src/com/blastback/controls/PlayerMovementControl.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,12 @@
1212
import com.jme3.renderer.ViewPort;
1313
import com.jme3.scene.Spatial;
1414
import com.jme3.scene.control.AbstractControl;
15-
import com.jme3.scene.control.Control;
16-
import com.sun.istack.internal.logging.Logger;
17-
import java.util.Set;
18-
import java.util.logging.Level;
1915

2016
public class PlayerMovementControl extends AbstractControl {
2117

22-
private BulletAppState _appState;
18+
private final BulletAppState _appState;
2319
private CharacterControl _charControl;
24-
private float _speed = 0.1f;
20+
private final float _speed = 0.1f;
2521
private Vector3f _direction = new Vector3f();
2622
private boolean _left = false, _right = false, _up = false, _down = false;
2723

@@ -33,6 +29,7 @@ public PlayerMovementControl(BulletAppState appState) {
3329
* This method is called when the control is added to the spatial, and when
3430
* the control is removed from the spatial (setting a null value). It can be
3531
* used for both initialization and cleanup.
32+
* @param spatial
3633
*/
3734
@Override
3835
public void setSpatial(Spatial spatial) {

0 commit comments

Comments
 (0)