x_ite 5.0.3 → 6.1.0

package/src/x_ite/Components/Shaders/Matrix3VertexAttribute.js

@@ -95,11 +95,11 @@ function (Fields,
       {
          X3DVertexAttributeNode .prototype .initialize .call (this);
 
-         this ._value .addInterest ("set_value", this);
+         this ._value .addInterest ("set_value__", this);
 
-         this .set_value ();
+         this .set_value__ ();
       },
-      set_value: function ()
+      set_value__: function ()
       {
          this .value  = this ._value .getValue ();
          this .length = this ._value .length;
@@ -108,35 +108,31 @@ function (Fields,
       {
          if (index < this .length)
          {
-            var value = this .value;
+            const value = this .value;
 
-            for (var i = index * 9, l = i + 9; i < l; ++ i)
+            for (let i = index * 9, l = i + 9; i < l; ++ i)
                array .push (value [i]);
          }
          else if (this .length)
          {
-            var value = this .value;
+            const value = this .value;
 
             index = this .length - 1;
 
-            for (var i = index * 9, l = i + 9; i < l; ++ i)
+            for (let i = index * 9, l = i + 9; i < l; ++ i)
                array .push (value [i]);
          }
          else
          {
-            var value = Matrix3 .Identity;
+            const value = Matrix3 .Identity;
 
-            for (var i = 0; i < 9; ++ i)
+            for (let i = 0; i < 9; ++ i)
                array .push (value [i]);
          }
       },
       enable: function (gl, shaderNode, buffer)
       {
-         shaderNode .enableMatrix3Attrib (gl, this ._name .getValue (), buffer);
-      },
-      disable: function (gl, shaderNode)
-      {
-         shaderNode .disableMatrix3Attrib (gl, this ._name .getValue ());
+         shaderNode .enableMatrix3Attrib (gl, this ._name .getValue (), buffer, 0, 0);
       },
    });
 

package/src/x_ite/Components/Shaders/Matrix4VertexAttribute.js

@@ -93,11 +93,11 @@ function (Fields,
       {
          X3DVertexAttributeNode .prototype .initialize .call (this);
 
-         this ._value .addInterest ("set_value", this);
+         this ._value .addInterest ("set_value__", this);
 
-         this .set_value ();
+         this .set_value__ ();
       },
-      set_value: function ()
+      set_value__: function ()
       {
          this .value  = this ._value .getValue ();
          this .length = this ._value .length;
@@ -106,35 +106,31 @@ function (Fields,
       {
          if (index < this .length)
          {
-            var value = this .value;
+            const value = this .value;
 
-            for (var i = index * 16, l = i + 16; i < l; ++ i)
+            for (let i = index * 16, l = i + 16; i < l; ++ i)
                array .push (value [i]);
          }
          else if (this .length)
          {
-            var value = this .value;
+            const value = this .value;
 
             index = this .length - 1;
 
-            for (var i = index * 16, l = i + 16; i < l; ++ i)
+            for (let i = index * 16, l = i + 16; i < l; ++ i)
                array .push (value [i]);
          }
          else
          {
-            var value = Matrix4 .Identity;
+            const value = Matrix4 .Identity;
 
-            for (var i = 0; i < 16; ++ i)
+            for (let i = 0; i < 16; ++ i)
                array .push (value [i]);
          }
       },
       enable: function (gl, shaderNode, buffer)
       {
-         shaderNode .enableMatrix4Attrib (gl, this ._name .getValue (), buffer);
-      },
-      disable: function (gl, shaderNode)
-      {
-         shaderNode .disableMatrix4Attrib (gl, this ._name .getValue ());
+         shaderNode .enableMatrix4Attrib (gl, this ._name .getValue (), buffer, 0, 0);
       },
    });
 

package/src/x_ite/Components/Shaders/ShaderPart.js

@@ -77,7 +77,6 @@ function (Fields,
 
       this .addType (X3DConstants .ShaderPart);
 
-      this .valid   = false;
       this .options = [ ];
    }
 
@@ -116,10 +115,6 @@ function (Fields,
 
          this .requestImmediateLoad ();
       },
-      isValid: function ()
-      {
-         return this .valid;
-      },
       getShader: function ()
       {
          return this .shader;
@@ -164,8 +159,6 @@ function (Fields,
       },
       loadNow: function ()
       {
-         this .valid = false;
-
          new FileLoader (this) .loadDocument (this ._url,
          function (data)
          {
@@ -183,9 +176,7 @@ function (Fields,
                gl .shaderSource (this .shader, source);
                gl .compileShader (this .shader);
 
-               this .valid = gl .getShaderParameter (this .shader, gl .COMPILE_STATUS);
-
-               if (! this .valid)
+               if (!gl .getShaderParameter (this .shader, gl .COMPILE_STATUS))
                   throw new Error (this .getTypeName () + " '" + this .getName () + "': " + gl .getShaderInfoLog (this .shader));
 
                this .setLoadState (X3DConstants .COMPLETE_STATE);