x_ite 4.2.17 → 4.7.7

package/src/x_ite/Components/EnvironmentalEffects/Fog.js

@@ -60,10 +60,10 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DBindableNode, 
+          X3DBindableNode,
           X3DFogObject,
           TraverseType,
-		  X3DConstants,
+		    X3DConstants,
           Matrix4)
 {
 "use strict";
@@ -112,20 +112,11 @@ function (Fields,
 		{
 			return this .modelMatrix;
 		},
-		bindToLayer: function (layer)
-		{
-			layer .getFogStack () .push (this);
-		},
-		unbindFromLayer: function (layer)
-		{
-			layer .getFogStack () .pop (this);
-		},
-		removeFromLayer: function (layer)
-		{
-			layer .getFogStack () .remove (this);
-		},
 		traverse: function (type, renderObject)
 		{
+			if (type !== TraverseType .CAMERA)
+				return;
+
 			renderObject .getLayer () .getFogs () .push (this);
 
 			this .modelMatrix .assign (renderObject .getModelViewMatrix () .get ());
@@ -134,5 +125,3 @@ function (Fields,
 
 	return Fog;
 });
-
-

package/src/x_ite/Components/EnvironmentalEffects/FogCoordinate.js

@@ -57,7 +57,7 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DGeometricPropertyNode, 
+          X3DGeometricPropertyNode,
           X3DConstants)
 {
 "use strict";
@@ -90,9 +90,61 @@ function (Fields,
 		{
 			return "fogCoord";
 		},
+		initialize: function ()
+		{
+			X3DGeometricPropertyNode .prototype .initialize .call (this);
+
+			this .depth_ .addInterest ("set_depth__", this);
+
+			this .set_depth__ ();
+		},
+		set_depth__: function ()
+		{
+			this .depth  = this .depth_ .getValue ();
+			this .length = this .depth_ .length;
+		},
+		isEmpty: function ()
+		{
+			return this .length === 0;
+		},
+		getSize: function ()
+		{
+			return this .length;
+		},
+		addDepth: function (index, array)
+		{
+			if (index < this .length)
+				array .push (this .depth [index]);
+
+			else if (this .length)
+				array .push (this .depth [this .length - 1]);
+
+			else
+				array .push (0);
+		},
+		addDepths: function (array, min)
+		{
+			var length = this .length;
+
+			if (length)
+			{
+				const depth = this .depth;
+
+				for (var index = 0; index < length; ++ index)
+					array .push (depth [index]);
+
+				var last = depth [length - 1];
+
+				for (var index = length; index < min; ++ index)
+					array .push (last);
+			}
+			else
+			{
+				for (var index = 0; index < min; ++ index)
+					array .push (0);
+			}
+		},
 	});
 
 	return FogCoordinate;
 });
-
-

package/src/x_ite/Components/EnvironmentalEffects/LocalFog.js

@@ -58,8 +58,8 @@ define ([
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DChildNode, 
-          X3DFogObject, 
+          X3DChildNode,
+          X3DFogObject,
           X3DConstants)
 {
 "use strict";
@@ -114,11 +114,9 @@ function (Fields,
 		pop: function (renderObject)
 		{
 			if (this .enabled_ .getValue ())
-				renderObject .getBrowser () .getLocalFogs () .push (renderObject .popLocalFog ());
+				renderObject .getBrowser () .getLocalObjects () .push (renderObject .popLocalFog ());
 		},
 	});
 
 	return LocalFog;
 });
-
-

package/src/x_ite/Components/EnvironmentalEffects/X3DBackgroundNode.js

