From 765608d0fffabb6313897cafabb541d44d8d0d6c Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 24 Sep 2015 19:49:02 +0200 Subject: [PATCH] More unused --- interface/src/Application.cpp | 10 ---------- interface/src/Application.h | 17 +---------------- .../src/AbstractViewStateInterface.h | 3 +-- 3 files changed, 2 insertions(+), 28 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9dc2a50d10..278c1fcddc 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2962,12 +2962,6 @@ void Application::update(float deltaTime) { _avatarUpdate->synchronousProcess(); - { - PerformanceTimer perfTimer("emitSimulating"); - // let external parties know we're updating - emit simulating(deltaTime); - } - // Update _viewFrustum with latest camera and view frustum data... // NOTE: we get this from the view frustum, to make it simpler, since the // loadViewFrumstum() method will get the correct details from the camera @@ -3316,10 +3310,6 @@ glm::vec3 Application::getSunDirection() { // FIXME, preprocessor guard this check to occur only in DEBUG builds static QThread * activeRenderingThread = nullptr; -bool Application::shouldRenderMesh(float largestDimension, float distanceToCamera) { - return DependencyManager::get()->shouldRenderMesh(largestDimension, distanceToCamera); -} - float Application::getSizeScale() const { return DependencyManager::get()->getOctreeSizeScale(); } diff --git a/interface/src/Application.h b/interface/src/Application.h index 9bb19dd6b7..d1db393cbc 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -252,10 +252,6 @@ public: virtual AbstractControllerScriptingInterface* getControllerScriptingInterface() { return &_controllerScriptingInterface; } virtual void registerScriptEngineWithApplicationServices(ScriptEngine* scriptEngine); - void resetProfile(const QString& username); - - virtual bool shouldRenderMesh(float largestDimension, float distanceToCamera); - QImage renderAvatarBillboard(RenderArgs* renderArgs); void displaySide(RenderArgs* renderArgs, Camera& whichCamera, bool selfAvatarOnly = false, bool billboard = false); @@ -319,10 +315,8 @@ public: int getMaxOctreePacketsPerSecond(); render::ScenePointer getMain3DScene() { return _main3DScene; } - render::EnginePointer getRenderEngine() { return _renderEngine; } - render::ScenePointer getMain3DScene() const { return _main3DScene; } - + render::EnginePointer getRenderEngine() { return _renderEngine; } gpu::ContextPointer getGPUContext() const { return _gpuContext; } const QRect& getMirrorViewRect() const { return _mirrorViewRect; } @@ -336,13 +330,6 @@ public: float getAverageSimsPerSecond(); signals: - - /// Fired when we're simulating; allows external parties to hook in. - void simulating(float deltaTime); - - /// Fired when the import window is closed - void importDone(); - void scriptLocationChanged(const QString& newPath); void svoImportRequested(const QString& url); @@ -350,8 +337,6 @@ signals: void checkBackgroundDownloads(); void domainConnectionRefused(const QString& reason); - void headURLChanged(const QString& newValue, const QString& modelName); - void bodyURLChanged(const QString& newValue, const QString& modelName); void fullAvatarURLChanged(const QString& newValue, const QString& modelName); void beforeAboutToQuit(); diff --git a/libraries/render-utils/src/AbstractViewStateInterface.h b/libraries/render-utils/src/AbstractViewStateInterface.h index a9cd7db20c..2b6c66b36a 100644 --- a/libraries/render-utils/src/AbstractViewStateInterface.h +++ b/libraries/render-utils/src/AbstractViewStateInterface.h @@ -44,8 +44,7 @@ public: virtual ViewFrustum* getShadowViewFrustum() = 0; virtual QThread* getMainThread() = 0; - - virtual bool shouldRenderMesh(float largestDimension, float distanceToCamera) = 0; + virtual float getSizeScale() const = 0; virtual int getBoundaryLevelAdjust() const = 0; virtual PickRay computePickRay(float x, float y) const = 0;