Skip to content

Commit

Permalink
Fix some minor bugs with game pieces
Browse files Browse the repository at this point in the history
  • Loading branch information
nab138 committed Dec 22, 2024
1 parent 2b2e4c5 commit 607cf11
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
3 changes: 3 additions & 0 deletions src/GestureRecognizers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ extension RootViewController {
hasPlacedField = true
sceneView.hasPlacedField = true
sceneView.trajectoryNode?.isHidden = false
for node in sceneView.gamePieceNodes {
node.isHidden = false
}
sceneView.curContainerDummyNode?.isHidden = false
floatingUI.node.addChildNode(floatingUI.scheduler.node)
floatingUI.node.addChildNode(floatingUI.fms.node)
Expand Down
13 changes: 5 additions & 8 deletions src/utils/ARSceneView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -162,23 +162,20 @@ class ARSceneView: ARSCNView {
}
}

// Place instances of the model at each location
for i in 0..<points.count {
gamePieceNodes[i].position = points[i]
gamePieceNodes[i].isHidden = !hasPlacedField
}

// save game piece positions
gamePiecePositions = points

// Update transforms
updateGamePieceTransforms()
}

func updateGamePieceTransforms() {
guard gamePieceNodes.count == gamePiecePositions.count else {
NSLog("Game piece nodes and positions are not the same length")
return
}
for i in 0..<gamePiecePositions.count {
gamePieceNodes[i].position = fieldNode.convertPosition(gamePiecePositions[i], to: nil)
gamePieceNodes[i].scale = fieldNode.scale
gamePieceNodes[i].isHidden = !hasPlacedField
}
}

Expand Down
1 change: 1 addition & 0 deletions src/utils/NetworkTablesHandler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ class NetworkTablesHandler {
if gamePiecesSubID != nil {
client.unsubscribe(subID: gamePiecesSubID!)
sceneView.gamePieceNodes.forEach { $0.removeFromParentNode() }
sceneView.gamePieceNodes = []
}

// Subscribe to robot position updates
Expand Down

0 comments on commit 607cf11

Please sign in to comment.