create and update command parsing

.gitignore

@@ -1,2 +1,3 @@
 config.toml
-__pycache__/
+__pycache__/
+tinytalk/.hypothesis

requirements.txt

@@ -3,3 +3,10 @@ opencv-contrib-python==4.1.1.26
 toml==0.10.0
 deep_merge==0.0.4
 parsimonious==0.8.1
+black==19.3b0
+hypothesis==4.41.3
+pytest==5.2.2
+pytest-xdist==1.30.0
+mysql-connector-python==8.0.17
+websockets==8.1
+python-osc==1.7.4

tinytalk/__init__.py

@@ -1,32 +1,3 @@
-from . import data
-from .grammar import grammar, TinyTalkVisitor
-
-def dump():
-    print("database dump:")
-    print(names)
-
-def read_tiny_talk(s):
-    print(f"***** reading {s}")
-    tree = grammar.parse(s)
-    print("***** the parse tree")
-    print(tree)
-    visitor = TinyTalkVisitor()
-    output = visitor.visit(tree)
-    print("***** output")
-    print(output)
-
-def init_database():
-    data.commit("aruco", "visible", {"id": 111, "x": 0, "y": 0})
-
-
-def run():
-    print("running simulation")
-    init_database()
-    data.commit("aruco", "visible", {"x": 10, "y": 1})
-    print(data.query('aruco'))
-    print("done")
-
-
 # sample tinytalk programs
 
 # syntax for data:

tinytalk/_test.py

@@ -0,0 +1,27 @@
+import grammar
+import interpreter
+
+app = "when [#marker x y] as m create [#ball x: m.y, y: m.x]"
+
+tree = grammar.grammar.parse(app)
+visitor = grammar.TinyTalkVisitor()
+app_json = visitor.visit(tree)
+
+scene = {
+    "appMarkers": {
+        "1": {
+            "type": "marker",
+            "x": 50,
+            "y": 0,
+        }
+    },
+    "virtualObjects": {
+    }
+}
+
+print(app_json)
+
+new_scene = interpreter.run(app_json, scene)
+
+print(scene)
+print(new_scene)

tinytalk/app.txt

@@ -0,0 +1,31 @@
+// ======= BALL APP =======
+// Create ball when we see ball
+when (#ball ) as m create (#blob x: m.x, y: m.y, point: [m.x, m.y], size: 10, vy: 0.005, vx: 0.005)
+
+
+// Change ball velocity when we hit a wall
+when (#blob y where y > 1.0) as b update b (y: 0.99, vy: b.vy * -1, point: [b.x, 0.95])
+
+when (#blob y where y < 0.0) as b update b (y: 0.01, vy: b.vy * -1, point: [b.x, 0.05])
+
+when (#blob x where x > 1.0) as b update b (x: 0.99, vx: b.vx * -1, point: [0.95, b.y])
+
+when (#blob x where x < 0.0) as b update b (x: 0.01, vx: b.vx * -1, point: [0.05, b.y])
+
+
+// Update ball position based on velocity
+when (#blob x y) as b update b (x: b.x + b.vx y: b.y + b.vy, point: [b.x + b.vx, b.y + b.vy])
+
+
+// ======= PADDLE APP =======
+// Create paddle when we see marker
+when (#marker ) as m create (#line x: m.x, ya: m.y + 0.05, yb: m.y - 0.05, points: [[m.x, ya], [m.x, yb]])
+
+
+// Update paddle line based on marker
+when (#marker x y) as m;
+     (#line x ya yb) as l
+update l (x: m.x,
+          ya: m.y + 0.05,
+          yb: m.y - 0.05,
+          points: [[l.x, l.ya], [l.x, l.yb]])