5 files changed, 50 insertions, 78 deletions

diff --git a/src/skel/crossplatform.h b/src/skel/crossplatform.h
index fe1f22fd..bfc03913 100644
--- a/src/skel/crossplatform.h
+++ b/src/skel/crossplatform.h
@@ -87,9 +87,6 @@ enum eGameState
     GS_FRONTEND,
     GS_INIT_PLAYING_GAME,
     GS_PLAYING_GAME,
-#ifndef MASTER
-    GS_ANIMVIEWER,
-#endif
 };
 extern RwUInt32 gGameState;
 
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index a20c1cc6..c219e711 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1259,17 +1259,11 @@ void resizeCB(GLFWwindow* window, int width, int height) {
 	* memory things don't work.
 	*/
 	/* redraw window */
-#ifndef MASTER
-	if (RwInitialised && (gGameState == GS_PLAYING_GAME || gGameState == GS_ANIMVIEWER))
-	{
-		RsEventHandler((gGameState == GS_PLAYING_GAME ? rsIDLE : rsANIMVIEWER), (void *)TRUE);
-	}
-#else
+
 	if (RwInitialised && gGameState == GS_PLAYING_GAME)
 	{
 		RsEventHandler(rsIDLE, (void *)TRUE);
 	}
-#endif
 
 	if (RwInitialised && height > 0 && width > 0) {
 		RwRect r;
@@ -1644,18 +1638,6 @@ main(int argc, char *argv[])
 		FrontEndMenuManager.DrawMemoryCardStartUpMenus();
 	}
 #endif
-
-	if (TurnOnAnimViewer)
-	{
-#ifndef MASTER
-		CAnimViewer::Initialise();
-#ifndef PS2_MENU
-		FrontEndMenuManager.m_bGameNotLoaded = false;
-#endif
-		gGameState = GS_ANIMVIEWER;
-		TurnOnAnimViewer = false;
-#endif
-	}
 	
 	initkeymap();
 
@@ -1675,6 +1657,18 @@ main(int argc, char *argv[])
 		* Enter the message processing loop...
 		*/
 
+#ifndef MASTER
+		if (gbModelViewer) {
+			// This is TheModelViewer in LCS
+			LoadingScreen("Loading the ModelViewer", NULL, GetRandomSplashScreen());
+			CAnimViewer::Initialise();
+			CTimer::Update();
+#ifndef PS2_MENU
+			FrontEndMenuManager.m_bGameNotLoaded = false;
+#endif
+		}
+#endif
+
 #ifdef PS2_MENU
 		if (TheMemoryCard.m_bWantToLoad)
 			LoadSplash(GetLevelSplashScreen(CGame::currLevel));
@@ -1689,7 +1683,13 @@ main(int argc, char *argv[])
 #endif
 		{
 			glfwPollEvents();
-			if( ForegroundApp )
+#ifndef MASTER
+			if (gbModelViewer) {
+				// This is TheModelViewerCore in LCS
+				TheModelViewer();
+			} else
+#endif
+			if ( ForegroundApp )
 			{
 				switch ( gGameState )
 				{
@@ -1893,18 +1893,6 @@ main(int argc, char *argv[])
 						}
 						break;
 					}
-#ifndef MASTER
-					case GS_ANIMVIEWER:
-					{
-						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
-						if (RwInitialised)
-						{
-							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
-								RsEventHandler(rsANIMVIEWER, (void*)TRUE);
-						}
-						break;
-					}
-#endif
 				}
 			}
 			else
@@ -1976,12 +1964,13 @@ main(int argc, char *argv[])
 		}
 		else
 		{
-			if ( gGameState == GS_PLAYING_GAME )
-				CGame::ShutDown();
 #ifndef MASTER
-			else if ( gGameState == GS_ANIMVIEWER )
+			if ( gbModelViewer )
 				CAnimViewer::Shutdown();
+			else
 #endif
+			if ( gGameState == GS_PLAYING_GAME )
+				CGame::ShutDown();
 			
 			CTimer::Stop();
 			
@@ -2002,13 +1991,13 @@ main(int argc, char *argv[])
 #endif
 	}
 	
-
-	if ( gGameState == GS_PLAYING_GAME )
-		CGame::ShutDown();
 #ifndef MASTER
-	else if ( gGameState == GS_ANIMVIEWER )
+	if ( gbModelViewer )
 		CAnimViewer::Shutdown();
+	else
 #endif
+	if ( gGameState == GS_PLAYING_GAME )
+		CGame::ShutDown();
 
 	DMAudio.Terminate();
 	
diff --git a/src/skel/skeleton.cpp b/src/skel/skeleton.cpp
index e21abb17..a21d5674 100644
--- a/src/skel/skeleton.cpp
+++ b/src/skel/skeleton.cpp
@@ -10,13 +10,12 @@
 
 #include "skeleton.h"
 #include "platform.h"
