From 007695b3828c2ef32c6ae9c619dcdcf2b8633252 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 6 Nov 2018 20:36:42 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E8=AE=A1=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/state_machine/main.cpp | 3 +-- src/libjin/Graphics/fonts/je_ttf.cpp | 8 ++++---- src/libjin/Time/je_timer.cpp | 3 ++- src/libjin/Time/je_timer.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/state_machine/main.cpp b/examples/state_machine/main.cpp index ffcf8e9..fb11fa3 100644 --- a/examples/state_machine/main.cpp +++ b/examples/state_machine/main.cpp @@ -47,13 +47,12 @@ void onLoad() timer.after(5000, [](void*) { sm.setParameterb("idle", true); sm.setParametert("run"); - timer.cancelAll(); + timer.cancel(hnd); //sm.setParameterb("run", false); }, NULL); timer.after(8000, [](void*) { sm.setParameterb("idle2", true); //sm.setParameterb("run", false); - timer.cancel(); }, NULL); } diff --git a/src/libjin/Graphics/fonts/je_ttf.cpp b/src/libjin/Graphics/fonts/je_ttf.cpp index f8d70e7..afd7973 100644 --- a/src/libjin/Graphics/fonts/je_ttf.cpp +++ b/src/libjin/Graphics/fonts/je_ttf.cpp @@ -24,9 +24,9 @@ namespace JinEngine namespace Fonts { - ///////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////////////////// // TTFData - ///////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////////////////// TTFData* TTFData::createTTFData(const unsigned char* data, unsigned int size) { @@ -144,9 +144,9 @@ namespace JinEngine return bitmap32; } - ///////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////////////////// // TTF - ///////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////////////////// #include "../shaders/built-in/je_font.shader.h" diff --git a/src/libjin/Time/je_timer.cpp b/src/libjin/Time/je_timer.cpp index fcd805c..8c48634 100644 --- a/src/libjin/Time/je_timer.cpp +++ b/src/libjin/Time/je_timer.cpp @@ -38,7 +38,8 @@ namespace JinEngine void Timer::cancel(Handler* handler) { - handler->canceled = true; + if(handler != nullptr) + handler->canceled = true; } void Timer::cancelAll() diff --git a/src/libjin/Time/je_timer.h b/src/libjin/Time/je_timer.h index 1310890..603cade 100644 --- a/src/libjin/Time/je_timer.h +++ b/src/libjin/Time/je_timer.h @@ -80,7 +80,7 @@ namespace JinEngine /// /// /// - void cancel(Handler* handler = nullptr); + void cancel(Handler* handler); /// /// -- cgit v1.1-26-g67d0