Use vertexGroup and remove assertion

phetsims · Oct 16, 2019 · 6006cd2 · 6006cd2
1 parent 2b55bfd
commit 6006cd2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/js/blackbox/model/BlackBoxSceneModel.js b/js/blackbox/model/BlackBoxSceneModel.js
@@ -38,7 +38,7 @@ define( require => {
         revealing: false,
         blackBoxStudy: true
       } );
-      const trueBlackBoxCircuitStruct = CircuitStruct.fromStateObject( trueBlackBoxCircuitObject, this.circuit.wireResistivityProperty, tandem.createTandem( 'circuitStruct' ), {
+      const trueBlackBoxCircuitStruct = CircuitStruct.fromStateObject( this.circuit, trueBlackBoxCircuitObject, this.circuit.wireResistivityProperty, tandem.createTandem( 'circuitStruct' ), {
 
         // All of the circuit elements in the true black box should be non-interactive
         interactive: false,
@@ -72,7 +72,7 @@ define( require => {
       this.revealingProperty.lazyLink( revealing => this.modeProperty.set( revealing ? InteractionMode.EXPLORE : InteractionMode.TEST ) );
 
       // Keep track of what the user has built inside the black box so it may be restored.
-      const userBlackBoxCircuit = new CircuitStruct();
+      const userBlackBoxCircuitStruct = new CircuitStruct();
       const circuit = this.circuit;
 
       const wireStubGroupTandem = tandem.createGroupTandem( 'wireStubs' );
@@ -97,7 +97,8 @@ define( require => {
             const dy = side === 'top' ? -extentLength :
                        side === 'bottom' ? +extentLength :
                        0;
-            const outerVertex = new Vertex( new Vector2( vertex.positionProperty.value.x + dx, vertex.positionProperty.value.y + dy ) );
+            const outerVertex = this.circuit.vertexGroup.createNextMember( new Vector2( vertex.positionProperty.value.x + dx, vertex.positionProperty.value.y + dy ) );
+            // const outerVertex = new Vertex( new Vector2( vertex.positionProperty.value.x + dx, vertex.positionProperty.value.y + dy ) );
             // outerVertex.attachable = true;
             outerVertex.blackBoxInterfaceProperty.set( true );
             outerVertex.draggableProperty.set( false );
@@ -148,7 +149,7 @@ define( require => {
 
         // Remove the vertices but not those on the black box interface
         // for ( const i = 0; i < blackBoxCircuit.vertices.length; i++ ) {
-        //   const vertex = blackBoxCircuit.vertices[ i ];
+        //   const vertex = blackBoxCircuit.vertexGroup.get(i);
         //   if ( !vertex.blackBoxInterfaceProperty.get() ) {
         //     circuit.vertices.remove( vertex );
         //   }
@@ -182,50 +183,50 @@ define( require => {
 
           // Any draggable vertices that remain should be made unattachable and undraggable, so the user cannot update the
           // circuit outside the box
-          circuit.vertices.forEach( vertex => {
+          circuit.vertexGroup.forEach( vertex => {
             if ( !vertex.blackBoxInterfaceProperty.get() ) {
               vertex.attachableProperty.set( false );
               vertex.draggableProperty.set( false );
               vertex.interactiveProperty.set( false );
             }
           } );
           circuit.circuitElements.forEach( circuitElement => circuitElement.interactiveProperty.set( false ) );
-          addBlackBoxContents( userBlackBoxCircuit );
+          addBlackBoxContents( userBlackBoxCircuitStruct );
         }
         else {
 
           // Switched to InteractionMode.EXPLORE. Move interior elements to userBlackBoxCircuit
-          userBlackBoxCircuit.clear();
-          circuit.vertices.forEach( v => {
+          userBlackBoxCircuitStruct.clear();
+          circuit.vertexGroup.forEach( v => {
             if ( v.interactiveProperty.get() && v.draggableProperty.get() ) {
-              userBlackBoxCircuit.vertices.push( v );
+              userBlackBoxCircuitStruct.vertices.push( v );
             }
           } );
           circuit.circuitElements.forEach( circuitElement => {
             if ( circuitElement.interactiveProperty.get() ) {
 
               // TODO: abstraction
               if ( circuitElement instanceof Wire ) {
-                userBlackBoxCircuit.wires.push( circuitElement );
+                userBlackBoxCircuitStruct.wires.push( circuitElement );
               }
               else if ( circuitElement instanceof Battery ) {
-                userBlackBoxCircuit.batteries.push( circuitElement );
+                userBlackBoxCircuitStruct.batteries.push( circuitElement );
               }
               else if ( circuitElement instanceof LightBulb ) {
-                userBlackBoxCircuit.lightBulbs.push( circuitElement );
+                userBlackBoxCircuitStruct.lightBulbs.push( circuitElement );
               }
               else if ( circuitElement instanceof Resistor ) {
-                userBlackBoxCircuit.resistors.push( circuitElement );
+                userBlackBoxCircuitStruct.resistors.push( circuitElement );
               }
               else if ( circuitElement instanceof Switch ) {
-                userBlackBoxCircuit.switches.push( circuitElement );
+                userBlackBoxCircuitStruct.switches.push( circuitElement );
               }
             }
           } );
-          removeBlackBoxContents( userBlackBoxCircuit );
+          removeBlackBoxContents( userBlackBoxCircuitStruct );
 
           // Any attachable vertices outside the box should become attachable and draggable
-          circuit.vertices.forEach( vertex => {
+          circuit.vertexGroup.forEach( vertex => {
             if ( !vertex.blackBoxInterfaceProperty.get() ) {
               vertex.draggableProperty.set( true );
               vertex.attachableProperty.set( true );
@@ -250,7 +251,7 @@ define( require => {
       this.resetBlackBoxSceneModel = () => {
         addWireStubs();
         addBlackBoxContents( trueBlackBoxCircuitStruct );
-        userBlackBoxCircuit.clear();
+        userBlackBoxCircuitStruct.clear();
       };
     }
 

diff --git a/js/blackbox/view/BlackBoxSceneView.js b/js/blackbox/view/BlackBoxSceneView.js
@@ -207,7 +207,7 @@ define( require => {
 
           // If the wire connected to a black box vertex, then it may no longer exist in the model. In this case there is
           // no need to move it inside the black box.
-          if ( blackBoxSceneModel.circuit.vertices.contains( vertex ) && blackBoxSceneModel.modeProperty.get() === InteractionMode.TEST ) {
+          if ( blackBoxSceneModel.circuit.vertexGroup.contains( vertex ) && blackBoxSceneModel.modeProperty.get() === InteractionMode.TEST ) {
 
             // Find all the vertices that must be translated into the box, translating wires
             ( () => {

diff --git a/js/blackbox/view/BlackBoxScreenView.js b/js/blackbox/view/BlackBoxScreenView.js
@@ -73,7 +73,7 @@ define( require => {
         this.children = [ sceneView ];
 
         // Fix the vertex layering.
-        sceneView.model.circuit.vertices.forEach( vertex => vertex.relayerEmitter.emit() );
+        sceneView.model.circuit.vertexGroup.forEach( vertex => vertex.relayerEmitter.emit() );
       } );
 
       this.visibleBoundsProperty.link( visibleBounds => {