Changeset 222

Timestamp:

03/16/08 15:06:02 (4 months ago)

Author:

mattn

Message:

* added three new filter types for quake2 surface and content flags
* fixed ufoai level filters

Files:

• GtkRadiant/branches/ZeroRadiant/contrib/ufoai/ufoai_filters.cpp (modified) (3 diffs)
• GtkRadiant/branches/ZeroRadiant/include/qertypes.h (modified) (1 diff)
• GtkRadiant/branches/ZeroRadiant/radiant/filters.cpp (modified) (4 diffs)

GtkRadiant/branches/ZeroRadiant/contrib/ufoai/ufoai_filters.cpp

@@ -11 +11 @@
-void UFOAIFilterInit (void)
-{
+        // texture name filters
-        filters[FILTER_ACTORCLIP] = FilterAdd(1, 0, "actorclip", 0);
-        filters[FILTER_WEAPONCLIP] = FilterAdd(1, 0, "weaponclip", 0);
@@ -16 +17 @@
-        filters[FILTER_STEPON] = FilterAdd(1, 0, "stepon", 0);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        Sys_Printf("UFO:AI Filters initialized\n");
@@ -37 +39 @@
-        if (filters[type]->active) {
-                filters[type]->active = false;
-Sys_Printf("filter %i deactivated\n", type
+//Sys_Printf("filter %i deactivated (mask %i 0x%x)\n", type, filters[type]->mask, filters[type]->mask
-        } else {
-                filters[type]->active = true;
-Sys_Printf("filter %i activated\n", type
+//Sys_Printf("filter %i activated (mask %i 0x%x)\n", type, filters[type]->mask, filters[type]->mask
-        }
-

GtkRadiant/branches/ZeroRadiant/include/qertypes.h

@@ -754 +754 @@
-                                                        // 3=brush->owner->eclass->name
-                                                        // 4=brush->owner->eclass->nShowFlags
+                                                        // 5=brush->face->texdef.flags (q2)
+                                                        // 6=brush->face->texdef.contents (q2)
-        int             mask;
-        char    *string;

GtkRadiant/branches/ZeroRadiant/radiant/filters.cpp

@@ -35 +35 @@
-// type 2 = QER_* shader flags
-// type 4 = entity classes
+// type 5 = surface flags (q2)
+// type 6 = content flags (q2)
+// type 7 = content flags - no match (q2)
-bfilter_t *FilterAdd(bfilter_t *pFilter, int type, int bmask, char *str, int exclude)
-{
@@ -41 +44 @@
-        pNew->attribute = type;
-        if (type == 1 || type == 3) pNew->string = str;
-
+ || type == 5 || type == 6 || type == 7
-        if (g_qeglobals.d_savedinfo.exclude & exclude)
-                pNew->active = true;
@@ -165 +168 @@
-                        filters = filters->next)
-                        {
+                                if (!filters->active)
+                                        continue;
-                                // exclude by attribute 1 brush->face->pShader->getName()
-ctive && filters->a
+
-                                {
-                                        if (strstr(f->pShader->getName(),filters->string))
@@ -175 +180 @@
-                                }
-                                // exclude by attribute 2 brush->face->pShader->getFlags()
-
-
+
-                                {
-                                        if (f->pShader->getFlags() & filters->mask)
+                                        {
+                                                filterbrush=true;
+                                                break;
+                                        }
+                                // quake2 - 5 == surface flags, 6 == content flags 
+                                }
+                                else if (filters->attribute == 5)
+                                {
+                                        if (f->texdef.flags && f->texdef.flags & filters->mask)
+                                        {
+                                                filterbrush=true;
+                                                break;
+                                        }
+                                }
+                                else if (filters->attribute == 6)
+                                {
+                                        if (f->texdef.contents && f->texdef.contents & filters->mask)
+                                        {
+                                                filterbrush=true;
+                                                break;
+                                        }
+                                }
+                                else if (filters->attribute == 7)
+                                {
+                                        if (f->texdef.contents && !(f->texdef.contents & filters->mask))
-                                        {
-                                                filterbrush=true;