sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update passing parameters from test chooser to test activity/fragment.

Browse Source
This commit is contained in:
iwgeric 2016-04-29 17:21:38 -04:00
parent c04e162c2c
commit dea0f5fd6d
5 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
jme3-android-examples/build.gradle
View File

@ -25,16 +25,14 @@ android {
}
}
// sourceSets {
// main.java.srcDirs += ['../jme3-examples/src/main/java' exclude 'TestChooser.java']
// }
sourceSets {
main {
java {
srcDir 'src/main/java'
// srcDir '../jme3-examples/src/main/java'
// exclude '**/TestChooser.java'
// exclude '**/awt/**'
}
assets {
srcDir 'src/assets'
srcDir '../jme3-testdata/src/main/resources'
}
}
}
@ -55,29 +53,4 @@ dependencies {
compile project(':jme3-niftygui')
compile project(':jme3-plugins')
compile project(':jme3-terrain')
compile project(':jme3-testdata')
// compile project(':jme3-examples')
}
//task copyTestClasses(type: Copy) {
// def sourceDir = file("../jme-examples/src/main/java")
// def outputDir = file("src/main/java")
//
// from sourceDir
// into outputDir
//}
//
//task copyTestResources(type: Copy) {
// def sourceDir = file("../jme-examples/src/main/resources")
// def outputDir = file("src/main/resources")
//
// from sourceDir
// into outputDir
//}
//
//// copy test classes and resources from jme3-examples module
//assembleDebug.dependsOn {
// copyTestClasses
// copyTestResources
//}

5
jme3-android-examples/src/main/java/org/jmonkeyengine/jme3androidexamples/JmeFragment.java
View File

@ -1,6 +1,7 @@
package org.jmonkeyengine.jme3androidexamples;
import android.os.Bundle;
import android.util.Log;
import com.jme3.app.AndroidHarnessFragment;
import java.util.logging.Level;
@ -66,9 +67,13 @@ public class JmeFragment extends AndroidHarnessFragment {
Bundle bundle=getArguments();
appClass = bundle.getString(SELECTED_APP_CLASS);
// Log.d(this.getClass().getSimpleName(), "AppClass: " + appClass);
joystickEventsEnabled = bundle.getBoolean(ENABLE_JOYSTICK_EVENTS);
// Log.d(this.getClass().getSimpleName(), "JoystickEventsEnabled: " + joystickEventsEnabled);
keyEventsEnabled = bundle.getBoolean(ENABLE_KEY_EVENTS);
// Log.d(this.getClass().getSimpleName(), "KeyEventsEnabled: " + keyEventsEnabled);
mouseEventsEnabled = bundle.getBoolean(ENABLE_MOUSE_EVENTS);
// Log.d(this.getClass().getSimpleName(), "MouseEventsEnabled: " + mouseEventsEnabled);
super.onCreate(savedInstanceState);
}

24
jme3-android-examples/src/main/java/org/jmonkeyengine/jme3androidexamples/MainActivity.java
View File

