Replae renderer with mode in app.rb

Author: monkstone

CHANGELOG.md

@@ -40,7 +40,7 @@ v0.8.0 Refactor processing code to jdk8 syntax, include lambda, switch on string
 
 v0.7.1 Oops fix `GfxRender` had not been merged
 
-v0.7.0 Refactor sketch_writer to load params from ~/.picrate/sketch.yml. `AppRender => GfxRender` because we only need `PGraphics` in renderer.
+v0.7.0 Refactor sketch_writer to load params from ~/.picrate/sketch.yml. `GfxRender => GfxRender` because we only need `PGraphics` in renderer.
 
 v0.6.0 Re-branding with new 'pick'/'eight' svg for PiCrate
 

docs/_classes/app_render/app_render.md

@@ -1,17 +1,17 @@
 ---
 layout: post
-title:  "AppRender and ShapeRender"
-keywords: to_vertex, Vec3D, Vec2D, AppRender, ShapeRender
+title:  "GfxRender and ShapeRender"
+keywords: to_vertex, Vec3D, Vec2D, GfxRender, ShapeRender
 ---
-Vec2D and Vec3D classes can be efficiently rendered as both PApplet vertices, and PShape vertices using AppRender and ShapeRender utility classes. To use the AppRender renderer you should create a single instance in the processing setup see below example:-
+Vec2D and Vec3D classes can be efficiently rendered as both PApplet vertices, and PShape vertices using GfxRender and ShapeRender utility classes. To use the GfxRender renderer you should create a single instance in the processing setup see below example:-
 
-### AppRender
+### GfxRender
 
 ```ruby
 attr_reader :renderer
 ...
 def setup
-  @renderer = AppRender.new(self)
+  @renderer = GfxRender.new(self)
 end
 ...
 ```

lib/picrate/app.rb

@@ -84,7 +84,7 @@ def self.inherited(subclass)
     class << self
       # Handy getters and setters on the class go here:
       attr_accessor :sketch_class, :library_loader, :arguments, :options
-      attr_reader :surface, :width, :height, :renderer
+      attr_reader :surface, :width, :height, :mode
       def load_libraries(*args)
         library_loader ||= LibraryLoader.new
         library_loader.load_library(*args)
@@ -132,11 +132,11 @@ def initialize(options = {}, arguments = [])
     end
 
     def size(*args)
-      w, h, renderer = *args
+      w, h, mode = *args
       @width ||= w
       @height ||= h
-      @renderer ||= renderer
-      import_opengl if /opengl/ =~ renderer
+      @mode ||= mode
+      import_opengl if /opengl/ =~ mode
       super(*args)
     end
 

src/main/java/monkstone/complex/JComplex.java

@@ -3,20 +3,19 @@
 import processing.core.PGraphics;
 
 /**
- *
  *
  * @author Martin Prout
  */
 public class GfxRender implements JRender {
 
-    final PGraphics g;
+    final PGraphics graphics;
 
     /**
      *
-     * @param gfx PGraphics
+     * @param graphics PGraphics
      */
-    public GfxRender(final PGraphics gfx) {
-        this.g = gfx;
+    public GfxRender(final PGraphics graphics) {
+        this.graphics = graphics;
     }
 
     /**
@@ -26,7 +25,7 @@ public GfxRender(final PGraphics gfx) {
      */
     @Override
     public void vertex(double x, double y) {
-        g.vertex((float) x, (float) y);
+        graphics.vertex((float) x, (float) y);
     }
 
     /**
@@ -36,7 +35,7 @@ public void vertex(double x, double y) {
      */
     @Override
     public void curveVertex(double x, double y) {
-        g.curveVertex((float) x, (float) y);
+        graphics.curveVertex((float) x, (float) y);
     }
 
     /**
@@ -47,7 +46,7 @@ public void curveVertex(double x, double y) {
      */
     @Override
     public void vertex(double x, double y, double z) {
-        g.vertex((float) x, (float) y, (float) z);
+        graphics.vertex((float) x, (float) y, (float) z);
     }
 
     /**
@@ -58,7 +57,7 @@ public void vertex(double x, double y, double z) {
      */
     @Override
     public void normal(double x, double y, double z) {
-        g.normal((float) x, (float) y, (float) z);
+        graphics.normal((float) x, (float) y, (float) z);
     }
 
     /**
@@ -71,7 +70,7 @@ public void normal(double x, double y, double z) {
      */
     @Override
     public void vertex(double x, double y, double z, double u, double v) {
-        g.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
+        graphics.vertex((float) x, (float) y, (float) z, (float) u, (float) v);
     }
 
     /**
@@ -82,6 +81,6 @@ public void vertex(double x, double y, double z, double u, double v) {
      */
     @Override
     public void curveVertex(double x, double y, double z) {
-        g.curveVertex((float) x, (float) y, (float) z);
+        graphics.curveVertex((float) x, (float) y, (float) z);
     }
 }