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

Merge branch 'master' of https://github.com/AxioDL/libSpecter

This commit is contained in:
Jack Andersen 2015-12-31 10:27:33 -10:00
parent d9053ee859 c40079646d
commit f9abc7c6dc
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
specter/lib/Table.cpp
View File

@ -73,7 +73,7 @@ void Table::RowsView::_setRowVerts(const boo::SWindowRect& sub, const boo::SWind
int startIdx = std::max(0, int(m_t.m_rows) - idx); int startIdx = std::max(0, int(m_t.m_rows) - idx);
size_t r, c; size_t r, c;
for (r=0 ; r<SPECTER_TABLE_MAX_ROWS && (sub.location[1] + yOff + spacing) >= scissor.location[1] ; ++r) for (r=0, c=0 ; r<SPECTER_TABLE_MAX_ROWS && (sub.location[1] + yOff + spacing) >= scissor.location[1] ; ++r)
{ {
const Zeus::CColor& color = (r&1) ? theme.tableCellBg1() : theme.tableCellBg2(); const Zeus::CColor& color = (r&1) ? theme.tableCellBg1() : theme.tableCellBg2();
int xOff = 0; int xOff = 0;
@ -96,7 +96,8 @@ void Table::RowsView::_setRowVerts(const boo::SWindowRect& sub, const boo::SWind
} }
m_visibleStart = startIdx; m_visibleStart = startIdx;
m_visibleRows = r; m_visibleRows = r;
m_vertsBuf->load(m_verts.get(), sizeof(SolidShaderVert) * 6 * r * c); if (r * c)
m_vertsBuf->load(m_verts, sizeof(SolidShaderVert) * 6 * r * c);
} }
void Table::setMultiplyColor(const Zeus::CColor& color) void Table::setMultiplyColor(const Zeus::CColor& color)

8
specter/lib/Toolbar.cpp
View File

@ -13,10 +13,10 @@ void Toolbar::Resources::init(boo::IGraphicsDataFactory* factory, const ThemeDat
{ {
static const Zeus::RGBA32 tex[] = static const Zeus::RGBA32 tex[] =
{ {
{255,255,255,64}, {{255,255,255,64}},
{255,255,255,64}, {{255,255,255,64}},
{0,0,0,64}, {{0,0,0,64}},
{0,0,0,64} {{0,0,0,64}}
}; };
m_shadingTex = factory->newStaticTexture(4, 1, 1, boo::TextureFormat::RGBA8, tex, 16); m_shadingTex = factory->newStaticTexture(4, 1, 1, boo::TextureFormat::RGBA8, tex, 16);
} }