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

fix broken dupe method implementation

Browse source
This commit is contained in:
Andrew Meadows 2016-05-06 09:07:03 -07:00
parent 635e2e78e3
commit 778820edb4
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -4519,11 +4519,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface()); scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface());
} }
void Application::copyCurrentViewFrustum(ViewFrustum& viewOut) const {
QMutexLocker viewLocker(&_viewMutex);
viewOut = _displayViewFrustum;
}
bool Application::canAcceptURL(const QString& urlString) const { bool Application::canAcceptURL(const QString& urlString) const {
QUrl url(urlString); QUrl url(urlString);
if (urlString.startsWith(HIFI_URL_SCHEME)) { if (urlString.startsWith(HIFI_URL_SCHEME)) {

2
interface/src/Application.h
View file

@ -167,7 +167,7 @@ public:
virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; } virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; }
virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) override; virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine) override;
virtual ViewFrustum* getCurrentViewFrustum() override { return getDisplayViewFrustum(); } virtual void copyCurrentViewFrustum(ViewFrustum& viewOut) const override { copyDisplayViewFrustum(viewOut); }
virtual QThread* getMainThread() override { return thread(); } virtual QThread* getMainThread() override { return thread(); }
virtual PickRay computePickRay(float x, float y) const override; virtual PickRay computePickRay(float x, float y) const override;
virtual glm::vec3 getAvatarPosition() const override; virtual glm::vec3 getAvatarPosition() const override;