diff options
author | 2017-12-01 13:22:27 +0100 | |
---|---|---|
committer | 2017-12-01 13:22:27 +0100 | |
commit | 39176274946d70ff520f265dee8fbd16d5fe0000 (patch) | |
tree | 318801d93146752050c9a492654ae3738820e3b9 /3rdparty/bgfx/examples/02-metaballs/metaballs.cpp | |
parent | 6829ecb3b037d6bfbe0b84e818d17d712f71bce6 (diff) |
Updated GENie, BGFX, BX, added BIMG since it is separated now, updated all shader binaries and MAME part of code to support new interfaces [Miodrag Milanovic]
Diffstat (limited to '3rdparty/bgfx/examples/02-metaballs/metaballs.cpp')
-rw-r--r-- | 3rdparty/bgfx/examples/02-metaballs/metaballs.cpp | 63 |
1 files changed, 45 insertions, 18 deletions
diff --git a/3rdparty/bgfx/examples/02-metaballs/metaballs.cpp b/3rdparty/bgfx/examples/02-metaballs/metaballs.cpp index 60728cc672a..c14c3df0fda 100644 --- a/3rdparty/bgfx/examples/02-metaballs/metaballs.cpp +++ b/3rdparty/bgfx/examples/02-metaballs/metaballs.cpp @@ -5,6 +5,7 @@ #include "common.h" #include "bgfx_utils.h" +#include "imgui/imgui.h" #include <bgfx/embedded_shader.h> @@ -12,6 +13,9 @@ #include "vs_metaballs.bin.h" #include "fs_metaballs.bin.h" +namespace +{ + static const bgfx::EmbeddedShader s_embeddedShaders[] = { BGFX_EMBEDDED_SHADER(vs_metaballs), @@ -371,7 +375,7 @@ float vertLerp(float* __restrict _result, float _iso, uint32_t _idx0, float _v0, const float* __restrict edge0 = s_cube[_idx0]; const float* __restrict edge1 = s_cube[_idx1]; - if (bx::fabsolute(_iso-_v1) < 0.00001f) + if (bx::fabs(_iso-_v1) < 0.00001f) { _result[0] = edge1[0]; _result[1] = edge1[1]; @@ -379,8 +383,8 @@ float vertLerp(float* __restrict _result, float _iso, uint32_t _idx0, float _v0, return 1.0f; } - if (bx::fabsolute(_iso-_v0) < 0.00001f - || bx::fabsolute(_v0-_v1) < 0.00001f) + if (bx::fabs(_iso-_v0) < 0.00001f + || bx::fabs(_v0-_v1) < 0.00001f) { _result[0] = edge0[0]; _result[1] = edge0[1]; @@ -474,13 +478,19 @@ uint32_t triangulate(uint8_t* _result, uint32_t _stride, const float* __restrict class ExampleMetaballs : public entry::AppI { - void init(int _argc, char** _argv) BX_OVERRIDE +public: + ExampleMetaballs(const char* _name, const char* _description) + : entry::AppI(_name, _description) + { + } + + void init(int32_t _argc, const char* const* _argv, uint32_t _width, uint32_t _height) override { Args args(_argc, _argv); - m_width = 1280; - m_height = 720; - m_debug = BGFX_DEBUG_TEXT; + m_width = _width; + m_height = _height; + m_debug = BGFX_DEBUG_NONE; m_reset = BGFX_RESET_VSYNC; bgfx::init(args.m_type, args.m_pciId); @@ -510,14 +520,18 @@ class ExampleMetaballs : public entry::AppI m_grid = new Grid[DIMS*DIMS*DIMS]; m_timeOffset = bx::getHPCounter(); + + imguiCreate(); } - int shutdown() BX_OVERRIDE + int shutdown() override { + imguiDestroy(); + delete [] m_grid; // Cleanup. - bgfx::destroyProgram(m_program); + bgfx::destroy(m_program); // Shutdown bgfx. bgfx::shutdown(); @@ -525,14 +539,28 @@ class ExampleMetaballs : public entry::AppI return 0; } - bool update() BX_OVERRIDE + bool update() override { const uint32_t ypitch = DIMS; const uint32_t zpitch = DIMS*DIMS; const float invdim = 1.0f/float(DIMS-1); - if (!entry::processEvents(m_width, m_height, m_debug, m_reset) ) + if (!entry::processEvents(m_width, m_height, m_debug, m_reset, &m_mouseState) ) { + imguiBeginFrame(m_mouseState.m_mx + , m_mouseState.m_my + , (m_mouseState.m_buttons[entry::MouseButton::Left ] ? IMGUI_MBUT_LEFT : 0) + | (m_mouseState.m_buttons[entry::MouseButton::Right ] ? IMGUI_MBUT_RIGHT : 0) + | (m_mouseState.m_buttons[entry::MouseButton::Middle] ? IMGUI_MBUT_MIDDLE : 0) + , m_mouseState.m_mz + , uint16_t(m_width) + , uint16_t(m_height) + ); + + showExampleDialog(this); + + imguiEndFrame(); + // Set view 0 default viewport. bgfx::setViewRect(0, 0, 0, uint16_t(m_width), uint16_t(m_height) ); @@ -548,11 +576,6 @@ class ExampleMetaballs : public entry::AppI const double toMs = 1000.0/freq; float time = (float)( (now - m_timeOffset)/double(bx::getHPFrequency() ) ); - // Use debug font to print information about this example. - bgfx::dbgTextClear(); - bgfx::dbgTextPrintf(0, 1, 0x4f, "bgfx/examples/02-metaball"); - bgfx::dbgTextPrintf(0, 2, 0x6f, "Description: Rendering with transient buffers and embedding shaders."); - float at[3] = { 0.0f, 0.0f, 0.0f }; float eye[3] = { 0.0f, 0.0f, -50.0f }; @@ -726,7 +749,7 @@ class ExampleMetaballs : public entry::AppI bgfx::setTransform(mtx); // Set vertex and index buffer. - bgfx::setVertexBuffer(&tvb, 0, numVertices); + bgfx::setVertexBuffer(0, &tvb, 0, numVertices); // Set render states. bgfx::setState(BGFX_STATE_DEFAULT); @@ -751,6 +774,8 @@ class ExampleMetaballs : public entry::AppI return false; } + entry::MouseState m_mouseState; + uint32_t m_width; uint32_t m_height; uint32_t m_debug; @@ -761,4 +786,6 @@ class ExampleMetaballs : public entry::AppI int64_t m_timeOffset; }; -ENTRY_IMPLEMENT_MAIN(ExampleMetaballs); +} // namespace + +ENTRY_IMPLEMENT_MAIN(ExampleMetaballs, "02-metaball", "Rendering with transient buffers and embedding shaders."); |