Fixed icon, fixed font rendering issue, and a few other small issues

engine/compilers/Xcode/Torque2D.xcodeproj/xcshareddata/xcschemes/Torque2D.xcscheme

@@ -44,7 +44,7 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       allowLocationSimulation = "YES">

engine/source/gui/guiCanvas.cc

@@ -416,7 +416,6 @@ GuiCanvas::GuiCanvas()
 #ifdef TORQUE_OS_IOS
    mBounds.set(0, 0, IOS_DEFAULT_RESOLUTION_X, IOS_DEFAULT_RESOLUTION_Y);
 #elif TORQUE_OS_ANDROID
-   //TODO: this need to access something else?
    mBounds.set(0, 0, _AndroidGetScreenWidth(), _AndroidGetScreenHeight());
 #else
    mBounds.set(0, 0, MIN_RESOLUTION_X, MIN_RESOLUTION_Y);

engine/source/gui/guiTextEditCtrl.cc

@@ -710,7 +710,6 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event)
          }
 
          // End added UNIX emacs key bindings
-         //TODO: android?
 #if !(defined(TORQUE_OS_OSX) || defined(TORQUE_OS_IOS))
          // windows style cut / copy / paste / undo keybinds
          case KEY_C:
@@ -759,7 +758,6 @@ bool GuiTextEditCtrl::onKeyDown(const GuiEvent &event)
             return false;
       }
    }
-   //TODO: android?
 #if (defined(TORQUE_OS_OSX) || defined(TORQUE_OS_IOS))
    // mac style cut / copy / paste / undo keybinds
    else if (event.modifier & SI_ALT)

engine/source/platform/platformFileIO.cc

