mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić 2015-07-28 22:02:48 -07:00
parent eecb4be9e9
commit 72a4bf0847
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
examples/common/cube_atlas.cpp
View File

@ -405,42 +405,46 @@ uint16_t Atlas::addRegion(uint16_t _width, uint16_t _height, const uint8_t* _bit
void Atlas::updateRegion(const AtlasRegion& _region, const uint8_t* _bitmapBuffer) void Atlas::updateRegion(const AtlasRegion& _region, const uint8_t* _bitmapBuffer)
{ {
const bgfx::Memory* mem = bgfx::alloc(_region.width * _region.height * 4); uint32_t size = _region.width * _region.height * 4;
memset(mem->data, 0, mem->size); if (0 < size)
if (_region.getType() == AtlasRegion::TYPE_BGRA8)
{ {
const uint8_t* inLineBuffer = _bitmapBuffer; const bgfx::Memory* mem = bgfx::alloc(size);
uint8_t* outLineBuffer = m_textureBuffer + _region.getFaceIndex() * (m_textureSize * m_textureSize * 4) + ( ( (_region.y * m_textureSize) + _region.x) * 4); memset(mem->data, 0, mem->size);
if (_region.getType() == AtlasRegion::TYPE_BGRA8)
for (int yy = 0; yy < _region.height; ++yy)
{ {
memcpy(outLineBuffer, inLineBuffer, _region.width * 4); const uint8_t* inLineBuffer = _bitmapBuffer;
inLineBuffer += _region.width * 4; uint8_t* outLineBuffer = m_textureBuffer + _region.getFaceIndex() * (m_textureSize * m_textureSize * 4) + ( ( (_region.y * m_textureSize) + _region.x) * 4);
outLineBuffer += m_textureSize * 4;
}
memcpy(mem->data, _bitmapBuffer, mem->size); for (int yy = 0; yy < _region.height; ++yy)
}
else
{
uint32_t layer = _region.getComponentIndex();
const uint8_t* inLineBuffer = _bitmapBuffer;
uint8_t* outLineBuffer = (m_textureBuffer + _region.getFaceIndex() * (m_textureSize * m_textureSize * 4) + ( ( (_region.y * m_textureSize) + _region.x) * 4) );
for (int yy = 0; yy < _region.height; ++yy)
{
for (int xx = 0; xx < _region.width; ++xx)
{ {
outLineBuffer[(xx * 4) + layer] = inLineBuffer[xx]; memcpy(outLineBuffer, inLineBuffer, _region.width * 4);
inLineBuffer += _region.width * 4;
outLineBuffer += m_textureSize * 4;
} }
memcpy(mem->data + yy * _region.width * 4, outLineBuffer, _region.width * 4); memcpy(mem->data, _bitmapBuffer, mem->size);
inLineBuffer += _region.width;
outLineBuffer += m_textureSize * 4;
} }
} else
{
uint32_t layer = _region.getComponentIndex();
const uint8_t* inLineBuffer = _bitmapBuffer;
uint8_t* outLineBuffer = (m_textureBuffer + _region.getFaceIndex() * (m_textureSize * m_textureSize * 4) + ( ( (_region.y * m_textureSize) + _region.x) * 4) );
bgfx::updateTextureCube(m_textureHandle, (uint8_t)_region.getFaceIndex(), 0, _region.x, _region.y, _region.width, _region.height, mem); for (int yy = 0; yy < _region.height; ++yy)
{
for (int xx = 0; xx < _region.width; ++xx)
{
outLineBuffer[(xx * 4) + layer] = inLineBuffer[xx];
}
memcpy(mem->data + yy * _region.width * 4, outLineBuffer, _region.width * 4);
inLineBuffer += _region.width;
outLineBuffer += m_textureSize * 4;
}
}
bgfx::updateTextureCube(m_textureHandle, (uint8_t)_region.getFaceIndex(), 0, _region.x, _region.y, _region.width, _region.height, mem);
}
} }
void Atlas::packFaceLayerUV(uint32_t _idx, uint8_t* _vertexBuffer, uint32_t _offset, uint32_t _stride) const void Atlas::packFaceLayerUV(uint32_t _idx, uint8_t* _vertexBuffer, uint32_t _offset, uint32_t _stride) const