ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-10 06:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #209 from QBall147/master

Browse source 
Added -exportents to q3map2 (exports entities to a .ent file)
This commit is contained in:
Timothee "TTimo" Besset 2013-07-19 11:43:32 -07:00
commit ae32550cb4
13 changed files with 279 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
radiant/qedefs.h
View file

@ -36,7 +36,7 @@
#define MAX_POINTS 1024
#define CMD_TEXTUREWAD 60000
#define CMD_BSPCOMMAND 61000
#define CMD_BSPCOMMAND 62000
#define PITCH 0
#define YAW 1

112
tools/quake3/q3map2/exportents.c Normal file
View file

@ -0,0 +1,112 @@
/* -------------------------------------------------------------------------------
Copyright (C) 1999-2013 id Software, Inc. and contributors.
For a list of contributors, see the accompanying CONTRIBUTORS file.
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 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
----------------------------------------------------------------------------------
This code has been altered significantly from its original form, to support
several games based on the Quake III Arena engine, in the form of "Q3Map2."
------------------------------------------------------------------------------- */
/* marker */
#define EXPORTENTS_C
/* dependencies */
#include "q3map2.h"
/* -------------------------------------------------------------------------------
this file contains code that exports entities to a .ent file.
------------------------------------------------------------------------------- */
/*
ExportEntities()
exports the entities to a text file (.ent)
*/
void ExportEntities( void ){
char filename[ 1024 ];
FILE *file;
/* note it */
Sys_FPrintf( SYS_VRB, "--- ExportEntities ---\n" );
/* do some path mangling */
strcpy( filename, source );
StripExtension( filename );
strcat( filename, ".ent" );
/* sanity check */
if ( bspEntData == NULL || bspEntDataSize == 0 ) {
Sys_Printf( "WARNING: No BSP entity data. aborting...\n" );
return;
}
/* write it */
Sys_Printf( "Writing %s\n", filename );
Sys_FPrintf( SYS_VRB, "(%d bytes)\n", bspEntDataSize );
file = fopen( filename, "w" );
if ( file == NULL ) {
Error( "Unable to open %s for writing", filename );
}
fprintf( file, "%s\n", bspEntData );
fclose( file );
}
/*
ExportEntitiesMain()
exports the entities to a text file (.ent)
*/
int ExportEntitiesMain( int argc, char **argv ){
/* arg checking */
if ( argc < 1 ) {
Sys_Printf( "Usage: q3map -exportents [-v] <mapname>\n" );
return 0;
}
/* do some path mangling */
strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
StripExtension( source );
DefaultExtension( source, ".bsp" );
/* load the bsp */
Sys_Printf( "Loading %s\n", source );
LoadBSPFile( source );
/* export the lightmaps */
ExportEntities();
/* return to sender */
return 0;
}

5
tools/quake3/q3map2/main.c
View file

