merge mess

Author: benfry

core/src/processing/opengl/PGLES.java

@@ -1234,7 +1234,7 @@ public void texSubImage2D(int target, int level, int xOffset, int yOffset, int w
 
   @Override
   public void copyTexSubImage2D(int target, int level, int xOffset, int yOffset, int x, int y, int width, int height) {
-    GLES20.glCopyTexSubImage2D(target, level, x, y, xOffset, xOffset, width, height);
+    GLES20.glCopyTexSubImage2D(target, level, x, y, xOffset, yOffset, width, height);
   }
 
   @Override

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -6012,57 +6012,73 @@ protected void blendModeImpl() {
 
     } else if (blendMode == BLEND) {
       if (blendEqSupported) {
-        pgl.blendEquation(PGL.FUNC_ADD);
+        pgl.blendEquationSeparate(PGL.FUNC_ADD,
+                                  PGL.FUNC_ADD);
       }
-      pgl.blendFunc(PGL.SRC_ALPHA, PGL.ONE_MINUS_SRC_ALPHA);
+      pgl.blendFuncSeparate(PGL.SRC_ALPHA, PGL.ONE_MINUS_SRC_ALPHA,
+                            PGL.ONE,       PGL.ONE);
 
     } else if (blendMode == ADD) {
       if (blendEqSupported) {
-        pgl.blendEquation(PGL.FUNC_ADD);
+        pgl.blendEquationSeparate(PGL.FUNC_ADD,
+                                  PGL.FUNC_ADD);
       }
-      pgl.blendFunc(PGL.SRC_ALPHA, PGL.ONE);
+      pgl.blendFuncSeparate(PGL.SRC_ALPHA, PGL.ONE,
+                            PGL.ONE,       PGL.ONE);
 
     } else if (blendMode == SUBTRACT) {
       if (blendEqSupported) {
-        pgl.blendEquation(PGL.FUNC_REVERSE_SUBTRACT);
-        pgl.blendFunc(PGL.ONE, PGL.SRC_ALPHA);
+        pgl.blendEquationSeparate(PGL.FUNC_REVERSE_SUBTRACT,
+                                  PGL.FUNC_ADD);
+        pgl.blendFuncSeparate(PGL.SRC_ALPHA, PGL.ONE,
+                              PGL.ONE,       PGL.ONE);
       } else {
         PGraphics.showWarning(BLEND_DRIVER_ERROR, "SUBTRACT");
       }
 
     } else if (blendMode == LIGHTEST) {
       if (blendEqSupported) {
-        pgl.blendEquation(PGL.FUNC_MAX);
-        pgl.blendFunc(PGL.SRC_ALPHA, PGL.DST_ALPHA);
+        pgl.blendEquationSeparate(PGL.FUNC_MAX,
+                                  PGL.FUNC_ADD);
+        pgl.blendFuncSeparate(PGL.ONE, PGL.ONE,
+                              PGL.ONE, PGL.ONE);
       } else {
         PGraphics.showWarning(BLEND_DRIVER_ERROR, "LIGHTEST");
       }
 
     } else if (blendMode == DARKEST) {
       if (blendEqSupported) {
-        pgl.blendEquation(PGL.FUNC_MIN);
-        pgl.blendFunc(PGL.SRC_ALPHA, PGL.DST_ALPHA);
+        pgl.blendEquationSeparate(PGL.FUNC_MIN,
+                                  PGL.FUNC_ADD);
+        pgl.blendFuncSeparate(PGL.ONE, PGL.ONE,
+                              PGL.ONE, PGL.ONE);
       } else {
         PGraphics.showWarning(BLEND_DRIVER_ERROR, "DARKEST");
       }
 
     } else if (blendMode == EXCLUSION) {
       if (blendEqSupported) {
-        pgl.blendEquation(PGL.FUNC_ADD);
+        pgl.blendEquationSeparate(PGL.FUNC_ADD,
+                                  PGL.FUNC_ADD);
       }
-      pgl.blendFunc(PGL.ONE_MINUS_DST_COLOR, PGL.ONE_MINUS_SRC_COLOR);
+      pgl.blendFuncSeparate(PGL.ONE_MINUS_DST_COLOR, PGL.ONE_MINUS_SRC_COLOR,
+                            PGL.ONE,                 PGL.ONE);
 
     } else if (blendMode == MULTIPLY) {
       if (blendEqSupported) {
-        pgl.blendEquation(PGL.FUNC_ADD);
+        pgl.blendEquationSeparate(PGL.FUNC_ADD,
+                                  PGL.FUNC_ADD);
       }
-      pgl.blendFunc(PGL.DST_COLOR, PGL.SRC_COLOR);
+      pgl.blendFuncSeparate(PGL.ZERO, PGL.SRC_COLOR,
+                            PGL.ONE,  PGL.ONE);
 
     } else if (blendMode == SCREEN) {
       if (blendEqSupported) {
-        pgl.blendEquation(PGL.FUNC_ADD);
+        pgl.blendEquationSeparate(PGL.FUNC_ADD,
+                                  PGL.FUNC_ADD);
       }
-      pgl.blendFunc(PGL.ONE_MINUS_DST_COLOR, PGL.ONE);
+      pgl.blendFuncSeparate(PGL.ONE_MINUS_DST_COLOR, PGL.ONE,
+                            PGL.ONE,                 PGL.ONE);
 
     } else if (blendMode == DIFFERENCE) {
       PGraphics.showWarning(BLEND_RENDERER_ERROR, "DIFFERENCE");

done.txt

@@ -1,3 +1,23 @@
+0232
+X Mismatched API level inside project.properties (Android mode ver. 3)
+X   https://github.com/processing/processing-android/issues/73
+X ecj.jar isn't found properly
+X   https://github.com/processing/processing-android/issues/67
+X   https://github.com/processing/processing-android/pull/76
+
+0228
+X figure out how to build from Eclipse JDI so we can remove tools.jar and javac
+X   https://github.com/processing/processing/issues/1840
+X figure out Android build w/o javac so we can remove tools.jar and javac
+X   also to the p5 repo with just a JRE
+X   remove initRequirements from Base (no longer need JDI)
+X     move this into Android mode?
+X   https://github.com/processing/processing-android/issues/46
+  
+X requires deleting the app before reinstalling
+X   just fix this like the others
+X   https://github.com/processing/processing-android/issues/55
+
 0217 android (released alongside 2.0b9)
 X split Android mode from the rest of the project
 X   build core when building the mode itself

mode.properties

@@ -2,7 +2,8 @@ name = Android Mode
 authorList = [The Processing Foundation](http://android.processing.org/)
 url = https://github.com/processing/processing-android
 sentence = Create projects with Processing for Android devices
-paragraph = Android Mode has been around since Processing 1.5, but we have moved it to a separate download so that it can be developed indepdendently of the PDE and the core.
-download=http://android.processing.org/AndroidMode.zip
-version = 217
-prettyVersion = 217
+paragraph = This version of the Android Mode is for Processing 3.0+
+version = 232
+prettyVersion = 3.0.1
+minRevision = 228
+maxRevision = 0

src/processing/mode/android/AndroidBuild.java

@@ -46,7 +46,7 @@ class AndroidBuild extends JavaBuild {
   static final String basePackage = "processing.test";
   static String sdkName = "2.3.3";
   static String sdkVersion = "10";  // Android 2.3.3 (Gingerbread)
-  static final String sdkTarget = "android-" + sdkVersion;
+  static String sdkTarget = "android-" + sdkVersion;
 
   private final AndroidSDK sdk;
   private final File coreZipFile;
@@ -72,6 +72,7 @@ public AndroidBuild(final Sketch sketch, final AndroidMode mode) {
   public static void setSdkTarget(AndroidSDK.SDKTarget target, Sketch sketch) {
     sdkName = target.name;
     sdkVersion = Integer.toString(target.version);
+    sdkTarget = "android-" + sdkVersion;
 
     Manifest manifest = new Manifest(sketch);
     manifest.setSdkTarget(sdkVersion);
@@ -627,7 +628,7 @@ private void writeBuildXML(final File file, final String projectName) {
     writer.println("       <isset property=\"env.ANDROID_HOME\" />");
     writer.println("  </condition>");
 
-    writer.println("  <property name=\"ecj.jar\" value=\"" + Base.getToolsFolder() + "/../modes/Java/mode/ecj.jar\" />");
+    writer.println("  <property name=\"ecj.jar\" value=\"" + Base.getToolsFolder() + "/../modes/java/mode/ecj.jar\" />");
     writer.println("  <property name=\"build.compiler\" value=\"org.eclipse.jdt.core.JDTCompilerAdapter\" />");
 
     writer.println("  <mkdir dir=\"bin\" />");

todo.txt

@@ -40,12 +40,6 @@ _ temporary files (for sketches and logs) are not deleted
 o   http://code.google.com/p/processing/issues/detail?id=562
 _   https://github.com/processing/processing-android/issues/33
 
-_ requires deleting the app before reinstalling
-_   just fix this like the others
-debug:
-Failure [INSTALL_PARSE_FAILED_INCONSISTENT_CERTIFICATES]
-Shutting down any existing adb server...
-
 _ NullPointerException in AndroidBuild.writeLocalProps(AndroidBuild.java:458)
 _   prompts for SDK, works; then after restart breaks again
 _   also refers to ANDROID_HOME and not ANDROID_SDK..