Changeset 319

Timestamp:

09/01/08 12:34:10 (3 months ago)

Author:

timo

Message:

merge branch work back into trunk

Files:

• GtkRadiant/trunk/config.py (modified) (2 diffs)
• GtkRadiant/trunk/contrib/bkgrnd2d/bkgrnd2d.vcproj (modified) (1 prop)
• GtkRadiant/trunk/contrib/bobtoolz/bobToolz_gtk.vcproj (modified) (1 prop)
• GtkRadiant/trunk/contrib/camera/camera.vcproj (modified) (1 prop)
• GtkRadiant/trunk/contrib/camera/camera_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/contrib/camera/camera_VC9.vcproj)
• GtkRadiant/trunk/contrib/gtkgensurf/gtkgensurf.vcproj (modified) (1 prop)
• GtkRadiant/trunk/contrib/hydratoolz/hydratoolz.vcproj (modified) (1 prop)
• GtkRadiant/trunk/contrib/prtview/PrtView.vcproj (modified) (1 prop)
• GtkRadiant/trunk/contrib/ufoai/ufoai.vcproj (modified) (1 prop)
• GtkRadiant/trunk/gen.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/cmdlib/cmdlib.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/cmdlib/cmdlib_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/libs/cmdlib/cmdlib_VC9.vcproj)
• GtkRadiant/trunk/libs/ddslib/ddslib.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/ddslib/ddslib_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/libs/ddslib/ddslib_VC9.vcproj)
• GtkRadiant/trunk/libs/l_net/l_net.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/l_net/l_net_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/libs/l_net/l_net_VC9.vcproj)
• GtkRadiant/trunk/libs/mathlib/mathlib.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/mathlib/mathlib_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/libs/mathlib/mathlib_VC9.vcproj)
• GtkRadiant/trunk/libs/md5lib/md5lib.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/md5lib/md5lib_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/libs/md5lib/md5lib_VC9.vcproj)
• GtkRadiant/trunk/libs/picomodel/picomodel.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/picomodel/picomodel_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/libs/picomodel/picomodel_VC9.vcproj)
• GtkRadiant/trunk/libs/splines/Splines.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/splines/Splines_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/libs/splines/Splines_VC9.vcproj)
• GtkRadiant/trunk/libs/synapse/synapse.vcproj (modified) (1 prop)
• GtkRadiant/trunk/libs/synapse/synapse_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/libs/synapse/synapse_VC9.vcproj)
• GtkRadiant/trunk/plugins/eclassfgd/fgd.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/entity/entity.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/entity/entity_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/entity/entity_VC9.vcproj)
• GtkRadiant/trunk/plugins/image/image.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/image/image_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/image/image_VC9.vcproj)
• GtkRadiant/trunk/plugins/imagehl/imagehl.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/imagem8/imagem8.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/imagepng/imagepng.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/imagepng/imagepng_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/imagepng/imagepng_VC9.vcproj)
• GtkRadiant/trunk/plugins/imagewal/imagewal.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/map/map.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/map/map_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/map/map_VC9.vcproj)
• GtkRadiant/trunk/plugins/mapxml/mapxml.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/mapxml/mapxml_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/mapxml/mapxml_VC9.vcproj)
• GtkRadiant/trunk/plugins/model/model.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/model/model_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/model/model_VC9.vcproj)
• GtkRadiant/trunk/plugins/sample/sample.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/shaders/shaders.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/shaders/shaders_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/shaders/shaders_VC9.vcproj)
• GtkRadiant/trunk/plugins/spritemodel/spritemodel.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/surface/surface.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/surface/surface_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/surface/surface_VC9.vcproj)
• GtkRadiant/trunk/plugins/surface_heretic2/surface_heretic2.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/surface_quake2/surface_quake2.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/surface_ufoai/surface_ufoai.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/textool/TexTool.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/vfspak/vfspak.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/vfspk3/vfspk3.vcproj (modified) (1 prop)
• GtkRadiant/trunk/plugins/vfspk3/vfspk3_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/plugins/vfspk3/vfspk3_VC9.vcproj)
• GtkRadiant/trunk/plugins/vfswad/vfswad.vcproj (modified) (1 prop)
• GtkRadiant/trunk/radiant.sln (modified) (2 diffs, 1 prop)
• GtkRadiant/trunk/radiant/gtkmisc.cpp (modified) (2 diffs)
• GtkRadiant/trunk/radiant/mainframe.cpp (modified) (4 diffs)
• GtkRadiant/trunk/radiant/mainframe.h (modified) (2 diffs)
• GtkRadiant/trunk/radiant/missing.cpp (modified) (2 diffs)
• GtkRadiant/trunk/radiant/preferences.cpp (modified) (3 diffs)
• GtkRadiant/trunk/radiant/radiant.vcproj (modified) (1 prop)
• GtkRadiant/trunk/radiant/radiant_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/radiant/radiant_VC9.vcproj)
• GtkRadiant/trunk/radiant/select.cpp (modified) (1 diff)
• GtkRadiant/trunk/radiant/select.h (modified) (1 diff)
• GtkRadiant/trunk/radiant_VC9.sln (copied) (copied from GtkRadiant/branches/timo/radiant_VC9.sln)
• GtkRadiant/trunk/tools/quake2/q2map/q2map.vcproj (modified) (1 prop)
• GtkRadiant/trunk/tools/quake2/qdata/qdata3.vcproj (modified) (1 prop)
• GtkRadiant/trunk/tools/quake2/qdata_heretic2/qdata3_heretic2.vcproj (modified) (1 prop)
• GtkRadiant/trunk/tools/quake3/q3data/q3data.vcproj (modified) (1 prop)
• GtkRadiant/trunk/tools/quake3/q3map2/bsp.c (modified) (2 diffs)
• GtkRadiant/trunk/tools/quake3/q3map2/bspfile_abstract.c (modified) (1 diff)
• GtkRadiant/trunk/tools/quake3/q3map2/bspfile_ibsp.c (modified) (4 diffs)
• GtkRadiant/trunk/tools/quake3/q3map2/game_quake3.h (modified) (2 diffs)
• GtkRadiant/trunk/tools/quake3/q3map2/light.c (modified) (1 diff)
• GtkRadiant/trunk/tools/quake3/q3map2/q3map2.h (modified) (4 diffs)
• GtkRadiant/trunk/tools/quake3/q3map2/q3map2.vcproj (modified) (7 diffs, 1 prop)
• GtkRadiant/trunk/tools/quake3/q3map2/q3map2_VC9.vcproj (copied) (copied from GtkRadiant/branches/timo/tools/quake3/q3map2/q3map2_VC9.vcproj)
• GtkRadiant/trunk/tools/quake3/q3map2/shaders.c (modified) (2 diffs)
• GtkRadiant/trunk/tools/quake3/q3map2/writebsp.c (modified) (1 diff)
• GtkRadiant/trunk/win32_install.py (deleted)

