Merge pull request #1893 from birarda/master

fixes for assignment-client Agent

assignment-client/src/Agent.cpp

@@ -23,8 +23,12 @@
 #include "Agent.h"
 
 Agent::Agent(const QByteArray& packet) :
-    ThreadedAssignment(packet)
+    ThreadedAssignment(packet),
+    _voxelEditSender(),
+    _particleEditSender()
 {
+    _scriptEngine.getVoxelsScriptingInterface()->setPacketSender(&_voxelEditSender);
+    _scriptEngine.getParticlesScriptingInterface()->setPacketSender(&_particleEditSender);
 }
 
 void Agent::processDatagram(const QByteArray& dataByteArray, const HifiSockAddr& senderSockAddr) {

assignment-client/src/Agent.h

@@ -15,9 +15,12 @@
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
 
+#include <ParticleEditPacketSender.h>
 #include <ParticleTree.h>
 #include <ScriptEngine.h>
 #include <ThreadedAssignment.h>
+#include <VoxelEditPacketSender.h>
+
 
 class Agent : public ThreadedAssignment {
     Q_OBJECT
@@ -39,6 +42,8 @@ signals:
 private:
     ScriptEngine _scriptEngine;
     ParticleTree _particleTree;
+    VoxelEditPacketSender _voxelEditSender;
+    ParticleEditPacketSender _particleEditSender;
 };
 
 #endif /* defined(__hifi__Agent__) */

domain-server/resources/web/assignment/placeholder.js

@@ -8,11 +8,9 @@ var NUMBER_OF_CELLS = NUMBER_OF_CELLS_EACH_DIMENSION * NUMBER_OF_CELLS_EACH_DIME
 var currentCells = [];
 var nextCells = [];
 
-var METER_LENGTH = 1 / TREE_SCALE;
+var METER_LENGTH = 1;
 var cellScale = (NUMBER_OF_CELLS_EACH_DIMENSION * METER_LENGTH) / NUMBER_OF_CELLS_EACH_DIMENSION; 
 
-print("TREE_SCALE = " + TREE_SCALE + "\n");
-
 // randomly populate the cell start values
 for (var i = 0; i < NUMBER_OF_CELLS_EACH_DIMENSION; i++) {
   // create the array to hold this row
@@ -108,7 +106,7 @@ function sendNextCells() {
 
         // queue a packet to add a voxel for the new cell
         var color = (nextCells[i][j] == 1) ? 255 : 1;
-        Voxels.queueDestructiveVoxelAdd(x, y, 0, cellScale, color, color, color);
+        Voxels.setVoxel(x, y, 0, cellScale, color, color, color);
       }
     }
   } 
@@ -128,4 +126,6 @@ function step() {
   sendNextCells();  
 }
 
-Agent.willSendVisualDataCallback.connect(step);
+
+Script.willSendVisualDataCallback.connect(step);
+Voxels.setPacketsPerSecond(200);