Update fork

.gitignore

@@ -2,6 +2,7 @@
 **/.classpath
 **/.settings
 **/.project
+**/.vscode
 **/out/
 /.gradle/
 /.nb-gradle/
@@ -18,12 +19,15 @@
 *.jnilib
 *.dylib
 *.iml
+*.class
+*.jtxt
 .gradletasknamecache
 .DS_Store
 /jme3-core/src/main/resources/com/jme3/system/version.properties
 /jme3-*/build/
+/jme3-*/bin/
 /jme3-bullet-native/bullet3.zip
-/jme3-bullet-native/bullet3-2.86.1/
+/jme3-bullet-native/bullet3-*/
 /jme3-bullet-native/src/native/cpp/com_jme3_bullet_*.h
 /jme3-android-native/openal-soft/
 /jme3-android-native/OpenALSoft.zip
@@ -38,9 +42,11 @@
 !/jme3-bullet-native/libs/native/osx/x86_64/libbulletjme.dylib
 !/jme3-bullet-native/libs/native/linux/x86/libbulletjme.so
 !/jme3-bullet-native/libs/native/linux/x86_64/libbulletjme.so
+/jme3-examples/private/
 !/jme3-vr/src/main/resources/**/*.dylib
 !/jme3-vr/src/main/resources/**/*.so
 !/jme3-vr/src/main/resources/**/*.so.dbg
 !/jme3-vr/src/main/resources/**/*.dll
 !/jme3-vr/src/main/resources/**/*.pdb
 /buildMaven.bat
+

.travis.yml

@@ -4,17 +4,18 @@ sudo: true
 branches:
   only:
   - master
-  - v3.1
-  - /^v3.2.0-.*$/
+  - /^v3.3.*$/
+  - v3.2
+  - /^v3.2.*$/
 
 matrix:
   include:
   - os: linux
     jdk: oraclejdk8
     env: UPLOAD=true UPLOAD_NATIVE=true
   - os: linux
-    jdk: openjdk7
-    dist: precise
+    jdk: openjdk11
+    dist: xenial
   - os: osx
     osx_image: xcode9.3
     env: UPLOAD_NATIVE=true
@@ -73,7 +74,6 @@ deploy:
     repo: jMonkeyEngine/jmonkeyengine
     tags: true
 
-
 # before_install:
   # required libs for android build tools
   # sudo apt-get update
@@ -82,6 +82,4 @@ deploy:
   # newest Android NDK
   # wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin -O ndk.bin
   # 7z x ndk.bin -y > /dev/null
-  # export ANDROID_NDK=`pwd`/android-ndk-r10c
-
-
+  # export ANDROID_NDK=`pwd`/android-ndk-r10c

README.md

