Skip to content

ofMaterial - unnecessary toGlm #8430

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

Merged
ofTheo merged 1 commit into from
Apr 18, 2025
Merged

ofMaterial - unnecessary toGlm #8430

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
8 changes: 4 additions & 4 deletions libs/openFrameworks/gl/ofMaterial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer &
glm::vec3 direction = light->direction;
if( !isPBR() ) {
direction = glm::vec3(light->position) + light->direction;
glm::vec4 direction4 = renderer.getCurrentViewMatrix() * glm::vec4(direction,1.0);
glm::vec4 direction4 = renderer.getCurrentViewMatrix() * glm::vec4(direction, 1.0f);
direction = glm::vec3(direction4) / direction4.w;
direction = direction - glm::vec3(lightEyePosition);
shader.setUniform3f("lights["+idx+"].spotDirection", glm::normalize(direction));
Expand All @@ -1203,7 +1203,7 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer &
glm::vec3 direction = light->direction;
if( !isPBR() ) {
direction = glm::vec3(light->position) + light->direction;
glm::vec4 direction4 = renderer.getCurrentViewMatrix() * glm::vec4(direction, 1.0);
glm::vec4 direction4 = renderer.getCurrentViewMatrix() * glm::vec4(direction, 1.0f);
direction = glm::vec3(direction4) / direction4.w;
direction = direction - glm::vec3(lightEyePosition);
shader.setUniform3f("lights["+idx+"].spotDirection", glm::normalize(direction));
Expand All @@ -1213,12 +1213,12 @@ void ofMaterial::updateLights(const ofShader & shader,ofGLProgrammableRenderer &
auto up = light->up;
if( !isPBR() ) {
right = glm::vec3(light->position) + light->right;
glm::vec4 right4 = renderer.getCurrentViewMatrix() * glm::vec4(right, 1.0);
glm::vec4 right4 = renderer.getCurrentViewMatrix() * glm::vec4(right, 1.0f);
right = glm::vec3(right4) / right4.w;
right = right - glm::vec3(lightEyePosition);
up = glm::cross(right, direction);
}
shader.setUniform3f("lights["+idx+"].right", glm::normalize(toGlm(right)));
shader.setUniform3f("lights["+idx+"].right", glm::normalize(right));
shader.setUniform3f("lights["+idx+"].up", glm::normalize(up));
}
}
Expand Down
Loading