ソースを参照

Moved public header files into bgfx subdirectory.

    grep -rl '<bgfx.h>' . | xargs sed -i 's@<bgfx.h>@<bgfx/bgfx.h>@g'
Branimir Karadžić 10 年 前
コミット
d1f99896ec
43 ファイル変更43 行追加43 行削除
  1. 1 1
      examples/00-helloworld/helloworld.cpp
  2. 1 1
      examples/02-metaballs/metaballs.cpp
  3. 1 1
      examples/10-font/font.cpp
  4. 1 1
      examples/11-fontsdf/fontsdf.cpp
  5. 1 1
      examples/13-stencil/stencil.cpp
  6. 1 1
      examples/14-shadowvolumes/shadowvolumes.cpp
  7. 1 1
      examples/15-shadowmaps-simple/shadowmaps_simple.cpp
  8. 1 1
      examples/16-shadowmaps/shadowmaps.cpp
  9. 1 1
      examples/17-drawstress/drawstress.cpp
  10. 1 1
      examples/20-nanovg/nanovg.cpp
  11. 1 1
      examples/23-vectordisplay/vectordisplay.h
  12. 1 1
      examples/24-nbody/nbody.cpp
  13. 1 1
      examples/25-c99/helloworld.c
  14. 1 1
      examples/common/bgfx_utils.cpp
  15. 1 1
      examples/common/bgfx_utils.h
  16. 1 1
      examples/common/cube_atlas.cpp
  17. 1 1
      examples/common/cube_atlas.h
  18. 1 1
      examples/common/entry/entry.cpp
  19. 1 1
      examples/common/entry/entry_android.cpp
  20. 1 1
      examples/common/entry/entry_glfw.cpp
  21. 1 1
      examples/common/entry/entry_ios.mm
  22. 2 2
      examples/common/entry/entry_nacl.cpp
  23. 1 1
      examples/common/entry/entry_osx.mm
  24. 1 1
      examples/common/entry/entry_sdl.cpp
  25. 1 1
      examples/common/entry/entry_windows.cpp
  26. 1 1
      examples/common/entry/entry_winrt.cpp
  27. 1 1
      examples/common/entry/entry_x11.cpp
  28. 1 1
      examples/common/font/font_manager.cpp
  29. 1 1
      examples/common/font/font_manager.h
  30. 1 1
      examples/common/font/text_buffer_manager.cpp
  31. 1 1
      examples/common/imgui/imgui.h
  32. 1 1
      examples/common/imgui/ocornut_imgui.cpp
  33. 1 1
      examples/common/nanovg/nanovg_bgfx.cpp
  34. 1 1
      include/bgfx/bgfx.h
  35. 0 0
      include/bgfx/bgfxdefines.h
  36. 0 0
      include/bgfx/bgfxplatform.h
  37. 1 1
      include/bgfx/c99/bgfx.h
  38. 0 0
      include/bgfx/c99/bgfxplatform.h
  39. 2 2
      src/bgfx.cpp
  40. 2 2
      src/bgfx_p.h
  41. 1 1
      src/glcontext_ppapi.cpp
  42. 1 1
      src/vertexdecl.h
  43. 1 1
      tools/geometryc/geometryc.cpp

+ 1 - 1
examples/00-helloworld/helloworld.cpp

@@ -4,7 +4,7 @@
  */
 
 #include "common.h"
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/uint32_t.h>
 #include "logo.h"
 

+ 1 - 1
examples/02-metaballs/metaballs.cpp

@@ -4,7 +4,7 @@
  */
 
 #include "common.h"
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 // embedded shaders
 #include "vs_metaballs.bin.h"

+ 1 - 1
examples/10-font/font.cpp

@@ -5,7 +5,7 @@
 
 #include "common.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/string.h>
 #include <bx/fpumath.h>

+ 1 - 1
examples/11-fontsdf/fontsdf.cpp

@@ -6,7 +6,7 @@
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/fpumath.h>
 

+ 1 - 1
examples/13-stencil/stencil.cpp

@@ -9,7 +9,7 @@
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
 #include <bx/fpumath.h>

+ 1 - 1
examples/14-shadowvolumes/shadowvolumes.cpp

@@ -19,7 +19,7 @@ using namespace std::tr1;
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
 #include <bx/allocator.h>

+ 1 - 1
examples/15-shadowmaps-simple/shadowmaps_simple.cpp

@@ -9,7 +9,7 @@
 
 #include "common.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
 #include <bx/fpumath.h>

+ 1 - 1
examples/16-shadowmaps/shadowmaps.cpp

