Changeset 1106 for trunkTweet

Timestamp:

Dec 7, 2011, 2:06:19 AM (11 years ago)

Author:

sam

Message:

core: try to merge Ticker and Emcee. Still not very good.

Location:

trunk

Files:

• deushax/gtk/glmapview.cpp (modified) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/application/application.cpp (modified) (2 diffs)
• src/core.h (modified) (1 diff)
• src/eglapp.cpp (modified) (2 diffs)
• src/emcee.cpp (deleted)
• src/emcee.h (deleted)
• src/entity.cpp (modified) (2 diffs)
• src/entity.h (modified) (1 diff)
• src/platform/android/androidapp.cpp (modified) (1 diff)
• src/platform/nacl/nacl_instance.cpp (modified) (1 diff)
• src/platform/nacl/naclapp.cpp (modified) (2 diffs)
• src/platform/ps3/ps3app.cpp (modified) (2 diffs)
• src/platform/sdl/sdlapp.cpp (modified) (2 diffs)
• src/ticker.cpp (modified) (4 diffs)
• src/ticker.h (modified) (2 diffs)

trunk/deushax/gtk/glmapview.cpp

@@ -111 +111 @@
         ticking = TRUE;
 
+        /* FIXME: shouldn't this be protected by a mutex? */
         if (mapviewer)
             mapviewer->SetPOV(gtk_adjustment_get_value(hadj),
                               mapviewer->GetHeight() - glarea->allocation.height
                                - gtk_adjustment_get_value(vadj));
-
-        /* Tick the game */
-        Ticker::TickGame();
     }
 
@@ -183 +181 @@
         while (g_main_context_iteration(NULL, FALSE))
             ;
-
-        /* FIXME: do some GTK stuff instead of waiting for so long */
-        Ticker::ClampFps();
     }
 

trunk/src/Makefile.am

@@ -12 +12 @@
     worldentity.cpp worldentity.h gradient.cpp gradient.h half.cpp half.h \
     platform.cpp platform.h sprite.cpp sprite.h trig.cpp trig.h \
-    real.cpp real.h emcee.cpp emcee.h \
+    real.cpp real.h \
     \
     lol/unit.h \

trunk/src/application/application.cpp

@@ -60 +60 @@
 Application::Application(char const *name, ivec2 resolution, float framerate)
 {
-    Emcee::Setup();
     data = new ApplicationData(name, resolution, framerate);
 }
@@ -77 +76 @@
 {
     delete data;
-    Emcee::Shutdown();
 }
 

trunk/src/core.h

@@ -104 +104 @@
 
 // Managers
-#include "emcee.h"
 #include "ticker.h"
 #include "forge.h"

trunk/src/eglapp.cpp

@@ -159 +159 @@
     while (!Ticker::Finished())
     {
-        /* Tick the game */
-        Ticker::TickGame();
-
         /* Tick the renderer, show the frame and clamp to desired framerate. */
         Ticker::TickDraw();
@@ -167 +164 @@
         eglSwapBuffers(data->egl_dpy, data->egl_surf);
 #endif
-
-        Ticker::ClampFps();
     }
 }

trunk/src/entity.cpp

@@ -71 +71 @@
 void Entity::SetState(uint32_t state)
 {
-    Emcee::SetState(this, state);
+    Ticker::SetState(this, state);
 }
 
@@ -77 +77 @@
                                Entity *other_entity, uint32_t other_state)
 {
-    Emcee::SetStateWhenMatch(this, state, other_entity, other_state);
+    Ticker::SetStateWhenMatch(this, state, other_entity, other_state);
 }
 

trunk/src/entity.h

@@ -30 +30 @@
     friend class TickerData;
     friend class Dict;
+    friend class Emcee;
 
 protected:

trunk/src/platform/android/androidapp.cpp

@@ -97 +97 @@
 Java_org_zoy_LolEngine_LolRenderer_nativeRender(JNIEnv* env)
 {
-    Ticker::ClampFps();
-    Ticker::TickGame();
     Ticker::TickDraw();
 }

trunk/src/platform/nacl/nacl_instance.cpp

@@ -127 +127 @@
         return;
 
-    Ticker::ClampFps();
-    Ticker::TickGame();
-
     opengl_context_->MakeContextCurrent(this);
     Ticker::TickDraw();

trunk/src/platform/nacl/naclapp.cpp

