From 2bbfe7e5d3113da66f69f5cfd894497dfff4e8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 18 Sep 2015 20:16:24 -0700 Subject: [PATCH] Moved public header files into bgfx subdirectory. --- examples/00-helloworld/helloworld.cpp | 2 +- examples/02-metaballs/metaballs.cpp | 2 +- examples/10-font/font.cpp | 2 +- examples/11-fontsdf/fontsdf.cpp | 2 +- examples/13-stencil/stencil.cpp | 2 +- examples/14-shadowvolumes/shadowvolumes.cpp | 2 +- examples/15-shadowmaps-simple/shadowmaps_simple.cpp | 2 +- examples/16-shadowmaps/shadowmaps.cpp | 2 +- examples/17-drawstress/drawstress.cpp | 2 +- examples/20-nanovg/nanovg.cpp | 2 +- examples/23-vectordisplay/vectordisplay.h | 2 +- examples/24-nbody/nbody.cpp | 2 +- examples/25-c99/helloworld.c | 2 +- examples/common/bgfx_utils.cpp | 2 +- examples/common/bgfx_utils.h | 2 +- examples/common/cube_atlas.cpp | 2 +- examples/common/cube_atlas.h | 2 +- examples/common/entry/entry.cpp | 2 +- examples/common/entry/entry_android.cpp | 2 +- examples/common/entry/entry_glfw.cpp | 2 +- examples/common/entry/entry_ios.mm | 2 +- examples/common/entry/entry_nacl.cpp | 4 ++-- examples/common/entry/entry_osx.mm | 2 +- examples/common/entry/entry_sdl.cpp | 2 +- examples/common/entry/entry_windows.cpp | 2 +- examples/common/entry/entry_winrt.cpp | 2 +- examples/common/entry/entry_x11.cpp | 2 +- examples/common/font/font_manager.cpp | 2 +- examples/common/font/font_manager.h | 2 +- examples/common/font/text_buffer_manager.cpp | 2 +- examples/common/imgui/imgui.h | 2 +- examples/common/imgui/ocornut_imgui.cpp | 2 +- examples/common/nanovg/nanovg_bgfx.cpp | 2 +- include/{ => bgfx}/bgfx.h | 2 +- include/{ => bgfx}/bgfxdefines.h | 0 include/{ => bgfx}/bgfxplatform.h | 0 include/{bgfx.c99.h => bgfx/c99/bgfx.h} | 2 +- include/{bgfxplatform.c99.h => bgfx/c99/bgfxplatform.h} | 0 src/bgfx.cpp | 4 ++-- src/bgfx_p.h | 4 ++-- src/glcontext_ppapi.cpp | 2 +- src/vertexdecl.h | 2 +- tools/geometryc/geometryc.cpp | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) rename include/{ => bgfx}/bgfx.h (99%) rename include/{ => bgfx}/bgfxdefines.h (100%) rename include/{ => bgfx}/bgfxplatform.h (100%) rename include/{bgfx.c99.h => bgfx/c99/bgfx.h} (99%) rename include/{bgfxplatform.c99.h => bgfx/c99/bgfxplatform.h} (100%) diff --git a/examples/00-helloworld/helloworld.cpp b/examples/00-helloworld/helloworld.cpp index 03d64e0b..b1f762ea 100644 --- a/examples/00-helloworld/helloworld.cpp +++ b/examples/00-helloworld/helloworld.cpp @@ -4,7 +4,7 @@ */ #include "common.h" -#include +#include #include #include "logo.h" diff --git a/examples/02-metaballs/metaballs.cpp b/examples/02-metaballs/metaballs.cpp index b7dc4654..105f8117 100644 --- a/examples/02-metaballs/metaballs.cpp +++ b/examples/02-metaballs/metaballs.cpp @@ -4,7 +4,7 @@ */ #include "common.h" -#include +#include // embedded shaders #include "vs_metaballs.bin.h" diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp index 7b816635..660ff299 100644 --- a/examples/10-font/font.cpp +++ b/examples/10-font/font.cpp @@ -5,7 +5,7 @@ #include "common.h" -#include +#include #include #include #include diff --git a/examples/11-fontsdf/fontsdf.cpp b/examples/11-fontsdf/fontsdf.cpp index f74c3885..d54d4756 100644 --- a/examples/11-fontsdf/fontsdf.cpp +++ b/examples/11-fontsdf/fontsdf.cpp @@ -6,7 +6,7 @@ #include "common.h" #include "bgfx_utils.h" -#include +#include #include #include diff --git a/examples/13-stencil/stencil.cpp b/examples/13-stencil/stencil.cpp index 2551306e..7a1e90d2 100644 --- a/examples/13-stencil/stencil.cpp +++ b/examples/13-stencil/stencil.cpp @@ -9,7 +9,7 @@ #include "common.h" #include "bgfx_utils.h" -#include +#include #include #include #include diff --git a/examples/14-shadowvolumes/shadowvolumes.cpp b/examples/14-shadowvolumes/shadowvolumes.cpp index 1ab279cc..17a19ab5 100644 --- a/examples/14-shadowvolumes/shadowvolumes.cpp +++ b/examples/14-shadowvolumes/shadowvolumes.cpp @@ -19,7 +19,7 @@ using namespace std::tr1; #include "common.h" #include "bgfx_utils.h" -#include +#include #include #include #include diff --git a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp index c361c860..13d86afb 100644 --- a/examples/15-shadowmaps-simple/shadowmaps_simple.cpp +++ b/examples/15-shadowmaps-simple/shadowmaps_simple.cpp @@ -9,7 +9,7 @@ #include "common.h" -#include +#include #include #include #include diff --git a/examples/16-shadowmaps/shadowmaps.cpp b/examples/16-shadowmaps/shadowmaps.cpp index ad0dbc26..34ce52c3 100644 --- a/examples/16-shadowmaps/shadowmaps.cpp +++ b/examples/16-shadowmaps/shadowmaps.cpp @@ -10,7 +10,7 @@ #include "common.h" #include "bgfx_utils.h" -#include +#include #include #include #include diff --git a/examples/17-drawstress/drawstress.cpp b/examples/17-drawstress/drawstress.cpp index de08f68b..b8171a3e 100644 --- a/examples/17-drawstress/drawstress.cpp +++ b/examples/17-drawstress/drawstress.cpp @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include +#include #include #include "common.h" diff --git a/examples/20-nanovg/nanovg.cpp b/examples/20-nanovg/nanovg.cpp index c505b842..2f4060a4 100644 --- a/examples/20-nanovg/nanovg.cpp +++ b/examples/20-nanovg/nanovg.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include "entry/entry.h" diff --git a/examples/23-vectordisplay/vectordisplay.h b/examples/23-vectordisplay/vectordisplay.h index 88a71b83..0b8c78a8 100644 --- a/examples/23-vectordisplay/vectordisplay.h +++ b/examples/23-vectordisplay/vectordisplay.h @@ -12,7 +12,7 @@ #ifndef __VECTORDISPLAY_H__ #define __VECTORDISPLAY_H__ -#include "bgfx.h" +#include #include #include diff --git a/examples/24-nbody/nbody.cpp b/examples/24-nbody/nbody.cpp index da7e7a44..854a55a7 100644 --- a/examples/24-nbody/nbody.cpp +++ b/examples/24-nbody/nbody.cpp @@ -7,7 +7,7 @@ #include "bgfx_utils.h" #include "imgui/imgui.h" #include "camera.h" -#include +#include struct u_paramsDataStruct { diff --git a/examples/25-c99/helloworld.c b/examples/25-c99/helloworld.c index b2e809c6..a362736b 100644 --- a/examples/25-c99/helloworld.c +++ b/examples/25-c99/helloworld.c @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include +#include #include "../00-helloworld/logo.h" extern bool entry_process_events(uint32_t* _width, uint32_t* _height, uint32_t* _debug, uint32_t* _reset); diff --git a/examples/common/bgfx_utils.cpp b/examples/common/bgfx_utils.cpp index ad1ca9fc..386062c0 100644 --- a/examples/common/bgfx_utils.cpp +++ b/examples/common/bgfx_utils.cpp @@ -12,7 +12,7 @@ #include namespace stl = tinystl; -#include +#include #include #include #include diff --git a/examples/common/bgfx_utils.h b/examples/common/bgfx_utils.h index 6b7d1f05..2938abff 100644 --- a/examples/common/bgfx_utils.h +++ b/examples/common/bgfx_utils.h @@ -6,7 +6,7 @@ #ifndef BGFX_UTILS_H_HEADER_GUARD #define BGFX_UTILS_H_HEADER_GUARD -#include +#include void* load(const char* _filePath, uint32_t* _size = NULL); void unload(void* _ptr); diff --git a/examples/common/cube_atlas.cpp b/examples/common/cube_atlas.cpp index c0303d0b..1d762b65 100644 --- a/examples/common/cube_atlas.cpp +++ b/examples/common/cube_atlas.cpp @@ -4,7 +4,7 @@ */ #include "common.h" -#include +#include #include // INT_MAX #include // memset diff --git a/examples/common/cube_atlas.h b/examples/common/cube_atlas.h index 903221e7..5efde048 100644 --- a/examples/common/cube_atlas.h +++ b/examples/common/cube_atlas.h @@ -15,7 +15,7 @@ /// algorithm based on C++ sources provided by Jukka Jylänki at: /// http://clb.demon.fi/files/RectangleBinPack/ -#include +#include struct AtlasRegion { diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp index fa83cce8..61dbe0b3 100644 --- a/examples/common/entry/entry.cpp +++ b/examples/common/entry/entry.cpp @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include +#include #include #include diff --git a/examples/common/entry/entry_android.cpp b/examples/common/entry/entry_android.cpp index f16b1e5d..aef9fee9 100644 --- a/examples/common/entry/entry_android.cpp +++ b/examples/common/entry/entry_android.cpp @@ -7,7 +7,7 @@ #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_ANDROID -#include +#include #include #include diff --git a/examples/common/entry/entry_glfw.cpp b/examples/common/entry/entry_glfw.cpp index 42a7bc6f..615d828c 100644 --- a/examples/common/entry/entry_glfw.cpp +++ b/examples/common/entry/entry_glfw.cpp @@ -9,7 +9,7 @@ #define GLFW_DLL #include -#include +#include #include "dbg.h" // This is just trivial implementation of GLFW3 integration. diff --git a/examples/common/entry/entry_ios.mm b/examples/common/entry/entry_ios.mm index d2392d89..1a10d26f 100644 --- a/examples/common/entry/entry_ios.mm +++ b/examples/common/entry/entry_ios.mm @@ -17,7 +17,7 @@ //# define HAS_METAL_SDK #endif -#include +#include #include #include diff --git a/examples/common/entry/entry_nacl.cpp b/examples/common/entry/entry_nacl.cpp index 8d6fac7b..bc476290 100644 --- a/examples/common/entry/entry_nacl.cpp +++ b/examples/common/entry/entry_nacl.cpp @@ -7,7 +7,7 @@ #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_NACL -#include +#include #include #include @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include "entry.h" diff --git a/examples/common/entry/entry_osx.mm b/examples/common/entry/entry_osx.mm index c0cec19d..5b59fe06 100644 --- a/examples/common/entry/entry_osx.mm +++ b/examples/common/entry/entry_osx.mm @@ -9,7 +9,7 @@ #import -#include +#include #include #include diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp index b9094e8c..a9faec69 100644 --- a/examples/common/entry/entry_sdl.cpp +++ b/examples/common/entry/entry_sdl.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp index a6a5ff2c..0a210853 100644 --- a/examples/common/entry/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -7,7 +7,7 @@ #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_WINDOWS -#include +#include #include #include diff --git a/examples/common/entry/entry_winrt.cpp b/examples/common/entry/entry_winrt.cpp index 44fb92a4..042c032d 100644 --- a/examples/common/entry/entry_winrt.cpp +++ b/examples/common/entry/entry_winrt.cpp @@ -7,7 +7,7 @@ #if BX_PLATFORM_WINRT -#include +#include #include using namespace Windows::ApplicationModel; diff --git a/examples/common/entry/entry_x11.cpp b/examples/common/entry/entry_x11.cpp index e0254884..898728a8 100644 --- a/examples/common/entry/entry_x11.cpp +++ b/examples/common/entry/entry_x11.cpp @@ -11,7 +11,7 @@ #define XK_LATIN1 #include #include // will include X11 which #defines None... Don't mess with order of includes. -#include +#include #undef None #include diff --git a/examples/common/font/font_manager.cpp b/examples/common/font/font_manager.cpp index 8532a534..053f7c95 100644 --- a/examples/common/font/font_manager.cpp +++ b/examples/common/font/font_manager.cpp @@ -25,7 +25,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); #include "../common.h" -#include +#include #include #if USE_EDTAA3 diff --git a/examples/common/font/font_manager.h b/examples/common/font/font_manager.h index 73d47120..978440a8 100644 --- a/examples/common/font/font_manager.h +++ b/examples/common/font/font_manager.h @@ -7,7 +7,7 @@ #define FONT_MANAGER_H_HEADER_GUARD #include -#include +#include class Atlas; diff --git a/examples/common/font/text_buffer_manager.cpp b/examples/common/font/text_buffer_manager.cpp index d42e0cb8..af1a3852 100644 --- a/examples/common/font/text_buffer_manager.cpp +++ b/examples/common/font/text_buffer_manager.cpp @@ -5,7 +5,7 @@ #include "../common.h" -#include +#include #include // offsetof #include // memcpy #include // wcslen diff --git a/examples/common/imgui/imgui.h b/examples/common/imgui/imgui.h index acd6e6da..d6d9cdff 100644 --- a/examples/common/imgui/imgui.h +++ b/examples/common/imgui/imgui.h @@ -26,7 +26,7 @@ #ifndef IMGUI_H_HEADER_GUARD #define IMGUI_H_HEADER_GUARD -#include +#include #include #define IMGUI_MBUT_LEFT 0x01 diff --git a/examples/common/imgui/ocornut_imgui.cpp b/examples/common/imgui/ocornut_imgui.cpp index aff41ac3..367896c8 100644 --- a/examples/common/imgui/ocornut_imgui.cpp +++ b/examples/common/imgui/ocornut_imgui.cpp @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include +#include #include #include #include diff --git a/examples/common/nanovg/nanovg_bgfx.cpp b/examples/common/nanovg/nanovg_bgfx.cpp index 817457db..8a7d83f4 100644 --- a/examples/common/nanovg/nanovg_bgfx.cpp +++ b/examples/common/nanovg/nanovg_bgfx.cpp @@ -28,7 +28,7 @@ #include #include "nanovg.h" -#include +#include #include diff --git a/include/bgfx.h b/include/bgfx/bgfx.h similarity index 99% rename from include/bgfx.h rename to include/bgfx/bgfx.h index 2bdc5b2e..13c7b58f 100644 --- a/include/bgfx.h +++ b/include/bgfx/bgfx.h @@ -10,7 +10,7 @@ #include // uint32_t #include // size_t -#include "bgfxdefines.h" +#include /// #define BGFX_HANDLE(_name) \ diff --git a/include/bgfxdefines.h b/include/bgfx/bgfxdefines.h similarity index 100% rename from include/bgfxdefines.h rename to include/bgfx/bgfxdefines.h diff --git a/include/bgfxplatform.h b/include/bgfx/bgfxplatform.h similarity index 100% rename from include/bgfxplatform.h rename to include/bgfx/bgfxplatform.h diff --git a/include/bgfx.c99.h b/include/bgfx/c99/bgfx.h similarity index 99% rename from include/bgfx.c99.h rename to include/bgfx/c99/bgfx.h index 23849bb5..0fbfd46b 100644 --- a/include/bgfx.c99.h +++ b/include/bgfx/c99/bgfx.h @@ -13,7 +13,7 @@ #include // uint32_t #include // size_t -#include "bgfxdefines.h" +#include typedef enum bgfx_renderer_type { diff --git a/include/bgfxplatform.c99.h b/include/bgfx/c99/bgfxplatform.h similarity index 100% rename from include/bgfxplatform.c99.h rename to include/bgfx/c99/bgfxplatform.h diff --git a/src/bgfx.cpp b/src/bgfx.cpp index bda36695..71d521b6 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -3217,8 +3217,8 @@ again: } } // namespace bgfx -#include -#include +#include +#include BX_STATIC_ASSERT(bgfx::Fatal::Count == bgfx::Fatal::Enum(BGFX_FATAL_COUNT) ); BX_STATIC_ASSERT(bgfx::RendererType::Count == bgfx::RendererType::Enum(BGFX_RENDERER_TYPE_COUNT) ); diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 9f758349..26de034b 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -19,7 +19,7 @@ # define BX_CONFIG_ALLOCATOR_DEBUG 1 #endif // BGFX_CONFIG_DEBUG -#include "bgfx.h" +#include #include "config.h" #include @@ -108,7 +108,7 @@ namespace bgfx #include #include -#include "bgfxplatform.h" +#include #include "image.h" #define BGFX_CHUNK_MAGIC_CSH BX_MAKEFOURCC('C', 'S', 'H', 0x2) diff --git a/src/glcontext_ppapi.cpp b/src/glcontext_ppapi.cpp index bdbb5068..fb17a11f 100644 --- a/src/glcontext_ppapi.cpp +++ b/src/glcontext_ppapi.cpp @@ -6,7 +6,7 @@ #include "bgfx_p.h" #if BX_PLATFORM_NACL && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL) -# include +# include # include "renderer_gl.h" namespace bgfx { namespace gl diff --git a/src/vertexdecl.h b/src/vertexdecl.h index 6ba12417..46025527 100644 --- a/src/vertexdecl.h +++ b/src/vertexdecl.h @@ -6,7 +6,7 @@ #ifndef BGFX_VERTEXDECL_H_HEADER_GUARD #define BGFX_VERTEXDECL_H_HEADER_GUARD -#include +#include #include namespace bgfx diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp index d55d4a2e..9e85a4c6 100644 --- a/tools/geometryc/geometryc.cpp +++ b/tools/geometryc/geometryc.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include "../../src/vertexdecl.h" #include