Skip to content
Snippets Groups Projects

Revert "Merge branch 'master' of gitlab.liu.se:emiol517/tsbk07-project"

Open Revert "Merge branch 'master' of gitlab.liu.se:emiol517/tsbk07-project"
revert-d16d61e2 into master
Open Olle Sievers requested to merge revert-d16d61e2 into master
Compare
and
46 files
+ 70405
− 6
Compare changes
  • Side-by-side
  • Inline
Files
46
Wonderland/snow.vert
+ 2
− 2
@@ -23,8 +23,8 @@ vec4 noisetex;
mat3 normalMatrix = mat3(modelMatrix);
exNormal = normalMatrix * inNormal;
xPos = gl_InstanceID%90 + 0.5;
zPos = gl_InstanceID/90 + 0.5;
xPos = gl_InstanceID%40 + 0.5;
zPos = gl_InstanceID/40 + 0.5;
noisetex = texture(noise, vec2(xPos/128, zPos/128)); //rgba
yPos = 1000*noisetex.y + 20*slope;