MCP commit.

dmzgroup · Aug 18, 2010 · 6ae92bd · 6ae92bd
1 parent f7ec8dd
commit 6ae92bd
Show file tree

Hide file tree

Showing 5 changed files with 222 additions and 194 deletions.
diff --git a/config/drone.xml b/config/drone.xml
@@ -7,6 +7,6 @@
    <instance name="drone"/>
 </javascript>
 <drone>
-   <count value="7"/>
+   <count value="5"/>
 </drone>
 </dmz>
diff --git a/config/mcp.xml b/config/mcp.xml
@@ -9,9 +9,11 @@
    <plugin name="mcp" reserve="true"/>
 </plugin-list>
 <dmzLuaModuleBasic>
-   <instance name="mcp"/>
    <instance name="recognizer"/>
 </dmzLuaModuleBasic>
+<javascript>
+   <instance name="mcp"/>
+</javascript>
 <!--
 <mcp>
    <drone-free-play value="true"/>

diff --git a/scripts/camera.js b/scripts/camera.js
@@ -82,8 +82,8 @@ timeSliceFunction = function (time) {
    }
 }
 
-//Active = 1;
-//timeSlice = dmz.time.setRepeatingTimer (self, timeSliceFunction);
+Active = 1;
+timeSlice = dmz.time.setRepeatingTimer (self, timeSliceFunction);
 dmz.input.channel.observe (self, function (channel, state) {
    var hil;
 

diff --git a/scripts/drone.js b/scripts/drone.js
@@ -9,6 +9,7 @@ var dmz =
       , matrix: require("dmz/types/matrix")
       , util: require("dmz/types/util")
       , isect: require("dmz/components/isect")
+      , mask: require("dmz/types/mask")
       }
 
    , MCP