@@ -10,7 +10,7 @@
 #include "common.h"
 #include "bgfx_utils.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/timer.h>
 #include <bx/readerwriter.h>
 #include <bx/fpumath.h>

+ 1 - 1
examples/17-drawstress/drawstress.cpp

@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/uint32_t.h>
 
 #include "common.h"

+ 1 - 1
examples/20-nanovg/nanovg.cpp

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/string.h>
 #include <bx/timer.h>
 #include "entry/entry.h"

+ 1 - 1
examples/23-vectordisplay/vectordisplay.h

@@ -12,7 +12,7 @@
 #ifndef __VECTORDISPLAY_H__
 #define __VECTORDISPLAY_H__
 
-#include "bgfx.h"
+#include <bgfx/bgfx.h>
 
 #include <tinystl/allocator.h>
 #include <tinystl/vector.h>

+ 1 - 1
examples/24-nbody/nbody.cpp

@@ -7,7 +7,7 @@
 #include "bgfx_utils.h"
 #include "imgui/imgui.h"
 #include "camera.h"
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 struct u_paramsDataStruct
 {

+ 1 - 1
examples/25-c99/helloworld.c

@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bgfx.c99.h>
+#include <bgfx/c99/bgfx.h>
 #include "../00-helloworld/logo.h"
 
 extern bool entry_process_events(uint32_t* _width, uint32_t* _height, uint32_t* _debug, uint32_t* _reset);

+ 1 - 1
examples/common/bgfx_utils.cpp

@@ -12,7 +12,7 @@
 #include <tinystl/string.h>
 namespace stl = tinystl;
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/readerwriter.h>
 #include <bx/fpumath.h>
 #include <bx/string.h>

+ 1 - 1
examples/common/bgfx_utils.h

@@ -6,7 +6,7 @@
 #ifndef BGFX_UTILS_H_HEADER_GUARD
 #define BGFX_UTILS_H_HEADER_GUARD
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 void* load(const char* _filePath, uint32_t* _size = NULL);
 void unload(void* _ptr);

+ 1 - 1
examples/common/cube_atlas.cpp

@@ -4,7 +4,7 @@
 */
 
 #include "common.h"
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 #include <limits.h> // INT_MAX
 #include <memory.h> // memset

+ 1 - 1
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 <bgfx.h>
+#include <bgfx/bgfx.h>
 
 struct AtlasRegion
 {

+ 1 - 1
examples/common/entry/entry.cpp

@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/string.h>
 #include <bx/readerwriter.h>
 

+ 1 - 1
examples/common/entry/entry_android.cpp

@@ -7,7 +7,7 @@
 
 #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_ANDROID
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <stdio.h>
 #include <bx/thread.h>

+ 1 - 1
examples/common/entry/entry_glfw.cpp

@@ -9,7 +9,7 @@
 
 #define GLFW_DLL
 #include <GLFW/glfw3.h>
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 #include "dbg.h"
 
 // This is just trivial implementation of GLFW3 integration.

+ 1 - 1
examples/common/entry/entry_ios.mm

@@ -17,7 +17,7 @@
 //#   define HAS_METAL_SDK
 #endif
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <bx/uint32_t.h>
 #include <bx/thread.h>

+ 2 - 2
examples/common/entry/entry_nacl.cpp

@@ -7,7 +7,7 @@
 
 #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_NACL
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +29,7 @@
 #include <ppapi/c/ppp_instance.h>
 #include <ppapi/gles2/gl2ext_ppapi.h>
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 #include <bx/thread.h>
 
 #include "entry.h"

+ 1 - 1
examples/common/entry/entry_osx.mm

@@ -9,7 +9,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <bx/uint32_t.h>
 #include <bx/thread.h>

+ 1 - 1
examples/common/entry/entry_sdl.cpp

@@ -13,7 +13,7 @@
 
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_syswm.h>
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <stdio.h>
 #include <bx/thread.h>

+ 1 - 1
examples/common/entry/entry_windows.cpp

@@ -7,7 +7,7 @@
 
 #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_WINDOWS
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #include <bx/uint32_t.h>
 #include <bx/thread.h>

+ 1 - 1
examples/common/entry/entry_winrt.cpp

@@ -7,7 +7,7 @@
 
 #if BX_PLATFORM_WINRT
 
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 #include <bx/thread.h>
 
 using namespace Windows::ApplicationModel;

+ 1 - 1
examples/common/entry/entry_x11.cpp

@@ -11,7 +11,7 @@
 #define XK_LATIN1
 #include <X11/keysymdef.h>
 #include <X11/Xlib.h> // will include X11 which #defines None... Don't mess with order of includes.
-#include <bgfxplatform.h>
+#include <bgfx/bgfxplatform.h>
 
 #undef None
 #include <bx/thread.h>

+ 1 - 1
examples/common/font/font_manager.cpp

@@ -25,7 +25,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
 
 #include "../common.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <math.h>
 
 #if USE_EDTAA3

+ 1 - 1
examples/common/font/font_manager.h

@@ -7,7 +7,7 @@
 #define FONT_MANAGER_H_HEADER_GUARD
 
 #include <bx/handlealloc.h>
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 class Atlas;
 

+ 1 - 1
examples/common/font/text_buffer_manager.cpp

@@ -5,7 +5,7 @@
 
 #include "../common.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <stddef.h> // offsetof
 #include <memory.h> // memcpy
 #include <wchar.h>  // wcslen

+ 1 - 1
examples/common/imgui/imgui.h

@@ -26,7 +26,7 @@
 #ifndef IMGUI_H_HEADER_GUARD
 #define IMGUI_H_HEADER_GUARD
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <ocornut-imgui/imgui.h>
 
 #define IMGUI_MBUT_LEFT   0x01

+ 1 - 1
examples/common/imgui/ocornut_imgui.cpp

@@ -3,7 +3,7 @@
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  */
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/allocator.h>
 #include <bx/fpumath.h>
 #include <bx/timer.h>

+ 1 - 1
examples/common/nanovg/nanovg_bgfx.cpp

@@ -28,7 +28,7 @@
 #include <math.h>
 #include "nanovg.h"
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 
 #include <bx/bx.h>
 

+ 1 - 1
include/bgfx.h → include/bgfx/bgfx.h

@@ -10,7 +10,7 @@
 #include <stdint.h> // uint32_t
 #include <stdlib.h> // size_t
 
-#include "bgfxdefines.h"
+#include <bgfx/bgfxdefines.h>
 
 ///
 #define BGFX_HANDLE(_name) \

+ 0 - 0
include/bgfxdefines.h → include/bgfx/bgfxdefines.h


+ 0 - 0
include/bgfxplatform.h → include/bgfx/bgfxplatform.h


+ 1 - 1
include/bgfx.c99.h → include/bgfx/c99/bgfx.h

@@ -13,7 +13,7 @@
 #include <stdint.h>  // uint32_t
 #include <stdlib.h>  // size_t
 
-#include "bgfxdefines.h"
+#include <bgfx/bgfxdefines.h>
 
 typedef enum bgfx_renderer_type
 {

+ 0 - 0
include/bgfxplatform.c99.h → include/bgfx/c99/bgfxplatform.h


+ 2 - 2
src/bgfx.cpp

@@ -3217,8 +3217,8 @@ again:
 	}
 } // namespace bgfx
 
-#include <bgfx.c99.h>
-#include <bgfxplatform.c99.h>
+#include <bgfx/c99/bgfx.h>
+#include <bgfx/c99/bgfxplatform.h>
 
 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) );

