tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed MechanicalGrid recusion having wrong previous node

Browse source
This commit is contained in:
Calclavia 2014-12-10 21:56:14 +08:00
parent 07f2e76bc3
commit 1bc3257692
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/scala/resonantinduction/mechanical/mech/grid/MechanicalGrid.scala
View file

@ -24,7 +24,7 @@ class MechanicalGrid extends GridNode[NodeMechanical](classOf[NodeMechanical]) w
/** /**
* The nodes that the grid is currently recusing through * The nodes that the grid is currently recusing through
*/ */
private var passed = Seq.empty[NodeMechanical] private var allPassed = Seq.empty[NodeMechanical]
/** /**
* Rebuild the node list starting from the first node and recursively iterating through its connections. * Rebuild the node list starting from the first node and recursively iterating through its connections.
@ -56,13 +56,13 @@ class MechanicalGrid extends GridNode[NodeMechanical](classOf[NodeMechanical]) w
getNodes.filter(n => n.bufferTorque != 0 && n.bufferAngularVelocity != 0).foreach( getNodes.filter(n => n.bufferTorque != 0 && n.bufferAngularVelocity != 0).foreach(
n => n =>
{ {
passed = Seq(n) allPassed = Seq(n)
recurse(deltaTime, n.bufferTorque, n.bufferAngularVelocity) recurse(Seq(n), deltaTime, n.bufferTorque, n.bufferAngularVelocity)
} }
) )
} }
passed = Seq.empty[NodeMechanical] allPassed = Seq.empty[NodeMechanical]
// UpdateTicker.world.enqueue(resetNodes) // UpdateTicker.world.enqueue(resetNodes)
resetNodes() resetNodes()
@ -92,7 +92,7 @@ class MechanicalGrid extends GridNode[NodeMechanical](classOf[NodeMechanical]) w
) )
} }
def recurse(deltaTime: Double, torque: Double, angularVelocity: Double) def recurse(passed: Seq[NodeMechanical], deltaTime: Double, torque: Double, angularVelocity: Double)
{ {
val curr = passed.last val curr = passed.last
@ -111,10 +111,10 @@ class MechanicalGrid extends GridNode[NodeMechanical](classOf[NodeMechanical]) w
{ {
if (c != prev) if (c != prev)
{ {
if (!passed.contains(c)) if (!allPassed.contains(c))
{ {
passed :+= c allPassed :+= c
recurse(deltaTime, addTorque, addVel) recurse(passed :+ c, deltaTime, addTorque, addVel)
} }
else else
{ {
@ -123,7 +123,7 @@ class MechanicalGrid extends GridNode[NodeMechanical](classOf[NodeMechanical]) w
if (Math.signum(c.angularVelocity) != sudoInvert * Math.signum(addVel)) if (Math.signum(c.angularVelocity) != sudoInvert * Math.signum(addVel))
{ {
isLocked = false isLocked = true
} }
} }
} }
@ -142,8 +142,8 @@ class MechanicalGrid extends GridNode[NodeMechanical](classOf[NodeMechanical]) w
curr.angularVelocity += netVelocity * deltaTime curr.angularVelocity += netVelocity * deltaTime
curr.connections.foreach(c => curr.connections.foreach(c =>
{ {
passed :+= c allPassed :+= c
recurse(deltaTime, netTorque, netVelocity) recurse(passed :+ c, deltaTime, netTorque, netVelocity)
}) })
} }
} }

2
src/main/scala/resonantinduction/mechanical/mech/process/grinder/NodeGrinder.scala
View file

@ -16,5 +16,5 @@ class NodeGrinder(parent: TileGrindingWheel) extends NodeMechanical(parent: Tile
override def inverseRotation(other: TNodeMechanical): Boolean = if (other.isInstanceOf[NodeGear]) (toVector3 - other.asInstanceOf[NodeMechanical].toVector3).toArray.sum < 0 else false override def inverseRotation(other: TNodeMechanical): Boolean = if (other.isInstanceOf[NodeGear]) (toVector3 - other.asInstanceOf[NodeMechanical].toVector3).toArray.sum < 0 else false
override def inverseNext(other: TNodeMechanical): Boolean = super.inverseNext(other) //if (other.isInstanceOf[NodeGear]) (toVector3 - other.asInstanceOf[NodeMechanical].toVector3).toArray.sum < 0 else super.inverseNext(other) override def inverseNext(other: TNodeMechanical): Boolean = if (other.isInstanceOf[NodeGear]) (toVector3 - other.asInstanceOf[NodeMechanical].toVector3).toArray.sum < 0 else false
} }