summaryrefslogtreecommitdiff
path: root/src/graphyx/actors
diff options
context:
space:
mode:
Diffstat (limited to 'src/graphyx/actors')
-rw-r--r--src/graphyx/actors/GUIActor.scala3
-rw-r--r--src/graphyx/actors/PhysicsActor.scala7
2 files changed, 5 insertions, 5 deletions
diff --git a/src/graphyx/actors/GUIActor.scala b/src/graphyx/actors/GUIActor.scala
index a704f6a..0116551 100644
--- a/src/graphyx/actors/GUIActor.scala
+++ b/src/graphyx/actors/GUIActor.scala
@@ -7,11 +7,10 @@
package graphyx.actors
import graphyx.graphics._
-import graphyx.gui._
import scala.actors._
class GUIActor extends Actor{
- val container = new Container
+ val container = new graphyx.gui.Container
var continue = true
diff --git a/src/graphyx/actors/PhysicsActor.scala b/src/graphyx/actors/PhysicsActor.scala
index b93541f..0bc7faf 100644
--- a/src/graphyx/actors/PhysicsActor.scala
+++ b/src/graphyx/actors/PhysicsActor.scala
@@ -6,6 +6,7 @@
package graphyx.actors
+import graphyx._
import graphyx.graphics._
import sims.dynamics._
import scala.actors._
@@ -30,8 +31,9 @@ class PhysicsActor extends Actor{
Graphyx.guiActor ! new Scene(world) {override val fps = _fps}
- while (mailboxSize > 0) {
- receive {
+ receiveWithin(0) {
+ case TIMEOUT => ()
+
case Stop => {
simulate = false
println("Simulation stopped.")
@@ -49,7 +51,6 @@ class PhysicsActor extends Actor{
case other => println("Engine received unknown command: '" + other + "'")
}
- }
val h = (System.nanoTime - t0) / 1000000
val f = 60