Skip to content
Snippets Groups Projects
Commit 8d480311 authored by D-AIRY's avatar D-AIRY
Browse files

Fixed border rendering; Disable updating hidden windows

parent 7ea4c3d3
Branches
Tags version_X.5.0-dev
1 merge request!6Version X.7.0
......@@ -210,6 +210,7 @@ build/gamesource/*
/build/gamesource/shaders/cache/*
!shaders/
!gui/
!editor_gui/
docs/html/*
!docs/html/material_editor/
!docs/html/particles_editor/
......
......@@ -17,11 +17,12 @@ namespace gui
m_iIndexStart[i] = 0;
m_iIndexCount[i] = 0;
//m_iColor[i] = 0xFF000000;
m_pColor[i] = float4_t(0.0f, 0.0f, 0.0f, 1.0f);
m_pColor[i] = float4_t(0.0f, 0.0f, 0.0f, 0.0f);
m_iVertexCount[i] = 0;
m_iVertexStart[i] = 0;
m_iSideCount[i] = 0;
m_pColorsConstant[i] = GetGUI()->getDevice()->createConstantBuffer(sizeof(float4));
m_pColorsConstant[i]->update(&m_pColor[i]);
}
m_pColorBlack = GetGUI()->getDevice()->createConstantBuffer(sizeof(float4));
......
......@@ -50,9 +50,12 @@ void XMETHODCALLTYPE CXUI::render()
pCtx->unsetDepthStencilSurface();
for(UINT i = 0, l = m_pWindows.size(); i < l; ++i)
{
if(m_pWindows[i]->isVisible())
{
m_pWindows[i]->render(pCtx);
}
}
pCtx->setColorTarget(pOldSurface);
pCtx->setDepthStencilSurface(pOldDS);
......@@ -62,10 +65,13 @@ void XMETHODCALLTYPE CXUI::render()
void XMETHODCALLTYPE CXUI::present()
{
for(UINT i = 0, l = m_pWindows.size(); i < l; ++i)
{
if(m_pWindows[i]->isVisible())
{
m_pWindows[i]->present();
}
}
}
//##########################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment