renamed sketches so they appear in the right order

Author: codeanticode

Diff for: intro/Ex_2_1_toon/Ex_2_1_toon.pde renamed to intro/Ex_02_1_toon/Ex_02_1_toon.pde

@@ -3,8 +3,6 @@ precision mediump float;
 precision mediump int;
 #endif
 
-#define PROCESSING_LIGHT_SHADER
-
 uniform float fraction;
 
 varying vec4 vertColor;

Diff for: intro/Ex_2_1_toon/data/frag.glsl renamed to intro/Ex_02_1_toon/data/frag.glsl

@@ -2,7 +2,7 @@ uniform mat4 transform;
 uniform mat3 normalMatrix;
 uniform vec3 lightNormal;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 
@@ -11,7 +11,7 @@ varying vec3 vertNormal;
 varying vec3 vertLightDir;
 
 void main() {
-  gl_Position = transform * vertex;  
+  gl_Position = transform * position;  
   vertColor = color;
   vertNormal = normalize(normalMatrix * normal);
   vertLightDir = -lightNormal;

Diff for: intro/Ex_2_1_toon/data/vert.glsl renamed to intro/Ex_02_1_toon/data/vert.glsl

@@ -1,13 +1,11 @@
-#define PROCESSING_COLOR_SHADER
-
 uniform mat4 transform;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 
 varying vec4 vertColor;
 
 void main() {
-  gl_Position = transform * vertex;    
+  gl_Position = transform * position;    
   vertColor = color;
 }

Diff for: intro/Ex_4_1_base/Ex_4_1_base.pde renamed to intro/Ex_04_1_base/Ex_04_1_base.pde

@@ -1,17 +1,15 @@
-#define PROCESSING_TEXTURE_SHADER
-
 uniform mat4 transform;
 uniform mat4 texMatrix;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec2 texCoord;
 
 varying vec4 vertColor;
 varying vec4 vertTexCoord;
 
 void main() {
-  gl_Position = transform * vertex;
+  gl_Position = transform * position;
 
   vertColor = color;
   vertTexCoord = texMatrix * vec4(texCoord, 1.0, 1.0);

Diff for: intro/Ex_4_2_color/Ex_4_2_color.pde renamed to intro/Ex_04_2_color/Ex_04_2_color.pde

@@ -1,23 +1,21 @@
-#define PROCESSING_LIGHT_SHADER
-
 uniform mat4 modelview;
 uniform mat4 transform;
 uniform mat3 normalMatrix;
 
 uniform vec4 lightPosition;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 
 varying vec4 vertColor;
 
 void main() {
-  gl_Position = transform * vertex;    
-  vec3 ecVertex = vec3(modelview * vertex);  
+  gl_Position = transform * position;    
+  vec3 ecPosition = vec3(modelview * position);  
   vec3 ecNormal = normalize(normalMatrix * normal);
 
-  vec3 direction = normalize(lightPosition.xyz - ecVertex);    
+  vec3 direction = normalize(lightPosition.xyz - ecPosition);    
   float intensity = max(0.0, dot(direction, ecNormal));
   vertColor = vec4(intensity, intensity, intensity, 1) * color;             
 }

Diff for: intro/Ex_4_2_color/data/colorfrag.glsl renamed to intro/Ex_04_2_color/data/colorfrag.glsl

@@ -1,13 +1,11 @@
-#define PROCESSING_LIGHT_SHADER
-
 uniform mat4 modelview;
 uniform mat4 transform;
 uniform mat3 normalMatrix;
 
 uniform vec4 lightPosition;
 uniform vec3 lightNormal;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 
@@ -16,10 +14,10 @@ varying vec3 ecNormal;
 varying vec3 lightDir;
 
 void main() {
-  gl_Position = transform * vertex;    
-  vec3 ecVertex = vec3(modelview * vertex);  
+  gl_Position = transform * position;    
+  vec3 ecPosition = vec3(modelview * position);  
 
   ecNormal = normalize(normalMatrix * normal);
-  lightDir = normalize(lightPosition.xyz - ecVertex);  
+  lightDir = normalize(lightPosition.xyz - ecPosition);  
   vertColor = color;
 }

Diff for: intro/Ex_4_2_color/data/colorvert.glsl renamed to intro/Ex_04_2_color/data/colorvert.glsl

@@ -1,13 +1,11 @@
-#define PROCESSING_TEXLIGHT_SHADER
-
 uniform mat4 modelview;
 uniform mat4 transform;
 uniform mat3 normalMatrix;
 uniform mat4 texMatrix;
 
 uniform vec4 lightPosition;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 attribute vec2 texCoord;
@@ -16,11 +14,11 @@ varying vec4 vertColor;
 varying vec4 vertTexCoord;
 
 void main() {
-  gl_Position = transform * vertex;    
-  vec3 ecVertex = vec3(modelview * vertex);  
+  gl_Position = transform * position;
+  vec3 ecPosition = vec3(modelview * position);  
   vec3 ecNormal = normalize(normalMatrix * normal);
 
-  vec3 direction = normalize(lightPosition.xyz - ecVertex);    
+  vec3 direction = normalize(lightPosition.xyz - ecPosition);    
   float intensity = max(0.0, dot(direction, ecNormal));
   vertColor = vec4(intensity, intensity, intensity, 1) * color;     
 

Diff for: intro/Ex_5_1_texture/Ex_5_1_texture.pde renamed to intro/Ex_05_1_texture/Ex_05_1_texture.pde

@@ -1,13 +1,11 @@
-#define PROCESSING_TEXLIGHT_SHADER
-
 uniform mat4 modelview;
 uniform mat4 transform;
 uniform mat3 normalMatrix;
 uniform mat4 texMatrix;
 
 uniform vec4 lightPosition;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 attribute vec2 texCoord;
@@ -18,11 +16,11 @@ varying vec3 lightDir;
 varying vec4 vertTexCoord;
 
 void main() {
-  gl_Position = transform * vertex;    
-  vec3 ecVertex = vec3(modelview * vertex);  
+  gl_Position = transform * position;    
+  vec3 ecPosition = vec3(modelview * position);  
 
   ecNormal = normalize(normalMatrix * normal);    
-  lightDir = normalize(lightPosition.xyz - ecVertex);  
+  lightDir = normalize(lightPosition.xyz - ecPosition);  
   vertColor = color;  
 
   vertTexCoord = texMatrix * vec4(texCoord, 1.0, 1.0);        

Diff for: intro/Ex_5_1_texture/data/lachoy.jpg renamed to intro/Ex_05_1_texture/data/lachoy.jpg

@@ -3,8 +3,6 @@ precision mediump float;
 precision mediump int;
 #endif
 
-#define PROCESSING_TEXTURE_SHADER
-
 uniform sampler2D texture;
 
 varying vec4 vertColor;

Diff for: intro/Ex_5_1_texture/data/texfrag.glsl renamed to intro/Ex_05_1_texture/data/texfrag.glsl

@@ -3,8 +3,6 @@ precision mediump float;
 precision mediump int;
 #endif
 
-#define PROCESSING_TEXTURE_SHADER
-
 uniform sampler2D texture;
 uniform vec2 texOffset;
 

Diff for: intro/Ex_9_1_allshaders/data/texvert.glsl renamed to intro/Ex_05_1_texture/data/texvert.glsl

@@ -3,8 +3,6 @@ precision mediump float;
 precision mediump int;
 #endif
 
-#define PROCESSING_TEXTURE_SHADER
-
 uniform sampler2D texture;
 uniform vec2 texOffset;
 

Diff for: intro/Ex_6_1_light/Ex_6_1_light.pde renamed to intro/Ex_06_1_light/Ex_06_1_light.pde

@@ -3,8 +3,6 @@ precision mediump float;
 precision mediump int;
 #endif
 
-#define PROCESSING_TEXTURE_SHADER
-
 uniform sampler2D texture;
 
 varying vec4 vertColor;

Diff for: intro/Ex_6_1_light/data/lightfrag.glsl renamed to intro/Ex_06_1_light/data/lightfrag.glsl

@@ -1,13 +1,11 @@
-#define PROCESSING_COLOR_SHADER
-
 uniform mat4 transform;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 
 varying vec4 vertColor;
 
 void main() {
-  gl_Position = transform * vertex;    
+  gl_Position = transform * position;    
   vertColor = color;
 }

Diff for: intro/Ex_9_1_allshaders/data/lightvert.glsl renamed to intro/Ex_06_1_light/data/lightvert.glsl

@@ -3,8 +3,6 @@ precision mediump float;
 precision mediump int;
 #endif
 
-#define PROCESSING_TEXTURE_SHADER
-
 uniform sampler2D texture;
 uniform vec2 texOffset;
 

Diff for: intro/Ex_6_2_pixlight/Ex_6_2_pixlight.pde renamed to intro/Ex_06_2_pixlight/Ex_06_2_pixlight.pde

@@ -3,8 +3,6 @@ precision mediump float;
 precision mediump int;
 #endif
 
-#define PROCESSING_TEXTURE_SHADER
-
 uniform sampler2D texture;
 uniform vec2 texOffset;
 

Diff for: intro/Ex_6_2_pixlight/data/pixlightfrag.glsl renamed to intro/Ex_06_2_pixlight/data/pixlightfrag.glsl

@@ -1,23 +1,21 @@
-#define PROCESSING_LIGHT_SHADER
-
 uniform mat4 modelview;
 uniform mat4 transform;
 uniform mat3 normalMatrix;
 
 uniform vec4 lightPosition;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 
 varying vec4 vertColor;
 
 void main() {
-  gl_Position = transform * vertex;    
-  vec3 ecVertex = vec3(modelview * vertex);  
+  gl_Position = transform * position;    
+  vec3 ecPosition = vec3(modelview * position);  
   vec3 ecNormal = normalize(normalMatrix * normal);
 
-  vec3 direction = normalize(lightPosition.xyz - ecVertex);    
+  vec3 direction = normalize(lightPosition.xyz - ecPosition);    
   float intensity = max(0.0, dot(direction, ecNormal));
   vertColor = vec4(intensity, intensity, intensity, 1) * color;             
 }

Diff for: intro/Ex_9_1_allshaders/data/pixlightvert.glsl renamed to intro/Ex_06_2_pixlight/data/pixlightvert.glsl

@@ -1,13 +1,11 @@
-#define PROCESSING_LIGHT_SHADER
-
 uniform mat4 modelview;
 uniform mat4 transform;
 uniform mat3 normalMatrix;
 
 uniform vec4 lightPosition;
 uniform vec3 lightNormal;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 
@@ -16,10 +14,10 @@ varying vec3 ecNormal;
 varying vec3 lightDir;
 
 void main() {
-  gl_Position = transform * vertex;    
-  vec3 ecVertex = vec3(modelview * vertex);  
+  gl_Position = transform * position;    
+  vec3 ecPosition = vec3(modelview * position);  
 
   ecNormal = normalize(normalMatrix * normal);
-  lightDir = normalize(lightPosition.xyz - ecVertex);  
+  lightDir = normalize(lightPosition.xyz - ecPosition);
   vertColor = color;
 }

Diff for: intro/Ex_7_1_texlight/Ex_7_1_texlight.pde renamed to intro/Ex_07_1_texlight/Ex_07_1_texlight.pde

@@ -1,13 +1,11 @@
-#define PROCESSING_TEXLIGHT_SHADER
-
 uniform mat4 modelview;
 uniform mat4 transform;
 uniform mat3 normalMatrix;
 uniform mat4 texMatrix;
 
 uniform vec4 lightPosition;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 attribute vec2 texCoord;
@@ -18,11 +16,11 @@ varying vec3 lightDir;
 varying vec4 vertTexCoord;
 
 void main() {
-  gl_Position = transform * vertex;    
-  vec3 ecVertex = vec3(modelview * vertex);  
+  gl_Position = transform * position;    
+  vec3 ecPosition = vec3(modelview * position);  
 
   ecNormal = normalize(normalMatrix * normal);    
-  lightDir = normalize(lightPosition.xyz - ecVertex);  
+  lightDir = normalize(lightPosition.xyz - ecPosition);
   vertColor = color;  
 
   vertTexCoord = texMatrix * vec4(texCoord, 1.0, 1.0);        

Diff for: intro/Ex_7_1_texlight/data/lachoy.jpg renamed to intro/Ex_07_1_texlight/data/lachoy.jpg

@@ -1,13 +1,11 @@
-#define PROCESSING_TEXLIGHT_SHADER
-
 uniform mat4 modelview;
 uniform mat4 transform;
 uniform mat3 normalMatrix;
 uniform mat4 texMatrix;
 
 uniform vec4 lightPosition;
 
-attribute vec4 vertex;
+attribute vec4 position;
 attribute vec4 color;
 attribute vec3 normal;
 attribute vec2 texCoord;
@@ -16,11 +14,11 @@ varying vec4 vertColor;
 varying vec4 vertTexCoord;
 
 void main() {
-  gl_Position = transform * vertex;    
-  vec3 ecVertex = vec3(modelview * vertex);  
+  gl_Position = transform * position;    
+  vec3 ecPosition = vec3(modelview * position);  
   vec3 ecNormal = normalize(normalMatrix * normal);
 
-  vec3 direction = normalize(lightPosition.xyz - ecVertex);    
+  vec3 direction = normalize(lightPosition.xyz - ecPosition);
   float intensity = max(0.0, dot(direction, ecNormal));
   vertColor = vec4(intensity, intensity, intensity, 1) * color;     
 

Diff for: intro/Ex_7_1_texlight/data/texlightfrag.glsl renamed to intro/Ex_07_1_texlight/data/texlightfrag.glsl

@@ -1,5 +1,3 @@
-#define PROCESSING_TEXTURE_SHADER
-
 uniform mat4 transform;
 uniform mat4 texMatrix;
 

Diff for: intro/Ex_7_1_texlight/data/texlightvert.glsl renamed to intro/Ex_07_1_texlight/data/texlightvert.glsl

@@ -11,10 +11,12 @@ void setup() {
   background(0);
 }
 
-void draw() {  
-  shader(pointShader, POINTS);
+void draw() {    
+  shader(pointShader);
+  // It is possible to set the shader type, but not needed, Processing will try to
+  // autodetect the type
+  //shader(pointShader, POINTS);
   if (mousePressed) {   
     point(mouseX, mouseY);
   }  
-}
-
+}