From 528360ac6c6c28c3e1cb915f5e635667207ac5e8 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Tue, 7 May 2013 22:37:19 -0700 Subject: [PATCH 1/4] Fixed path separator. --- examples/04-mesh/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/04-mesh/makefile b/examples/04-mesh/makefile index d3d54cdc..f12c1023 100644 --- a/examples/04-mesh/makefile +++ b/examples/04-mesh/makefile @@ -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 From 3601c74e92be7152eaa19188a838fd6371ed3338 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Wed, 8 May 2013 22:57:54 -0700 Subject: [PATCH 2/4] Fixed reset flag in examples. --- examples/00-helloworld/helloworld.cpp | 2 +- examples/01-cubes/cubes.cpp | 2 +- examples/02-metaballs/metaballs.cpp | 2 +- examples/03-raymarch/raymarch.cpp | 2 +- examples/04-mesh/mesh.cpp | 2 +- examples/05-instancing/instancing.cpp | 2 +- examples/06-bump/bump.cpp | 2 +- examples/08-update/update.cpp | 2 +- examples/09-hdr/hdr.cpp | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/00-helloworld/helloworld.cpp b/examples/00-helloworld/helloworld.cpp index 238a7be8..7819b810 100644 --- a/examples/00-helloworld/helloworld.cpp +++ b/examples/00-helloworld/helloworld.cpp @@ -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); diff --git a/examples/01-cubes/cubes.cpp b/examples/01-cubes/cubes.cpp index a50318d1..94e15bbb 100644 --- a/examples/01-cubes/cubes.cpp +++ b/examples/01-cubes/cubes.cpp @@ -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); diff --git a/examples/02-metaballs/metaballs.cpp b/examples/02-metaballs/metaballs.cpp index 325a51f1..c948aa31 100644 --- a/examples/02-metaballs/metaballs.cpp +++ b/examples/02-metaballs/metaballs.cpp @@ -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); diff --git a/examples/03-raymarch/raymarch.cpp b/examples/03-raymarch/raymarch.cpp index 3731b540..3a871033 100644 --- a/examples/03-raymarch/raymarch.cpp +++ b/examples/03-raymarch/raymarch.cpp @@ -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); diff --git a/examples/04-mesh/mesh.cpp b/examples/04-mesh/mesh.cpp index 2e9418f9..db5ca6af 100644 --- a/examples/04-mesh/mesh.cpp +++ b/examples/04-mesh/mesh.cpp @@ -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); diff --git a/examples/05-instancing/instancing.cpp b/examples/05-instancing/instancing.cpp index 39b7bb74..30c037a6 100644 --- a/examples/05-instancing/instancing.cpp +++ b/examples/05-instancing/instancing.cpp @@ -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); diff --git a/examples/06-bump/bump.cpp b/examples/06-bump/bump.cpp index f3fe9fa3..eac8d410 100644 --- a/examples/06-bump/bump.cpp +++ b/examples/06-bump/bump.cpp @@ -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); diff --git a/examples/08-update/update.cpp b/examples/08-update/update.cpp index 33e33813..0a133fad 100644 --- a/examples/08-update/update.cpp +++ b/examples/08-update/update.cpp @@ -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); diff --git a/examples/09-hdr/hdr.cpp b/examples/09-hdr/hdr.cpp index 55ee14e2..9c3843d0 100644 --- a/examples/09-hdr/hdr.cpp +++ b/examples/09-hdr/hdr.cpp @@ -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); From 5672a5dbd74f0674159ed8728622163b11f9bcc4 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Thu, 9 May 2013 22:09:17 -0700 Subject: [PATCH 3/4] Updated docs. --- include/bgfx.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/bgfx.h b/include/bgfx.h index 805c9005..9675e3cc 100644 --- a/include/bgfx.h +++ b/include/bgfx.h @@ -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. From 4d507ec6edc69f457d1f8c15715ac985f6b2398f Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Sun, 12 May 2013 21:55:54 -0700 Subject: [PATCH 4/4] Updated README. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 01e39b6e..66f51037 100644 --- a/README.md +++ b/README.md @@ -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: