Merge pull request #378 from processing/rc1

Merge rc1 branch

Author: codeanticode

.classpath

@@ -5,6 +5,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-app"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing-java"/>
-	<classpathentry kind="lib" path="/processing-java/mode/antlr.jar"/>
+	<classpathentry kind="lib" path="mode/gradle-tooling-api-4.0.jar"/>
 	<classpathentry kind="output" path="core/bin"/>
 </classpath>

build.gradle

@@ -14,14 +14,17 @@ allprojects {
     apply plugin: 'java'
 
     ext.android_platform = "$sdkdir/platforms/android-$sdkver"
+    ext.android_tools_lib = "$sdkdir/platforms/android-$sdkver/tools/lib"
     ext.core_jar_path = "$rootDir/processing-core.zip"
 
     repositories {
         jcenter()
         flatDir dirs: "$rootDir/core/library"
         flatDir dirs: "$rootDir/core/build/libs"
         flatDir dirs: "$rootDir/libraries/vr/library"
+        flatDir dirs: "$sdkdir/tools/lib"        
         flatDir dirs: android_platform
+        flatDir dirs: android_tools_lib
     }
 
     sourceCompatibility = 1.7
@@ -32,9 +35,10 @@ dependencies {
     compile name: 'android'
     compile project(":core")
     compile project(":libraries:vr")
-    compile group: 'org.processing', name: 'core', version: '3.2.3'
-    compile group: 'org.processing', name: 'pde', version: '3.2.3'
-    compile group: 'org.processing', name: 'java-mode', version: '3.2.3'
+    compile group: 'org.processing', name: 'core', version: '3.3.4'
+    compile group: 'org.processing', name: 'pde', version: '3.3.4'
+    compile group: 'org.processing', name: 'java-mode', version: '3.3.4'
+    compile "org.gradle:gradle-tooling-api:4.0"
 }
 
 sourceSets {
@@ -71,13 +75,16 @@ task dist {
 
         Files.copy(file("mode.properties").toPath(),
                    file("$root/mode.properties").toPath(), REPLACE_EXISTING);
+
+        FileUtils.copyDirectory(file("tools/SDKUpdater/tool"), 
+                                file("$root/tools/SDKUpdater/tool"))
+        FileUtils.copyDirectory(file("tools/SDKUpdater/src"), 
+                                file("$root/tools/SDKUpdater/src"))
 
         FileUtils.copyDirectory(file("libraries/vr/examples"), 
                                 file("$root/libraries/vr/examples"))
         FileUtils.copyDirectory(file("libraries/vr/gvrsdk"), 
                                 file("$root/libraries/vr/gvrsdk"))
-        FileUtils.copyDirectory(file("libraries/vr/lib"), 
-                                file("$root/libraries/vr/lib"))    
         FileUtils.copyDirectory(file("libraries/vr/library"), 
                                 file("$root/libraries/vr/library"))
         FileUtils.copyDirectory(file("libraries/vr/src"), 

build.xml

@@ -5,6 +5,9 @@
   <!-- path to the main processing repo --> 
   <property name="processing.dir" value="../processing" />
 
+  <!-- path to the android sdk -->
+  <property name="sdk.dir" value="/Users/andres/code/android/android-studio/sdk" />
+	
   <property name="core.jar.path" value="processing-core.zip" />
   <property name="mode.jar.path" value="mode/AndroidMode.jar" />
   <property name="mode.dist.path" value="release/AndroidMode.zip" />
@@ -28,21 +31,16 @@
     <!-- env used to set classpath below -->
     <property environment="env" />
 
-<!--
-	   classpath="../core/library/core.jar; lib/ant.jar; lib/ant-launcher.jar; lib/antlr.jar; lib/apple.jar; lib/jdt-core.jar; lib/jna.jar; lib/org-netbeans-swing-outline.jar;lib/com.ibm.icu_4.4.2.v20110823.jar;lib/jdi.jar;lib/jdimodel.jar;lib/org.eclipse.osgi_3.8.1.v20120830-144521.jar"
--->
     <javac source="1.7" 
 	   target="1.7" 
 	   destdir="bin" 
 	   encoding="UTF-8" 
 	   includeAntRuntime="false"
  	   classpath="${processing.dir}/core/library/core.jar;
  	              ${processing.dir}/java/mode/JavaMode.jar; 
-      		      ${processing.dir}/java/mode/antlr.jar;
-		            ${processing.dir}/java/mode/org.eclipse.core.runtime.jar;
-                ${processing.dir}/app/pde.jar;
-                ${processing.dir}/app/lib/ant.jar;
-                ${processing.dir}/app/lib/ant-launcher.jar"
+                  ${processing.dir}/java/mode/org.eclipse.core.runtime.jar;
+                  ${processing.dir}/app/pde.jar;
+                  mode/gradle-tooling-api-4.0.jar"
 	   debug="on">
       <src path="src" />
     </javac>
@@ -53,35 +51,10 @@
     <jar basedir="bin" destfile="${mode.jar.path}" />
   </target>
 
- 
-  <!-- now that this is standalone, probably not really needed -->
-<!--
-  <target name="android-dist-check">
--->
-    <!-- ensure that the processing-core.zip file has been built -->
-<!--
-    <available file="${core.jar.path}" 
-	       property="android-core-present" />
--->
-    <!--<echo message="${target.path}/modes/android/processing-core.zip" />-->
-<!--
-    <fail unless="android-core-present" 
-	  message="processing-core.zip was not built, but is required for dist. Install the Android tools, set ANDROID_SDK, and try again." />
-  </target>
--->
-
 
   <target name="dist" depends="build" 
 	  description="Create AndroidMode.zip and AndroidMode.txt">
     <mkdir dir="release" />
-
-<!--  	
-    <copy todir="mode">
-      <fileset dir="core/library">
-	    <include name="*.jar" />
-      </fileset>
-    </copy>
--->
 
     <zip destfile="${mode.dist.path}">
       <zipfileset dir="." prefix="AndroidMode">
@@ -92,6 +65,8 @@
         <include name="examples/**" />
         <include name="icons/**" />
         <include name="theme/**" />
+      	<include name="tools/SDKUpdater/tool/**" />
+        <include name="tools/SDKUpdater/src/**" />      	
         <include name="libraries/vr/library.properties" />        
         <include name="libraries/vr/examples/**" />
         <include name="libraries/vr/gvrsdk/**" />
@@ -112,13 +87,14 @@
 
   <target name="subprojects-clean">
     <subant buildpath="core" target="clean"/>
-    <subant buildpath="libraries/vr" target="clean"/>    
+    <subant buildpath="tools/SDKUpdater" target="clean"/>  	
+    <subant buildpath="libraries/vr" target="clean"/>
   </target>
 
   <target name="subprojects-build">
     <subant buildpath="core" target="build"/>
-    <subant buildpath="libraries/vr" target="build"/>    
+  	<subant buildpath="tools/SDKUpdater" target="build"/>
+    <subant buildpath="libraries/vr" target="build"/>  	
   </target>
-  
 
 </project>

core/src/assets/shaders/LineVert.glsl

@@ -1,7 +1,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2012-16 The Processing Foundation
+  Copyright (c) 2012-17 The Processing Foundation
   Copyright (c) 2004-12 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
@@ -35,53 +35,63 @@ attribute vec4 direction;
 
 varying vec4 vertColor;
 
-vec3 clipToWindow(vec4 clip, vec4 viewport) {
-  vec3 post_div = clip.xyz / clip.w;
-  vec2 xypos = (post_div.xy + vec2(1.0, 1.0)) * 0.5 * viewport.zw;
-  return vec3(xypos, post_div.z * 0.5 + 0.5);
-}
-  
-vec4 windowToClipVector(vec2 window, vec4 viewport, float clip_w) {
-  vec2 xypos = (window / viewport.zw) * 2.0;
-  return vec4(xypos, 0.0, 0.0) * clip_w;
-}  
-  
 void main() {
   vec4 posp = modelviewMatrix * position;
-    
+  vec4 posq = modelviewMatrix * (position + vec4(direction.xyz, 0));
+
   // Moving vertices slightly toward the camera
   // to avoid depth-fighting with the fill triangles.
   // Discussed here:
   // http://www.opengl.org/discussion_boards/ubbthreads.php?ubb=showflat&Number=252848  
   posp.xyz = posp.xyz * scale;
-  vec4 clipp = projectionMatrix * posp;
+  posq.xyz = posq.xyz * scale;
+
+  vec4 p = projectionMatrix * posp;
+  vec4 q = projectionMatrix * posq;
+
+  // formula to convert from clip space (range -1..1) to screen space (range 0..[width or height])
+  // screen_p = (p.xy/p.w + <1,1>) * 0.5 * viewport.zw
+
+  // prevent division by W by transforming the tangent formula (div by 0 causes
+  // the line to disappear, see https://github.com/processing/processing/issues/5183)
+  // t = screen_q - screen_p
+  //
+  // tangent is normalized and we don't care which direction it points to (+-)
+  // t = +- normalize( screen_q - screen_p )
+  // t = +- normalize( (q.xy/q.w+<1,1>)*0.5*viewport.zw - (p.xy/p.w+<1,1>)*0.5*viewport.zw )
+  //
+  // extract common factor, <1,1> - <1,1> cancels out
+  // t = +- normalize( (q.xy/q.w - p.xy/p.w) * 0.5 * viewport.zw )
+  //
+  // convert to common divisor
+  // t = +- normalize( ((q.xy*p.w - p.xy*q.w) / (p.w*q.w)) * 0.5 * viewport.zw )
+  //
+  // remove the common scalar divisor/factor, not needed due to normalize and +-
+  // (keep viewport - can't remove because it has different components for x and y
+  //  and corrects for aspect ratio, see https://github.com/processing/processing/issues/5181)
+  // t = +- normalize( (q.xy*p.w - p.xy*q.w) * viewport.zw )
+
+  vec2 tangent = normalize((q.xy*p.w - p.xy*q.w) * viewport.zw);
+
+  // flip tangent to normal (it's already normalized)
+  vec2 normal = vec2(-tangent.y, tangent.x);
+
   float thickness = direction.w;
-  
-  if (thickness != 0.0) {  
-    vec4 posq = posp + modelviewMatrix * vec4(direction.xyz, 0);
-    posq.xyz = posq.xyz * scale;  
-    vec4 clipq = projectionMatrix * posq; 
-  
-    vec3 window_p = clipToWindow(clipp, viewport); 
-    vec3 window_q = clipToWindow(clipq, viewport); 
-    vec3 tangent = window_q - window_p;
-    
-    vec2 perp = normalize(vec2(-tangent.y, tangent.x));
-    vec2 offset = perp * thickness;
-
-    if (0 < perspective) {
-      // Perspective correction (lines will look thiner as they move away 
-      // from the view position).  
-      gl_Position.xy = clipp.xy + offset.xy;
-      gl_Position.zw = clipp.zw;
-    } else {
-      // No perspective correction.	
-      vec4 offsetp = windowToClipVector(offset, viewport, clipp.w);
-      gl_Position = clipp + offsetp;
-    }    
-  } else {
-    gl_Position = clipp;
-  }
-  
+  vec2 offset = normal * thickness;
+
+  // Perspective ---
+  // convert from world to clip by multiplying with projection scaling factor
+  // to get the right thickness (see https://github.com/processing/processing/issues/5182)
+  // invert Y, projections in Processing invert Y
+  vec2 perspScale = (projectionMatrix * vec4(1, -1, 0, 0)).xy;
+
+  // No Perspective ---
+  // multiply by W (to cancel out division by W later in the pipeline) and
+  // convert from screen to clip (derived from clip to screen above)
+  vec2 noPerspScale = p.w / (0.5 * viewport.zw);
+
+  gl_Position.xy = p.xy + offset.xy * mix(noPerspScale, perspScale, float(perspective > 0));
+  gl_Position.zw = p.zw;
+
   vertColor = color;
 }

core/src/assets/shaders/PointVert.glsl

@@ -1,7 +1,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2012-16 The Processing Foundation
+  Copyright (c) 2012-17 The Processing Foundation
   Copyright (c) 2004-12 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
@@ -32,24 +32,25 @@ attribute vec2 offset;
 
 varying vec4 vertColor;
 
-vec4 windowToClipVector(vec2 window, vec4 viewport, float clipw) {
-  vec2 xypos = (window / viewport.zw) * 2.0;
-  return vec4(xypos, 0.0, 0.0) * clipw;
-}  
-
 void main() {
   vec4 pos = modelviewMatrix * position;
   vec4 clip = projectionMatrix * pos;
-  
-  if (0 < perspective) {
-    // Perspective correction (points will look thiner as they move away 
-    // from the view position).
-    gl_Position = clip + projectionMatrix * vec4(offset.xy, 0, 0);
-  } else {
-    // No perspective correction.	
-    vec4 cloff = windowToClipVector(offset.xy, viewport, clip.w);
-    gl_Position = clip + cloff;
-  }
+
+  // Perspective ---
+  // convert from world to clip by multiplying with projection scaling factor
+  // invert Y, projections in Processing invert Y
+  vec2 perspScale = (projectionMatrix * vec4(1, -1, 0, 0)).xy;
+
+  // formula to convert from clip space (range -1..1) to screen space (range 0..[width or height])
+  // screen_p = (p.xy/p.w + <1,1>) * 0.5 * viewport.zw
+
+  // No Perspective ---
+  // multiply by W (to cancel out division by W later in the pipeline) and
+  // convert from screen to clip (derived from clip to screen above)
+  vec2 noPerspScale = clip.w / (0.5 * viewport.zw);
+
+  gl_Position.xy = clip.xy + offset.xy * mix(noPerspScale, perspScale, float(perspective > 0));
+  gl_Position.zw = clip.zw;
 
   vertColor = color;
 }

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -241,6 +241,8 @@ public void endDraw() {
           if (screen != null) {
             screen.drawBitmap(bitmap, new Matrix(), null);
           }
+        } catch (Exception e) {
+          e.printStackTrace();
         } finally {
           if (screen != null) {
             try {