Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 218 files). Show all
Unified · Split
| @@ -20,7 +20,6 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <AudioConstants.h> |
| 21 | 21 | #include <AudioEffectOptions.h> |
| 22 | 22 | #include <AvatarData.h> |
| 23 | −#include <CollisionInfo.h> | |
| 24 | 23 | #include <EntityScriptingInterface.h> |
| 25 | 24 | #include <NetworkAccessManager.h> |
| 26 | 25 | #include <NodeList.h> |
| @@ -370,8 +369,6 @@ void ScriptEngine::init() { · 343 unmodified lines | ||
| 370 | 369 | |
| 371 | 370 | // constants |
| 372 | 371 | globalObject().setProperty("TREE_SCALE", newVariant(QVariant(TREE_SCALE))); |
| 373 | − globalObject().setProperty("COLLISION_GROUP_ENVIRONMENT", newVariant(QVariant(COLLISION_GROUP_ENVIRONMENT))); | |
| 374 | − globalObject().setProperty("COLLISION_GROUP_AVATARS", newVariant(QVariant(COLLISION_GROUP_AVATARS))); | |
| 375 | 372 | } |
| 376 | 373 | |
| 377 | 374 | QScriptValue ScriptEngine::registerGlobalObject(const QString& name, QObject* object) { |