x_ite 4.0.5 → 4.7.5

package/src/x_ite/Browser/Text/X3DTextContext.js

@@ -50,7 +50,7 @@
 define ([
 	"jquery",
 	"x_ite/Components/Text/FontStyle",
-	"lib/opentype.js/dist/opentype",
+	"opentype",
 ],
 function ($,
           FontStyle,
@@ -60,64 +60,72 @@ function ($,
 
 	function X3DTextContext ()
 	{
-		this .fontCache         = { };
-		this .fontGeometryCache = { }; // [fontName] [primitveQuality] [glyphIndex]
+		this .fontCache  = new Map ();
+		this .glyphCache = new Map (); // [font] [primitveQuality] [glyphIndex]
 	}
 
 	X3DTextContext .prototype =
 	{
 		initialize: function ()
-		{
-		},
+		{ },
 		getDefaultFontStyle: function ()
 		{
-			if (! this .defaultFontStyle)
-			{
-				this .defaultFontStyle = new FontStyle (this .getPrivateScene ());
-				this .defaultFontStyle .setup ();
-			}
+			this .defaultFontStyle = new FontStyle (this .getPrivateScene ());
+			this .defaultFontStyle .setup ();
+
+			this .getDefaultFontStyle = function () { return this .defaultFontStyle; };
 
 			return this .defaultFontStyle;
 		},
-		getFont: function (URL, success, error)
+		getFont: function (url)
 		{
-			if (URL .query .length !== 0)
-				error ("Font url with query not supported");
+			url = url .toString ();
 
-			var deferred = this .fontCache [URL .filename];
+			var deferred = this .fontCache .get (url);
 
-			if (! deferred)
+			if (deferred === undefined)
 			{
-				deferred = this .fontCache [URL .filename] = $.Deferred ();
+				this .fontCache .set (url, deferred = $.Deferred ());
 
-				opentype .load (URL .toString (), this .setFont .bind (this, URL));
+				opentype .load (url, this .setFont .bind (this, deferred));
 			}
 
-			deferred .done (success);
-			deferred .fail (error);
+			return deferred;
 		},
-		setFont: function (URL, error, font)
+		setFont: function (deferred, error, font)
 		{
-			var deferred = this .fontCache [URL .filename];
-
 			if (error)
+			{
 				deferred .reject (error);
+			}
 			else
 			{
-				// Setup font.
-				font .fontName = font .familyName + font .styleName;
-
-				// Workaround to initialize composite glyphs.
-				for (var i = 0, length = font .numGlyphs; i < length; ++ i)
-					font .glyphs .get (i) .getPath (0, 0, 1);
+//				// Workaround to initialize composite glyphs.
+//				for (var i = 0, length = font .numGlyphs; i < length; ++ i)
+//					font .glyphs .get (i) .getPath (0, 0, 1);
 
 				// Resolve callbacks.
 				deferred .resolve (font);
 			}
 		},
-		getFontGeometryCache: function ()
+		getGlyph: function (font, primitveQuality, glyphIndex)
 		{
-		   return this .fontGeometryCache;
+			var cachedFont = this .glyphCache .get (font);
+
+			if (! cachedFont)
+				this .glyphCache .set (font, cachedFont = [ ]);
+
+			var cachedQuality = cachedFont [primitveQuality];
+
+			if (! cachedQuality)
+				cachedQuality = cachedFont [primitveQuality] = [ ];
+
+			var cachedGlyph = cachedQuality [glyphIndex];
+
+			if (! cachedGlyph)
+				cachedGlyph = cachedQuality [glyphIndex] = { };
+
+		   return cachedGlyph;
 		},
 	};
 

package/src/x_ite/Browser/Text/X3DTextGeometry.js

@@ -63,7 +63,6 @@ function (TextAlignment,
 "use strict";
 
 	var
-		glyphCache  = { },
 		bbox        = new Box2 (),
 		lineBBox    = new Box2 (),
 		min         = new Vector2 (0, 0),
@@ -141,7 +140,7 @@ function (TextAlignment,
 				text      = this .text,
 				fontStyle = this .fontStyle,
 				numLines  = text .string_ .length;
-			
+
 			text .lineBounds_ .length = numLines;
 			this .glyphs      .length = 0;
 
@@ -164,9 +163,9 @@ function (TextAlignment,
 			else
 			{
 				var
-					string   = text .string_ .getValue (),
+					string   = text .string_,
 					numChars = 0;
-			
+
 				for (var i = 0, length = string .length; i < length; ++ i)
 					numChars += string [i] .length;
 
@@ -189,13 +188,13 @@ function (TextAlignment,
 		{
 			var
 				font        = fontStyle .getFont (),
-				string      = text .string_ .getValue (),
+				string      = text .string_,
 				numLines    = string .length,
 				maxExtent   = Math .max (0, text .maxExtent_ .getValue ()),
 				topToBottom = fontStyle .topToBottom_ .getValue (),
 				scale       = fontStyle .getScale (),
 				spacing     = fontStyle .spacing_ .getValue ();
-			
+
 			bbox .set ();
 
 			// Calculate bboxes.
@@ -217,13 +216,11 @@ function (TextAlignment,
 
 				// Calculate charSpacing and lineBounds.
 
-				var lineNumber = topToBottom ? l : numLines - l - 1;
-
 				var
 					charSpacing = 0,
 					length      = text .getLength (l);
-	
-				lineBound .set (size .x, lineNumber == 0 ? max .y - font .descender / font .unitsPerEm : spacing) .multiply (scale);
+
+				lineBound .set (size .x * scale, ll == 0 ? max .y - font .descender / font .unitsPerEm * scale : spacing);
 
 				if (maxExtent)
 				{
@@ -241,7 +238,7 @@ function (TextAlignment,
 					size .x      = length / scale;
 				}
 
-				this .charSpacings [ll] = charSpacing 
+				this .charSpacings [ll] = charSpacing;
 				text .lineBounds_ [l]   = lineBound;
 
 				// Calculate line translation.
@@ -313,10 +310,10 @@ function (TextAlignment,
 			                        max3 .set (max .x, max .y, 0));
 		},
 		vertical: function (text, fontStyle)
-		{		
+		{
 			var
 				font             = fontStyle .getFont (),
-				string           = text .string_ .getValue (),
+				string           = text .string_,
 				numLines         = string .length,
 				maxExtent        = Math .max (0, text .maxExtent_ .getValue ()),
 				leftToRight      = fontStyle .leftToRight_ .getValue (),
@@ -325,9 +322,9 @@ function (TextAlignment,
 				spacing          = fontStyle .spacing_ .getValue (),
 				yPad             = this .yPad,
 				primitiveQuality = this .getBrowser () .getBrowserOptions () .getPrimitiveQuality ();
-	
+
 			bbox .set ();
-		
+
 			// Calculate bboxes.
 
 			var
@@ -345,9 +342,9 @@ function (TextAlignment,
 					numChars = glyphs .length;
 
 				// Calculate line bbox
-		
+
 				lineBBox .set ();
-		
+
 				var
 					firstG = topToBottom ? 0 : numChars - 1,
 					lastG  = topToBottom ? numChars : -1,
@@ -359,12 +356,12 @@ function (TextAlignment,
 
 					// Get glyph extents.
 
-					this .getGlyphExtents (glyph, primitiveQuality, min, max);
-		
+					this .getGlyphExtents (font, glyph, primitiveQuality, min, max);
+
 					size .assign (max) .subtract (min);
-					
+
 					// Calculate glyph translation
-					
+
 					var glyphNumber = topToBottom ? g : numChars - g - 1;
 
 					this .translations [t] .set ((spacing - size .x - min .x) / 2, -glyphNumber);
@@ -372,18 +369,18 @@ function (TextAlignment,
 					// Calculate center.
 
 					center .assign (min) .add (size1_2 .assign (size) .divide (2)) .add (this .translations [t]);
-		
+
 					// Add bbox.
-		
+
 					lineBBox .add (box2 .set (size, center));
 				}
-							
+
 				// Get line extents.
-		
+
 				lineBBox .getExtents (min, max);
-		
+
 				size .assign (max) .subtract (min);
-	
+
 				// Calculate charSpacing and lineBounds.
 
 				var
@@ -392,17 +389,17 @@ function (TextAlignment,
 					charSpacing = 0,
 					length      = text .getLength (l);
 
-				lineBound .set (l === 0 ? spacing - padding: spacing, size .y) .multiply (scale);
+				lineBound .set (l === 0 ? spacing - padding: spacing, numChars ? size .y : 0) .multiply (scale);
 
 				if (maxExtent)
 				{
 					if (length)
 						length = Math .min (maxExtent, length);
-		
+
 					else
 						length = Math .min (maxExtent, size .y * scale);
 				}
-		
+
 				if (length)
 				{
 					charSpacing  = (length - lineBound .y) / (glyphs .length - 1) / scale;
@@ -410,11 +407,11 @@ function (TextAlignment,
 					size .y      = length / scale;
 					min .y       = max .y  - size .y;
 				}
-		
+
 				text .lineBounds_ [l] = lineBound;
-	
+
 				// Calculate line translation.
-				
+
 				switch (fontStyle .getMajorAlignment ())
 				{
 					case TextAlignment .BEGIN:
@@ -427,17 +424,18 @@ function (TextAlignment,
 					case TextAlignment .END:
 					{
 						// This is needed to make maxExtend and charSpacing work.
-						this .getGlyphExtents (glyphs [topToBottom ? numChars - 1 : 0] , primitiveQuality, glyphMin, vector);
+						if (numChars)
+							this .getGlyphExtents (font, glyphs [topToBottom ? numChars - 1 : 0], primitiveQuality, glyphMin .assign (Vector2 .Zero), vector);
 
 						translation .set (lineNumber * spacing, (size .y - max .y + glyphMin .y));
 						break;
 					}
 				}
-		
-				// Calculate glyph translation		
-		
+
+				// Calculate glyph translation
+
 				var space = 0;
-		
+
 				for (var tt = t0; tt < t; ++ tt)
 				{
 					this .translations [tt] .add (translation);
@@ -448,7 +446,7 @@ function (TextAlignment,
 
 					space += charSpacing;
 				}
-		
+
 				// Calculate ypad to extend line bounds.
 
 				switch (fontStyle .getMajorAlignment ())
@@ -468,49 +466,49 @@ function (TextAlignment,
 				// Calculate center.
 
 				center .assign (min) .add (size1_2 .assign (size) .divide (2));
-		
+
 				// Add bbox.
-					
+
 				bbox .add (box2 .set (size .multiply (scale), center .add (translation) .multiply (scale)));
 			}
 
 			// Get text extents.
-		
+
 			bbox .getExtents (min, max);
-		
+
 			size .assign (max) .subtract (min);
-			
+
 			// Extend lineBounds.
-		
+
 			switch (fontStyle .getMajorAlignment ())
 			{
 				case TextAlignment .BEGIN:
 				case TextAlignment .FIRST:
 				{
-					var lineBounds = text .lineBounds_ .getValue ();
+					var lineBounds = text .lineBounds_;
 
 					for (var i = 0, length = lineBounds .length; i < length; ++ i)
 						lineBounds [i] .y += max .y - yPad [i] * scale;
-		
+
 					break;
 				}
 				case TextAlignment .MIDDLE:
 					break;
 				case TextAlignment .END:
 				{
-					var lineBounds = text .lineBounds_ .getValue ();
+					var lineBounds = text .lineBounds_;
 
 					for (var i = 0, length = lineBounds .length; i < length; ++ i)
-						lineBounds [i].y += yPad [i] * scale - min .y;
-		
+						lineBounds [i] .y += yPad [i] * scale - min .y;
+
 					break;
 				}
 			}
-	
+
 			// Calculate text position
-		
+
 			text .textBounds_ = size;
-		
+
 			switch (fontStyle .getMajorAlignment ())
 			{
 				case TextAlignment .BEGIN:
@@ -524,7 +522,7 @@ function (TextAlignment,
 					this .bearing .set (-min .x, min .y);
 					break;
 			}
-		
+
 			switch (fontStyle .getMinorAlignment ())
 			{
 				case TextAlignment .BEGIN:
@@ -538,9 +536,9 @@ function (TextAlignment,
 					this .minorAlignment .set (-min .x - size .x, 0);
 					break;
 			}
-		
+
 			// Translate bbox by minorAlignment.
-		
+
 			min .add (this .minorAlignment);
 			max .add (this .minorAlignment);
 
@@ -554,14 +552,7 @@ function (TextAlignment,
 		},
 		stringToGlyphs: function (font, line, normal, lineNumber)
 		{
-			line = line .getValue ();
-
-			var
-				fontGlyphCache = glyphCache [font .fontName],
-				glypes         = this .glyphs [lineNumber];
-
-			if (! fontGlyphCache)
-				fontGlyphCache = glyphCache [font .fontName] = [ ];
+			var glypes = this .glyphs [lineNumber];
 
 			if (! glypes)
 				glypes = this .glyphs [lineNumber] = [ ];
@@ -574,24 +565,7 @@ function (TextAlignment,
 				step  = normal ? 1 : -1;
 
 			for (var c = first, g = 0; c !== last; c += step, ++ g)
-			{
-				var
-					charCode = line .charCodeAt (c),
-					glyph     = null;
-				
-				if (glyph = fontGlyphCache [charCode])
-					;
-				else
-				{
-					glyph = font .stringToGlyphs (line [c]) [0];
-
-					fontGlyphCache [charCode] = glyph;
-
-					glyph .extents = { };
-				}
-
-				glypes [g] = glyph;
-			}
+				glypes [g] = font .charToGlyph (line [c]);
 
 			return glypes;
 		},
@@ -613,7 +587,7 @@ function (TextAlignment,
 					glyph   = glyphs [g],
 					kerning = g + 1 < length ? font .getKerningValue (glyph, glyphs [g + 1]) : 0;
 
-				this .getGlyphExtents (glyph, primitiveQuality, glyphMin, glyphMax);
+				this .getGlyphExtents (font, glyph, primitiveQuality, glyphMin, glyphMax);
 
 				xMax += glyph .advanceWidth + kerning;
 				yMin  = Math .min (yMin, glyphMin .y);
@@ -622,7 +596,7 @@ function (TextAlignment,
 
 			if (glyphs .length)
 			{
-				this .getGlyphExtents (glyphs [0], primitiveQuality, glyphMin, glyphMax);
+				this .getGlyphExtents (font, glyphs [0], primitiveQuality, glyphMin, glyphMax);
 
 				xMin  = glyphMin .x;
 			}

package/src/x_ite/Browser/Texturing/MultiTextureFunctionType.js

@@ -0,0 +1,64 @@
+/* -*- 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 (function ()
+{
+"use strict";
+
+	var i = 0;
+
+	var FunctionType =
+	{
+		DEFAULT:        i ++,
+		COMPLEMENT:     i ++,
+		ALPHAREPLICATE: i ++,
+	};
+
+	return FunctionType;
+});

package/src/x_ite/Browser/Texturing/MultiTextureModeType.js

@@ -0,0 +1,81 @@
+/* -*- 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 (function ()
+{
+"use strict";
+
+	var i = 0;
+
+	var ModeType =
+	{
+		REPLACE:                   i ++,
+		MODULATE:                  i ++,
+		MODULATE2X:                i ++,
+		MODULATE4X:                i ++,
+		ADD:                       i ++,
+		ADDSIGNED:                 i ++,
+		ADDSIGNED2X:               i ++,
+		ADDSMOOTH:                 i ++,
+		SUBTRACT:                  i ++,
+		BLENDDIFFUSEALPHA:         i ++,
+		BLENDTEXTUREALPHA:         i ++,
+		BLENDFACTORALPHA:          i ++,
+		BLENDCURRENTALPHA:         i ++,
+		MODULATEALPHA_ADDCOLOR:    i ++,
+		MODULATEINVALPHA_ADDCOLOR: i ++,
+		MODULATEINVCOLOR_ADDALPHA: i ++,
+		DOTPRODUCT3:               i ++,
+		SELECTARG1:                i ++,
+		SELECTARG2:                i ++,
+		OFF:                       i ++,
+	};
+
+	return ModeType;
+});

package/src/x_ite/Browser/Texturing/MultiTextureSourceType.js

@@ -0,0 +1,65 @@
+/* -*- 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 (function ()
+{
+"use strict";
+
+	var i = 0;
+
+	var SourceType =
+	{
+		DEFAULT:  i ++,
+		DIFFUSE:  i ++,
+		SPECULAR: i ++,
+		FACTOR:   i ++,
+	};
+
+	return SourceType;
+});