AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove remaining unused vars from TestGameView

This commit is contained in:
Phillip Stephens 2017-09-14 05:42:20 -07:00
parent 001125429f
commit b28769977f
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Editor/ProjectManager.cpp
View File

@ -133,7 +133,7 @@ makeProj:
m_mainMP1.emplace(m_factoryMP1, m_objStore, m_vm.m_mainBooFactory, m_mainMP1.emplace(m_factoryMP1, m_objStore, m_vm.m_mainBooFactory,
m_vm.m_mainCommandQueue, m_vm.m_renderTex); m_vm.m_mainCommandQueue, m_vm.m_renderTex);
m_vm.InitMP1(*m_mainMP1); m_vm.InitMP1(*m_mainMP1);
m_vm.BuildTestPART(m_objStore); m_vm.BuildTestPART();
if (needsSave) if (needsSave)
saveProject(); saveProject();

6
Editor/ViewManager.cpp
View File

@ -25,10 +25,9 @@ using YAMLNode = athena::io::YAMLNode;
namespace urde namespace urde
{ {
void ViewManager::BuildTestPART(urde::IObjectStore& objStore) void ViewManager::BuildTestPART()
{ {
TLockedToken<CTexture> xrayPalette = objStore.GetObj("TXTR_XRayPalette"); m_testGameView.reset(new TestGameView(*this, m_viewResources, *m_rootView));
m_testGameView.reset(new TestGameView(*this, m_viewResources, *m_rootView, xrayPalette));
m_rootView->accessContentViews().clear(); m_rootView->accessContentViews().clear();
m_rootView->accessContentViews().push_back(m_testGameView.get()); m_rootView->accessContentViews().push_back(m_testGameView.get());
@ -50,7 +49,6 @@ void ViewManager::TestGameView::draw(boo::IGraphicsCommandQueue* gfxQ)
{ {
gfxQ->clearTarget(true, true); gfxQ->clearTarget(true, true);
m_vm.m_projManager.mainDraw(); m_vm.m_projManager.mainDraw();
++m_frame;
} }
specter::View* ViewManager::BuildSpaceViews() specter::View* ViewManager::BuildSpaceViews()

14
Editor/ViewManager.hpp
View File

@ -53,17 +53,9 @@ class ViewManager : public specter::IViewManager
class TestGameView : public specter::View class TestGameView : public specter::View
{ {
ViewManager& m_vm; 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: public:
TestGameView(ViewManager& vm, specter::ViewResources& res, specter::View& parent, TestGameView(ViewManager& vm, specter::ViewResources& res, specter::View& parent)
TLockedToken<CTexture>& xrayPalette) : View(res, parent), m_vm(vm) {}
: View(res, parent), m_vm(vm), m_xrayBlur(xrayPalette), m_random(20) {}
void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub); void resized(const boo::SWindowRect& root, const boo::SWindowRect& sub);
void draw(boo::IGraphicsCommandQueue* gfxQ); void draw(boo::IGraphicsCommandQueue* gfxQ);
@ -151,7 +143,7 @@ class ViewManager : public specter::IViewManager
unsigned m_editorFrames = 120; unsigned m_editorFrames = 120;
void FadeInEditors() {m_editorFrames = 0;} void FadeInEditors() {m_editorFrames = 0;}
void BuildTestPART(urde::IObjectStore& objStore); void BuildTestPART();
void InitMP1(MP1::CMain& main); void InitMP1(MP1::CMain& main);
Space* m_deferSplit = nullptr; Space* m_deferSplit = nullptr;