sunrize 1.5.13 → 1.6.0

package/src/Editors/OutlineEditor.js

@@ -1298,6 +1298,27 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       UndoManager .shared .endUndo ();
    }
 
+   activateLayer (event)
+   {
+      event .preventDefault ();
+      event .stopImmediatePropagation ();
+
+      const
+         target    = $(event .target),
+         element   = target .closest (".node", this .sceneGraph),
+         layerNode = this .getNode (element),
+         layerSet  = this .browser .getWorld () .getLayerSet (),
+         index     = layerSet ._layers .findIndex (node => node ?.getValue () .valueOf () === layerNode);
+
+      if (index < 0)
+         return;
+
+      if (layerSet ._activeLayer .getValue () === index + 1)
+         Editor .setFieldValue (this .browser .currentScene, layerSet, layerSet ._activeLayer, -1);
+      else
+         Editor .setFieldValue (this .browser .currentScene, layerSet, layerSet ._activeLayer, index + 1);
+   }
+
    addBooleanField (button)
    {
       const
@@ -1335,7 +1356,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          showAlpha: field .getType () === X3D .X3DConstants .SFColorRGBA,
          showInitial: true,
          showInput: false,
-			preferredFormat: "name",
+         preferredFormat: "name",
          showButtons: false,
          allowEmpty: false,
       })
@@ -1353,7 +1374,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          value .g = rgb .g / 255;
          value .b = rgb .b / 255;
 
-			if (value .getType () === X3D .X3DConstants .SFColorRGBA)
+         if (value .getType () === X3D .X3DConstants .SFColorRGBA)
             value .a = rgb .a;
 
          Editor .setFieldValue (node .getExecutionContext (), node, field, value);
@@ -1371,10 +1392,10 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       });
    }
 
-	removeColorField (button)
-	{
-		button .spectrum ?.("destroy");
-	}
+   removeColorField (button)
+   {
+      button .spectrum ?.("destroy");
+   }
 
    addTimeField (button)
    {
@@ -1503,7 +1524,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          case "Cylinder":
          case "Sphere":
          {
-            toolNode .getTransformTool () .tool .getField ("isActive") .setValue (true);
+            toolNode .getTransformTool () .tool .getField ("active") .setValue (true);
             break;
          }
          case "Disk2D":
@@ -1511,13 +1532,13 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             if (field .getName () === "innerRadius")
             {
                toolNode .tool .group = `${node .getTypeName ()}.innerRadius`;
-               toolNode .getInnerRadiusTransformTool () .tool .getField ("isActive") .setValue (true);
+               toolNode .getInnerRadiusTransformTool () .tool .getField ("active") .setValue (true);
             }
 
             if (field .getName () === "outerRadius")
             {
                toolNode .tool .group = `${node .getTypeName ()}.outerRadius`;
-               toolNode .getOuterRadiusTransformTool () .tool .getField ("isActive") .setValue (true);
+               toolNode .getOuterRadiusTransformTool () .tool .getField ("active") .setValue (true);
             }
 
             break;
@@ -1527,8 +1548,13 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             if (toolNode .tool .group !== "Transform")
                break;
 
-            toolNode .tool .getField ("isActive") .setValue (true);
-            toolNode .tool .transformTool ?.getValue () .getTool () ?.tool .getField ("isActive") .setValue (true);
+            const innerTool = toolNode .tool .transformTool ?.getValue () .getTool ();
+
+            if (innerTool)
+               innerTool .tool .getField ("active") .setValue (true);
+            else
+               toolNode .tool .getField ("active") .setValue (true);
+
             break;
          }
       }
@@ -1536,6 +1562,8 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
       toolNode .handleUndo (new X3D .SFBool (true));
    }
 