+ 2 - 2
src/bgfx_p.h

@@ -19,7 +19,7 @@
 #	define BX_CONFIG_ALLOCATOR_DEBUG 1
 #endif // BGFX_CONFIG_DEBUG
 
-#include "bgfx.h"
+#include <bgfx/bgfx.h>
 #include "config.h"
 
 #include <inttypes.h>
@@ -108,7 +108,7 @@ namespace bgfx
 #include <bx/string.h>
 #include <bx/os.h>
 
-#include "bgfxplatform.h"
+#include <bgfx/bgfxplatform.h>
 #include "image.h"
 
 #define BGFX_CHUNK_MAGIC_CSH BX_MAKEFOURCC('C', 'S', 'H', 0x2)

+ 1 - 1
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 <bgfxplatform.h>
+#	include <bgfx/bgfxplatform.h>
 #	include "renderer_gl.h"
 
 namespace bgfx { namespace gl

+ 1 - 1
src/vertexdecl.h

@@ -6,7 +6,7 @@
 #ifndef BGFX_VERTEXDECL_H_HEADER_GUARD
 #define BGFX_VERTEXDECL_H_HEADER_GUARD
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include <bx/readerwriter.h>
 
 namespace bgfx

+ 1 - 1
tools/geometryc/geometryc.cpp

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <bgfx.h>
+#include <bgfx/bgfx.h>
 #include "../../src/vertexdecl.h"
 
 #include <tinystl/allocator.h>