History

Merge remote-tracking branch 'upstream/master' into RunningScripts

Ryan Huffman committed 12 years ago

Commit edcff0b2 parents f889cef a934ffb45 files · +1654 −425Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 45 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+11−2
@@ -19,6 +19,7 @@ · 18 unmodified lines
19 19
20#include <AudioRingBuffer.h>20#include <AudioRingBuffer.h>
21#include <AvatarData.h>21#include <AvatarData.h>
22#include <CollisionInfo.h>
22#include <NodeList.h>23#include <NodeList.h>
23#include <PacketHeaders.h>24#include <PacketHeaders.h>
24#include <UUID.h>25#include <UUID.h>
@@ -230,8 +231,16 @@ void ScriptEngine::init() { · 205 unmodified lines
230 231
231 registerGlobalObject("Voxels", &_voxelsScriptingInterface);232 registerGlobalObject("Voxels", &_voxelsScriptingInterface);
232 233
233 QScriptValue treeScaleValue = _engine.newVariant(QVariant(TREE_SCALE));234 // constants
234 _engine.globalObject().setProperty("TREE_SCALE", treeScaleValue);235 QScriptValue globalObject = _engine.globalObject();
236 globalObject.setProperty("TREE_SCALE", _engine.newVariant(QVariant(TREE_SCALE)));
237 globalObject.setProperty("COLLISION_GROUP_ENVIRONMENT", _engine.newVariant(QVariant(COLLISION_GROUP_ENVIRONMENT)));
238 globalObject.setProperty("COLLISION_GROUP_AVATARS", _engine.newVariant(QVariant(COLLISION_GROUP_AVATARS)));
239 globalObject.setProperty("COLLISION_GROUP_VOXELS", _engine.newVariant(QVariant(COLLISION_GROUP_VOXELS)));
240 globalObject.setProperty("COLLISION_GROUP_PARTICLES", _engine.newVariant(QVariant(COLLISION_GROUP_PARTICLES)));
241
242 globalObject.setProperty("AVATAR_MOTION_OBEY_LOCAL_GRAVITY", _engine.newVariant(QVariant(AVATAR_MOTION_OBEY_LOCAL_GRAVITY)));
243 globalObject.setProperty("AVATAR_MOTION_OBEY_ENVIRONMENTAL_GRAVITY", _engine.newVariant(QVariant(AVATAR_MOTION_OBEY_ENVIRONMENTAL_GRAVITY)));
235 244
236 // let the VoxelPacketSender know how frequently we plan to call it245 // let the VoxelPacketSender know how frequently we plan to call it
237 _voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);246 _voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);