From 9694a622b5bec8f8d7c7882f817680570131dd1a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 5 Feb 2014 15:35:13 -0800 Subject: [PATCH] update placeholder and give edit packet senders to Agent --- assignment-client/src/Agent.cpp | 6 +++++- assignment-client/src/Agent.h | 5 +++++ domain-server/resources/web/assignment/placeholder.js | 10 +++++----- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index 2694bf83e2..93ec4bf991 100644 --- a/assignment-client/src/Agent.cpp +++ b/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) { diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h index 8b2038a8b0..7495fc06bf 100644 --- a/assignment-client/src/Agent.h +++ b/assignment-client/src/Agent.h @@ -15,9 +15,12 @@ #include #include +#include #include #include #include +#include + class Agent : public ThreadedAssignment { Q_OBJECT @@ -39,6 +42,8 @@ signals: private: ScriptEngine _scriptEngine; ParticleTree _particleTree; + VoxelEditPacketSender _voxelEditSender; + ParticleEditPacketSender _particleEditSender; }; #endif /* defined(__hifi__Agent__) */ diff --git a/domain-server/resources/web/assignment/placeholder.js b/domain-server/resources/web/assignment/placeholder.js index ee8f89cdd6..7c84767f31 100644 --- a/domain-server/resources/web/assignment/placeholder.js +++ b/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); \ No newline at end of file + +Script.willSendVisualDataCallback.connect(step); +Voxels.setPacketsPerSecond(200); \ No newline at end of file