Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 04:53:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not store physics engine pointer in PickScriptingInterface

Browse source
This commit is contained in:
sabrina-shanman 2018-08-03 15:35:59 -07:00
parent c6b24496c8
commit a460cfac29
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -6656,7 +6656,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
auto pickScriptingInterface = DependencyManager::get<PickScriptingInterface>(); auto pickScriptingInterface = DependencyManager::get<PickScriptingInterface>();
pickScriptingInterface->registerMetaTypes(scriptEngine.data()); pickScriptingInterface->registerMetaTypes(scriptEngine.data());
pickScriptingInterface->setPhysicsEngine(_physicsEngine);
// connect this script engines printedMessage signal to the global ScriptEngines these various messages // connect this script engines printedMessage signal to the global ScriptEngines these various messages
connect(scriptEngine.data(), &ScriptEngine::printedMessage, connect(scriptEngine.data(), &ScriptEngine::printedMessage,

3
interface/src/raypick/PickScriptingInterface.cpp
View file

@ -11,6 +11,7 @@
#include <QVariant> #include <QVariant>
#include "GLMHelpers.h" #include "GLMHelpers.h"
#include "Application.h"
#include <PickManager.h> #include <PickManager.h>
#include "StaticRayPick.h" #include "StaticRayPick.h"
@ -174,7 +175,7 @@ unsigned int PickScriptingInterface::createCollisionPick(const QVariant& propert
CollisionRegion collisionRegion(propMap); CollisionRegion collisionRegion(propMap);
return DependencyManager::get<PickManager>()->addPick(PickQuery::Collision, std::make_shared<CollisionPick>(filter, maxDistance, enabled, collisionRegion, _physicsEngine)); return DependencyManager::get<PickManager>()->addPick(PickQuery::Collision, std::make_shared<CollisionPick>(filter, maxDistance, enabled, collisionRegion, qApp->getPhysicsEngine()));
} }
void PickScriptingInterface::enablePick(unsigned int uid) { void PickScriptingInterface::enablePick(unsigned int uid) {

8
interface/src/raypick/PickScriptingInterface.h
View file

@ -295,14 +295,6 @@ public slots:
* @returns {number} * @returns {number}
*/ */
static constexpr unsigned int INTERSECTED_HUD() { return IntersectionType::HUD; } static constexpr unsigned int INTERSECTED_HUD() { return IntersectionType::HUD; }
// Set to allow CollisionPicks to have access to the physics engine
void setPhysicsEngine(PhysicsEnginePointer physicsEngine) {
_physicsEngine = physicsEngine;
}
protected:
PhysicsEnginePointer _physicsEngine;
}; };
#endif // hifi_PickScriptingInterface_h #endif // hifi_PickScriptingInterface_h