Fixed some styling issues in sfml demos

demo/sfml_opengl2/main.cpp

@@ -58,32 +58,27 @@ int main(void)
 {
     /* Platform */
     sf::ContextSettings settings(24, 8, 4, 2, 2);
-    sf::Window window(sf::VideoMode(WINDOW_WIDTH, WINDOW_HEIGHT), "Demo", sf::Style::Default, settings);
-
-    window.setVerticalSyncEnabled(true);
-    window.setActive(true);
-
-    glViewport(0, 0, window.getSize().x, window.getSize().y);
-    struct nk_context *ctx;
-    struct nk_color background;
+    sf::Window win(sf::VideoMode(WINDOW_WIDTH, WINDOW_HEIGHT), "Demo", sf::Style::Default, settings);
+    win.setVerticalSyncEnabled(true);
+    win.setActive(true);
+    glViewport(0, 0, win.getSize().x, win.getSize().y);
 
     /* GUI */
-    ctx = nk_sfml_init(&window);
+    struct nk_context *ctx;
+    ctx = nk_sfml_init(&win);
     /* Load Fonts: if none of these are loaded a default font will be used  */
     /* Load Cursor: if you uncomment cursor loading please hide the cursor */
-    {
-        struct nk_font_atlas *atlas;
-        nk_sfml_font_stash_begin(&atlas);
-        /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, 0);*/
-        /*struct nk_font *roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 14, 0);*/
-        /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, 0);*/
-        /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, 0);*/
-        /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, 0);*/
-        /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, 0);*/
-        nk_sfml_font_stash_end();
-        /*nk_style_load_all_cursors(ctx, atlas->cursors);*/
-        /*nk_style_set_font(ctx, &droid->handle);*/
-    }
+    struct nk_font_atlas *atlas;
+    nk_sfml_font_stash_begin(&atlas);
+    /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, 0);*/
+    /*struct nk_font *roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 14, 0);*/
+    /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, 0);*/
+    /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, 0);*/
+    /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, 0);*/
+    /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, 0);*/
+    nk_sfml_font_stash_end();
+    /*nk_style_load_all_cursors(ctx, atlas->cursors);*/
+    /*nk_style_set_font(ctx, &droid->handle);*/
 
     /* style.c */
     /*set_style(ctx, THEME_WHITE);*/
@@ -91,22 +86,19 @@ int main(void)
     /*set_style(ctx, THEME_BLUE);*/
     /*set_style(ctx, THEME_DARK);*/
 
+    struct nk_color background;
     background = nk_rgb(28,48,62);
-
-    while (window.isOpen())
+    while (win.isOpen())
     {
         /* Input */
-        sf::Event event;
-
+        sf::Event evt;
         nk_input_begin(ctx);
-        while(window.pollEvent(event))
-        {
-            if(event.type == sf::Event::Closed)
-                window.close();
-            else if(event.type == sf::Event::Resized)
-                glViewport(0, 0, event.size.width, event.size.height);
-
-            nk_sfml_handle_event(&event);
+        while(win.pollEvent(evt)) {
+            if(evt.type == sf::Event::Closed)
+                win.close();
+            else if(evt.type == sf::Event::Resized)
+                glViewport(0, 0, evt.size.width, evt.size.height);
+            nk_sfml_handle_event(&evt);
         }
         nk_input_end(ctx);
 
@@ -152,24 +144,18 @@ int main(void)
         /* ----------------------------------------- */
 
         /* Draw */
-        {
-            window.setActive(true);
-
-            float bg[4];
-            nk_color_fv(bg, background);
-            glClear(GL_COLOR_BUFFER_BIT);
-            glClearColor(bg[0], bg[1], bg[2], bg[3]);
-
-            /* IMPORTANT: `nk_sfml_render` modifies some global OpenGL state
-            * with blending, scissor, face culling and depth test and defaults everything
-            * back into a default state. Make sure to either save and restore or
-            * reset your own state after drawing rendering the UI. */
-            nk_sfml_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER);
-            
-            window.display();
-        }
+        float bg[4];
+        win.setActive(true);
+        nk_color_fv(bg, background);
+        glClear(GL_COLOR_BUFFER_BIT);
+        glClearColor(bg[0], bg[1], bg[2], bg[3]);
+        /* IMPORTANT: `nk_sfml_render` modifies some global OpenGL state
+        * with blending, scissor, face culling and depth test and defaults everything
+        * back into a default state. Make sure to either save and restore or
+        * reset your own state after drawing rendering the UI. */
+        nk_sfml_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER);
+        win.display();
     }
