x_ite 4.0.5 → 4.7.5

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

@@ -48,7 +48,6 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Components/Core/X3DBindableNode",
 	"x_ite/Bits/TraverseType",
 	"x_ite/Bits/X3DConstants",
@@ -59,8 +58,7 @@ define ([
 	"standard/Math/Numbers/Matrix4",
 	"standard/Math/Algorithm",
 ],
-function ($,
-          X3DBindableNode,
+function (X3DBindableNode,
           TraverseType,
           X3DConstants,
           ViewVolume,
@@ -149,34 +147,28 @@ function ($,
 		y3 = new Complex (0, 0),
 		y4 = new Complex (0, 0);
 
-	var
-		farVector         = new Vector3 (0, 0, 0),
-		projectionMatrix  = new Matrix4 ();
-
 	function X3DBackgroundNode (executionContext)
 	{
 		X3DBindableNode .call (this, executionContext);
 
 		this .addType (X3DConstants .X3DBackgroundNode);
 
+		this .skyAngle_    .setUnit ("angle");
+		this .groundAngle_ .setUnit ("angle");
+
 		this .hidden                = false;
 		this .projectionMatrixArray = new Float32Array (16);
-		this .transformationMatrix  = new Matrix4 ();
+		this .modelMatrix           = new Matrix4 ();
 		this .modelViewMatrixArray  = new Float32Array (16);
-		this .clipPlanes            = [ ];
+		this .localObjects          = [ ];
 		this .colors                = [ ];
 		this .sphere                = [ ];
 		this .textures              = 0;
 	}
 
-	X3DBackgroundNode .prototype = $.extend (Object .create (X3DBindableNode .prototype),
+	X3DBackgroundNode .prototype = Object .assign (Object .create (X3DBindableNode .prototype),
 	{
 		constructor: X3DBackgroundNode,
-		modelViewMatrix: new Matrix4 (),
-		rotation: new Rotation4 (),
-		scale: new Vector3 (0, 0, 0),
-		textureMatrixArray: new Float32Array (new Matrix4 ()),
-		rectangleCount: 6,
 		initialize: function ()
 		{
 			X3DBindableNode .prototype .initialize .call (this);
@@ -237,31 +229,19 @@ function ($,
 
 			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;
@@ -272,7 +252,7 @@ function ($,
 		{
 			return this .hidden;
 		},
-		isTransparent: function ()
+		getTransparent: function ()
 		{
 			if (this .hidden)
 				return true;
@@ -328,13 +308,13 @@ function ($,
 				                     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];
@@ -349,7 +329,7 @@ function ($,
 				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]);
 
@@ -358,7 +338,7 @@ function ($,
 
 					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);
@@ -367,7 +347,7 @@ function ($,
 				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]);
 
@@ -376,7 +356,7 @@ function ($,
 					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);
@@ -391,7 +371,7 @@ function ($,
 				phi         = 0,
 				vAngleMax   = bottom ? Math .PI / 2 : Math .PI,
 				V_DIMENSION = vAngle .length - 1;
-			
+
 			for (var v = 0; v < V_DIMENSION; ++ v)
 			{
 				var
@@ -406,11 +386,11 @@ function ($,
 
 				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
@@ -420,7 +400,7 @@ function ($,
 
 					// 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);
@@ -430,7 +410,7 @@ function ($,
 					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,
@@ -447,7 +427,7 @@ function ($,
 					                    // 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);
 				}
 			}
 		},
@@ -503,160 +483,188 @@ function ($,
 				{
 					renderObject .getLayer () .getBackgrounds () .push (this);
 
-					this .transformationMatrix .assign (renderObject .getModelViewMatrix () .get ());
-					break;
+					this .modelMatrix .assign (renderObject .getModelViewMatrix () .get ());
+					return;
 				}
 				case TraverseType .DISPLAY:
 				{
 					var
-						sourcePlanes = renderObject .getClipPlanes (),
-						destPlanes   = this .clipPlanes;
+						sourceObjects = renderObject .getLocalObjects (),
+						destObjects   = this .localObjects;
 
-					for (var i = 0, length = sourcePlanes .length; i < length; ++ i)
-						destPlanes [i] = sourcePlanes [i];
+					for (var i = 0, length = sourceObjects .length; i < length; ++ i)
+						destObjects [i] = sourceObjects [i];
 
-					destPlanes .length = sourcePlanes .length;
-					break;
+					destObjects .length = sourceObjects .length;
+					return;
 				}
 			}
 		},
-		display: function (renderObject, viewport)
+		display: (function ()
 		{
-			try
+			var
+				invProjectionMatrix = new Matrix4 (),
+				modelViewMatrix     = new Matrix4 (),
+				rotation            = new Rotation4 (),
+				scale               = new Vector3 (0, 0, 0),
+				farVector           = new Vector3 (0, 0, 0);
+
+			return function (gl, renderObject, viewport)
 			{
-				if (this .hidden)
-					return;
+				try
+				{
+					if (this .hidden)
+						return;
 
-				var
-					browser = renderObject .getBrowser (),
-					gl      = browser .getContext ();
+					// Setup context.
 
-				// Setup context.
-	
-				gl .disable (gl .DEPTH_TEST);
-				gl .depthMask (false);
-				gl .enable (gl .CULL_FACE);
-				gl .frontFace (gl .CCW);
+					gl .disable (gl .DEPTH_TEST);
+					gl .depthMask (false);
+					gl .enable (gl .CULL_FACE);
+					gl .frontFace (gl .CCW);
 
-				// Get background scale.
+					// Get background scale.
 
-				var
-					farValue        = -ViewVolume .unProjectPointMatrix (0, 0, 0.99999, projectionMatrix .assign (renderObject .getProjectionMatrix () .get ()) .inverse (), viewport, farVector) .z,
-					rotation        = this .rotation,
-					modelViewMatrix = this .modelViewMatrix .assign (this .transformationMatrix);
+					var farValue = -ViewVolume .unProjectPointMatrix (0, 0, 1, invProjectionMatrix .assign (renderObject .getProjectionMatrix () .get ()) .inverse (), viewport, farVector) .z * 0.8;
 
-				// Get projection matrix.
+					// Get projection matrix.
 
-				this .projectionMatrixArray .set (renderObject .getProjectionMatrix () .get ());	
+					this .projectionMatrixArray .set (renderObject .getProjectionMatrix () .get ());
 
-				// Rotate and scale background.
+					// Rotate and scale background.
 
-				modelViewMatrix .multRight (renderObject .getInverseCameraSpaceMatrix () .get ());
-				modelViewMatrix .get (null, rotation);
-				modelViewMatrix .identity ();
-				modelViewMatrix .rotate (rotation);
-				modelViewMatrix .scale (this .scale .set (farValue, farValue, farValue));
+					modelViewMatrix .assign (this .modelMatrix);
+					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);
+					this .modelViewMatrixArray .set (modelViewMatrix);
 
-				// Draw background sphere and texture cube.
+					// Draw background sphere and texture cube.
 
-				this .drawSphere (renderObject);
+					this .drawSphere (renderObject);
 
-				if (this .textures)
-					this .drawCube (renderObject);
-			}
-			catch (error)
-			{ }
-		},
+					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 .useProgram (gl);
+			if (shaderNode .getValid ())
+			{
+				shaderNode .enable (gl);
 
-			// Clip planes
+				// Clip planes
 
-			shaderNode .setClipPlanes (gl, this .clipPlanes);
+				shaderNode .setLocalObjects (gl, this .localObjects);
 
-			// 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.
-	
-			if (transparency)
-				gl .enable (gl .BLEND);
-			else
-				gl .disable (gl .BLEND);
+				// Setup context.
+
+				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 .disableColorAttribute (gl);
+				shaderNode .disable (gl);
+			}
 		},
-		drawCube: function (renderObject)
+		drawCube: (function ()
 		{
-			var
-				browser    = renderObject .getBrowser (),
-				gl         = browser .getContext (),
-				shaderNode = browser .getGouraudShader ();
+			const
+				textureMatrixArray = new Float32Array (new Matrix4 ()),
+				white              = new Float32Array ([1, 1, 1]);
 
-			shaderNode .useProgram (gl);
+			return function (renderObject)
+			{
+				var
+					browser    = renderObject .getBrowser (),
+					gl         = browser .getContext (),
+					shaderNode = browser .getUnlitShader ();
 
-			// Clip planes
+				if (shaderNode .getValid ())
+				{
+					shaderNode .enable (gl);
 
-			shaderNode .setClipPlanes (gl, this .clipPlanes);
+					// Clip planes
 
-			// Enable vertex attribute arrays.
+					shaderNode .setLocalObjects (gl, this .localObjects);
 
-			shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers);
+					// Enable vertex attribute arrays.
 
-			// Uniforms
+					shaderNode .enableTexCoordAttribute (gl, this .texCoordBuffers);
 
-			gl .uniform1i (shaderNode .x3d_FogType,       0);
-			gl .uniform1i (shaderNode .x3d_ColorMaterial, false);
-			gl .uniform1i (shaderNode .x3d_Lighting,      false);
+					// Uniforms
 
-			gl .uniformMatrix4fv (shaderNode .x3d_TextureMatrix,    false, this .textureMatrixArray);
-			gl .uniformMatrix4fv (shaderNode .x3d_ProjectionMatrix, false, this .projectionMatrixArray);
-			gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,  false, this .modelViewMatrixArray);
+					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);
 
-			// Draw.
+					gl .uniformMatrix4fv (shaderNode .x3d_TextureMatrix [0], false, textureMatrixArray);
+					gl .uniformMatrix4fv (shaderNode .x3d_ProjectionMatrix,  false, this .projectionMatrixArray);
+					gl .uniformMatrix4fv (shaderNode .x3d_ModelViewMatrix,   false, this .modelViewMatrixArray);
 
-			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);
+					// Draw.
 
-			// Disable vertex attribute arrays.
+					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);
 
-			shaderNode .disableTexCoordAttribute (gl);
-		},
+					// 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);
@@ -667,12 +675,10 @@ function ($,
 
 				// Draw.
 
-				gl .drawArrays (gl .TRIANGLES, 0, this .rectangleCount);
+				gl .drawArrays (gl .TRIANGLES, 0, 6);
 			}
 		},
 	});
 
 	return X3DBackgroundNode;
 });
-
-

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

@@ -48,18 +48,74 @@
 
 
 define ([
-	"jquery",
 	"x_ite/Bits/X3DConstants",
+	"standard/Math/Numbers/Matrix3",
+	"standard/Utility/ObjectCache",
 ],
-function ($,
-          X3DConstants)
+function (X3DConstants,
+          Matrix3,
+          ObjectCache)
 {
 "use strict";
 
+	var Fogs = ObjectCache (FogContainer);
+
+	function FogContainer ()
+	{
+		this .fogMatrix = new Float32Array (9);
+	}
+
+	FogContainer .prototype =
+	{
+		constructor: FogContainer,
+		set: function (fogNode, modelViewMatrix)
+		{
+			this .fogNode = fogNode;
+
+			try
+			{
+				this .fogMatrix .set (modelViewMatrix .submatrix .inverse ());
+			}
+			catch (error)
+			{
+				this .fogMatrix .set (Matrix3 .Identity);
+			}
+		},
+		setShaderUniforms: function (gl, shaderObject)
+		{
+			if (shaderObject .hasFog (this))
+				return;
+
+			var
+				fogNode         = this .fogNode,
+				visibilityRange = Math .max (0, fogNode .visibilityRange_ .getValue ());
+
+			if (fogNode .getHidden () || visibilityRange === 0)
+			{
+				gl .uniform1i (shaderObject .x3d_FogType, 0); // NO_FOG
+			}
+			else
+			{
+				var color  = fogNode .color_ .getValue ();
+
+				gl .uniform1i        (shaderObject .x3d_FogType,            fogNode .fogType);
+				gl .uniform3f        (shaderObject .x3d_FogColor,           color .r, color .g, color .b);
+				gl .uniform1f        (shaderObject .x3d_FogVisibilityRange, visibilityRange);
+				gl .uniformMatrix3fv (shaderObject .x3d_FogMatrix, false,   this .fogMatrix);
+			}
+		},
+		dispose: function ()
+		{
+		   Fogs .push (this);
+		},
+	};
+
 	function X3DFogObject (executionContext)
 	{
 		this .addType (X3DConstants .X3DFogObject);
 
+		this .visibilityRange_ .setUnit ("length");
+
 		this .hidden = false;
 	}
 
@@ -97,28 +153,11 @@ function ($,
 		{
 			return this .hidden;
 		},
-		setShaderUniforms: function (gl, shaderObject, renderObject)
+		getFogs: function ()
 		{
-			if (this .hidden)
-				gl .uniform1i (shaderObject .x3d_FogType, 0); // NO_FOG
-
-			else
-			{
-				var
-					color           = this .color_ .getValue (),
-					visibilityRange = Math .max (0, this .visibilityRange_ .getValue ());
-
-				if (visibilityRange === 0)
-					visibilityRange = renderObject .getNavigationInfo () .getFarValue (renderObject .getViewpoint ());
-
-				gl .uniform1i (shaderObject .x3d_FogType,            this .fogType);
-				gl .uniform3f (shaderObject .x3d_FogColor,           color .r, color .g, color .b);
-				gl .uniform1f (shaderObject .x3d_FogVisibilityRange, visibilityRange);
-			}
+			return Fogs;
 		},
 	};
 
 	return X3DFogObject;
 });
-
-