1 files changed, 17 insertions, 5 deletions
diff --git a/menu_demo/bitmap.c b/menu_demo/bitmap.c
index 83aacda..1739c11 100644
--- a/menu_demo/bitmap.c
+++ b/menu_demo/bitmap.c
@@ -21,9 +21,9 @@
 #define BITMAP_IMAGE_SIZE 0x22
 
 
-struct ImageStruct BitmapLoad(char *filename)
+struct BitmapStruct BitmapLoad(char *filename)
 {
-  struct ImageStruct l_sImage;
+  struct BitmapStruct l_sImage;
   GLuint texture;
   FILE *bitmap;
 
@@ -64,11 +64,14 @@ struct ImageStruct BitmapLoad(char *filename)
     }
     else // depth == 32 bits
     {
-      gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, width, height, GL_BGRA, GL_UNSIGNED_BYTE, imagedata);
+      gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGBA, width, height, GL_BGRA, GL_UNSIGNED_BYTE, imagedata);;
     }
 
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-	  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_NEAREST);
+	  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    //glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+    //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
+    //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
 
     l_sImage.m_iImageId = texture;
     l_sImage.m_iWidth   = width;
@@ -87,3 +90,12 @@ struct ImageStruct BitmapLoad(char *filename)
 }
 
 
+
+void BitmapConvertWidth(struct BitmapStruct *f_sImage, double f_dHeight)
+{
+  double l_dRatio;
+
+  l_dRatio = (double)f_sImage->m_iHeight / f_dHeight;
+  f_sImage->m_iWidth = (int)(f_sImage->m_iWidth / l_dRatio);
+
+} // ConvertButton