Add basic lighning and fix meta viewport

Luigi De Rosa · Luigi De Rosa · commit df55df154995 · 2019-05-31T09:17:32.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,7 +30,7 @@
     "orbit-controls-es6": "^2.0.0",
     "parcel-bundler": "^1.12.3",
     "resource-loader": "^2.2.4",
-    "three": "^0.104.0"
+    "three": "^0.105.1"
   },
   "dependencies": {}
 }
diff --git a/src/index.html b/src/index.html
@@ -1,6 +1,7 @@
 <html>
   <head>
     <title>Developers in Vicenza</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <style>
       html, body {
         margin: 0;
diff --git a/src/js/cube/cube.frag b/src/js/cube/cube.frag
@@ -5,7 +5,8 @@ uniform vec3 color; // ms({ value: '#ff0000' })
 uniform float xAlpha; // ms({ value: 0, step: 0.01, range: [0, 1] })
 
 varying vec2 vUv;
-varying float vDelay;
+varying vec3 vNormal;
+// varying float vDelay;
 
 void main(){
   // float alpha = step(xAlpha, vUv.x);
@@ -19,6 +20,11 @@ void main(){
   if (vUv.x > xAlpha){
     discard;
   }
+
+  vec3 L = vec3(0.4);
+  float force = max(dot(normalize(vNormal),L), 0.0);
+
+  color *= smoothstep(-0.8, 1.0, force);
   
   gl_FragColor = vec4(color, 1.);
 }
diff --git a/src/js/cube/cube.vert b/src/js/cube/cube.vert
@@ -3,17 +3,20 @@ precision highp float;
 attribute vec3 position;
 attribute vec3 offset;
 attribute vec2 uv;
-attribute float delay;
+attribute vec3 normal;
+// attribute float delay;
 
 uniform mat4 modelViewMatrix;
 uniform mat4 projectionMatrix;
+uniform mat3 normalMatrix;
 uniform float uSpeed; // ms({ value: 0.0, step: 0.001, range: [-10, 10] })
 uniform float uForce; // ms({ value: 0.0, step: 0.001, range: [-10, 10] })
 uniform float uRotation; // ms({ value: -0.35, step: 0.001, range: [-1, 1] })
 uniform float uTime;
 
 varying vec2 vUv;
-varying float vDelay;
+// varying float vDelay;
+varying vec3 vNormal;
 
 mat3 rotateX(float theta){
   float c=cos(theta);
@@ -41,16 +44,20 @@ mat3 rotateZ(float theta){
 void main(){
   vUv=uv;
   vUv=clamp(vUv,0.,.999);
-  vDelay=delay;
+  // vDelay=delay;
+  vNormal = normal * normalMatrix;
   
   vec3 pos=position;
   vec3 pivot=vec3(0.,0.,0.);
   
   float force=pos.x*uForce;
   
   pos.xyz+=pivot;
-  pos=pos*rotateX(force+uTime * 3.0);
-  // vNormal = vNormal * rotateX(-(force + speed));
+
+  float angle = force + uTime * 3.0;
+  
+  pos= pos * rotateX(angle);
+  vNormal = vNormal * rotateX(-angle);
   pos.xyz-=pivot;
   
   // pos=pos*rotateZ(uRotation);

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`"orbit-controls-es6": "^2.0.0",`
`31`	`31`	`"parcel-bundler": "^1.12.3",`
`32`	`32`	`"resource-loader": "^2.2.4",`
`33`		`- "three": "^0.104.0"`
	`33`	`+ "three": "^0.105.1"`
`34`	`34`	`},`
`35`	`35`	`"dependencies": {}`
`36`	`36`	`}`