GtkRadiant/trunk/config.py

@@ -258 +258 @@
-                ret = os.system( cmd )
-                if ( ret != 0 ):
-'checkout or update failed'
+Exception( 'checkout or update failed' )
-
-
@@ -268 +268 @@
-
-        def Setup( self ):
-                for platform in self.setup_platforms:
-                        if ( platform == 'local' ):
-                                # special case, fetch external paks under the local install directory
-                                self.FetchGamePaks( self.install_directory )
+                # NOTE: unrelated to self.setup_platforms - grab support files and binaries and install them
+                if ( self.platform == 'Windows' ):
+                        depsfile = 'GtkR-deps-1.6-3.zip'
+                        # TMP
+                        #if ( not os.path.exists( depsfile ) ):
+                        if ( True ):
+                                cmd = 'wget http://zerowing.idsoftware.com/files/radiant/developer/1.6.1/%s' % depsfile
+                                print cmd
+                                ret = os.system( cmd )
+                                if ( ret != 0 ):
+                                        raise Exception( 'Failed to download dependencies file' )
+
+                                # extract one directoy above
+                                f = os.path.abspath( depsfile )
+                                backup_cwd = os.getcwd()
+                                os.chdir( os.path.dirname( backup_cwd ) )
+                                cmd = 'unzip %s' % f
+                                print cmd
+                                ret = os.system( cmd )
+                                if ( ret != 0 ):
+                                        raise Exception( 'unzip dependencies file failed' )
+                                os.chdir( backup_cwd )
+                                
+                                # copy all the dependent runtime data to the install directory
+                                srcdir = os.path.dirname( backup_cwd )
+                                for f in [
+                                        'libxml2/bin/libxml2.dll',
+                                        'gtk2/bin/libglib-2.0-0.dll',
+                                        'gtk2/bin/libgobject-2.0-0.dll',
+                                        'gtk2/bin/libgdk-win32-2.0-0.dll',
+                                        'gtk2/bin/libgtk-win32-2.0-0.dll',
+                                        'gtk2/bin/intl.dll',
+                                        'gtk2/bin/libatk-1.0-0.dll',
+                                        'gtk2/bin/libcairo-2.dll',
+                                        'gtk2/bin/libgdk_pixbuf-2.0-0.dll',
+                                        'gtk2/bin/libgmodule-2.0-0.dll',
+                                        'gtk2/bin/libpng13.dll',
+                                        'gtk2/bin/libpango-1.0-0.dll',
+                                        'gtk2/bin/libpangocairo-1.0-0.dll',
+                                        'gtk2/bin/libpangowin32-1.0-0.dll',
+                                        'gtk2/lib/libgtkglext-win32-1.0-0.dll',
+                                        'gtk2/lib/libgdkglext-win32-1.0-0.dll',
+                                        'gtk2/lib/iconv.dll', ]:
+                                        cmd = 'cp -v "%s" installs' % os.path.join( srcdir, f )
+                                        print cmd
+                                        ret = os.system( cmd )
+                                        if ( ret != 0 ):
+                                                raise Exception( 'runtime file copy failed' )
+                                for d in [
+                                        'gtk2/etc',
+                                        'gtk2/share',
+                                        ]:
+                                        cmd = 'cp -r -v "%s" install' % os.path.join( srcdir, d )
+                                        print cmd
+                                        ret = os.system( cmd )
+                                        if ( ret != 0 ):
+                                                raise Exception( 'runtime directory copy failed' )
-
-# parse the config statement line to produce/update an existing config list

