scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2024-11-28 18:45:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #284 from dariomanesku/master

Browse source 
Nanovg viewid fix + cleanup.
This commit is contained in:
Branimir Karadžić 2015-03-12 14:28:39 -07:00
commit 6e3845c780
4 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -813,6 +813,7 @@ struct Imgui
void beginFrame(int32_t _mx, int32_t _my, uint8_t _button, int32_t _scroll, uint16_t _width, uint16_t _height, char _inputChar, uint8_t _view)
{
IMGUI_beginFrame(_mx, _my, _button, _width, _height, _inputChar, _view);
nvgViewId(m_nvg, _view);
m_view = _view;
m_viewWidth = _width;

2
examples/common/imgui/ocornut_imgui.cpp
View file

@ -165,7 +165,7 @@ struct OcornutImguiContext
ImGui::NewFrame();
ImGui::ShowTestWindow();
//ImGui::ShowTestWindow(); //Debug only.
}
void endFrame()

1
examples/common/nanovg/nanovg.h
View file

@ -599,6 +599,7 @@ struct NVGparams {
typedef struct NVGparams NVGparams;
NVGcontext* nvgCreate(int edgeaa, unsigned char viewid);
void nvgViewId(struct NVGcontext* ctx, unsigned char viewid);
void nvgDelete(struct NVGcontext* ctx);
// Contructor and destructor, called by the render back-end.

7
examples/common/nanovg/nanovg_bgfx.cpp
View file

@ -1051,6 +1051,13 @@ error:
return NULL;
}
void nvgViewId(struct NVGcontext* ctx, unsigned char viewid)
{
struct NVGparams* params = nvgInternalParams(ctx);
struct GLNVGcontext* gl = (struct GLNVGcontext*)params->userPtr;
gl->viewid = uint8_t(viewid);
}
void nvgDelete(struct NVGcontext* ctx)
{
nvgDeleteInternal(ctx);