steffen/VoxelEngine
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fiddling around with lighting and a Rendermanager

Browse source
This commit is contained in:
steffen 2017-10-29 08:37:11 +01:00
parent 8d7625a411
commit 1995d2734e
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Lights/LightingManager.py
View file

@ -52,6 +52,8 @@ class LightingManager:
def render(self, projMatrix, geometryRotMatrix): def render(self, projMatrix, geometryRotMatrix):
self.light.finishDepthMapping() self.light.finishDepthMapping()
def addRenderStep(self,alternateprogramdict,structure): def addRenderStep(self,alternateprogramdict,structure):
r = self.__Renderstep(alternateprogramdict,structure) r = self.__Renderstep(alternateprogramdict,structure)
self.renderSteps.append(r) self.renderSteps.append(r)

11
fragment.glsl
View file

@ -23,6 +23,11 @@ const float screenGamma = 2.2;
const float pitl = 2*3.14159265359 / 16.0; const float pitl = 2*3.14159265359 / 16.0;
const float circlelength = 700.0; const float circlelength = 700.0;
bool isVisible(int i, vec2 offs)
{
return !(texture(ShadowMaps[i],lightviewpos[i].xy + offs).x <= (lightviewpos[i].z - 0.0005*tan(acos(dot(normal,-normalize(lightpos[i] - pos.xyz))))));
}
void main() void main()
{ {
vec3 colorLinear = ambientFactor * colorin; vec3 colorLinear = ambientFactor * colorin;
@ -39,7 +44,7 @@ void main()
float visible = 0; float visible = 0;
for(int j = 0; j < 4; j++){ for(int j = 0; j < 4; j++){
vec2 offs = vec2(cos(j*4*pitl),sin(j*4*pitl)) / circlelength; vec2 offs = vec2(cos(j*4*pitl),sin(j*4*pitl)) / circlelength;
visible += float(!(texture(ShadowMaps[i],lightviewpos[i].xy + offs).x <= (lightviewpos[i].z - 0.0005*tan(acos(dot(normal,-normalize(lightpos[i] - pos.xyz))))))) * 1.0/16.0; visible += float(isVisible(i, offs)) * 1.0/16.0;
} }
if(visible == 0.25) if(visible == 0.25)
visible = 1.0; visible = 1.0;
@ -47,9 +52,11 @@ void main()
visible = 0; visible = 0;
for(int j = 0; j < 16; j++){ for(int j = 0; j < 16; j++){
vec2 offs = vec2(cos(j*pitl),sin(j*pitl)) / circlelength; vec2 offs = vec2(cos(j*pitl),sin(j*pitl)) / circlelength;
visible += float(!(texture(ShadowMaps[i],lightviewpos[i].xy + offs).x <= (lightviewpos[i].z - 0.0005*tan(acos(dot(normal,-normalize(lightpos[i] - pos.xyz))))))) * 1.0/16.0; visible += float(isVisible(i, offs)) * 1.0/16.0;
} }
colorLinear += (visible * 0.5 + 0.5) *(lambertian * diffuseFactor * colorin * lightColor[i] + specular * specFactor*colorin); colorLinear += (visible * 0.5 + 0.5) *(lambertian * diffuseFactor * colorin * lightColor[i] + specular * specFactor*colorin);
colorLinear /= dot(lightpos[i] - pos.xyz, lightpos[i] - pos.xyz)/200;
//colorLinear = vec3(visible * specular); //colorLinear = vec3(visible * specular);
} }