From 778820edb4c4fe85630ae8407524a69633e0839c Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Fri, 6 May 2016 09:07:03 -0700 Subject: [PATCH] fix broken dupe method implementation --- interface/src/Application.cpp | 5 ----- interface/src/Application.h | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 83cd577b52..16d9e0c108 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4519,11 +4519,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri scriptEngine->registerGlobalObject("Reticle", getApplicationCompositor().getReticleInterface()); } -void Application::copyCurrentViewFrustum(ViewFrustum& viewOut) const { - QMutexLocker viewLocker(&_viewMutex); - viewOut = _displayViewFrustum; -} - bool Application::canAcceptURL(const QString& urlString) const { QUrl url(urlString); if (urlString.startsWith(HIFI_URL_SCHEME)) { diff --git a/interface/src/Application.h b/interface/src/Application.h index 0fca44c9b6..ea5f637d96 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -167,7 +167,7 @@ public: virtual controller::ScriptingInterface* getControllerScriptingInterface() { return _controllerScriptingInterface; } 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 PickRay computePickRay(float x, float y) const override; virtual glm::vec3 getAvatarPosition() const override;