fix merge

2020-04-18 23:24:43 +02:00
parent 50d36d4015 3c05d6d222
commit 10e32a1957
67 changed files with 558 additions and 7126 deletions
--- a/src/globe/globe-fs.js
+++ b/src/globe/globe-fs.js
@@ -54,7 +54,6 @@ void main(void) {
    outColor = diffuseColor * vec3(NdotL) + diffuseColor * ambient * (1.-NdotL);


-    // outColor =  pow(outColor, vec3(1.0 / 2.2));
    gl_FragColor = vec4( outColor, 1. );
 }
 `