diff options
Diffstat (limited to '3rdparty/bgfx/examples/14-shadowvolumes/shadowvolumes.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/14-shadowvolumes/shadowvolumes.cpp | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/3rdparty/bgfx/examples/14-shadowvolumes/shadowvolumes.cpp b/3rdparty/bgfx/examples/14-shadowvolumes/shadowvolumes.cpp index 3aae01fde82..8b61d60c671 100644 --- a/3rdparty/bgfx/examples/14-shadowvolumes/shadowvolumes.cpp +++ b/3rdparty/bgfx/examples/14-shadowvolumes/shadowvolumes.cpp @@ -13,9 +13,6 @@ #include <tinystl/unordered_map.h> namespace stl = tinystl; -namespace std { namespace tr1 {} } -using namespace std::tr1; - #include "common.h" #include "bgfx_utils.h" @@ -1029,29 +1026,29 @@ struct Mesh #define BGFX_CHUNK_MAGIC_IB BX_MAKEFOURCC('I', 'B', ' ', 0x0) #define BGFX_CHUNK_MAGIC_PRI BX_MAKEFOURCC('P', 'R', 'I', 0x0) - bx::CrtFileReader reader; - bx::open(&reader, _filePath); + bx::FileReaderI* reader = entry::getFileReader(); + bx::open(reader, _filePath); Group group; uint32_t chunk; - while (4 == bx::read(&reader, chunk) ) + while (4 == bx::read(reader, chunk) ) { switch (chunk) { case BGFX_CHUNK_MAGIC_VB: { - bx::read(&reader, group.m_sphere); - bx::read(&reader, group.m_aabb); - bx::read(&reader, group.m_obb); + bx::read(reader, group.m_sphere); + bx::read(reader, group.m_aabb); + bx::read(reader, group.m_obb); - bgfx::read(&reader, m_decl); + bgfx::read(reader, m_decl); uint16_t stride = m_decl.getStride(); - bx::read(&reader, group.m_numVertices); + bx::read(reader, group.m_numVertices); const uint32_t size = group.m_numVertices*stride; group.m_vertices = (uint8_t*)malloc(size); - bx::read(&reader, group.m_vertices, size); + bx::read(reader, group.m_vertices, size); const bgfx::Memory* mem = bgfx::makeRef(group.m_vertices, size); group.m_vbh = bgfx::createVertexBuffer(mem, m_decl); @@ -1060,10 +1057,10 @@ struct Mesh case BGFX_CHUNK_MAGIC_IB: { - bx::read(&reader, group.m_numIndices); + bx::read(reader, group.m_numIndices); const uint32_t size = group.m_numIndices*2; group.m_indices = (uint16_t*)malloc(size); - bx::read(&reader, group.m_indices, size); + bx::read(reader, group.m_indices, size); const bgfx::Memory* mem = bgfx::makeRef(group.m_indices, size); group.m_ibh = bgfx::createIndexBuffer(mem); @@ -1073,31 +1070,31 @@ struct Mesh case BGFX_CHUNK_MAGIC_PRI: { uint16_t len; - bx::read(&reader, len); + bx::read(reader, len); std::string material; material.resize(len); - bx::read(&reader, const_cast<char*>(material.c_str() ), len); + bx::read(reader, const_cast<char*>(material.c_str() ), len); uint16_t num; - bx::read(&reader, num); + bx::read(reader, num); for (uint32_t ii = 0; ii < num; ++ii) { - bx::read(&reader, len); + bx::read(reader, len); std::string name; name.resize(len); - bx::read(&reader, const_cast<char*>(name.c_str() ), len); + bx::read(reader, const_cast<char*>(name.c_str() ), len); Primitive prim; - bx::read(&reader, prim.m_startIndex); - bx::read(&reader, prim.m_numIndices); - bx::read(&reader, prim.m_startVertex); - bx::read(&reader, prim.m_numVertices); - bx::read(&reader, prim.m_sphere); - bx::read(&reader, prim.m_aabb); - bx::read(&reader, prim.m_obb); + bx::read(reader, prim.m_startIndex); + bx::read(reader, prim.m_numIndices); + bx::read(reader, prim.m_startVertex); + bx::read(reader, prim.m_numVertices); + bx::read(reader, prim.m_sphere); + bx::read(reader, prim.m_aabb); + bx::read(reader, prim.m_obb); group.m_prims.push_back(prim); } @@ -1108,13 +1105,13 @@ struct Mesh break; default: - DBG("%08x at %d", chunk, reader.seek() ); + DBG("%08x at %d", chunk, bx::seek(reader) ); abort(); break; } } - bx::close(&reader); + bx::close(reader); for (GroupArray::iterator it = m_groups.begin(), itEnd = m_groups.end(); it != itEnd; ++it) { @@ -1179,7 +1176,7 @@ struct Model { bgfx::setTexture(0, s_texColor, m_texture); } - bgfx::setTexture(1, s_texStencil, s_stencilFb); + bgfx::setTexture(1, s_texStencil, bgfx::getTexture(s_stencilFb) ); // Apply render state ::setRenderState(_renderState); |