scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-17 20:31:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed Linux build.

Browse source
This commit is contained in:
bkaradzic 2014-01-19 00:28:17 -08:00
parent f08ce4fdaa
commit b5f1a4fcf9
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/17-drawstress/drawstress.cpp
View file

@ -338,6 +338,7 @@ int _main_(int /*_argc*/, char** /*_argv*/)
}
// Cleanup.
imguiDestroy();
bgfx::destroyIndexBuffer(ibh);
bgfx::destroyVertexBuffer(vbh);
bgfx::destroyProgram(program);

14
examples/common/imgui/imgui.cpp
View file

@ -28,6 +28,7 @@
#include <bx/uint32_t.h>
#include <bgfx.h>
#include "../entry/dbg.h"
#include "imgui.h"
#include "../fpumath.h"
@ -1513,17 +1514,22 @@ bool imguiSlider(const char* _text, int32_t* _val, int32_t _vmin, int32_t _vmax,
return result;
}
uint32_t imguiChooseUseMacroInstead(uint32_t _selected, const char* _first, ...)
uint32_t imguiChooseUseMacroInstead(uint32_t _selected, ...)
{
uint32_t ii = 0;
for (const char** str = &_first; *str != NULL; ++str, ++ii)
va_list argList;
va_start(argList, _selected);
const char* str = va_arg(argList, const char*);
for (uint32_t ii = 0; str != NULL; ++ii, str = va_arg(argList, const char*))
{
if (imguiCheck(*str, ii == _selected) )
if (imguiCheck(str, ii == _selected) )
{
_selected = ii;
}
}
va_end(argList);
return _selected;
}

2
examples/common/imgui/imgui.h
View file

@ -72,7 +72,7 @@ void imguiValue(const char* _text);
bool imguiSlider(const char* _text, float* _val, float _vmin, float _vmax, float _vinc, bool _enabled = true);
bool imguiSlider(const char* _text, int32_t* _val, int32_t _vmin, int32_t _vmax, bool _enabled = true);
uint32_t imguiChooseUseMacroInstead(uint32_t _selected, const char* _first, ...);
uint32_t imguiChooseUseMacroInstead(uint32_t _selected, ...);
#define imguiChoose(...) imguiChooseUseMacroInstead(__VA_ARGS__, NULL)
void imguiDrawText(int _x, int _y, ImguiTextAlign::Enum _align, const char* _text, uint32_t _argb);