ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multiplayer kart select with new RTT widget

Browse Source
This commit is contained in:
Marianne Gagnon 2014-05-24 20:34:39 -04:00
parent add14147a3
commit bdc13d3bb9
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/guiengine/widgets/model_view_widget.cpp
View File

@ -82,8 +82,14 @@ void ModelViewWidget::clearModels()
m_model_location.clear(); m_model_location.clear();
m_model_scale.clear(); m_model_scale.clear();
m_model_frames.clear(); m_model_frames.clear();
irr_driver->getSceneManager()->clear();
if (m_rtt_main_node != NULL) m_rtt_main_node->remove();
if (m_light != NULL) m_light->remove();
if (m_camera != NULL) m_camera->remove();
m_rtt_main_node = NULL; m_rtt_main_node = NULL;
m_camera = NULL;
m_light = NULL;
delete m_rtt_provider; delete m_rtt_provider;
m_rtt_provider = NULL; m_rtt_provider = NULL;
@ -173,6 +179,7 @@ void ModelViewWidget::update(float delta)
m_rtt_main_node->setRotation(core::vector3df(0.0f, angle, 0.0f)); m_rtt_main_node->setRotation(core::vector3df(0.0f, angle, 0.0f));
m_rtt_main_node->setVisible(true);
irr_driver->setRTT(m_rtt_provider); irr_driver->setRTT(m_rtt_provider);
irr_driver->getSceneManager()->setActiveCamera(m_camera); irr_driver->getSceneManager()->setActiveCamera(m_camera);
@ -186,6 +193,7 @@ void ModelViewWidget::update(float delta)
glBindFramebuffer(GL_FRAMEBUFFER, 0); glBindFramebuffer(GL_FRAMEBUFFER, 0);
irr_driver->getSceneManager()->setActiveCamera(NULL); irr_driver->getSceneManager()->setActiveCamera(NULL);
m_rtt_main_node->setVisible(false);
} }
void ModelViewWidget::setupRTTScene(PtrVector<scene::IMesh, REF>& mesh, void ModelViewWidget::setupRTTScene(PtrVector<scene::IMesh, REF>& mesh,
@ -193,7 +201,14 @@ void ModelViewWidget::setupRTTScene(PtrVector<scene::IMesh, REF>& mesh,
AlignedArray<Vec3>& mesh_scale, AlignedArray<Vec3>& mesh_scale,
const std::vector<int>& model_frames) const std::vector<int>& model_frames)
{ {
irr_driver->getSceneManager()->clear(); if (m_rtt_main_node != NULL) m_rtt_main_node->remove();
if (m_light != NULL) m_light->remove();
if (m_camera != NULL) m_camera->remove();
m_rtt_main_node = NULL;
m_camera = NULL;
m_light = NULL;
irr_driver->clearLights(); irr_driver->clearLights();
if (model_frames[0] == -1) if (model_frames[0] == -1)