summaryrefslogtreecommitdiff
path: root/src/graphyx/Graphyx.scala
diff options
context:
space:
mode:
Diffstat (limited to 'src/graphyx/Graphyx.scala')
-rw-r--r--src/graphyx/Graphyx.scala7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/graphyx/Graphyx.scala b/src/graphyx/Graphyx.scala
index 01caea8..192b897 100644
--- a/src/graphyx/Graphyx.scala
+++ b/src/graphyx/Graphyx.scala
@@ -22,10 +22,10 @@ object Graphyx{
Atom,
Chain,
Wave,
+ Net,
Stacking,
BallStack,
Cup,
- Net,
Friction,
Friction2,
Restitution,
@@ -33,6 +33,7 @@ object Graphyx{
Carriage,
General1,
General2,
+ Cannon,
EmptyTest
)
@@ -48,10 +49,10 @@ object Graphyx{
val physicsActor = new PhysicsActor
val guiActor = new GUIActor
-
+
def main(args: Array[String]): Unit = {
test.init()
- physicsActor.world = test.world
+ physicsActor.world = test.world
guiActor.start()
physicsActor.start()
}