Revert "Core.js polishing"

This reverts commit 1d6cbb3.
cnr-isti-vclab · Nov 11, 2016 · c22e1ed · c22e1ed
1 parent 1d6cbb3
commit c22e1ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/js/mlj/core/Core.js b/js/mlj/core/Core.js
@@ -123,11 +123,11 @@ MLJ.core.AmbientLight = function (scene, camera, renderer) {
  */
 MLJ.core.Headlight = function (scene, camera, renderer) {
     /***************debug****************** */
-    // var geometry = new THREE.BoxGeometry( 1, 1, 1 );
-    // var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
-    // var cube1 = new THREE.Mesh( geometry, material );
-    // var material1 = new THREE.MeshBasicMaterial( {color: 0xFF0000} );
-    // var cube2 = new THREE.Mesh( geometry, material1 );
+    var geometry = new THREE.BoxGeometry( 1, 1, 1 );
+    var material = new THREE.MeshBasicMaterial( {color: 0x00ff00} );
+    var cube1 = new THREE.Mesh( geometry, material );
+    var material1 = new THREE.MeshBasicMaterial( {color: 0xFF0000} );
+    var cube2 = new THREE.Mesh( geometry, material1 );
     /*************************************** */
 
     var _on = true;
@@ -179,7 +179,11 @@ MLJ.core.Headlight = function (scene, camera, renderer) {
      * @author Thomas Alderighi
      */
     this.setPosition = function (pos) {
-      _light.position.set(pos.x+1, pos.y-1, pos.z);
+    //   _light.quaternion.set(0,0,0,1);
+    //   _light.updateMatrixWorld(true);
+        // _lightMesh.lookAt(pos);
+        // _light.position.set(1 , -1, 15);
+      _light.position.set(pos.x + 2, pos.y-2, pos.z);
     }
 
     /**

diff --git a/js/mlj/plugins/rendering/shaders/horBlurFrag.glsl b/js/mlj/plugins/rendering/shaders/horBlurFrag.glsl
@@ -16,7 +16,7 @@ varying vec2 vUv;
 
 vec3 GaussianBlur(sampler2D tex0, vec2 centreUV, vec2 pixelOffset) {
      vec3 colOut = vec3( 0, 0, 0 );
-     //if (texture2D(tex0, centreUV) == vec4(0.0)) discard;
+     if (texture2D(tex0, centreUV) == vec4(0.0)) discard;
      for( int i = 0; i < stepCount; i++ ) {
          vec2 texCoordOffset = gOffsets[i] * pixelOffset;
          vec3 col = texture2D(tex0, centreUV + texCoordOffset).xyz +

diff --git a/js/mlj/plugins/rendering/shaders/verBlurFrag.glsl b/js/mlj/plugins/rendering/shaders/verBlurFrag.glsl
@@ -16,7 +16,7 @@ varying vec2 vUv;
 
 vec3 GaussianBlur(sampler2D tex0, vec2 centreUV, vec2 pixelOffset) {
      vec3 colOut = vec3( 0, 0, 0 );
-    // if (texture2D(tex0, centreUV) == vec4(0.0)) discard;
+     if (texture2D(tex0, centreUV) == vec4(0.0)) discard;
 
      for( int i = 0; i < stepCount; i++ ) {
          vec2 texCoordOffset = gOffsets[i] * pixelOffset;