x_ite 4.2.17 → 4.7.7

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

@@ -0,0 +1,91 @@
+/* -*- 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/Components/Texturing/X3DTextureCoordinateNode",
+	"x_ite/Components/Rendering/X3DGeometryNode",
+	"x_ite/Bits/X3DConstants",
+],
+function (X3DTextureCoordinateNode,
+          X3DGeometryNode,
+          X3DConstants)
+{
+"use strict";
+
+	function X3DSingleTextureCoordinateNode (executionContext)
+	{
+		X3DTextureCoordinateNode .call (this, executionContext);
+
+		this .addType (X3DConstants .X3DSingleTextureCoordinateNode);
+
+		this .texCoordArray = X3DGeometryNode .createArray ();
+	}
+
+	X3DSingleTextureCoordinateNode .prototype = Object .assign (Object .create (X3DTextureCoordinateNode .prototype),
+	{
+		constructor: X3DSingleTextureCoordinateNode,
+		init: function (multiArray)
+		{
+			this .texCoordArray .length = 0;
+
+			multiArray .push (this .texCoordArray);
+		},
+		addTexCoord: function (index, multiArray)
+		{
+			this .addTexCoordToChannel (index, multiArray [0]);
+		},
+		setShaderUniforms: function (gl, shaderObject)
+		{
+			for (let i = 0, length = shaderObject .x3d_MaxTextures; i < length; ++ i)
+				this .setShaderUniformsToChannel (gl, shaderObject, i);
+		},
+	});
+
+	return X3DSingleTextureCoordinateNode;
+});

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

@@ -0,0 +1,183 @@
+/* -*- 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/Components/Texturing/X3DTextureNode",
+	"x_ite/Bits/X3DConstants",
+	"x_ite/Bits/X3DCast",
+	"x_ite/Browser/Texturing/MultiTextureModeType",
+	"x_ite/Browser/Texturing/MultiTextureSourceType",
+	"x_ite/Browser/Texturing/MultiTextureFunctionType",
+],
+function (X3DTextureNode,
+          X3DConstants,
+          X3DCast,
+          ModeType,
+          SourceType,
+          FunctionType)
+{
+"use strict";
+
+	function X3DSingleTextureNode (executionContext)
+	{
+		X3DTextureNode .call (this, executionContext);
+
+		this .addType (X3DConstants .X3DSingleTextureNode);
+	}
+
+	X3DSingleTextureNode .prototype = Object .assign (Object .create (X3DTextureNode .prototype),
+	{
+		constructor: X3DSingleTextureNode,
+		initialize: function ()
+		{
+			X3DTextureNode .prototype .initialize .call (this);
+
+			this .textureProperties_ .addInterest ("set_textureProperties__", this);
+
+			const gl = this .getBrowser () .getContext ();
+
+			this .texture = gl .createTexture ();
+
+			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 ();
+		},
+		getTexture: function ()
+		{
+			return this .texture;
+		},
+		updateTextureProperties: (function ()
+      {
+         // Anisotropic Filtering in WebGL is handled by an extension, use one of getExtension depending on browser:
+
+         const ANISOTROPIC_EXT = [
+            "EXT_texture_filter_anisotropic",
+            "MOZ_EXT_texture_filter_anisotropic",
+            "WEBKIT_EXT_texture_filter_anisotropic",
+         ];
+
+         return function (target, haveTextureProperties, textureProperties, width, height, repeatS, repeatT, repeatR)
+         {
+            const 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 ()]);
+
+               if (gl .getVersion () >= 2)
+                  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);
+
+               if (gl .getVersion () >= 2)
+                  gl .texParameteri (target, gl .TEXTURE_WRAP_R, repeatR ? gl .REPEAT : gl .CLAMP_TO_EDGE);
+            }
+
+            //gl .texParameterfv (target, gl .TEXTURE_BORDER_COLOR, textureProperties .borderColor_ .getValue ());
+            //gl .texParameterf  (target, gl .TEXTURE_PRIORITY,     textureProperties .texturePriority_ .getValue ());
+
+            for (const extension of ANISOTROPIC_EXT)
+            {
+               const ext = gl .getExtension (extension);
+
+               if (ext)
+               {
+                  gl .texParameterf (target, ext .TEXTURE_MAX_ANISOTROPY_EXT, textureProperties .anisotropicDegree_ .getValue ());
+                  break;
+               }
+            }
+         };
+      })(),
+		setShaderUniforms: function (gl, shaderObject, renderObject)
+		{
+			this .setShaderUniformsToChannel (gl, shaderObject, renderObject, 0);
+
+			gl .uniform1i (shaderObject .x3d_NumTextures, 1);
+			gl .uniform1i (shaderObject .x3d_MultiTextureMode [0],      ModeType .MODULATE);
+			gl .uniform1i (shaderObject .x3d_MultiTextureAlphaMode [0], ModeType .MODULATE);
+			gl .uniform1i (shaderObject .x3d_MultiTextureSource [0],    SourceType .DEFAULT);
+			gl .uniform1i (shaderObject .x3d_MultiTextureFunction [0],  FunctionType .DEFAULT);
+		},
+	});
+
+	return X3DSingleTextureNode;
+});

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

@@ -0,0 +1,77 @@
+/* -*- 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/Components/Texturing/X3DTextureTransformNode",
+	"x_ite/Bits/X3DConstants",
+],
+function (X3DTextureTransformNode,
+          X3DConstants)
+{
+"use strict";
+
+	function X3DSingleTextureTransformNode (executionContext)
+	{
+		X3DTextureTransformNode .call (this, executionContext);
+
+		this .addType (X3DConstants .X3DSingleTextureTransformNode);
+	}
+
+	X3DSingleTextureTransformNode .prototype = Object .assign (Object .create (X3DTextureTransformNode .prototype),
+	{
+		constructor: X3DSingleTextureTransformNode,
+		setShaderUniforms: function (gl, shaderObject)
+		{
+			for (let i = 0, length = shaderObject .x3d_MaxTextures; i < length; ++ i)
+				this .setShaderUniformsToChannel (gl, shaderObject, i);
+		},
+	});
+
+	return X3DSingleTextureTransformNode;
+});

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

@@ -48,14 +48,10 @@
 
 
 define ([
-	"x_ite/Fields",
-	"x_ite/Components/Texturing/X3DTextureNode",
-	"x_ite/Bits/X3DCast",
+	"x_ite/Components/Texturing/X3DSingleTextureNode",
 	"x_ite/Bits/X3DConstants",
 ],
-function (Fields,
-          X3DTextureNode,
-          X3DCast,
+function (X3DSingleTextureNode,
           X3DConstants)
 {
 "use strict";
@@ -64,49 +60,33 @@ function (Fields,
 
 	function X3DTexture2DNode (executionContext)
 	{
-		X3DTextureNode .call (this, executionContext);
+		X3DSingleTextureNode .call (this, executionContext);
 
 		this .addType (X3DConstants .X3DTexture2DNode);
 
+		const gl = this .getBrowser () .getContext ();
+
+		this .target = gl .TEXTURE_2D;
 		this .width  = 0;
 		this .height = 0;
 		this .flipY  = false;
 		this .data   = null;
 	}
 
-	X3DTexture2DNode .prototype = Object .assign (Object .create (X3DTextureNode .prototype),
+	X3DTexture2DNode .prototype = Object .assign (Object .create (X3DSingleTextureNode .prototype),
 	{
 		constructor: X3DTexture2DNode,
 		initialize: function ()
 		{
-			X3DTextureNode .prototype .initialize .call (this);
-			
-			var gl = this .getBrowser () .getContext ();
-			
-			this .target = gl .TEXTURE_2D;
+			X3DSingleTextureNode .prototype .initialize .call (this);
+
+			this .repeatS_ .addInterest ("updateTextureProperties", this);
+			this .repeatT_ .addInterest ("updateTextureProperties", this);
 
-			this .repeatS_           .addInterest ("updateTextureProperties", this);
-			this .repeatT_           .addInterest ("updateTextureProperties", this);
-			this .textureProperties_ .addInterest ("set_textureProperties__", this);
+			const gl = this .getBrowser () .getContext ();
 
 			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 ()
 		{
@@ -128,48 +108,50 @@ function (Fields,
 		{
 			return this .data;
 		},
+		clearTexture: function ()
+		{
+			this .setTexture (1, 1, false, defaultData, false);
+
+			this .data = null;
+		},
 		setTexture: function (width, height, transparent, data, flipY)
 		{
 			try
 			{
-				this .transparent_ = transparent;
-				this .width        = width;
-				this .height       = height;
-				this .flipY        = flipY;
-				this .data         = data;
-	
+				this .width  = width;
+				this .height = height;
+				this .flipY  = flipY;
+				this .data   = data;
+
 				var gl = this .getBrowser () .getContext ();
-	
+
 				gl .pixelStorei (gl .UNPACK_FLIP_Y_WEBGL, flipY);
 				gl .pixelStorei (gl .UNPACK_ALIGNMENT, 1);
 				gl .bindTexture (gl .TEXTURE_2D, this .getTexture ());
 				gl .texImage2D  (gl .TEXTURE_2D, 0, gl .RGBA, width, height, 0, gl .RGBA, gl .UNSIGNED_BYTE, 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)
@@ -177,58 +159,23 @@ function (Fields,
 		},
 		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);
-		},
-		resize: function (input, inputWidth, inputHeight, outputWidth, outputHeight)
-		{
-		   // Nearest neighbor scaling algorithm for very small images.
-
-			var
-				output = new Uint8Array (outputWidth * outputHeight * 4),
-				scaleX = outputWidth / inputWidth,
-				scaleY = outputHeight / inputHeight;
-
-			for (var y = 0; y < outputHeight; ++ y)
-			{
-				var
-					inputW  = Math .floor (y / scaleY) * inputWidth,
-					outputW = y * outputWidth;
-
-				for (var x = 0; x < outputWidth; ++ x)
-				{
-					var
-						index       = (inputW + Math.floor (x / scaleX)) * 4,
-						indexScaled = (outputW + x) * 4;
-
-					output [indexScaled]     = input [index];
-					output [indexScaled + 1] = input [index + 1];
-					output [indexScaled + 2] = input [index + 2];
-					output [indexScaled + 3] = input [index + 3];
-				}
-			}
-
-			return output;
+			X3DSingleTextureNode .prototype .updateTextureProperties .call (this,
+			                                                                this .target,
+			                                                                this .textureProperties_ .getValue (),
+			                                                                this .texturePropertiesNode,
+			                                                                this .width,
+			                                                                this .height,
+			                                                                this .repeatS_ .getValue (),
+			                                                                this .repeatT_ .getValue (),
+			                                                                false);
 		},
-		setShaderUniforms: function (gl, shaderObject, i)
+		setShaderUniformsToChannel: function (gl, shaderObject, renderObject, i)
 		{
-			shaderObject .textureTypeArray [i] = 2;
-			gl .activeTexture (gl .TEXTURE2);
+			gl .activeTexture (gl .TEXTURE0 + shaderObject .getBrowser () .getTexture2DUnits () [i]);
 			gl .bindTexture (gl .TEXTURE_2D, this .getTexture ());
-			gl .uniform1iv (shaderObject .x3d_TextureType, shaderObject .textureTypeArray); // TODO: Put this in X3DProgramableShaderObject
+			gl .uniform1i (shaderObject .x3d_TextureType [i], 2);
 		},
 	});
 
 	return X3DTexture2DNode;
 });
-
-