Made RENDERPATH_GL20 require fbo support and always use it.

[xonotic/darkplaces.git] / filematch.c

diff --git a/filematch.c b/filematch.c
index 54bd2a5c50f13d86bef459c47ed0816a0bb5d84e..14c1d1605ab43d77616f2577d7a5ade11549673f 100644 (file)
--- a/filematch.c
+++ b/filematch.c
@@ -1,4 +1,10 @@
 
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <dirent.h>
+#endif
+
 #include "quakedef.h"
 
 // LordHavoc: some portable directory listing code I wrote for lmp2pcx, now used in darkplaces to load id1/*.pak and such...
@@ -8,6 +14,8 @@ int matchpattern(const char *in, const char *pattern, int caseinsensitive)
        return matchpattern_with_separator(in, pattern, caseinsensitive, "/\\:", false);
 }
 
+// wildcard_least_one: if true * matches 1 or more characters
+//                     if false * matches 0 or more characters
 int matchpattern_with_separator(const char *in, const char *pattern, int caseinsensitive, const char *separators, qboolean wildcard_least_one)
 {
        int c1, c2;
@@ -25,10 +33,11 @@ int matchpattern_with_separator(const char *in, const char *pattern, int caseins
                        break;
                case '*': // match anything until following string
                        if(wildcard_least_one)
+                       {
                                if (*in == 0 || strchr(separators, *in))
                                        return 0; // no match
-                       if (!*in)
-                               return 1; // match
+                               in++;
+                       }
                        pattern++;
                        while (*in)
                        {
@@ -108,22 +117,37 @@ void stringlistappend(stringlist_t *list, const char *text)
        list->numstrings++;
 }
 
-void stringlistsort(stringlist_t *list)
+static int stringlistsort_cmp(const void *a, const void *b)
+{
+       return strcasecmp(*(const char **)a, *(const char **)b);
+}
+
+void stringlistsort(stringlist_t *list, qboolean uniq)
 {
        int i, j;
-       char *temp;
-       // this is a selection sort (finds the best entry for each slot)
-       for (i = 0;i < list->numstrings - 1;i++)
+       if(list->numstrings < 1)
+               return;
+       qsort(&list->strings[0], list->numstrings, sizeof(list->strings[0]), stringlistsort_cmp);
+       if(uniq)
        {
-               for (j = i + 1;j < list->numstrings;j++)
+               // i: the item to read
+               // j: the item last written
+               for (i = 1, j = 0; i < list->numstrings; ++i)
                {
-                       if (strcasecmp(list->strings[i], list->strings[j]) > 0)
-                       {
-                               temp = list->strings[i];
-                               list->strings[i] = list->strings[j];
-                               list->strings[j] = temp;
-                       }
+                       char *save;
+                       if(!strcasecmp(list->strings[i], list->strings[j]))
+                               continue;
+                       ++j;
+                       save = list->strings[j];
+                       list->strings[j] = list->strings[i];
+                       list->strings[i] = save;
                }
+               for(i = j+1; i < list->numstrings; ++i)
+               {
+                       if (list->strings[i])
+                               Z_Free(list->strings[i]);
+               }
+               list->numstrings = j+1;
        }
 }
 
@@ -138,11 +162,9 @@ static void adddirentry(stringlist_t *list, const char *path, const char *name)
        }
 }
 #ifdef WIN32
-#include <windows.h>
 void listdirectory(stringlist_t *list, const char *basepath, const char *path)
 {
-       int i;
-       char pattern[4096], *c;
+       char pattern[4096];
        WIN32_FIND_DATA n_file;
        HANDLE hFile;
        strlcpy (pattern, basepath, sizeof(pattern));
@@ -156,24 +178,43 @@ void listdirectory(stringlist_t *list, const char *basepath, const char *path)
                adddirentry(list, path, n_file.cFileName);
        } while (FindNextFile(hFile, &n_file) != 0);
        FindClose(hFile);
-
-       // convert names to lowercase because windows does not care, but pattern matching code often does
-       for (i = 0;i < list->numstrings;i++)
-               for (c = list->strings[i];*c;c++)
-                       if (*c >= 'A' && *c <= 'Z')
-                               *c += 'a' - 'A';
 }
 #else
-#include <dirent.h>
 void listdirectory(stringlist_t *list, const char *basepath, const char *path)
 {
        char fullpath[MAX_OSPATH];
        DIR *dir;
        struct dirent *ent;
-       dpsnprintf(fullpath, sizeof(fullpath), "%s%s", basepath, *path ? path : "./");
+       dpsnprintf(fullpath, sizeof(fullpath), "%s%s", basepath, path);
+#ifdef __ANDROID__
+       // SDL currently does not support listing assets, so we have to emulate
+       // it. We're using relative paths for assets, so that will do.
+       if (basepath[0] != '/')
+       {
+               char listpath[MAX_OSPATH];
+               qfile_t *listfile;
+               dpsnprintf(listpath, sizeof(listpath), "%sls.txt", fullpath);
+               char *buf = (char *) FS_SysLoadFile(listpath, tempmempool, true, NULL);
+               if (!buf)
+                       return;
+               char *p = buf;
+               for (;;)
+               {
+                       char *q = strchr(p, '\n');
+                       if (q == NULL)
+                               break;
+                       *q = 0;
+                       adddirentry(list, path, p);
+                       p = q + 1;
+               }
+               Mem_Free(buf);
+               return;
+       }
+#endif
        dir = opendir(fullpath);
        if (!dir)
                return;
+
        while ((ent = readdir(dir)))
                adddirentry(list, path, ent->d_name);
        closedir(dir);