vurtun
/
nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #817 from ccawley2011/sfml-fix 

Fix compilation of the SFML demos
master
dumblob 2019-06-16 20:38:13 +02:00 committed by GitHub
parent bb327b97a9 930ac1e888
commit 9854477f0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
demo/sfml_opengl2/main.cpp
View File

@ -165,7 +165,6 @@ int main(void)
/* Draw */
win.setActive(true);
nk_color_fv(bg, background);
glClear(GL_COLOR_BUFFER_BIT);
glClearColor(bg.r, bg.g, bg.b, bg.a);
/* IMPORTANT: `nk_sfml_render` modifies some global OpenGL state

6
demo/sfml_opengl2/nuklear_sfml_gl2.h
View File

@ -97,9 +97,9 @@ nk_sfml_render(enum nk_anti_aliasing AA)
glEnableClientState(GL_COLOR_ARRAY);
{
GLsizei vs = sizeof(struct nk_sfml_vertex);
size_t vp = offsetof(struct nk_sfml_vertex, position);
size_t vt = offsetof(struct nk_sfml_vertex, uv);
size_t vc = offsetof(struct nk_sfml_vertex, col);
size_t vp = NK_OFFSETOF(struct nk_sfml_vertex, position);
size_t vt = NK_OFFSETOF(struct nk_sfml_vertex, uv);
size_t vc = NK_OFFSETOF(struct nk_sfml_vertex, col);
/* convert from command queue into draw list and draw to screen */
const struct nk_draw_command* cmd;

2
demo/sfml_opengl3/main.cpp
View File

@ -171,9 +171,7 @@ int main(void)
/* ----------------------------------------- */
/* Draw */
float bg[4];
win.setActive(true);
nk_color_fv(bg, background);
glClear(GL_COLOR_BUFFER_BIT);
glClearColor(bg.r, bg.g, bg.b, bg.a);
/* IMPORTANT: `nk_sfml_render` modifies some global OpenGL state

6
demo/sfml_opengl3/nuklear_sfml_gl3.h
View File

@ -134,9 +134,9 @@ nk_sfml_device_create(void)
{
/* buffer setup */
GLsizei vs = sizeof(struct nk_sfml_vertex);
size_t vp = offsetof(struct nk_sfml_vertex, position);
size_t vt = offsetof(struct nk_sfml_vertex, uv);
size_t vc = offsetof(struct nk_sfml_vertex, col);
size_t vp = NK_OFFSETOF(struct nk_sfml_vertex, position);
size_t vt = NK_OFFSETOF(struct nk_sfml_vertex, uv);
size_t vc = NK_OFFSETOF(struct nk_sfml_vertex, col);
glGenBuffers(1, &dev->vbo);
glGenBuffers(1, &dev->ebo);