x_ite 5.0.3 → 6.1.0

package/src/x_ite/Components/Rendering/LineSet.js

@@ -72,6 +72,7 @@ function (Fields,
 
       this .fogCoordNode = null;
       this .colorNode    = null;
+      this .normalNode   = null;
       this .coordNode    = null;
    }
 
@@ -84,6 +85,7 @@ function (Fields,
          new X3DFieldDefinition (X3DConstants .inputOutput, "attrib",      new Fields .MFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "fogCoord",    new Fields .SFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "color",       new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "normal",      new Fields .SFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "coord",       new Fields .SFNode ()),
       ]),
       getTypeName: function ()
@@ -105,11 +107,13 @@ function (Fields,
          this ._attrib   .addInterest ("set_attrib__",   this);
          this ._fogCoord .addInterest ("set_fogCoord__", this);
          this ._color    .addInterest ("set_color__",    this);
+         this ._normal   .addInterest ("set_normal__",   this);
          this ._coord    .addInterest ("set_coord__",    this);
 
          this .set_attrib__ ();
          this .set_fogCoord__ ();
          this .set_color__ ();
+         this .set_normal__ ();
          this .set_coord__ ();
       },
       set_attrib__: function ()
@@ -117,7 +121,10 @@ function (Fields,
          const attribNodes = this .getAttrib ();
 
          for (const attribNode of attribNodes)
+         {
             attribNode .removeInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .removeInterest ("updateVertexArrays", this);
+         }
 
          attribNodes .length = 0;
 
@@ -130,7 +137,12 @@ function (Fields,
          }
 
          for (const attribNode of attribNodes)
+         {
             attribNode .addInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .addInterest ("updateVertexArrays", this);
+         }
+
+         this .updateVertexArrays ();
       },
       set_fogCoord__: function ()
       {
@@ -166,6 +178,16 @@ function (Fields,
       {
          this .setTransparent (this .colorNode .getTransparent ());
       },
+      set_normal__: function ()
+      {
+         if (this .normalNode)
+            this .normalNode .removeInterest ("requestRebuild", this);
+
+         this .normalNode = X3DCast (X3DConstants .X3DNormalNode, this ._normal);
+
+         if (this .normalNode)
+            this .normalNode .addInterest ("requestRebuild", this);
+      },
       set_coord__: function ()
       {
          if (this .coordNode)
@@ -184,17 +206,17 @@ function (Fields,
          // Fill GeometryNode
 
          const
-            vertexCount   = this ._vertexCount,
-            attribNodes   = this .getAttrib (),
-            numAttrib     = attribNodes .length,
-            attribs       = this .getAttribs (),
-            fogCoordNode  = this .fogCoordNode,
-            colorNode     = this .colorNode,
-            coordNode     = this .coordNode,
-            fogDepthArray = this .getFogDepths (),
-            colorArray    = this .getColors (),
-            vertexArray   = this .getVertices (),
-            size          = coordNode .getSize ();
+            vertexCount    = this ._vertexCount,
+            attribNodes    = this .getAttrib (),
+            numAttribNodes = attribNodes .length,
+            attribArrays   = this .getAttribs (),
+            fogCoordNode   = this .fogCoordNode,
+            colorNode      = this .colorNode,
+            coordNode      = this .coordNode,
+            fogDepthArray  = this .getFogDepths (),
+            colorArray     = this .getColors (),
+            vertexArray    = this .getVertices (),
+            size           = coordNode .getSize ();
 
          let index = 0;
 
@@ -209,8 +231,8 @@ function (Fields,
 
                for (let i = 0; i < count; ++ i, index += i & 1)
                {
-                  for (let a = 0; a < numAttrib; ++ a)
-                     attribNodes [a] .addValue (index, attribs [a]);
+                  for (let a = 0; a < numAttribNodes; ++ a)
+                     attribNodes [a] .addValue (index, attribArrays [a]);
 
                   if (fogCoordNode)
                      fogCoordNode .addDepth (index, fogDepthArray);

package/src/x_ite/Components/Rendering/PointSet.js

@@ -72,6 +72,7 @@ function (Fields,
 
       this .fogCoordNode = null;
       this .colorNode    = null;
+      this .normalNode   = null;
       this .coordNode    = null;
    }
 
@@ -83,6 +84,7 @@ function (Fields,
          new X3DFieldDefinition (X3DConstants .inputOutput, "attrib",   new Fields .MFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "fogCoord", new Fields .SFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "color",    new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "normal",   new Fields .SFNode ()),
          new X3DFieldDefinition (X3DConstants .inputOutput, "coord",    new Fields .SFNode ()),
       ]),
       getTypeName: function ()
@@ -104,11 +106,13 @@ function (Fields,
          this ._attrib   .addInterest ("set_attrib__",   this);
          this ._fogCoord .addInterest ("set_fogCoord__", this);
          this ._color    .addInterest ("set_color__",    this);
+         this ._normal   .addInterest ("set_normal__",   this);
          this ._coord    .addInterest ("set_coord__",    this);
 
          this .set_attrib__ ();
          this .set_fogCoord__ ();
          this .set_color__ ();
+         this .set_normal__ ();
          this .set_coord__ ();
       },
       getCoord: function ()
@@ -120,7 +124,10 @@ function (Fields,
          const attribNodes = this .getAttrib ();
 
          for (const attribNode of attribNodes)
+         {
             attribNode .removeInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .removeInterest ("updateVertexArrays", this);
+         }
 
          attribNodes .length = 0;
 
@@ -133,7 +140,12 @@ function (Fields,
          }
 
          for (const attribNode of attribNodes)
+         {
             attribNode .addInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .addInterest ("updateVertexArrays", this);
+         }
+
+         this .updateVertexArrays ();
       },
       set_fogCoord__: function ()
       {
@@ -155,6 +167,16 @@ function (Fields,
          if (this .colorNode)
             this .colorNode .addInterest ("requestRebuild", this);
       },
+      set_normal__: function ()
+      {
+         if (this .normalNode)
+            this .normalNode .removeInterest ("requestRebuild", this);
+
+         this .normalNode = X3DCast (X3DConstants .X3DNormalNode, this ._normal);
+
+         if (this .normalNode)
+            this .normalNode .addInterest ("requestRebuild", this);
+      },
       set_coord__: function ()
       {
          if (this .coordNode)
@@ -171,21 +193,21 @@ function (Fields,
             return;
 
          const
-            attribNodes   = this .getAttrib (),
-            numAttrib     = attribNodes .length,
-            attribs       = this .getAttribs (),
-            fogCoordNode  = this .fogCoordNode,
-            fogDepthArray = this .getFogDepths (),
-            colorNode     = this .colorNode,
-            colorArray    = this .getColors (),
-            coordNode     = this .coordNode,
-            vertexArray   = this .getVertices (),
-            numPoints     = coordNode ._point .length;
-
-         for (let a = 0; a < numAttrib; ++ a)
+            attribNodes    = this .getAttrib (),
+            numAttribNodes = attribNodes .length,
+            attribArrays   = this .getAttribs (),
+            fogCoordNode   = this .fogCoordNode,
+            fogDepthArray  = this .getFogDepths (),
+            colorNode      = this .colorNode,
+            colorArray     = this .getColors (),
+            coordNode      = this .coordNode,
+            vertexArray    = this .getVertices (),
+            numPoints      = coordNode ._point .length;
+
+         for (let a = 0; a < numAttribNodes; ++ a)
          {
             for (let i = 0; i < numPoints; ++ i)
-               attribNodes [a] .addValue (i, attribs [a]);
+               attribNodes [a] .addValue (i, attribArrays [a]);
          }
 
          if (fogCoordNode)

package/src/x_ite/Components/Rendering/X3DComposedGeometryNode.js

@@ -119,11 +119,14 @@ function (X3DGeometryNode,
          const attribNodes = this .getAttrib ();
 
          for (const attribNode of attribNodes)
+         {
             attribNode .removeInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .removeInterest ("updateVertexArrays", this);
+         }
 
          attribNodes .length = 0;
 
-         for (const node of  this ._attrib)
+         for (const node of this ._attrib)
          {
             const attribNode = X3DCast (X3DConstants .X3DVertexAttributeNode, node);
 
@@ -132,7 +135,12 @@ function (X3DGeometryNode,
          }
 
          for (const attribNode of attribNodes)
+         {
             attribNode .addInterest ("requestRebuild", this);
+            attribNode ._attribute_changed .addInterest ("updateVertexArrays", this);
+         }
+
+         this .updateVertexArrays ();
       },
       set_fogCoord__: function ()
       {
@@ -222,8 +230,8 @@ function (X3DGeometryNode,
             colorPerVertex     = this ._colorPerVertex .getValue (),
             normalPerVertex    = this ._normalPerVertex .getValue (),
             attribNodes        = this .getAttrib (),
-            numAttrib          = attribNodes .length,
-            attribs            = this .getAttribs (),
+            numAttribNodes     = attribNodes .length,
+            attribArrays       = this .getAttribs (),
             fogCoordNode       = this .getFogCoord (),
             colorNode          = this .getColor (),
             texCoordNode       = this .getTexCoord (),
@@ -246,8 +254,8 @@ function (X3DGeometryNode,
                face  = Math .floor (i / verticesPerFace),
                index = this .getPolygonIndex (this .getTriangleIndex (i));
 
-            for (let a = 0; a < numAttrib; ++ a)
-               attribNodes [a] .addValue (index, attribs [a]);
+            for (let a = 0; a < numAttribNodes; ++ a)
+               attribNodes [a] .addValue (index, attribArrays [a]);
 
             if (fogCoordNode)
                fogCoordNode .addDepth (index, fogDepthArray);