GtkRadiant/trunk/radiant.sln

@@ -10 +10 @@
-                {0B522841-BDCC-493A-BA5C-604AE2CD5756} = {0B522841-BDCC-493A-BA5C-604AE2CD5756}
-                {3886C418-A41E-4AFF-BBD1-8E1E508920C9} = {3886C418-A41E-4AFF-BBD1-8E1E508920C9}
+                {444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8}
-        EndProjectSection
-EndProject
@@ -73 +74 @@
-        ProjectSection(ProjectDependencies) = postProject
-                {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01} = {DC2F2B6B-2596-4B90-88CE-2FDE4C2FFB01}
+                {444E6FDA-83BD-49F1-89A4-7CF716F742A8} = {444E6FDA-83BD-49F1-89A4-7CF716F742A8}
-        EndProjectSection
-EndProject

GtkRadiant/trunk/radiant/gtkmisc.cpp

@@ -1475 +1475 @@
-  gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION (file_sel));
-
-
-
+
+
+
-
-  gtk_widget_hide (GTK_FILE_SELECTION (file_sel)->file_list->parent);
@@ -1492 +1493 @@
-    gtk_main_iteration ();
-
-gtk_file_selection_get_filename (GTK_FILE_SELECTION (file_sel))
-
- (file_sel
- (file_sel
+ gtk_file_selection_get_filename( GTK_FILE_SELECTION( file_sel ) ) 
+
+( file_sel 
+( file_sel 
-
-  return filename;

GtkRadiant/trunk/radiant/mainframe.cpp

@@ -123 +123 @@
-  {"CSGSubtract", 'U', 0x01, ID_SELECTION_CSGSUBTRACT, "menu_selection_csgsubstract"},
-  //  {"ViewGroups", 'G', 0x00, ID_VIEW_GROUPS, "menu_view_groups"}, (temporary disabled)
+  {"SelectFuncGroup", 'G', 0x00, ID_SELECT_FUNC_GROUP, "menu_select_func_group"},
-  {"HideSelected", 'H', 0x00, ID_VIEW_HIDESHOW_HIDESELECTED, "menu_view_hideshow_hideselected"},
-  {"ShowHidden", 'H', 0x01, ID_VIEW_HIDESHOW_SHOWHIDDEN, "menu_view_hideshow_showhidden"},
@@ -425 +426 @@
-    case ID_VIEW_ENTITY: g_pParentWnd->OnViewEntity (); break;
-    case ID_VIEW_GROUPS: g_pParentWnd->OnViewGroups (); break;
+        case ID_SELECT_FUNC_GROUP: g_pParentWnd->OnSelectFuncGroup(); break;
-    case ID_TOGGLEVIEW: g_pParentWnd->OnToggleview (); break;
-    case ID_TOGGLEVIEW_YZ: g_pParentWnd->OnToggleviewYz (); break;
@@ -1201 +1203 @@
-  create_menu_item_with_mnemonic (menu_in_menu, _("Select _Inside"),
-                    GTK_SIGNAL_FUNC (HandleCommand), ID_SELECTION_SELECTINSIDE);
+  create_menu_item_with_mnemonic (menu_in_menu, "Select Func _Group", GTK_SIGNAL_FUNC (HandleCommand), ID_SELECT_FUNC_GROUP);
-#ifndef QUAKE3
-  create_menu_item_with_mnemonic (menu_in_menu, _("Nudge Left"),
@@ -7075 +7078 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-  if (g_PrefsDlg.m_bCamDiscrete && (m_pCamWnd && !m_pCamWnd->m_bFreeMove) )

GtkRadiant/trunk/radiant/mainframe.h

@@ -408 +408 @@
-#define ID_COLORS_MAJOR_ALT             40231
-
+#define ID_SELECT_FUNC_GROUP                    40233
+
-// those must have their own ID chunk ID_GRID_025 <= ID_GRID <= ID_GRID_256
-#define ID_GRID_025                     40300
@@ -892 +894 @@
-  void OnFilterClusterportals();
-  void OnFilterLightgrid();
+  void OnSelectFuncGroup();
-
-private:

GtkRadiant/trunk/radiant/missing.cpp

@@ -209 +209 @@
-
-bool radCreateDirectory( const char *directory ) {
-CreateDirectory( directory, NULL ) != false
+( CreateDirectory( directory, NULL ) != false )
-}
-
-bool radCopyFile( const char *lpExistingFileName, const char *lpNewFileName ) {
-CopyFile( lpExistingFileName, lpNewFileName, FALSE ) != false
+( CopyFile( lpExistingFileName, lpNewFileName, FALSE ) != false )
-}
-
@@ -240 +240 @@
-                        case PATH_DIRECTORY: {
-                                if ( CheckFile( dstEntry.GetBuffer() ) == PATH_FAIL ) {
-
+
+
+
+
-                                }
-                                bool ret;

GtkRadiant/trunk/radiant/preferences.cpp

@@ -3230 +3230 @@
-
-        CGameInstall* i = static_cast<CGameInstall*>( data );
-w
+i->m_pW
-
-        i->UpdateData( TRUE );
@@ -3237 +3237 @@
-                i->m_strEngine = dir;
-                i->UpdateData( FALSE );
-
+g_
-        }
-}
@@ -3371 +3371 @@
-
-        FILE *fg = fopen( gameFilePath.GetBuffer(), "w" );
-
+|| ferror( fg ) 
-                Error( "Failed to open %s for writing\n", gameFilePath.GetBuffer() );
-        }

GtkRadiant/trunk/radiant/select.cpp

@@ -1372 +1372 @@
-        Sys_UpdateWindows (W_ALL);
-}
+
+void Select_SelectGroup(entity_t* group)
+{
+        brush_t*  b;
+        //brush_t*  next;
+
+        Undo_Start ("select func group");
+        Undo_AddBrushList (&selected_brushes);
+        Undo_End();
+
+        Select_Deselect();
+
+        b = &group->brushes;
+
+        do
+        {
+                b = b->onext;
+                Brush_RemoveFromList(b);
+                Brush_AddToList(b, &selected_brushes);
+        } while( b->onext != &group->brushes );
+
+        Sys_UpdateWindows (W_ALL);
+}
+
-
-void Select_Ungroup(void)

GtkRadiant/trunk/radiant/select.h

@@ -66 +66 @@
-void Select_FitTexture(int nHeight = 1, int nWidth = 1);
-
+void Select_SelectGroup(entity_t* group);
+
-// absolute texture coordinates
-// TTimo NOTE: this is stuff for old brushes format and rotation texture lock .. sort of in-between with bush primitives

GtkRadiant/trunk/tools/quake3/q3map2/bsp.c

@@ -46 +46 @@
-
-
+/*
+ProcessAdvertisements()
+copies advertisement info into the BSP structures
+*/
+
+static void ProcessAdvertisements( void ) {
+        int                                     i;
+        const char*                     className;
+        const char*                     modelKey;
+        int                                     modelNum;
+        bspModel_t*                     adModel;
+        bspDrawSurface_t*       adSurface;
+
+        Sys_FPrintf( SYS_VRB, "--- ProcessAdvertisements ---\n" );
+
+        for( i = 0; i < numEntities; i++ ) {
+
+                /* is an advertisement? */
+                className = ValueForKey( &entities[ i ], "classname" );
+
+                if( !Q_stricmp( "advertisement", className ) ) {
+                        
+                        modelKey = ValueForKey( &entities[ i ], "model" );
+
+                        if( strlen( modelKey ) > MAX_QPATH - 1 ) {
+                                Error( "Model Key for entity exceeds ad struct string length." );
+                        } else {
+                                if( numBSPAds < MAX_MAP_ADVERTISEMENTS ) {
+                                        bspAds[numBSPAds].cellId = IntForKey( &entities[ i ], "cellId" );
+                                        strncpy( bspAds[numBSPAds].model, modelKey, sizeof( bspAds[numBSPAds].model ) );
+
+                                        modelKey++;
+                                        modelNum = atoi( modelKey );
+                                        adModel = &bspModels[modelNum];
+                                        
+                                        if( adModel->numBSPSurfaces != 1 ) {
+                                                Error( "Ad cell id %d has more than one surface.", bspAds[numBSPAds].cellId );
+                                        }
+
+                                        adSurface = &bspDrawSurfaces[adModel->firstBSPSurface];
+                                        
+                                        // store the normal for use at run time.. all ad verts are assumed to 
+                                        // have identical normals (because they should be a simple rectangle)
+                                        // so just use the first vert's normal
+                                        VectorCopy( bspDrawVerts[adSurface->firstVert].normal, bspAds[numBSPAds].normal );
+
+                                        // store the ad quad for quick use at run time
+                                        if( adSurface->surfaceType == MST_PATCH ) {
+                                                int v0 = adSurface->firstVert + adSurface->patchHeight - 1;
+                                                int v1 = adSurface->firstVert + adSurface->numVerts - 1;
+                                                int v2 = adSurface->firstVert + adSurface->numVerts - adSurface->patchWidth;
+                                                int v3 = adSurface->firstVert;
+                                                VectorCopy( bspDrawVerts[v0].xyz, bspAds[numBSPAds].rect[0] );
+                                                VectorCopy( bspDrawVerts[v1].xyz, bspAds[numBSPAds].rect[1] );
+                                                VectorCopy( bspDrawVerts[v2].xyz, bspAds[numBSPAds].rect[2] );
+                                                VectorCopy( bspDrawVerts[v3].xyz, bspAds[numBSPAds].rect[3] );
+                                        } else {
+                                                Error( "Ad cell %d has an unsupported Ad Surface type.", bspAds[numBSPAds].cellId );
+                                        }
+
+                                        numBSPAds++;
+                                } else {
+                                        Error( "Maximum number of map advertisements exceeded." );
+                                }
+                        }
+                }
+        }
+
+        Sys_FPrintf( SYS_VRB, "%9d in-game advertisements\n", numBSPAds );
+}
-
-/*
@@ -846 +916 @@
-        SetLightStyles();
-        
+        /* process in game advertisements */
+        ProcessAdvertisements();
+
-        /* finish and write bsp */
-        EndBSPFile();

GtkRadiant/trunk/tools/quake3/q3map2/bspfile_abstract.c

@@ -240 +240 @@
-                bspFogs[ i ].brushNum = LittleLong( bspFogs[ i ].brushNum );
-                bspFogs[ i ].visibleSide = LittleLong( bspFogs[ i ].visibleSide );
+        }
+
+        /* advertisements */
+        for( i = 0; i < numBSPAds; i++ )
+        {
+                bspAds[ i ].cellId = LittleLong( bspAds[ i ].cellId );
+                bspAds[ i ].normal[ 0 ] = LittleFloat( bspAds[ i ].normal[ 0 ] );
+                bspAds[ i ].normal[ 1 ] = LittleFloat( bspAds[ i ].normal[ 1 ] );
+                bspAds[ i ].normal[ 2 ] = LittleFloat( bspAds[ i ].normal[ 2 ] );
+
+                for( j = 0; j < 4; j++ ) 
+                {
+                        bspAds[ i ].rect[j][ 0 ] = LittleFloat( bspAds[ i ].rect[j][ 0 ] );
+                        bspAds[ i ].rect[j][ 1 ] = LittleFloat( bspAds[ i ].rect[j][ 1 ] );
+                        bspAds[ i ].rect[j][ 2 ] = LittleFloat( bspAds[ i ].rect[j][ 2 ] );
+                }
+
+                //bspAds[ i ].model[ MAX_QPATH ];
-        }
-}

