Changeset 26 for trunk/Classes/loadscreen.cpp

Timestamp:

2010-05-28 07:39:52 (2 years ago)

Author:

kpoole

Message:

Episode 5

File:

• trunk/Classes/loadscreen.cpp (modified) (11 diffs)

trunk/Classes/loadscreen.cpp

@@ -44 +44 @@
 #define MIN_PERCENTAGE   0
 #define MAX_PERCENTAGE 100
+
+extern bool gRedraw;
 
 loadscreen::global_loadscreen_manager* loadscreen::global_loadscreen_manager::manager = 0;
@@ -209 +211 @@
             font::word_wrap_text((*tip)["source"], font::SIZE_NORMAL, tip_width);
             
-            const int pad = game_config::title_tip_padding;
+//          const int pad = game_config::title_tip_padding;
+            
+#ifdef __IPAD__
+            const int pad = 10;
+#else
+            const int pad = 5;
+#endif
             
             SDL_Rect area = font::text_area(text,font::SIZE_NORMAL);
@@ -299 +307 @@
     std::string path = game_config::path + "/data/core/images/" + file; 
     
+#ifdef __IPAD__
+    int pvrtcSize = 1024;
+#else
     int pvrtcSize = 512;
+#endif
     GLsizei dataSize = (pvrtcSize * pvrtcSize * 4) / 8;
     FILE *fp = fopen(path.c_str(), "rb");
@@ -313 +325 @@
     
     glGenTextures(1, &logo_texture_);   
-    glBindTexture(GL_TEXTURE_2D, logo_texture_);
+    //glBindTexture(GL_TEXTURE_2D, logo_texture_);
+    cacheBindTexture(GL_TEXTURE_2D, logo_texture_, 1);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -319 +332 @@
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG, pvrtcSize, pvrtcSize, 0, dataSize, data);
+#ifndef NDEBUG
     GLenum err = glGetError();
     if (err != GL_NO_ERROR)
@@ -326 +340 @@
         std::cerr << buffer;
     }
+#endif
     
     free(data);
@@ -336 +351 @@
 void loadscreen::set_progress(const int percentage, const std::string &text, const bool commit)
 {
+    
+    if (gRedraw)
+    {
+        gRedraw = false;
+        logo_drawn_ = false;
+    }
+    
     // Saturate percentage.
     prcnt_ = percentage < MIN_PERCENTAGE ? MIN_PERCENTAGE: percentage > MAX_PERCENTAGE ? MAX_PERCENTAGE: percentage;
@@ -387 +409 @@
         //SDL_BlitSurface (logo_surface_, 0, gdis, &area);      
         //screen_.blit_surface(0, 0, logo_surface_);
-        GLshort vertices[8];
+        GLshort vertices[12];
         GLfloat texCoords[8];
+        
+#ifdef __IPAD__
+        int size = 1024;
+#else
+        int size = 512;
+#endif
         
         vertices[0] = 0;
         vertices[1] = 0;
-        vertices[2] = 512;
-        vertices[3] = 0;
+        vertices[2] = 0;
+        vertices[3] = size;
         vertices[4] = 0;
-        vertices[5] = 512;
-        vertices[6] = 512;
-        vertices[7] = 512;
+        vertices[5] = 0;
+        vertices[6] = 0;
+        vertices[7] = size;
+        vertices[8] = 0;
+        vertices[9] = size;
+        vertices[10] = size;
+        vertices[11] = 0;
 
         texCoords[0] = 0;
@@ -418 +450 @@
         
         // draw logo over everything
+#ifdef __IPAD__
+        std::string path = game_config::path + "/data/core/images/misc/logo.png";
+        surface logo_surface = IMG_Load(path.c_str());
+        blit_surface((1024-logo_surface.get()->w)/2, -10, logo_surface);
+        
+        
+        SDL_Rect tip_area = {690, 306, 225, 140};
+        draw_tip_of_day(screen_, tips_of_day, gui::dialog_frame::titlescreen_style,&tip_area);      
+#else
         std::string path = game_config::path + "/data/core/images/misc/logo_small.png";
         surface logo_surface = IMG_Load(path.c_str());
@@ -425 +466 @@
         SDL_Rect tip_area = {242, 100, 225, 140};
         draw_tip_of_day(screen_, tips_of_day, gui::dialog_frame::titlescreen_style,&tip_area);
+#endif
 
         logo_drawn_ = true;
@@ -432 +474 @@
     
     int pbx = (scrx - pbw)/2;                   // Horizontal location.
+#ifdef __IPAD__ 
+    int pby = 693;
+#else
     int pby = 276; //(scry - pbh)/2 + pby_offset_;      // Vertical location.
+#endif
 
     // Draw top border.