x_ite 4.7.12 → 5.0.0

package/src/x_ite/Components/RigidBodyPhysics/SliderJoint.js

@@ -48,16 +48,16 @@
 
 
 define ([
-	"jquery",
-	"x_ite/Fields",
-	"x_ite/Basic/X3DFieldDefinition",
-	"x_ite/Basic/FieldDefinitionArray",
-	"x_ite/Components/RigidBodyPhysics/X3DRigidJointNode",
-	"x_ite/Bits/X3DConstants",
-	"standard/Math/Numbers/Vector3",
-	"standard/Math/Numbers/Rotation4",
-	"standard/Math/Numbers/Matrix4",
-	"lib/ammojs/AmmoJS"
+   "jquery",
+   "x_ite/Fields",
+   "x_ite/Base/X3DFieldDefinition",
+   "x_ite/Base/FieldDefinitionArray",
+   "x_ite/Components/RigidBodyPhysics/X3DRigidJointNode",
+   "x_ite/Base/X3DConstants",
+   "standard/Math/Numbers/Vector3",
+   "standard/Math/Numbers/Rotation4",
+   "standard/Math/Numbers/Matrix4",
+   "lib/ammojs/AmmoJS"
 ],
 function ($,
           Fields,
@@ -72,163 +72,163 @@ function ($,
 {
 "use strict";
 
-	function SliderJoint (executionContext)
-	{
-		X3DRigidJointNode .call (this, executionContext);
-
-		this .addType (X3DConstants .SliderJoint);
-
-		this .minSeparation_  .setUnit ("length");
-		this .maxSeparation_  .setUnit ("length");
-		this .sliderForce_    .setUnit ("force");
-		this .separation_     .setUnit ("force");
-		this .separationRate_ .setUnit ("speed");
-
-		this .joint   = null;
-		this .outputs = { };
-	}
-
-	SliderJoint .prototype = Object .assign (Object .create (X3DRigidJointNode .prototype),
-	{
-		constructor: SliderJoint,
-		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",            new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "forceOutput",         new Fields .MFString ("NONE")),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "axis",                new Fields .SFVec3f (0, 1, 0)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "minSeparation",       new Fields .SFFloat ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "maxSeparation",       new Fields .SFFloat (1)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "sliderForce",         new Fields .SFFloat (0)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "stopBounce",          new Fields .SFFloat ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "stopErrorCorrection", new Fields .SFFloat (1)),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "separation",          new Fields .SFFloat ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "separationRate",      new Fields .SFFloat ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "body1",               new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "body2",               new Fields .SFNode ()),
-		]),
-		getTypeName: function ()
-		{
-			return "SliderJoint";
-		},
-		getComponentName: function ()
-		{
-			return "RigidBodyPhysics";
-		},
-		getContainerField: function ()
-		{
-			return "joints";
-		},
-		initialize: function ()
-		{
-			X3DRigidJointNode .prototype .initialize .call (this);
-
-			this .axis_          .addInterest ("set_joint__",       this);
-			this .minSeparation_ .addInterest ("set_separation__",  this);
-			this .maxSeparation_ .addInterest ("set_separation__",  this);
-		},
-		addJoint: (function ()
-		{
-			var
-				axisRotation = new Rotation4 (0, 0, 1, 0),
-				matrixA      = new Matrix4 (),
-				matrixB      = new Matrix4 (),
-				origin       = new Ammo .btVector3 (0, 0, 0),
-				frameInA     = new Ammo .btTransform (),
-				frameInB     = new Ammo .btTransform ();
-
-			return function ()
-			{
-				if (! this .getCollection ())
-					return;
-
-				if (! this .getBody1 ())
-					return;
-
-				if (! this .getBody2 ())
-					return;
-
-			   if (this .getBody1 () .getCollection () !== this .getCollection ())
-					return;
-
-			   if (this .getBody2 () .getCollection () !== this .getCollection ())
-					return;
-
-				axisRotation .setFromToVec (Vector3 .xAxis, this .axis_ .getValue ());
-
-				matrixA .set (this .getBody1 () .position_ .getValue (), Rotation4 .multRight (this .getBody1 () .orientation_ .getValue (), axisRotation));
-				matrixB .set (this .getBody1 () .position_ .getValue (), Rotation4 .multRight (this .getBody1 () .orientation_ .getValue (), axisRotation));
-
-				origin .setValue (matrixA [12], matrixA [13], matrixA [14]);
-
-				frameInA .getBasis () .setValue (matrixA [0], matrixA [4], matrixA [8],
-				                                 matrixA [1], matrixA [5], matrixA [9],
-				                                 matrixA [2], matrixA [6], matrixA [10]);
-
-				frameInA .setOrigin (origin);
-
-				origin .setValue (matrixB [12], matrixB [13], matrixB [14]);
-
-				frameInA .getBasis () .setValue (matrixB [0], matrixB [4], matrixB [8],
-				                                 matrixB [1], matrixB [5], matrixB [9],
-				                                 matrixB [2], matrixB [6], matrixB [10]);
-
-				frameInB .setOrigin (origin);
-
-				this .joint = new Ammo .btSliderConstraint (this .getBody1 () .getRigidBody (),
-				                                            this .getBody2 () .getRigidBody (),
-				                                            frameInA,
-				                                            frameInB,
-				                                            true);
-
-				this .joint .setLowerAngLimit (0);
-				this .joint .setUpperAngLimit (0);
-
-				this .set_separation__ ();
-
-				this .getCollection () .getDynamicsWorld () .addConstraint (this .joint, true);
-			};
-		})(),
-		removeJoint: function ()
-		{
-			if (! this .joint)
-				return;
-
-			if (this .getCollection ())
-				this .getCollection () .getDynamicsWorld () .removeConstraint (this .joint);
-
-			Ammo .destroy (this .joint);
-			this .joint = null;
-		},
-		set_forceOutput__: function ()
-		{
-			for (var key in this .outputs)
-				delete this .outputs [key];
-
-			for (var i = 0, length = this .forceOutput_ .length; i < length; ++ i)
-			{
-				var value = this .forceOutput_ [i];
-
-				if (value == "ALL")
-				{
-					this .outputs .separation     = true;
-					this .outputs .separationRate = true;
-				}
-				else
-				{
-					this .outputs [value] = true;
-				}
-			}
-
-			this .setOutput (! $.isEmptyObject (this .outputs));
-		},
-		set_separation__: function ()
-		{
-			if (! this .joint)
-				return;
-
-			this .joint .setLowerLinLimit (this .minSeparation_ .getValue ());
-			this .joint .setUpperLinLimit (this .maxSeparation_ .getValue ());
-		},
-	});
-
-	return SliderJoint;
+   function SliderJoint (executionContext)
+   {
+      X3DRigidJointNode .call (this, executionContext);
+
+      this .addType (X3DConstants .SliderJoint);
+
+      this ._minSeparation  .setUnit ("length");
+      this ._maxSeparation  .setUnit ("length");
+      this ._sliderForce    .setUnit ("force");
+      this ._separation     .setUnit ("force");
+      this ._separationRate .setUnit ("speed");
+
+      this .joint   = null;
+      this .outputs = { };
+   }
+
+   SliderJoint .prototype = Object .assign (Object .create (X3DRigidJointNode .prototype),
+   {
+      constructor: SliderJoint,
+      [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",            new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "forceOutput",         new Fields .MFString ("NONE")),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "axis",                new Fields .SFVec3f (0, 1, 0)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "minSeparation",       new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "maxSeparation",       new Fields .SFFloat (1)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "sliderForce",         new Fields .SFFloat (0)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "stopBounce",          new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "stopErrorCorrection", new Fields .SFFloat (1)),
+         new X3DFieldDefinition (X3DConstants .outputOnly,  "separation",          new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .outputOnly,  "separationRate",      new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "body1",               new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "body2",               new Fields .SFNode ()),
+      ]),
+      getTypeName: function ()
+      {
+         return "SliderJoint";
+      },
+      getComponentName: function ()
+      {
+         return "RigidBodyPhysics";
+      },
+      getContainerField: function ()
+      {
+         return "joints";
+      },
+      initialize: function ()
+      {
+         X3DRigidJointNode .prototype .initialize .call (this);
+
+         this ._axis          .addInterest ("set_joint__",       this);
+         this ._minSeparation .addInterest ("set_separation__",  this);
+         this ._maxSeparation .addInterest ("set_separation__",  this);
+      },
+      addJoint: (function ()
+      {
+         var
+            axisRotation = new Rotation4 (0, 0, 1, 0),
+            matrixA      = new Matrix4 (),
+            matrixB      = new Matrix4 (),
+            origin       = new Ammo .btVector3 (0, 0, 0),
+            frameInA     = new Ammo .btTransform (),
+            frameInB     = new Ammo .btTransform ();
+
+         return function ()
+         {
+            if (! this .getCollection ())
+               return;
+
+            if (! this .getBody1 ())
+               return;
+
+            if (! this .getBody2 ())
+               return;
+
+            if (this .getBody1 () .getCollection () !== this .getCollection ())
+               return;
+
+            if (this .getBody2 () .getCollection () !== this .getCollection ())
+               return;
+
+            axisRotation .setFromToVec (Vector3 .xAxis, this ._axis .getValue ());
+
+            matrixA .set (this .getBody1 () ._position .getValue (), Rotation4 .multRight (this .getBody1 () ._orientation .getValue (), axisRotation));
+            matrixB .set (this .getBody1 () ._position .getValue (), Rotation4 .multRight (this .getBody1 () ._orientation .getValue (), axisRotation));
+
+            origin .setValue (matrixA [12], matrixA [13], matrixA [14]);
+
+            frameInA .getBasis () .setValue (matrixA [0], matrixA [4], matrixA [8],
+                                             matrixA [1], matrixA [5], matrixA [9],
+                                             matrixA [2], matrixA [6], matrixA [10]);
+
+            frameInA .setOrigin (origin);
+
+            origin .setValue (matrixB [12], matrixB [13], matrixB [14]);
+
+            frameInA .getBasis () .setValue (matrixB [0], matrixB [4], matrixB [8],
+                                             matrixB [1], matrixB [5], matrixB [9],
+                                             matrixB [2], matrixB [6], matrixB [10]);
+
+            frameInB .setOrigin (origin);
+
+            this .joint = new Ammo .btSliderConstraint (this .getBody1 () .getRigidBody (),
+                                                        this .getBody2 () .getRigidBody (),
+                                                        frameInA,
+                                                        frameInB,
+                                                        true);
+
+            this .joint .setLowerAngLimit (0);
+            this .joint .setUpperAngLimit (0);
+
+            this .set_separation__ ();
+
+            this .getCollection () .getDynamicsWorld () .addConstraint (this .joint, true);
+         };
+      })(),
+      removeJoint: function ()
+      {
+         if (! this .joint)
+            return;
+
+         if (this .getCollection ())
+            this .getCollection () .getDynamicsWorld () .removeConstraint (this .joint);
+
+         Ammo .destroy (this .joint);
+         this .joint = null;
+      },
+      set_forceOutput__: function ()
+      {
+         for (var key in this .outputs)
+            delete this .outputs [key];
+
+         for (var i = 0, length = this ._forceOutput .length; i < length; ++ i)
+         {
+            var value = this ._forceOutput [i];
+
+            if (value == "ALL")
+            {
+               this .outputs .separation     = true;
+               this .outputs .separationRate = true;
+            }
+            else
+            {
+               this .outputs [value] = true;
+            }
+         }
+
+         this .setOutput (! $.isEmptyObject (this .outputs));
+      },
+      set_separation__: function ()
+      {
+         if (! this .joint)
+            return;
+
+         this .joint .setLowerLinLimit (this ._minSeparation .getValue ());
+         this .joint .setUpperLinLimit (this ._maxSeparation .getValue ());
+      },
+   });
+
+   return SliderJoint;
 });