GtkRadiant/trunk/tools/quake3/q3map2/bspfile_ibsp.c

@@ -65 +65 @@
-#define LUMP_LIGHTGRID          15
-#define LUMP_VISIBILITY         16
-
+
+
-
-
@@ -454 +455 @@
-}
-
-
-
-/*
-LoadIBSPFile()
@@ -514 +513 @@
-        
-        CopyLightGridLumps( header );
-
+
+
+
+
-        /* free the file buffer */
-        free( header );
@@ -572 +574 @@
-        AddLump( file, (bspHeader_t*) header, LUMP_FOGS, bspFogs, numBSPFogs * sizeof( bspFog_t ) );
-        AddLump( file, (bspHeader_t*) header, LUMP_DRAWINDEXES, bspDrawIndexes, numBSPDrawIndexes * sizeof( bspDrawIndexes[ 0 ] ) );
-
+
+
+
+
-        /* emit bsp size */
-        size = ftell( file );

GtkRadiant/trunk/tools/quake3/q3map2/game_quake3.h

@@ -115 +115 @@
-        1.0f,                           /* lightmap compensate */
-        "IBSP",                         /* bsp file prefix */
-6
+7
-        qfalse,                         /* cod-style lump len/ofs order */
-        LoadIBSPFile,           /* bsp load function */
@@ -180 +180 @@
-                { "dust",                       0,                                                      0,                                                      Q_SURF_DUST,                            0,                                                      0,                                                      0 },
-                
-                
-                /* null */
-                { NULL, 0, 0, 0, 0, 0, 0 }

