polish

gre · Aug 30, 2013 · d5849ed · d5849ed
1 parent 0d2b3a6
commit d5849ed
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 11 deletions.
diff --git a/app/actors/Peers.scala b/app/actors/Peers.scala
@@ -62,7 +62,7 @@ class PeersActor extends Actor {
   private var serverChannel: Option[Channel[JsValue]] = None
   private var serverEnumerator: Option[Enumerator[JsValue]] = None
 
-  val serverId = "123456789"
+  val serverId = "_hive_"
 
   def isServer(id: String) = serverId == id
 

diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js
@@ -45,7 +45,7 @@
   }(beez.params));
 
   // Network
-  var ws = new WebSocket("ws://localhost:9000/join/123456789");
+  var ws = new WebSocket(WEBSOCKET_ENDPOINT);
   var hive;
   var rtconmessage = function (msg) {
     switch (msg[0]) {

diff --git a/app/assets/javascripts/mobile.js b/app/assets/javascripts/mobile.js
@@ -1,8 +1,6 @@
 (function(){
   // Network
-  var client_id = Math.round(Math.random() * 100000);
-  var ws_host = "ws://localhost:9000/join/" + client_id;
-  var ws = new WebSocket(ws_host);
+  var ws = new WebSocket(WEBSOCKET_ENDPOINT);
 
   var hive;
   ws.onopen = function() {

diff --git a/app/assets/javascripts/models/XYaxis.js b/app/assets/javascripts/models/XYaxis.js
@@ -2,8 +2,8 @@ beez.XYaxis = Backbone.Model.extend({
   defaults: {
     width: 200,
     height: 150,
-    x: 0.5,
-    y: 0.5,
+    x: 0,
+    y: 0,
     changing: false,
     name: "",
     xlabel: "",

diff --git a/app/assets/javascripts/views/XYaxisTouchableView.js b/app/assets/javascripts/views/XYaxisTouchableView.js
@@ -102,6 +102,24 @@ beez.XYaxisTouchableView = Backbone.View.extend({
     c.rotate(Math.PI / 2);
     c.translate(-OFFSET, -(canvas.height - OFFSET2));
 
+    // grid
+    c.strokeStyle = "#666";
+    c.lineWidth = 1;
+    for (var i=0; i<10; ++i) {
+      var x = canvas.width*i/10;
+      c.beginPath();
+      c.moveTo(x, 0);
+      c.lineTo(x, canvas.height);
+      c.stroke();
+    }
+    for (var i=0; i<10; ++i) {
+      var y = canvas.height*i/10;
+      c.beginPath();
+      c.moveTo(0, y);
+      c.lineTo(canvas.width, y);
+      c.stroke();
+    }
+
     // pointer
     c.strokeStyle = !this.model.get("changing") ? "#fff" : "#ace";
     c.lineWidth = !this.model.get("changing") ? 3 : 6;

diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
@@ -12,11 +12,11 @@ object Application extends Controller {
     Ok(views.html.index())
   }
 
-  def desktop = Action {
+  def desktop = Action { implicit r =>
     Ok(views.html.desktop())
   }
 
-  def mobile = Action {
+  def mobile = Action { implicit r =>
     Ok(views.html.mobile())
   }
 

diff --git a/app/views/desktop.scala.html b/app/views/desktop.scala.html
@@ -1,4 +1,4 @@
-@()
+@()(implicit rh: RequestHeader)
 
 <!DOCTYPE html>
 <html lang="en">
@@ -24,6 +24,7 @@ <h1>Beez</h1>
   <script src="@routes.Assets.at("vendors/backbone/backbone-min.js")" type="text/javascript"></script>
 
   <script type="text/javascript">
+  var WEBSOCKET_ENDPOINT = "@routes.Application.join("_hive_").webSocketURL()";
   window.beez = {};
   </script>
   <script type="text/javascript" src="@routes.Assets.at("javascripts/models/network.js")"></script>

diff --git a/app/views/mobile.scala.html b/app/views/mobile.scala.html
@@ -1,4 +1,4 @@
-@()
+@()(implicit rh: RequestHeader)
 
 <!DOCTYPE html>
 <html lang="en">
@@ -21,6 +21,7 @@
   <script src="@routes.Assets.at("vendors/backbone/backbone-min.js")" type="text/javascript"></script>
 
   <script type="text/javascript">
+  var WEBSOCKET_ENDPOINT = "@routes.Application.join(java.util.UUID.randomUUID().toString()).webSocketURL()";
   window.beez = {};
   </script>
   <script type="text/javascript" src="@routes.Assets.at("javascripts/models/network.js")"></script>