x_ite 4.2.17 → 4.7.7

package/src/x_ite/Components/Texturing/X3DTexture2DNode.js.~1~

@@ -0,0 +1,209 @@
+/* -*- Mode: JavaScript; coding: utf-8; tab-width: 3; indent-tabs-mode: tab; c-basic-offset: 3 -*-
+ *******************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright create3000, Scheffelstraße 31a, Leipzig, Germany 2011.
+ *
+ * All rights reserved. Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * The copyright notice above does not evidence any actual of intended
+ * publication of such source code, and is an unpublished work by create3000.
+ * This material contains CONFIDENTIAL INFORMATION that is the property of
+ * create3000.
+ *
+ * No permission is granted to copy, distribute, or create derivative works from
+ * the contents of this software, in whole or in part, without the prior written
+ * permission of create3000.
+ *
+ * NON-MILITARY USE ONLY
+ *
+ * All create3000 software are effectively free software with a non-military use
+ * restriction. It is free. Well commented source is provided. You may reuse the
+ * source in any way you please with the exception anything that uses it must be
+ * marked to indicate is contains 'non-military use only' components.
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2015, 2016 Holger Seelig <holger.seelig@yahoo.de>.
+ *
+ * This file is part of the X_ITE Project.
+ *
+ * X_ITE is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License version 3 only, as published by the
+ * Free Software Foundation.
+ *
+ * X_ITE is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License version 3 for more
+ * details (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version 3
+ * along with X_ITE.  If not, see <http://www.gnu.org/licenses/gpl.html> for a
+ * copy of the GPLv3 License.
+ *
+ * For Silvio, Joy and Adi.
+ *
+ ******************************************************************************/
+
+
+define ([
+	"x_ite/Fields",
+	"x_ite/Components/Texturing/X3DTextureNode",
+	"x_ite/Bits/X3DCast",
+	"x_ite/Bits/X3DConstants",
+],
+function (Fields,
+          X3DTextureNode,
+          X3DCast,
+          X3DConstants)
+{
+"use strict";
+
+   var defaultData = new Uint8Array ([ 255, 255, 255, 255 ]);
+
+	function X3DTexture2DNode (executionContext)
+	{
+		X3DTextureNode .call (this, executionContext);
+
+		this .addType (X3DConstants .X3DTexture2DNode);
+
+		this .width  = 0;
+		this .height = 0;
+		this .flipY  = false;
+		this .data   = null;
+	}
+
+	X3DTexture2DNode .prototype = Object .assign (Object .create (X3DTextureNode .prototype),
+	{
+		constructor: X3DTexture2DNode,
+		initialize: function ()
+		{
+			X3DTextureNode .prototype .initialize .call (this);
+			
+			var gl = this .getBrowser () .getContext ();
+			
+			this .target = gl .TEXTURE_2D;
+
+			this .repeatS_           .addInterest ("updateTextureProperties", this);
+			this .repeatT_           .addInterest ("updateTextureProperties", this);
+			this .textureProperties_ .addInterest ("set_textureProperties__", this);
+
+			gl .bindTexture (gl .TEXTURE_2D, this .getTexture ());
+			gl .texImage2D  (gl .TEXTURE_2D, 0, gl .RGBA, 1, 1, 0, gl .RGBA, gl .UNSIGNED_BYTE, defaultData);
+		
+			this .set_textureProperties__ ();
+		},
+		set_textureProperties__: function ()
+		{
+			if (this .texturePropertiesNode)
+				this .texturePropertiesNode .removeInterest ("updateTextureProperties", this);
+
+			this .texturePropertiesNode = X3DCast (X3DConstants .TextureProperties, this .textureProperties_);
+
+			if (! this .texturePropertiesNode)
+				this .texturePropertiesNode = this .getBrowser () .getDefaultTextureProperties ();
+
+			this .texturePropertiesNode .addInterest ("updateTextureProperties", this);
+
+			this .updateTextureProperties ();
+		},
+		getTarget: function ()
+		{
+			return this .target;
+		},
+		getWidth: function ()
+		{
+			return this .width;
+		},
+		getHeight: function ()
+		{
+			return this .height;
+		},
+		getFlipY: function ()
+		{
+			return this .flipY;
+		},
+		getData: function ()
+		{
+			return this .data;
+		},
+		setTexture: function (width, height, transparent, data, flipY)
+		{
+			try
+			{
+				this .width  = width;
+				this .height = height;
+				this .flipY  = flipY;
+				this .data   = data;
+
+				var
+					browser        = this .getBrowser (),
+					gl             = browser .getContext (),
+					internalFormat = this .texturePropertiesNode .getTextureCompression (),
+					borderWidth    = this .texturePropertiesNode .getBorderWidth ();
+
+				gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, flipY);
+				gl .pixelStorei (gl .UNPACK_ALIGNMENT, 1);
+				gl .bindTexture (gl .TEXTURE_2D, this .getTexture ());
+
+				if (internalFormat === gl .RGBA)
+					gl .texImage2D (gl .TEXTURE_2D, 0, gl .RGBA, width, height, 0, gl .RGBA, gl .UNSIGNED_BYTE, data);
+				else
+					gl .compressedTexImage2D (gl .TEXTURE_2D, 0, internalFormat, width, height, 0, data);
+
+				this .setTransparent (transparent);
+				this .updateTextureProperties ();
+				this .addNodeEvent ();
+			}
+			catch (error)
+			{ }
+		},
+		clearTexture: function ()
+		{
+			this .setTexture (1, 1, false, defaultData, false);
+		},
+		updateTexture: function (data, flipY)
+		{
+			try
+			{
+				this .data = data;
+	
+				var gl = this .getBrowser () .getContext ();
+	
+				gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, flipY);
+				gl .bindTexture (gl .TEXTURE_2D, this .getTexture ());
+				gl .texSubImage2D (gl .TEXTURE_2D, 0, 0, 0, gl .RGBA, gl .UNSIGNED_BYTE, data);
+	
+				if (this .texturePropertiesNode .generateMipMaps_ .getValue ())
+					gl .generateMipmap (gl .TEXTURE_2D);
+	
+				this .addNodeEvent ();
+			}
+			catch (error)
+			{ }
+		},
+		updateTextureProperties: function ()
+		{
+			var gl = this .getBrowser () .getContext ();
+
+			X3DTextureNode .prototype .updateTextureProperties .call (this,
+			                                                          gl .TEXTURE_2D,
+			                                                          this .textureProperties_ .getValue (),
+			                                                          this .texturePropertiesNode,
+			                                                          this .width,
+			                                                          this .height,
+			                                                          this .repeatS_ .getValue (),
+			                                                          this .repeatT_ .getValue (),
+			                                                          false);
+		},
+		setShaderUniformsToChannel: function (gl, shaderObject, i)
+		{
+			gl .activeTexture (gl .TEXTURE0 + shaderObject .getBrowser () .getTexture2DUnits () [i]);
+			gl .bindTexture (gl .TEXTURE_2D, this .getTexture ());
+			gl .uniform1i (shaderObject .x3d_TextureType [i], 2);
+		},
+	});
+
+	return X3DTexture2DNode;
+});