-
     nk_sfml_shutdown();
     return 0;
 }

demo/sfml_opengl2/nuklear_sfml_gl2.h

@@ -32,22 +32,19 @@ NK_API void                 nk_sfml_shutdown(void);
  */
  #ifdef NK_SFML_GL2_IMPLEMENTATION
 
-struct nk_sfml_device
-{
+struct nk_sfml_device {
     struct nk_buffer cmds;
     struct nk_draw_null_texture null;
     GLuint font_tex;
 };
 
-struct nk_sfml_vertex
-{
+struct nk_sfml_vertex {
     float position[2];
     float uv[2];
     nk_byte col[4];
 };
 
-static struct nk_sfml
-{
+static struct nk_sfml {
     sf::Window* window;
     struct nk_sfml_device ogl;
     struct nk_context ctx;
@@ -108,8 +105,7 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
 
         /* fill converting configuration */
         struct nk_convert_config config;
-        static const struct nk_draw_vertex_layout_element vertex_layout[] = 
-        {
+        static const struct nk_draw_vertex_layout_element vertex_layout[] = {
             {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_sfml_vertex, position)},
             {NK_VERTEX_TEXCOORD, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_sfml_vertex, uv)},
             {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sfml_vertex, col)},
@@ -133,19 +129,16 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
         nk_convert(&sfml.ctx, &dev->cmds, &vbuf, &ebuf, &config);
 
         /* setup vertex buffer pointer */
-        {
-            const void* vertices = nk_buffer_memory_const(&vbuf);
-            glVertexPointer(2, GL_FLOAT, vs, (const void*)((const nk_byte*)vertices + vp));
-            glTexCoordPointer(2, GL_FLOAT, vs, (const void*)((const nk_byte*)vertices + vt));
-            glColorPointer(4, GL_UNSIGNED_BYTE, vs, (const void*)((const nk_byte*)vertices + vc));
-        }
+        const void* vertices = nk_buffer_memory_const(&vbuf);
+        glVertexPointer(2, GL_FLOAT, vs, (const void*)((const nk_byte*)vertices + vp));
+        glTexCoordPointer(2, GL_FLOAT, vs, (const void*)((const nk_byte*)vertices + vt));
+        glColorPointer(4, GL_UNSIGNED_BYTE, vs, (const void*)((const nk_byte*)vertices + vc));
 
         /* iterate over and execute each draw command */
         offset = (const nk_draw_index*)nk_buffer_memory_const(&ebuf);
         nk_draw_foreach(cmd, &sfml.ctx, &dev->cmds)
         {
             if(!cmd->elem_count) continue;
-
             glBindTexture(GL_TEXTURE_2D, (GLuint)cmd->texture.id);
             glScissor(
                 (GLint)(cmd->clip_rect.x),
@@ -182,36 +175,34 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
 static void
 nk_sfml_clipboard_paste(nk_handle usr, struct nk_text_edit* edit)
 {
-    /* Not Implemented in SFML 
+#if 0
+    /* Not Implemented in SFML */
     sf::Clipboard clipboard(sfml.window);
     const char* text = clipboard.getText();
 
     if(text)
         nk_textedit_paste(edit, text, nk_strlen(text));
         (void)usr;
-    */
+#endif
 }
 
 static void
 nk_sfml_clipboard_copy(nk_handle usr, const char* text, int len)
 {
-    /*
+#if 0
     char* str = 0;
     (void)usr;
-    if(!len)
-        return;
+    if(!len) return;
     str = (char*)malloc((size_t)len+1);
-    if(!str)
-        return;
+    if(!str) return;
     memcpy(str, text, (size_t)len);
     str[len] = '\0';
 
-     Not Implemented in SFML
+    /* Not Implemented in SFML */
     sf::Clipboard clipboard(sfml.window);
     clipboard.setText(str);
-    
     free(str);
-    */
+#endif
 }
 
 NK_API struct nk_context*
@@ -235,40 +226,34 @@ nk_sfml_font_stash_begin(struct nk_font_atlas** atlas)
 }
 
 NK_API void
-nk_sfml_font_stash_end(void)
+nk_sfml_font_stash_end()
 {
-    const void* image;
     int w, h;
-    image = nk_font_atlas_bake(&sfml.atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
-    nk_sfml_device_upload_atlas(image, w, h);
+    const void* img;
+    img = nk_font_atlas_bake(&sfml.atlas, &w, &h, NK_FONT_ATLAS_RGBA32);
+    nk_sfml_device_upload_atlas(img, w, h);
     nk_font_atlas_end(&sfml.atlas, nk_handle_id((int)sfml.ogl.font_tex), &sfml.ogl.null);
     if(sfml.atlas.default_font)
         nk_style_set_font(&sfml.ctx, &sfml.atlas.default_font->handle);
 }
 
 NK_API int
-nk_sfml_handle_event(sf::Event* event)
+nk_sfml_handle_event(sf::Event* evt)
 {
     struct nk_context* ctx = &sfml.ctx;
-
     /* optional grabbing behavior */
     if(ctx->input.mouse.grab)
         ctx->input.mouse.grab = 0;
-    else if(ctx->input.mouse.ungrab)
-    {
+    else if(ctx->input.mouse.ungrab) {
         int x = (int)ctx->input.mouse.prev.x;
         int y = (int)ctx->input.mouse.prev.y;
-
         sf::Mouse::setPosition(sf::Vector2i(x, y), *sfml.window);
         ctx->input.mouse.ungrab = 0;
     }
-
-
-    if(event->type == sf::Event::KeyReleased || event->type == sf::Event::KeyPressed)
+    if(evt->type == sf::Event::KeyReleased || evt->type == sf::Event::KeyPressed)
     {
-        int down = event->type == sf::Event::KeyPressed;
-        sf::Keyboard::Key key = event->key.code;
-
+        int down = evt->type == sf::Event::KeyPressed;
+        sf::Keyboard::Key key = evt->key.code;
         if(key == sf::Keyboard::RShift || key == sf::Keyboard::LShift)
             nk_input_key(ctx, NK_KEY_SHIFT, down);
         else if(key == sf::Keyboard::Delete)
@@ -279,17 +264,13 @@ nk_sfml_handle_event(sf::Event* event)
             nk_input_key(ctx, NK_KEY_TAB, down);
         else if(key == sf::Keyboard::BackSpace)
             nk_input_key(ctx, NK_KEY_BACKSPACE, down);
-        else if(key == sf::Keyboard::Home)
-        {
+        else if(key == sf::Keyboard::Home) {
             nk_input_key(ctx, NK_KEY_TEXT_START, down);
             nk_input_key(ctx, NK_KEY_SCROLL_START, down);
-        }
-        else if(key == sf::Keyboard::End)
-        {
+        } else if(key == sf::Keyboard::End) {
             nk_input_key(ctx, NK_KEY_TEXT_END, down);
             nk_input_key(ctx, NK_KEY_SCROLL_END, down);
-        }
-        else if(key == sf::Keyboard::PageDown)
+        } else if(key == sf::Keyboard::PageDown)
             nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down);
         else if(key == sf::Keyboard::PageUp)
             nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down);
@@ -311,84 +292,49 @@ nk_sfml_handle_event(sf::Event* event)
             nk_input_key(ctx, NK_KEY_UP, down);
         else if(key == sf::Keyboard::Down)
             nk_input_key(ctx, NK_KEY_DOWN, down);
-        else if(key == sf::Keyboard::Left)
-        {
+        else if(key == sf::Keyboard::Left) {
             if(sf::Keyboard::isKeyPressed(sf::Keyboard::LControl))
                 nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down);
-            else
-                nk_input_key(ctx, NK_KEY_LEFT, down);
-        }
-        else if(key == sf::Keyboard::Right)
-        {
+            else nk_input_key(ctx, NK_KEY_LEFT, down);
+        } else if(key == sf::Keyboard::Right) {
             if(sf::Keyboard::isKeyPressed(sf::Keyboard::LControl))
                 nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down);
-            else
-                nk_input_key(ctx, NK_KEY_RIGHT, down);
-        }
-        else return 0;
-
+            else nk_input_key(ctx, NK_KEY_RIGHT, down);
+        } else return 0;
         return 1;
-    }
-    else if(event->type == sf::Event::MouseButtonPressed || event->type == sf::Event::MouseButtonReleased)
-    {
-        int down = event->type == sf::Event::MouseButtonPressed;
-        const int x = event->mouseButton.x;
-        const int y = event->mouseButton.y;
-
-        if(event->mouseButton.button == sf::Mouse::Left)
+    } else if(evt->type == sf::Event::MouseButtonPressed || evt->type == sf::Event::MouseButtonReleased) {
+        int down = evt->type == sf::Event::MouseButtonPressed;
+        const int x = evt->mouseButton.x, y = evt->mouseButton.y;
+        if(evt->mouseButton.button == sf::Mouse::Left)
             nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down);
-        if(event->mouseButton.button == sf::Mouse::Middle)
+        if(evt->mouseButton.button == sf::Mouse::Middle)
             nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down);
-        if(event->mouseButton.button == sf::Mouse::Right)
+        if(evt->mouseButton.button == sf::Mouse::Right)
             nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down);
-        else
-            return 0;
-
+        else return 0;
         return 1;
-    }
-    else if(event->type == sf::Event::MouseMoved)
-    {
-        nk_input_motion(ctx, event->mouseMove.x, event->mouseMove.y);
-
+    } else if(evt->type == sf::Event::MouseMoved) {
+        nk_input_motion(ctx, evt->mouseMove.x, evt->mouseMove.y);
         return 1;
-    }
-    else if(event->type == sf::Event::TouchBegan || event->type == sf::Event::TouchEnded)
-    {
-        int down = event->type == sf::Event::TouchBegan;
-        const int x = event->touch.x;
-        const int y = event->touch.y;
-
+    } else if(evt->type == sf::Event::TouchBegan || evt->type == sf::Event::TouchEnded) {
+        int down = evt->type == sf::Event::TouchBegan;
+        const int x = evt->touch.x, y = evt->touch.y;
         nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down);
