mirror of
https://github.com/scratchfoundation/bgfx.git
synced 2024-11-28 18:45:54 -05:00
Merge remote-tracking branch 'refs/remotes/bgfx_bkaradzic/master'
This commit is contained in:
commit
def7541538
12 changed files with 19 additions and 12 deletions
|
@ -6,7 +6,7 @@ https://github.com/bkaradzic/bgfx
|
|||
What is it?
|
||||
-----------
|
||||
|
||||
Cross-platform rendering library.
|
||||
Cross-platform rendering library ([API](https://github.com/bkaradzic/bgfx/blob/master/include/bgfx.h)).
|
||||
|
||||
Supported rendering backends:
|
||||
|
||||
|
|
|
@ -17,7 +17,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -102,7 +102,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -502,7 +502,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -181,7 +181,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -12,7 +12,7 @@ include $(BGFX_DIR)/premake/shader.mk
|
|||
geometry: ../runtime/meshes/bunny.bin
|
||||
|
||||
../runtime/meshes/bunny.bin: bunny.obj
|
||||
..\..\tools\bin\geometryc -f bunny.obj -o ..\runtime\meshes\bunny.bin --packnormal 1
|
||||
../../tools/bin/geometryc -f bunny.obj -o ../runtime/meshes/bunny.bin --packnormal 1
|
||||
|
||||
rebuild:
|
||||
@make -s --no-print-directory TARGET=0 clean all
|
||||
|
|
|
@ -286,7 +286,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -102,7 +102,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -258,7 +258,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -133,7 +133,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -413,7 +413,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
|
|||
uint32_t reset = BGFX_RESET_VSYNC;
|
||||
|
||||
bgfx::init();
|
||||
bgfx::reset(width, height);
|
||||
bgfx::reset(width, height, reset);
|
||||
|
||||
// Enable debug text.
|
||||
bgfx::setDebug(debug);
|
||||
|
|
|
@ -487,7 +487,14 @@ namespace bgfx
|
|||
/// Unpack vec4 from vertex stream format.
|
||||
void vertexUnpack(float _output[4], Attrib::Enum _attr, const VertexDecl& _decl, const void* _data, uint32_t _index = 0);
|
||||
|
||||
/// Convert from one vertex stream format to another.
|
||||
/// Converts vertex stream data from one vertex stream format to another.
|
||||
///
|
||||
/// @param _destDecl Destination vertex stream declaration.
|
||||
/// @param _destData Destination vertex stream.
|
||||
/// @param _srcDecl Source vertex stream declaration.
|
||||
/// @param _srcData Source vertex stream data.
|
||||
/// @param _num Number of vertices to convert from source to destination.
|
||||
///
|
||||
void vertexConvert(const VertexDecl& _destDecl, void* _destData, const VertexDecl& _srcDecl, const void* _srcData, uint32_t _num = 1);
|
||||
|
||||
/// Returns renderer backend API type.
|
||||
|
|
Loading…
Reference in a new issue