소스 검색

Update delta_time

Rob Loach 1 년 전
부모
커밋
3d7ef2c92a

+ 5 - 5
demo/allegro5/nuklear_allegro5.h

@@ -66,7 +66,7 @@ static struct nk_allegro5 {
     int touch_down_id;
     struct nk_context ctx;
     struct nk_buffer cmds;
-    double delta_time_last;
+    float delta_time_seconds_last;
 } allegro5;
 
 
@@ -179,9 +179,9 @@ nk_allegro5_render()
     const struct nk_command *cmd;
 
     /* Update the timer */
-    double now = al_get_time();
-    allegro5.ctx.delta_time_seconds = now - allegro5.delta_time_last;
-    allegro5.delta_time_last = now;
+    float now = (float)al_get_time();
+    allegro5.ctx.delta_time_seconds = now - allegro5.delta_time_seconds_last;
+    allegro5.delta_time_seconds_last = now;
 
     al_set_target_backbuffer(allegro5.dsp);
 
@@ -504,7 +504,7 @@ nk_allegro5_init(NkAllegro5Font *allegro5font, ALLEGRO_DISPLAY *dsp,
     allegro5.height = height;
     allegro5.is_touch_down = 0;
     allegro5.touch_down_id = -1;
-    allegro5.delta_time_last = al_get_time();
+    allegro5.delta_time_seconds_last = (float)al_get_time();
 
     nk_init_default(&allegro5.ctx, font);
     allegro5.ctx.clip.copy = nk_allegro5_clipboard_copy;

+ 5 - 5
demo/glfw_opengl2/nuklear_glfw_gl2.h

@@ -79,7 +79,7 @@ static struct nk_glfw {
     double last_button_click;
     int is_double_click_down;
     struct nk_vec2 double_click_pos;
-    double delta_time_last;
+    float delta_time_seconds_last;
 } glfw;
 
 NK_INTERN void
@@ -274,7 +274,7 @@ nk_glfw3_init(GLFWwindow *win, enum nk_glfw_init_state init_state)
     glfw.is_double_click_down = nk_false;
     glfw.double_click_pos = nk_vec2(0, 0);
 
-    glfw.delta_time_last = glfwGetTime();
+    glfw.delta_time_seconds_last = (float)glfwGetTime();
 
     return &glfw.ctx;
 }
@@ -307,9 +307,9 @@ nk_glfw3_new_frame(void)
     struct GLFWwindow *win = glfw.win;
 
     /* update the timer */
-    double delta_time_now = glfwGetTime();
-    glfw.ctx.delta_time_seconds = delta_time_now - glfw.delta_time_last;
-    glfw.delta_time_last = delta_time_now;
+    float delta_time_now = (float)glfwGetTime();
+    glfw.ctx.delta_time_seconds = delta_time_now - glfw.delta_time_seconds_last;
+    glfw.delta_time_seconds_last = delta_time_now;
 
     glfwGetWindowSize(win, &glfw.width, &glfw.height);
     glfwGetFramebufferSize(win, &glfw.display_width, &glfw.display_height);

+ 5 - 5
demo/glfw_opengl3/nuklear_glfw_gl3.h

@@ -53,7 +53,7 @@ struct nk_glfw {
     double last_button_click;
     int is_double_click_down;
     struct nk_vec2 double_click_pos;
-    double delta_time_last;
+    float delta_time_seconds_last;
 };
 
 NK_API struct nk_context*   nk_glfw3_init(struct nk_glfw* glfw, GLFWwindow *win, enum nk_glfw_init_state);
@@ -390,7 +390,7 @@ nk_glfw3_init(struct nk_glfw* glfw, GLFWwindow *win, enum nk_glfw_init_state ini
     glfw->is_double_click_down = nk_false;
     glfw->double_click_pos = nk_vec2(0, 0);
 
-    glfw->delta_time_last = glfwGetTime();
+    glfw->delta_time_seconds_last = (float)glfwGetTime();
 
     return &glfw->ctx;
 }
