Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:57:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clean up and less changes

Browse source
This commit is contained in:
sam 2016-12-09 03:05:25 -08:00
parent 914fc7fca8
commit 2427a16d6e
5 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu-gl/src/gpu/gl/GLShader.cpp
View file

@ -32,7 +32,7 @@ GLShader::~GLShader() {
// GLSL version // GLSL version
static const std::string glslVersion { static const std::string glslVersion {
"#version 450 core" "#version 410 core"
}; };
// Shader domain // Shader domain

2
libraries/render-utils/src/lightClusters_drawClusterContent.slf
View file

@ -46,7 +46,7 @@ void main(void) {
int clusterOffset = cluster.z; int clusterOffset = cluster.z;
ivec3 dims = ivec3(frustumGrid.dims.x, frustumGrid.dims.y, frustumGrid.dims.z); ivec3 dims = frustumGrid.dims.xyz;
dims.z +=1; dims.z +=1;
ivec3 summedDims = ivec3(dims.x * dims.y, dims.x, 1); ivec3 summedDims = ivec3(dims.x * dims.y, dims.x, 1);

2
libraries/render-utils/src/lightClusters_drawClusterFromDepth.slf
View file

@ -42,7 +42,7 @@ void main(void) {
float numLightsScale = clamp(numLights * 0.05, 0.01, 1.0); float numLightsScale = clamp(numLights * 0.05, 0.01, 1.0);
ivec3 dims = ivec3(frustumGrid.dims.x, frustumGrid.dims.y, frustumGrid.dims.z); ivec3 dims = frustumGrid.dims.xyz;
dims.z +=1; dims.z +=1;
ivec3 summedDims = ivec3(dims.x * dims.y, dims.x, 1); ivec3 summedDims = ivec3(dims.x * dims.y, dims.x, 1);

2
libraries/render-utils/src/local_lights_drawOutline.slf
View file

@ -65,7 +65,7 @@ void main(void) {
} }
int lightClusterOffset = cluster.z; int lightClusterOffset = cluster.z;
ivec3 dims = ivec3(frustumGrid.dims.x, frustumGrid.dims.y, frustumGrid.dims.z); ivec3 dims = frustumGrid.dims.xyz;
if (clusterPos.x < 0 || clusterPos.x >= dims.x) { if (clusterPos.x < 0 || clusterPos.x >= dims.x) {
discard; discard;
} }

9
libraries/render-utils/src/local_lights_shading.slf
View file

@ -53,21 +53,14 @@ void main(void) {
vec4 clusterEyePos = frustumGrid_worldToEye(fragPos); vec4 clusterEyePos = frustumGrid_worldToEye(fragPos);
ivec3 clusterPos = frustumGrid_eyeToClusterPos(clusterEyePos.xyz); ivec3 clusterPos = frustumGrid_eyeToClusterPos(clusterEyePos.xyz);
vec3 volumePos = frustumGrid_eyeToVolume(clusterEyePos.xyz, frustumGrid.eyeToGridProj, frustumGrid.rangeNear, frustumGrid.rangeFar);
ivec3 dims = ivec3(frustumGrid.dims.x, frustumGrid.dims.y, frustumGrid.dims.z);
vec3 gridPos = frustumGrid_volumeToGrid(volumePos, dims);
ivec3 cluster = clusterGrid_getCluster(frustumGrid_clusterToIndex(clusterPos)); ivec3 cluster = clusterGrid_getCluster(frustumGrid_clusterToIndex(clusterPos));
int numLights = cluster.x + cluster.y; int numLights = cluster.x + cluster.y;
if (numLights <= 0) { if (numLights <= 0) {
discard; discard;
} }
int lightClusterOffset = cluster.z; int lightClusterOffset = cluster.z;
// ivec3 dims = ivec3(frustumGrid.dims.x, frustumGrid.dims.y, frustumGrid.dims.z);
//ivec3 dims = frustumGrid.dims.xyz;
ivec3 dims = frustumGrid.dims.xyz;
if (clusterPos.x < 0 || clusterPos.x >= dims.x) { if (clusterPos.x < 0 || clusterPos.x >= dims.x) {
discard; discard;
} }