@@ -417,7 +417,6 @@ StringTableEntry Platform::stripBasePath(const char *path)
 StringTableEntry Platform::getPrefsPath(const char *file /* = NULL */)
 {
     char buf[1024];
-    //TODO: should android have its own define?
 #if defined(TORQUE_OS_IOS) || defined(TORQUE_OS_ANDROID)
     
     if ( file )

engine/source/platform/platformVideo.cc

@@ -27,7 +27,10 @@
 
 extern void GameDeactivate( bool noRender );
 extern void GameReactivate();
-
+#ifdef TORQUE_OS_ANDROID
+extern int _AndroidGetScreenWidth();
+extern int _AndroidGetScreenHeight();
+#endif
 // Static class data:
 Vector<DisplayDevice*>  Video::smDeviceList;
 DisplayDevice*          Video::smCurrentDevice;
@@ -414,7 +417,6 @@ bool Video::setScreenMode( U32 width, U32 height, U32 bpp, bool fullScreen )
    if ( smCurrentDevice )
    {
        //MIN_RESOLUTION defined in platformWin32/platformGL.h
-	   //TODO: android?
 #ifdef TORQUE_OS_IOS
       if(width == 0)
          width = IOS_DEFAULT_RESOLUTION_X;
@@ -429,6 +431,13 @@ bool Video::setScreenMode( U32 width, U32 height, U32 bpp, bool fullScreen )
       //    height *=2;
       //}
        
+#elif TORQUE_OS_ANDROID
+      if(width == 0)
+	     width = _AndroidGetScreenWidth();
+	  if(height == 0)
+	     height = _AndroidGetScreenHeight();
+	  if(bpp == 0)
+	     bpp = ANDROID_DEFAULT_RESOLUTION_BIT_DEPTH;
 #else
       if(width == 0)
          width = MIN_RESOLUTION_X;

engine/source/platformAndroid/AndroidConsole.cpp

@@ -107,8 +107,8 @@ bool AndroidConsole::isEnabled()
 
 AndroidConsole::AndroidConsole()
 {
-	//TODO: change back to false?
-   consoleEnabled = true;
+   consoleEnabled = false;
+
    clearInBuf();
    
    Con::addConsumer(AndroidConsoleConsumer);

engine/source/platformAndroid/AndroidFileio.cpp

@@ -466,7 +466,6 @@ StringTableEntry Platform::getExecutablePath()
 //-----------------------------------------------------------------------------
 StringTableEntry Platform::getExecutableName()
 {
-   //TODO: does this need anything further?
    return StringTable->insert("Torque2D");
 }
 

engine/source/platformAndroid/AndroidFont.cpp

@@ -62,13 +62,9 @@ bool AndroidFont::create( const char* name, U32 size, U32 charset )
 {
     // Sanity!
     AssertFatal( name != NULL, "Cannot create a NULL font name." );
-    //TODO: font create
-    /*
-    // Generate compatible font name.
-    CFStringRef fontName = CFStringCreateWithCString( kCFAllocatorDefault, name, kCFStringEncodingUTF8 );
-    
+
     // Sanity!
-    if ( !fontName )
+    if ( !name )
     {
         Con::errorf("Could not handle font name of '%s'.", name );
         return false;
@@ -78,19 +74,24 @@ bool AndroidFont::create( const char* name, U32 size, U32 charset )
     F32 scaledSize = size * (72.0f/96.0f);
     scaledSize = mRound(scaledSize);
     
+
+    //TODO: generating font cache on android does not work.  Need to generate cache on desktop first.
+    //freetype2 would need to be added to generate on device.
     // Create the font reference.
-    mFontRef = CTFontCreateWithName( fontName, scaledSize, NULL );
+    //mFontRef = CTFontCreateWithName( fontName, scaledSize, NULL );
     
     // Sanity!
-    if ( !mFontRef )
+    /*if ( !mFontRef )
     {
         Con::errorf( "Could not generate a font reference to font name '%s' of size '%d'", name, size );
         return false;
-    }
+    }*/
     
     // Fetch font metrics.
-    CGFloat ascent = CTFontGetAscent( mFontRef );
-    CGFloat descent = CTFontGetDescent( mFontRef );
+    //CGFloat ascent = CTFontGetAscent( mFontRef );
+    //CGFloat descent = CTFontGetDescent( mFontRef );
+    float ascent = 0;
+    float descent = 0;
     
     // Set baseline.
     mBaseline = (U32)mRound(ascent);
@@ -99,8 +100,8 @@ bool AndroidFont::create( const char* name, U32 size, U32 charset )
     mHeight = (U32)mRound( ascent + descent );
     
     // Create a gray-scale color-space.
-    mColorSpace = CGColorSpaceCreateDeviceGray();
-    */
+    //mColorSpace = CGColorSpaceCreateDeviceGray();
+
     // Return status.
     return true;
 }
@@ -146,7 +147,7 @@ PlatformFont::CharInfo& AndroidFont::getCharInfo(const UTF16 character) const
     characterInfo.xOffset = 0;
     characterInfo.yOffset = 0;
     
-    //TODO: getcharinfo
+    //TODO: getcharinfo if freetype2 font creation on device is added
     /*
     CGGlyph characterGlyph;
     CGRect characterBounds;

engine/source/platformAndroid/AndroidPlatform.cpp

@@ -60,7 +60,7 @@ S32 Platform::messageBox(const UTF8 *title, const UTF8 *message, MBButtons butto
 //-----------------------------------------------------------------------------
 bool Platform::pathCopy(const char* source, const char* dest, bool nooverwrite)
 {
-	//TODO: Not used on android?
+	Con::errorf("pathCopy is not supported on Android due to assets being in a zip file");
 	return false;
    
 }
@@ -68,7 +68,7 @@ bool Platform::pathCopy(const char* source, const char* dest, bool nooverwrite)
 //-----------------------------------------------------------------------------
 bool Platform::fileRename(const char *source, const char *dest)
 {
-   //TODO: not used on android?
+	Con::errorf("fileRename is not supported on Android due to assets being in a zip file");
    return false;
 }
 

engine/source/platformAndroid/AndroidProcessControl.cpp

@@ -56,26 +56,6 @@ void Platform::restartInstance()
       Con::errorf("The game is still running, we cant relaunch now!");
       return;
    }
-   //TODO: is this needed on android?
-   /*
-   // get the path to the torque executable
-   CFBundleRef mainBundle =  CFBundleGetMainBundle();
-   CFURLRef execURL = CFBundleCopyExecutableURL(mainBundle);
-   CFStringRef execString = CFURLCopyFileSystemPath(execURL, kCFURLPOSIXPathStyle);
-
-   // append ampersand so that we can launch without blocking.
-   // encase in quotes so that spaces in the path are accepted.
-   CFMutableStringRef mut = CFStringCreateMutableCopy(NULL, 0, execString);
-   CFStringInsert(mut, 0, CFSTR("\""));
-   CFStringAppend(mut, CFSTR("\" & "));
-   
-   U32 len = CFStringGetMaximumSizeForEncoding(CFStringGetLength(mut), kCFStringEncodingUTF8);
-   char *execCString = new char[len+1];
-   CFStringGetCString(mut, execCString, len, kCFStringEncodingUTF8);
-   execCString[len - 1] = '\0';
    
-   Con::printf("---- %s -----",execCString);
-   system(execCString);
-   delete[] execCString;
-   */
+   Con::errorf("restartInstance is not supported on Android");
 }

engine/source/platformAndroid/AndroidStrings.cpp

@@ -412,14 +412,8 @@ void dQsort(void *base, U32 nelem, U32 width, int (QSORT_CALLBACK *fcmp)(const v
    qsort(base, nelem, width, fcmp);
 }   
 
-//TODO: need this?
 StringTableEntry Platform::createUUID( void )
 {
-    /*CFUUIDRef ref = CFUUIDCreate(nil);
-    NSString* uuid = (__bridge_transfer NSString *)CFUUIDCreateString(nil,ref);
-    CFRelease(ref);
-
-    StringTableEntry uuidString = StringTable->insert([uuid UTF8String]);
-    return uuidString;*/
+    Con::errorf("createUUID not supported on Android");
 	return StringTable->insert("");
 }

engine/source/platformAndroid/T2DActivity.cpp

@@ -886,12 +886,14 @@ static void engine_handle_cmd(struct android_app* app, int32_t cmd) {
 
                 if (bSuspended == true) {
 					glViewport(0, 0, engine->width, engine->height);
+					Game->textureResurrect();
 					bSuspended = false;
 				}
             }
             break;
         case APP_CMD_TERM_WINDOW:
 			bSuspended = true;
+			Game->textureKill();
             // The window is being hidden or closed, clean it up.
             engine_term_display(engine, false);
             break;
@@ -972,7 +974,6 @@ void android_main(struct android_app* state) {
     //store the cache dir
     activity.loadCacheDir();
 
-    //TODO: anything we need to do with these?
     platState.argc = 0;
     //platState.argv
 

modules/Sandbox/1/gui/guiProfiles.cs

@@ -21,7 +21,7 @@
 //-----------------------------------------------------------------------------
 
 $platformFontType = ($platform $= "windows") ? "lucida console" : "monaco";
-$platformFontSize = ($platform $= "ios" || $platform $= "Android") ? 18 : 12;
+$platformFontSize = ($platform $= "ios") ? 18 : 12;
 
 //-----------------------------------------------------------------------------