@@ -3,7 +3,7 @@ jMonkeyEngine
 
 [![Build Status](https://travis-ci.org/jMonkeyEngine/jmonkeyengine.svg?branch=master)](https://travis-ci.org/jMonkeyEngine/jmonkeyengine)
 
-jMonkeyEngine is a 3D game engine for adventurous Java developers. It’s open-source, cross-platform, and cutting-edge. 3.2.0 is the latest stable version of the jMonkeyEngine 3 SDK, a complete game development suite. We'll release 3.2.x updates until the major 3.3 release arrives.
+jMonkeyEngine is a 3D game engine for adventurous Java developers. It’s open-source, cross-platform, and cutting-edge. 3.2.2 is the latest stable version of the jMonkeyEngine 3 SDK, a complete game development suite. We'll release 3.2.x updates until the major 3.3 release arrives.
 
 The engine is used by several commercial game studios and computer-science courses. Here's a taste:
 
@@ -15,12 +15,13 @@ The engine is used by several commercial game studios and computer-science cours
  - [Copod](http://herebeben.com/copod)
  - [Attack of the Gelatinous Blob](http://attackofthegelatinousblob.com/)
  - [Chaos](http://4realms.net/)
- - [Mythruna](https://mythruna.com/)
+ - [Mythruna](http://mythruna.com/)
  - [PirateHell](http://www.desura.com/games/piratehell)
  - [3089 (on steam)](http://store.steampowered.com/app/263360/)
  - [3079 (on steam)](http://store.steampowered.com/app/259620/)
  - [Lightspeed Frontier](http://www.lightspeedfrontier.com/)
  - [Skullstone](http://www.skullstonegame.com/)
+ - [Spoxel](https://store.steampowered.com/app/746880/Spoxel/)
 
 ## Getting started
 

appveyor.yml

@@ -3,10 +3,13 @@ version: 1.0.{build}.{branch}
 branches:
   only:
   - master
+  - v3.2
 
 only_commits:
   files:
     - jme3-bullet-native/
+    - appveyor.yml
+    - gradle.properties
 
 skip_tags: true
 
@@ -34,7 +37,7 @@ build_script:
 cache:
 - C:\Users\appveyor\.gradle\caches
 - C:\Users\appveyor\.gradle\wrapper
-- jme3-bullet-native\bullet3.zip
+- jme3-bullet-native\bullet3.zip -> gradle.properties
 
 test: off
 deploy: off

common.gradle

@@ -8,7 +8,7 @@ apply plugin: 'maven'
 group = 'org.jmonkeyengine'
 version = jmePomVersion
 
-sourceCompatibility = '1.7'
+sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 
 repositories {
@@ -24,7 +24,7 @@ repositories {
 dependencies {
     // Adding dependencies here will add the dependencies to each subproject.
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    testCompile group: 'org.mockito', name: 'mockito-core', version: '2.0.28-beta'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
     testCompile group: 'org.easytesting', name: 'fest-assert-core', version: '2.0M10'
 }
 
@@ -43,6 +43,8 @@ javadoc {
     options.header = "<b>jMonkeyEngine ${jmeMainVersion} ${project.name}</b>"
     options.author = "true"
     options.use = "true"
+    options.charSet = "UTF-8"
+    options.encoding = "UTF-8"
     //disable doclint for JDK8, more quiet output
     if (JavaVersion.current().isJava8Compatible()){
         options.addStringOption('Xdoclint:none', '-quiet')

gradle.properties

@@ -5,7 +5,7 @@ jmeMainVersion = 3.3
 # Version addition pre-alpha-svn, Stable, Beta
 jmeVersionTag = SNAPSHOT
 # Increment this each time jmeVersionTag changes but jmeVersion stays the same
-jmeVersionTagID = 0
+jmeVersionTagID = 2
 
 # specify if JavaDoc should be built
 buildJavaDoc = true
@@ -16,11 +16,11 @@ buildAndroidExamples = false
 
 # Path to android NDK for building native libraries
 #ndkPath=/Users/normenhansen/Documents/Code-Import/android-ndk-r7
-ndkPath = /opt/android-ndk-r10c
+ndkPath = /opt/android-ndk-r16b
 
 # Path for downloading native Bullet
-bulletUrl = https://github.com/bulletphysics/bullet3/archive/2.86.1.zip
-bulletFolder = bullet3-2.86.1
+bulletUrl = https://github.com/bulletphysics/bullet3/archive/2.87.zip
+bulletFolder = bullet3-2.87
 bulletZipFile = bullet3.zip
 
 # POM settings
@@ -38,3 +38,4 @@ POM_INCEPTION_YEAR=2009
 # Bintray settings to override in $HOME/.gradle/gradle.properties or ENV or commandline
 bintray_user=
 bintray_api_key=
+

jme3-android-examples/src/main/java/jme3test/android/TestAndroidResources.java

@@ -1,15 +1,9 @@
 package jme3test.android;
 
 import com.jme3.app.SimpleApplication;
-import com.jme3.light.AmbientLight;
-import com.jme3.light.PointLight;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
-import com.jme3.math.Vector3f;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.shape.Box;
-import com.jme3.scene.shape.Sphere;
-import com.jme3.util.TangentBinormalGenerator;
 
 /**
  * Test case to look for images stored in the Android drawable and mipmap directories.  Image files are

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

@@ -1,16 +1,12 @@
 package org.jmonkeyengine.jme3androidexamples;
 
 import android.os.Bundle;
-import android.util.Log;
 import com.jme3.app.AndroidHarnessFragment;
-
 import java.util.logging.Level;
 import java.util.logging.LogManager;
 
-import static org.jmonkeyengine.jme3androidexamples.MainActivity.*;
-
 /**
- * A placeholder fragment containing a the jME GLSurfaceView.
+ * A placeholder fragment containing a jME GLSurfaceView.
  */
 public class JmeFragment extends AndroidHarnessFragment {
 

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

@@ -1,6 +1,5 @@
 package org.jmonkeyengine.jme3androidexamples;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.os.Bundle;

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

@@ -1,9 +1,8 @@
 package org.jmonkeyengine.jme3androidexamples;
 
 import android.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
-import android.util.Log;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;

jme3-android-native/decode.gradle

@@ -3,6 +3,7 @@ String stbiUrl = 'https://raw.githubusercontent.com/nothings/stb/master/stb_imag
 
 // Working directories for the ndk build.
 String decodeBuildDir = "${buildDir}" + File.separator + 'decode'
+String decodeClassesBuildDir = "${buildDir}" + File.separator + 'decode_classes'
 String decodeBuildJniDir = decodeBuildDir + File.separator + 'jni'
 String decodeBuildLibsDir = decodeBuildDir + File.separator + 'libs'
 
@@ -44,13 +45,20 @@ task copyTremorFiles(type: Copy) {
     into outputDir
 }
 
-// Generate headers via javah
+// Generate headers via javac -h
 task generateJavahHeaders(type: Exec) {
-    executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
-    args '-d', decodeSourceDir
-    args '-classpath', project.projectClassPath
-    args "com.jme3.audio.plugins.NativeVorbisFile"
-    args "com.jme3.texture.plugins.AndroidNativeImageLoader"
+    def files0 = fileTree("src/main/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files1 = fileTree("src/common/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files2 = fileTree("../jme3-core/src/main/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files3 = fileTree("../jme3-core/src/plugins/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files4 = fileTree("../jme3-core/src/tools/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files5 = fileTree("../jme3-terrain/src/main/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def filesList = "\"" + files0.join("\"\n\"") + "\"\n\"" + files1.join("\"\n\"") + "\"\n\"" + files2.join("\"\n\"") + "\"\n\"" + files3.join("\"\n\"") + "\"\n\"" + files4.join("\"\n\"") + "\"\n\"" + files5.join("\"\n\"") + "\""
+	new File("$projectDir/java_classes.jtxt").text = filesList.replaceAll(java.util.regex.Pattern.quote("\\"), java.util.regex.Matcher.quoteReplacement("/"))
+    executable org.gradle.internal.jvm.Jvm.current().getExecutable('javac')
+    args '-h', decodeSourceDir
+    args "@$projectDir/java_classes.jtxt"
+    args '-d', decodeClassesBuildDir
 }
 
 // Copy jME Android native files to jni directory

jme3-android-native/openalsoft.gradle

@@ -9,6 +9,7 @@ String openALSoftFolder = 'openal-soft-e5016f8'
 
 //Working directories for the ndk build.
 String openalsoftBuildDir = "${buildDir}" + File.separator + 'openalsoft'
+String openalsoftClassesBuildDir = "${buildDir}" + File.separator + 'openalsoft_classes'
 String openalsoftBuildJniDir = openalsoftBuildDir + File.separator + 'jni'
 String openalsoftBuildLibsDir = openalsoftBuildDir + File.separator + 'libs'
 
@@ -73,12 +74,18 @@ task copyJmeOpenALSoft(type: Copy, dependsOn:copyOpenALSoft) {
 }
 
 task generateOpenAlSoftHeaders(type:Exec, dependsOn: copyJmeOpenALSoft) {
-    executable org.gradle.internal.jvm.Jvm.current().getExecutable('javah')
-    args '-d', openalsoftJmeAndroidPath
-    args '-classpath', project.projectClassPath
-    args "com.jme3.audio.android.AndroidAL"
-    args "com.jme3.audio.android.AndroidALC"
-    args "com.jme3.audio.android.AndroidEFX"
+    def files0 = fileTree("src/main/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files1 = fileTree("src/common/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files2 = fileTree("../jme3-core/src/main/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files3 = fileTree("../jme3-core/src/plugins/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files4 = fileTree("../jme3-core/src/tools/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def files5 = fileTree("../jme3-terrain/src/main/java/").filter { it.isFile() && it.getName().endsWith(".java") }.files
+    def filesList = "\"" + files0.join("\"\n\"") + "\"\n\"" + files1.join("\"\n\"") + "\"\n\"" + files2.join("\"\n\"") + "\"\n\"" + files3.join("\"\n\"") + "\"\n\"" + files4.join("\"\n\"") + "\"\n\"" + files5.join("\"\n\"") + "\""
+	new File("$projectDir/java_classes.jtxt").text = filesList.replaceAll(java.util.regex.Pattern.quote("\\"), java.util.regex.Matcher.quoteReplacement("/"))
+    executable org.gradle.internal.jvm.Jvm.current().getExecutable('javac')
+    args '-h', openalsoftJmeAndroidPath
+    args "@$projectDir/java_classes.jtxt"
+    args '-d', openalsoftClassesBuildDir
 }
 
 task buildOpenAlSoftNativeLib(type: Exec, dependsOn: generateOpenAlSoftHeaders) {

jme3-android/src/main/java/com/jme3/app/AndroidHarness.java

@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
-import android.content.pm.ActivityInfo;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.NinePatchDrawable;
 import android.opengl.GLSurfaceView;

jme3-android/src/main/java/com/jme3/app/AndroidHarnessFragment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2015 jMonkeyEngine
+ * Copyright (c) 2009-2019 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -125,7 +125,7 @@ public class AndroidHarnessFragment extends Fragment implements
     /**
      * Set the maximum resolution for the surfaceview in either the
      * width or height screen direction depending on the screen size.
-     * If the surfaceview is retangular, the longest side (width or height)
+     * If the surfaceview is rectangular, the longest side (width or height)
      * will have the resolution set to a maximum of maxResolutionDimension.
      * The other direction will be set to a value that maintains the aspect
      * ratio of the surfaceview. </br>
@@ -276,17 +276,17 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     /**
-     * Called by the system to create the View hierchy associated with this
+     * Called by the system to create the View hierarchy associated with this
      * Fragment.  For jME, this is a FrameLayout that contains the GLSurfaceView
      * and an overlaying SplashScreen Image (if used).  The View that is returned
-     * will be placed on the screen within the boundries of the View borders defined
+     * will be placed on the screen within the boundaries of the View borders defined
      * by the Activity's layout parameters for this Fragment.  For jME, we also
      * update the application reference to the new view.
      *
      * @param inflater
      * @param container
      * @param savedInstanceState
-     * @return
+     * @return the new view
      */
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {

jme3-android/src/main/java/com/jme3/app/DefaultAndroidProfiler.java

@@ -135,6 +135,11 @@ public void appStep(AppStep appStep) {
         }
     }
 
+    @Override
+    public void appSubStep(String... additionalInfo) {
+
+    }
+
     public void vpStep(VpStep vpStep, ViewPort vp, RenderQueue.Bucket bucket) {
         if (androidApiLevel >= 18) {
             switch (vpStep) {

jme3-android/src/main/java/com/jme3/app/state/VideoRecorderAppState.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2012 jMonkeyEngine
+ * Copyright (c) 2009-2019 jMonkeyEngine
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -123,7 +123,6 @@ public VideoRecorderAppState(File file) {
      * This constructor allows you to specify the output file of the video as well as the quality
      * @param file the video file
      * @param quality the quality of the jpegs in the video stream (0.0 smallest file - 1.0 largest file)
-     * @param framerate the frame rate of the resulting video, the application will be locked to this framerate
      */
     public VideoRecorderAppState(File file, float quality) {
         this.file = file;

jme3-android/src/main/java/com/jme3/asset/plugins/AndroidLocator.java

@@ -6,7 +6,6 @@
 import com.jme3.system.android.JmeAndroidSystem;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class AndroidLocator implements AssetLocator {

jme3-android/src/main/java/com/jme3/input/android/AndroidGestureProcessor.java

@@ -36,7 +36,6 @@
 import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import com.jme3.input.event.TouchEvent;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**

jme3-android/src/main/java/com/jme3/input/android/AndroidInputHandler.java

@@ -42,7 +42,6 @@
 import com.jme3.input.JoyInput;
 import com.jme3.input.TouchInput;
 import com.jme3.system.AppSettings;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**