@@ -160,7 +160,7 @@ function (X3DBindableNode,
 		this .projectionMatrixArray = new Float32Array (16);
 		this .modelMatrix           = new Matrix4 ();
 		this .modelViewMatrixArray  = new Float32Array (16);
-		this .shaderObjects         = [ ];
+		this .localObjects          = [ ];
 		this .colors                = [ ];
 		this .sphere                = [ ];
 		this .textures              = 0;
@@ -229,31 +229,19 @@ function (X3DBindableNode,
 
 			if (texture)
 			{
-				texture .loadState_ .addInterest ("setTextureBit", this, bit);
-				this .setTextureBit (texture .loadState_, bit);
+				texture .loadState_ .addInterest ("setTextureBit", this, texture, bit);
+				this .setTextureBit (texture .loadState_, texture, bit);
 			}
 			else
-				this .textures &= ~(1 << bit);
+				this .setTextureBit (X3DConstants .NOT_STARTED, null, bit);
 		},
-		setTextureBit: function (loadState, bit)
+		setTextureBit: function (loadState, texture, bit)
 		{
-			if (loadState .getValue () === X3DConstants .COMPLETE_STATE)
+			if (loadState .getValue () === X3DConstants .COMPLETE_STATE || (texture && texture .getData ()))
 				this .textures |= 1 << bit;
 			else
 				this .textures &= ~(1 << bit);
 		},
-		bindToLayer: function (layer)
-		{
-			layer .getBackgroundStack () .push (this);
-		},
-		unbindFromLayer: function (layer)
-		{
-			layer .getBackgroundStack () .pop (this);
-		},
-		removeFromLayer: function (layer)
-		{
-			layer .getBackgroundStack () .remove (this);
-		},
 		setHidden: function (value)
 		{
 			this .hidden = value;
@@ -264,7 +252,7 @@ function (X3DBindableNode,
 		{
 			return this .hidden;
 		},
-		isTransparent: function ()
+		getTransparent: function ()
 		{
 			if (this .hidden)
 				return true;
@@ -320,13 +308,13 @@ function (X3DBindableNode,
 				                     s,  s, -s, 1, -s, -s, -s, 1,  s, -s, -s, 1,
 				                    -s,  s,  s, 1,  s,  s,  s, 1, -s, -s,  s, 1, // Front
 				                    -s, -s,  s, 1,  s,  s,  s, 1,  s, -s,  s, 1,
-				                    -s,  s, -s, 1, -s,  s,  s, 1, -s, -s,  s, 1, // Left	
+				                    -s,  s, -s, 1, -s,  s,  s, 1, -s, -s,  s, 1, // Left
 				                    -s,  s, -s, 1, -s, -s,  s, 1, -s, -s, -s, 1,
-				                    	s,  s,  s, 1,  s,  s, -s, 1,  s, -s,  s, 1, // Right		
+				                    	s,  s,  s, 1,  s,  s, -s, 1,  s, -s,  s, 1, // Right
 				                     s, -s,  s, 1,  s,  s, -s, 1,  s, -s, -s, 1,
-				                    	s,  s,  s, 1, -s,  s,  s, 1, -s,  s, -s, 1, // Top		
+				                    	s,  s,  s, 1, -s,  s,  s, 1, -s,  s, -s, 1, // Top
 				                     s,  s,  s, 1, -s,  s, -s, 1,  s,  s, -s, 1,
-				                    -s, -s,  s, 1,  s, -s,  s, 1, -s, -s, -s, 1, // Bottom	
+				                    -s, -s,  s, 1,  s, -s,  s, 1, -s, -s, -s, 1, // Bottom
 				                    -s, -s, -s, 1,  s, -s,  s, 1,  s, -s, -s, 1);
 
 				var c = this .skyColor_ [0];
@@ -341,7 +329,7 @@ function (X3DBindableNode,
 				if (this .skyColor_ .length > this .skyAngle_ .length)
 				{
 					var vAngle = [ ];
-					
+
 					for (var i = 0, length = this .skyAngle_ .length; i < length; ++ i)
 						vAngle .push (this .skyAngle_ [i]);
 
@@ -350,7 +338,7 @@ function (X3DBindableNode,
 
 					var vAngleMax = this .groundColor_ .length > this .groundAngle_ .length ? Math .PI / 2 : Math .PI;
 
-					if (vAngle [vAngle .length - 1] < vAngleMax)
+					if (vAngle .at (-1) < vAngleMax)
 						vAngle .push (vAngleMax);
 
 					this .buildSphere (RADIUS, vAngle, this .skyAngle_, this .skyColor_, alpha, false);
@@ -359,7 +347,7 @@ function (X3DBindableNode,
 				if (this .groundColor_ .length > this .groundAngle_ .length)
 				{
 					var vAngle = [ ];
-					
+
 					for (var i = 0, length = this .groundAngle_ .length; i < length; ++ i)
 						vAngle .push (this .groundAngle_ [i]);
 
@@ -368,7 +356,7 @@ function (X3DBindableNode,
 					if (vAngle .length === 0 || vAngle [0] < Math .PI / 2)
 						vAngle .unshift (Math .PI / 2);
 
-					if (vAngle [vAngle .length - 1] > 0)
+					if (vAngle .at (-1) > 0)
 						vAngle .push (0);
 
 					this .buildSphere (RADIUS, vAngle, this .groundAngle_, this .groundColor_, alpha, true);
@@ -383,7 +371,7 @@ function (X3DBindableNode,
 				phi         = 0,
 				vAngleMax   = bottom ? Math .PI / 2 : Math .PI,
 				V_DIMENSION = vAngle .length - 1;
-			
+
 			for (var v = 0; v < V_DIMENSION; ++ v)
 			{
 				var
@@ -398,11 +386,11 @@ function (X3DBindableNode,
 
 				z1 .setPolar (radius, theta1);
 				z2 .setPolar (radius, theta2);
-				
+
 				var
 					c1 = this .getColor (vAngle [v],     color, angle),
 					c2 = this .getColor (vAngle [v + 1], color, angle);
-				
+
 				for (var u = 0; u < U_DIMENSION; ++ u)
 				{
 					// p4 --- p1
@@ -412,7 +400,7 @@ function (X3DBindableNode,
 
 					// The last point is the first one.
 					var u1 = u < U_DIMENSION - 1 ? u + 1 : 0;
-			
+
 					// p1, p2
 					phi = 2 * Math .PI * (u / U_DIMENSION);
 					y1  .setPolar (-z1 .imag, phi);
@@ -422,7 +410,7 @@ function (X3DBindableNode,
 					phi = 2 * Math .PI * (u1 / U_DIMENSION);
 					y3  .setPolar (-z2 .imag, phi);
 					y4  .setPolar (-z1 .imag, phi);
-					
+
 					// Triangle 1 and 2
 
 					this .colors .push (c1 .r, c1 .g, c1 .b, alpha,
@@ -439,7 +427,7 @@ function (X3DBindableNode,
 					                    // Triangle 2
 					                    y1 .imag, z1 .real, y1 .real, 1,
 					                    y4 .imag, z1 .real, y4 .real, 1,
-					                    y3 .imag, z2 .real, y3 .real, 1);	
+					                    y3 .imag, z2 .real, y3 .real, 1);
 				}
 			}
 		},
@@ -496,19 +484,19 @@ function (X3DBindableNode,
 					renderObject .getLayer () .getBackgrounds () .push (this);
 
 					this .modelMatrix .assign (renderObject .getModelViewMatrix () .get ());
-					break;
+					return;
 				}
 				case TraverseType .DISPLAY:
 				{
 					var
-						sourceObjects = renderObject .getShaderObjects (),
-						destObjects   = this .shaderObjects;
+						sourceObjects = renderObject .getLocalObjects (),
+						destObjects   = this .localObjects;
 
 					for (var i = 0, length = sourceObjects .length; i < length; ++ i)
 						destObjects [i] = sourceObjects [i];
 
 					destObjects .length = sourceObjects .length;
-					break;
+					return;
 				}
 			}
 		},
@@ -527,142 +515,156 @@ function (X3DBindableNode,
 				{
 					if (this .hidden)
 						return;
-	
+
 					// Setup context.
-		
+
 					gl .disable (gl .DEPTH_TEST);
 					gl .depthMask (false);
 					gl .enable (gl .CULL_FACE);
 					gl .frontFace (gl .CCW);
-	
+
 					// Get background scale.
-	
-					var
-						viewpoint      = renderObject .getViewpoint (),
-						navigationInfo = renderObject .getNavigationInfo (),
-						farValue       = -ViewVolume .unProjectPointMatrix (0, 0, 1, invProjectionMatrix .assign (renderObject .getProjectionMatrix () .get ()) .inverse (), viewport, farVector) .z * 0.8;
+
+					var farValue = -ViewVolume .unProjectPointMatrix (0, 0, 1, invProjectionMatrix .assign (renderObject .getProjectionMatrix () .get ()) .inverse (), viewport, farVector) .z * 0.8;
 
 					// Get projection matrix.
-	
-					this .projectionMatrixArray .set (renderObject .getProjectionMatrix () .get ());	
-	
+
+					this .projectionMatrixArray .set (renderObject .getProjectionMatrix () .get ());
+
 					// Rotate and scale background.
-	
+
 					modelViewMatrix .assign (this .modelMatrix);
-					modelViewMatrix .multRight (renderObject .getInverseCameraSpaceMatrix () .get ());
+					modelViewMatrix .multRight (renderObject .getViewMatrix () .get ());
 					modelViewMatrix .get (null, rotation);
 					modelViewMatrix .identity ();
 					modelViewMatrix .rotate (rotation);
 					modelViewMatrix .scale (scale .set (farValue, farValue, farValue));
 
 					this .modelViewMatrixArray .set (modelViewMatrix);
-	
+
 					// Draw background sphere and texture cube.
-	
+
 					this .drawSphere (renderObject);
-	
+
 					if (this .textures)
 						this .drawCube (renderObject);
 				}
 				catch (error)
-				{ }
+				{
+					console .log (error);
+				}
 			};
 		})(),
 		drawSphere: function (renderObject)
 		{
 			var transparency = this .transparency_ .getValue ();
-		
+
 			if (transparency >= 1)
 				return;
-	
+
 			var
 				browser    = renderObject .getBrowser (),
 				gl         = browser .getContext (),
 				shaderNode = browser .getBackgroundSphereShader ();
 
-			shaderNode .enable (gl);
+			if (shaderNode .getValid ())
+			{
+				shaderNode .enable (gl);
+
+				// Clip planes
 
-			// Clip planes
+				shaderNode .setLocalObjects (gl, this .localObjects);
 
-			shaderNode .setShaderObjects (gl, this .shaderObjects);
+				// Enable vertex attribute arrays.
 
-			// Enable vertex attribute arrays.
+				shaderNode .enableColorAttribute  (gl, this .colorBuffer);
+				shaderNode .enableVertexAttribute (gl, this .sphereBuffer);
 
-			shaderNode .enableColorAttribute  (gl, this .colorBuffer);
-			shaderNode .enableVertexAttribute (gl, this .sphereBuffer);
+				// Uniforms
 
-			// Uniforms
+				gl .uniformMatrix4fv (shaderNode .x3d_ProjectionMatrix, false, this .projectionMatrixArray);
+				gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,  false, this .modelViewMatrixArray);
 
-			gl .uniformMatrix4fv (shaderNode .x3d_ProjectionMatrix, false, this .projectionMatrixArray);
-			gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,  false, this .modelViewMatrixArray);
+				// Setup context.
 
-			// Setup context.
-	
-			if (transparency)
-				gl .enable (gl .BLEND);
-			else
-				gl .disable (gl .BLEND);
+				if (transparency)
+					gl .enable (gl .BLEND);
+				else
+					gl .disable (gl .BLEND);
 
-			// Draw.
+				// Draw.
 
-			gl .drawArrays (gl .TRIANGLES, 0, this .sphereCount);
+				gl .drawArrays (gl .TRIANGLES, 0, this .sphereCount);
 
-			// Disable vertex attribute arrays.
+				// Disable vertex attribute arrays.
 
-			shaderNode .disableColorAttribute (gl);
-			shaderNode .disable (gl);
+				shaderNode .disableColorAttribute (gl);
+				shaderNode .disable (gl);
+			}
 		},
 		drawCube: (function ()
 		{
-			var textureMatrixArray = new Float32Array (new Matrix4 ());
+			const
+				textureMatrixArray = new Float32Array (new Matrix4 ()),
+				white              = new Float32Array ([1, 1, 1]);
 
 			return function (renderObject)
 			{
 				var
 					browser    = renderObject .getBrowser (),
 					gl         = browser .getContext (),
-					shaderNode = browser .getGouraudShader ();
-	
-				shaderNode .enable (gl);
-	
-				// Clip planes
-	
-				shaderNode .setShaderObjects (gl, this .shaderObjects);
-	
-				// Enable vertex attribute arrays.
-	
-				shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers);
-	
-				// Uniforms
-	
-				gl .uniform1i (shaderNode .x3d_FogType,       0);
-				gl .uniform1i (shaderNode .x3d_ColorMaterial, false);
-				gl .uniform1i (shaderNode .x3d_Lighting,      false);
-	
-				gl .uniformMatrix4fv (shaderNode .x3d_TextureMatrix,    false, textureMatrixArray);
-				gl .uniformMatrix4fv (shaderNode .x3d_ProjectionMatrix, false, this .projectionMatrixArray);
-				gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,  false, this .modelViewMatrixArray);
-	
-				// Draw.
-	
-				this .drawRectangle (gl, shaderNode, this .frontTexture,  this .frontBuffer);
-				this .drawRectangle (gl, shaderNode, this .backTexture,   this .backBuffer);
-				this .drawRectangle (gl, shaderNode, this .leftTexture,   this .leftBuffer);
-				this .drawRectangle (gl, shaderNode, this .rightTexture,  this .rightBuffer);
-				this .drawRectangle (gl, shaderNode, this .topTexture,    this .topBuffer);
-				this .drawRectangle (gl, shaderNode, this .bottomTexture, this .bottomBuffer);
-	
-				// Disable vertex attribute arrays.
-	
-				shaderNode .disableTexCoordAttribute (gl);
-				shaderNode .disable (gl);
+					shaderNode = browser .getUnlitShader ();
+
+				if (shaderNode .getValid ())
+				{
+					shaderNode .enable (gl);
+
+					// Clip planes
+
+					shaderNode .setLocalObjects (gl, this .localObjects);
+
+					// Enable vertex attribute arrays.
+
+					shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers);
+
+					// Uniforms
+
+					gl .uniform1i  (shaderNode .x3d_FogType,                            0);
+					gl .uniform1i  (shaderNode .x3d_FillPropertiesFilled,               true);
+					gl .uniform1i  (shaderNode .x3d_FillPropertiesHatched,              false);
+					gl .uniform1i  (shaderNode .x3d_ColorMaterial,                      false);
+					gl .uniform3fv (shaderNode .x3d_EmissiveColor,                      white)
+					gl .uniform1f  (shaderNode .x3d_Transparency,                       0)
+					gl .uniform1i  (shaderNode .x3d_NumTextures,                        1);
+					gl .uniform1i  (shaderNode .x3d_TextureType [0],                    2);
+					gl .uniform1i  (shaderNode .x3d_TextureCoordinateGeneratorMode [0], 0);
+					gl .uniform1i  (shaderNode .x3d_NumProjectiveTextures,              0);
+
+					gl .uniformMatrix4fv (shaderNode .x3d_TextureMatrix [0], false, textureMatrixArray);
+					gl .uniformMatrix4fv (shaderNode .x3d_ProjectionMatrix,  false, this .projectionMatrixArray);
+					gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,   false, this .modelViewMatrixArray);
+
+					// Draw.
+
+					this .drawRectangle (gl, shaderNode, this .frontTexture,  this .frontBuffer);
+					this .drawRectangle (gl, shaderNode, this .backTexture,   this .backBuffer);
+					this .drawRectangle (gl, shaderNode, this .leftTexture,   this .leftBuffer);
+					this .drawRectangle (gl, shaderNode, this .rightTexture,  this .rightBuffer);
+					this .drawRectangle (gl, shaderNode, this .topTexture,    this .topBuffer);
+					this .drawRectangle (gl, shaderNode, this .bottomTexture, this .bottomBuffer);
+
+					// Disable vertex attribute arrays.
+
+					shaderNode .disableTexCoordAttribute (gl);
+					shaderNode .disable (gl);
+				}
 			};
 		})(),
 		drawRectangle: function (gl, shaderNode, texture, buffer)
 		{
-			if (texture && texture .checkLoadState () === X3DConstants .COMPLETE_STATE)
+			if (texture && (texture .checkLoadState () === X3DConstants .COMPLETE_STATE || texture .getData ()))
 			{
-				texture .setShaderUniforms (gl, shaderNode, 0);
+				texture .setShaderUniforms (gl, shaderNode);
 
 				if (texture .transparent_ .getValue ())
 					gl .enable (gl .BLEND);
@@ -680,5 +682,3 @@ function (X3DBindableNode,
 
 	return X3DBackgroundNode;
 });
-
-

package/src/x_ite/Components/EnvironmentalEffects/X3DFogObject.js

@@ -59,7 +59,7 @@ function (X3DConstants,
 "use strict";
 
 	var Fogs = ObjectCache (FogContainer);
-	
+
 	function FogContainer ()
 	{
 		this .fogMatrix = new Float32Array (9);
@@ -83,6 +83,9 @@ function (X3DConstants,
 		},
 		setShaderUniforms: function (gl, shaderObject)
 		{
+			if (shaderObject .hasFog (this))
+				return;
+
 			var
 				fogNode         = this .fogNode,
 				visibilityRange = Math .max (0, fogNode .visibilityRange_ .getValue ());
@@ -93,9 +96,7 @@ function (X3DConstants,
 			}
 			else
 			{
-				var
-					color  = fogNode .color_ .getValue (),
-					center = this .center;
+				var color  = fogNode .color_ .getValue ();
 
 				gl .uniform1i        (shaderObject .x3d_FogType,            fogNode .fogType);
 				gl .uniform3f        (shaderObject .x3d_FogColor,           color .r, color .g, color .b);
@@ -160,5 +161,3 @@ function (X3DConstants,
 
 	return X3DFogObject;
 });
-
-

package/src/x_ite/Components/EnvironmentalEffects.js

@@ -67,7 +67,7 @@ function (SupportedNodes,
 {
 "use strict";
 
-	var Types =
+	const Types =
 	{
 		Background:        Background,
 		Fog:               Fog,
@@ -76,18 +76,15 @@ function (SupportedNodes,
 		TextureBackground: TextureBackground,
 	};
 
-	var AbstractTypes =
+	const AbstractTypes =
 	{
 		X3DBackgroundNode: X3DBackgroundNode,
 		X3DFogObject:      X3DFogObject,
 	};
-	
-	for (var typeName in Types)
-		SupportedNodes .addType (typeName, Types [typeName]); 
 
-	for (var typeName in AbstractTypes)
-		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]); 
+	for (const typeName in Types)
+		SupportedNodes .addType (typeName, Types [typeName]);
 
-	return Types;
+	for (const typeName in AbstractTypes)
+		SupportedNodes .addAbstractType (typeName, AbstractTypes [typeName]);
 });
-