redraw

Author: flipcoder

Qor/LoadingState.cpp

@@ -115,12 +115,12 @@ LoadingState :: LoadingState(Qor* qor):
     //fade_to(Color::white(), m_FadeTime);
     m_Fade.frame(Frame<Color>(
         Color::white(),
-        Freq::Time::seconds(0.25f),
+        Freq::Time::seconds(0.5f),
         INTERPOLATE(out_sine<Color>)
     ));
     //m_Fade.frame(Frame<Color>(
     //    Color::white(), // wait a while
-    //    Freq::Time::seconds(0.25f),
+    //    Freq::Time::seconds(0.5f),
     //    INTERPOLATE(Color, out_sine)
     //));
 #ifndef QOR_NO_AUDIO
@@ -207,7 +207,7 @@ void LoadingState :: logic(Freq::Time t)
             {
                 m_Fade.frame(Frame<Color>(
                     Color::black(),
-                    Freq::Time::seconds(0.25f),
+                    Freq::Time::seconds(0.5f),
                     INTERPOLATE(out_sine<Color>)
                 ));
             }
@@ -231,6 +231,8 @@ void LoadingState :: logic(Freq::Time t)
             }
         }
     }
+    
+    m_pPipeline->redraw();
 }
 
 void LoadingState :: render() const

Qor/Main.cpp

@@ -22,9 +22,6 @@ int main(int argc, char* argv[])
 
     auto engine = kit::make_unique<Qor>(args, Info::Program);
 
-    //engine->max_tick(300.0f);
-    //engine->max_fps(30.0f);
-    
     if(engine->args().value_or("mod", "").empty())
         engine->states().register_class<BasicState>(); // run basic state
     else

Qor/Qor.cpp

@@ -182,6 +182,15 @@ Qor :: ~Qor()
     m_pPipeline.reset();
 }
 
+bool Qor :: needs_render() const
+{
+    bool pipeline_dirty = m_pPipeline->dirty();
+    int pipeline_idlemode = m_pPipeline->idle();
+    if(not (pipeline_idlemode & Pipeline::IDLE_RENDER) || pipeline_dirty)
+        return true;
+    return false;
+}
+
 void Qor :: logic()
 {
     Freq::Time t;
@@ -200,17 +209,21 @@ void Qor :: logic()
         m_FrameAccum += t.s();
         if(m_MaxTick < K_EPSILON) // MaxTick==0 for unlimited ticks
             break;
-        if((m_TickAccum > 1.0f/m_MaxTick) ||
-            (m_MaxFPS > K_EPSILON && m_FrameAccum > 1.0f/m_MaxFPS))
+        if(m_TickAccum > 1.0f/m_MaxTick)
             break;
+        if(m_MaxFPS > K_EPSILON && m_FrameAccum > 1.0f/m_MaxFPS) {
+            if(needs_render())
+                break;
+        }
         try{
+            //SDL_Delay(1);
             this_thread::yield();
         }catch(...){
             quit();
             return;
         }
     }
-    //LOGf("%s", m_TickAccum);
+    t = Freq::Time::seconds(m_TickAccum);
 
     ++m_TicksLastSecond;
 
@@ -239,9 +252,7 @@ void Qor :: render()
     if(Headless::enabled())
         return;
 
-    bool pipeline_dirty = m_pPipeline->dirty();
-    int pipeline_idlemode = m_pPipeline->idle();
-    if((pipeline_idlemode & Pipeline::IDLE_RENDER) && not pipeline_dirty)
+    if(!needs_render())
         return;
 
     if(m_FPSAlarm.elapsed()) {

Qor/Qor.h

@@ -220,6 +220,8 @@ class Qor:
         mutable std::mutex m_TasksMutex;
         std::thread::id m_HandlerThreadID = std::this_thread::get_id();
         std::deque<std::function<void()>> m_Tasks;
+
+        bool needs_render() const;
 
         void async_load(State* s)
         {