package/src/x_ite/Components/Texturing/X3DTextureCoordinateNode.js

@@ -48,14 +48,10 @@
 
 
 define ([
-	"x_ite/Fields",
 	"x_ite/Components/Rendering/X3DGeometricPropertyNode",
-	"x_ite/Components/Rendering/X3DGeometryNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function (Fields,
-          X3DGeometricPropertyNode, 
-          X3DGeometryNode, 
+function (X3DGeometricPropertyNode,
           X3DConstants)
 {
 "use strict";
@@ -65,26 +61,16 @@ function (Fields,
 		X3DGeometricPropertyNode .call (this, executionContext);
 
 		this .addType (X3DConstants .X3DTextureCoordinateNode);
-
-		this .texCoordArray = X3DGeometryNode .createArray ();
 	}
 
 	X3DTextureCoordinateNode .prototype = Object .assign (Object .create (X3DGeometricPropertyNode .prototype),
 	{
 		constructor: X3DTextureCoordinateNode,
-		init: function (multiArray)
-		{
-			this .texCoordArray .length = 0;
-
-			multiArray .push (this .texCoordArray);
-		},
-		addTexCoord: function (index, multiArray)
+		setShaderUniformsToChannel: function (gl, shaderObject, i)
 		{
-			this .addTexCoordToChannel (index, multiArray [0]);
+			gl .uniform1i (shaderObject .x3d_TextureCoordinateGeneratorMode [i], 0);
 		},
 	});
 
 	return X3DTextureCoordinateNode;
 });
-
-

package/src/x_ite/Components/Texturing/X3DTextureNode.js

@@ -53,19 +53,11 @@ define ([
 	"x_ite/Bits/X3DConstants",
 ],
 function (Fields,
-          X3DAppearanceChildNode, 
+          X3DAppearanceChildNode,
           X3DConstants)
 {
 "use strict";
 
-	// Anisotropic Filtering in WebGL is handled by an extension, use one of getExtension depending on browser:
-
-	var ANISOTROPIC_EXT = [
-		"EXT_texture_filter_anisotropic",
-		"MOZ_EXT_texture_filter_anisotropic",
-		"WEBKIT_EXT_texture_filter_anisotropic",
-	];
-	
 	function X3DTextureNode (executionContext)
 	{
 		X3DAppearanceChildNode .call (this, executionContext);
@@ -80,69 +72,16 @@ function (Fields,
 	X3DTextureNode .prototype = Object .assign (Object .create (X3DAppearanceChildNode .prototype),
 	{
 		constructor: X3DTextureNode,
-		initialize: function ()
+		setTransparent: function (value)
 		{
-			X3DAppearanceChildNode .prototype .initialize .call (this);
-
-			var gl = this .getBrowser () .getContext ();
-
-			this .texture = gl .createTexture ();
+			if (value !== this .transparent_ .getValue ())
+				this .transparent_ = value;
 		},
-		getTexture: function ()
+		getTransparent: function ()
 		{
-			return this .texture;
-		},
-		updateTextureProperties: function (target, haveTextureProperties, textureProperties, width, height, repeatS, repeatT, repeatR)
-		{
-			var gl = this .getBrowser () .getContext ();
-
-			gl .bindTexture (target, this .getTexture ());
-
-			if (Math .max (width, height) < this .getBrowser () .getMinTextureSize () && ! haveTextureProperties)
-			{
-				// Dont generate mipmaps.
-				gl .texParameteri (target, gl .TEXTURE_MIN_FILTER, gl .NEAREST);
-				gl .texParameteri (target, gl .TEXTURE_MAG_FILTER, gl .NEAREST);
-			}
-			else
-			{
-				if (textureProperties .generateMipMaps_ .getValue ())
-					gl .generateMipmap (target);
-
-				gl .texParameteri (target, gl .TEXTURE_MIN_FILTER, gl [textureProperties .getMinificationFilter ()]);
-				gl .texParameteri (target, gl .TEXTURE_MAG_FILTER, gl [textureProperties .getMagnificationFilter ()]);
-			}
-
-			if (haveTextureProperties)
-			{
-				gl .texParameteri (target, gl .TEXTURE_WRAP_S, gl [textureProperties .getBoundaryModeS ()]);
-				gl .texParameteri (target, gl .TEXTURE_WRAP_T, gl [textureProperties .getBoundaryModeT ()]);
-				//gl .texParameteri (target, gl .TEXTURE_WRAP_R, gl [textureProperties .getBoundaryModeR ()]);
-			}
-			else
-			{
-				gl .texParameteri (target, gl .TEXTURE_WRAP_S, repeatS ? gl .REPEAT : gl .CLAMP_TO_EDGE);
-				gl .texParameteri (target, gl .TEXTURE_WRAP_T, repeatT ? gl .REPEAT : gl .CLAMP_TO_EDGE);
-				//gl .texParameteri (target, gl .TEXTURE_WRAP_R, repeatR ? gl .REPEAT : gl .CLAMP);
-			}
-
-			//gl .texParameterfv (target, gl .TEXTURE_BORDER_COLOR, textureProperties .borderColor_ .getValue ());
-			//gl .texParameterf  (target, gl .TEXTURE_PRIORITY,     textureProperties .texturePriority_ .getValue ());
-
-			for (var i = 0; i < ANISOTROPIC_EXT .length; ++ i)
-			{
-				var ext = gl .getExtension (ANISOTROPIC_EXT [i]);
-				
-				if (ext)
-				{
-					gl .texParameterf (target, ext .TEXTURE_MAX_ANISOTROPY_EXT, textureProperties .anisotropicDegree_ .getValue ());
-					break;
-				}
-			}
+			return this .transparent_ .getValue ();
 		},
 	});
 
 	return X3DTextureNode;
 });
-
-

package/src/x_ite/Components/Texturing/X3DTextureTransformNode.js

@@ -52,7 +52,7 @@ define ([
 	"x_ite/Bits/X3DConstants",
 	"standard/Math/Numbers/Matrix4",
 ],
-function (X3DAppearanceChildNode, 
+function (X3DAppearanceChildNode,
           X3DConstants,
           Matrix4)
 {
@@ -64,8 +64,7 @@ function (X3DAppearanceChildNode,
 
 		this .addType (X3DConstants .X3DTextureTransformNode);
 
-		this .matrix      = new Matrix4 ();
-		this .matrixArray = new Float32Array (this .matrix);
+		this .matrixArray = new Float32Array (Matrix4 .Identity);
 	}
 
 	X3DTextureTransformNode .prototype = Object .assign (Object .create (X3DAppearanceChildNode .prototype),
@@ -75,17 +74,11 @@ function (X3DAppearanceChildNode,
 		{
 			this .matrixArray .set (value);
 		},
-		getMatrix: function ()
+		setShaderUniformsToChannel: function (gl, shaderObject, i)
 		{
-			return this .matrix;
-		},
-		setShaderUniforms: function (gl, shaderObject)
-		{
-			gl .uniformMatrix4fv (shaderObject .x3d_TextureMatrix, false, this .matrixArray);
+			gl .uniformMatrix4fv (shaderObject .x3d_TextureMatrix [i], false, this .matrixArray);
 		},
 	});
 
 	return X3DTextureTransformNode;
 });
-
-

package/src/x_ite/Components/Texturing.js

@@ -50,14 +50,17 @@ define ([
 	"x_ite/Configuration/SupportedNodes",
 	"x_ite/Components/Texturing/ImageTexture",
 	"x_ite/Components/Texturing/MovieTexture",
-//	"x_ite/Components/Texturing/MultiTexture",
-//	"x_ite/Components/Texturing/MultiTextureCoordinate",
-//	"x_ite/Components/Texturing/MultiTextureTransform",
+	"x_ite/Components/Texturing/MultiTexture",
+	"x_ite/Components/Texturing/MultiTextureCoordinate",
+	"x_ite/Components/Texturing/MultiTextureTransform",
 	"x_ite/Components/Texturing/PixelTexture",
 	"x_ite/Components/Texturing/TextureCoordinate",
-//	"x_ite/Components/Texturing/TextureCoordinateGenerator",
+	"x_ite/Components/Texturing/TextureCoordinateGenerator",
 	"x_ite/Components/Texturing/TextureProperties",
 	"x_ite/Components/Texturing/TextureTransform",
+	"x_ite/Components/Texturing/X3DSingleTextureCoordinateNode",
+	"x_ite/Components/Texturing/X3DSingleTextureNode",
+	"x_ite/Components/Texturing/X3DSingleTextureTransformNode",
 	"x_ite/Components/Texturing/X3DTexture2DNode",
 	"x_ite/Components/Texturing/X3DTextureCoordinateNode",
 	"x_ite/Components/Texturing/X3DTextureNode",
@@ -66,14 +69,17 @@ define ([
 function (SupportedNodes,
           ImageTexture,
           MovieTexture,
-//          MultiTexture,
-//          MultiTextureCoordinate,
-//          MultiTextureTransform,
+          MultiTexture,
+          MultiTextureCoordinate,
+          MultiTextureTransform,
           PixelTexture,
           TextureCoordinate,
-//          TextureCoordinateGenerator,
+          TextureCoordinateGenerator,
           TextureProperties,
           TextureTransform,
+          X3DSingleTextureCoordinateNode,
+          X3DSingleTextureNode,
+          X3DSingleTextureTransformNode,
           X3DTexture2DNode,
           X3DTextureCoordinateNode,
           X3DTextureNode,
@@ -81,34 +87,34 @@ function (SupportedNodes,
 {
 "use strict";
 
-	var Types =
+	const Types =
 	{
 		ImageTexture:               ImageTexture,
 		MovieTexture:               MovieTexture,
-//		MultiTexture:               MultiTexture,
-//		MultiTextureCoordinate:     MultiTextureCoordinate,
-//		MultiTextureTransform:      MultiTextureTransform,
+		MultiTexture:               MultiTexture,
+		MultiTextureCoordinate:     MultiTextureCoordinate,
+		MultiTextureTransform:      MultiTextureTransform,
 		PixelTexture:               PixelTexture,
 		TextureCoordinate:          TextureCoordinate,
-//		TextureCoordinateGenerator: TextureCoordinateGenerator,
+		TextureCoordinateGenerator: TextureCoordinateGenerator,
 		TextureProperties:          TextureProperties,
 		TextureTransform:           TextureTransform,
 	};
 
-	var AbstractTypes =
+	const AbstractTypes =
 	{
-		X3DTexture2DNode:         X3DTexture2DNode,
-		X3DTextureCoordinateNode: X3DTextureCoordinateNode,
-		X3DTextureNode:           X3DTextureNode,
-		X3DTextureTransformNode:  X3DTextureTransformNode,
+		X3DSingleTextureCoordinateNode: X3DSingleTextureCoordinateNode,
+		X3DSingleTextureNode:           X3DSingleTextureNode,
+		X3DSingleTextureTransformNode:  X3DSingleTextureTransformNode,
+		X3DTexture2DNode:               X3DTexture2DNode,
+		X3DTextureCoordinateNode:       X3DTextureCoordinateNode,
+		X3DTextureNode:                 X3DTextureNode,
+		X3DTextureTransformNode:        X3DTextureTransformNode,
 	};
-	
-	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]);
 });
-

package/src/x_ite/Components/Texturing3D/ComposedTexture3D.js

@@ -53,12 +53,14 @@ define ([
 	"x_ite/Basic/FieldDefinitionArray",
 	"x_ite/Components/Texturing3D/X3DTexture3DNode",
 	"x_ite/Bits/X3DConstants",
+	"x_ite/Bits/X3DCast",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DTexture3DNode, 
-          X3DConstants)
+          X3DTexture3DNode,
+          X3DConstants,
+          X3DCast)
 {
 "use strict";
 
@@ -67,6 +69,10 @@ function (Fields,
 		X3DTexture3DNode .call (this, executionContext);
 
 		this .addType (X3DConstants .ComposedTexture3D);
+
+		this .addChildObjects ("loadState", new Fields .SFInt32 (X3DConstants .NOT_STARTED_STATE));
+
+		this .textureNodes = [ ];
 	}
 
 	ComposedTexture3D .prototype = Object .assign (Object .create (X3DTexture3DNode .prototype),
@@ -74,6 +80,7 @@ function (Fields,
 		constructor: ComposedTexture3D,
 		fieldDefinitions: new FieldDefinitionArray ([
 			new X3DFieldDefinition (X3DConstants .inputOutput,    "metadata",          new Fields .SFNode ()),
+			new X3DFieldDefinition (X3DConstants .inputOutput,    "description",       new Fields .SFString ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "repeatS",           new Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "repeatT",           new Fields .SFBool ()),
 			new X3DFieldDefinition (X3DConstants .initializeOnly, "repeatR",           new Fields .SFBool ()),
@@ -92,9 +99,86 @@ function (Fields,
 		{
 			return "texture";
 		},
+		initialize: function ()
+		{
+			X3DTexture3DNode .prototype .initialize .call (this);
+
+			this .texture_ .addInterest ("set_texture__", this);
+
+			this .set_texture__ ();
+		},
+		checkLoadState: function ()
+		{
+			return this .loadState_ .getValue ();
+		},
+		set_texture__: function ()
+		{
+			var textureNodes = this .textureNodes;
+
+			for (var i = 0, length = textureNodes .length; i < length; ++ i)
+				textureNodes [i] .removeInterest ("update", this);
+
+			textureNodes .length = 0;
+
+			for (var i = 0, length = this .texture_ .length; i < length; ++ i)
+			{
+				var textureNode = X3DCast (X3DConstants .X3DTexture2DNode, this .texture_ [i]);
+
+				if (textureNode)
+					textureNodes .push (textureNode);
+			}
+
+			for (var i = 0, length = textureNodes .length; i < length; ++ i)
+				textureNodes [i] .addInterest ("update", this);
+
+			this .update ();
+		},
+		update: function ()
+		{
+			var
+				textureNodes = this .textureNodes,
+				complete     = 0;
+
+			for (var i = 0, length = textureNodes .length; i < length; ++ i)
+				complete += textureNodes [i] .checkLoadState () === X3DConstants .COMPLETE_STATE;
+
+			if (textureNodes .length === 0 || complete !== textureNodes .length)
+			{
+				this .clearTexture ();
+
+				this .loadState_ = X3DConstants .FAILED_STATE;
+			}
+			else
+			{
+				var
+					gl           = this .getBrowser () .getContext (),
+					textureNode0 = textureNodes [0],
+					width        = textureNode0 .getWidth (),
+					height       = textureNode0 .getHeight (),
+					depth        = textureNodes .length,
+					transparent  = 0,
+					size         = width * height * 4,
+					data         = new Uint8Array (size * depth);
+
+				for (var i = 0, d = 0; i < depth; ++ i)
+				{
+					var
+						textureNode = this .textureNodes [i],
+						tData       = textureNode .getData ();
+
+					transparent += textureNode .getTransparent ();
+
+					for (var t = 0; t < size; ++ t, ++ d)
+					{
+						data [d] = tData [t];
+					}
+				}
+
+				this .setTexture (width, height, depth, !! transparent, gl .RGBA, data);
+				this .loadState_ = X3DConstants .COMPLETE_STATE;
+			}
+		},
 	});
 
 	return ComposedTexture3D;
 });
-
-