Changeset 3349 for code/branches/resource/src/core/Game.cc

Timestamp:

Jul 25, 2009, 2:14:05 PM (15 years ago)

Author:

rgrieder

Message:

Moved InputManager, GUIManager and GraphicsManager handling from GSGraphics to Core.

File:

• code/branches/resource/src/core/Game.cc (modified) (4 diffs)

code/branches/resource/src/core/Game.cc

@@ -245 +245 @@
             }
 
-            // UPDATE, Core first
-            bool threwException = false;
-            try
-            {
-                this->core_->update(*this->gameClock_);
-            }
-            catch (const std::exception& ex)
-            {
-                threwException = true;
-                COUT(0) << "Exception while ticking the Core: " << ex.what() << std::endl;
-            }
-            catch (...)
-            {
-                threwException = true;
-            }
-            if (threwException)
-            {
-                COUT(0) << "An exception occured while ticking the Core. This should really never happen!" << std::endl;
-                COUT(0) << "Closing the program." << std::endl;
+            // UPDATE, Core preUpdate (doesn't throw)
+            if (!this->core_->preUpdate(*this->gameClock_))
+            {
                 this->stop();
                 break;
@@ -273 +257 @@
                 it != this->activeStates_.end(); ++it)
             {
-                bool threwException = false;
+                std::string exceptionMessage;
                 try
                 {
                     // Add tick time for most of the states
                     uint64_t timeBeforeTick;
-                    if (!(*it)->ignoreTickTime())
+                    if ((*it)->ignoreTickTime())
                         timeBeforeTick = this->gameClock_->getRealMicroseconds();
                     (*it)->update(*this->gameClock_);
-                    if (!(*it)->ignoreTickTime())
-                        this->addTickTime(static_cast<uint32_t>(this->gameClock_->getRealMicroseconds() - timeBeforeTick));
+                    if ((*it)->ignoreTickTime())
+                        this->subtractTickTime(static_cast<int32_t>(this->gameClock_->getRealMicroseconds() - timeBeforeTick));
                 }
                 catch (const std::exception& ex)
+                { exceptionMessage = ex.what(); }
+                catch (...)
+                { exceptionMessage = "Unknown exception"; }
+                if (!exceptionMessage.empty())
                 {
-                    threwException = true;
-                    COUT(0) << "Exception while ticking: " << ex.what() << std::endl;
-                }
-                catch (...)
-                {
-                    threwException = true;
-                }
-                if (threwException)
-                {
-                    COUT(1) << "An exception occured while ticking GameState '" << (*it)->getName() << "'. This should really never happen!" << std::endl;
+                    COUT(1) << "An exception occurred while updating '" << (*it)->getName() << "': " << exceptionMessage << std::endl;
+                    COUT(1) << "This should really never happen!" << std::endl;
                     COUT(1) << "Unloading all GameStates depending on the one that crashed." << std::endl;
                     if ((*it)->getParent() != NULL)
@@ -304 +284 @@
                 }
 
+            }
+
+            // UPDATE, Core postUpdate (doesn't throw)
+            if (!this->core_->postUpdate(*this->gameClock_))
+            {
+                this->stop();
+                break;
             }
 
@@ -344 +331 @@
     }
 
-    void Game::addTickTime(uint32_t length)
+    void Game::subtractTickTime(int32_t length)
     {
         assert(!this->statisticsTickTimes_.empty());
-        this->statisticsTickTimes_.back().tickLength += length;
-        this->periodTickTime_+=length;
+        this->statisticsTickTimes_.back().tickLength -= length;
+        this->periodTickTime_ -= length;
     }