id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-04-22 09:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed random alpha values within exportImagesToTrenchBroom cmd

Browse source
This commit is contained in:
Robert Beckebans 2022-01-31 16:40:29 +01:00
parent 7ece182bdf
commit 2ea2db396d
3 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -650,13 +650,15 @@ r_useFilmicPostProcessing [0, 1] | Apply several post process effects to m
Name | Description
:--------------------------------------| :------------------------------------------------
dmap mapfile | Command: Compiles a .map to its corresponding BSP .proc, Collision .cm files and Area Awareness System (AI navigation) .aas files. Just type dmap to list all options
dmap `[glfile]` mapfile | DMap option that exports the BSP areas and portals to .obj for debugging purposes
dmap `[glview]` mapfile | DMap option that exports the BSP areas and portals to .obj for debugging purposes
bakeEnvironmentProbes | Command after loading a map. Captures all env_probe entities and stores them to disc
bakeLightGrids [`<switches>`...] | `<Switches>` limit[num] : max probes per BSP area (default 16384) bounce[num] : number of bounces or number of light reuse (default 1) grid( xdim ydim zdim ) : light grid size steps into each direction (default 64 64 128)
exportScriptEvents | Command: Generates a new script/doom_events.script that reflects all registered class events in the idClass C++ system. The gamecode still needs to be extended to add the original comments of the events
exportFGD `[nomodels]` | Command: Exports all entity defs to exported/_tb/*.fgd for usage in TrenchBroom
exportFGD `[nomodels]` | Command: Exports all entity defs to exported/_tb/*.fgd for usage in convertMapToValve220 `<map>` |
exportImagesToTrenchBroom | Command: Decompresses and saves all TB relevant .bimage images to _tb/*.png files
exportModelsToTrenchBroom | Command: Saves all .base|.blwo|.bmd5mesh models to _tb/*.obj files
exportEntityDefsToBlender | Command: Exports all entity and model defs to exported/entities.json for usage in Blender
postLoadExportModels | Cvar: Export models after loading to OBJ model format. Set it to 1 before loading a map.
before loading a map.
exportMapToOBJ | Command: Convert .map file to .obj/.mtl
postLoadExportFlashAtlas | Cvar: Set to 1 at startup to dump the Flash images to exported/swf/
postLoadExportFlashToSWF | Cvar: Set to 1 at startup to dump the Flash .bswf files as .swf (WIP)

19
neo/framework/DeclManager.cpp
View file

@ -2936,6 +2936,11 @@ void idDeclManagerLocal::ExportImagesToTrenchBroom_f( const idCmdArgs& args )
{
idDxtDecoder dxt;
dxt.DecompressImageDXT1( data, rgba.Ptr(), dxtWidth, dxtHeight );
for( int i = 0; i < ( dxtWidth * dxtHeight ); i++ )
{
rgba[i * 4 + 3] = 255;
}
}
else if( imgHeader.format == FMT_DXT5 )
{
@ -2944,6 +2949,11 @@ void idDeclManagerLocal::ExportImagesToTrenchBroom_f( const idCmdArgs& args )
if( imgHeader.colorFormat == CFM_NORMAL_DXT5 )
{
dxt.DecompressNormalMapDXT5( data, rgba.Ptr(), dxtWidth, dxtHeight );
for( int i = 0; i < ( dxtWidth * dxtHeight ); i++ )
{
rgba[i * 4 + 3] = 255;
}
}
else if( imgHeader.colorFormat == CFM_YCOCG_DXT5 )
{
@ -2958,6 +2968,11 @@ void idDeclManagerLocal::ExportImagesToTrenchBroom_f( const idCmdArgs& args )
else
{
dxt.DecompressImageDXT5( data, rgba.Ptr(), dxtWidth, dxtHeight );
for( int i = 0; i < ( dxtWidth * dxtHeight ); i++ )
{
rgba[i * 4 + 3] = 255;
}
}
}
@ -2976,13 +2991,11 @@ void idDeclManagerLocal::ExportImagesToTrenchBroom_f( const idCmdArgs& args )
// scale DXT sized images back to the original size
byte* scaled = R_Dropsample( rgba.Ptr(), dxtWidth, dxtHeight, img.width, img.height );
#if 1
if( img.width > 16 && img.height > 16 )
{
R_WritePNG( exportName, scaled, 4, img.width, img.height, true, "fs_basepath" );
}
else
#endif
{
exportName.SetFileExtension( ".tga" );
R_WriteTGA( exportName, scaled, img.width, img.height, false, "fs_basepath" );
@ -2992,13 +3005,11 @@ void idDeclManagerLocal::ExportImagesToTrenchBroom_f( const idCmdArgs& args )
}
else
{
#if 1
if( img.width > 16 && img.height > 16 )
{
R_WritePNG( exportName, rgba.Ptr(), 4, img.width, img.height, true, "fs_basepath" );
}
else
#endif
{
exportName.SetFileExtension( ".tga" );
R_WriteTGA( exportName, rgba.Ptr(), img.width, img.height, false, "fs_basepath" );

2
zip-RBDOOM-3-BFG-lite-snapshot.bat
View file

@ -1,5 +1,5 @@
REM 7z a RBDOOM-3-BFG-1.3.1.1-lite-win64-20220109-git-xxxxxxx.7z -r base/env/ base/maps/*.lightgrid base/maps/*_extra_ents.map -x!generated
set filename=RBDOOM-3-BFG-1.4.0.2-lite-win64-20220129-git-xxxxxxx.7z
set filename=RBDOOM-3-BFG-1.4.0.3-lite-win64-20220131-git-xxxxxxx.7z
7z a %filename% README.md RELEASE-NOTES.md base/devtools.cfg base/modelviewer.cfg base/extract_resources.cfg base/convert_maps_to_valve220.cfg base/def/*.def base/materials/*.mtr base/textures/common base/textures/editor -x!generated -xr!*.xcf -xr!*.blend
7z a %filename% README.md RELEASE-NOTES.md tools/trenchbroom
pause