First step at cleaning image loading.

[lugaru.git] / Source / OpenGL_Windows.cpp

diff --git a/Source/OpenGL_Windows.cpp b/Source/OpenGL_Windows.cpp
index 6d684ba1d2cbe4e413aebc9264cf924459d2d065..45e7b8b31db2beae284d2304f4ed6671cc89f13a 100644 (file)
--- a/Source/OpenGL_Windows.cpp
+++ b/Source/OpenGL_Windows.cpp
@@ -30,9 +30,9 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace Game;
 
-static bool load_image(const char * fname, TGAImageRec & tex);
-static bool load_png(const char * fname, TGAImageRec & tex);
-static bool load_jpg(const char * fname, TGAImageRec & tex);
+bool load_image(const char * fname, ImageRec & tex);
+static bool load_png(const char * fname, ImageRec & tex);
+static bool load_jpg(const char * fname, ImageRec & tex);
 bool save_image(const char * fname);
 static bool save_png(const char * fname);
 
@@ -55,6 +55,7 @@ bool gameFocused;
 
 extern float slomospeed;
 extern float slomofreq;
+extern bool visibleloading;
 
 
 
@@ -175,7 +176,6 @@ void initGL()
     glDisable( GL_ALPHA_TEST);
     glDisable( GL_BLEND);
     glDisable( GL_DEPTH_TEST);
-    //glDisable( GL_DITHER);
     glDisable( GL_FOG);
     glDisable( GL_LIGHTING);
     glDisable( GL_LOGIC_OP);
@@ -196,13 +196,11 @@ void initGL()
     glClearDepth( 1.0f);
     glDepthFunc( GL_LEQUAL);
     glDepthMask( GL_TRUE);
-    //glDepthRange( FRONT_CLIP, BACK_CLIP);
     glEnable( GL_DEPTH_TEST);
     glHint( GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
     glCullFace( GL_FRONT);
     glEnable( GL_CULL_FACE);
     glEnable( GL_LIGHTING);
-    //glEnable( GL_LIGHT_MODEL_AMBIENT);
     glEnable( GL_DITHER);
     glEnable( GL_COLOR_MATERIAL);
     glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
@@ -763,24 +761,14 @@ int main(int argc, char **argv)
 
 // --------------------------------------------------------------------------
 
-
-bool LoadImage(const char * fname, TGAImageRec & tex)
+bool load_image(const char *file_name, ImageRec &tex)
 {
+    if (visibleloading)
+        Game::LoadingScreen();
+
     if ( tex.data == NULL )
         return false;
-    else
-        return load_image(fname, tex);
-}
 
-void ScreenShot(const char * fname)
-{
-
-}
-
-
-
-static bool load_image(const char *file_name, TGAImageRec &tex)
-{
     const char *ptr = strrchr((char *)file_name, '.');
     if (ptr) {
         if (strcasecmp(ptr + 1, "png") == 0)
@@ -793,7 +781,6 @@ static bool load_image(const char *file_name, TGAImageRec &tex)
     return false;
 }
 
-
 struct my_error_mgr {
     struct jpeg_error_mgr pub; /* "public" fields */
     jmp_buf setjmp_buffer; /* for return to caller */
@@ -808,7 +795,7 @@ static void my_error_exit(j_common_ptr cinfo)
 }
 
 /* stolen from public domain example.c code in libjpg distribution. */
-static bool load_jpg(const char *file_name, TGAImageRec &tex)
+static bool load_jpg(const char *file_name, ImageRec &tex)
 {
     struct jpeg_decompress_struct cinfo;
     struct my_error_mgr jerr;
@@ -856,7 +843,7 @@ static bool load_jpg(const char *file_name, TGAImageRec &tex)
 
 
 /* stolen from public domain example.c code in libpng distribution. */
-static bool load_png(const char *file_name, TGAImageRec &tex)
+static bool load_png(const char *file_name, ImageRec &tex)
 {
     bool hasalpha = false;
     png_structp png_ptr = NULL;