@@ -59 +59 @@
     while (!Ticker::Finished())
     {
-        /* Tick the game */
-        Ticker::TickGame();
-
         /* Tick the renderer, show the frame and clamp to desired framerate. */
         Ticker::TickDraw();
@@ -67 +64 @@
 #if defined __native_client__
 #endif
-
-        Ticker::ClampFps();
     }
 }

trunk/src/platform/ps3/ps3app.cpp

@@ -119 +119 @@
     while (!Ticker::Finished())
     {
-        /* Tick the game */
-        Ticker::TickGame();
-
         /* Tick the renderer, show the frame and clamp to desired framerate. */
         Ticker::TickDraw();
@@ -131 +128 @@
         cellSysutilCheckCallback();
 #endif
-
-        Ticker::ClampFps();
     }
 }

trunk/src/platform/sdl/sdlapp.cpp

@@ -85 +85 @@
     while (!Ticker::Finished())
     {
-        /* Tick the game */
-        Ticker::TickGame();
-
         /* Tick the renderer, show the frame and clamp to desired framerate. */
         Ticker::TickDraw();
@@ -93 +90 @@
         SDL_GL_SwapBuffers();
 #endif
-        Ticker::ClampFps();
     }
 }

trunk/src/ticker.cpp

@@ -67 +67 @@
     Timer timer;
     float deltams, bias, fps;
+
+    /* Background threads */
+    static void *GameThreadMain(void *p);
+    static void *DrawThreadMain(void *p); /* unused */
+    Thread *gamethread, *drawthread;
+    Queue gametick, drawtick;
 
     /* Shutdown management */
@@ -142 +148 @@
 }
 
