History

expose COLLISION_GOUP_* constants to JS

Andrew Meadows committed 12 years ago

Commit 0a7a5031 parent 73d06741 file · +9 −3Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+9−3
@@ -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,13 @@ 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)));
235 241
236 // let the VoxelPacketSender know how frequently we plan to call it242 // let the VoxelPacketSender know how frequently we plan to call it
237 _voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);243 _voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);
@@ -561,4 +567,4 @@ void ScriptEngine::include(const QString& includeFile) { · 323 unmodified lines
561 qDebug() << "Uncaught exception at (" << includeFile << ") line" << line << ":" << result.toString();567 qDebug() << "Uncaught exception at (" << includeFile << ") line" << line << ":" << result.toString();
562 emit errorMessage("Uncaught exception at (" + includeFile + ") line" + QString::number(line) + ":" + result.toString());568 emit errorMessage("Uncaught exception at (" + includeFile + ") line" + QString::number(line) + ":" + result.toString());
563 }569 }
564}570}