Changeset 269Tweet

Timestamp:

Jan 23, 2011, 6:46:02 PM (10 years ago)

Author:

sam

Message:

Convert NPOT textures in code.

Location:

trunk

Files:

• monsterz/background.png (modified) (previous)
• src/font.cpp (modified) (1 diff)
• src/tileset.cpp (modified) (2 diffs)

trunk/src/font.cpp

@@ -89 +89 @@
         data->height = data->img->h / 16;
 
+        GLuint format = data->img->format->Amask ? GL_RGBA : GL_RGB;
+        int planes = data->img->format->Amask ? 4 : 3;
+
+        int w = PotUp(data->img->w);
+        int h = PotUp(data->img->h);
+
+        uint8_t *pixels = (uint8_t *)data->img->pixels;
+        if (w != data->img->w || h != data->img->h)
+        {
+            uint8_t *tmp = (uint8_t *)malloc(planes * w * h);
+            for (int line = 0; line < data->img->h; line++)
+                memcpy(tmp + planes * w * line,
+                       pixels + planes * data->img->w * line,
+                       planes * data->img->w);
+            pixels = tmp;
+        }
+
         glGenTextures(1, &data->texture);
         glBindTexture(GL_TEXTURE_2D, data->texture);
 
-        glTexImage2D(GL_TEXTURE_2D, 0, 4, data->img->w, data->img->h, 0,
-                     GL_RGBA, GL_UNSIGNED_BYTE, data->img->pixels);
+        glTexImage2D(GL_TEXTURE_2D, 0, planes, w, h, 0,
+                     format, GL_UNSIGNED_BYTE, pixels);
 
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
+        if (pixels != data->img->pixels)
+            free(pixels);
         SDL_FreeSurface(data->img);
         data->img = NULL;

trunk/src/tileset.cpp

@@ -84 +84 @@
     data->nh = data->img->h / h;
     data->ntiles = data->nw * data->nh;
-    data->tx = (float)w / data->img->w;
-    data->ty = (float)h / data->img->h;
+    data->tx = (float)w / PotUp(data->img->w);
+    data->ty = (float)h / PotUp(data->img->h);
 
     drawgroup = DRAWGROUP_BEFORE;
@@ -113 +113 @@
         int planes = data->img->format->Amask ? 4 : 3;
 
+        int w = PotUp(data->img->w);
+        int h = PotUp(data->img->h);
+
+        uint8_t *pixels = (uint8_t *)data->img->pixels;
+        if (w != data->img->w || h != data->img->h)
+        {
+            uint8_t *tmp = (uint8_t *)malloc(planes * w * h);
+            for (int line = 0; line < data->img->h; line++)
+                memcpy(tmp + planes * w * line,
+                       pixels + planes * data->img->w * line,
+                       planes * data->img->w);
+            pixels = tmp;
+        }
+
         glGenTextures(1, &data->texture);
         glBindTexture(GL_TEXTURE_2D, data->texture);
 
-        glTexImage2D(GL_TEXTURE_2D, 0, planes, data->img->w, data->img->h, 0,
-                     format, GL_UNSIGNED_BYTE, data->img->pixels);
+        glTexImage2D(GL_TEXTURE_2D, 0, planes, w, h, 0,
+                     format, GL_UNSIGNED_BYTE, pixels);
 
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 
+        if (pixels != data->img->pixels)
+            free(pixels);
         SDL_FreeSurface(data->img);
         data->img = NULL;