History

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

Ryan Huffman committed 12 years ago

Commit 65fd2a72 parents 45beeaa 19b76e347 files · +1877 −604Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+5−2
@@ -167,7 +167,7 @@ void ScriptEngine::setAvatarData(AvatarData* avatarData, const QString& objectNa · 166 unmodified lines
167void ScriptEngine::setAvatarHashMap(AvatarHashMap* avatarHashMap, const QString& objectName) {167void ScriptEngine::setAvatarHashMap(AvatarHashMap* avatarHashMap, const QString& objectName) {
168 // remove the old Avatar property, if it exists168 // remove the old Avatar property, if it exists
169 _engine.globalObject().setProperty(objectName, QScriptValue());169 _engine.globalObject().setProperty(objectName, QScriptValue());
170 170
171 // give the script engine the new avatar hash map171 // give the script engine the new avatar hash map
172 registerGlobalObject(objectName, avatarHashMap);172 registerGlobalObject(objectName, avatarHashMap);
173}173}
@@ -229,7 +229,7 @@ void ScriptEngine::init() { · 55 unmodified lines
229 registerGlobalObject("Vec3", &_vec3Library);229 registerGlobalObject("Vec3", &_vec3Library);
230 registerGlobalObject("Uuid", &_uuidLibrary);230 registerGlobalObject("Uuid", &_uuidLibrary);
231 registerGlobalObject("AnimationCache", &_animationCache);231 registerGlobalObject("AnimationCache", &_animationCache);
232 232
233 registerGlobalObject("Voxels", &_voxelsScriptingInterface);233 registerGlobalObject("Voxels", &_voxelsScriptingInterface);
234 234
235 // constants235 // constants
@@ -240,6 +240,9 @@ void ScriptEngine::init() { · 4 unmodified lines
240 globalObject.setProperty("COLLISION_GROUP_VOXELS", _engine.newVariant(QVariant(COLLISION_GROUP_VOXELS)));240 globalObject.setProperty("COLLISION_GROUP_VOXELS", _engine.newVariant(QVariant(COLLISION_GROUP_VOXELS)));
241 globalObject.setProperty("COLLISION_GROUP_PARTICLES", _engine.newVariant(QVariant(COLLISION_GROUP_PARTICLES)));241 globalObject.setProperty("COLLISION_GROUP_PARTICLES", _engine.newVariant(QVariant(COLLISION_GROUP_PARTICLES)));
242 242
243 globalObject.setProperty("AVATAR_MOTION_OBEY_LOCAL_GRAVITY", _engine.newVariant(QVariant(AVATAR_MOTION_OBEY_LOCAL_GRAVITY)));
244 globalObject.setProperty("AVATAR_MOTION_OBEY_ENVIRONMENTAL_GRAVITY", _engine.newVariant(QVariant(AVATAR_MOTION_OBEY_ENVIRONMENTAL_GRAVITY)));
245
243 // let the VoxelPacketSender know how frequently we plan to call it246 // let the VoxelPacketSender know how frequently we plan to call it
244 _voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);247 _voxelsScriptingInterface.getVoxelPacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);
245 _particlesScriptingInterface.getParticlePacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);248 _particlesScriptingInterface.getParticlePacketSender()->setProcessCallIntervalHint(SCRIPT_DATA_CALLBACK_USECS);