GtkRadiant/trunk/tools/quake3/q3map2/light.c

@@ -340 +340 @@
-                        Error( "Invalid lightstyle (%d) on entity %d", light->style, i );
-                
-/* override */
-if( noStyles )
-       light->style = LS_NORMAL;
-
+if( light->style != LS_NORMAL ) {
+       Sys_FPrintf (SYS_WRN, "WARNING: Styled light found targeting %s\n **", target );
+}
+
-                /* set light intensity */
-                intensity = FloatForKey( e, "_light" );

GtkRadiant/trunk/tools/quake3/q3map2/q3map2.h

@@ -170 +170 @@
-#define C_SKIP                                  0x00008000      /* like hint, but skips this face (doesn't split bsp) */
-#define C_NOMARKS                               0x00010000      /* no decals */
-
-#define C_DETAIL                                0x08000000      /* THIS MUST BE THE SAME AS IN RADIANT! */
-
@@ -324 +323 @@
-#define MAX_MAP_DRAW_INDEXES    0x80000
-
+#define MAX_MAP_ADVERTISEMENTS  30
-
-/* key / value pair sizes in the entities lump */
@@ -502 +502 @@
-bspDrawSurface_t;
-
+
+/* advertisements */
+typedef struct {
+        int                     cellId;
+        vec3_t          normal;
+        vec3_t          rect[4];
+        char            model[ MAX_QPATH ];
+} bspAdvertisement_t;