Changeset 725Tweet

Timestamp:

Mar 6, 2011, 10:46:24 PM (10 years ago)

Author:

sam

Message:

ios: texture loading test.

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• image.cpp (modified) (8 diffs)
• image.mm (added)

trunk/src/Makefile.am

@@ -21 +21 @@
 liblol_a_CPPFLAGS = @LOL_CFLAGS@
 
+EXTRA_DIST = image.mm
+

trunk/src/image.cpp

@@ -16 +16 @@
 #include <cstdio>
 
-#if defined USE_SDL
+#if defined __APPLE__ && defined __MACH__
+#
+#elif defined USE_SDL
 #   include <SDL.h>
 #   include <SDL_image.h>
@@ -46 +48 @@
     Image::format_t format;
 
-#if defined USE_SDL
+#if defined __APPLE__ && defined __MACH__
+    uint8_t *pixels;
+#elif defined USE_SDL
     SDL_Surface *img;
 #elif defined ANDROID_NDK
@@ -53 +57 @@
     jint *pixels;
 #else
-    uint8_t *dummy;
+    uint8_t *pixels;
 #endif
 };
@@ -64 +68 @@
   : data(new ImageData())
 {
-#if defined USE_SDL
+#if defined __APPLE__ && defined __MACH__
+    NSString *path = [[NSBundle mainBundle] pathForResource:@"ascii" ofType:@"png"];
+    NSData *pngdata = [[NSData alloc] initWithContentsOfFile:path];
+    UIImage *image = [[UIImage alloc] initWithData:pngdata];
+    if (!image)
+    {
+#if !LOL_RELEASE
+        fprintf(stderr, "ERROR: could not load %s\n", path);
+#endif
+        exit(1);
+    }
+
+    int w = CGImageGetWidth(image.CGImage);
+    int h = CGImageGetHeight(image.CGImage);
+    data->size = vec2i(w, h);
+    data->format = FORMAT_RGBA;
+
+    CGColorSpaceRef cspace = CGColorSpaceCreateDeviceRGB();
+    data->pixels = (uint8_t *)malloc(w * h * 4);
+    CGContextRef ctx =
+            CGBitmapContextCreate(data->pixels, w, h, 8, 4 * w, cspace,
+                    kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
+    CGColorSpaceRelease(cspace);
+    CGContextClearRect(ctx, CGRectMake(0, 0, w, h));
+    CGContextTranslateCTM(ctx, 0, h - h);
+    CGContextDrawImage(ctx, CGRectMake(0, 0, w, h), image.CGImage);
+    CGContextRelease(ctx);
+    [image release];
+    [pngdata release];
+#elif defined USE_SDL
     for (char const *name = path; *name; name++)
         if ((data->img = IMG_Load(name)))
@@ -114 +147 @@
     data->size = 256;
     data->format = FORMAT_RGBA;
-    data->dummy = (uint8_t *)malloc(256 * 256 * 4 * sizeof(*data->dummy));
-    uint8_t *parser = data->dummy;
+    data->pixels = (uint8_t *)malloc(256 * 256 * 4 * sizeof(*data->pixels));
+    uint8_t *parser = data->pixels;
     for (int j = 0; j < 256; j++)
         for (int i = 0; i < 256; i++)
@@ -139 +172 @@
 void * Image::GetData() const
 {
-#if defined USE_SDL
+#if defined __APPLE__ && defined __MACH__
+    return data->pixels;
+#elif defined USE_SDL
     return data->img->pixels;
 #elif defined ANDROID_NDK
     return data->pixels;
 #else
-    return data->dummy;
+    return data->pixels;
 #endif
 }
@@ -150 +185 @@
 Image::~Image()
 {
-#if defined USE_SDL
+#if defined __APPLE__ && defined __MACH__
+    free(data->pixels);
+#elif defined USE_SDL
     SDL_FreeSurface(data->img);
 #elif defined ANDROID_NDK
@@ -164 +201 @@
     g_env->DeleteGlobalRef(data->bmp);
 #else
-    free(data->dummy);
+    free(data->pixels);
 #endif
     delete data;