Skip to content

Setting view, viewInv and cameraPos uniforms to shaders by default #5504 #5506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Dawars wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Setting view, viewInv and cameraPos uniforms to shaders by default #5504 #5506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions core/src/processing/opengl/PGraphicsOpenGL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,9 @@ public void dispose() {
// To pass to shaders
protected float[] glProjection;
protected float[] glModelview;
protected float[] glView;
protected float[] glViewInv;
protected float[] glCamPos;
protected float[] glProjmodelview;
protected float[] glNormal;

Expand Down Expand Up @@ -1755,6 +1758,67 @@ protected void updateGLModelview() {
glModelview[15] = modelview.m33;
}

protected void updateGLView() {
if (glView == null) {
glView = new float[16];
}

glView[0] = camera.m00;
glView[1] = camera.m10;
glView[2] = camera.m20;
glView[3] = camera.m30;

glView[4] = camera.m01;
glView[5] = camera.m11;
glView[6] = camera.m21;
glView[7] = camera.m31;

glView[8] = camera.m02;
glView[9] = camera.m12;
glView[10] = camera.m22;
glView[11] = camera.m32;

glView[12] = camera.m03;
glView[13] = camera.m13;
glView[14] = camera.m23;
glView[15] = camera.m33;
}

protected void updateGLViewInv() {
if (glViewInv == null) {
glViewInv = new float[16];
}

glViewInv[0] = cameraInv.m00;
glViewInv[1] = cameraInv.m10;
glViewInv[2] = cameraInv.m20;
glViewInv[3] = cameraInv.m30;

glViewInv[4] = cameraInv.m01;
glViewInv[5] = cameraInv.m11;
glViewInv[6] = cameraInv.m21;
glViewInv[7] = cameraInv.m31;

glViewInv[8] = cameraInv.m02;
glViewInv[9] = cameraInv.m12;
glViewInv[10] = cameraInv.m22;
glViewInv[11] = cameraInv.m32;

glViewInv[12] = cameraInv.m03;
glViewInv[13] = cameraInv.m13;
glViewInv[14] = cameraInv.m23;
glViewInv[15] = cameraInv.m33;
}

protected void updateGLCameraPos() {
if (glCamPos == null) {
glCamPos = new float[3];
}

glCamPos[0] = modelviewInv.m03;
glCamPos[1] = modelviewInv.m13;
glCamPos[2] = modelviewInv.m23;
}

protected void updateGLProjmodelview() {
if (glProjmodelview == null) {
Expand Down
34 changes: 34 additions & 0 deletions core/src/processing/opengl/PShader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ public class PShader implements PConstants {
// Uniforms common to all shader types
protected int transformMatLoc;
protected int modelviewMatLoc;
protected int viewMatLoc;
protected int viewInvMatLoc;
protected int cameraPosLoc;
protected int projectionMatLoc;
protected int ppixelsLoc;
protected int ppixelsUnit;
Expand Down Expand Up @@ -1153,6 +1156,18 @@ protected void loadUniforms() {
if (modelviewMatLoc == -1)
modelviewMatLoc = getUniformLoc("modelviewMatrix");

viewMatLoc = getUniformLoc("view");
if (viewMatLoc == -1)
viewMatLoc = getUniformLoc("viewMatrix");

viewInvMatLoc = getUniformLoc("viewInv");
if (viewInvMatLoc == -1)
viewInvMatLoc = getUniformLoc("viewInvMatrix");

cameraPosLoc = getUniformLoc("cameraPos");
if (cameraPosLoc == -1)
cameraPosLoc = getUniformLoc("camera");

projectionMatLoc = getUniformLoc("projection");
if (projectionMatLoc == -1)
projectionMatLoc = getUniformLoc("projectionMatrix");
Expand Down Expand Up @@ -1197,6 +1212,25 @@ protected void setCommonUniforms() {
setUniformMatrix(modelviewMatLoc, currentPG.glModelview);
}

if (-1 < viewMatLoc) {
currentPG.updateGLView();
setUniformMatrix(viewMatLoc, currentPG.glView);
}

if (-1 < viewInvMatLoc) {
currentPG.updateGLViewInv();
setUniformMatrix(viewInvMatLoc, currentPG.glViewInv);
}

if (-1 < cameraPosLoc) {
currentPG.updateGLCameraPos();

float x = currentPG.glCamPos[0];
float y = currentPG.glCamPos[1];
float z = currentPG.glCamPos[2];
setUniformValue(cameraPosLoc, x, y, z);
}

if (-1 < projectionMatLoc) {
currentPG.updateGLProjection();
setUniformMatrix(projectionMatLoc, currentPG.glProjection);
Expand Down