diff --git a/src/dusk/console/console.c b/src/dusk/console/console.c index 1ebc42b0..a62ef2b6 100644 --- a/src/dusk/console/console.c +++ b/src/dusk/console/console.c @@ -136,7 +136,6 @@ errorret_t consoleDraw(void) { &FONT_TEXTURE_DEFAULT )); } - errorChain(spriteBatchFlush()); errorOk(); } diff --git a/src/dusk/ui/ui.c b/src/dusk/ui/ui.c index 2f144ea6..47c83d00 100644 --- a/src/dusk/ui/ui.c +++ b/src/dusk/ui/ui.c @@ -17,11 +17,6 @@ ui_t UI; errorret_t uiInit(void) { memoryZero(&UI, sizeof(ui_t)); - - // cameraInitOrthographic(&UI.camera); - // UI.camera.orthographic.left = 0; - // UI.camera.orthographic.bottom = 0; - errorOk(); } @@ -30,6 +25,7 @@ void uiUpdate(void) { errorret_t uiRender(void) { errorChain(uiFPSDraw()); + errorChain(spriteBatchFlush()); errorChain(consoleDraw()); errorChain(spriteBatchFlush()); diff --git a/src/dusk/ui/uifps.c b/src/dusk/ui/uifps.c index a4c9fc9a..6a9a908d 100644 --- a/src/dusk/ui/uifps.c +++ b/src/dusk/ui/uifps.c @@ -40,7 +40,7 @@ errorret_t uiFPSDraw() { ); color_t textColor; - if(fps >= 60.0f) { + if(fps >= 55.0f) { textColor = COLOR_GREEN; } else if(fps >= 45.0f) { textColor = COLOR_YELLOW; diff --git a/src/duskdolphin/time/timedolphin.c b/src/duskdolphin/time/timedolphin.c index 1d053693..0d9e612f 100644 --- a/src/duskdolphin/time/timedolphin.c +++ b/src/duskdolphin/time/timedolphin.c @@ -9,8 +9,8 @@ double_t timeGetRealDolphin(void) { // "Returns time in ticks since 2000" - u64 timeInMillis = PPCTicksToMs(SYS_Time()); - double_t timeSeconds = (double_t)timeInMillis / 1000.0; + u64 timeInUs = PPCTicksToUs(SYS_Time()); + double_t timeSeconds = (double_t)timeInUs / 1000000.0; // Time to adjust time from 2000 to 1970, in seconds double_t timeOffset = 946684800.0;