-
         return 1;
-    }
-    else if(event->type == sf::Event::TouchMoved)
-    {
-        if(ctx->input.mouse.grabbed)
-        {
+    } else if(evt->type == sf::Event::TouchMoved) {
+        if(ctx->input.mouse.grabbed) {
             int x = (int)ctx->input.mouse.prev.x;
             int y = (int)ctx->input.mouse.prev.y;
-
-            nk_input_motion(ctx, x + event->touch.x, y + event->touch.y);
-        }
-        else
-            nk_input_motion(ctx, event->touch.x, event->touch.y);
-
+            nk_input_motion(ctx, x + evt->touch.x, y + evt->touch.y);
+        } else nk_input_motion(ctx, evt->touch.x, evt->touch.y);
         return 1;
-    }
-    else if(event->type == sf::Event::TextEntered)
-    {
-        nk_input_unicode(ctx, event->text.unicode);
-
+    } else if(evt->type == sf::Event::TextEntered) {
+        nk_input_unicode(ctx, evt->text.unicode);
         return 1;
-    }
-    else if(event->type == sf::Event::MouseWheelScrolled)
-    {
-        nk_input_scroll(ctx, event->mouseWheelScroll.delta);
-
+    } else if(evt->type == sf::Event::MouseWheelScrolled) {
+        nk_input_scroll(ctx, evt->mouseWheelScroll.delta);
         return 1;
     }
