X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake2%2Fq2map%2Ftree.c;h=c73f62293ba5a1a1373e4192e272c51bc27a758a;hb=dac8329952745dbb494bad1c301e44bab05ec0db;hp=6ca4aa1623057a17893bc723d9a9f77388304fe6;hpb=99980506540d9546dad31223a6eadf126ba68121;p=xonotic%2Fnetradiant.git diff --git a/tools/quake2/q2map/tree.c b/tools/quake2/q2map/tree.c index 6ca4aa16..c73f6229 100644 --- a/tools/quake2/q2map/tree.c +++ b/tools/quake2/q2map/tree.c @@ -1,42 +1,43 @@ /* -Copyright (C) 1999-2007 id Software, Inc. and contributors. -For a list of contributors, see the accompanying CONTRIBUTORS file. + Copyright (C) 1999-2006 Id Software, Inc. and contributors. + For a list of contributors, see the accompanying CONTRIBUTORS file. -This file is part of GtkRadiant. + This file is part of GtkRadiant. -GtkRadiant is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -GtkRadiant is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with GtkRadiant; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ #include "qbsp.h" -extern int c_nodes; +extern int c_nodes; -void RemovePortalFromNode (portal_t *portal, node_t *l); +void RemovePortalFromNode( portal_t *portal, node_t *l ); -node_t *NodeForPoint (node_t *node, vec3_t origin) -{ - plane_t *plane; - vec_t d; +node_t *NodeForPoint( node_t *node, vec3_t origin ){ + plane_t *plane; + vec_t d; - while (node->planenum != PLANENUM_LEAF) + while ( node->planenum != PLANENUM_LEAF ) { plane = &mapplanes[node->planenum]; - d = DotProduct (origin, plane->normal) - plane->dist; - if (d >= 0) + d = DotProduct( origin, plane->normal ) - plane->dist; + if ( d >= 0 ) { node = node->children[0]; - else + } + else{ node = node->children[1]; + } } return node; @@ -45,157 +46,155 @@ node_t *NodeForPoint (node_t *node, vec3_t origin) /* -============= -FreeTreePortals_r -============= -*/ -void FreeTreePortals_r (node_t *node) -{ - portal_t *p, *nextp; - int s; + ============= + FreeTreePortals_r + ============= + */ +void FreeTreePortals_r( node_t *node ){ + portal_t *p, *nextp; + int s; // free children - if (node->planenum != PLANENUM_LEAF) - { - FreeTreePortals_r (node->children[0]); - FreeTreePortals_r (node->children[1]); + if ( node->planenum != PLANENUM_LEAF ) { + FreeTreePortals_r( node->children[0] ); + FreeTreePortals_r( node->children[1] ); } // free portals - for (p=node->portals ; p ; p=nextp) + for ( p = node->portals ; p ; p = nextp ) { - s = (p->nodes[1] == node); + s = ( p->nodes[1] == node ); nextp = p->next[s]; - RemovePortalFromNode (p, p->nodes[!s]); - FreePortal (p); + RemovePortalFromNode( p, p->nodes[!s] ); + FreePortal( p ); } node->portals = NULL; } /* -============= -FreeTree_r -============= -*/ -void FreeTree_r (node_t *node) -{ - face_t *f, *nextf; + ============= + FreeTree_r + ============= + */ +void FreeTree_r( node_t *node ){ + face_t *f, *nextf; // free children - if (node->planenum != PLANENUM_LEAF) - { - FreeTree_r (node->children[0]); - FreeTree_r (node->children[1]); + if ( node->planenum != PLANENUM_LEAF ) { + FreeTree_r( node->children[0] ); + FreeTree_r( node->children[1] ); } // free bspbrushes - FreeBrushList (node->brushlist); + FreeBrushList( node->brushlist ); // free faces - for (f=node->faces ; f ; f=nextf) + for ( f = node->faces ; f ; f = nextf ) { nextf = f->next; - FreeFace (f); + FreeFace( f ); } // free the node - if (node->volume) - FreeBrush (node->volume); + if ( node->volume ) { + FreeBrush( node->volume ); + } - if (numthreads == 1) + if ( numthreads == 1 ) { c_nodes--; - free (node); + } + free( node ); } /* -============= -FreeTree -============= -*/ -void FreeTree (tree_t *tree) -{ - FreeTreePortals_r (tree->headnode); - FreeTree_r (tree->headnode); - free (tree); + ============= + FreeTree + ============= + */ +void FreeTree( tree_t *tree ){ + FreeTreePortals_r( tree->headnode ); + FreeTree_r( tree->headnode ); + free( tree ); } //=============================================================== -void PrintTree_r (node_t *node, int depth) -{ - int i; - plane_t *plane; - bspbrush_t *bb; +void PrintTree_r( node_t *node, int depth ){ + int i; + plane_t *plane; + bspbrush_t *bb; - for (i=0 ; iplanenum == PLANENUM_LEAF) - { - if (!node->brushlist) - Sys_Printf ("NULL\n"); + for ( i = 0 ; i < depth ; i++ ) + Sys_Printf( " " ); + if ( node->planenum == PLANENUM_LEAF ) { + if ( !node->brushlist ) { + Sys_Printf( "NULL\n" ); + } else { - for (bb=node->brushlist ; bb ; bb=bb->next) - Sys_Printf ("%i ", bb->original->brushnum); - Sys_Printf ("\n"); + for ( bb = node->brushlist ; bb ; bb = bb->next ) + Sys_Printf( "%i ", bb->original->brushnum ); + Sys_Printf( "\n" ); } return; } plane = &mapplanes[node->planenum]; - Sys_Printf ("#%i (%5.2f %5.2f %5.2f):%5.2f\n", node->planenum, - plane->normal[0], plane->normal[1], plane->normal[2], - plane->dist); - PrintTree_r (node->children[0], depth+1); - PrintTree_r (node->children[1], depth+1); + Sys_Printf( "#%i (%5.2f %5.2f %5.2f):%5.2f\n", node->planenum, + plane->normal[0], plane->normal[1], plane->normal[2], + plane->dist ); + PrintTree_r( node->children[0], depth + 1 ); + PrintTree_r( node->children[1], depth + 1 ); } /* -========================================================= + ========================================================= -NODES THAT DON'T SEPERATE DIFFERENT CONTENTS CAN BE PRUNED + NODES THAT DON'T SEPERATE DIFFERENT CONTENTS CAN BE PRUNED -========================================================= -*/ + ========================================================= + */ -int c_pruned; +int c_pruned; /* -============ -PruneNodes_r -============ -*/ -void PruneNodes_r (node_t *node) -{ - bspbrush_t *b, *next; - - if (node->planenum == PLANENUM_LEAF) + ============ + PruneNodes_r + ============ + */ +void PruneNodes_r( node_t *node ){ + bspbrush_t *b, *next; + + if ( node->planenum == PLANENUM_LEAF ) { return; - PruneNodes_r (node->children[0]); - PruneNodes_r (node->children[1]); + } + PruneNodes_r( node->children[0] ); + PruneNodes_r( node->children[1] ); - if ( (node->children[0]->contents & CONTENTS_SOLID) - && (node->children[1]->contents & CONTENTS_SOLID) ) - { - if (node->faces) - Error ("node->faces seperating CONTENTS_SOLID"); - if (node->children[0]->faces || node->children[1]->faces) - Error ("!node->faces with children"); + if ( ( node->children[0]->contents & CONTENTS_SOLID ) + && ( node->children[1]->contents & CONTENTS_SOLID ) ) { + if ( node->faces ) { + Error( "node->faces seperating CONTENTS_SOLID" ); + } + if ( node->children[0]->faces || node->children[1]->faces ) { + Error( "!node->faces with children" ); + } // FIXME: free stuff node->planenum = PLANENUM_LEAF; node->contents = CONTENTS_SOLID; node->detail_seperator = false; - if (node->brushlist) - Error ("PruneNodes: node->brushlist"); + if ( node->brushlist ) { + Error( "PruneNodes: node->brushlist" ); + } // combine brush lists node->brushlist = node->children[1]->brushlist; - for (b=node->children[0]->brushlist ; b ; b=next) + for ( b = node->children[0]->brushlist ; b ; b = next ) { next = b->next; b->next = node->brushlist; @@ -207,12 +206,11 @@ void PruneNodes_r (node_t *node) } -void PruneNodes (node_t *node) -{ - Sys_FPrintf( SYS_VRB, "--- PruneNodes ---\n"); +void PruneNodes( node_t *node ){ + Sys_FPrintf( SYS_VRB, "--- PruneNodes ---\n" ); c_pruned = 0; - PruneNodes_r (node); - Sys_FPrintf( SYS_VRB, "%5i pruned nodes\n", c_pruned); + PruneNodes_r( node ); + Sys_FPrintf( SYS_VRB, "%5i pruned nodes\n", c_pruned ); } //===========================================================