x_ite 4.2.17 → 4.7.7

package/src/x_ite/Browser/Networking/X3DNetworkingContext.js

@@ -49,16 +49,12 @@
 
 define ([
 	"x_ite/Fields",
-	"x_ite/Components/Networking/LoadSensor",
 	"x_ite/Browser/Networking/urls",
-	"standard/Networking/URI",
 	"sprintf",
 	"locale/gettext",
 ],
 function (Fields,
-          LoadSensor,
           urls,
-          URI,
           sprintf,
           _)
 {
@@ -66,25 +62,23 @@ function (Fields,
 
 	function getBaseURI (element)
 	{
-		var baseURI = element .baseURI;
+		let baseURI = element .baseURI;
 
 		// Fix for Edge.
 		if (baseURI .startsWith ("about:"))
 			baseURI = document .baseURI;
 
-		return new URI (baseURI);
+		return baseURI;
 	}
 
 	function X3DNetworkingContext ()
 	{
 		this .addChildObjects ("loadCount", new Fields .SFInt32 ());
 
-		this .loadSensor     = new LoadSensor (this .getPrivateScene ());
 		this .loadingTotal   = 0;
 		this .loadingObjects = new Set ();
 		this .loading        = false;
 		this .location       = getBaseURI (this .getElement () [0]);
-		this .defaultScene   = this .createScene (); // Inline node's empty scene.
 
 		this .getCanvas () .fadeOut (0);
 
@@ -95,18 +89,10 @@ function (Fields,
 	X3DNetworkingContext .prototype =
 	{
 		initialize: function ()
-		{
-			this .loadSensor .setup ();
-
-			// Inline node's empty scene.
-
-			this .defaultScene .setPrivate (true);
-			this .defaultScene .setLive (true);
-			this .defaultScene .setup ();
-		},
+		{ },
 		getProviderUrl: function ()
 		{
-			return urls .providerUrl;
+			return urls .getProviderUrl ();
 		},
 		getLocation: function ()
 		{
@@ -114,12 +100,18 @@ function (Fields,
 		},
 		getDefaultScene: function ()
 		{
+			// Inline node's empty scene.
+
+			this .defaultScene = this .createScene ();
+
+			this .defaultScene .setPrivate (true);
+			this .defaultScene .setLive (true);
+			this .defaultScene .setup ();
+
+			this .getDefaultScene = function () { return this .defaultScene; };
+
 			return this .defaultScene;
 		},
-		getLoadSensor: function ()
-		{
-			return this .loadSensor;
-		},
 		setBrowserLoading: function (value)
 		{
 			this .loading = value;
@@ -128,6 +120,8 @@ function (Fields,
 			{
 				this .resetLoadCount ();
 
+				this .getElement () .find (".x_ite-private-world-info") .remove ();
+
 				if (this .getBrowserOptions () .getSplashScreen ())
 				{
 					this .getCanvas ()       .stop (true, true) .animate ({ "delay": 1 }, 1) .fadeOut (0);
@@ -163,7 +157,7 @@ function (Fields,
 			++ this .loadingTotal;
 
 			this .loadingObjects .add (object);
-			
+
 			this .setLoadCount (this .loadingObjects .size);
 			this .setCursor ("DEFAULT");
 		},
@@ -201,7 +195,7 @@ function (Fields,
 			this .loadCount_   = 0;
 			this .loadingTotal = 0;
 
-			this .loadingObjects .clear ();			   
+			this .loadingObjects .clear ();
 		},
 	};
 

package/src/x_ite/Browser/Networking/urls.js

@@ -46,28 +46,43 @@
  *
  ******************************************************************************/
 
-define ([
-	"standard/Networking/URI",
-	"x_ite/DEBUG",
-],
-function (URI,
-          DEBUG)
+define (function ()
 {
 "use strict";
 
-	var scriptUrl = new URI (getScriptURL ())
+	function URLs () { }
 
-	function provider (component)
+	URLs .prototype =
 	{
-		var min = DEBUG ? "" : ".min";
+		getProviderUrl: function (file)
+		{
+			if (file)
+			{
+				if (getScriptURL () .match (/\.min\.js$/))
+					file += ".min";
 
-		return scriptUrl .transform ("components/" + component + min + ".js") .toString ();
-	}
+				return new URL ("assets/components/" + file + ".js", getScriptURL ()) .href;
+			}
 
-	return {
-		provider: provider,
-		providerUrl: "http://create3000.de/x_ite",
-		fallbackUrl: "http://cors.create3000.de/",
-		fallbackExpression: new RegExp ("^http://cors.create3000.de/"),
+			return "https://create3000.github.io/x_ite/";
+		},
+		getShaderUrl: function (file)
+		{
+			return new URL ("assets/shaders/" + file, getScriptURL ()) .href;
+		},
+		getFontsUrl: function (file)
+		{
+			return new URL ("assets/fonts/" + file, getScriptURL ()) .href;
+		},
+		getLinetypeUrl: function (index)
+		{
+			return new URL ("assets/linetype/" + index + ".png", getScriptURL ()) .href;
+		},
+		getHatchingUrl: function (index)
+		{
+			return new URL ("assets/hatching/" + index + ".png", getScriptURL ()) .href;
+		},
 	};
+
+	return new URLs ();
 });

package/src/x_ite/Browser/ParticleSystems/X3DParticleSystemsContext.js

@@ -53,18 +53,17 @@ define ([
 function (PointEmitter)
 {
 "use strict";
-	
+
 	function X3DParticleSystemsContext () { }
 
 	X3DParticleSystemsContext .prototype =
 	{
 		getDefaultEmitter: function ()
 		{
-			if (! this .defaultEmitter)
-			{
-				this .defaultEmitter = new PointEmitter (this .getPrivateScene ());
-				this .defaultEmitter .setup ();
-			}
+			this .defaultEmitter = new PointEmitter (this .getPrivateScene ());
+			this .defaultEmitter .setup ();
+
+			this .getDefaultEmitter = function () { return this .defaultEmitter; };
 
 			return this .defaultEmitter;
 		},

package/src/x_ite/Browser/Picking/IntersectionType.js

@@ -0,0 +1,63 @@
+/* -*- 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 IntersectionType =
+	{
+		BOUNDS:   i ++,
+		GEOMETRY: i ++,
+	};
+
+	return IntersectionType;
+});

package/src/x_ite/Browser/Picking/MatchCriterion.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 MatchCriterion =
+	{
+		MATCH_ANY:      i ++,
+		MATCH_EVERY:    i ++,
+		MATCH_ONLY_ONE: i ++,
+	};
+
+	return MatchCriterion;
+});

package/src/x_ite/Browser/Picking/SortOrder.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 SortOrder =
+	{
+		ANY:        i ++,
+		CLOSEST:    i ++,
+		ALL:        i ++,
+		ALL_SORTED: i ++,
+	};
+
+	return SortOrder;
+});

package/src/x_ite/Browser/Picking/VolumePicker.js

@@ -0,0 +1,197 @@
+/* -*- 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 ([
+	"standard/Math/Numbers/Vector3",
+	"standard/Math/Numbers/Rotation4",
+	"standard/Math/Numbers/Matrix4",
+	require .getComponentUrl ("rigid-body-physics"),
+],
+function (Vector3,
+          Rotation4,
+          Matrix4,
+          RigidBodyPhysics)
+{
+"use strict";
+
+	var Ammo = RigidBodyPhysics .Ammo;
+
+	function VolumePicker ()
+	{
+		this .broadphase             = new Ammo .btDbvtBroadphase ();
+		this .collisionConfiguration = new Ammo .btDefaultCollisionConfiguration ();
+		this .dispatcher             = new Ammo .btCollisionDispatcher (this .collisionConfiguration);
+		this .collisionWorld         = new Ammo .btCollisionWorld (this .dispatcher, this .broadphase, this .collisionConfiguration);
+
+		this .compoundShape1         = new Ammo .btCompoundShape ();
+		this .motionState1           = new Ammo .btDefaultMotionState ();
+		this .constructionInfo1      = new Ammo .btRigidBodyConstructionInfo (0, this .motionState1, this .compoundShape1);
+		this .rigidBody1             = new Ammo .btRigidBody (this .constructionInfo1);
+
+		this .compoundShape2         = new Ammo .btCompoundShape ();
+		this .motionState2           = new Ammo .btDefaultMotionState ();
+		this .constructionInfo2      = new Ammo .btRigidBodyConstructionInfo (0, this .motionState2, this .compoundShape2);
+		this .rigidBody2             = new Ammo .btRigidBody (this .constructionInfo2);
+
+		this .collisionWorld .addCollisionObject (this .rigidBody1);
+		this .collisionWorld .addCollisionObject (this .rigidBody2);
+	}
+
+	VolumePicker .prototype =
+	{
+		constuctor: VolumePicker,
+		setChildShape1: function (matrix, childShape)
+		{
+			this .setChildShape (this .compoundShape1, matrix, childShape);
+		},
+		setChildShape2: function (matrix, childShape)
+		{
+			this .setChildShape (this .compoundShape2, matrix, childShape);
+		},
+		setChildShape1Components: function (transform, localScaling, childShape)
+		{
+			this .setChildShapeComponents (this .compoundShape1, transform, localScaling, childShape);
+		},
+		setChildShape2Components: function (transform, localScaling, childShape)
+		{
+			this .setChildShapeComponents (this .compoundShape2, transform, localScaling, childShape);
+		},
+		setChildShape: (function ()
+		{
+			var
+				translation = new Vector3 (0, 0, 0),
+				rotation    = new Rotation4 (0, 0, 1, 0),
+				scale       = new Vector3 (1, 1, 1),
+				s           = new Ammo .btVector3 (0, 0, 0);
+
+			return function (compoundShape, matrix, childShape)
+			{
+				try
+				{
+					if (compoundShape .getNumChildShapes ())
+						compoundShape .removeChildShapeByIndex (0);
+
+					if (childShape .getNumChildShapes ())
+					{
+						matrix .get (translation, rotation, scale);
+
+						s .setValue (scale .x, scale .y, scale .z);
+
+						childShape .setLocalScaling (s);
+						compoundShape .addChildShape (this .getTransform (translation, rotation), childShape);
+					}
+				}
+				catch (error)
+				{
+					// matrix .get
+				}
+			};
+		})(),
+		setChildShapeComponents: function (compoundShape, transform, localScaling, childShape)
+		{
+			if (compoundShape .getNumChildShapes ())
+				compoundShape .removeChildShapeByIndex (0);
+
+			if (childShape .getNumChildShapes ())
+			{
+				childShape .setLocalScaling (localScaling);
+				compoundShape .addChildShape (transform, childShape);
+			}
+		},
+		contactTest: function ()
+		{
+			this .collisionWorld .performDiscreteCollisionDetection ();
+
+			var numManifolds = this .dispatcher .getNumManifolds ();
+
+			for (var i = 0; i < numManifolds; ++ i)
+			{
+				var
+					contactManifold = this .dispatcher .getManifoldByIndexInternal (i),
+					numContacts     = contactManifold .getNumContacts ();
+
+				for (var j = 0; j < numContacts; ++ j)
+				{
+					var pt = contactManifold .getContactPoint (j);
+
+					if (pt .getDistance () <= 0)
+						return true;
+				}
+			}
+
+			return false;
+		},
+		getTransform: (function ()
+		{
+			var
+				T = new Ammo .btTransform (),
+				o = new Ammo .btVector3 (0, 0, 0),
+				m = new Matrix4 ();
+
+			return function (translation, rotation, transform)
+			{
+				var t = transform || T;
+
+				m .set (translation, rotation);
+
+				o .setValue (m [12], m [13], m [14]);
+
+				t .getBasis () .setValue (m [0], m [4], m [8],
+				                          m [1], m [5], m [9],
+				                          m [2], m [6], m [10]);
+
+				t .setOrigin (o);
+
+				return t;
+			};
+		})(),
+	};
+
+	return VolumePicker;
+});