-
     return 0;
 }
 

demo/sfml_opengl3/main.cpp

@@ -57,39 +57,31 @@ int main(void)
 {
     /* Platform */
     sf::ContextSettings settings(24, 8, 4, 3, 3);
-    sf::Window window(sf::VideoMode(WINDOW_WIDTH, WINDOW_HEIGHT), "Demo", sf::Style::Default, settings);
-
-    window.setVerticalSyncEnabled(true);
-    window.setActive(true);
-
-    /* Load OpenGL extensions */
-    if(!gladLoadGL())
-    {
+    sf::Window win(sf::VideoMode(WINDOW_WIDTH, WINDOW_HEIGHT), "Demo", sf::Style::Default, settings);
+    win.setVerticalSyncEnabled(true);
+    win.setActive(true);
+    if(!gladLoadGL()) { /* Load OpenGL extensions */
         printf("Failed to load OpenGL extensions!\n");
         return -1;
     }
-
-    glViewport(0, 0, window.getSize().x, window.getSize().y);
-    struct nk_context *ctx;
-    struct nk_color background;
+    glViewport(0, 0, win.getSize().x, win.getSize().y);
 
     /* GUI */
-    ctx = nk_sfml_init(&window);
+    struct nk_context *ctx;
+    ctx = nk_sfml_init(&win);
     /* Load Fonts: if none of these are loaded a default font will be used  */
     /* Load Cursor: if you uncomment cursor loading please hide the cursor */
-    {
-        struct nk_font_atlas *atlas;
-        nk_sfml_font_stash_begin(&atlas);
-        /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, 0);*/
-        /*struct nk_font *roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 14, 0);*/
-        /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, 0);*/
-        /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, 0);*/
-        /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, 0);*/
-        /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, 0);*/
-        nk_sfml_font_stash_end();
-        /*nk_style_load_all_cursors(ctx, atlas->cursors);*/
-        /*nk_style_set_font(ctx, &droid->handle);*/
-    }
+    struct nk_font_atlas *atlas;
+    nk_sfml_font_stash_begin(&atlas);
+    /*struct nk_font *droid = nk_font_atlas_add_from_file(atlas, "../../../extra_font/DroidSans.ttf", 14, 0);*/
+    /*struct nk_font *roboto = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Roboto-Regular.ttf", 14, 0);*/
+    /*struct nk_font *future = nk_font_atlas_add_from_file(atlas, "../../../extra_font/kenvector_future_thin.ttf", 13, 0);*/
+    /*struct nk_font *clean = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyClean.ttf", 12, 0);*/
+    /*struct nk_font *tiny = nk_font_atlas_add_from_file(atlas, "../../../extra_font/ProggyTiny.ttf", 10, 0);*/
+    /*struct nk_font *cousine = nk_font_atlas_add_from_file(atlas, "../../../extra_font/Cousine-Regular.ttf", 13, 0);*/
+    nk_sfml_font_stash_end();
+    /*nk_style_load_all_cursors(ctx, atlas->cursors);*/
+    /*nk_style_set_font(ctx, &droid->handle);*/
 
     /* style.c */
     /*set_style(ctx, THEME_WHITE);*/