package/src/x_ite/Components/RigidBodyPhysics/UniversalJoint.js

@@ -48,68 +48,66 @@
 
 
 define ([
-	"x_ite/Fields",
-	"x_ite/Basic/X3DFieldDefinition",
-	"x_ite/Basic/FieldDefinitionArray",
-	"x_ite/Components/RigidBodyPhysics/X3DRigidJointNode",
-	"x_ite/Bits/X3DConstants",
+   "x_ite/Fields",
+   "x_ite/Base/X3DFieldDefinition",
+   "x_ite/Base/FieldDefinitionArray",
+   "x_ite/Components/RigidBodyPhysics/X3DRigidJointNode",
+   "x_ite/Base/X3DConstants",
 ],
 function (Fields,
           X3DFieldDefinition,
           FieldDefinitionArray,
-          X3DRigidJointNode, 
+          X3DRigidJointNode,
           X3DConstants)
 {
 "use strict";
 
-	function UniversalJoint (executionContext)
-	{
-		X3DRigidJointNode .call (this, executionContext);
+   function UniversalJoint (executionContext)
+   {
+      X3DRigidJointNode .call (this, executionContext);
 
-		this .addType (X3DConstants .UniversalJoint);
+      this .addType (X3DConstants .UniversalJoint);
 
-		// Units
-	
-		this .anchorPoint_      .setUnit ("length");
-		this .body1AnchorPoint_ .setUnit ("length");
-		this .body2AnchorPoint_ .setUnit ("length");
-	}
+      // Units
 
-	UniversalJoint .prototype = Object .assign (Object .create (X3DRigidJointNode .prototype),
-	{
-		constructor: UniversalJoint,
-		fieldDefinitions: new FieldDefinitionArray ([
-			new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",             new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "forceOutput",          new Fields .MFString ("NONE")),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "anchorPoint",          new Fields .SFVec3f ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "axis1",                new Fields .SFVec3f ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "axis2",                new Fields .SFVec3f ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "stopBounce1",          new Fields .SFFloat ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "stop1ErrorCorrection", new Fields .SFFloat (0.8)),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "stop2Bounce",          new Fields .SFFloat ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "stop2ErrorCorrection", new Fields .SFFloat (0.8)),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "body1AnchorPoint",     new Fields .SFVec3f ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "body1Axis",            new Fields .SFVec3f ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "body2AnchorPoint",     new Fields .SFVec3f ()),
-			new X3DFieldDefinition (X3DConstants .outputOnly,  "body2Axis",            new Fields .SFVec3f ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "body1",                new Fields .SFNode ()),
-			new X3DFieldDefinition (X3DConstants .inputOutput, "body2",                new Fields .SFNode ()),
-		]),
-		getTypeName: function ()
-		{
-			return "UniversalJoint";
-		},
-		getComponentName: function ()
-		{
-			return "RigidBodyPhysics";
-		},
-		getContainerField: function ()
-		{
-			return "joints";
-		},
-	});
-
-	return UniversalJoint;
-});
+      this ._anchorPoint      .setUnit ("length");
+      this ._body1AnchorPoint .setUnit ("length");
+      this ._body2AnchorPoint .setUnit ("length");
+   }
 
