mirrors/Nuklear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sfml_gl2: add delta_time_seconds

Browse Source
This commit is contained in:
PROP 65 2024-08-29 03:15:45 +00:00 committed by GitHub
parent 81ae780756
commit 49fd23e13c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
demo/sfml_opengl2/nuklear_sfml_gl2.h
View File

@ -14,6 +14,7 @@
#define NK_SFML_GL2_H_ #define NK_SFML_GL2_H_
#include <SFML/Window.hpp> #include <SFML/Window.hpp>
#include <SFML/System/Clock.hpp>
NK_API struct nk_context* nk_sfml_init(sf::Window* window); NK_API struct nk_context* nk_sfml_init(sf::Window* window);
NK_API void nk_sfml_font_stash_begin(struct nk_font_atlas** atlas); NK_API void nk_sfml_font_stash_begin(struct nk_font_atlas** atlas);
@ -51,6 +52,7 @@ static struct nk_sfml {
struct nk_sfml_device ogl; struct nk_sfml_device ogl;
struct nk_context ctx; struct nk_context ctx;
struct nk_font_atlas atlas; struct nk_font_atlas atlas;
sf::Clock* frame_delta_clock;
} sfml; } sfml;
NK_INTERN void NK_INTERN void
@ -74,6 +76,9 @@ nk_sfml_render(enum nk_anti_aliasing AA)
int window_width = sfml.window->getSize().x; int window_width = sfml.window->getSize().x;
int window_height = sfml.window->getSize().y; int window_height = sfml.window->getSize().y;
sfml.ctx.delta_time_seconds = (float)((double)sfml.frame_delta_clock->getElapsedTime().asMicroseconds() / 1000000);
sfml.frame_delta_clock->restart();
glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TRANSFORM_BIT); glPushAttrib(GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_TRANSFORM_BIT);
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
@ -229,6 +234,7 @@ nk_sfml_init(sf::Window* window)
sfml.ctx.clip.paste = nk_sfml_clipboard_paste; sfml.ctx.clip.paste = nk_sfml_clipboard_paste;
sfml.ctx.clip.userdata = nk_handle_ptr(0); sfml.ctx.clip.userdata = nk_handle_ptr(0);
nk_buffer_init_default(&sfml.ogl.cmds); nk_buffer_init_default(&sfml.ogl.cmds);
sfml.frame_delta_clock = new sf::Clock();
return &sfml.ctx; return &sfml.ctx;
} }
@ -334,8 +340,8 @@ nk_sfml_handle_event(sf::Event* evt)
} else if(evt->type == sf::Event::TouchBegan || evt->type == sf::Event::TouchEnded) { } else if(evt->type == sf::Event::TouchBegan || evt->type == sf::Event::TouchEnded) {
int down = evt->type == sf::Event::TouchBegan; int down = evt->type == sf::Event::TouchBegan;
const int x = evt->touch.x, y = evt->touch.y; const int x = evt->touch.x, y = evt->touch.y;
ctx->input.mouse.pos.x = x; ctx->input.mouse.pos.x = x;
ctx->input.mouse.pos.y = y; ctx->input.mouse.pos.y = y;
nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down); nk_input_button(ctx, NK_BUTTON_LEFT, x, y, down);
return 1; return 1;
} else if(evt->type == sf::Event::TouchMoved) { } else if(evt->type == sf::Event::TouchMoved) {
@ -363,6 +369,7 @@ void nk_sfml_shutdown(void)
nk_free(&sfml.ctx); nk_free(&sfml.ctx);
glDeleteTextures(1, &dev->font_tex); glDeleteTextures(1, &dev->font_tex);
nk_buffer_free(&dev->cmds); nk_buffer_free(&dev->cmds);
delete sfml.frame_delta_clock;
memset(&sfml, 0, sizeof(sfml)); memset(&sfml, 0, sizeof(sfml));
} }