x_ite 4.2.17 → 4.7.7

package/src/x_ite/Bits/TraverseType.js

@@ -57,14 +57,11 @@ define (function ()
 	{
 		POINTER:   i ++,
 		CAMERA:    i ++,
+		PICKING:   i ++,
 		COLLISION: i ++,
-		DEPTH:     i ++,
+		SHADOW:    i ++,
 		DISPLAY:   i ++,
 	};
 
-	Object .preventExtensions (TraverseType);
-	Object .freeze (TraverseType);
-	Object .seal (TraverseType);
-
 	return TraverseType;
 });

package/src/x_ite/Bits/X3DConstants.js

@@ -52,11 +52,20 @@ define (function ()
 "use strict";
 
 	var
-		loadState = 0,
-		fieldType = 0;
+		browserEvent = 0,
+		loadState    = 0,
+		fieldType    = 0;
 
 	var X3DConstants =
 	{
+		// Browser event
+
+		CONNECTION_ERROR:  browserEvent ++,
+		BROWSER_EVENT:     browserEvent ++,
+		INITIALIZED_EVENT: browserEvent ++,
+		SHUTDOWN_EVENT:    browserEvent ++,
+		INITIALIZED_ERROR: browserEvent ++,
+
 		// Load state
 
 		NOT_STARTED_STATE: loadState ++,

package/src/x_ite/Browser/Core/BrowserOptions.js

@@ -67,7 +67,7 @@ function (Fields,
           TextureQuality)
 {
 "use strict";
-	
+
 	function toBoolean (value, defaultValue)
 	{
 		if (value === "true" || value === "TRUE")
@@ -109,6 +109,7 @@ function (Fields,
 			new X3DFieldDefinition (X3DConstants .inputOutput, "Gravity",                new Fields .SFFloat (9.80665)),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "StraightenHorizon",      new Fields .SFBool (true)),
 			new X3DFieldDefinition (X3DConstants .inputOutput, "LogarithmicDepthBuffer", new Fields .SFBool (false)),
+			new X3DFieldDefinition (X3DConstants .inputOutput, "Timings",                new Fields .SFBool (false)),
 		]),
 		getTypeName: function ()
 		{
@@ -125,7 +126,7 @@ function (Fields,
 		initialize: function ()
 		{
 			X3DBaseNode .prototype .initialize .call (this);
-			
+
 			this .SplashScreen_              .addInterest ("set_splashScreen__",           this);
 			this .Rubberband_                .addInterest ("set_rubberband__",             this);
 			this .PrimitiveQuality_          .addInterest ("set_primitiveQuality__",       this);
@@ -133,34 +134,37 @@ function (Fields,
 			this .Shading_                   .addInterest ("set_shading__",                this);
 			this .StraightenHorizon_         .addInterest ("set_straightenHorizon__",      this);
 			this .LogarithmicDepthBuffer_    .addInterest ("set_logarithmicDepthBuffer__", this);
+			this .Timings_                   .addInterest ("set_timings__",                this);
 
 			this .configure ();
 		},
 		configure: function ()
 		{
-			if (! this .isInitialized ())
+			if (!this .isInitialized ())
 				return;
 
-			var fieldDefinitions = this .getFieldDefinitions ();
+			const
+				browser          = this .getBrowser (),
+				localStorage     = browser .getLocalStorage (),
+				fieldDefinitions = this .getFieldDefinitions ();
 
-			for (var i = 0; i < fieldDefinitions .length; ++ i)
+			for (const fieldDefinition of fieldDefinitions)
 			{
-				var
-					fieldDefinition = fieldDefinitions [i],
-					field           = this .getField (fieldDefinition .name);
+				const field = this .getField (fieldDefinition .name);
 
-				if (this .getBrowser () .getLocalStorage () ["BrowserOptions." + fieldDefinition .name] !== undefined)
+				if (localStorage ["BrowserOptions." + fieldDefinition .name] !== undefined)
 					continue;
 
-				if (! field .equals (fieldDefinition .value))
+				if (!field .equals (fieldDefinition .value))
 					field .setValue (fieldDefinition .value);
 			}
 
-			var
-				rubberband        = this .getBrowser () .getLocalStorage () ["BrowserOptions.Rubberband"],
-				primitiveQuality  = this .getBrowser () .getLocalStorage () ["BrowserOptions.PrimitiveQuality"],
-				textureQuality    = this .getBrowser () .getLocalStorage () ["BrowserOptions.TextureQuality"],
-				straightenHorizon = this .getBrowser () .getLocalStorage () ["BrowserOptions.StraightenHorizon"];
+			const
+				rubberband        = localStorage ["BrowserOptions.Rubberband"],
+				primitiveQuality  = localStorage ["BrowserOptions.PrimitiveQuality"],
+				textureQuality    = localStorage ["BrowserOptions.TextureQuality"],
+				straightenHorizon = localStorage ["BrowserOptions.StraightenHorizon"],
+				timings           = localStorage ["BrowserOptions.Timings"];
 
 			this .setAttributeSplashScreen ();
 
@@ -175,6 +179,9 @@ function (Fields,
 
 			if (straightenHorizon !== undefined && straightenHorizon !== this .StraightenHorizon_ .getValue ())
 				this .StraightenHorizon_ = straightenHorizon;
+
+			if (timings !== undefined && timings !== this .Timings_ .getValue ())
+				this .Timings_ = timings;
 		},
 		setAttributeSplashScreen: function ()
 		{
@@ -200,10 +207,6 @@ function (Fields,
 		{
 			return toBoolean (this .getBrowser () .getElement () .attr ("splashScreen"), true);
 		},
-		getTimings: function ()
-		{
-			return toBoolean (this .getBrowser () .getElement () .attr ("timings"), true);
-		},
 		getPrimitiveQuality: function ()
 		{
 			return this .primitiveQuality;
@@ -223,21 +226,21 @@ function (Fields,
 		set_rubberband__: function (rubberband)
 		{
 			this .getBrowser () .getLocalStorage () ["BrowserOptions.Rubberband"] = rubberband .getValue ();
+			this .getBrowser () .getViewer () .initShaders ();
 		},
 		set_primitiveQuality__: function (value)
 		{
-			var primitiveQuality = value .getValue () .toUpperCase ();
+			const
+				browser          = this .getBrowser (),
+				localStorage     = browser .getLocalStorage (),
+				primitiveQuality = value .getValue () .toUpperCase ();
 
-			this .getBrowser () .getLocalStorage () ["BrowserOptions.PrimitiveQuality"] = primitiveQuality;
+			localStorage ["BrowserOptions.PrimitiveQuality"] = primitiveQuality;
 
-			var
-				arc      = this .getBrowser () .getArc2DOptions (),
-				arcClose = this .getBrowser () .getArcClose2DOptions (),
-				circle   = this .getBrowser () .getCircle2DOptions (),
-				disk     = this .getBrowser () .getDisk2DOptions (),
-				cone     = this .getBrowser () .getConeOptions (),
-				cylinder = this .getBrowser () .getCylinderOptions (),
-				sphere   = this .getBrowser () .getSphereOptions ();
+			const
+				cone     = browser .getConeOptions (),
+				cylinder = browser .getCylinderOptions (),
+				sphere   = browser .getSphereOptions ();
 
 			switch (primitiveQuality)
 			{
@@ -248,16 +251,13 @@ function (Fields,
 
 					this .primitiveQuality = PrimitiveQuality .LOW;
 
-					arc .dimension_      = 20;
-					arcClose .dimension_ = 20;
-					circle .dimension_   = 20;
-					disk .dimension_     = 20;
+					if (browser .setGeometry2DPrimitiveQuality)
+						browser .setGeometry2DPrimitiveQuality (this .primitiveQuality);
 
 					cone     .xDimension_ = 16;
 					cylinder .xDimension_ = 16;
-
-					sphere .xDimension_ = 20;
-					sphere .yDimension_ = 9;
+					sphere   .xDimension_ = 20;
+					sphere   .yDimension_ = 9;
 					break;
 				}
 				case "HIGH":
@@ -267,16 +267,13 @@ function (Fields,
 
 					this .primitiveQuality = PrimitiveQuality .HIGH;
 
-					arc .dimension_      = 80;
-					arcClose .dimension_ = 80;
-					circle .dimension_   = 80;
-					disk .dimension_     = 80;
+					if (browser .setGeometry2DPrimitiveQuality)
+						browser .setGeometry2DPrimitiveQuality (this .primitiveQuality);
 
 					cone     .xDimension_ = 32;
 					cylinder .xDimension_ = 32;
-
-					sphere .xDimension_ = 64;
-					sphere .yDimension_ = 31;
+					sphere   .xDimension_ = 64;
+					sphere   .yDimension_ = 31;
 					break;
 				}
 				default:
@@ -286,33 +283,33 @@ function (Fields,
 
 					this .primitiveQuality = PrimitiveQuality .MEDIUM;
 
-					arc .dimension_      = 40;
-					arcClose .dimension_ = 40;
-					circle .dimension_   = 40;
-					disk .dimension_     = 40;
+					if (browser .setGeometry2DPrimitiveQuality)
+						browser .setGeometry2DPrimitiveQuality (this .primitiveQuality);
 
 					cone     .xDimension_ = 20;
 					cylinder .xDimension_ = 20;
-
-					sphere .xDimension_ = 32;
-					sphere .yDimension_ = 15;
+					sphere   .xDimension_ = 32;
+					sphere   .yDimension_ = 15;
 					break;
 				}
 			}
 		},
 		set_textureQuality__: function (value)
 		{
-			var textureQuality = value .getValue () .toUpperCase ();
+			const
+				browser        = this .getBrowser (),
+				localStorage   = browser .getLocalStorage (),
+				textureQuality = value .getValue () .toUpperCase ();
 
-			this .getBrowser () .getLocalStorage () ["BrowserOptions.TextureQuality"] = textureQuality;
+			localStorage ["BrowserOptions.TextureQuality"] = textureQuality;
 
-			var textureProperties = this .getBrowser () .getDefaultTextureProperties ();
+			const textureProperties = this .getBrowser () .getDefaultTextureProperties ();
 
 			switch (textureQuality)
 			{
 				case "LOW":
 				{
-					if (this .textureQuality === TextureQuality .HIGH)
+					if (this .textureQuality === TextureQuality .LOW)
 						break;
 
 					this .textureQuality = TextureQuality .LOW;
@@ -337,7 +334,7 @@ function (Fields,
 					textureProperties .minificationFilter_  = "NICEST";
 					textureProperties .textureCompression_  = "NICEST";
 					textureProperties .generateMipMaps_     = true;
-			
+
 					//glHint (GL_GENERATE_MIPMAP_HINT,        GL_NICEST);
 					//glHint (GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
 					break;
@@ -362,7 +359,7 @@ function (Fields,
 		},
 		set_shading__: function (value)
 		{
-			var shading = value .getValue () .toUpperCase ();
+			const shading = value .getValue () .toUpperCase ();
 
 			switch (shading)
 			{
@@ -402,9 +399,11 @@ function (Fields,
 		},
 		set_logarithmicDepthBuffer__: function (logarithmicDepthBuffer)
 		{
-			var browser = this .getBrowser ();
+			const
+				browser = this .getBrowser (),
+				gl      = browser .getContext ();
 
-			logarithmicDepthBuffer = logarithmicDepthBuffer .getValue () && Boolean (browser .getExtension ("EXT_frag_depth"));
+			logarithmicDepthBuffer = logarithmicDepthBuffer .getValue () && (gl .getVersion () >= 2 || Boolean (browser .getExtension ("EXT_frag_depth")));
 
 			if (logarithmicDepthBuffer === browser .getRenderingProperties () .LogarithmicDepthBuffer_ .getValue ())
 				return;
@@ -415,20 +414,42 @@ function (Fields,
 
 			// There's no need to update background shader.
 
-			browser .getPointShader () .parts_ [0] .getValue () .url_ .addEvent ();
-			browser .getPointShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			if (browser .hasPointShader ())
+			{
+				browser .getPointShader () .parts_ [0] .getValue () .url_ .addEvent ();
+				browser .getPointShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			}
 
-			browser .getLineShader () .parts_ [0] .getValue () .url_ .addEvent ();
-			browser .getLineShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			if (browser .hasLineShader ())
+			{
+				browser .getLineShader () .parts_ [0] .getValue () .url_ .addEvent ();
+				browser .getLineShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			}
 
-			browser .getGouraudShader () .parts_ [0] .getValue () .url_ .addEvent ();
-			browser .getGouraudShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			if (browser .hasGouraudShader ())
+			{
+				browser .getGouraudShader () .parts_ [0] .getValue () .url_ .addEvent ();
+				browser .getGouraudShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			}
 
-			browser .getPhongShader () .parts_ [0] .getValue () .url_ .addEvent ();
-			browser .getPhongShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			if (browser .hasPhongShader ())
+			{
+				browser .getPhongShader () .parts_ [0] .getValue () .url_ .addEvent ();
+				browser .getPhongShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			}
+
+			if (browser .hasShadowShader ())
+			{
+				browser .getShadowShader () .parts_ [0] .getValue () .url_ .addEvent ();
+				browser .getShadowShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			}
+		},
+		set_timings__: function (timings)
+		{
+			const browser = this .getBrowser ();
 
-			browser .getShadowShader () .parts_ [0] .getValue () .url_ .addEvent ();
-			browser .getShadowShader () .parts_ [1] .getValue () .url_ .addEvent ();
+			browser .getLocalStorage () ["BrowserOptions.Timings"] = timings .getValue ();
+			browser .getBrowserTimings () .setEnabled (timings .getValue ());
 		},
 	});
 

package/src/x_ite/Browser/Core/BrowserTimings.js

@@ -59,14 +59,14 @@ function ($,
           _)
 {
 "use strict";
-	
+
    function f2 (n) { return Math .floor (n * 100) / 100; }
 
 	function BrowserTimings (executionContext)
 	{
 		X3DBaseNode .call (this, executionContext);
 
-		this .addChildObjects ("enabled", new SFBool ());
+		this .enabled = false;
 	}
 
 	BrowserTimings .prototype = Object .assign (Object .create (X3DBaseNode .prototype),
@@ -88,42 +88,33 @@ function ($,
 		{
 			X3DBaseNode .prototype .initialize .call (this);
 
-			this .enabled_ .addInterest ("set_enabled__", this);
-
 			this .localeOptions = { minimumFractionDigits: 2, maximumFractionDigits: 2 };
 			this .type          = this .getBrowser () .getLocalStorage () ["BrowserTimings.type"] || "LESS";
 			this .startTime     = 0;
 			this .frames        = 0;
 
-			this .element = $("<div></div>") .addClass ("x_ite-private-browser-timings") .appendTo (this .getBrowser () .getElement () .find (".x_ite-private-surface"));
+			this .element = $("<div></div>") .addClass ("x_ite-private-browser-timings") .appendTo (this .getBrowser () .getSurface ());
 			this .table   = $("<table></table>") .appendTo (this .element);
 			this .header  = $("<thead></thead>") .append ($("<tr></tr>") .append ($("<th colspan='2'></th>"))) .appendTo (this .table);
 			this .body    = $("<tbody></tbody>") .appendTo (this .table);
 			this .footer  = $("<tfoot></tfoot>") .append ($("<tr></tr>") .append ($("<td colspan='2'></td>"))) .appendTo (this .table);
-			this .button  = $("<button></button>") .click (this .set_type__ .bind (this)) .appendTo (this .footer .find ("td"));
+			this .button  = $("<button></button>") .attr ("type", "button") .click (this .set_type__ .bind (this)) .appendTo (this .footer .find ("td"));
 			this .rows    = [ ];
 
 			this .set_button__ ();
-
-			if (this .getBrowser () .getLocalStorage () ["BrowserTimings.enabled"])
-				this .enabled_ = true;
-		},
-		setEnabled: function (value)
-		{
-			this .enabled_ = value;
 		},
 		getEnabled: function ()
 		{
-			return this .enabled_ .getValue ();
+			return this .enabled;
 		},
-		set_enabled__: function (enabled)
+		setEnabled: function (enabled)
 		{
-			if (! this .getBrowser () .getBrowserOptions () .getTimings ())
+			if (this .enabled === enabled)
 				return;
 
-			this .getBrowser () .getLocalStorage () ["BrowserTimings.enabled"] = enabled .getValue ();
+			this .enabled = enabled;
 
-			if (enabled .getValue ())
+			if (enabled)
 			{
 				this .element .fadeIn ();
 				this .getBrowser () .prepareEvents () .addInterest ("update", this);
@@ -157,11 +148,11 @@ function ($,
 		update: function ()
 		{
 			var currentTime = this .getBrowser () .getCurrentTime ();
-		
+
 			if (currentTime - this .startTime > 1)
 			{
 			   this .build ();
-				
+
 				this .frames    = 0;
 				this .startTime = currentTime;
 			}
@@ -177,13 +168,13 @@ function ($,
 				fixed       = this .localeOptions,
 				rows        = this .rows,
 				r           = 0;
-			
+
 			rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Frame rate") + ":")) .append ($("<td></td>") .text (f2(this .frames / (currentTime - this .startTime)) .toLocaleString (language, fixed) + " " + _("fps")));
 			rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Speed")      + ":")) .append ($("<td></td>") .text (f2(this .getSpeed (browser .currentSpeed))         .toLocaleString (language, fixed) + " " + this .getSpeedUnit (browser .currentSpeed)));
 
 			if (this .type === "MORE")
 			{
-				var 
+				var
 					layers            = browser .getWorld () .getLayerSet () .getLayers (),
 					activeLayer       = browser .getActiveLayer (),
 					systemTime        = browser .systemTime,
@@ -205,14 +196,15 @@ function ($,
 			   rows [1] .addClass ("x_ite-private-more");
 
 				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Browser")   + ":")) .append ($("<td></td>") .text (f2(systemTime)           .toLocaleString (language, fixed) + " " + _("ms")));
-				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("X3D")       + ":")) .append ($("<td></td>") .text (f2(browser .browserTime) .toLocaleString (language, fixed) + " " + _("ms")));
-				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Routing")   + ":")) .append ($("<td></td>") .text (f2(routingTime)          .toLocaleString (language, fixed) + " " + _("ms")));
-				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Picking")   + ":")) .append ($("<td></td>") .text (f2(browser .pickingTime) .toLocaleString (language, fixed) + " " + _("ms")));
+				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("X3D total")       + ":")) .append ($("<td></td>") .text (f2(browser .browserTime) .toLocaleString (language, fixed) + " " + _("ms")));
+				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Event Processing")   + ":")) .append ($("<td></td>") .text (f2(routingTime)          .toLocaleString (language, fixed) + " " + _("ms")));
+				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Pointer")   + ":")) .append ($("<td></td>") .text (f2(browser .pointerTime) .toLocaleString (language, fixed) + " " + _("ms")));
 				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Camera")    + ":")) .append ($("<td></td>") .text (f2(browser .cameraTime)  .toLocaleString (language, fixed) + " " + _("ms")));
-				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Collision") + ":")) .append ($("<td></td>") .text (f2(collisionTime)        .toLocaleString (language, fixed) + " " + _("ms")));
-				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Display")   + ":")) .append ($("<td></td>") .text (f2(browser .displayTime) .toLocaleString (language, fixed) + " " + _("ms")));
-				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Shapes")    + ":")) .append ($("<td></td>") .text (opaqueShapes + " + " + transparentShapes));
-				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Sensors")   + ":")) .append ($("<td></td>") .text (prepareEvents + sensors));
+				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Picking")   + ":")) .append ($("<td></td>") .text (f2(browser .pickingTime) .toLocaleString (language, fixed) + " " + _("ms")));
+				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Collision Detection") + ":")) .append ($("<td></td>") .text (f2(collisionTime)        .toLocaleString (language, fixed) + " " + _("ms")));
+				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Rendering")   + ":")) .append ($("<td></td>") .text (f2(browser .displayTime) .toLocaleString (language, fixed) + " " + _("ms")));
+				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Number of Shapes")    + ":")) .append ($("<td></td>") .text (opaqueShapes + " + " + transparentShapes));
+				rows [r++] = $("<tr></tr>") .append ($("<td></td>") .text (_("Number of Sensors")   + ":")) .append ($("<td></td>") .text (prepareEvents + sensors));
 			}
 
 			rows .length = r;