From b28769977f7f8bbf445fd93730706ec41a201f8f Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 14 Sep 2017 05:42:20 -0700 Subject: [PATCH] Remove remaining unused vars from TestGameView --- Editor/ProjectManager.cpp | 2 +- Editor/ViewManager.cpp | 6 ++---- Editor/ViewManager.hpp | 14 +++----------- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/Editor/ProjectManager.cpp b/Editor/ProjectManager.cpp index 1c67c8e4b..15615a71f 100644 --- a/Editor/ProjectManager.cpp +++ b/Editor/ProjectManager.cpp @@ -133,7 +133,7 @@ makeProj: m_mainMP1.emplace(m_factoryMP1, m_objStore, m_vm.m_mainBooFactory, m_vm.m_mainCommandQueue, m_vm.m_renderTex); m_vm.InitMP1(*m_mainMP1); - m_vm.BuildTestPART(m_objStore); + m_vm.BuildTestPART(); if (needsSave) saveProject(); diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp index 65cfb09a0..5bdbc89e1 100644 --- a/Editor/ViewManager.cpp +++ b/Editor/ViewManager.cpp @@ -25,10 +25,9 @@ using YAMLNode = athena::io::YAMLNode; namespace urde { -void ViewManager::BuildTestPART(urde::IObjectStore& objStore) +void ViewManager::BuildTestPART() { - TLockedToken xrayPalette = objStore.GetObj("TXTR_XRayPalette"); - m_testGameView.reset(new TestGameView(*this, m_viewResources, *m_rootView, xrayPalette)); + m_testGameView.reset(new TestGameView(*this, m_viewResources, *m_rootView)); m_rootView->accessContentViews().clear(); m_rootView->accessContentViews().push_back(m_testGameView.get()); @@ -50,7 +49,6 @@ void ViewManager::TestGameView::draw(boo::IGraphicsCommandQueue* gfxQ) { gfxQ->clearTarget(true, true); m_vm.m_projManager.mainDraw(); - ++m_frame; } specter::View* ViewManager::BuildSpaceViews() diff --git a/Editor/ViewManager.hpp b/Editor/ViewManager.hpp index 5fd7c31d9..61a6fb4ad 100644 --- a/Editor/ViewManager.hpp +++ b/Editor/ViewManager.hpp @@ -53,17 +53,9 @@ class ViewManager : public specter::IViewManager class TestGameView : public specter::View { ViewManager& m_vm; - CSpaceWarpFilter m_spaceWarpFilter; - CWideScreenFilter m_widescreen = { EFilterType::Blend }; - CXRayBlurFilter m_xrayBlur; - CCameraBlurFilter m_camBlur; - CRandom16 m_random; - float m_theta = 0.f; - unsigned m_frame = 0; public: - TestGameView(ViewManager& vm, specter::ViewResources& res, specter::View& parent, - TLockedToken& xrayPalette) - : View(res, parent), m_vm(vm), m_xrayBlur(xrayPalette), m_random(20) {} + TestGameView(ViewManager& vm, specter::ViewResources& res, specter::View& parent) + : View(res, parent), m_vm(vm) {} void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub); void draw(boo::IGraphicsCommandQueue* gfxQ); @@ -151,7 +143,7 @@ class ViewManager : public specter::IViewManager unsigned m_editorFrames = 120; void FadeInEditors() {m_editorFrames = 0;} - void BuildTestPART(urde::IObjectStore& objStore); + void BuildTestPART(); void InitMP1(MP1::CMain& main); Space* m_deferSplit = nullptr;