Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 06:36:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix polyvox

Browse source
This commit is contained in:
SamGondelman 2019-07-11 13:34:58 -07:00
parent 22a7a97a9a
commit 7793e07eeb
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/entities-renderer/src/polyvox.slf
View file

@ -39,7 +39,6 @@
<@endif@>
layout(location=RENDER_UTILS_ATTR_POSITION_MS) in vec3 _positionMS;
layout(location=RENDER_UTILS_ATTR_NORMAL_WS) in vec3 _normalWS;
layout(location=RENDER_UTILS_ATTR_NORMAL_MS) in vec3 _normalMS;
LAYOUT(binding=ENTITIES_TEXTURE_POLYVOX_XMAP) uniform sampler2D xMap;
LAYOUT(binding=ENTITIES_TEXTURE_POLYVOX_YMAP) uniform sampler2D yMap;
@ -81,7 +80,7 @@ void main(void) {
vec4 xzDiffuse = texture(yMap, vec2(-inPositionX, inPositionZ));
vec4 yzDiffuse = texture(zMap, vec2(inPositionZ, -inPositionY));
vec3 normalMS = normalize(_normalMS);
vec3 normalMS = normalize(cross(dFdy(_positionMS.xyz), dFdx(_positionMS.xyz)));
vec3 xyDiffuseScaled = xyDiffuse.rgb * abs(normalMS.z);
vec3 xzDiffuseScaled = xzDiffuse.rgb * abs(normalMS.y);
vec3 yzDiffuseScaled = yzDiffuse.rgb * abs(normalMS.x);

2
libraries/entities-renderer/src/polyvox.slv
View file

@ -24,7 +24,6 @@
<@endif@>
layout(location=RENDER_UTILS_ATTR_POSITION_MS) out vec3 _positionMS;
layout(location=RENDER_UTILS_ATTR_NORMAL_WS) out vec3 _normalWS;
layout(location=RENDER_UTILS_ATTR_NORMAL_MS) out vec3 _normalMS;
<@endif@>
void main(void) {
@ -41,7 +40,6 @@ void main(void) {
<@endif@>
<$transformModelToWorldDir(cam, obj, inNormal.xyz, _normalWS)$>
_normalMS = inNormal.xyz;
_positionMS = inPosition.xyz;
<@endif@>
<@if HIFI_USE_FADE@>