@ -721,6 +721,11 @@ int main( int argc, char **argv ){
r = LightMain( argc, argv );
}
/* QBall: export entities */
else if ( !strcmp( argv[ 1 ], "-exportents" ) ) {
r = ExportEntitiesMain( argc - 1, argv + 1 );
}
/* ydnar: lightmap export */
else if ( !strcmp( argv[ 1 ], "-export" ) ) {
r = ExportLightmapsMain( argc - 1, argv + 1 );

5
tools/quake3/q3map2/q3map2.h
View file

@ -1762,6 +1762,11 @@ void StitchSurfaceLightmaps( void );
void StoreSurfaceLightmaps( void );
/* exportents.c */
void ExportEntities( void );
int ExportEntitiesMain( int argc, char **argv );
/* image.c */
void ImageFree( image_t *image );
image_t *ImageFind( const char *filename );

4
tools/quake3/q3map2/q3map2.vcproj
View file

@ -302,6 +302,10 @@
RelativePath=".\lightmaps_ydnar.c"
>
</File>
<File
RelativePath=".\exportents.c"
>
</File>
<File
RelativePath=".\vis.c"
>

1
tools/quake3/q3map2/q3map2.vcxproj
View file

@ -193,6 +193,7 @@
<ClCompile Include="light_trace.c" />
<ClCompile Include="light_ydnar.c" />
<ClCompile Include="lightmaps_ydnar.c" />
<ClCompile Include="exportents.c" />
<ClCompile Include="vis.c" />
<ClCompile Include="visflow.c" />
<ClCompile Include="convert_ase.c" />

3
tools/quake3/q3map2/q3map2.vcxproj.filters
View file

@ -110,6 +110,9 @@
<ClCompile Include="lightmaps_ydnar.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="exportents.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="vis.c">
<Filter>src</Filter>
</ClCompile>

112
tools/urt/tools/quake3/q3map2/exportents.c Normal file
View file

@ -0,0 +1,112 @@
/* -------------------------------------------------------------------------------
Copyright (C) 1999-2013 id Software, Inc. and contributors.
For a list of contributors, see the accompanying CONTRIBUTORS file.
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 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
----------------------------------------------------------------------------------
This code has been altered significantly from its original form, to support
several games based on the Quake III Arena engine, in the form of "Q3Map2."
------------------------------------------------------------------------------- */
/* marker */
#define EXPORTENTS_C
/* dependencies */
#include "q3map2.h"
/* -------------------------------------------------------------------------------
this file contains code that exports entities to a .ent file.
------------------------------------------------------------------------------- */
/*
ExportEntities()
exports the entities to a text file (.ent)
*/
void ExportEntities( void ){
char filename[ 1024 ];
FILE *file;
/* note it */
Sys_FPrintf( SYS_VRB, "--- ExportEntities ---\n" );
/* do some path mangling */
strcpy( filename, source );
StripExtension( filename );
strcat( filename, ".ent" );
/* sanity check */
if ( bspEntData == NULL || bspEntDataSize == 0 ) {
Sys_Printf( "WARNING: No BSP entity data. aborting...\n" );
return;
}
/* write it */
Sys_Printf( "Writing %s\n", filename );
Sys_FPrintf( SYS_VRB, "(%d bytes)\n", bspEntDataSize );
file = fopen( filename, "w" );
if ( file == NULL ) {
Error( "Unable to open %s for writing", filename );
}
fprintf( file, "%s\n", bspEntData );
fclose( file );
}
/*
ExportEntitiesMain()
exports the entities to a text file (.ent)
*/
int ExportEntitiesMain( int argc, char **argv ){
/* arg checking */
if ( argc < 1 ) {
Sys_Printf( "Usage: q3map -exportents [-v] <mapname>\n" );
return 0;
}
/* do some path mangling */
strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
StripExtension( source );
DefaultExtension( source, ".bsp" );
/* load the bsp */
Sys_Printf( "Loading %s\n", source );
LoadBSPFile( source );
/* export the lightmaps */
ExportEntities();
/* return to sender */
return 0;
}

5
tools/urt/tools/quake3/q3map2/main.c
View file

@ -606,6 +606,11 @@ int main( int argc, char **argv ){
r = LightMain( argc, argv );
}
/* QBall: export entities */
else if ( !strcmp( argv[ 1 ], "-exportents" ) ) {
r = ExportEntitiesMain( argc - 1, argv + 1 );
}
/* ydnar: lightmap export */
else if ( !strcmp( argv[ 1 ], "-export" ) ) {
r = ExportLightmapsMain( argc - 1, argv + 1 );

5
tools/urt/tools/quake3/q3map2/q3map2.h
View file

@ -1749,6 +1749,11 @@ void StitchSurfaceLightmaps( void );
void StoreSurfaceLightmaps( void );
/* exportents.c */
void ExportEntities( void );
int ExportEntitiesMain( int argc, char **argv );
/* image.c */
void ImageFree( image_t *image );
image_t *ImageFind( const char *filename );

22
tools/urt/tools/quake3/q3map2/q3map2_urt.vcproj
View file

@ -837,6 +837,28 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="exportents.c"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
</Filter>
<Filter
Name="light"

1
tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj
View file

@ -317,6 +317,7 @@
<ClCompile Include="light_trace.c" />
<ClCompile Include="light_ydnar.c" />
<ClCompile Include="lightmaps_ydnar.c" />
<ClCompile Include="exportents.c" />
<ClCompile Include="vis.c" />
<ClCompile Include="visflow.c" />
<ClCompile Include="convert_ase.c" />

3
tools/urt/tools/quake3/q3map2/q3map2_urt.vcxproj.filters
View file

@ -65,6 +65,9 @@
<ClCompile Include="surface_extra.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="exportents.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="brush.c">
<Filter>src\bsp</Filter>
</ClCompile>