Skip to content

Commit

Permalink
little mods for updated specification
Browse files Browse the repository at this point in the history
  • Loading branch information
hideyukisaito committed Mar 11, 2013
1 parent b68b40a commit 07b3cfe
Show file tree
Hide file tree
Showing 145 changed files with 2,301 additions and 8,835 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Original file line Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules node_modules
.DS_Store .DS_Store
/public/photos/ /public/photos/

2 changes: 1 addition & 1 deletion bin/osc.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ UI.prototype.send = function(address, msg) {
var ui = new UI(); var ui = new UI();


ui.on('hello', function(message) { ui.on('hello', function(message) {
console.log(message); console.log('osc.js:hello!', message);
}); });


ui.on('viewpoint', function(message) { ui.on('viewpoint', function(message) {
Expand Down
10 changes: 5 additions & 5 deletions lib/ui.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ function UI() {


this.sock.on('message', function(msg, remote) { this.sock.on('message', function(msg, remote) {
var msg = osc.fromBuffer(msg) var msg = osc.fromBuffer(msg)
, address = msg.address.replace('/gianteyes/', '') , address = msg.elements[0].address.replace('/gianteyes/', '')
, args = msg.args , args = msg.elements[0].args
, keys = self.keys[address] , keys = self.keys[address]
, data = remote; , data = remote;


keys.forEach(function(key, i) { keys.forEach(function(key, i) {
data[key] = args[i]['value']; if (undefined !== args[i]) data[key] = args[i]['value'];
}); });


self.emit(address, data); self.emit(address, data);
Expand All @@ -47,7 +47,7 @@ UI.prototype.addClient = function(message) {


// self.clients.push({ ip: ip, port: port }); // self.clients.push({ ip: ip, port: port });
self.clients[ip] = port; self.clients[ip] = port;

Camera Camera
.find({}) .find({})
.populate('photos') .populate('photos')
Expand Down Expand Up @@ -76,7 +76,7 @@ module.exports = UI;
var ui = new UI(); var ui = new UI();


ui.on('hello', function(message) { ui.on('hello', function(message) {
console.log(message); console.log('ui.js:hello!', message);
}); });


// ui.on('viewpoint', function(message) { // ui.on('viewpoint', function(message) {
Expand Down
6 changes: 5 additions & 1 deletion node_modules/express/node_modules/buffer-crc32/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion node_modules/express/node_modules/commander/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 07b3cfe

Please sign in to comment.