@@ -97,22 +89,20 @@ int main(void)
     /*set_style(ctx, THEME_BLUE);*/
     /*set_style(ctx, THEME_DARK);*/
 
+    struct nk_color background;
     background = nk_rgb(28,48,62);
-
-    while (window.isOpen())
+    while (win.isOpen())
     {
         /* Input */
-        sf::Event event;
-
+        sf::Event evt;
         nk_input_begin(ctx);
-        while(window.pollEvent(event))
-        {
-            if(event.type == sf::Event::Closed)
-                window.close();
-            else if(event.type == sf::Event::Resized)
-                glViewport(0, 0, event.size.width, event.size.height);
+        while(win.pollEvent(evt)) {
+            if(evt.type == sf::Event::Closed)
+                win.close();
+            else if(evt.type == sf::Event::Resized)
+                glViewport(0, 0, evt.size.width, evt.size.height);
 
-            nk_sfml_handle_event(&event);
+            nk_sfml_handle_event(&evt);
         }
         nk_input_end(ctx);
 
@@ -158,24 +148,18 @@ int main(void)
         /* ----------------------------------------- */
 
         /* Draw */
-        {
-            window.setActive(true);
-
-            float bg[4];
-            nk_color_fv(bg, background);
-            glClear(GL_COLOR_BUFFER_BIT);
-            glClearColor(bg[0], bg[1], bg[2], bg[3]);
-            
-            /* IMPORTANT: `nk_sfml_render` modifies some global OpenGL state
-            * with blending, scissor, face culling and depth test and defaults everything
-            * back into a default state. Make sure to either save and restore or
-            * reset your own state after drawing rendering the UI. */
-            nk_sfml_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER);
-            
-            window.display();
-        }
+        float bg[4];
+        win.setActive(true);
+        nk_color_fv(bg, background);
+        glClear(GL_COLOR_BUFFER_BIT);
+        glClearColor(bg[0], bg[1], bg[2], bg[3]);
+        /* IMPORTANT: `nk_sfml_render` modifies some global OpenGL state
+        * with blending, scissor, face culling and depth test and defaults everything
+        * back into a default state. Make sure to either save and restore or
+        * reset your own state after drawing rendering the UI. */
+        nk_sfml_render(NK_ANTI_ALIASING_ON, MAX_VERTEX_BUFFER, MAX_ELEMENT_BUFFER);
+        win.display();
     }
-
     nk_sfml_shutdown();
     return 0;
 }

demo/sfml_opengl3/nuklear_sfml_gl3.h

@@ -41,8 +41,7 @@ NK_API void                 nk_sfml_device_destroy(void);
 
 #include <string>
 
