- fix compilation issue on psp

- attempt at reducing loading times on the PSP: I merged a few graphics files together, removed some unused calls from the initialization functions, and moved some other ones to have a more lazy approach. The PSP version remains fairly slow in some parts (especially loading, but also entering the shop, or starting a new game), so I will try to reduce file access as much as possible in the days to come. Not a release blocker IMO though, but I4d sure love if it were faster.
- uppercased "Track1.mp3" to be in line with the actual filename. Most likely this had been broken forever on case-sensitive OSes
- I removed costly calls from the textscroller. I believe it wasn't very useful in its previous state. Now it's only "advertising" for unlockable stuff, which I think is ok (and allows to refresh it every time the menu is loaded)
- As a counterpart, added a "% complete" progress bar in the menu, something I wanted to add a while ago.

JGE/include/JLogger.h

@@ -19,6 +19,7 @@
 class JLogger{
  public:
   static void Log(const char * text);
+  static void Log(std::string text);
 
   JLogger(const char* text);
   ~JLogger();
@@ -26,6 +27,7 @@ class JLogger{
   const char* mText;
 
   static std::string lastLog;
+  static int lastTime;
 };
 
 #endif

JGE/include/JRenderer.h

@@ -88,11 +88,6 @@ public:
 	//////////////////////////////////////////////////////////////////////////
 	static JRenderer* GetInstance();
 
-  /*
-//START PurpleScreen Debug
-  static int debugged;
-//END PurpleScreen Debug
-*/
 	static void Destroy();
 
 	static void Set3DFlag(bool flag);

JGE/src/JGE.cpp

@@ -7,7 +7,13 @@
 // Copyright (c) 2007 James Hui (a.k.a. Dr.Watson) <jhkhui@gmail.com>
 //
 //-------------------------------------------------------------------------------------
+
+ 
+// Should we add PrecompiledHeader.h to more platforms here? PSP Doesn't support it in JGE (erwan 2011/12/11) 
+#if defined (IOS)
 #include "PrecompiledHeader.h"
+#endif
+
 #include <iostream>
 #include <map>
 #include <set>
@@ -357,7 +363,7 @@ void JGE::Init()
     sceCtrlSetSamplingCycle(0);
     sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG);
 
-    JRenderer::GetInstance();
+    //JRenderer::GetInstance(); Lazy loading
     //JFileSystem::GetInstance(); Lazy loading
     //JSoundSystem::GetInstance(); let's do lazy loading
 
@@ -451,7 +457,7 @@ void JGE::Init()
     mDone = false;
     mPaused = false;
     mCriticalAssert = false;
-    JRenderer::GetInstance();
+    //JRenderer::GetInstance(); Lazy loading
     //JFileSystem::GetInstance(); Lazy loading
     JSoundSystem::GetInstance();
     LeftClickedProcessed();

JGE/src/JLogger.cpp

@@ -1,24 +1,34 @@
 #include "../include/JLogger.h"
+#include "../include/JGE.h"
 #include "../include/DebugRoutines.h"
 
 #include <fstream>
 
 string JLogger::lastLog = "";
+int JLogger::lastTime = 0;
 
 void JLogger::Log(const char * text){
 #ifdef DOLOG
   std::ofstream file(LOG_FILE, std::ios_base::app);
+  std::stringstream out;
+  int newTime = JGEGetTime();
+  out << newTime << "(+" << newTime - lastTime << ") :" << text;
   if (file){
-    file << text;
+    file << out.str();
     file << "\n";
     file.close();
+    lastTime = newTime;
   }
 
-  DebugTrace(text);
+  DebugTrace(out.str());
 #endif
   lastLog = text;
 }
 
+void JLogger::Log(std::string text){
+    Log(text.c_str());
+}
+
 JLogger::JLogger(const char* text) : mText(text)
 {
 #ifdef DOLOG

JGE/src/main.cpp

@@ -49,7 +49,7 @@ bool done = false;
 JApp *game = NULL;
 JGE *g_engine = NULL;
 
-u32 gTickFrequency;
+u32 gTickFrequency = 1;
 
 //------------------------------------------------------------------------------------------------
 // Exit callback
@@ -293,6 +293,14 @@ u8 JGEGetAnalogY() { return gCtrlPad.Ly; }
 // The main loop
 int main(int argc, char *argv[])
 {
+    pspDebugScreenInit();
+
+    pspDebugScreenSetBackColor(0x00000000);
+    pspDebugScreenSetTextColor(0xFFFFFFFF);
+    pspDebugScreenClear();
+
+    pspDebugScreenPrintf("Wagic:Loading core...");
+
     JLOG("SetupCallbacks()");
     SetupCallbacks();
 #ifdef DEVHOOK

JGE/src/zipFS/zfsystem.cpp

@@ -289,9 +289,10 @@ void filesystem::InsertZip(const char * Filename, const size_t PackID)
 	string ZipPath = m_BasePath + Filename;
 
 	// Open zip
-	ifstream File(ZipPath.c_str(), ios::binary);
-
     LOG(("opening zip:" + ZipPath).c_str());
+    ifstream File(ZipPath.c_str(), ios::binary);
+
+
 
 	if (! File)
 		return;
@@ -331,6 +332,8 @@ void filesystem::InsertZip(const char * Filename, const size_t PackID)
 	// Add zip file to Zips data base (only if not empty)
 	if (ZipInfo.m_NbEntries != 0)
 		m_Zips[PackID] = ZipInfo;
+
+    LOG("--zip file loading DONE");
 }