eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Testing light uniforms

Browse Source
This commit is contained in:
codeanticode
2012-02-03 00:54:53 +00:00
parent 03333e5784
commit 085385f086
5 changed files with 255 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/core/src/processing/core/FillShaderFrag.glsl
+1
View File
@@ -29,6 +29,7 @@ varying vec4 vertColor;
varying vec2 vertTexcoord;
void main() {
gl_FragColor = vertColor;
if (0 < textured) {
gl_FragColor = texture2D(textureSampler, vertTexcoord) * vertColor;
} else {
android/core/src/processing/core/FillShaderVert.glsl
+30 -2
View File
@@ -21,18 +21,46 @@
uniform mat4 modelviewMatrix;
uniform mat4 projectionMatrix;
uniform mat4 projmodelviewMatrix;
uniform int textured;
uniform int lightCount;
uniform vec4 lightPosition[8];
uniform vec4 lightNormal[8];
uniform vec4 lightAmbient[8];
uniform vec4 lightDiffuse[8];
uniform vec4 lightSpecular[8];
uniform float lightFalloffConstant[8];
uniform float lightFalloffLinear[8];
uniform float lightFalloffQuadratic[8];
uniform float lightSpotAngle[8];
uniform float lightSpotConcentration[8];
attribute vec4 inVertex;
attribute vec4 inColor;
attribute vec3 inNormal;
attribute vec2 inTexcoord;
varying vec4 vertColor;
varying vec2 vertTexcoord;
void main() {
gl_Position = projectionMatrix * modelviewMatrix * inVertex;
gl_Position = projmodelviewMatrix * inVertex;
vertColor = inColor;
vertTexcoord = inTexcoord;
if (0 < textured) {
vertTexcoord = inTexcoord;
}
vec4 total = vec4(0, 0, 0, 0);
//vec4 total = vec4(1, 1, 1, 1);
for (int i = 0; i < lightCount; i++) {
// Some random calculation just to stop the compiler from discarding the uniforms.
float c = lightFalloffConstant[i] * lightFalloffLinear[i] * lightFalloffQuadratic[i] * lightSpotAngle[i] * lightSpotConcentration[i];
total += lightDiffuse[i] * dot(lightPosition[i], lightNormal[i]) + c * lightAmbient[i] + lightSpecular[i];
}
vertColor += total;
}
android/core/src/processing/core/PGL.java
+16 -5
View File
@@ -993,11 +993,6 @@ public class PGL {
return GLES20.glGetUniformLocation(prog, name);
}
public void setArrayUniform(int loc, float[] v) {
// ?
GLES20.glUniform1fv(loc, v.length, v, 0);
}
public void setIntUniform(int loc, int value) {
GLES20.glUniform1i(loc, value);
}
@@ -1017,6 +1012,22 @@ public class PGL {
public void setFloatUniform(int loc, float value0, float value1, float value2, float value3) {
GLES20.glUniform4f(loc, value0, value1, value2, value3);
}
public void setFloat1ArrayUniform(int loc, float[] v) {
GLES20.glUniform1fv(loc, v.length, v, 0);
}
public void setFloat2ArrayUniform(int loc, float[] v) {
GLES20.glUniform2fv(loc, v.length / 2, v, 0);
}
public void setFloat3ArrayUniform(int loc, float[] v) {
GLES20.glUniform3fv(loc, v.length / 3, v, 0);
}
public void setFloat4ArrayUniform(int loc, float[] v) {
GLES20.glUniform4fv(loc, v.length / 4, v, 0);
}
public void setMatUniform(int loc, float m00, float m01,
float m10, float m11) {
android/core/src/processing/core/PGraphicsAndroid3D.java
+191 -104
View File
@@ -143,6 +143,7 @@ public class PGraphicsAndroid3D extends PGraphics {
public PMatrix3D camera;
public PMatrix3D cameraInv;
public PMatrix3D modelview;
public PMatrix3D projmodelview;
// Temporary array to copy the PMatrices to OpenGL.
//protected float[] glMatrix;
@@ -172,11 +173,28 @@ public class PGraphicsAndroid3D extends PGraphics {
public int[] lightType;
/** Light positions */
public float[][] lightPosition;
public float[] lightPosition;
/** Light direction (normalized vector) */
public float[][] lightNormal;
public float[] lightNormal;
/**
* Ambient colors for lights.
*/
public float[] lightAmbient;
/**
* Diffuse colors for lights.
*/
public float[] lightDiffuse;
/**
* Specular colors for lights. Internally these are stored as numbers between
* 0 and 1.
*/
public float[] lightSpecular;
/** Light falloff */
public float[] lightFalloffConstant;
public float[] lightFalloffLinear;
@@ -191,21 +209,6 @@ public class PGraphicsAndroid3D extends PGraphics {
/** Light spot concentration */
public float[] lightSpotConcentration;
/**
* Ambient colors for lights.
*/
public float[][] lightAmbient;
/**
* Diffuse colors for lights.
*/
public float[][] lightDiffuse;
/**
* Specular colors for lights. Internally these are stored as numbers between
* 0 and 1.
*/
public float[][] lightSpecular;
/** Current specular color for lighting */
public float[] currentLightSpecular;
@@ -474,17 +477,18 @@ public class PGraphicsAndroid3D extends PGraphics {
projection = new PMatrix3D();
camera = new PMatrix3D();
cameraInv = new PMatrix3D();
modelview = new PMatrix3D();
modelview = new PMatrix3D();
projmodelview = new PMatrix3D();
matricesAllocated = true;
}
if (!lightsAllocated) {
lightType = new int[PGL.MAX_LIGHTS];
lightPosition = new float[PGL.MAX_LIGHTS][4];
lightNormal = new float[PGL.MAX_LIGHTS][4];
lightAmbient = new float[PGL.MAX_LIGHTS][4];
lightDiffuse = new float[PGL.MAX_LIGHTS][4];
lightSpecular = new float[PGL.MAX_LIGHTS][4];
lightPosition = new float[4 * PGL.MAX_LIGHTS];
lightNormal = new float[4 * PGL.MAX_LIGHTS];
lightAmbient = new float[4 * PGL.MAX_LIGHTS];
lightDiffuse = new float[4 * PGL.MAX_LIGHTS];
lightSpecular = new float[4 * PGL.MAX_LIGHTS];
lightFalloffConstant = new float[PGL.MAX_LIGHTS];
lightFalloffLinear = new float[PGL.MAX_LIGHTS];
lightFalloffQuadratic = new float[PGL.MAX_LIGHTS];
@@ -3273,8 +3277,7 @@ public class PGraphicsAndroid3D extends PGraphics {
/**
* Apply a 4x4 transformation matrix to the modelview stack using
* glMultMatrix().
* Apply a 4x4 transformation matrix to the modelview stack.
*/
public void applyMatrix(float n00, float n01, float n02, float n03,
float n10, float n11, float n12, float n13,
@@ -4148,37 +4151,37 @@ public class PGraphicsAndroid3D extends PGraphics {
lightType[lightCount] = AMBIENT;
colorCalc(r, g, b);
lightAmbient[lightCount][0] = calcR;
lightAmbient[lightCount][1] = calcG;
lightAmbient[lightCount][2] = calcB;
lightAmbient[lightCount][3] = 1.0f;
lightAmbient[4 * lightCount + 0] = calcR;
lightAmbient[4 * lightCount + 1] = calcG;
lightAmbient[4 * lightCount + 2] = calcB;
lightAmbient[4 * lightCount + 3] = 1.0f;
lightPosition[lightCount][0] = x;
lightPosition[lightCount][1] = y;
lightPosition[lightCount][2] = z;
lightPosition[lightCount][3] = 1.0f;
lightPosition[4 * lightCount + 0] = x;
lightPosition[4 * lightCount + 1] = y;
lightPosition[4 * lightCount + 2] = z;
lightPosition[4 * lightCount + 3] = 1.0f;
lightFalloffConstant[lightCount] = currentLightFalloffConstant;
lightFalloffLinear[lightCount] = currentLightFalloffLinear;
lightFalloffQuadratic[lightCount] = currentLightFalloffQuadratic;
lightDiffuse[lightCount][0] = 0;
lightDiffuse[lightCount][1] = 0;
lightDiffuse[lightCount][2] = 0;
lightDiffuse[lightCount][3] = 1;
lightDiffuse[4 * lightCount + 0] = 0;
lightDiffuse[4 * lightCount + 1] = 0;
lightDiffuse[4 * lightCount + 2] = 0;
lightDiffuse[4 * lightCount + 3] = 1;
lightSpotAngle[lightCount] = 180;
lightSpotConcentration[lightCount] = 0;
lightSpecular[lightCount][0] = 0;
lightSpecular[lightCount][1] = 0;
lightSpecular[lightCount][2] = 0;
lightSpecular[lightCount][3] = 1;
lightSpecular[4 * lightCount + 0] = 0;
lightSpecular[4 * lightCount + 1] = 0;
lightSpecular[4 * lightCount + 2] = 0;
lightSpecular[4 * lightCount + 3] = 1;
lightNormal[lightCount][0] = 0;
lightNormal[lightCount][1] = 0;
lightNormal[lightCount][2] = 0;
lightNormal[lightCount][3] = 0;
lightNormal[4 * lightCount + 0] = 0;
lightNormal[4 * lightCount + 1] = 0;
lightNormal[4 * lightCount + 2] = 0;
lightNormal[4 * lightCount + 3] = 0;
/*
lightEnable(lightCount);
@@ -4202,32 +4205,32 @@ public class PGraphicsAndroid3D extends PGraphics {
lightType[lightCount] = DIRECTIONAL;
colorCalc(r, g, b);
lightDiffuse[lightCount][0] = calcR;
lightDiffuse[lightCount][1] = calcG;
lightDiffuse[lightCount][2] = calcB;
lightDiffuse[lightCount][3] = 1.0f;
lightDiffuse[4 * lightCount + 0] = calcR;
lightDiffuse[4 * lightCount + 1] = calcG;
lightDiffuse[4 * lightCount + 2] = calcB;
lightDiffuse[4 * lightCount + 3] = 1.0f;
lightFalloffConstant[lightCount] = currentLightFalloffConstant;
lightFalloffLinear[lightCount] = currentLightFalloffLinear;
lightFalloffQuadratic[lightCount] = currentLightFalloffQuadratic;
lightSpecular[lightCount][0] = currentLightSpecular[0];
lightSpecular[lightCount][1] = currentLightSpecular[1];
lightSpecular[lightCount][2] = currentLightSpecular[2];
lightSpecular[lightCount][3] = currentLightSpecular[3];
lightSpecular[4 * lightCount + 0] = currentLightSpecular[0];
lightSpecular[4 * lightCount + 1] = currentLightSpecular[1];
lightSpecular[4 * lightCount + 2] = currentLightSpecular[2];
lightSpecular[4 * lightCount + 3] = currentLightSpecular[3];
// In this case, the normal is used to indicate the direction
// of the light, with the w component equals to zero. See
// the comments in the lightDirection() method.
lightNormal[lightCount][0] = nx;
lightNormal[lightCount][1] = ny;
lightNormal[lightCount][2] = nz;
lightNormal[lightCount][3] = 0.0f;
lightNormal[4 * lightCount + 0] = nx;
lightNormal[4 * lightCount + 1] = ny;
lightNormal[4 * lightCount + 2] = nz;
lightNormal[4 * lightCount + 3] = 0.0f;
lightAmbient[lightCount][0] = 0;
lightAmbient[lightCount][1] = 0;
lightAmbient[lightCount][2] = 0;
lightAmbient[lightCount][3] = 1.0f;
lightAmbient[4 * lightCount + 0] = 0;
lightAmbient[4 * lightCount + 1] = 0;
lightAmbient[4 * lightCount + 2] = 0;
lightAmbient[4 * lightCount + 3] = 1.0f;
lightSpotAngle[lightCount] = 180;
lightSpotConcentration[lightCount] = 0;
@@ -4254,36 +4257,37 @@ public class PGraphicsAndroid3D extends PGraphics {
lightType[lightCount] = POINT;
colorCalc(r, g, b);
lightDiffuse[lightCount][0] = calcR;
lightDiffuse[lightCount][1] = calcG;
lightDiffuse[lightCount][2] = calcB;
lightDiffuse[lightCount][3] = 1.0f;
lightDiffuse[4 * lightCount + 0] = calcR;
lightDiffuse[4 * lightCount + 1] = calcG;
lightDiffuse[4 * lightCount + 2] = calcB;
lightDiffuse[4 * lightCount + 3] = 1.0f;
lightFalloffConstant[lightCount] = currentLightFalloffConstant;
lightFalloffLinear[lightCount] = currentLightFalloffLinear;
lightFalloffQuadratic[lightCount] = currentLightFalloffQuadratic;
lightSpecular[lightCount][0] = currentLightSpecular[0];
lightSpecular[lightCount][1] = currentLightSpecular[1];
lightSpecular[lightCount][2] = currentLightSpecular[2];
lightSpecular[4 * lightCount + 0] = currentLightSpecular[0];
lightSpecular[4 * lightCount + 1] = currentLightSpecular[1];
lightSpecular[4 * lightCount + 2] = currentLightSpecular[2];
lightSpecular[4 * lightCount + 3] = currentLightSpecular[3];
lightPosition[lightCount][0] = x;
lightPosition[lightCount][1] = y;
lightPosition[lightCount][2] = z;
lightPosition[lightCount][3] = 1.0f;
lightPosition[4 * lightCount + 0] = x;
lightPosition[4 * lightCount + 1] = y;
lightPosition[4 * lightCount + 2] = z;
lightPosition[4 * lightCount + 3] = 1.0f;
lightAmbient[lightCount][0] = 0;
lightAmbient[lightCount][1] = 0;
lightAmbient[lightCount][2] = 0;
lightAmbient[lightCount][3] = 1.0f;
lightAmbient[4 * lightCount + 0] = 0;
lightAmbient[4 * lightCount + 1] = 0;
lightAmbient[4 * lightCount + 2] = 0;
lightAmbient[4 * lightCount + 3] = 1.0f;
lightSpotAngle[lightCount] = 180;
lightSpotConcentration[lightCount] = 0;
lightNormal[lightCount][0] = 0;
lightNormal[lightCount][1] = 0;
lightNormal[lightCount][2] = 0;
lightNormal[lightCount][3] = 0;
lightNormal[4 * lightCount + 0] = 0;
lightNormal[4 * lightCount + 1] = 0;
lightNormal[4 * lightCount + 2] = 0;
lightNormal[4 * lightCount + 3] = 0;
/*
lightEnable(lightCount);
@@ -4308,38 +4312,39 @@ public class PGraphicsAndroid3D extends PGraphics {
lightType[lightCount] = SPOT;
colorCalc(r, g, b);
lightDiffuse[lightCount][0] = calcR;
lightDiffuse[lightCount][1] = calcG;
lightDiffuse[lightCount][2] = calcB;
lightDiffuse[lightCount][3] = 1.0f;
lightDiffuse[4 * lightCount + 0] = calcR;
lightDiffuse[4 * lightCount + 1] = calcG;
lightDiffuse[4 * lightCount + 2] = calcB;
lightDiffuse[4 * lightCount + 3] = 1.0f;
lightFalloffConstant[lightCount] = currentLightFalloffConstant;
lightFalloffLinear[lightCount] = currentLightFalloffLinear;
lightFalloffQuadratic[lightCount] = currentLightFalloffQuadratic;
lightSpecular[lightCount][0] = currentLightSpecular[0];
lightSpecular[lightCount][1] = currentLightSpecular[1];
lightSpecular[lightCount][2] = currentLightSpecular[2];
lightSpecular[4 * lightCount + 0] = currentLightSpecular[0];
lightSpecular[4 * lightCount + 1] = currentLightSpecular[1];
lightSpecular[4 * lightCount + 2] = currentLightSpecular[2];
lightSpecular[4 * lightCount + 3] = currentLightSpecular[3];
lightPosition[lightCount][0] = x;
lightPosition[lightCount][1] = y;
lightPosition[lightCount][2] = z;
lightPosition[lightCount][3] = 1.0f;
lightPosition[4 * lightCount + 0] = x;
lightPosition[4 * lightCount + 1] = y;
lightPosition[4 * lightCount + 2] = z;
lightPosition[4 * lightCount + 3] = 1.0f;
float invn = 1.0f / PApplet.dist(0, 0, 0, nx, ny, nz);
lightNormal[lightCount][0] = invn * nx;
lightNormal[lightCount][1] = invn * ny;
lightNormal[lightCount][2] = invn * nz;
lightNormal[lightCount][3] = 0.0f;
lightNormal[4 * lightCount + 0] = invn * nx;
lightNormal[4 * lightCount + 1] = invn * ny;
lightNormal[4 * lightCount + 2] = invn * nz;
lightNormal[4 * lightCount + 3] = 0.0f;
lightSpotAngle[lightCount] = PApplet.degrees(angle);
lightSpotConcentration[lightCount] = concentration;
//lightSpotAngleCos[lightCount] = Math.max(0, (float) Math.cos(angle));
lightAmbient[lightCount][0] = 0;
lightAmbient[lightCount][1] = 0;
lightAmbient[lightCount][2] = 0;
lightAmbient[lightCount][3] = 1.0f;
lightAmbient[4 * lightCount + 0] = 0;
lightAmbient[4 * lightCount + 1] = 0;
lightAmbient[4 * lightCount + 2] = 0;
lightAmbient[4 * lightCount + 3] = 1.0f;
/*
lightEnable(lightCount);
@@ -5827,7 +5832,20 @@ public class PGraphicsAndroid3D extends PGraphics {
protected static int fillModelviewLoc;
protected static int fillProjectionLoc;
protected static int fillTexturedLoc;
protected static int fillProjmodelviewLoc;
protected static int fillTexturedLoc;
protected static int fillLightCountLoc;
protected static int fillLightPositionLoc;
protected static int fillLightNormalLoc;
protected static int fillLightAmbientLoc;
protected static int fillLightDiffuseLoc;
protected static int fillLightSpecularLoc;
protected static int fillLightFalloffConstantLoc;
protected static int fillLightFalloffLinearLoc;
protected static int fillLightFalloffQuadraticLoc;
protected static int fillLightSpotAngleLoc;
protected static int fillLightSpotConcentrationLoc;
protected static int fillVertexAttribLoc;
protected static int fillColorAttribLoc;
@@ -5861,8 +5879,23 @@ public class PGraphicsAndroid3D extends PGraphics {
fillModelviewLoc = fillShader.getUniformLocation("modelviewMatrix");
fillProjectionLoc = fillShader.getUniformLocation("projectionMatrix");
fillProjmodelviewLoc = fillShader.getUniformLocation("projmodelviewMatrix");
fillTexturedLoc = fillShader.getUniformLocation("textured");
fillLightCountLoc = fillShader.getUniformLocation("lightCount");
fillLightPositionLoc = fillShader.getUniformLocation("lightPosition");
fillLightNormalLoc = fillShader.getUniformLocation("lightNormal");
fillLightAmbientLoc = fillShader.getUniformLocation("lightAmbient");
fillLightDiffuseLoc = fillShader.getUniformLocation("lightDiffuse");
fillLightSpecularLoc = fillShader.getUniformLocation("lightSpecular");
fillLightFalloffConstantLoc = fillShader.getUniformLocation("lightFalloffConstant");
fillLightFalloffLinearLoc = fillShader.getUniformLocation("lightFalloffLinear");
fillLightFalloffQuadraticLoc = fillShader.getUniformLocation("lightFalloffQuadratic");
fillLightSpotAngleLoc = fillShader.getUniformLocation("lightSpotAngle");
fillLightSpotConcentrationLoc = fillShader.getUniformLocation("lightSpotConcentration");
fillVertexAttribLoc = fillShader.getAttribLocation("inVertex");
fillColorAttribLoc = fillShader.getAttribLocation("inColor");
fillNormalAttribLoc = fillShader.getAttribLocation("inNormal");
@@ -5881,15 +5914,61 @@ public class PGraphicsAndroid3D extends PGraphics {
projection.m20, projection.m21, projection.m22, projection.m23,
projection.m30, projection.m31, projection.m32, projection.m33);
// Also send projection * modelview
projmodelview.set(projection);
projmodelview.apply(modelview);
fillShader.setMatUniform(fillProjmodelviewLoc, projmodelview.m00, projmodelview.m01, projmodelview.m02, projmodelview.m03,
projmodelview.m10, projmodelview.m11, projmodelview.m12, projmodelview.m13,
projmodelview.m20, projmodelview.m21, projmodelview.m22, projmodelview.m23,
projmodelview.m30, projmodelview.m31, projmodelview.m32, projmodelview.m33);
// About normal matrix
// http://www.lighthouse3d.com/tutorials/glsl-tutorial/the-normal-matrix/
// http://arcsynthesis.org/gltut/Illumination/Tut09%20Normal%20Transformation.html
//fillShader.setIntUniform(fillLightCountLoc, lightCount);
fillShader.setIntUniform(fillLightCountLoc, 8);
lightAmbient[0] = 0.5f;
lightAmbient[1] = 0;
lightAmbient[2] = 0;
lightAmbient[3] = 0;
lightFalloffConstant[0] = 1;
lightFalloffLinear[0] = 1;
lightFalloffQuadratic[0] = 1;
lightSpotAngle[0] = 1;
lightSpotConcentration[0] = 1;
lightAmbient[4 + 0] = 0;
lightAmbient[4 + 1] = 0;
lightAmbient[4 + 2] = 0.5f;
lightAmbient[4 + 3] = 0;
lightFalloffConstant[1] = 1;
lightFalloffLinear[1] = 1;
lightFalloffQuadratic[1] = 1;
lightSpotAngle[1] = 1;
lightSpotConcentration[1] = 1;
fillShader.setVec4ArrayUniform(fillLightPositionLoc, lightPosition);
fillShader.setVec4ArrayUniform(fillLightNormalLoc, lightNormal);
fillShader.setVec4ArrayUniform(fillLightAmbientLoc, lightAmbient);
fillShader.setVec4ArrayUniform(fillLightDiffuseLoc, lightDiffuse);
fillShader.setVec4ArrayUniform(fillLightSpecularLoc, lightSpecular);
fillShader.setFloatArrayUniform(fillLightFalloffConstantLoc, lightFalloffConstant);
fillShader.setFloatArrayUniform(fillLightFalloffLinearLoc, lightFalloffLinear);
fillShader.setFloatArrayUniform(fillLightFalloffQuadraticLoc, lightFalloffQuadratic);
fillShader.setFloatArrayUniform(fillLightSpotAngleLoc, lightSpotAngle);
fillShader.setFloatArrayUniform(fillLightSpotConcentrationLoc, lightSpotConcentration);
// Multiple lights
// http://en.wikibooks.org/wiki/GLSL_Programming/GLUT/Multiple_Lights
for (int i = 0; i < lightCount; i++) {
//for (int i = 0; i < lightCount; i++) {
// need to pass these to the shader:
// vec4 lightPosition[lightCount]
@@ -5904,8 +5983,16 @@ public class PGraphicsAndroid3D extends PGraphics {
// float lightFalloffQuadratic[lightCount]
// float lightSpotAngle[lightCount]
// float lightSpotConcentration[lightCount]
}
// float lightSpotConcentration[lightCount]
//);
//}
}
protected void stopFillShader() {
android/core/src/processing/core/PShader.java
+17
View File
@@ -281,6 +281,23 @@ public class PShader {
pgl.setFloatUniform(loc, x);
}
public void setFloatArrayUniform(int loc, float[] x) {
pgl.setFloat1ArrayUniform(loc, x);
}
public void setVec2ArrayUniform(int loc, float[] x) {
pgl.setFloat2ArrayUniform(loc, x);
}
public void setVec3ArrayUniform(int loc, float[] x) {
pgl.setFloat3ArrayUniform(loc, x);
}
public void setVec4ArrayUniform(int loc, float[] x) {
pgl.setFloat4ArrayUniform(loc, x);
}
/**
* Sets the vec2 uniform with name to the given values.
*