AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 14:24:56 +00:00
Code Issues Projects Releases Wiki Activity

CSplashScreen integration

Browse Source
This commit is contained in:
Jack Andersen
2016-09-13 19:54:09 -10:00
parent 8b23c0538e
commit 1d8dfa3205
21 changed files with 409 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Editor/ProjectManager.cpp
View File

@@ -130,7 +130,8 @@ makeProj:
m_vm.SetupEditorView();
m_factoryMP1.IndexMP1Resources(*m_proj);
m_mainMP1.emplace(m_factoryMP1, m_objStore, m_vm.m_mainBooFactory, m_vm.m_mainCommandQueue, m_vm.m_renderTex);
m_mainMP1.emplace(m_factoryMP1, m_objStore, m_vm.m_mainBooFactory,
m_vm.m_mainCommandQueue, m_vm.m_renderTex, *m_vm.m_amuseAllocWrapper);
m_vm.InitMP1(*m_mainMP1);
m_vm.BuildTestPART(m_objStore);
@@ -185,6 +186,12 @@ void ProjectManager::mainUpdate()
m_mainMP1->Proc();
}
void ProjectManager::mainDraw()
{
if (m_mainMP1)
m_mainMP1->Draw();
}
void ProjectManager::asyncIdle()
{
m_factoryMP1.AsyncIdle();

1
Editor/ProjectManager.hpp
View File

@@ -52,6 +52,7 @@ public:
bool saveProject();
void mainUpdate();
void mainDraw();
void asyncIdle();
void shutdown();
};

7
Editor/ViewManager.cpp
View File

@@ -176,8 +176,10 @@ void ViewManager::ParticleView::draw(boo::IGraphicsCommandQueue *gfxQ)
if (m_frame == 300)
g_GameState->GetWorldTransitionManager()->PleaseStopSoon();
g_GameState->GetWorldTransitionManager()->Update(1.f / 60.f);
g_GameState->GetWorldTransitionManager()->Draw();
//g_GameState->GetWorldTransitionManager()->Update(1.f / 60.f);
//g_GameState->GetWorldTransitionManager()->Draw();
m_vm.m_projManager.mainDraw();
++m_frame;
}
@@ -348,6 +350,7 @@ void ViewManager::init(boo::IApplication* app)
m_renderTex = root->renderTex();
m_mainWindow->setWaitCursor(false);
m_voiceEngine = boo::NewAudioVoiceEngine();
m_amuseAllocWrapper.emplace(*m_voiceEngine);
/*
CGraphics::InitializeBoo(gf, m_mainWindow->getCommandQueue(), root->renderTex());
CModelShaders::Initialize(m_fileStoreManager, gf);

2
Editor/ViewManager.hpp
View File

@@ -3,6 +3,7 @@
#include "hecl/CVarManager.hpp"
#include "boo/audiodev/IAudioVoiceEngine.hpp"
#include "amuse/BooBackend.hpp"
#include "ProjectManager.hpp"
#include "Space.hpp"
@@ -75,6 +76,7 @@ class ViewManager : public specter::IViewManager
std::unique_ptr<u8[]> m_rsfBuf;
std::unique_ptr<boo::IAudioVoiceEngine> m_voiceEngine;
std::unique_ptr<boo::IAudioVoice> m_videoVoice;
std::experimental::optional<amuse::BooBackendVoiceAllocator> m_amuseAllocWrapper;
struct AudioVoiceCallback : boo::IAudioVoiceCallback
{
ViewManager& m_vm;