+   UniversalJoint .prototype = Object .assign (Object .create (X3DRigidJointNode .prototype),
+   {
+      constructor: UniversalJoint,
+      [Symbol .for ("X_ITE.X3DBaseNode.fieldDefinitions")]: new FieldDefinitionArray ([
+         new X3DFieldDefinition (X3DConstants .inputOutput, "metadata",             new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "forceOutput",          new Fields .MFString ("NONE")),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "anchorPoint",          new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "axis1",                new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "axis2",                new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "stopBounce1",          new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "stop1ErrorCorrection", new Fields .SFFloat (0.8)),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "stop2Bounce",          new Fields .SFFloat ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "stop2ErrorCorrection", new Fields .SFFloat (0.8)),
+         new X3DFieldDefinition (X3DConstants .outputOnly,  "body1AnchorPoint",     new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .outputOnly,  "body1Axis",            new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .outputOnly,  "body2AnchorPoint",     new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .outputOnly,  "body2Axis",            new Fields .SFVec3f ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "body1",                new Fields .SFNode ()),
+         new X3DFieldDefinition (X3DConstants .inputOutput, "body2",                new Fields .SFNode ()),
+      ]),
+      getTypeName: function ()
+      {
+         return "UniversalJoint";
+      },
+      getComponentName: function ()
+      {
+         return "RigidBodyPhysics";
+      },
+      getContainerField: function ()
+      {
+         return "joints";
+      },
+   });
 
+   return UniversalJoint;
+});