+   #endUndoSetFieldValueSymbol = Symbol ();
+
    endUndoSetFieldValue (node, field)
    {
       const toolNode = node .getTool ?.();
@@ -1554,13 +1582,13 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          case "Cylinder":
          case "Sphere":
          {
-            this .browser .finishedEvents () .addFieldCallback (this, () =>
+            this .browser .finishedEvents () .addFieldCallback (this .#endUndoSetFieldValueSymbol, () =>
             {
-               this .browser .finishedEvents () .removeFieldCallback (this);
+               this .browser .finishedEvents () .removeFieldCallback (this .#endUndoSetFieldValueSymbol);
 
                toolNode .getTransformTool () .transformGroups ();
                toolNode .handleUndo (new X3D .SFBool ());
-               toolNode .getTransformTool () .tool .getField ("isActive") .setValue (false);
+               toolNode .getTransformTool () .tool .getField ("active") .setValue (false);
 
                UndoManager .shared .endUndo ();
             });
@@ -1569,9 +1597,9 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          }
          case "Disk2D":
          {
-            this .browser .finishedEvents () .addFieldCallback (this, () =>
+            this .browser .finishedEvents () .addFieldCallback (this .#endUndoSetFieldValueSymbol, () =>
             {
-               this .browser .finishedEvents () .removeFieldCallback (this);
+               this .browser .finishedEvents () .removeFieldCallback (this .#endUndoSetFieldValueSymbol);
 
                if (field .getName () === "innerRadius")
                   toolNode .getInnerRadiusTransformTool () .transformGroups ();
@@ -1582,10 +1610,10 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
                toolNode .handleUndo (new X3D .SFBool ());
 
                if (field .getName () === "innerRadius")
-                  toolNode .getInnerRadiusTransformTool () .tool .getField ("isActive") .setValue (false);
+                  toolNode .getInnerRadiusTransformTool () .tool .getField ("active") .setValue (false);
 
                if (field .getName () === "outerRadius")
-                  toolNode .getOuterRadiusTransformTool () .tool .getField ("isActive") .setValue (false);
+                  toolNode .getOuterRadiusTransformTool () .tool .getField ("active") .setValue (false);
 
                UndoManager .shared .endUndo ();
             });
@@ -1603,15 +1631,13 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
             {
                // Sound, X3DEnvironmentalSensorNode, ...
 
-               this .browser .finishedEvents () .addFieldCallback (this, () =>
+               this .browser .finishedEvents () .addFieldCallback (this .#endUndoSetFieldValueSymbol, () =>
                {
-                  this .browser .finishedEvents () .removeFieldCallback (this);
+                  this .browser .finishedEvents () .removeFieldCallback (this .#endUndoSetFieldValueSymbol);
 
                   innerTool .transformGroups ();
                   toolNode .handleUndo (new X3D .SFBool ());
-
-                  toolNode  .tool .getField ("isActive") .setValue (false);
-                  innerTool .tool .getField ("isActive") .setValue (false);
+                  innerTool .tool .getField ("active") .setValue (false);
 
                   UndoManager .shared .endUndo ();
                });
@@ -1622,7 +1648,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
 
                toolNode .transformGroups ();
                toolNode .handleUndo (new X3D .SFBool ());
-               toolNode .tool .getField ("isActive") .setValue (false);
+               toolNode .tool .getField ("active") .setValue (true);
 
                UndoManager .shared .endUndo ();
             }
@@ -1705,7 +1731,7 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          if (this .connector .type === type)
          {
             if (this .connector .field === field)
-            	return
+               return
          }
       }
 
@@ -1756,65 +1782,65 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          {
             case "input":
             {
-            	const routes = field .getInputRoutes ();
-
-            	switch (routes .size)
-            	{
-            		case 0:
-            		{
-            			break
-            		}
-            		case 1:
-            		{
-            			for (const route of routes)
-            			{
-            				// Delete route.
-
-            				Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField);
-            			}
-
-            			break;
-            		}
-            		default:
-            		{
-            			element .data ("full-expanded", true);
-            			element .jstree ("open_node", element);
-            			break;
-            		}
-            	}
-
-            	break
+               const routes = field .getInputRoutes ();
+
+               switch (routes .size)
+               {
+                  case 0:
+                  {
+                     break
+                  }
+                  case 1:
+                  {
+                     for (const route of routes)
+                     {
+                        // Delete route.
+
+                        Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField);
+                     }
+
+                     break;
+                  }
+                  default:
+                  {
+                     element .data ("full-expanded", true);
+                     element .jstree ("open_node", element);
+                     break;
+                  }
+               }
+
+               break
             }
             case "output":
             {
-            	const routes = field .getOutputRoutes ();
-
-            	switch (routes .size)
-            	{
-            		case 0:
-            		{
-            			break
-            		}
-            		case 1:
-            		{
-            			for (const route of routes)
-            			{
-            				// Delete route.
-
-            				Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField);
-            			}
-
-            			break;
-            		}
-            		default:
-            		{
-            			element .data ("full-expanded", true);
-            			element .jstree ("open_node", element);
-            			break;
-            		}
-            	}
-
-            	break;
+               const routes = field .getOutputRoutes ();
+
+               switch (routes .size)
+               {
+                  case 0:
+                  {
+                     break
+                  }
+                  case 1:
+                  {
+                     for (const route of routes)
+                     {
+                        // Delete route.
+
+                        Editor .deleteRoute (route .getExecutionContext (), route .sourceNode, route .sourceField, route .destinationNode, route .destinationField);
+                     }
+
+                     break;
+                  }
+                  default:
+                  {
+                     element .data ("full-expanded", true);
+                     element .jstree ("open_node", element);
+                     break;
+                  }
+               }
+
+               break;
             }
          }
       }
@@ -1828,73 +1854,73 @@ module .exports = class OutlineEditor extends OutlineRouteGraph
          {
             case "input":
             {
-            	if (this .connector)
-            	{
-            		if (this .connector .type === type)
-            			break;
+               if (this .connector)
+               {
+                  if (this .connector .type === type)
+                     break;
 
-            		if (this .connector .executionContext !== executionContext)
-            			break;
+                  if (this .connector .executionContext !== executionContext)
+                     break;
 
-            		if (this .connector .field .getType () !== field .getType ())
-            			break;
+                  if (this .connector .field .getType () !== field .getType ())
+                     break;
 
                   if (this .connector .node .getField (this .connector .field .getName ()) .getFieldInterests () .has (node .getField (field .getName ())))
                      break;
 
-            		// Add route.
+                  // Add route.
 
-            		Editor .addRoute (executionContext, this .connector .node, this .connector .field .getName (), node, field .getName ());
+                  Editor .addRoute (executionContext, this .connector .node, this .connector .field .getName (), node, field .getName ());
 
-            		if (event .shiftKey)
-            			break;
+                  if (event .shiftKey)
+                     break;
 
-            		this .connector .element .find (".access-type img.active.output.activated")
-            			.removeClass ("activated");
+                  this .connector .element .find (".access-type img.active.output.activated")
+                     .removeClass ("activated");
 
-            		delete this .connector;
-            	}
-            	else
-            	{
-            		this .connector = { type, executionContext, node, field, element };
-            	}
+                  delete this .connector;
+               }
+               else
+               {
+                  this .connector = { type, executionContext, node, field, element };
+               }
 
-            	break
+               break
             }
             case "output":
             {
-            	if (this .connector)
-            	{
-            		if (this .connector .type === type)
-            			break;
+               if (this .connector)
+               {
+                  if (this .connector .type === type)
+                     break;
 
-            		if (this .connector .executionContext !== executionContext)
-            			break;
+                  if (this .connector .executionContext !== executionContext)
+                     break;
 
-            		if (this .connector .field .getType () !== field .getType ())
-            			break;
+                  if (this .connector .field .getType () !== field .getType ())
+                     break;
 
                   if (node .getField (field .getName ()) .getFieldInterests () .has (this .connector .node .getField (this .connector .field .getName ())))
                      break;
 
-            		// Add route.
+                  // Add route.
 
-            		Editor .addRoute (executionContext, node, field .getName (), this .connector .node, this .connector .field .getName ());
+                  Editor .addRoute (executionContext, node, field .getName (), this .connector .node, this .connector .field .getName ());
 
-            		if (event .shiftKey)
-            			break;
+                  if (event .shiftKey)
+                     break;
 
-            		this .connector .element .find (".access-type img.active.input.activated")
-            			.removeClass ("activated");
+                  this .connector .element .find (".access-type img.active.input.activated")
+                     .removeClass ("activated");
 
-            		delete this .connector;
-            	}
-            	else
-            	{
-            		this .connector = { type, executionContext, node, field, element };
-            	}
+                  delete this .connector;
+               }
+               else
+               {
+                  this .connector = { type, executionContext, node, field, element };
+               }
 
-            	break;
+               break;
             }
          }
       }