Merge branch 'master' into processing4

Author: codeanticode

core/src/processing/android/PFragment.java

@@ -219,7 +219,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
   }
 
   @Override
-  public boolean onOptionsItemSelected(MenuItem item){
+  public boolean onOptionsItemSelected(MenuItem item) {
     if (sketch != null) return sketch.onOptionsItemSelected(item);
     return super.onOptionsItemSelected(item);
   }

core/src/processing/android/PWatchFaceGLES.java

@@ -173,9 +173,9 @@ public void onCreate(SurfaceHolder surfaceHolder) {
     public EGLConfig chooseEglConfig(EGLDisplay eglDisplay) {
       int[] numEglConfigs = new int[1];
       EGLConfig[] eglConfigs = new EGLConfig[1];
-      if(!EGL14.eglChooseConfig(eglDisplay, CONFIG_ATTRIB_LIST, 0, eglConfigs, 0, eglConfigs.length, numEglConfigs, 0)) {
+      if (!EGL14.eglChooseConfig(eglDisplay, CONFIG_ATTRIB_LIST, 0, eglConfigs, 0, eglConfigs.length, numEglConfigs, 0)) {
         throw new RuntimeException("eglChooseConfig failed");
-      } else if(numEglConfigs[0] == 0) {
+      } else if (numEglConfigs[0] == 0) {
         throw new RuntimeException("no matching EGL configs");
       } else {
         return eglConfigs[0];

core/src/processing/core/PApplet.java

@@ -6585,7 +6585,7 @@ static final public boolean parseBoolean(float what) {
    * @return true if 'what' is "true" or "TRUE", false otherwise
    */
   static final public boolean parseBoolean(String what) {
-    return new Boolean(what).booleanValue();
+    return Boolean.valueOf(what);
   }
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
@@ -6643,7 +6643,7 @@ static final public boolean[] parseBoolean(float what[]) {
   static final public boolean[] parseBoolean(String what[]) {
     boolean outgoing[] = new boolean[what.length];
     for (int i = 0; i < what.length; i++) {
-      outgoing[i] = new Boolean(what[i]).booleanValue();
+      outgoing[i] = Boolean.valueOf(what[i]);
     }
     return outgoing;
   }
@@ -6932,7 +6932,7 @@ static final public float parseFloat(String what) {
 
   static final public float parseFloat(String what, float otherwise) {
     try {
-      return new Float(what).floatValue();
+      return Float.valueOf(what);
     } catch (NumberFormatException e) { }
 
     return otherwise;
@@ -6982,7 +6982,7 @@ static final public float[] parseFloat(String what[], float missing) {
     float output[] = new float[what.length];
     for (int i = 0; i < what.length; i++) {
       try {
-        output[i] = new Float(what[i]).floatValue();
+        output[i] = Float.valueOf(what[i]);
       } catch (NumberFormatException e) {
         output[i] = missing;
       }

core/src/processing/core/PShapeOBJ.java

@@ -358,7 +358,7 @@ static protected void parseMTL(PApplet parent, String path,
             // Starting new material.
             String mtlname = parts[1];
             currentMtl = new OBJMaterial(mtlname);
-            materialsHash.put(mtlname, new Integer(materials.size()));
+            materialsHash.put(mtlname, Integer.valueOf(materials.size()));
             materials.add(currentMtl);
           } else if (parts[0].equals("map_Kd") && parts.length > 1) {
             // Loading texture map.

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -4413,7 +4413,7 @@ static protected void invScale(PMatrix3D matrix, float x, float y, float z) {
 
 
   static protected void invScale(PMatrix2D matrix, float x, float y) {
-    matrix.preApply(1/x, 0, 0, 1/y, 0, 0);
+    matrix.preApply(1/x, 0, 0, 0, 1/y, 0);
   }
 
 
@@ -6774,25 +6774,25 @@ public void copy(PImage src,
     int scrX0, scrX1;
     int scrY0, scrY1;
     if (invX) {
-      scrX0 = dx + dw;
-      scrX1 = dx;
+      scrX0 = (dx + dw) / src.pixelDensity;
+      scrX1 = dx / src.pixelDensity;
     } else {
-      scrX0 = dx;
-      scrX1 = dx + dw;
+      scrX0 = dx / src.pixelDensity;
+      scrX1 = (dx + dw) / src.pixelDensity;
     }
 
     int texX0 = sx;
     int texX1 = sx + sw;
     int texY0, texY1;
     if (invY) {
-      scrY0 = height - (dy + dh);
-      scrY1 = height - dy;
+      scrY0 = height - (dy + dh) / src.pixelDensity;
+      scrY1 = height - dy / src.pixelDensity;
       texY0 = tex.height - (sy + sh);
       texY1 = tex.height - sy;
     } else {
       // Because drawTexture uses bottom-to-top orientation of Y axis.
-      scrY0 = height - dy;
-      scrY1 = height - (dy + dh);
+      scrY0 = height - dy / src.pixelDensity;
+      scrY1 = height - (dy + dh) / src.pixelDensity;
       texY0 = sy;
       texY1 = sy + sh;
     }

core/src/processing/opengl/PShapeOpenGL.java

@@ -1251,7 +1251,11 @@ public void translate(float tx, float ty, float tz) {
 
   @Override
   public void rotate(float angle) {
-    transform(ROTATE, angle);
+    if (is3D) {
+      transform(ROTATE, angle, 0, 0, 1);
+    } else {
+      transform(ROTATE, angle);
+    }
   }
 
 

mode/languages/mode.properties

@@ -13,6 +13,7 @@
 
 menu.file.export_signed_package = Export Signed Package
 menu.file.export_android_project = Export Android Project
+menu.file.export_signed_bundle = Export Signed Bundle
 
 # | File | Edit | Sketch | Android | Tools | Help |
 #                        | Android |
@@ -61,8 +62,11 @@ android_editor.status.exporting_project = Exporting an Android project of the sk
 android_editor.status.project_export_completed = Done with project export.
 android_editor.status.project_export_failed = Error with project export.
 android_editor.status.exporting_package = Exporting signed package...
+android_editor.status.exporting_bundle = Exporting signed bundle...
 android_editor.status.package_export_completed = Done with package export.
+android_editor.status.bundle_export_completed = Done with bundle export.
 android_editor.status.package_export_failed = Error with package export.
+android_editor.status.bundle_export_failed = Error with bundle export.
 android_editor.error.cannot_create_sketch_properties = Error While creating sketch properties file "%s": %s
 
 # ---------------------------------------
@@ -84,8 +88,10 @@ android_mode.dialog.wallpaper_installed_body = Processing just built and install
 android_mode.dialog.watchface_installed_title = Watch face installed!
 android_mode.dialog.watchface_installed_body = Processing just built and installed your sketch as a watch face on the selected device.<br><br>You need to add it as a favourite watch face on the device and then select it from the watch face picker in order to run it.
 android_mode.dialog.cannot_export_package_title = Cannot export package...
+android_mode.dialog.cannot_export_bundle_title = Cannot export bundle...
 android_mode.dialog.cannot_export_package_body = The sketch still has the default package name. Not good, since this name will uniquely identify your app on the Play store... for ever! Come up with a different package name and write in the AndroidManifest.xml file in the sketch folder, after the "package=" attribute inside the manifest tag, which also contains version code and name. Once you have done that, try exporting the sketch again.<br><br>For more info on distributing apps from Processing,<br>check <a href=\"%s\">this online tutorial</a>.
 android_mode.dialog.cannot_use_default_icons_title = Cannot export package...
+android_mode.dialog.cannot_use_default_icons_title_bundle = Cannot export bundle...
 android_mode.dialog.cannot_use_default_icons_body = The sketch does not include all required app icons. Processing could use its default set of Android icons, which are okay to test the app on your device, but a bad idea to distribute it on the Play store. Create a full set of unique icons for your app, and copy them into the sketch folder. Once you have done that, try exporting the sketch again.<br><br>For more info on distributing apps from Processing,<br>check <a href=\"%s\">this online tutorial</a>.
 android_mode.warn.cannot_load_sdk_title = Bad news...
 android_mode.warn.cannot_load_sdk_body = The Android SDK could not be loaded.\nThe Android Mode will be disabled.

mode/languages/mode_ko.properties

@@ -13,6 +13,7 @@
 
 menu.file.export_signed_package = 서명 된 패키지 내보내기
 menu.file.export_android_project = 안드로이드 프로젝트 내보내기
+menu.file.export_signed_bundle = 안드로이드 번들 내보내기
 
 # | File | Edit | Sketch | Android | Tools | Help |
 #                        | Android |
@@ -27,4 +28,4 @@ menu.android.ar = AR
 menu.android.devices = 장치들
 menu.android.devices.no_connected_devices = 연결된 기기 없음
 menu.android.sdk_updater = SDK 업데이터
-menu.android.reset_adb = ADB 재설정
+menu.android.reset_adb = ADB 재설정

mode/mode.properties

@@ -1,10 +1,11 @@
-name = Android Mode
+name = Android Mode for Processing 4
 authorList = [The Processing Foundation](https://processingfoundation.org/)
 url = http://android.processing.org
-sentence = Create projects with Processing for Android devices
-paragraph = This version of the Android Mode is for Processing 4.0+
+sentence = This mode lets you use Processing to create Android apps
+paragraph =
 imports=processing.mode.java.JavaMode
-version = 401
-prettyVersion = 4.5.0a2
+version = 402
+prettyVersion = 4.5.0b1
 minRevision = 1276
 maxRevision = 0
+