-void Ticker::Setup(float fps)
-{
-    data->fps = fps;
-}
-
-void Ticker::TickGame()
-{
-    Profiler::Stop(Profiler::STAT_TICK_FRAME);
-    Profiler::Start(Profiler::STAT_TICK_FRAME);
-
-    Profiler::Start(Profiler::STAT_TICK_GAME);
+void *TickerData::GameThreadMain(void *p)
+{
+    for (;;)
+    {
+        int tick = data->gametick.Pop();
+        if (!tick)
+            break;
+
+        Profiler::Stop(Profiler::STAT_TICK_FRAME);
+        Profiler::Start(Profiler::STAT_TICK_FRAME);
+
+        Profiler::Start(Profiler::STAT_TICK_GAME);
 
 #if 0
-    Log::Debug("-------------------------------------\n");
-    for (int i = 0; i < Entity::ALLGROUP_END; i++)
-    {
-        Log::Debug("%s Group %i\n",
-                   (i < Entity::GAMEGROUP_END) ? "Game" : "Draw", i);
-
-        for (Entity *e = data->list[i]; e; )
-        {
-            Log::Debug("  \\-- %s (ref %i, destroy %i)\n", e->GetName(), e->ref, e->destroy);
-            e = (i < Entity::GAMEGROUP_END) ? e->gamenext : e->drawnext;
-        }
-    }
-#endif
-
-    data->frame++;
-
-    /* If recording with fixed framerate, set deltams to a fixed value */
-    if (data->recording && data->fps)
-    {
-        data->deltams = 1000.0f / data->fps;
-    }
-    else
-    {
-        data->deltams = data->timer.GetMs();
-        data->bias += data->deltams;
-    }
-
-    /* If shutdown is stuck, kick the first entity we meet and see
-     * whether it makes things better. Note that it is always a bug to
-     * have referenced entities after 20 frames, but at least this
-     * safeguard makes it possible to exit the program cleanly. */
-    if (data->quit && !((data->frame - data->quitframe) % data->quitdelay))
-    {
-        int n = 0;
-        data->panic = 2 * (data->panic + 1);
-
-        for (int i = 0; i < Entity::ALLGROUP_END && n < data->panic; i++)
-        for (Entity *e = data->list[i]; e && n < data->panic; e = e->gamenext)
-            if (e->ref)
+        Log::Debug("-------------------------------------\n");
+        for (int i = 0; i < Entity::ALLGROUP_END; i++)
+        {
+            Log::Debug("%s Group %i\n",
+                       (i < Entity::GAMEGROUP_END) ? "Game" : "Draw", i);
+
+            for (Entity *e = data->list[i]; e; )
             {
-#if !LOL_RELEASE
-                Log::Error("poking %s\n", e->GetName());
-#endif
-                e->ref--;
-                n++;
-            }
-
-#if !LOL_RELEASE
-        if (n)
-            Log::Error("%i entities stuck after %i frames, poked %i\n",
-                       data->nentities, data->quitdelay, n);
-#endif
-
-        data->quitdelay = data->quitdelay > 1 ? data->quitdelay / 2 : 1;
-    }
-
-    /* Garbage collect objects that can be destroyed. We can do this
-     * before inserting awaiting objects, because only objects already in
-     * the tick lists can be marked for destruction. */
-    for (int i = 0; i < Entity::ALLGROUP_END; i++)
-        for (Entity *e = data->list[i], *prev = NULL; e; )
-        {
-            if (e->destroy && i < Entity::GAMEGROUP_END)
-            {
-                /* If entity is to be destroyed, remove it from the
-                 * game tick list. */
-                (prev ? prev->gamenext : data->list[i]) = e->gamenext;
-
-                e = e->gamenext;
-            }
-            else if (e->destroy)
-            {
-                /* If entity is to be destroyed, remove it from the
-                 * draw tick list and destroy it. */
-                (prev ? prev->drawnext : data->list[i]) = e->drawnext;
-
-                Entity *tmp = e;
-                e = e->drawnext; /* Can only be in a draw group list */
-                delete tmp;
-
-                data->nentities--;
-            }
-            else
-            {
-                if (e->ref <= 0 && i >= Entity::DRAWGROUP_BEGIN)
-                    e->destroy = 1;
-                prev = e;
+                Log::Debug("  \\-- %s (ref %i, destroy %i)\n", e->GetName(), e->ref, e->destroy);
                 e = (i < Entity::GAMEGROUP_END) ? e->gamenext : e->drawnext;
             }
         }
-
-    /* Insert waiting objects into the appropriate lists */
-    while (data->todolist)
-    {
-        Entity *e = data->todolist;
-        data->todolist = e->gamenext;
-
-        e->gamenext = data->list[e->gamegroup];
-        data->list[e->gamegroup] = e;
-        e->drawnext = data->list[e->drawgroup];
-        data->list[e->drawgroup] = e;
-    }
-
-    /* Tick objects for the game loop */
-    for (int i = Entity::GAMEGROUP_BEGIN; i < Entity::GAMEGROUP_END; i++)
-        for (Entity *e = data->list[i]; e; e = e->gamenext)
-            if (!e->destroy)
+#endif
+
+        data->frame++;
+
+        /* If recording with fixed framerate, set deltams to a fixed value */
+        if (data->recording && data->fps)
+        {
+            data->deltams = 1000.0f / data->fps;
+        }
+        else
+        {
+            data->deltams = data->timer.GetMs();
+            data->bias += data->deltams;
+        }
+
+        /* If shutdown is stuck, kick the first entity we meet and see
+         * whether it makes things better. Note that it is always a bug to
+         * have referenced entities after 20 frames, but at least this
+         * safeguard makes it possible to exit the program cleanly. */
+        if (data->quit && !((data->frame - data->quitframe) % data->quitdelay))
+        {
+            int n = 0;
+            data->panic = 2 * (data->panic + 1);
+
+            for (int i = 0; i < Entity::ALLGROUP_END && n < data->panic; i++)
+            for (Entity *e = data->list[i]; e && n < data->panic; e = e->gamenext)
+                if (e->ref)
+                {
+#if !LOL_RELEASE
+                    Log::Error("poking %s\n", e->GetName());
+#endif
+                    e->ref--;
+                    n++;
+                }
+
+#if !LOL_RELEASE
+            if (n)
+                Log::Error("%i entities stuck after %i frames, poked %i\n",
+                           data->nentities, data->quitdelay, n);
+#endif
+
+            data->quitdelay = data->quitdelay > 1 ? data->quitdelay / 2 : 1;
+        }
+
+        /* Garbage collect objects that can be destroyed. We can do this
+         * before inserting awaiting objects, because only objects already
+         * inthe tick lists can be marked for destruction. */
+        for (int i = 0; i < Entity::ALLGROUP_END; i++)
+            for (Entity *e = data->list[i], *prev = NULL; e; )
             {
-#if !LOL_RELEASE
-                if (e->state != Entity::STATE_IDLE)
-                    Log::Error("entity not idle for game tick\n");
-                e->state = Entity::STATE_PRETICK_GAME;
-#endif
-                e->TickGame(data->deltams);
-#if !LOL_RELEASE
-                if (e->state != Entity::STATE_POSTTICK_GAME)
-                    Log::Error("entity missed super game tick\n");
-                e->state = Entity::STATE_IDLE;
-#endif
+                if (e->destroy && i < Entity::GAMEGROUP_END)
+                {
+                    /* If entity is to be destroyed, remove it from the
+                     * game tick list. */
+                    (prev ? prev->gamenext : data->list[i]) = e->gamenext;
+
+                    e = e->gamenext;
+                }
+                else if (e->destroy)
+                {
+                    /* If entity is to be destroyed, remove it from the
+                     * draw tick list and destroy it. */
+                    (prev ? prev->drawnext : data->list[i]) = e->drawnext;
+
+                    Entity *tmp = e;
+                    e = e->drawnext; /* Can only be in a draw group list */
+                    delete tmp;
+
+                    data->nentities--;
+                }
+                else
+                {
+                    if (e->ref <= 0 && i >= Entity::DRAWGROUP_BEGIN)
+                        e->destroy = 1;
+                    prev = e;
+                    e = (i < Entity::GAMEGROUP_END) ? e->gamenext : e->drawnext;
+                }
             }
 
-    Profiler::Stop(Profiler::STAT_TICK_GAME);
+        /* Insert waiting objects into the appropriate lists */
+        while (data->todolist)
+        {
+            Entity *e = data->todolist;
+            data->todolist = e->gamenext;
+
+            e->gamenext = data->list[e->gamegroup];
+            data->list[e->gamegroup] = e;
+            e->drawnext = data->list[e->drawgroup];
+            data->list[e->drawgroup] = e;
+        }
+
+        /* Tick objects for the game loop */
+        for (int i = Entity::GAMEGROUP_BEGIN; i < Entity::GAMEGROUP_END; i++)
+            for (Entity *e = data->list[i]; e; e = e->gamenext)
+                if (!e->destroy)
+                {
+#if !LOL_RELEASE
+                    if (e->state != Entity::STATE_IDLE)
+                        Log::Error("entity not idle for game tick\n");
+                    e->state = Entity::STATE_PRETICK_GAME;
+#endif
+                    e->TickGame(data->deltams);
+#if !LOL_RELEASE
+                    if (e->state != Entity::STATE_POSTTICK_GAME)
+                        Log::Error("entity missed super game tick\n");
+                    e->state = Entity::STATE_IDLE;
+#endif
+                }
+
+        Profiler::Stop(Profiler::STAT_TICK_GAME);
+
+        data->drawtick.Push(1);
+    }
+
+    data->drawtick.Push(0);
+
+    return NULL;
+}
+
+void *TickerData::DrawThreadMain(void *p)
+{
+    for (;;)
+    {
+        int tick = data->drawtick.Pop();
+        if (!tick)
+            break;
+
+        data->gametick.Push(1);
+    }
+
+    return NULL;
+}
+
+void Ticker::SetState(Entity *entity, uint32_t state)
+{
+
+}
+
+void Ticker::SetStateWhenMatch(Entity *entity, uint32_t state,
+                               Entity *other_entity, uint32_t other_state)
+{
+
+}
+
+void Ticker::Setup(float fps)
+{
+    data->fps = fps;
+
+    data->gamethread = new Thread(TickerData::GameThreadMain, NULL);
+    data->gametick.Push(1);
 }
 
 void Ticker::TickDraw()
 {
+    data->drawtick.Pop();
+
     Profiler::Start(Profiler::STAT_TICK_DRAW);
 
@@ -323 +372 @@
     Profiler::Stop(Profiler::STAT_TICK_DRAW);
     Profiler::Start(Profiler::STAT_TICK_BLIT);
-}
-
-void Ticker::ClampFps()
-{
+
+    /* Signal game thread that it can carry on */
+    data->gametick.Push(1);
+
+    /* Clamp FPS */
     Profiler::Stop(Profiler::STAT_TICK_BLIT);
 
@@ -369 +419 @@
     data->quit = 1;
     data->quitframe = data->frame;
+
+    data->gametick.Push(0);
+    delete data->gamethread;
 }
 

trunk/src/ticker.h

@@ -33 +33 @@
 
     static void Setup(float fps);
-    static void TickGame();
     static void TickDraw();
-    static void ClampFps();
     static void StartBenchmark();
     static void StopBenchmark();
@@ -41 +39 @@
     static void StopRecording();
     static int GetFrameNum();
+
+    static void SetState(Entity *entity, uint32_t state);
+    static void SetStateWhenMatch(Entity *entity, uint32_t state,
+                                  Entity *other_entity, uint32_t other_state);
 
     static void Shutdown();