From 8b72e8e52a5873f5739f2ff02f46f04b2c6846e8 Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Sun, 12 Feb 2012 16:19:27 +0000
Subject: [PATCH] Moved default material properties from PGraphics to
 PGraphicsOpenGL/Android3D

---
 android/core/src/processing/core/PGraphics.java             | 5 -----
 android/core/src/processing/core/PGraphicsAndroid3D.java    | 6 ++++++
 core/src/processing/core/PGraphics.java                     | 5 -----
 .../opengl/src/processing/opengl/PGraphicsOpenGL.java       | 6 ++++++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/android/core/src/processing/core/PGraphics.java b/android/core/src/processing/core/PGraphics.java
index b391b502f..e3a4a7675 100644
--- a/android/core/src/processing/core/PGraphics.java
+++ b/android/core/src/processing/core/PGraphics.java
@@ -691,11 +691,6 @@ public class PGraphics extends PImage implements PConstants {
     fill(255);
     stroke(0);
     
-    ambient(255);
-    specular(0);
-    emissive(0);
-    shininess(1);
-    
     // added for 0178 for subclasses that need them
     strokeWeight(DEFAULT_STROKE_WEIGHT);
     strokeJoin(DEFAULT_STROKE_JOIN);
diff --git a/android/core/src/processing/core/PGraphicsAndroid3D.java b/android/core/src/processing/core/PGraphicsAndroid3D.java
index 7fe775789..5bea35930 100644
--- a/android/core/src/processing/core/PGraphicsAndroid3D.java
+++ b/android/core/src/processing/core/PGraphicsAndroid3D.java
@@ -1718,6 +1718,12 @@ public class PGraphicsAndroid3D extends PGraphics {
     
     // easiest for beginners
     textureMode(IMAGE);
+    
+    // Default material properties
+    ambient(80);
+    specular(125);
+    emissive(0);
+    shininess(1);    
   }
   
   // reapplySettings
diff --git a/core/src/processing/core/PGraphics.java b/core/src/processing/core/PGraphics.java
index 23e246c4d..7b6767d50 100644
--- a/core/src/processing/core/PGraphics.java
+++ b/core/src/processing/core/PGraphics.java
@@ -736,11 +736,6 @@ public class PGraphics extends PImage implements PConstants {
     colorMode(RGB, 255);
     fill(255);
     stroke(0);
-    
-    ambient(255);
-    specular(0);
-    emissive(0);
-    shininess(1);    
 
     // as of 0178, no longer relying on local versions of the variables
     // being set, because subclasses may need to take extra action.
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
index ca71c1b9d..65180fa98 100644
--- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -1724,6 +1724,12 @@ public class PGraphicsOpenGL extends PGraphics {
     
     // easiest for beginners
     textureMode(IMAGE);
+    
+    // Default material properties
+    ambient(80);
+    specular(125);
+    emissive(0);
+    shininess(1); 
   }
   
   // reapplySettings