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

Full-window loop test; resource token fix

This commit is contained in:
Jack Andersen 2016-03-08 13:38:00 -10:00
parent ee3723150d
commit 5f7c6769e3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Editor/ViewManager.cpp
View File

@ -30,7 +30,8 @@ void ViewManager::BuildTestPART(urde::IObjectStore& objStore)
m_lineRenderer.reset(new urde::CLineRenderer(urde::CLineRenderer::EPrimitiveMode::LineStrip, 4, nullptr, true)); m_lineRenderer.reset(new urde::CLineRenderer(urde::CLineRenderer::EPrimitiveMode::LineStrip, 4, nullptr, true));
*/ */
m_particleView.reset(new ParticleView(*this, m_viewResources, *m_rootView)); m_particleView.reset(new ParticleView(*this, m_viewResources, *m_rootView));
m_moviePlayer.reset(new CMoviePlayer("Video/00_first_start.thp", -1.f, true, false)); m_moviePlayer.reset(new CMoviePlayer("Video/00_first_start.thp", -1.f, false, false));
m_moviePlayer->SetFrame({-1.0f, 1.0f, 0.f}, {-1.0f, -1.0f, 0.f}, {1.0f, -1.0f, 0.f}, {1.0f, 1.0f, 0.f});
CDvdFile testRSF("Audio/frontend_1.rsf"); CDvdFile testRSF("Audio/frontend_1.rsf");
u64 rsfLen = testRSF.Length(); u64 rsfLen = testRSF.Length();
m_rsfBuf.reset(new u8[rsfLen]); m_rsfBuf.reset(new u8[rsfLen]);
@ -77,6 +78,11 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ)
} }
if (m_vm.m_moviePlayer) if (m_vm.m_moviePlayer)
{ {
if (m_vm.m_moviePlayer->GetIsMovieFinishedPlaying())
{
m_vm.m_moviePlayer.reset(new CMoviePlayer("Video/01_startloop.thp", -1.f, true, false));
m_vm.m_moviePlayer->SetFrame({-1.0f, 1.0f, 0.f}, {-1.0f, -1.0f, 0.f}, {1.0f, -1.0f, 0.f}, {1.0f, 1.0f, 0.f});
}
m_vm.m_moviePlayer->Update(1.f / 60.f); m_vm.m_moviePlayer->Update(1.f / 60.f);
m_vm.m_moviePlayer->DrawFrame(); m_vm.m_moviePlayer->DrawFrame();
} }

2
Editor/ViewManager.hpp
View File

@ -42,7 +42,7 @@ class ViewManager : public specter::IViewManager
ViewManager& m_vm; ViewManager& m_vm;
public: public:
ParticleView(ViewManager& vm, specter::ViewResources& res, specter::View& parent) ParticleView(ViewManager& vm, specter::ViewResources& res, specter::View& parent)
: View(res, parent), m_vm(vm) {} : View(res, parent), m_vm(vm) {commitResources(res);}
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);
}; };