load assets.zip only once

- fixed some logging issue when loading assets.zip

Author: Denzy7

glue/include/dengine/dengine.h

@@ -71,6 +71,8 @@ typedef struct
     int enable_logthread;
 
     int android_handlebackbutton;
+    Stream assets_zip_stream;
+    ZipRead assets_zip;
 }DengineInitOpts;
 
 

glue/src/dengine.c

@@ -292,11 +292,47 @@ int dengine_init()
     if(DENGINE_INIT_OPTS.enable_logthread)
         dengineutils_logging_init();
 
+
+
+    /* load assets.zip */
+    /*TODO: could we load assets.zip from apk assets? */
+#ifndef DENGINE_ANDROID
+    char buf[2048];
+    /* hit or miss, i guess they never miss huh :( */
+    static const char* possible_assetszip_paths[] = 
+    {
+        "../../../share/dengine-%s/assets.zip",
+        "../../share/dengine-%s/assets.zip",
+        "../share/dengine-%s/assets.zip",
+        "share/dengine-%s/assets.zip",
+        "assets.zip"
+    };
+    for(int i = 0; i < DENGINE_ARY_SZ(possible_assetszip_paths); i++)
+    {
+        snprintf(buf, sizeof(buf), possible_assetszip_paths[i], DENGINE_VERSION);
+        FILE* ok = fopen(buf, "rb");
+        if(ok != NULL)
+        {
+            fclose(ok);
+            if(dengineutils_stream_new(buf, DENGINEUTILS_STREAM_TYPE_FILE, DENGINEUTILS_STREAM_MODE_READ, &DENGINE_INIT_OPTS.assets_zip_stream) && dengineutils_zipread_load(&DENGINE_INIT_OPTS.assets_zip_stream, &DENGINE_INIT_OPTS.assets_zip))
+            {
+                dengineutils_logging_log("TODO::load assets.zip from %s. cd_records: %u, ",
+                        buf, DENGINE_INIT_OPTS.assets_zip.eocdr.cd_records);
+                ;
+
+            }
+            break;
+        }
+    }
+#endif
+
     return 1;
 }
 
 void dengine_terminate()
 {
+
+    dengineutils_zipread_free(&DENGINE_INIT_OPTS.assets_zip);
     denginegui_terminate();
     dengineutils_filesys_terminate();
 
@@ -348,46 +384,18 @@ int dengine_load_asset(const char* path, void** mem, size_t* length)
 {
     File2Mem f2m;
     memset(&f2m, 0, sizeof(f2m));
+    CDFHR* cdfhr;
+    char buf[2048];
+
 #ifdef DENGINE_ANDROID
     f2m.file = path;
     dengineutils_android_asset2file2mem(&f2m);
-#else
-    char buf[2048];
+#endif
 
-    Stream assets_zip_stream;
-    ZipRead assets_zip;
-    CDFHR* cdfhr;
-    uint32_t cdfhr_sz;
-    /* hit or miss, i guess they never miss huh :( */
-    static const char* possiblepaths[] = 
-    {
-        "../../../share/dengine-%s/assets.zip",
-        "../../share/dengine-%s/assets.zip",
-        "../share/dengine-%s/assets.zip",
-        "share/dengine-%s/assets.zip",
-        "assets.zip"
-    };
-    for(int i = 0; i < DENGINE_ARY_SZ(possiblepaths); i++)
+    if(f2m.mem == NULL && DENGINE_INIT_OPTS.assets_zip.eocdr.cd_records > 0 && dengineutils_zipread_find_cdfhr(path, &cdfhr, &DENGINE_INIT_OPTS.assets_zip))
     {
-        snprintf(buf, sizeof(buf), possiblepaths[i], DENGINE_VERSION);
-        FILE* ok = fopen(buf, "rb");
-        if(ok != NULL)
-        {
-            fclose(ok);
-            if(dengineutils_stream_new(buf, DENGINEUTILS_STREAM_TYPE_FILE, DENGINEUTILS_STREAM_MODE_READ, &assets_zip_stream))
-            {
-                dengineutils_zipread_load(&assets_zip_stream, &assets_zip);
-                if(dengineutils_zipread_find_cdfhr(path, &cdfhr, &assets_zip))
-                {
-                    dengineutils_zipread_decompress_cdfhr_mem(&assets_zip_stream, cdfhr, &f2m.mem, &cdfhr_sz);
-                    dengineutils_logging_log("TODO::load %s from assets.zip", path);
-                    f2m.size = cdfhr_sz;
-                }
-            }
-
-            dengineutils_zipread_free(&assets_zip);
-            break;
-        }
+        dengineutils_zipread_decompress_cdfhr_mem(&DENGINE_INIT_OPTS.assets_zip_stream, cdfhr, &f2m.mem, (uint32_t*)&f2m.size);
+        dengineutils_logging_log("TODO::load %s from assets.zip", path);
     }
 
     if(f2m.mem == NULL)
@@ -399,7 +407,6 @@ int dengine_load_asset(const char* path, void** mem, size_t* length)
         dengineutils_filesys_file2mem_load(&f2m);
 
     }
-#endif
     *mem = f2m.mem;
     if(length)
         *length = f2m.size;

lib/dengine-utils/src/filesys.c

@@ -181,17 +181,14 @@ const char* dengineutils_filesys_get_assetsdir()
     /*}*/
 
 
-    char zipped_assets_dir[256];
-    //../../share/dengine-0.8.1/assets.zip
-    snprintf(zipped_assets_dir, sizeof(zipped_assets_dir), "../../share/dengine-%s/assets.zip", DENGINE_VERSION);
     dengineutils_logging_log("WARNING::Could not find assets directory.\n"
                              "Try:\n\t"
-                             "-dengine v0.8.1 and later support zipped assets if assets.zip is copied to %s\n\t",
                              "-moving it next to the executable\n\t"
                              "-moving it to %s\n\t"
                              "-setting envvar DENGINEASSETS\n\t"
-                             "-recompiling sources on this machine\n\t",
-                             zipped_assets_dir,
+                             "-recompiling sources on this machine\n\t"
+                             "\n"
+                             "*dengine v0.8.1 and later supports zipped assets if assets.zip is copied to current working directory*\n\t",
                              dengineutils_filesys_get_filesdir_dengine()
             );
 

lib/dengine-utils/src/zipread.c

@@ -78,7 +78,8 @@ int dengineutils_zipread_load(Stream* stream, ZipRead* zipread)
 
     if(!find_eocdr)
     {
-        dengineutils_logging_log("ERROR::EOCDR not found. This is probably not a zip file");
+        const char* path = stream->path ? stream->path : "This";
+        dengineutils_logging_log("ERROR::EOCDR not found. %s is probably not a zip file", path);
         return 0;
     }