-struct nk_sfml_device
-{
+struct nk_sfml_device {
     struct nk_buffer cmds;
     struct nk_draw_null_texture null;
     GLuint vbo, vao, ebo;
@@ -56,16 +55,12 @@ struct nk_sfml_device
     GLint uniform_proj;
     GLuint font_tex;
 };
-
-struct nk_sfml_vertex
-{
+struct nk_sfml_vertex {
     float position[2];
     float uv[2];
     nk_byte col[4];
 };
-
-static struct nk_sfml
-{
+static struct nk_sfml {
     sf::Window* window;
     struct nk_sfml_device ogl;
     struct nk_context ctx;
@@ -117,7 +112,7 @@ nk_sfml_device_create(void)
     glShaderSource(dev->frag_shdr, 1, &fragment_shader, 0);
     glCompileShader(dev->vert_shdr);
     glCompileShader(dev->frag_shdr);
-    
+
     glGetShaderiv(dev->vert_shdr, GL_COMPILE_STATUS, &status);
     assert(status == GL_TRUE);
 
@@ -136,7 +131,6 @@ nk_sfml_device_create(void)
     dev->attrib_pos = glGetAttribLocation(dev->prog, "Position");
     dev->attrib_uv = glGetAttribLocation(dev->prog, "TexCoord");
     dev->attrib_col = glGetAttribLocation(dev->prog, "Color");
-
     {
         /* buffer setup */
         GLsizei vs = sizeof(struct nk_sfml_vertex);
@@ -160,7 +154,6 @@ nk_sfml_device_create(void)
         glVertexAttribPointer((GLuint)dev->attrib_uv, 2, GL_FLOAT, GL_FALSE, vs, (void*)vt);
         glVertexAttribPointer((GLuint)dev->attrib_col, 4, GL_UNSIGNED_BYTE, GL_TRUE, vs, (void*)vc);
     }
-
     glBindTexture(GL_TEXTURE_2D, 0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
@@ -191,7 +184,7 @@ nk_sfml_device_upload_atlas(const void* image, int width, int height)
     glBindTexture(GL_TEXTURE_2D, dev->font_tex);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, 
+    glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0,
                 GL_RGBA, GL_UNSIGNED_BYTE, image);
 }
 
@@ -200,18 +193,14 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
 {
     /* setup global state */
     struct nk_sfml_device* dev = &sfml.ogl;
-
     int window_width = sfml.window->getSize().x;
     int window_height = sfml.window->getSize().y;
-
-    GLfloat ortho[4][4] = 
-    {
+    GLfloat ortho[4][4] = {
         {2.0f, 0.0f, 0.0f, 0.0f},
         {0.0f,-2.0f, 0.0f, 0.0f},
         {0.0f, 0.0f,-1.0f, 0.0f},
         {-1.0f,1.0f, 0.0f, 1.0f},
     };
-
     ortho[0][0] /= (GLfloat)window_width;
     ortho[1][1] /= (GLfloat)window_height;
 
@@ -245,13 +234,10 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
         /* load vertices/elements directly into vertex/element buffer */
         vertices = glMapBuffer(GL_ARRAY_BUFFER, GL_WRITE_ONLY);
         elements = glMapBuffer(GL_ELEMENT_ARRAY_BUFFER, GL_WRITE_ONLY);
-
         {
             /* fill convert configuration */
             struct nk_convert_config config;
-
-            static const struct nk_draw_vertex_layout_element vertex_layout[] = 
-            {
+            static const struct nk_draw_vertex_layout_element vertex_layout[] =  {
                 {NK_VERTEX_POSITION, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_sfml_vertex, position)},
                 {NK_VERTEX_TEXCOORD, NK_FORMAT_FLOAT, NK_OFFSETOF(struct nk_sfml_vertex, uv)},
                 {NK_VERTEX_COLOR, NK_FORMAT_R8G8B8A8, NK_OFFSETOF(struct nk_sfml_vertex, col)},
@@ -271,14 +257,11 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
             config.line_AA = AA;
 
             /* setup buffers to load vertices and elements */
-            {
-                struct nk_buffer vbuf, ebuf;
-                nk_buffer_init_fixed(&vbuf, vertices, (nk_size)max_vertex_buffer);
-                nk_buffer_init_fixed(&ebuf, elements, (nk_size)max_element_buffer);
-                nk_convert(&sfml.ctx, &dev->cmds, &vbuf, &ebuf, &config);
-            }
+            struct nk_buffer vbuf, ebuf;
+            nk_buffer_init_fixed(&vbuf, vertices, (nk_size)max_vertex_buffer);
+            nk_buffer_init_fixed(&ebuf, elements, (nk_size)max_element_buffer);
+            nk_convert(&sfml.ctx, &dev->cmds, &vbuf, &ebuf, &config);
         }
-
         glUnmapBuffer(GL_ARRAY_BUFFER);
         glUnmapBuffer(GL_ELEMENT_ARRAY_BUFFER);
 
@@ -286,7 +269,6 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
         nk_draw_foreach(cmd, &sfml.ctx, &dev->cmds)
         {
             if (!cmd->elem_count) continue;
-
             glBindTexture(GL_TEXTURE_2D, (GLuint)cmd->texture.id);
             glScissor(
                 (GLint)(cmd->clip_rect.x),
@@ -298,7 +280,6 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
         }
         nk_clear(&sfml.ctx);
     }
-
     glUseProgram(0);
     glBindBuffer(GL_ARRAY_BUFFER, 0);
     glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
@@ -310,36 +291,31 @@ nk_sfml_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element_
 static void
 nk_sfml_clipboard_paste(nk_handle usr, struct nk_text_edit* edit)
 {
-    /* Not Implemented in SFML 
+#if 0
+    /* Not Implemented in SFML
+    (void)usr;
     sf::Clipboard clipboard(sfml.window);
     const char* text = clipboard.getText();
-
-    if(text)
-        nk_textedit_paste(edit, text, nk_strlen(text));
-        (void)usr;
-    */
+    if(text) nk_textedit_paste(edit, text, nk_strlen(text));
+#endif
 }
-
 static void
 nk_sfml_clipboard_copy(nk_handle usr, const char* text, int len)
 {
-    /*
+#if 0
     char* str = 0;
     (void)usr;
-    if(!len)
-        return;
+    if(!len) return;
     str = (char*)malloc((size_t)len+1);
-    if(!str)
-        return;
+    if(!str) return;
     memcpy(str, text, (size_t)len);
     str[len] = '\0';
 
-     Not Implemented in SFML
+    /* Not Implemented in SFML */
     sf::Clipboard clipboard(sfml.window);
     clipboard.setText(str);
-    
     free(str);
-    */
+#endif
 }
 
 NK_API struct nk_context*
@@ -363,7 +339,7 @@ nk_sfml_font_stash_begin(struct nk_font_atlas** atlas)
 }
 
 NK_API void
-nk_sfml_font_stash_end(void)
+nk_sfml_font_stash_end()
 {
     const void* image;
     int w, h;
@@ -375,28 +351,22 @@ nk_sfml_font_stash_end(void)
 }
 
 NK_API int
-nk_sfml_handle_event(sf::Event* event)
+nk_sfml_handle_event(sf::Event* evt)
 {
     struct nk_context* ctx = &sfml.ctx;
-
     /* optional grabbing behavior */
     if(ctx->input.mouse.grab)
         ctx->input.mouse.grab = 0;
-    else if(ctx->input.mouse.ungrab)
-    {
+    else if(ctx->input.mouse.ungrab) {
         int x = (int)ctx->input.mouse.prev.x;
         int y = (int)ctx->input.mouse.prev.y;
-        
         sf::Mouse::setPosition(sf::Vector2i(x, y), *sfml.window);
         ctx->input.mouse.ungrab = 0;
     }
-
-
-    if(event->type == sf::Event::KeyReleased || event->type == sf::Event::KeyPressed)
+    if(evt->type == sf::Event::KeyReleased || evt->type == sf::Event::KeyPressed)
     {
-        int down = event->type == sf::Event::KeyPressed;
-        sf::Keyboard::Key key = event->key.code;
-
+        int down = evt->type == sf::Event::KeyPressed;
+        sf::Keyboard::Key key = evt->key.code;
         if(key == sf::Keyboard::RShift || key == sf::Keyboard::LShift)
             nk_input_key(ctx, NK_KEY_SHIFT, down);
         else if(key == sf::Keyboard::Delete)
@@ -407,17 +377,13 @@ nk_sfml_handle_event(sf::Event* event)
             nk_input_key(ctx, NK_KEY_TAB, down);
         else if(key == sf::Keyboard::BackSpace)
             nk_input_key(ctx, NK_KEY_BACKSPACE, down);
-        else if(key == sf::Keyboard::Home)
-        {
+        else if(key == sf::Keyboard::Home) {
             nk_input_key(ctx, NK_KEY_TEXT_START, down);
             nk_input_key(ctx, NK_KEY_SCROLL_START, down);
-        }
-        else if(key == sf::Keyboard::End)
-        {
+        } else if(key == sf::Keyboard::End) {
             nk_input_key(ctx, NK_KEY_TEXT_END, down);
             nk_input_key(ctx, NK_KEY_SCROLL_END, down);
-        }
-        else if(key == sf::Keyboard::PageDown)
+        } else if(key == sf::Keyboard::PageDown)
             nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down);
         else if(key == sf::Keyboard::PageUp)
             nk_input_key(ctx, NK_KEY_SCROLL_DOWN, down);
@@ -439,89 +405,54 @@ nk_sfml_handle_event(sf::Event* event)
             nk_input_key(ctx, NK_KEY_UP, down);
         else if(key == sf::Keyboard::Down)
             nk_input_key(ctx, NK_KEY_DOWN, down);
-        else if(key == sf::Keyboard::Left)
-        {
+        else if(key == sf::Keyboard::Left) {
             if(sf::Keyboard::isKeyPressed(sf::Keyboard::LControl))
                 nk_input_key(ctx, NK_KEY_TEXT_WORD_LEFT, down);
-            else
-                nk_input_key(ctx, NK_KEY_LEFT, down);
-        }
-        else if(key == sf::Keyboard::Right)
-        {
+            else nk_input_key(ctx, NK_KEY_LEFT, down);
+        } else if(key == sf::Keyboard::Right) {
             if(sf::Keyboard::isKeyPressed(sf::Keyboard::LControl))
                 nk_input_key(ctx, NK_KEY_TEXT_WORD_RIGHT, down);
-            else
-                nk_input_key(ctx, NK_KEY_RIGHT, down);
-        }
-        else return 0;
-
+            else nk_input_key(ctx, NK_KEY_RIGHT, down);
+        } else return 0;
         return 1;
-    }
-    else if(event->type == sf::Event::MouseButtonPressed || event->type == sf::Event::MouseButtonReleased)
-    {
-        int down = event->type == sf::Event::MouseButtonPressed;
-        const int x = event->mouseButton.x;
-        const int y = event->mouseButton.y;
-
-        if(event->mouseButton.button == sf::Mouse::Left)
+    } else if(evt->type == sf::Event::MouseButtonPressed || evt->type == sf::Event::MouseButtonReleased) {
+        int down = evt->type == sf::Event::MouseButtonPressed;
+        const int x = evt->mouseButton.x, y = evt->mouseButton.y;
+        if(evt->mouseButton.button == sf::Mouse::Left)
             nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down);
-        if(event->mouseButton.button == sf::Mouse::Middle)
+        if(evt->mouseButton.button == sf::Mouse::Middle)
             nk_input_button(ctx, NK_BUTTON_MIDDLE, x, y, down);
-        if(event->mouseButton.button == sf::Mouse::Right)
+        if(evt->mouseButton.button == sf::Mouse::Right)
             nk_input_button(ctx, NK_BUTTON_RIGHT, x, y, down);
-        else
-            return 0;
-
+        else return 0;
         return 1;
-    }
-    else if(event->type == sf::Event::MouseMoved)
-    {
-        nk_input_motion(ctx, event->mouseMove.x, event->mouseMove.y);
-
+    } else if(evt->type == sf::Event::MouseMoved) {
+        nk_input_motion(ctx, evt->mouseMove.x, evt->mouseMove.y);
         return 1;
-    }
-    else if(event->type == sf::Event::TouchBegan || event->type == sf::Event::TouchEnded)
-    {
-        int down = event->type == sf::Event::TouchBegan;
-        const int x = event->touch.x;
-        const int y = event->touch.y;
-
+    } else if(evt->type == sf::Event::TouchBegan || evt->type == sf::Event::TouchEnded) {
+        int down = evt->type == sf::Event::TouchBegan;
+        const int x = evt->touch.x, y = evt->touch.y;
         nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down);
-
         return 1;
-    }
-    else if(event->type == sf::Event::TouchMoved)
-    {
-        if(ctx->input.mouse.grabbed)
-        {
+    } else if(evt->type == sf::Event::TouchMoved) {
+        if(ctx->input.mouse.grabbed) {
             int x = (int)ctx->input.mouse.prev.x;
             int y = (int)ctx->input.mouse.prev.y;
-
-            nk_input_motion(ctx, x + event->touch.x, y + event->touch.y);
-        }
-        else
-            nk_input_motion(ctx, event->touch.x, event->touch.y);
-
+            nk_input_motion(ctx, x + evt->touch.x, y + evt->touch.y);
+        } else nk_input_motion(ctx, evt->touch.x, evt->touch.y);
         return 1;
-    }
-    else if(event->type == sf::Event::TextEntered)
-    {
-        nk_input_unicode(ctx, event->text.unicode);
-
+    } else if(evt->type == sf::Event::TextEntered) {
+        nk_input_unicode(ctx, evt->text.unicode);
         return 1;
-    }
-    else if(event->type == sf::Event::MouseWheelScrolled)
-    {
-        nk_input_scroll(ctx, event->mouseWheelScroll.delta);
-
+    } else if(evt->type == sf::Event::MouseWheelScrolled) {
+        nk_input_scroll(ctx, evt->mouseWheelScroll.delta);
         return 1;
     }
-
     return 0;
 }
 
 NK_API
-void nk_sfml_shutdown(void)
+void nk_sfml_shutdown()
 {
     nk_font_atlas_clear(&sfml.atlas);
     nk_free(&sfml.ctx);