@ -213,9 +213,27 @@ public class MainActivity extends Activity implements OnItemClickListener, View.
/* Get selected class, pack it in the intent and start the test app */
Log.i(TAG, "User selected OK for class: " + currentSelection);
Intent intent = new Intent(this, TestActivity.class);
intent.putExtra(SELECTED_APP_CLASS, currentSelection);
intent.putExtra(ENABLE_MOUSE_EVENTS, enableMouseEvents);
intent.putExtra(ENABLE_JOYSTICK_EVENTS, enableJoystickEvents);
// intent.putExtra(SELECTED_APP_CLASS, currentSelection);
// intent.putExtra(ENABLE_MOUSE_EVENTS, enableMouseEvents);
// intent.putExtra(ENABLE_JOYSTICK_EVENTS, enableJoystickEvents);
// intent.putExtra(ENABLE_KEY_EVENTS, enableKeyEvents);
Bundle args = new Bundle();
args.putString(MainActivity.SELECTED_APP_CLASS, currentSelection);
// Log.d(this.getClass().getSimpleName(), "AppClass="+currentSelection);
args.putBoolean(MainActivity.ENABLE_MOUSE_EVENTS, enableMouseEvents);
// Log.d(TestActivity.class.getSimpleName(), "MouseEnabled="+enableMouseEvents);
args.putBoolean(MainActivity.ENABLE_JOYSTICK_EVENTS, enableJoystickEvents);
// Log.d(TestActivity.class.getSimpleName(), "JoystickEnabled="+enableJoystickEvents);
args.putBoolean(MainActivity.ENABLE_KEY_EVENTS, enableKeyEvents);
// Log.d(TestActivity.class.getSimpleName(), "KeyEnabled="+enableKeyEvents);
intent.putExtras(args);
startActivity(intent);
} else if (view.equals(btnCancel)) {
/* Exit */

23
jme3-android-examples/src/main/java/org/jmonkeyengine/jme3androidexamples/TestActivity.java
View File

@ -16,21 +16,26 @@ public class TestActivity extends AppCompatActivity {
// Supply index input as an argument.
Bundle args = new Bundle();
String appClass = savedInstanceState.getString(MainActivity.SELECTED_APP_CLASS);
Bundle bundle = savedInstanceState;
if (bundle == null) {
bundle = getIntent().getExtras();
}
String appClass = bundle.getString(MainActivity.SELECTED_APP_CLASS);
args.putString(MainActivity.SELECTED_APP_CLASS, appClass);
Log.d(TestActivity.class.getSimpleName(), "AppClass="+appClass);
// Log.d(TestActivity.class.getSimpleName(), "AppClass="+appClass);
boolean mouseEnabled = savedInstanceState.getBoolean(MainActivity.ENABLE_MOUSE_EVENTS, true);
boolean mouseEnabled = bundle.getBoolean(MainActivity.ENABLE_MOUSE_EVENTS, true);
args.putBoolean(MainActivity.ENABLE_MOUSE_EVENTS, mouseEnabled);
Log.d(TestActivity.class.getSimpleName(), "MouseEnabled="+mouseEnabled);
// Log.d(TestActivity.class.getSimpleName(), "MouseEnabled="+mouseEnabled);
boolean joystickEnabled = savedInstanceState.getBoolean(MainActivity.ENABLE_JOYSTICK_EVENTS, true);
boolean joystickEnabled = bundle.getBoolean(MainActivity.ENABLE_JOYSTICK_EVENTS, true);
args.putBoolean(MainActivity.ENABLE_JOYSTICK_EVENTS, joystickEnabled);
Log.d(TestActivity.class.getSimpleName(), "JoystickEnabled="+joystickEnabled);
// Log.d(TestActivity.class.getSimpleName(), "JoystickEnabled="+joystickEnabled);
boolean keyEnabled = savedInstanceState.getBoolean(MainActivity.ENABLE_KEY_EVENTS, true);
boolean keyEnabled = bundle.getBoolean(MainActivity.ENABLE_KEY_EVENTS, true);
args.putBoolean(MainActivity.ENABLE_KEY_EVENTS, keyEnabled);
Log.d(TestActivity.class.getSimpleName(), "KeyEnabled="+keyEnabled);
// Log.d(TestActivity.class.getSimpleName(), "KeyEnabled="+keyEnabled);
fragment.setArguments(args);
@ -39,7 +44,7 @@ public class TestActivity extends AppCompatActivity {
// Replace whatever is in the fragment_container view with this fragment,
// and add the transaction to the back stack so the user can navigate back
transaction.replace(R.id.jMEFragment, fragment);
transaction.add(R.id.fragmentContainer, fragment);
transaction.addToBackStack(null);
// Commit the transaction

3
jme3-android-examples/src/main/res/layout/activity_test.xml
View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
@ -9,6 +10,7 @@
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="org.jmonkeyengine.jme3androidexamples.TestActivity">
<!--
<fragment
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -17,5 +19,6 @@
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"/>
-->
</RelativeLayout>