+#include "main.h"
 
 // --MIAMI: file done
 
 static RwBool               DefaultVideoMode = TRUE;
 
-bool TurnOnAnimViewer = false;
-
 RsGlobalType                RsGlobal;
 
 #ifdef _WIN32
@@ -161,7 +160,7 @@ rsPreInitCommandLine(RwChar *arg)
 #ifndef MASTER
 	if (!strcmp(arg, RWSTRING("-animviewer")))
 	{
-		TurnOnAnimViewer = TRUE;
+		gbModelViewer = TRUE;
 
 		return TRUE;
 	}
diff --git a/src/skel/skeleton.h b/src/skel/skeleton.h
index 1c468179..380b6c05 100644
--- a/src/skel/skeleton.h
+++ b/src/skel/skeleton.h
@@ -79,11 +79,8 @@ enum RsEvent
 	rsPADANALOGUERIGHTRESET,
 	rsPREINITCOMMANDLINE,
 	rsACTIVATE,
-	rsANIMVIEWER,
 };
 
-extern bool TurnOnAnimViewer;
-
 typedef enum RsEvent RsEvent;
 
 typedef RsEventStatus (*RsInputEventHandler)(RsEvent event, void *param);
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index b2d5a64f..a437a3b4 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -1008,17 +1008,11 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
 			RECT				rect;
 
 			/* redraw window */
-#ifndef MASTER
-			if (RwInitialised && (gGameState == GS_PLAYING_GAME || gGameState == GS_ANIMVIEWER))
-			{
-				RsEventHandler((gGameState == GS_PLAYING_GAME ? rsIDLE : rsANIMVIEWER), (void *)TRUE);
-			}
-#else
+
 			if (RwInitialised && gGameState == GS_PLAYING_GAME)
 			{
 				RsEventHandler(rsIDLE, (void *)TRUE);
 			}
-#endif
 
 			/* Manually resize window */
 			rect.left = rect.top = 0;
@@ -2173,17 +2167,17 @@ WinMain(HINSTANCE instance,
 	}
 #endif
 
-	if (TurnOnAnimViewer)
-	{
 #ifndef MASTER
+	if (gbModelViewer) {
+		// This is TheModelViewer in LCS
+		LoadingScreen("Loading the ModelViewer", NULL, GetRandomSplashScreen());
 		CAnimViewer::Initialise();
+		CTimer::Update();
 #ifndef PS2_MENU
 		FrontEndMenuManager.m_bGameNotLoaded = false;
 #endif
-		gGameState = GS_ANIMVIEWER;
-		TurnOnAnimViewer = false;
-#endif
 	}
+#endif
 
 	while ( TRUE )
 	{
@@ -2228,6 +2222,12 @@ WinMain(HINSTANCE instance,
 					DispatchMessage(&message);
 				}
 			}
+#ifndef MASTER
+			else if (gbModelViewer) {
+				// This is TheModelViewerCore in LCS
+				TheModelViewer();
+			}
+#endif
 			else if( ForegroundApp )
 			{
 				switch ( gGameState )
@@ -2447,18 +2447,6 @@ WinMain(HINSTANCE instance,
 						}
 						break;
 					}
-#ifndef MASTER
-					case GS_ANIMVIEWER:
-					{
-						float ms = (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond();
-						if (RwInitialised)
-						{
-							if (!FrontEndMenuManager.m_PrefsFrameLimiter || (1000.0f / (float)RsGlobal.maxFPS) < ms)
-								RsEventHandler(rsANIMVIEWER, (void*)TRUE);
-						}
-						break;
-					}
-#endif
 				}
 			}
 			else
@@ -2530,12 +2518,13 @@ WinMain(HINSTANCE instance,
 		}
 		else
 		{
-			if ( gGameState == GS_PLAYING_GAME )
-				CGame::ShutDown();
 #ifndef MASTER
-			else if ( gGameState == GS_ANIMVIEWER )
+			if ( gbModelViewer )
 				CAnimViewer::Shutdown();
+			else
 #endif
+			if ( gGameState == GS_PLAYING_GAME )
+				CGame::ShutDown();
 
 			CTimer::Stop();
 			
@@ -2557,12 +2546,13 @@ WinMain(HINSTANCE instance,
 	}
 	
 
-	if ( gGameState == GS_PLAYING_GAME )
-		CGame::ShutDown();
 #ifndef MASTER
-	else if ( gGameState == GS_ANIMVIEWER )
+	if ( gbModelViewer )
 		CAnimViewer::Shutdown();
+	else
 #endif
+	if ( gGameState == GS_PLAYING_GAME )
+		CGame::ShutDown();
 
 	DMAudio.Terminate();