use renderer setting to choose the correct service for watch faces

Author: codeanticode

src/processing/mode/android/AndroidBuild.java

@@ -39,6 +39,7 @@
 import processing.app.exec.ProcessResult;
 import processing.core.PApplet;
 import processing.mode.java.JavaBuild;
+import processing.mode.java.preproc.SurfaceInfo;
 
 import java.io.*;
 import java.security.Permission;
@@ -175,7 +176,7 @@ public File createProject() throws IOException, SketchException {
     // build the preproc and get to work
     AndroidPreprocessor preproc = new AndroidPreprocessor(sketch, getPackageName());
     // On Android, this init will throw a SketchException if there's a problem with size()
-    preproc.initSketchSize(sketch.getMainProgram());
+    SurfaceInfo info = preproc.initSketchSize(sketch.getMainProgram());
     preproc.initSketchSmooth(sketch.getMainProgram());
 
     sketchClassName = preprocess(srcFolder, manifest.getPackageName(), preproc, false);
@@ -192,9 +193,7 @@ public File createProject() throws IOException, SketchException {
       final File resFolder = new File(tmpFolder, "res");
       writeRes(resFolder, sketchClassName);
 
-
-      writeMainClass(srcFolder);
-
+      writeMainClass(srcFolder, preproc.getRenderer(info.getSettings()));
 
       // new location for SDK Tools 17: /opt/android/tools/proguard/proguard-android.txt
 //      File proguardSrc = new File(sdk.getSdkFolder(), "tools/lib/proguard.cfg");
@@ -969,13 +968,18 @@ private File mkdirs(final File parent, final String name) throws SketchException
   }
 
 
-  private void writeMainClass(final File srcDirectory) {
+  private void writeMainClass(final File srcDirectory, String renderer) {
+    System.out.println("---------------> RENDERER: " + renderer);
     if (publishOption == FRAGMENT) {
       writeFragmentActivity(srcDirectory);
     } else if (publishOption == WALLPAPER) {
       writeWallpaperService(srcDirectory);
     } else if (publishOption == WATCHFACE) {
-      writeWatchfaceService(srcDirectory);
+      if (renderer != null && (renderer.equals("P2D") || renderer.equals("P3D"))) {
+        writeWatchFaceGLESService(srcDirectory);  
+      } else {
+        writeWatchFaceCanvasService(srcDirectory);  
+      }      
     } else if (publishOption == CARDBOARD) {
       writeCardboardActivity(srcDirectory);
     }
@@ -1047,7 +1051,7 @@ private void writeWallpaperService(final File srcDirectory) {
   }
 
 
-  private void writeWatchfaceService(final File srcDirectory) {
+  private void writeWatchFaceGLESService(final File srcDirectory) {
     File mainServiceFile = new File(new File(srcDirectory, manifest.getPackageName().replace(".", "/")),
         "MainService.java");
     final PrintWriter writer = PApplet.createWriter(mainServiceFile);
@@ -1064,6 +1068,25 @@ private void writeWatchfaceService(final File srcDirectory) {
     writer.flush();
     writer.close();  
   }
+
+  
+  private void writeWatchFaceCanvasService(final File srcDirectory) {
+    File mainServiceFile = new File(new File(srcDirectory, manifest.getPackageName().replace(".", "/")),
+        "MainService.java");
+    final PrintWriter writer = PApplet.createWriter(mainServiceFile);
+    writer.println("package " + manifest.getPackageName() +";");    
+    writer.println("import processing.android.PWatchFaceCanvas;");
+    writer.println("import processing.core.PApplet;");
+    writer.println("public class MainService extends PWatchFaceCanvas {");
+    writer.println("    public MainService() {");
+    writer.println("        super();");
+    writer.println("        PApplet sketch = new " + sketchClassName + "();");
+    writer.println("        setSketch(sketch);");
+    writer.println("    }");
+    writer.println("}");
+    writer.flush();
+    writer.close();  
+  }  
 
 
   private void writeCardboardActivity(final File srcDirectory) {

src/processing/mode/android/AndroidPreprocessor.java

@@ -26,9 +26,12 @@
 import java.io.PrintWriter;
 //import java.io.Writer;
 import java.util.List;
+import java.util.regex.MatchResult;
+import java.util.regex.Pattern;
 
 import processing.app.*;
 import processing.core.PApplet;
+import processing.data.StringList;
 import processing.mode.java.preproc.PdePreprocessor;
 //import processing.mode.java.preproc.PreprocessorResult;
 import processing.mode.java.preproc.SurfaceInfo;
@@ -37,8 +40,12 @@
 
 
 public class AndroidPreprocessor extends PdePreprocessor {
-  Sketch sketch;
-  String packageName;
+  static private final Pattern VOID_SETUP_REGEX =
+      Pattern.compile("(?:^|\\s|;)void\\s+setup\\s*\\(", Pattern.MULTILINE);
+  static private final Pattern CLOSING_BRACE = Pattern.compile("\\}");  
+  
+  protected Sketch sketch;
+  protected String packageName;
 
   protected String smoothStatement;
   protected String sketchQuality;
@@ -76,7 +83,84 @@ public SurfaceInfo initSketchSize(String code) throws SketchException {
     sketchRenderer = surfaceInfo.getRenderer();*/
     return surfaceInfo;
   }
+  
+  public String getRenderer(String code) {
+    String uncommented = scrubComments(code);
+    MatchResult setupMatch = findInCurrentScope(VOID_SETUP_REGEX, uncommented);
+    String searchArea = null;
+    if (setupMatch != null) {
+      int start = uncommented.indexOf("{", setupMatch.end());
+      if (start >= 0) {
+        // Find a closing brace
+        MatchResult match = findInCurrentScope(CLOSING_BRACE, uncommented, start);
+        if (match != null) {
+          searchArea = uncommented.substring(start + 1, match.end() - 1);
+        } else {
+          return null;
+        }
+      }
+    }    
+    String[] sizeContents = matchMethod("size", searchArea);
+    String[] fullContents = matchMethod("fullScreen", searchArea);
+    if (sizeContents != null) {
+      StringList args = breakCommas(sizeContents[1]);
+      return (args.size() >= 3) ? args.get(2).trim() : null;
+    }    
+    if (fullContents != null) {
+      StringList args = breakCommas(fullContents[1]);
+      if (args.size() > 0) {  // might have no args
+        String args0 = args.get(0).trim();
+        if (args.size() == 1) {
+          // could be either fullScreen(1) or fullScreen(P2D), figure out which
+          if (args0.equals("SPAN") || PApplet.parseInt(args0, -1) != -1) {
+            // it's the display parameter, not the renderer
+          } else {
+            return args0;
+          }
+        } else if (args.size() == 2) {
+          return args0;
+        } else {
+          return null;
+        }
+      }
+    }
+    return null;
+  }
 
+  static private StringList breakCommas(String contents) {
+    StringList outgoing = new StringList();
+
+    boolean insideQuote = false;
+    // The current word being read
+    StringBuilder current = new StringBuilder();
+    char[] chars = contents.toCharArray();
+    for (int i = 0; i < chars.length; i++) {
+      char c = chars[i];
+      if (insideQuote) {
+        current.append(c);
+        if (c == '\"') {
+          insideQuote = false;
+        }
+      } else {
+        if (c == ',') {
+          if (current.length() != 0) {
+            outgoing.append(current.toString());
+            current.setLength(0);
+          }
+        } else {
+          current.append(c);
+          if (c == '\"') {
+            insideQuote = true;
+          }
+        }
+      }
+    }
+    if (current.length() != 0) {
+      outgoing.append(current.toString());
+    }
+    return outgoing;
+  }  
+  
 
   public String[] initSketchSmooth(String code) throws SketchException {
     String[] info = parseSketchSmooth(code, true);
@@ -305,5 +389,18 @@ public String[] getDefaultImports() {
         "android.app.Fragment"
       };    
   } 
-  */ 
+  */
+  
+  private class SurfaceInfoAndroid extends SurfaceInfo {
+//    private String renderer;
+//    SurfaceInfoAndroid(SurfaceInfo info) {
+//
+//    }
+    String getRenderer() {
+      return renderer;
+    }
+    
+    
+  }
+  
 }