From f7fe163f2b82ac55790953086abe66cea60d7d17 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Tue, 6 Aug 2013 21:04:28 -0700 Subject: [PATCH 1/4] Cleanup. --- examples/common/entry_linux.cpp | 2 +- examples/common/entry_windows.cpp | 3 +-- examples/common/imgui/imgui.cpp | 42 +++++++++++++++---------------- examples/common/imgui/imgui.h | 20 +++++++-------- src/bgfx.cpp | 2 +- src/bgfx_p.h | 1 - src/glcontext_glx.cpp | 2 +- src/renderer_d3d11.cpp | 26 +++++++++---------- src/renderer_d3d9.cpp | 32 +++++++++++------------ src/renderer_gl.cpp | 2 +- src/renderer_gl.h | 4 +-- src/vertexdecl.cpp | 1 - 12 files changed, 67 insertions(+), 70 deletions(-) diff --git a/examples/common/entry_linux.cpp b/examples/common/entry_linux.cpp index 37422305..41007459 100644 --- a/examples/common/entry_linux.cpp +++ b/examples/common/entry_linux.cpp @@ -33,7 +33,7 @@ namespace entry static void initTranslateKey(uint16_t _xk, Key::Enum _key) { _xk += 256; - BX_CHECK(_xk < countof(s_translateKey), "Out of bounds %d.", _xk); + BX_CHECK(_xk < BX_COUNTOF(s_translateKey), "Out of bounds %d.", _xk); s_translateKey[_xk&0x1ff] = (uint8_t)_key; } diff --git a/examples/common/entry_windows.cpp b/examples/common/entry_windows.cpp index edf7d99d..6230609c 100644 --- a/examples/common/entry_windows.cpp +++ b/examples/common/entry_windows.cpp @@ -9,7 +9,6 @@ #include "entry_p.h" -#include #include #include @@ -47,7 +46,7 @@ namespace entry static uint8_t translateKeyModifiers() { uint8_t modifiers = 0; - for (uint32_t ii = 0; ii < countof(s_translateKeyModifiers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(s_translateKeyModifiers); ++ii) { const TranslateKeyModifiers& tkm = s_translateKeyModifiers[ii]; modifiers |= 0 > GetKeyState(tkm.m_vk) ? tkm.m_modifier : Modifier::None; diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp index 76e7f1b1..1d7a4d21 100644 --- a/examples/common/imgui/imgui.cpp +++ b/examples/common/imgui/imgui.cpp @@ -399,7 +399,7 @@ struct Imgui drawText(_x + AREA_HEADER / 2 , _y + AREA_HEADER / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _name , imguiRGBA(255, 255, 255, 128) ); @@ -554,7 +554,7 @@ struct Imgui { drawText(xx + BUTTON_HEIGHT / 2 , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200) ); @@ -563,7 +563,7 @@ struct Imgui { drawText(xx + BUTTON_HEIGHT / 2 , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , imguiRGBA(128, 128, 128, 200) ); @@ -601,7 +601,7 @@ struct Imgui { drawText(xx + BUTTON_HEIGHT / 2 , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , imguiRGBA(255, 255, 255, 200) ); @@ -610,7 +610,7 @@ struct Imgui { drawText(xx + BUTTON_HEIGHT / 2 , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , imguiRGBA(128, 128, 128, 200) ); @@ -671,7 +671,7 @@ struct Imgui { drawText(xx + BUTTON_HEIGHT , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200) ); @@ -680,7 +680,7 @@ struct Imgui { drawText(xx + BUTTON_HEIGHT , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , imguiRGBA(128, 128, 128, 200) ); @@ -731,7 +731,7 @@ struct Imgui { drawText(xx + BUTTON_HEIGHT , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200) ); @@ -740,7 +740,7 @@ struct Imgui { drawText(xx + BUTTON_HEIGHT , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , imguiRGBA(128, 128, 128, 200) ); @@ -750,7 +750,7 @@ struct Imgui { drawText(xx + width - BUTTON_HEIGHT / 2 , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_RIGHT + , ImguiTextAlign::Right , _subtext , imguiRGBA(255, 255, 255, 128) ); @@ -776,7 +776,7 @@ struct Imgui m_widgetY += BUTTON_HEIGHT; drawText(xx , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , out , imguiRGBA(255, 255, 255, 255) ); @@ -791,7 +791,7 @@ struct Imgui drawText(xx + ww - BUTTON_HEIGHT / 2 , yy + BUTTON_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_RIGHT + , ImguiTextAlign::Right , _text , imguiRGBA(255, 255, 255, 200) ); @@ -889,14 +889,14 @@ struct Imgui { drawText(xx + SLIDER_HEIGHT / 2 , yy + SLIDER_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200) ); drawText(xx + width - SLIDER_HEIGHT / 2 , yy + SLIDER_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_RIGHT + , ImguiTextAlign::Right , msg , isHot(id) ? imguiRGBA(255, 196, 0, 255) : imguiRGBA(255, 255, 255, 200) ); @@ -905,14 +905,14 @@ struct Imgui { drawText(xx + SLIDER_HEIGHT / 2 , yy + SLIDER_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_LEFT + , ImguiTextAlign::Left , _text , imguiRGBA(128, 128, 128, 200) ); drawText(xx + width - SLIDER_HEIGHT / 2 , yy + SLIDER_HEIGHT / 2 + TEXT_HEIGHT / 2 - , IMGUI_ALIGN_RIGHT + , ImguiTextAlign::Right , msg , imguiRGBA(128, 128, 128, 200) ); @@ -1247,12 +1247,12 @@ struct Imgui return len; } - void drawText(int32_t _x, int32_t _y, imguiTextAlign _align, const char* _text, uint32_t _abgr) + void drawText(int32_t _x, int32_t _y, ImguiTextAlign::Enum _align, const char* _text, uint32_t _abgr) { drawText( (float)_x, (float)_y, _text, _align, _abgr); } - void drawText(float _x, float _y, const char* _text, imguiTextAlign _align, uint32_t _abgr) + void drawText(float _x, float _y, const char* _text, ImguiTextAlign::Enum _align, uint32_t _abgr) { if (!_text) { @@ -1260,11 +1260,11 @@ struct Imgui } uint32_t numVertices = 0; - if (_align == IMGUI_ALIGN_CENTER) + if (_align == ImguiTextAlign::Center) { _x -= getTextLength(m_cdata, _text, numVertices) / 2; } - else if (_align == IMGUI_ALIGN_RIGHT) + else if (_align == ImguiTextAlign::Right) { _x -= getTextLength(m_cdata, _text, numVertices); } @@ -1505,7 +1505,7 @@ bool imguiSlider(const char* _text, float* _val, float _vmin, float _vmax, float return s_imgui.slider(_text, _val, _vmin, _vmax, _vinc, _enabled); } -void imguiDrawText(int32_t _x, int32_t _y, imguiTextAlign _align, const char* _text, uint32_t _argb) +void imguiDrawText(int32_t _x, int32_t _y, ImguiTextAlign::Enum _align, const char* _text, uint32_t _argb) { s_imgui.drawText(_x, _y, _align, _text, _argb); } diff --git a/examples/common/imgui/imgui.h b/examples/common/imgui/imgui.h index 2cb49a10..4a5e0db0 100644 --- a/examples/common/imgui/imgui.h +++ b/examples/common/imgui/imgui.h @@ -26,17 +26,17 @@ #ifndef __IMGUI_H__ #define __IMGUI_H__ -enum imguiMouseButton -{ - IMGUI_MBUT_LEFT = 0x01, - IMGUI_MBUT_RIGHT = 0x02, -}; +#define IMGUI_MBUT_LEFT 0x01 +#define IMGUI_MBUT_RIGHT 0x02 -enum imguiTextAlign +struct ImguiTextAlign { - IMGUI_ALIGN_LEFT, - IMGUI_ALIGN_CENTER, - IMGUI_ALIGN_RIGHT, + enum Enum + { + Left, + Center, + Right, + }; }; inline uint32_t imguiRGBA(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a = 255) @@ -71,7 +71,7 @@ void imguiLabel(const char* _format, ...); void imguiValue(const char* _text); bool imguiSlider(const char* _text, float* val, float vmin, float vmax, float vinc, bool _enabled = true); -void imguiDrawText(int _x, int _y, imguiTextAlign _align, const char* _text, uint32_t _argb); +void imguiDrawText(int _x, int _y, ImguiTextAlign::Enum _align, const char* _text, uint32_t _argb); void imguiDrawLine(float _x0, float _y0, float _x1, float _y1, float _r, uint32_t _argb); void imguiDrawRoundedRect(float _x, float _y, float _w, float _h, float _r, uint32_t _argb); void imguiDrawRect(float _x, float _y, float _w, float _h, uint32_t _argb); diff --git a/src/bgfx.cpp b/src/bgfx.cpp index 3d0cc845..8185c61c 100755 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -744,7 +744,7 @@ namespace bgfx memset(m_seq, 0, sizeof(m_seq) ); memset(m_seqMask, 0, sizeof(m_seqMask) ); - for (uint32_t ii = 0; ii < countof(m_rect); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_rect); ++ii) { m_rect[ii].m_width = 1; m_rect[ii].m_height = 1; diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 24572c5e..36dc511a 100755 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -57,7 +57,6 @@ namespace bgfx #include #include #include -#include #include #include #include diff --git a/src/glcontext_glx.cpp b/src/glcontext_glx.cpp index 92a3ab92..4f757c72 100644 --- a/src/glcontext_glx.cpp +++ b/src/glcontext_glx.cpp @@ -82,7 +82,7 @@ namespace bgfx { BX_TRACE("---"); bool valid = true; - for (uint32_t attr = 6; attr < countof(attrsGlx)-1 && attrsGlx[attr] != None; attr += 2) + for (uint32_t attr = 6; attr < BX_COUNTOF(attrsGlx)-1 && attrsGlx[attr] != None; attr += 2) { int value; glXGetFBConfigAttrib(s_display, configs[ii], attrsGlx[attr], &value); diff --git a/src/renderer_d3d11.cpp b/src/renderer_d3d11.cpp index aef66a92..555ed731 100644 --- a/src/renderer_d3d11.cpp +++ b/src/renderer_d3d11.cpp @@ -373,8 +373,8 @@ namespace bgfx { BX_TRACE("Adapter #%d", ii); - char description[countof(desc.Description)]; - wcstombs(description, desc.Description, countof(desc.Description) ); + char description[BX_COUNTOF(desc.Description)]; + wcstombs(description, desc.Description, BX_COUNTOF(desc.Description) ); BX_TRACE("\tDescription: %s", description); BX_TRACE("\tVendorId: 0x%08x, DeviceId: 0x%08x, SubSysId: 0x%08x, Revision: 0x%08x" , desc.VendorId @@ -478,37 +478,37 @@ namespace bgfx invalidateCache(); - for (uint32_t ii = 0; ii < countof(m_indexBuffers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_indexBuffers); ++ii) { m_indexBuffers[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_vertexBuffers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_vertexBuffers); ++ii) { m_vertexBuffers[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_vertexShaders); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_vertexShaders); ++ii) { m_vertexShaders[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_fragmentShaders); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_fragmentShaders); ++ii) { m_fragmentShaders[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_textures); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_textures); ++ii) { m_textures[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_renderTargets); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_renderTargets); ++ii) { m_renderTargets[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_uniforms); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_uniforms); ++ii) { m_uniforms[ii].destroy(); } @@ -590,7 +590,7 @@ namespace bgfx void updateMsaa() { - for (uint32_t ii = 1, last = 0; ii < countof(s_msaa); ++ii) + for (uint32_t ii = 1, last = 0; ii < BX_COUNTOF(s_msaa); ++ii) { uint32_t msaa = s_checkMsaa[ii]; uint32_t quality = 0; @@ -2259,7 +2259,7 @@ namespace bgfx void Context::rendererUpdateViewName(uint8_t _id, const char* _name) { - mbstowcs(&s_viewNameW[_id][0], _name, countof(s_viewNameW[0]) ); + mbstowcs(&s_viewNameW[_id][0], _name, BX_COUNTOF(s_viewNameW[0]) ); } void Context::rendererUpdateUniform(uint16_t _loc, const void* _data, uint32_t _size) @@ -2864,8 +2864,8 @@ namespace bgfx tvm.printf(0, pos++, BGFX_CONFIG_DEBUG ? 0x89 : 0x8f, " " BGFX_RENDERER_NAME " "); const DXGI_ADAPTER_DESC& desc = s_renderCtx.m_adapterDesc; - char description[countof(desc.Description)]; - wcstombs(description, desc.Description, countof(desc.Description) ); + char description[BX_COUNTOF(desc.Description)]; + wcstombs(description, desc.Description, BX_COUNTOF(desc.Description) ); tvm.printf(0, pos++, 0x0f, " Device: %s", description); tvm.printf(0, pos++, 0x0f, " Memory: %" PRIi64 " (video), %" PRIi64 " (system), %" PRIi64 " (shared)" , desc.DedicatedVideoMemory diff --git a/src/renderer_d3d9.cpp b/src/renderer_d3d9.cpp index e688ff21..11ec631e 100644 --- a/src/renderer_d3d9.cpp +++ b/src/renderer_d3d9.cpp @@ -339,7 +339,7 @@ namespace bgfx D3DCREATE_SOFTWARE_VERTEXPROCESSING, }; - for (uint32_t ii = 0; ii < countof(behaviorFlags) && NULL == m_device; ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(behaviorFlags) && NULL == m_device; ++ii) { #if 0 // BGFX_CONFIG_RENDERER_DIRECT3D9EX DX_CHECK(m_d3d9->CreateDeviceEx(m_adapter @@ -473,37 +473,37 @@ namespace bgfx { preReset(); - for (uint32_t ii = 0; ii < countof(m_indexBuffers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_indexBuffers); ++ii) { m_indexBuffers[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_vertexBuffers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_vertexBuffers); ++ii) { m_vertexBuffers[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_vertexShaders); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_vertexShaders); ++ii) { m_vertexShaders[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_fragmentShaders); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_fragmentShaders); ++ii) { m_fragmentShaders[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_textures); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_textures); ++ii) { m_textures[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_vertexDecls); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_vertexDecls); ++ii) { m_vertexDecls[ii].destroy(); } - for (uint32_t ii = 0; ii < countof(m_renderTargets); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_renderTargets); ++ii) { m_renderTargets[ii].destroy(); } @@ -532,7 +532,7 @@ namespace bgfx void updateMsaa() { - for (uint32_t ii = 1, last = 0; ii < countof(s_checkMsaa); ++ii) + for (uint32_t ii = 1, last = 0; ii < BX_COUNTOF(s_checkMsaa); ++ii) { D3DMULTISAMPLE_TYPE msaa = s_checkMsaa[ii]; DWORD quality; @@ -730,17 +730,17 @@ namespace bgfx capturePreReset(); - for (uint32_t ii = 0; ii < countof(m_indexBuffers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_indexBuffers); ++ii) { m_indexBuffers[ii].preReset(); } - for (uint32_t ii = 0; ii < countof(m_vertexBuffers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_vertexBuffers); ++ii) { m_vertexBuffers[ii].preReset(); } - for (uint32_t ii = 0; ii < countof(m_renderTargets); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_renderTargets); ++ii) { m_renderTargets[ii].preReset(); } @@ -753,17 +753,17 @@ namespace bgfx capturePostReset(); - for (uint32_t ii = 0; ii < countof(m_indexBuffers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_indexBuffers); ++ii) { m_indexBuffers[ii].postReset(); } - for (uint32_t ii = 0; ii < countof(m_vertexBuffers); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_vertexBuffers); ++ii) { m_vertexBuffers[ii].postReset(); } - for (uint32_t ii = 0; ii < countof(m_renderTargets); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(m_renderTargets); ++ii) { m_renderTargets[ii].postReset(); } @@ -2196,7 +2196,7 @@ namespace bgfx void Context::rendererUpdateViewName(uint8_t _id, const char* _name) { - mbstowcs(&s_viewNameW[_id][0], _name, countof(s_viewNameW[0]) ); + mbstowcs(&s_viewNameW[_id][0], _name, BX_COUNTOF(s_viewNameW[0]) ); } void Context::rendererUpdateUniform(uint16_t _loc, const void* _data, uint32_t _size) diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 7e044895..f27bdb96 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -1212,7 +1212,7 @@ namespace bgfx m_used[used] = Attrib::Count; used = 0; - for (uint32_t ii = 0; ii < countof(s_instanceDataName); ++ii) + for (uint32_t ii = 0; ii < BX_COUNTOF(s_instanceDataName); ++ii) { GLuint loc = glGetAttribLocation(m_id, s_instanceDataName[ii]); if (GLuint(-1) != loc ) diff --git a/src/renderer_gl.h b/src/renderer_gl.h index e8cdd728..295ee548 100755 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -650,12 +650,12 @@ namespace bgfx { void create() { - glGenQueries(countof(m_queries), m_queries); + glGenQueries(BX_COUNTOF(m_queries), m_queries); } void destroy() { - glDeleteQueries(countof(m_queries), m_queries); + glDeleteQueries(BX_COUNTOF(m_queries), m_queries); } void begin(uint16_t _id, GLenum _target) const diff --git a/src/vertexdecl.cpp b/src/vertexdecl.cpp index 697eb17d..8513629f 100644 --- a/src/vertexdecl.cpp +++ b/src/vertexdecl.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include "vertexdecl.h" From 640c61fe4516a2e4a939da6debf8f07748a812dd Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Tue, 6 Aug 2013 21:09:02 -0700 Subject: [PATCH 2/4] Cleanup. --- examples/06-bump/bump.cpp | 3 +-- examples/09-hdr/hdr.cpp | 1 - examples/10-font/font.cpp | 5 ++--- tools/geometryc/geometryc.cpp | 3 +-- tools/shaderc/shaderc.cpp | 7 +++---- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/examples/06-bump/bump.cpp b/examples/06-bump/bump.cpp index 9128f27c..f694aabc 100644 --- a/examples/06-bump/bump.cpp +++ b/examples/06-bump/bump.cpp @@ -6,7 +6,6 @@ #include "common.h" #include -#include #include #include "entry.h" #include "dbg.h" @@ -305,7 +304,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) const bgfx::Memory* mem; - calcTangents(s_cubeVertices, countof(s_cubeVertices), s_PosNormalTangentTexcoordDecl, s_cubeIndices, countof(s_cubeIndices) ); + calcTangents(s_cubeVertices, BX_COUNTOF(s_cubeVertices), s_PosNormalTangentTexcoordDecl, s_cubeIndices, BX_COUNTOF(s_cubeIndices) ); // Create static vertex buffer. mem = bgfx::makeRef(s_cubeVertices, sizeof(s_cubeVertices) ); diff --git a/examples/09-hdr/hdr.cpp b/examples/09-hdr/hdr.cpp index 7f4a5fab..82c47649 100644 --- a/examples/09-hdr/hdr.cpp +++ b/examples/09-hdr/hdr.cpp @@ -6,7 +6,6 @@ #include "common.h" #include -#include #include #include #include "entry.h" diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp index aff89443..26652c2c 100644 --- a/examples/10-font/font.cpp +++ b/examples/10-font/font.cpp @@ -7,7 +7,6 @@ #include #include -#include #include #include "entry.h" #include "dbg.h" @@ -100,7 +99,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) "font/five_minutes.otf" }; - const uint32_t fontCount = countof(fontNames); + const uint32_t fontCount = BX_COUNTOF(fontNames); TrueTypeHandle fontFiles[fontCount]; FontHandle fonts[fontCount]; @@ -189,7 +188,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) // Use transient text to display debug information. wchar_t fpsText[64]; - bx::swnprintf(fpsText, countof(fpsText), L"Frame: % 7.3f[ms]", double(frameTime) * toMs); + bx::swnprintf(fpsText, BX_COUNTOF(fpsText), L"Frame: % 7.3f[ms]", double(frameTime) * toMs); textBufferManager->clearTextBuffer(transientText); textBufferManager->setPenPosition(transientText, 20.0, 4.0f); diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp index 4e260a27..7777c1b3 100644 --- a/tools/geometryc/geometryc.cpp +++ b/tools/geometryc/geometryc.cpp @@ -51,7 +51,6 @@ namespace std { namespace tr1 {} using namespace tr1; } // namespace std #include #include -#include #include #include #include @@ -429,7 +428,7 @@ int main(int _argc, const char* _argv[]) const char* next = data; do { - next = tokenizeCommandLine(next, commandLine, len, argc, argv, countof(argv), '\n'); + next = tokenizeCommandLine(next, commandLine, len, argc, argv, BX_COUNTOF(argv), '\n'); if (0 < argc) { if (0 == strcmp(argv[0], "#") ) diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index a0c29351..fa1a297f 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -36,7 +36,6 @@ extern "C" #include #include -#include #include #include #include @@ -568,7 +567,7 @@ bool compileHLSLShaderDx9(bx::CommandLine& _cmdLine, const std::string& _code, b uint32_t optimization = 3; if (_cmdLine.hasArg(optimization, 'O') ) { - optimization = bx::uint32_min(optimization, countof(s_optimizationLevelDx9)-1); + optimization = bx::uint32_min(optimization, BX_COUNTOF(s_optimizationLevelDx9)-1); flags |= s_optimizationLevelDx9[optimization]; } else @@ -749,7 +748,7 @@ bool compileHLSLShaderDx11(bx::CommandLine& _cmdLine, const std::string& _code, uint32_t optimization = 3; if (_cmdLine.hasArg(optimization, 'O') ) { - optimization = bx::uint32_min(optimization, countof(s_optimizationLevelDx11)-1); + optimization = bx::uint32_min(optimization, BX_COUNTOF(s_optimizationLevelDx11)-1); flags |= s_optimizationLevelDx11[optimization]; } else @@ -1051,7 +1050,7 @@ struct Preprocessor void setDefaultDefine(const char* _name) { char temp[1024]; - bx::snprintf(temp, countof(temp) + bx::snprintf(temp, BX_COUNTOF(temp) , "#ifndef %s\n" "# define %s 0\n" "#endif // %s\n" From 4c4c2eb5cb96a1c4810f13ce128f87634e079000 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Wed, 7 Aug 2013 21:45:56 -0700 Subject: [PATCH 3/4] examples-common: Reogranized sources. Added command interpreter and input bindings support. --- README.md | 1 + examples/00-helloworld/helloworld.cpp | 6 +- examples/01-cubes/cubes.cpp | 6 +- examples/02-metaballs/metaballs.cpp | 6 +- examples/03-raymarch/raymarch.cpp | 6 +- examples/04-mesh/mesh.cpp | 6 +- examples/05-instancing/instancing.cpp | 5 +- examples/06-bump/bump.cpp | 7 +- examples/07-callback/callback.cpp | 1 - examples/08-update/update.cpp | 5 +- examples/09-hdr/hdr.cpp | 7 +- examples/10-font/font.cpp | 5 +- examples/11-fontsdf/fontsdf.cpp | 8 +- examples/12-lod/lod.cpp | 7 +- examples/common/common.h | 34 +-- examples/common/entry/cmd.cpp | 228 ++++++++++++++++ examples/common/entry/cmd.h | 15 ++ examples/common/{ => entry}/dbg.cpp | 2 - examples/common/{ => entry}/dbg.h | 0 examples/common/entry/entry.cpp | 190 +++++++++++++ examples/common/{ => entry}/entry.h | 54 ++-- examples/common/{ => entry}/entry_android.cpp | 8 +- examples/common/{ => entry}/entry_ios.mm | 0 examples/common/{ => entry}/entry_linux.cpp | 6 +- examples/common/{ => entry}/entry_nacl.cpp | 6 +- examples/common/{ => entry}/entry_osx.mm | 0 examples/common/{ => entry}/entry_p.h | 45 +++- examples/common/{ => entry}/entry_qnx.cpp | 6 +- examples/common/{ => entry}/entry_windows.cpp | 6 +- examples/common/entry/input.cpp | 251 ++++++++++++++++++ examples/common/entry/input.h | 55 ++++ examples/common/processevents.h | 130 --------- tools/geometryc/geometryc.cpp | 1 - tools/shaderc/shaderc.cpp | 2 - 34 files changed, 835 insertions(+), 280 deletions(-) create mode 100644 examples/common/entry/cmd.cpp create mode 100644 examples/common/entry/cmd.h rename examples/common/{ => entry}/dbg.cpp (98%) mode change 100755 => 100644 rename examples/common/{ => entry}/dbg.h (100%) create mode 100644 examples/common/entry/entry.cpp rename examples/common/{ => entry}/entry.h (69%) rename examples/common/{ => entry}/entry_android.cpp (97%) rename examples/common/{ => entry}/entry_ios.mm (100%) rename examples/common/{ => entry}/entry_linux.cpp (98%) rename examples/common/{ => entry}/entry_nacl.cpp (97%) rename examples/common/{ => entry}/entry_osx.mm (100%) mode change 100755 => 100644 rename examples/common/{ => entry}/entry_p.h (72%) rename examples/common/{ => entry}/entry_qnx.cpp (85%) rename examples/common/{ => entry}/entry_windows.cpp (99%) create mode 100644 examples/common/entry/input.cpp create mode 100644 examples/common/entry/input.h delete mode 100644 examples/common/processevents.h diff --git a/README.md b/README.md index 2e3055a9..16e94717 100644 --- a/README.md +++ b/README.md @@ -266,6 +266,7 @@ Todo - Occlusion queries. - DX11: MSAA. - Fullscreen mode. + - GLES: Support for ETC1 and PVR compressed textures. Contact ------- diff --git a/examples/00-helloworld/helloworld.cpp b/examples/00-helloworld/helloworld.cpp index f0661436..a61b3e05 100644 --- a/examples/00-helloworld/helloworld.cpp +++ b/examples/00-helloworld/helloworld.cpp @@ -6,9 +6,7 @@ #include "common.h" #include -#include "entry.h" -#include "dbg.h" -#include "processevents.h" +#include "entry/entry.h" int _main_(int /*_argc*/, char** /*_argv*/) { @@ -31,7 +29,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) , 0 ); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/01-cubes/cubes.cpp b/examples/01-cubes/cubes.cpp index 84569dc6..00e6a9b7 100644 --- a/examples/01-cubes/cubes.cpp +++ b/examples/01-cubes/cubes.cpp @@ -7,10 +7,8 @@ #include #include -#include "entry.h" -#include "dbg.h" +#include "entry/entry.h" #include "fpumath.h" -#include "processevents.h" #include #include @@ -186,7 +184,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) int64_t timeOffset = bx::getHPCounter(); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/02-metaballs/metaballs.cpp b/examples/02-metaballs/metaballs.cpp index f4904aec..24f57184 100644 --- a/examples/02-metaballs/metaballs.cpp +++ b/examples/02-metaballs/metaballs.cpp @@ -7,10 +7,8 @@ #include #include -#include "entry.h" -#include "dbg.h" +#include "entry/entry.h" #include "fpumath.h" -#include "processevents.h" #include #include @@ -528,7 +526,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) int64_t timeOffset = bx::getHPCounter(); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/03-raymarch/raymarch.cpp b/examples/03-raymarch/raymarch.cpp index 39cef697..44677faa 100644 --- a/examples/03-raymarch/raymarch.cpp +++ b/examples/03-raymarch/raymarch.cpp @@ -7,10 +7,8 @@ #include #include -#include "entry.h" -#include "dbg.h" +#include "entry/entry.h" #include "fpumath.h" -#include "processevents.h" #include #include @@ -235,7 +233,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) int64_t timeOffset = bx::getHPCounter(); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/04-mesh/mesh.cpp b/examples/04-mesh/mesh.cpp index 0503ef1d..6f2b9d39 100644 --- a/examples/04-mesh/mesh.cpp +++ b/examples/04-mesh/mesh.cpp @@ -8,10 +8,8 @@ #include #include #include -#include "entry.h" -#include "dbg.h" +#include "entry/entry.h" #include "fpumath.h" -#include "processevents.h" #include #include @@ -334,7 +332,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) int64_t timeOffset = bx::getHPCounter(); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/05-instancing/instancing.cpp b/examples/05-instancing/instancing.cpp index 2fec00e8..ab69c517 100644 --- a/examples/05-instancing/instancing.cpp +++ b/examples/05-instancing/instancing.cpp @@ -7,10 +7,7 @@ #include #include -#include "entry.h" -#include "dbg.h" #include "fpumath.h" -#include "processevents.h" #include #include @@ -175,7 +172,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) int64_t timeOffset = bx::getHPCounter(); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/06-bump/bump.cpp b/examples/06-bump/bump.cpp index f694aabc..5af2241f 100644 --- a/examples/06-bump/bump.cpp +++ b/examples/06-bump/bump.cpp @@ -7,10 +7,7 @@ #include #include -#include "entry.h" -#include "dbg.h" #include "fpumath.h" -#include "processevents.h" #include #include @@ -335,7 +332,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) // We can destroy vertex and fragment shader here since // their reference is kept inside bgfx after calling createProgram. - // Vertex and fragment shader will be destroyed once program is^ + // Vertex and fragment shader will be destroyed once program is // destroyed. bgfx::destroyVertexShader(vsh); bgfx::destroyFragmentShader(fsh); @@ -350,7 +347,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) int64_t timeOffset = bx::getHPCounter(); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/07-callback/callback.cpp b/examples/07-callback/callback.cpp index 63db3978..349f9c10 100644 --- a/examples/07-callback/callback.cpp +++ b/examples/07-callback/callback.cpp @@ -9,7 +9,6 @@ #include #include #include -#include "dbg.h" #include "fpumath.h" #include "aviwriter.h" diff --git a/examples/08-update/update.cpp b/examples/08-update/update.cpp index 23d099c7..f17c8123 100644 --- a/examples/08-update/update.cpp +++ b/examples/08-update/update.cpp @@ -8,10 +8,7 @@ #include #include #include -#include "entry.h" -#include "dbg.h" #include "fpumath.h" -#include "processevents.h" #include "packrect.h" #include @@ -231,7 +228,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) int64_t timeOffset = bx::getHPCounter(); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/09-hdr/hdr.cpp b/examples/09-hdr/hdr.cpp index 82c47649..1bb7e16a 100644 --- a/examples/09-hdr/hdr.cpp +++ b/examples/09-hdr/hdr.cpp @@ -8,10 +8,7 @@ #include #include #include -#include "entry.h" -#include "dbg.h" #include "fpumath.h" -#include "processevents.h" #include "imgui/imgui.h" #include @@ -514,11 +511,11 @@ int _main_(int /*_argc*/, char** /*_argv*/) uint32_t oldWidth = 0; uint32_t oldHeight = 0; - MouseState mouseState; + entry::MouseState mouseState; float time = 0.0f; - while (!processEvents(width, height, debug, reset, &mouseState) ) + while (!entry::processEvents(width, height, debug, reset, &mouseState) ) { if (oldWidth != width || oldHeight != height) diff --git a/examples/10-font/font.cpp b/examples/10-font/font.cpp index 26652c2c..3b91fd54 100644 --- a/examples/10-font/font.cpp +++ b/examples/10-font/font.cpp @@ -8,10 +8,7 @@ #include #include #include -#include "entry.h" -#include "dbg.h" #include "fpumath.h" -#include "processevents.h" #include "font/font_manager.h" #include "font/text_buffer_manager.h" @@ -170,7 +167,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) // Create a transient buffer for real-time data. TextBufferHandle transientText = textBufferManager->createTextBuffer(FONT_TYPE_ALPHA, BufferType::Transient); - while (!processEvents(width, height, debug, reset) ) + while (!entry::processEvents(width, height, debug, reset) ) { // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, width, height); diff --git a/examples/11-fontsdf/fontsdf.cpp b/examples/11-fontsdf/fontsdf.cpp index c7ae137e..4187ac5a 100644 --- a/examples/11-fontsdf/fontsdf.cpp +++ b/examples/11-fontsdf/fontsdf.cpp @@ -4,12 +4,10 @@ */ #include "common.h" + #include #include -#include "entry.h" -#include "dbg.h" #include "fpumath.h" -#include "processevents.h" #include "font/font_manager.h" #include "font/text_metrics.h" @@ -172,7 +170,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) textBufferManager->appendText(scrollableBuffer, fontScaled, textBegin, textEnd); - MouseState mouseState; + entry::MouseState mouseState; int32_t scrollArea = 0; const int32_t guiPanelWidth = 250; const int32_t guiPanelHeight = 200; @@ -181,7 +179,7 @@ int _main_(int /*_argc*/, char** /*_argv*/) float textScale = 1.0f; float textSize = 14.0f; - while (!processEvents(width, height, debug, reset, &mouseState) ) + while (!entry::processEvents(width, height, debug, reset, &mouseState) ) { imguiBeginFrame(mouseState.m_mx , mouseState.m_my diff --git a/examples/12-lod/lod.cpp b/examples/12-lod/lod.cpp index f8763f50..aa19577d 100644 --- a/examples/12-lod/lod.cpp +++ b/examples/12-lod/lod.cpp @@ -8,10 +8,7 @@ #include #include #include -#include "entry.h" -#include "dbg.h" #include "fpumath.h" -#include "processevents.h" #include "imgui/imgui.h" #include @@ -405,8 +402,8 @@ int _main_(int /*_argc*/, char** /*_argv*/) float at[3] = { 0.0f, 1.0f, 0.0f }; float eye[3] = { 0.0f, 1.0f, -2.0f }; - MouseState mouseState; - while (!processEvents(width, height, debug, reset, &mouseState) ) + entry::MouseState mouseState; + while (!entry::processEvents(width, height, debug, reset, &mouseState) ) { imguiBeginFrame(mouseState.m_mx , mouseState.m_my diff --git a/examples/common/common.h b/examples/common/common.h index 3a5f819e..68cd3c21 100644 --- a/examples/common/common.h +++ b/examples/common/common.h @@ -3,36 +3,4 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#ifndef __COMMON_H__ -#define __COMMON_H__ - -#include "dbg.h" - -#if 0 -# define BX_TRACE(_format, ...) \ - do { \ - DBG(BX_FILE_LINE_LITERAL "BGFX " _format "\n", ##__VA_ARGS__); \ - } while(0) - -# define BX_WARN(_condition, _format, ...) \ - do { \ - if (!(_condition) ) \ - { \ - DBG("WARN " _format, ##__VA_ARGS__); \ - } \ - } while(0) - -# define BX_CHECK(_condition, _format, ...) \ - do { \ - if (!(_condition) ) \ - { \ - DBG("CHECK " _format, ##__VA_ARGS__); \ - bx::debugBreak(); \ - } \ - } while(0) -#endif // 0 - -#include -#include - -#endif // __COMMON_H__ +#include "entry/entry.h" diff --git a/examples/common/entry/cmd.cpp b/examples/common/entry/cmd.cpp new file mode 100644 index 00000000..ef63f9c0 --- /dev/null +++ b/examples/common/entry/cmd.cpp @@ -0,0 +1,228 @@ +/* + * Copyright 2010-2013 Branimir Karadzic. All rights reserved. + * License: http://www.opensource.org/licenses/BSD-2-Clause + */ + +#include +#include // size_t +// #include +#include // isspace +#include + +#include "dbg.h" +#include "cmd.h" +#include +#include + +// Reference: +// http://msdn.microsoft.com/en-us/library/a1y7w461.aspx +static const char* tokenizeCommandLine(const char* _commandLine, char* _buffer, uint32_t& _bufferSize, int& _argc, char* _argv[], int _maxArgvs, char _term) +{ + int argc = 0; + const char* curr = _commandLine; + char* currOut = _buffer; + char term = ' '; + bool sub = false; + + enum ParserState + { + SkipWhitespace, + SetTerm, + Copy, + Escape, + End, + }; + + ParserState state = SkipWhitespace; + + while ('\0' != *curr + && _term != *curr + && argc < _maxArgvs) + { + switch (state) + { + case SkipWhitespace: + for (; isspace(*curr); ++curr); // skip whitespace + state = SetTerm; + break; + + case SetTerm: + if ('"' == *curr) + { + term = '"'; + ++curr; // skip begining quote + } + else + { + term = ' '; + } + + _argv[argc] = currOut; + ++argc; + + state = Copy; + break; + + case Copy: + if ('\\' == *curr) + { + state = Escape; + } + else if ('"' == *curr + && '"' != term) + { + sub = !sub; + } + else if (isspace(*curr) && !sub) + { + state = End; + } + else if (term != *curr || sub) + { + *currOut = *curr; + ++currOut; + } + else + { + state = End; + } + ++curr; + break; + + case Escape: + { + const char* start = --curr; + for (; '\\' == *curr; ++curr); + + if ('"' != *curr) + { + int count = (int)(curr-start); + + curr = start; + for (int ii = 0; ii < count; ++ii) + { + *currOut = *curr; + ++currOut; + ++curr; + } + } + else + { + curr = start+1; + *currOut = *curr; + ++currOut; + ++curr; + } + } + state = Copy; + break; + + case End: + *currOut = '\0'; + ++currOut; + state = SkipWhitespace; + break; + } + } + + *currOut = '\0'; + if (0 < argc + && '\0' == _argv[argc-1][0]) + { + --argc; + } + + _bufferSize = (uint32_t)(currOut - _buffer); + _argc = argc; + + if ('\0' != *curr) + { + ++curr; + } + + return curr; +} + +struct CmdContext +{ + CmdContext() + { + } + + ~CmdContext() + { + } + + void add(const char* _name, ConsoleFn _fn, void* _userData) + { + uint32_t cmd = bx::hashMurmur2A(_name, (uint32_t)strlen(_name) ); + BX_CHECK(m_lookup.end() == m_lookup.find(cmd), "Command \"%s\" already exist.", _name); + Func fn = { _fn, _userData }; + m_lookup.insert(std::make_pair(cmd, fn) ); + } + + void exec(const char* _cmd) + { + for (const char* next = _cmd; '\0' != *next; _cmd = next) + { + char commandLine[1024]; + uint32_t size = sizeof(commandLine); + int argc; + char* argv[64]; + next = tokenizeCommandLine(_cmd, commandLine, size, argc, argv, BX_COUNTOF(argv), '\n'); + if (argc > 0) + { + int err = -1; + uint32_t cmd = bx::hashMurmur2A(argv[0], (uint32_t)strlen(argv[0]) ); + CmdLookup::iterator it = m_lookup.find(cmd); + if (it != m_lookup.end() ) + { + Func& fn = it->second; + err = fn.m_fn(this, fn.m_userData, argc, argv); + } + + switch (err) + { + case 0: + break; + + case -1: + { + std::string tmp(_cmd, next-_cmd - (*next == '\0' ? 0 : 1) ); + DBG("Command '%s' doesn't exist.", tmp.c_str() ); + } + break; + + default: + { + std::string tmp(_cmd, next-_cmd - (*next == '\0' ? 0 : 1) ); + DBG("Failed '%s' err: %d.", tmp.c_str(), err); + } + break; + } + } + } + } + + struct Func + { + ConsoleFn m_fn; + void* m_userData; + }; + + + typedef std::unordered_map CmdLookup; + CmdLookup m_lookup; +}; + +static CmdContext s_cmdContext; + +void cmdAdd(const char* _name, ConsoleFn _fn, void* _userData) +{ + s_cmdContext.add(_name, _fn, _userData); +} + +void cmdExec(const char* _cmd) +{ + s_cmdContext.exec(_cmd); +} diff --git a/examples/common/entry/cmd.h b/examples/common/entry/cmd.h new file mode 100644 index 00000000..a2961021 --- /dev/null +++ b/examples/common/entry/cmd.h @@ -0,0 +1,15 @@ +/* + * Copyright 2010-2013 Branimir Karadzic. All rights reserved. + * License: http://www.opensource.org/licenses/BSD-2-Clause + */ + +#ifndef __CMD_H__ +#define __CMD_H__ + +struct CmdContext; +typedef int (*ConsoleFn)(CmdContext* _context, void* _userData, int _argc, char const* const* _argv); + +void cmdAdd(const char* _name, ConsoleFn _fn, void* _userData = NULL); +void cmdExec(const char* _cmd); + +#endif // __CMD_H__ diff --git a/examples/common/dbg.cpp b/examples/common/entry/dbg.cpp old mode 100755 new mode 100644 similarity index 98% rename from examples/common/dbg.cpp rename to examples/common/entry/dbg.cpp index f3e017e4..9c210aa6 --- a/examples/common/dbg.cpp +++ b/examples/common/entry/dbg.cpp @@ -3,8 +3,6 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include "common.h" - #include #include #include diff --git a/examples/common/dbg.h b/examples/common/entry/dbg.h similarity index 100% rename from examples/common/dbg.h rename to examples/common/entry/dbg.h diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp new file mode 100644 index 00000000..2908f5fa --- /dev/null +++ b/examples/common/entry/entry.cpp @@ -0,0 +1,190 @@ +/* + * Copyright 2011-2013 Branimir Karadzic. All rights reserved. + * License: http://www.opensource.org/licenses/BSD-2-Clause + */ + +#include +#include + +#include "entry_p.h" +#include "cmd.h" +#include "input.h" + +extern int _main_(int _argc, char** _argv); + +namespace entry +{ + static uint32_t s_debug = BGFX_DEBUG_NONE; + static uint32_t s_reset = BGFX_RESET_NONE; + static bool s_exit = false; + + bool setOrToggle(uint32_t& _flags, const char* _name, uint32_t _bit, int _first, int _argc, char const* const* _argv) + { + if (0 == strcmp(_argv[_first], _name) ) + { + int arg = _first+1; + if (_argc > arg) + { + _flags &= ~_bit; + _flags |= bx::toBool(_argv[arg]) ? _bit : 0; + } + else + { + _flags ^= _bit; + } + + return true; + } + + return false; + } + + void cmd(const void* _userData) + { + cmdExec( (const char*)_userData); + } + + int cmdMouseLock(CmdContext* /*_context*/, void* /*_userData*/, int _argc, char const* const* _argv) + { + if (_argc > 1) + { + inputSetMouseLock(_argc > 1 ? bx::toBool(_argv[1]) : !inputIsMouseLocked() ); + return 0; + } + + return 1; + } + + int cmdGraphics(CmdContext* /*_context*/, void* /*_userData*/, int _argc, char const* const* _argv) + { + if (_argc > 1) + { + if (setOrToggle(s_reset, "vsync", BGFX_RESET_VSYNC, 1, _argc, _argv) + || setOrToggle(s_reset, "msaa", BGFX_RESET_MSAA_X16, 1, _argc, _argv) ) + { + return 0; + } + else if (setOrToggle(s_debug, "stats", BGFX_DEBUG_STATS, 1, _argc, _argv) + || setOrToggle(s_debug, "ifh", BGFX_DEBUG_IFH, 1, _argc, _argv) + || setOrToggle(s_debug, "text", BGFX_DEBUG_TEXT, 1, _argc, _argv) ) + { + bgfx::setDebug(s_debug); + return 0; + } + } + + return 1; + } + + int cmdExit(CmdContext* /*_context*/, void* /*_userData*/, int /*_argc*/, char const* const* /*_argv*/) + { + s_exit = true; + return 0; + } + + static const InputBinding s_bindings[] = + { + { entry::Key::KeyQ, entry::Modifier::LeftCtrl, 1, cmd, "exit" }, + { entry::Key::F1, entry::Modifier::None, 1, cmd, "graphics stats" }, + { entry::Key::F7, entry::Modifier::None, 1, cmd, "graphics vsync" }, + { entry::Key::F8, entry::Modifier::None, 1, cmd, "graphics msaa" }, + + INPUT_BINDING_END + }; + + int main(int _argc, char** _argv) + { + cmdAdd("mouselock", cmdMouseLock); + cmdAdd("graphics", cmdGraphics ); + cmdAdd("exit", cmdExit ); + + inputAddBindings("bindings", s_bindings); + + int32_t result = ::_main_(_argc, _argv); + return result; + } + + bool processEvents(uint32_t& _width, uint32_t& _height, uint32_t& _debug, uint32_t& _reset, MouseState* _mouse) + { + s_debug = _debug; + + bool mouseLock = inputIsMouseLocked(); + + const Event* ev; + do + { + struct SE { const Event* m_ev; SE() : m_ev(poll() ) {} ~SE() { if (NULL != m_ev) { release(m_ev); } } } scopeEvent; + ev = scopeEvent.m_ev; + + if (NULL != ev) + { + switch (ev->m_type) + { + case Event::Exit: + return true; + + case Event::Mouse: + { + const MouseEvent* mouse = static_cast(ev); + + if (mouse->m_move) + { + inputSetMousePos(mouse->m_mx, mouse->m_my); + } + else + { + inputSetMouseButtonState(mouse->m_button, mouse->m_down); + } + + if (NULL != _mouse + && !mouseLock) + { + if (mouse->m_move) + { + _mouse->m_mx = mouse->m_mx; + _mouse->m_my = mouse->m_my; + } + else + { + _mouse->m_buttons[mouse->m_button] = mouse->m_down; + } + } + } + break; + + case Event::Key: + { + const KeyEvent* key = static_cast(ev); + inputSetKeyState(key->m_key, key->m_modifiers, key->m_down); + } + break; + + case Event::Size: + { + const SizeEvent* size = static_cast(ev); + _width = size->m_width; + _height = size->m_height; + _reset = !s_reset; // force reset + } + break; + + default: + break; + } + } + } while (NULL != ev); + + if (_reset != s_reset) + { + _reset = s_reset; + bgfx::reset(_width, _height, _reset); + inputSetMouseResolution(_width, _height); + } + + inputProcess(); + _debug = s_debug; + + return s_exit; + } + +} // namespace entry diff --git a/examples/common/entry.h b/examples/common/entry/entry.h similarity index 69% rename from examples/common/entry.h rename to examples/common/entry/entry.h index 86f3c62d..49ba1193 100644 --- a/examples/common/entry.h +++ b/examples/common/entry/entry.h @@ -6,6 +6,11 @@ #ifndef __ENTRY_H__ #define __ENTRY_H__ +#include "dbg.h" + +#include +#include + namespace entry { struct MouseButton @@ -119,47 +124,24 @@ namespace entry }; }; - struct Event + struct MouseState { - enum Enum + MouseState() + : m_mx(0) + , m_my(0) { - Exit, - Key, - Mouse, - Size, - }; + for (uint32_t ii = 0; ii < entry::MouseButton::Count; ++ii) + { + m_buttons[ii] = entry::MouseButton::None; + } + } - Event::Enum m_type; + uint32_t m_mx; + uint32_t m_my; + uint8_t m_buttons[entry::MouseButton::Count]; }; - struct KeyEvent : public Event - { - Key::Enum m_key; - uint8_t m_modifiers; - bool m_down; - }; - - struct MouseEvent : public Event - { - int32_t m_mx; - int32_t m_my; - MouseButton::Enum m_button; - bool m_down; - bool m_move; - }; - - struct SizeEvent : public Event - { - uint32_t m_width; - uint32_t m_height; - }; - - const Event* poll(); - void release(const Event* _event); - - void setWindowSize(uint32_t _width, uint32_t _height); - void toggleWindowFrame(); - void setMouseLock(bool _lock); + bool processEvents(uint32_t& _width, uint32_t& _height, uint32_t& _debug, uint32_t& _reset, MouseState* _mouse = NULL); } // namespace entry diff --git a/examples/common/entry_android.cpp b/examples/common/entry/entry_android.cpp similarity index 97% rename from examples/common/entry_android.cpp rename to examples/common/entry/entry_android.cpp index 13743183..38f89ed9 100644 --- a/examples/common/entry_android.cpp +++ b/examples/common/entry/entry_android.cpp @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include "common.h" +#include "entry.h" #if BX_PLATFORM_ANDROID @@ -23,8 +23,6 @@ extern "C" #include } // extern "C" -extern int _main_(int _argc, char** _argv); - namespace entry { struct MainThreadEntry @@ -218,15 +216,13 @@ namespace entry int32_t MainThreadEntry::threadFunc(void* _userData) { MainThreadEntry* self = (MainThreadEntry*)_userData; - int32_t result = _main_(self->m_argc, self->m_argv); + int32_t result = main(self->m_argc, self->m_argv); // PostMessage(s_ctx.m_hwnd, WM_QUIT, 0, 0); return result; } } // namespace entry -extern int _main_(int _argc, char** _argv); - extern "C" void android_main(android_app* _app) { using namespace entry; diff --git a/examples/common/entry_ios.mm b/examples/common/entry/entry_ios.mm similarity index 100% rename from examples/common/entry_ios.mm rename to examples/common/entry/entry_ios.mm diff --git a/examples/common/entry_linux.cpp b/examples/common/entry/entry_linux.cpp similarity index 98% rename from examples/common/entry_linux.cpp rename to examples/common/entry/entry_linux.cpp index 41007459..8e3f1f4d 100644 --- a/examples/common/entry_linux.cpp +++ b/examples/common/entry/entry_linux.cpp @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include "common.h" +#include "entry.h" #if BX_PLATFORM_LINUX @@ -24,8 +24,6 @@ #define DEFAULT_WIDTH 1280 #define DEFAULT_HEIGHT 720 -extern int _main_(int _argc, char** _argv); - namespace entry { static uint8_t s_translateKey[512]; @@ -295,7 +293,7 @@ namespace entry int32_t MainThreadEntry::threadFunc(void* _userData) { MainThreadEntry* self = (MainThreadEntry*)_userData; - int32_t result = _main_(self->m_argc, self->m_argv); + int32_t result = main(self->m_argc, self->m_argv); s_ctx.m_exit = true; return result; } diff --git a/examples/common/entry_nacl.cpp b/examples/common/entry/entry_nacl.cpp similarity index 97% rename from examples/common/entry_nacl.cpp rename to examples/common/entry/entry_nacl.cpp index 99429548..fb37ca92 100644 --- a/examples/common/entry_nacl.cpp +++ b/examples/common/entry/entry_nacl.cpp @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include "common.h" +#include "entry.h" #if BX_PLATFORM_NACL @@ -32,8 +32,6 @@ #include "entry.h" -extern int _main_(int _argc, char** _argv); - namespace entry { const PPB_Core* g_coreInterface; @@ -112,7 +110,7 @@ namespace entry PP_Resource resource = g_messageLoopInterface->Create(g_instance); g_messageLoopInterface->AttachToCurrentThread(resource); - int32_t result = _main_(self->m_argc, self->m_argv); + int32_t result = main(self->m_argc, self->m_argv); return result; } diff --git a/examples/common/entry_osx.mm b/examples/common/entry/entry_osx.mm old mode 100755 new mode 100644 similarity index 100% rename from examples/common/entry_osx.mm rename to examples/common/entry/entry_osx.mm diff --git a/examples/common/entry_p.h b/examples/common/entry/entry_p.h similarity index 72% rename from examples/common/entry_p.h rename to examples/common/entry/entry_p.h index 29a6b500..a9a3c75e 100644 --- a/examples/common/entry_p.h +++ b/examples/common/entry/entry_p.h @@ -9,11 +9,54 @@ #include #include -#include "dbg.h" #include "entry.h" namespace entry { + int main(int _argc, char** _argv); + + struct Event + { + enum Enum + { + Exit, + Key, + Mouse, + Size, + }; + + Event::Enum m_type; + }; + + struct KeyEvent : public Event + { + Key::Enum m_key; + uint8_t m_modifiers; + bool m_down; + }; + + struct MouseEvent : public Event + { + int32_t m_mx; + int32_t m_my; + MouseButton::Enum m_button; + bool m_down; + bool m_move; + }; + + struct SizeEvent : public Event + { + uint32_t m_width; + uint32_t m_height; + }; + + const Event* poll(); + void release(const Event* _event); + + void setWindowSize(uint32_t _width, uint32_t _height); + void toggleWindowFrame(); + void setMouseLock(bool _lock); + class EventQueue { public: diff --git a/examples/common/entry_qnx.cpp b/examples/common/entry/entry_qnx.cpp similarity index 85% rename from examples/common/entry_qnx.cpp rename to examples/common/entry/entry_qnx.cpp index 442dff38..c255ee61 100644 --- a/examples/common/entry_qnx.cpp +++ b/examples/common/entry/entry_qnx.cpp @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include "common.h" +#include "entry.h" #if BX_PLATFORM_QNX @@ -35,11 +35,9 @@ namespace entry } // namespace entry -extern int _main_(int _argc, char** _argv); - int main(int _argc, char** _argv) { - _main_(_argc, _argv); + entry::main(_argc, _argv); } #endif // BX_PLATFORM_QNX diff --git a/examples/common/entry_windows.cpp b/examples/common/entry/entry_windows.cpp similarity index 99% rename from examples/common/entry_windows.cpp rename to examples/common/entry/entry_windows.cpp index 6230609c..a698ed78 100644 --- a/examples/common/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -3,7 +3,7 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ -#include "common.h" +#include "entry.h" #if BX_PLATFORM_WINDOWS @@ -21,8 +21,6 @@ #define WM_USER_TOGGLE_WINDOW_FRAME (WM_USER+1) #define WM_USER_MOUSE_LOCK (WM_USER+2) -extern int _main_(int _argc, char** _argv); - namespace entry { struct TranslateKeyModifiers @@ -625,7 +623,7 @@ namespace entry int32_t MainThreadEntry::threadFunc(void* _userData) { MainThreadEntry* self = (MainThreadEntry*)_userData; - int32_t result = _main_(self->m_argc, self->m_argv); + int32_t result = main(self->m_argc, self->m_argv); PostMessage(s_ctx.m_hwnd, WM_QUIT, 0, 0); return result; } diff --git a/examples/common/entry/input.cpp b/examples/common/entry/input.cpp new file mode 100644 index 00000000..74d6d690 --- /dev/null +++ b/examples/common/entry/input.cpp @@ -0,0 +1,251 @@ +/* + * Copyright 2010-2013 Branimir Karadzic. All rights reserved. + * License: http://www.opensource.org/licenses/BSD-2-Clause + */ + +#include "entry_p.h" +#include "input.h" + +#include +#include +#include + +struct Mouse +{ + Mouse() + : m_width(1280) + , m_height(720) + , m_lock(false) + { + } + + void reset() + { + if (m_lock) + { + m_norm[0] = 0.0f; + m_norm[1] = 0.0f; + } + + memset(m_buttons, 0, sizeof(m_buttons) ); + } + + void setResolution(uint16_t _width, uint16_t _height) + { + m_width = _width; + m_height = _height; + } + + void setPos(int32_t _mx, int32_t _my) + { + m_absolute[0] = _mx; + m_absolute[1] = _my; + m_norm[0] = float(_mx)/float(m_width); + m_norm[1] = float(_my)/float(m_height); + } + + void setButtonState(entry::MouseButton::Enum _button, uint8_t _state) + { + m_buttons[_button] = _state; + } + + void read(bool _mouseLock) + { + if (_mouseLock != m_lock) + { + m_lock = _mouseLock; + + if (_mouseLock) + { + m_norm[0] = 0.0f; + m_norm[1] = 0.0f; + } + } + } + + int32_t m_absolute[2]; + float m_norm[2]; + int32_t m_wheel; + uint8_t m_buttons[entry::MouseButton::Count]; + uint16_t m_width; + uint16_t m_height; + bool m_lock; +}; + +struct Keyboard +{ + Keyboard() + { + } + + void reset() + { + memset(m_key, 0, sizeof(m_key) ); + memset(m_once, 0xff, sizeof(m_once) ); + } + + static uint32_t encodeKeyState(uint8_t _modifiers, bool _down) + { + uint32_t state = 0; + state |= uint32_t(_modifiers)<<16; + state |= uint32_t(_down)<<8; + return state; + } + + static void decodeKeyState(uint32_t _state, uint8_t& _modifiers, bool& _down) + { + _modifiers = (_state>>16)&0xff; + _down = 0 != ( (_state>>8)&0xff); + } + + void setKeyState(entry::Key::Enum _key, uint8_t _modifiers, bool _down) + { + m_key[_key] = encodeKeyState(_modifiers, _down); + m_once[_key] = false; + } + + uint32_t m_key[256]; + bool m_once[256]; +}; + +struct Input +{ + Input() + { + reset(); + } + + ~Input() + { + } + + void addBindings(const char* _name, const InputBinding* _bindings) + { + m_inputBindingsMap.insert(std::make_pair(_name, _bindings) ); + } + + void removeBindings(const char* _name) + { + m_inputBindingsMap.erase(_name); + } + + void process(const InputBinding* _bindings) + { + for (const InputBinding* binding = _bindings; binding->m_key != entry::Key::None; ++binding) + { + uint8_t modifiers; + bool down; + Keyboard::decodeKeyState(m_keyboard.m_key[binding->m_key], modifiers, down); + + if (binding->m_flags == 1) + { + if (down + && modifiers == binding->m_modifiers) + { + if (!m_keyboard.m_once[binding->m_key]) + { + binding->m_fn(binding->m_userData); + m_keyboard.m_once[binding->m_key] = true; + } + } + else + { + m_keyboard.m_once[binding->m_key] = false; + } + } + else + { + if (down + && modifiers == binding->m_modifiers) + { + binding->m_fn(binding->m_userData); + } + } + } + } + + void process() + { + m_mouse.read(m_mouse.m_lock); + + for (InputBindingMap::const_iterator it = m_inputBindingsMap.begin(); it != m_inputBindingsMap.end(); ++it) + { + process(it->second); + } + } + + void reset() + { + m_mouse.reset(); + m_keyboard.reset(); + } + + typedef std::unordered_map InputBindingMap; + InputBindingMap m_inputBindingsMap; + Mouse m_mouse; + Keyboard m_keyboard; +}; + +static Input s_input; + +void inputAddBindings(const char* _name, const InputBinding* _bindings) +{ + s_input.addBindings(_name, _bindings); +} + +void inputRemoveBindings(const char* _name) +{ + s_input.removeBindings(_name); +} + +void inputProcess() +{ + s_input.process(); +} + +void inputSetMouseResolution(uint16_t _width, uint16_t _height) +{ + s_input.m_mouse.setResolution(_width, _height); +} + +void inputSetKeyState(entry::Key::Enum _key, uint8_t _modifiers, bool _down) +{ + s_input.m_keyboard.setKeyState(_key, _modifiers, _down); +} + +void inputSetMousePos(int32_t _mx, int32_t _my) +{ + s_input.m_mouse.setPos(_mx, _my); +} + +void inputSetMouseButtonState(entry::MouseButton::Enum _button, uint8_t _state) +{ + s_input.m_mouse.setButtonState(_button, _state); +} + +void inputGetMouse(float _mouse[2]) +{ + _mouse[0] = s_input.m_mouse.m_norm[0]; + _mouse[1] = s_input.m_mouse.m_norm[1]; + s_input.m_mouse.m_norm[0] = 0.0f; + s_input.m_mouse.m_norm[1] = 0.0f; +} + +bool inputIsMouseLocked() +{ + return s_input.m_mouse.m_lock; +} + +void inputSetMouseLock(bool _lock) +{ + if (s_input.m_mouse.m_lock != _lock) + { + s_input.m_mouse.m_lock = _lock; + entry::setMouseLock(_lock); + if (_lock) + { + s_input.m_mouse.m_norm[0] = 0.0f; + s_input.m_mouse.m_norm[1] = 0.0f; + } + } +} diff --git a/examples/common/entry/input.h b/examples/common/entry/input.h new file mode 100644 index 00000000..9b2c956c --- /dev/null +++ b/examples/common/entry/input.h @@ -0,0 +1,55 @@ +/* + * Copyright 2010-2013 Branimir Karadzic. All rights reserved. + * License: http://www.opensource.org/licenses/BSD-2-Clause + */ + +#ifndef __INPUT_H__ +#define __INPUT_H__ + +#include +#include "entry.h" + +typedef void (*InputBindingFn)(const void* _userData); + +struct InputBinding +{ + entry::Key::Enum m_key; + uint8_t m_modifiers; + uint8_t m_flags; + InputBindingFn m_fn; + const void* m_userData; +}; + +#define INPUT_BINDING_END { entry::Key::None, entry::Modifier::None, NULL, NULL } + +/// +void inputAddBindings(const char* _name, const InputBinding* _bindings); + +/// +void inputRemoveBindings(const char* _name); + +/// +void inputProcess(); + +/// +void inputSetKeyState(entry::Key::Enum _key, uint8_t _modifiers, bool _down); + +/// +void inputSetMouseResolution(uint16_t _width, uint16_t _height); + +/// +void inputSetMousePos(int32_t _mx, int32_t _my); + +/// +void inputSetMouseButtonState(entry::MouseButton::Enum _button, uint8_t _state); + +/// +void inputSetMouseLock(bool _lock); + +/// +void inputGetMouse(float _mouse[2]); + +/// +bool inputIsMouseLocked(); + +#endif // __INPUT_H__ diff --git a/examples/common/processevents.h b/examples/common/processevents.h deleted file mode 100644 index c1eca843..00000000 --- a/examples/common/processevents.h +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright 2011-2013 Branimir Karadzic. All rights reserved. - * License: http://www.opensource.org/licenses/BSD-2-Clause - */ - -#ifndef __PROCESS_EVENTS_H__ -#define __PROCESS_EVENTS_H__ - -struct MouseState -{ - MouseState() - : m_mx(0) - , m_my(0) - { - for (uint32_t ii = 0; ii < entry::MouseButton::Count; ++ii) - { - m_buttons[ii] = entry::MouseButton::None; - } - } - - uint32_t m_mx; - uint32_t m_my; - uint8_t m_buttons[entry::MouseButton::Count]; -}; - -inline bool processEvents(uint32_t& _width, uint32_t& _height, uint32_t& _debug, uint32_t& _reset, MouseState* _mouse = NULL) -{ - using namespace entry; - - bool reset = false; - - const Event* ev; - do - { - struct SE { const Event* m_ev; SE() : m_ev(poll() ) {} ~SE() { if (NULL != m_ev) { release(m_ev); } } } scopeEvent; - ev = scopeEvent.m_ev; - - if (NULL != ev) - { - switch (ev->m_type) - { - case Event::Exit: - return true; - - case Event::Mouse: - if (NULL != _mouse) - { - const MouseEvent* mouse = static_cast(ev); - if (mouse->m_move) - { - _mouse->m_mx = mouse->m_mx; - _mouse->m_my = mouse->m_my; - } - else - { - _mouse->m_buttons[mouse->m_button] = mouse->m_down; - } - } - break; - - case Event::Key: - { - const KeyEvent* key = static_cast(ev); - if ( (key->m_key == Key::KeyQ && (key->m_modifiers & (Modifier::LeftCtrl|Modifier::RightCtrl) ) ) - || ( (key->m_key == Key::Esc) ) ) - { - return true; - } - else if (key->m_down) - { - if (key->m_key == Key::F1) - { - _debug ^= BGFX_DEBUG_STATS; - bgfx::setDebug(_debug); - return false; - } - else if (key->m_key == Key::F7) - { - _reset ^= BGFX_RESET_VSYNC; - reset = true; - } - else if (key->m_key == Key::F8) - { - _reset ^= BGFX_RESET_MSAA_X16; - reset = true; - } - else if (key->m_key == Key::F9) - { - setWindowSize(640, 480); - _width = 640; - _height = 480; - } - else if (key->m_key == Key::F10) - { - setWindowSize(1280, 720); - _width = 1280; - _height = 720; - } - else if (key->m_key == Key::F11) - { - toggleWindowFrame(); - } - } - } - break; - - case Event::Size: - { - const SizeEvent* size = static_cast(ev); - _width = size->m_width; - _height = size->m_height; - reset = true; - } - break; - - default: - break; - } - } - } while (NULL != ev); - - if (reset) - { - bgfx::reset(_width, _height, _reset); - } - - return false; -} - -#endif // __PROCESS_EVENTS_H__ diff --git a/tools/geometryc/geometryc.cpp b/tools/geometryc/geometryc.cpp index 7777c1b3..fcd089be 100644 --- a/tools/geometryc/geometryc.cpp +++ b/tools/geometryc/geometryc.cpp @@ -11,7 +11,6 @@ #include #include #include -namespace std { namespace tr1 {} using namespace tr1; } // namespace std #include #include diff --git a/tools/shaderc/shaderc.cpp b/tools/shaderc/shaderc.cpp index fa1a297f..d73699a2 100644 --- a/tools/shaderc/shaderc.cpp +++ b/tools/shaderc/shaderc.cpp @@ -18,8 +18,6 @@ #include #include -namespace std { namespace tr1 {} using namespace tr1; } // namespace std - #define MAX_TAGS 256 extern "C" { From d07ededcaf8161f01eed1ce68675561c32537624 Mon Sep 17 00:00:00 2001 From: bkaradzic Date: Wed, 7 Aug 2013 22:01:46 -0700 Subject: [PATCH 4/4] Fixed NaCl build. --- examples/common/entry/cmd.cpp | 4 ++-- examples/common/entry/entry_nacl.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/common/entry/cmd.cpp b/examples/common/entry/cmd.cpp index ef63f9c0..4ec4547b 100644 --- a/examples/common/entry/cmd.cpp +++ b/examples/common/entry/cmd.cpp @@ -3,10 +3,10 @@ * License: http://www.opensource.org/licenses/BSD-2-Clause */ +#include // isspace #include #include // size_t -// #include -#include // isspace +#include // strlen #include #include "dbg.h" diff --git a/examples/common/entry/entry_nacl.cpp b/examples/common/entry/entry_nacl.cpp index fb37ca92..457ed948 100644 --- a/examples/common/entry/entry_nacl.cpp +++ b/examples/common/entry/entry_nacl.cpp @@ -7,6 +7,8 @@ #if BX_PLATFORM_NACL +#include "entry_p.h" + #include #include #include