@@ -423,9 +423,9 @@ nk_glfw3_new_frame(struct nk_glfw* glfw)
     struct GLFWwindow *win = glfw->win;
 
     /* update the timer */
-    double delta_time_now = glfwGetTime();
-    glfw->ctx.delta_time_seconds = delta_time_now - glfw->delta_time_last;
-    glfw->delta_time_last = delta_time_now;
+    float delta_time_now = (float)glfwGetTime();
+    glfw->ctx.delta_time_seconds = delta_time_now - glfw->delta_time_seconds_last;
+    glfw->delta_time_seconds_last = delta_time_now;
 
     glfwGetWindowSize(win, &glfw->width, &glfw->height);
     glfwGetFramebufferSize(win, &glfw->display_width, &glfw->display_height);

+ 4 - 4
demo/glfw_vulkan/nuklear_glfw_vulkan.h

@@ -379,7 +379,7 @@ static struct nk_glfw {
     double last_button_click;
     int is_double_click_down;
     struct nk_vec2 double_click_pos;
-    double delta_time_last;
+    float delta_time_seconds_last;
 } glfw;
 
 struct Mat4f {
@@ -1256,9 +1256,9 @@ NK_API void nk_glfw3_new_frame(void) {
     struct GLFWwindow *win = glfw.win;
 
     /* update the timer */
-    double delta_time_now = glfwGetTime();
-    glfw.ctx.delta_time_seconds = delta_time_now - glfw.delta_time_last;
-    glfw.delta_time_last = delta_time_now;
+    float delta_time_now = (float)glfwGetTime();
+    glfw.ctx.delta_time_seconds = delta_time_now - glfw.delta_time_seconds_last;
+    glfw.delta_time_seconds_last = delta_time_now;
 
     nk_input_begin(ctx);
     for (i = 0; i < glfw.text_len; ++i)

+ 0 - 6
demo/rawfb/nuklear_rawfb.h

@@ -70,7 +70,6 @@ struct rawfb_context {
     struct rawfb_image fb;
     struct rawfb_image font_tex;
     struct nk_font_atlas atlas;
-    Uint64 delta_time_last;
 };
 
 #ifndef MIN
@@ -1035,11 +1034,6 @@ nk_rawfb_render(const struct rawfb_context *rawfb,
 {
     const struct nk_command *cmd;
 
-    /* update the timer */
-    Uint64 now = SDL_GetTicks64();
-    sdlsurface->ctx.delta_time_seconds = (float)(now - sdlsurface->delta_time_last) / 1000;
-    sdlsurface->delta_time_last = now;
-
     if (enable_clear)
         nk_rawfb_clear(rawfb, clear);
 

+ 1 - 6
demo/sdl_renderer/nuklear_sdl_renderer.h

@@ -88,11 +88,6 @@ nk_sdl_render(enum nk_anti_aliasing AA)
     /* setup global state */
     struct nk_sdl_device *dev = &sdl.ogl;
 
-    /* update the timer */
-    Uint64 now = SDL_GetTicks64();
-    sdl.ctx.delta_time_seconds = (float)(now - sdl.delta_time_last) / 1000;
-    sdl.delta_time_last = now;
-
     {
         SDL_Rect saved_clip;
 #ifdef NK_SDL_CLAMP_CLIP_RECT
@@ -250,7 +245,7 @@ nk_sdl_init(SDL_Window *win, SDL_Renderer *renderer)
 #endif
     sdl.win = win;
     sdl.renderer = renderer;
-    sdl.delta_time_last = SDL_GetTicks64();
+    sdl.delta_time_seconds_last = ((float)SDL_GetTicks64()) / 1000;
     nk_init_default(&sdl.ctx, 0);
     sdl.ctx.clip.copy = nk_sdl_clipboard_copy;
     sdl.ctx.clip.paste = nk_sdl_clipboard_paste;