H3cJP/source-engine
1
0
Fork 0
mirror of https://github.com/nillerusr/source-engine.git synced 2025-04-26 12:57:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use vrad from kisak strike and fix wscript

Browse Source
This commit is contained in:
Er2 2023-05-13 21:11:15 +03:00
parent 8241777248
commit d4ca49ff1a
20 changed files with 2660 additions and 1371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v2
- name: Build linux-i386
run: |
scripts/build-ubuntu-i386.sh
scripts/build-ubuntu-i386.sh -u
build-linux-amd64:
runs-on: ubuntu-20.04
@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@v2
- name: Build linux-amd64
run: |
scripts/build-ubuntu-amd64.sh
scripts/build-ubuntu-amd64.sh -u
build-android-armv7a:
runs-on: ubuntu-20.04
@ -38,7 +38,7 @@ jobs:
- name: Build windows-i386
run: |
git submodule init && git submodule update
./waf.bat configure -T debug
./waf.bat configure -T debug -u
./waf.bat build
build-windows-amd64:
@ -49,7 +49,7 @@ jobs:
- name: Build windows-amd64
run: |
git submodule init && git submodule update
./waf.bat configure -T debug -8
./waf.bat configure -T debug -8 -u
./waf.bat build
build-dedicated-windows-i386:
@ -99,7 +99,7 @@ jobs:
- uses: actions/checkout@v2
- name: Build macos-amd64
run: |
scripts/build-macos-amd64.sh
scripts/build-macos-amd64.sh -u
build-dedicated-macos-amd64:
runs-on: macos-latest

2
materialsystem/cmaterialsystem.cpp
View File

@ -672,7 +672,7 @@ bool CMaterialSystem::Connect( CreateInterfaceFn factory )
g_pLauncherMgr = (ILauncherMgr *)factory( "SDLMgrInterface001" /*SDL_MGR_INTERFACE_VERSION*/, NULL );
if ( !g_pLauncherMgr )
{
return false;
Warning("Cannot connect SDL!\n");
}
#endif // USE_SDL
#endif // !DEDICATED

2
utils/common/cmdlib.cpp
View File

@ -803,7 +803,7 @@ FileHandle_t SafeOpenRead( const char *filename )
void SafeRead( FileHandle_t f, void *buffer, int count)
{
if ( g_pFileSystem->Read (buffer, count, f) != (size_t)count)
Error ("File read failure");
Error ("File read failure\n");
}

2
utils/common/filesystem_tools.cpp
View File

@ -62,7 +62,9 @@ void FileSystem_SetupStandardDirectories( const char *pFilename, const char *pGa
Q_MakeAbsolutePath( qdir, sizeof( qdir ), pFilename, NULL );
Q_StripFilename( qdir );
#ifdef _WIN32 // lol
Q_strlower( qdir );
#endif
if ( qdir[0] != 0 )
{
Q_AppendSlash( qdir, sizeof( qdir ) );

2
utils/vbsp/writebsp.cpp
View File

@ -966,7 +966,7 @@ void SetModelNumbers (void)
}
else
{
sprintf (value, "");
value[0] = '\0';
}
SetKeyValue (&entities[i], "model", value);
}

6
utils/vrad/leaf_ambient_lighting.cpp
View File

@ -193,8 +193,8 @@ bool IsLeafAmbientSurfaceLight( dworldlight_t *wl )
if ( wl->style != 0 )
return false;
float intensity = MAX( wl->intensity[0], wl->intensity[1] );
intensity = MAX( intensity, wl->intensity[2] );
float intensity = max( wl->intensity[0], wl->intensity[1] );
intensity = max( intensity, wl->intensity[2] );
return (intensity * g_flWorldLightMinEmitSurfaceDistanceRatio) < g_flWorldLightMinEmitSurface;
}
@ -650,7 +650,7 @@ void ComputePerLeafAmbientLighting()
{
// Distribute the work among the workers.
VMPI_SetCurrentStage( "ComputeLeafAmbientLighting" );
DistributeWork( numleafs, VMPI_DISTRIBUTEWORK_PACKETID, VMPI_ProcessLeafAmbient, VMPI_ReceiveLeafAmbientResults );
DistributeWork( numleafs, VMPI_ProcessLeafAmbient, VMPI_ReceiveLeafAmbientResults );
}
else
#endif

747
utils/vrad/lightmap.cpp
View File

File diff suppressed because it is too large Load Diff

5
utils/vrad/lightmap.h
View File

@ -137,5 +137,10 @@ void FreeDLights();
void ExportDirectLightsToWorldLights();
float CalculateAmbientOcclusion( Vector *pPosition, Vector *pNormal );
fltx4 CalculateAmbientOcclusion4( const FourVectors &position4, const FourVectors &normal4, int static_prop_index_to_ignore );
float SoftenCosineTerm( float flDot );
fltx4 SoftenCosineTerm( fltx4 dots );
#endif // LIGHTMAP_H

12
utils/vrad/mpivrad.cpp
View File

@ -29,7 +29,7 @@
#include "mpi_stats.h"
#include "vmpi_distribute_work.h"
#include "vmpi_tools_shared.h"
#include "tier0/fasttimer.h"
@ -60,9 +60,13 @@ bool VRAD_DispatchFn( MessageBuffer *pBuf, int iSource, int iPacketID )
}
}
CDispatchReg g_VRADDispatchReg( VMPI_VRAD_PACKET_ID, VRAD_DispatchFn ); // register to handle the messages we want
CDispatchReg g_DistributeWorkReg( VMPI_DISTRIBUTEWORK_PACKETID, DistributeWorkDispatch );
VMPI_REGISTER_PACKET_ID( VMPI_VRAD_PACKET_ID )
VMPI_REGISTER_SUBPACKET_ID( VMPI_VRAD_PACKET_ID, VMPI_SUBPACKETID_VIS_LEAFS )
VMPI_REGISTER_SUBPACKET_ID( VMPI_VRAD_PACKET_ID, VMPI_SUBPACKETID_BUILDFACELIGHTS )
VMPI_REGISTER_SUBPACKET_ID( VMPI_VRAD_PACKET_ID, VMPI_SUBPACKETID_PLIGHTDATA_RESULTS )
void VRAD_SetupMPI( int &argc, char **&argv )
{
@ -238,7 +242,6 @@ void RunMPIBuildFacelights()
VMPI_SetCurrentStage( "RunMPIBuildFaceLights" );
double elapsed = DistributeWork(
numfaces,
VMPI_DISTRIBUTEWORK_PACKETID,
MPI_ProcessFaces,
MPI_ReceiveFaceResults );
@ -265,7 +268,7 @@ void RunMPIBuildFacelights()
else
{
if ( g_iVMPIVerboseLevel >= 1 )
Msg( "\n\n%.1f%% CPU utilization during BuildFaceLights\n\n", ( g_CPUTime.GetSeconds() * 100 / elapsed ) );
Msg( "\n\n%.1f%% CPU utilization during BuildFaceLights\n\n", (int)( g_CPUTime.GetSeconds() * 100 / elapsed ) );
}
}
@ -396,7 +399,6 @@ void RunMPIBuildVisLeafs()
double elapsed = DistributeWork(
dvis->numclusters,
VMPI_DISTRIBUTEWORK_PACKETID,
MPI_ProcessVisLeafs,
MPI_ReceiveVisLeafsResults );

3
utils/vrad/mpivrad.h
View File

@ -18,9 +18,6 @@
#define VMPI_SUBPACKETID_BUILDFACELIGHTS 1
#define VMPI_SUBPACKETID_PLIGHTDATA_RESULTS 2
// DistributeWork owns this packet ID.
#define VMPI_DISTRIBUTEWORK_PACKETID 2
// Called first thing in the exe.
void VRAD_SetupMPI( int &argc, char **&argv );

20
utils/vrad/radial.cpp
View File

@ -647,7 +647,7 @@ void FinalLightFace( int iThread, int facenum )
float minlight;
int lightstyles;
LightingValue_t lb[NUM_BUMP_VECTS + 1], v[NUM_BUMP_VECTS + 1];
unsigned char *pdata[NUM_BUMP_VECTS + 1];
unsigned char *pdata[NUM_BUMP_VECTS + 2]; // +2 is for flat and additional lightmap alpha data
int bumpSample;
radial_t *rad = NULL;
radial_t *prad = NULL;
@ -734,9 +734,9 @@ void FinalLightFace( int iThread, int facenum )
// it isn't going to use those positions (see loop over bumpSample below)
// The file offset is correctly computed to only store space for 1 set
// of light data if we don't have bumped lighting.
for( bumpSample = 0; bumpSample < bumpSampleCount; ++bumpSample )
for( bumpSample = 0; bumpSample < bumpSampleCount + 1; ++bumpSample ) // The +1 is for the additional lightmap alpha data
{
pdata[bumpSample] = &(*pdlightdata)[f->lightofs + (k * bumpSampleCount + bumpSample) * fl->numluxels*4];
pdata[bumpSample] = &(*pdlightdata)[f->lightofs + ( ( k * ( bumpSampleCount + 1 ) ) + bumpSample) * fl->numluxels*4];
}
// Compute the average luxel color, but not for the bump samples
@ -773,11 +773,11 @@ void FinalLightFace( int iThread, int facenum )
// v is indirect light that is received on the luxel.
if( !bDisp )
{
SampleRadial( prad, fl->luxel[j], v, bumpSampleCount );
SampleRadial( prad, fl->luxel[j], v, bumpSampleCount ); // indirect on brushes
}
else
{
StaticDispMgr()->SampleRadial( facenum, prad, fl->luxel[j], j, v, bumpSampleCount, true );
StaticDispMgr()->SampleRadial( facenum, prad, fl->luxel[j], j, v, bumpSampleCount, true ); // indirect on displacements
}
for( bumpSample = 0; bumpSample < bumpSampleCount; ++bumpSample )
@ -840,6 +840,16 @@ void FinalLightFace( int iThread, int facenum )
// convert to a 4 byte r,g,b,signed exponent format
VectorToColorRGBExp32( Vector( lb[bumpSample].m_vecLighting.x, lb[bumpSample].m_vecLighting.y,
lb[bumpSample].m_vecLighting.z ), *( ColorRGBExp32 *)pdata[bumpSample] );
// Generate additional lightmap alpha data
if ( bumpSample == 0 )
{
pdata[bumpSampleCount][0] = uint8( clamp( lb[0].m_flDirectSunAmount, 0.0f, 1.0f ) * 255.0f + 0.5f );
pdata[bumpSampleCount][1] = uint8( clamp( lb[1].m_flDirectSunAmount, 0.0f, 1.0f ) * 255.0f + 0.5f );
pdata[bumpSampleCount][2] = uint8( clamp( lb[2].m_flDirectSunAmount, 0.0f, 1.0f ) * 255.0f + 0.5f );
pdata[bumpSampleCount][3] = uint8( clamp( lb[3].m_flDirectSunAmount, 0.0f, 1.0f ) * 255.0f + 0.5f );
pdata[bumpSampleCount]+=4;
}
#endif
pdata[bumpSample] += 4;

177
utils/vrad/trace.cpp
View File

@ -133,11 +133,7 @@ public:
addedCoverage[s] = 0.0f;
if ( ( sign >> s) & 0x1 )
{
#ifdef VRAD_SSE
addedCoverage[s] = ComputeCoverageFromTexture( b0->m128_f32[s], b1->m128_f32[s], b2->m128_f32[s], hitID );
#else
addedCoverage[s] = ComputeCoverageFromTexture( b0[0][s], b1[0][s], b2[0][s], hitID );
#endif
addedCoverage[s] = ComputeCoverageFromTexture( (*b0)[s], (*b1)[s], (*b2)[s], hitID );
}
}
m_coverage = AddSIMD( m_coverage, LoadUnalignedSIMD( addedCoverage ) );
@ -173,11 +169,7 @@ void TestLine( const FourVectors& start, const FourVectors& stop,
{
visibility[i] = 1.0f;
if ( ( rt_result.HitIds[i] != -1 ) &&
#ifdef VRAD_SSE
( rt_result.HitDistance.m128_f32[i] < len.m128_f32[i] ) )
#else
( rt_result.HitDistance[i] < len[i] ) )
#endif
{
visibility[i] = 0.0f;
}
@ -187,7 +179,68 @@ void TestLine( const FourVectors& start, const FourVectors& stop,
*pFractionVisible = MinSIMD( *pFractionVisible, coverageCallback.GetFractionVisible() );
}
void TestLine_IgnoreSky( const FourVectors& start, const FourVectors& stop,
fltx4 *pFractionVisible, int static_prop_index_to_ignore )
{
FourRays myrays;
myrays.origin = start;
myrays.direction = stop;
myrays.direction -= myrays.origin;
fltx4 len = myrays.direction.length();
myrays.direction *= ReciprocalSIMD( len );
RayTracingResult rt_result;
CCoverageCountTexture coverageCallback;
g_RtEnv.Trace4Rays(myrays, Four_Zeros, len, &rt_result, TRACE_ID_STATICPROP | static_prop_index_to_ignore, g_bTextureShadows ? &coverageCallback : 0 );
// Assume we can see the targets unless we get hits
float visibility[4];
for ( int i = 0; i < 4; i++ )
{
visibility[i] = 1.0f;
if ( ( rt_result.HitIds[i] != -1 ) &&
( rt_result.HitDistance[i] < len[i] ) )
{
int id = g_RtEnv.OptimizedTriangleList[rt_result.HitIds[i]].m_Data.m_IntersectData.m_nTriangleID;
if ( !( id & TRACE_ID_SKY ) )
{
visibility[i] = 0.0f;
}
}
}
*pFractionVisible = LoadUnalignedSIMD( visibility );
if ( g_bTextureShadows )
*pFractionVisible = MinSIMD( *pFractionVisible, coverageCallback.GetFractionVisible() );
}
void TestLine_LightBlockers( const FourVectors& start, const FourVectors& stop,
fltx4 *pFractionVisible )
{
FourRays myrays;
myrays.origin = start;
myrays.direction = stop;
myrays.direction -= myrays.origin;
fltx4 len = myrays.direction.length();
myrays.direction *= ReciprocalSIMD( len );
RayTracingResult rt_result;
g_RtEnv_LightBlockers.Trace4Rays( myrays, Four_Zeros, len, &rt_result, -1, NULL );
// Assume we can see the targets unless we get hits
float visibility[4] = { 1.0f, 1.0f, 1.0f, 1.0f };
if ( (rt_result.HitIds[0] != -1) &&
(rt_result.HitDistance[0] < len[0]) )
{
fltx4 dotRaySurfaceN = rt_result.surface_normal * myrays.direction;
if ( dotRaySurfaceN[0] > 0.0f )
{
visibility[0] = 0.0f;
}
}
*pFractionVisible = LoadUnalignedSIMD( visibility );
}
/*
================
@ -381,11 +434,7 @@ void TestLine_DoesHitSky( FourVectors const& start, FourVectors const& stop,
{
aOcclusion[i] = 0.0f;
if ( ( rt_result.HitIds[i] != -1 ) &&
#ifdef VRAD_SSE
( rt_result.HitDistance.m128_f32[i] < len.m128_f32[i] ) )
#else
( rt_result.HitDistance[i] < len[i] ) )
#endif
{
int id = g_RtEnv.OptimizedTriangleList[rt_result.HitIds[i]].m_Data.m_IntersectData.m_nTriangleID;
if ( !( id & TRACE_ID_SKY ) )
@ -501,22 +550,92 @@ dmodel_t *BrushmodelForEntity( entity_t *pEntity )
return NULL;
}
// Add one that casts textureshadows
void AddTexturedBrushWinding( winding_t *w, const VMatrix &xform, texinfo_t *tx, int shadowMaterialIndex )
{
Vector2D uv[MAX_POINTS_ON_WINDING];
int mappingWidth = 32;
int mappingHeight = 32;
GetShadowTextureMapping( shadowMaterialIndex, &mappingWidth, &mappingHeight );
for ( int j = 0; j < w->numpoints; j++ )
{
// base texture coordinate
uv[j].x = DotProduct( w->p[j].Base(), tx->textureVecsTexelsPerWorldUnits[0] ) +
tx->textureVecsTexelsPerWorldUnits[0][3];
uv[j].x /= float(mappingWidth);
uv[j].y = DotProduct( w->p[j].Base(), tx->textureVecsTexelsPerWorldUnits[1] ) +
tx->textureVecsTexelsPerWorldUnits[1][3];
uv[j].y /= float(mappingHeight);
}
Vector v0, v1, v2;
for ( int j = 2; j < w->numpoints; j++ )
{
v0 = xform.VMul4x3(w->p[0]);
v1 = xform.VMul4x3(w->p[j-1]);
v2 = xform.VMul4x3(w->p[j]);
float coverage = ComputeCoverageForTriangle(shadowMaterialIndex, uv[0], uv[j-1], uv[j] );
int index = -1;
unsigned short flags = 0;
Vector fullCoverage(0,0,1);
if ( coverage < 1.0 )
{
index = AddShadowTextureTriangle( shadowMaterialIndex, uv[0], uv[j-1], uv[j] );
flags = FCACHETRI_TRANSPARENT;
fullCoverage.x = coverage;
}
g_RtEnv.AddTriangle(TRACE_ID_OPAQUE, v0, v1, v2, fullCoverage, flags, index);
}
}
void AddBrushToRaytraceEnvironment( dbrush_t *pBrush, const VMatrix &xform )
{
if ( !( pBrush->contents & MASK_OPAQUE ) )
int materialIndexList[256];
bool bTextureShadows = false;
if ( !( pBrush->contents & (MASK_OPAQUE) ) && !(g_bTextureShadows && (pBrush->contents & CONTENTS_GRATE)) )
return;
if ( pBrush->contents & CONTENTS_LADDER )
return;
// load any transparent textures for shadows
if ( g_bTextureShadows && (pBrush->contents & CONTENTS_GRATE) && pBrush->numsides < ARRAYSIZE(materialIndexList) )
{
for (int i = 0; i < pBrush->numsides; i++ )
{
dbrushside_t *side = &dbrushsides[pBrush->firstside + i];
texinfo_t *tx = &texinfo[side->texinfo];
dtexdata_t *pTexData = &dtexdata[tx->texdata];
const char *pMaterialName = TexDataStringTable_GetString( pTexData->nameStringTableID );
materialIndexList[i] = LoadShadowTexture( pMaterialName );
if ( materialIndexList[i] >= 0 )
{
bTextureShadows = true;
}
}
}
Vector v0, v1, v2;
for (int i = 0; i < pBrush->numsides; i++ )
{
dbrushside_t *side = &dbrushsides[pBrush->firstside + i];
dplane_t *plane = &dplanes[side->planenum];
texinfo_t *tx = &texinfo[side->texinfo];
winding_t *w = BaseWindingForPlane (plane->normal, plane->dist);
bool bIsLightBlocker = false;
if ( tx->flags & SURF_SKY || side->dispinfo )
continue;
if ( ( pBrush->contents & ( CONTENTS_OPAQUE | CONTENTS_SOLID ) ) && ( tx->flags & SURF_NODRAW ) )
{
bIsLightBlocker = true;
}
for (int j=0 ; j<pBrush->numsides && w; j++)
{
if (i == j)
@ -529,14 +648,28 @@ void AddBrushToRaytraceEnvironment( dbrush_t *pBrush, const VMatrix &xform )
}
if ( w )
{
for ( int j = 2; j < w->numpoints; j++ )
if ( bTextureShadows && materialIndexList[i] >= 0 )
{
v0 = xform.VMul4x3(w->p[0]);
v1 = xform.VMul4x3(w->p[j-1]);
v2 = xform.VMul4x3(w->p[j]);
Vector fullCoverage;
fullCoverage.x = 1.0f;
g_RtEnv.AddTriangle(TRACE_ID_OPAQUE, v0, v1, v2, fullCoverage);
AddTexturedBrushWinding( w, xform, tx, materialIndexList[i] );
}
else
{
// opaque
Vector fullCoverage(1,1,1);
for ( int j = 2; j < w->numpoints; j++ )
{
v0 = xform.VMul4x3(w->p[0]);
v1 = xform.VMul4x3(w->p[j-1]);
v2 = xform.VMul4x3(w->p[j]);
g_RtEnv.AddTriangle( TRACE_ID_OPAQUE, v0, v1, v2, fullCoverage );
// light blockers
if ( bIsLightBlocker )
{
g_RtEnv_LightBlockers.AddTriangle( TRACE_ID_OPAQUE, v0, v1, v2, fullCoverage );
g_RtEnv_RadiosityPatches.AddTriangle( TRACE_ID_OPAQUE, v0, v1, v2, fullCoverage );
}
}
}
FreeWinding( w );
}
@ -615,7 +748,7 @@ void AddBrushesForRayTrace( void )
CUtlVector<int> brushList;
GetBrushes_r ( dmodels[0].headnode, brushList );
for ( int i = 0; i < brushList.Size(); i++ )
for ( int i = 0; i < brushList.Count(); i++ )
{
dbrush_t *brush = &dbrushes[brushList[i]];
AddBrushToRaytraceEnvironment ( brush, identity );

39
utils/vrad/vismat.cpp
View File

@ -296,6 +296,29 @@ void AddDispsToClusterTable( void )
}
struct ClusterPatchList_t
{
CUtlVector<int> patches;
};
static CUtlVector<ClusterPatchList_t> g_ClusterStaticPropPatches;
void AddStaticPropPatchesToClusterTable()
{
g_ClusterStaticPropPatches.SetCount( g_ClusterLeaves.Count() );
for ( int i = 0; i < g_Patches.Count(); i++ )
{
const CPatch &patch = g_Patches[ i ];
if ( patch.faceNumber >= 0 || patch.clusterNumber < 0 )
{
continue;
}
g_ClusterStaticPropPatches[ patch.clusterNumber ].patches.AddToTail( i );
}
}
/*
==============
BuildVisRow
@ -345,7 +368,7 @@ void BuildVisRow (int patchnum, byte *pvs, int head, transfer_t *transfers, CTra
}
}
int dispCount = g_ClusterDispFaces[j].dispFaces.Size();
int dispCount = g_ClusterDispFaces[j].dispFaces.Count();
for( int ndxDisp = 0; ndxDisp < dispCount; ndxDisp++ )
{
int ndxFace = g_ClusterDispFaces[j].dispFaces[ndxDisp];
@ -360,6 +383,20 @@ void BuildVisRow (int patchnum, byte *pvs, int head, transfer_t *transfers, CTra
TestPatchToFace( patchnum, ndxFace, head, transfers, transferMaker, iThread );
}
if ( g_bStaticPropBounce )
{
// Test static prop patches
int staticPropPatchCount = g_ClusterStaticPropPatches[ j ].patches.Count();
for ( int i = 0; i < staticPropPatchCount; i++ )
{
int nPatchIdx = g_ClusterStaticPropPatches[ j ].patches[ i ];
if ( nPatchIdx != patchnum )
{
TestPatchToPatch( patchnum, nPatchIdx, head, transfers, transferMaker, iThread );
}
}
}
}

357
utils/vrad/vrad.cpp
View File

@ -40,7 +40,7 @@ every surface must be divided into at least two patches each axis
*/
CUtlVector<CPatch> g_Patches;
CUtlVector<int> g_FacePatches; // contains all patches, children first
CUtlVector<int> g_FacePatches; // constains all patches, children first
CUtlVector<int> faceParents; // contains only root patches, use next parent to iterate
CUtlVector<int> clusterChildren;
CUtlVector<Vector> emitlight;
@ -66,8 +66,7 @@ bool g_bDumpRtEnv = false;
bool bRed2Black = true;
bool g_bFastAmbient = false;
bool g_bNoSkyRecurse = false;
bool g_bDumpPropLightmaps = false;
bool g_bFiniteFalloffModel = false; // whether to use 1/xxx or not
int junk;
@ -77,6 +76,7 @@ float lightscale = 1.0;
float dlight_threshold = 0.1; // was DIRECT_LIGHT constant
char source[MAX_PATH] = "";
char platformPath[MAX_PATH] = "";
char level_name[MAX_PATH] = ""; // map filename, without extension or path info
@ -93,12 +93,14 @@ bool g_bInterrupt = false; // Wsed with background lighting in WC. Tells VRAD
float g_SunAngularExtent=0.0;
float g_flSkySampleScale = 1.0;
float g_flStaticPropSampleScale = 4.0;
bool g_bLargeDispSampleRadius = false;
bool g_bOnlyStaticProps = false;
bool g_bShowStaticPropNormals = false;
bool g_bStaticPropBounce = false;
float g_flStaticPropBounceBoost = 1.0f;
float qgamma = 0.5;
float indirect_sun = 1.0;
@ -125,11 +127,15 @@ bool g_bStaticPropLighting = false;
bool g_bStaticPropPolys = false;
bool g_bTextureShadows = false;
bool g_bDisablePropSelfShadowing = false;
bool g_bFastStaticProps = false;
bool g_bDumpBumpStaticProps = false;
bool g_bDisableStaticPropVertexInSolidTest = false;
CUtlVector<byte> g_FacesVisibleToLights;
RayTracingEnvironment g_RtEnv;
RayTracingEnvironment g_RtEnv_LightBlockers; // ray tracing environment consisting solely of light blockers - used in conjunction with bsp to solve indirect lighting for static props (as opposed to using the full RTE).
RayTracingEnvironment g_RtEnv_RadiosityPatches;
dface_t *g_pFaces=0;
@ -290,7 +296,7 @@ void ReadLightFile (char *filename)
texlights[j].filename = filename;
file_texlights ++;
num_texlights = MAX( num_texlights, j + 1 );
num_texlights = max( num_texlights, j + 1 );
}
}
qprintf ( "[%i texlights parsed from '%s']\n\n", file_texlights, filename);
@ -305,8 +311,6 @@ LightForTexture
*/
void LightForTexture( const char *name, Vector& result )
{
int i;
result[ 0 ] = result[ 1 ] = result[ 2 ] = 0;
char baseFilename[ MAX_PATH ];
@ -346,7 +350,7 @@ void LightForTexture( const char *name, Vector& result )
}
}
for (i=0 ; i<num_texlights ; i++)
for (int i=0 ; i<num_texlights ; i++)
{
if (!Q_strcasecmp (name, texlights[i].name))
{
@ -548,6 +552,7 @@ void MakePatchForFace (int fn, winding_t *w)
patch->child2 = g_Patches.InvalidIndex();
patch->parent = g_Patches.InvalidIndex();
patch->needsBumpmap = tx->flags & SURF_BUMPLIGHT ? true : false;
patch->staticPropIdx = -1;
// link and save patch data
patch->ndxNext = g_FacePatches.Element( fn );
@ -739,6 +744,11 @@ void MakePatches (void)
// make the displacement surface patches
StaticDispMgr()->MakePatches();
if ( g_bStaticPropBounce )
{
StaticPropMgr()->MakePatches();
}
}
/*
@ -755,6 +765,12 @@ SUBDIVIDE
//-----------------------------------------------------------------------------
bool PreventSubdivision( CPatch *patch )
{
if ( patch->faceNumber < 0 )
{
// static prop patch
return true;
}
dface_t *f = g_pFaces + patch->faceNumber;
texinfo_t *tx = &texinfo[f->texinfo];
@ -825,7 +841,7 @@ int CreateChildPatch( int nParentIndex, winding_t *pWinding, float flArea, const
if ( (child->face_maxs[i] == child->maxs[i] || child->face_mins[i] == child->mins[i] )
&& total[i] > minchop )
{
child->chop = MAX( minchop, child->chop / 2 );
child->chop = max( minchop, child->chop / 2 );
break;
}
}
@ -885,7 +901,7 @@ void SubdividePatch( int ndxPatch )
if (patch->chop > minchop)
{
bSubdivide = true;
patch->chop = MAX( minchop, patch->chop / 2 );
patch->chop = max( minchop, patch->chop / 2 );
}
}
}
@ -936,7 +952,7 @@ void SubdividePatches (void)
if (numbounce == 0)
return;
unsigned int uiPatchCount = g_Patches.Size();
unsigned int uiPatchCount = g_Patches.Count();
qprintf ("%i patches before subdivision\n", uiPatchCount);
for (i = 0; i < uiPatchCount; i++)
@ -944,6 +960,12 @@ void SubdividePatches (void)
CPatch *pCur = &g_Patches.Element( i );
pCur->planeDist = pCur->plane->dist;
if ( pCur->faceNumber < 0 )
{
// This and all following patches are "fake" staticprop patches. Set up parent data structure for them.
break;
}
pCur->ndxNextParent = faceParents.Element( pCur->faceNumber );
faceParents[pCur->faceNumber] = pCur - g_Patches.Base();
}
@ -974,10 +996,16 @@ void SubdividePatches (void)
g_FacePatches[i] = g_FacePatches.InvalidIndex();
}
uiPatchCount = g_Patches.Size();
uiPatchCount = g_Patches.Count();
for (i = 0; i < uiPatchCount; i++)
{
CPatch *pCur = &g_Patches.Element( i );
if ( pCur->faceNumber < 0)
{
// Static prop patches don't have an associated face
continue;
}
pCur->ndxNext = g_FacePatches.Element( pCur->faceNumber );
g_FacePatches[pCur->faceNumber] = pCur - g_Patches.Base();
@ -1282,7 +1310,7 @@ void WriteWorld (char *name, int iBump)
if (!out)
Error ("Couldn't open %s", name);
unsigned int uiPatchCount = g_Patches.Size();
unsigned int uiPatchCount = g_Patches.Count();
for (j=0; j<uiPatchCount; j++)
{
patch = &g_Patches.Element( j );
@ -1323,7 +1351,7 @@ void WriteRTEnv (char *name)
winding_t *triw = AllocWinding( 3 );
triw->numpoints = 3;
for( int i = 0; i < g_RtEnv.OptimizedTriangleList.Size(); i++ )
for( int i = 0; i < g_RtEnv.OptimizedTriangleList.Count(); i++ )
{
triw->p[0] = g_RtEnv.OptimizedTriangleList[i].Vertex( 0);
triw->p[1] = g_RtEnv.OptimizedTriangleList[i].Vertex( 1);
@ -1424,7 +1452,7 @@ void CollectLight( Vector& total )
VectorFill( total, 0 );
// process patches in reverse order so that children are processed before their parents
unsigned int uiPatchCount = g_Patches.Size();
unsigned int uiPatchCount = g_Patches.Count();
for( i = uiPatchCount - 1; i >= 0; i-- )
{
patch = &g_Patches.Element( i );
@ -1563,7 +1591,7 @@ void GatherLight (int threadnum, void *pUserData)
Vector normals[NUM_BUMP_VECTS+1];
// Disps
bool bDisp = ( g_pFaces[patch->faceNumber].dispinfo != -1 );
bool bDisp = ( patch->faceNumber >= 0 ) && ( g_pFaces[ patch->faceNumber ].dispinfo != -1 );
if ( bDisp )
{
normals[0] = patch->normal;
@ -1663,7 +1691,7 @@ void BounceLight (void)
char name[64];
qboolean bouncing = numbounce > 0;
unsigned int uiPatchCount = g_Patches.Size();
unsigned int uiPatchCount = g_Patches.Count();
for (i=0 ; i<uiPatchCount; i++)
{
// totallight has a copy of the direct lighting. Move it to the emitted light and zero it out (to integrate bounces only)
@ -1711,7 +1739,7 @@ void BounceLight (void)
{
// transfer light from to the leaf patches from other patches via transfers
// this moves shooter->emitlight to receiver->addlight
unsigned int uiPatchCount = g_Patches.Size();
uiPatchCount = g_Patches.Count();
RunThreadsOn (uiPatchCount, true, GatherLight);
// move newly received light (addlight) to light to be sent out (emitlight)
// start at children and pull light up to parents
@ -1828,6 +1856,11 @@ void RadWorld_Start()
// add displacement faces to cluster table
AddDispsToClusterTable();
if ( g_bStaticPropBounce )
{
AddStaticPropPatchesToClusterTable();
}
// create directlights out of patches and lights
CreateDirectLights ();
@ -1940,6 +1973,21 @@ void MakeAllScales (void)
qprintf ("transfer lists: %5.1f megs\n"
, (float)total_transfer * sizeof(transfer_t) / (1024*1024));
if ( g_bStaticPropBounce )
{
int nTransfers = 0;
for ( int i = 0; i < g_Patches.Count(); i++ )
{
CPatch *pCur = &g_Patches.Element( i );
if ( pCur->faceNumber >= 0 )
{
continue;
}
nTransfers += pCur->numtransfers;
}
Msg( "static prop patch transfers %d\n", nTransfers );
}
}
@ -2025,17 +2073,51 @@ bool RadWorld_Go()
BuildFacesVisibleToLights( true );
}
#ifdef MPI
// build initial facelights
#ifdef MPI
if (g_bUseMPI)
{
// RunThreadsOnIndividual (numfaces, true, BuildFacelights);
RunMPIBuildFacelights();
if ( g_bStaticPropBounce )
{
RunThreadsOnIndividual( g_Patches.Count(), true, BuildStaticPropPatchlights );
}
}
else
#endif
{
RunThreadsOnIndividual (numfaces, true, BuildFacelights);
RunThreadsOnIndividual( numfaces, true, BuildFacelights );
if ( g_bStaticPropBounce )
{
RunThreadsOnIndividual( g_Patches.Count(), true, BuildStaticPropPatchlights );
}
#if 0
IScratchPad3D *pPad = ScratchPad3D_Create();
pPad->SetAutoFlush( false );
float flMax = 0.0f;
for ( int i = 0; i < g_Patches.Count(); i++ )
{
if ( g_Patches[ i ].child1 != g_Patches.InvalidIndex() || g_Patches[ i ].child2 != g_Patches.InvalidIndex() )
continue;
Vector vLight = g_Patches[ i ].directlight;
flMax = Max( flMax, vLight.x );
flMax = Max( flMax, vLight.y );
flMax = Max( flMax, vLight.z );
}
for ( int i = 0; i < g_Patches.Count(); i++ )
{
if ( g_Patches[ i ].child1 != g_Patches.InvalidIndex() || g_Patches[ i ].child2 != g_Patches.InvalidIndex() )
continue;
Vector vLight = g_Patches[ i ].directlight * g_Patches[i].reflectivity;
vLight /= flMax;
vLight.x = SrgbLinearToGamma( vLight.x );
vLight.y = SrgbLinearToGamma( vLight.y );
vLight.z = SrgbLinearToGamma( vLight.z );
pPad->DrawPolygon( CSPVertList( g_Patches[ i ].winding->p, g_Patches[ i ].winding->numpoints, CSPColor( vLight ) ) );
}
pPad->Release();
#endif
}
// Was the process interrupted?
@ -2068,10 +2150,10 @@ bool RadWorld_Go()
if (numbounce > 0)
{
// allocate memory for emitlight/addlight
emitlight.SetSize( g_Patches.Size() );
memset( emitlight.Base(), 0, g_Patches.Size() * sizeof( Vector ) );
addlight.SetSize( g_Patches.Size() );
memset( addlight.Base(), 0, g_Patches.Size() * sizeof( bumplights_t ) );
emitlight.SetSize( g_Patches.Count() );
memset( emitlight.Base(), 0, g_Patches.Count() * sizeof( Vector ) );
addlight.SetSize( g_Patches.Count() );
memset( addlight.Base(), 0, g_Patches.Count() * sizeof( bumplights_t ) );
MakeAllScales ();
@ -2087,12 +2169,13 @@ bool RadWorld_Go()
StaticDispMgr()->InsertPatchSampleDataIntoHashTable();
StaticDispMgr()->EndTimer();
#ifdef MPI
// blend bounced light into direct light and save
#ifdef MPI
VMPI_SetCurrentStage( "FinalLightFace" );
if ( !g_bUseMPI || g_bMPIMaster )
#endif
RunThreadsOnIndividual (numfaces, true, FinalLightFace);
#ifdef MPI
// Distribute the lighting data to workers.
VMPI_DistributeLightData();
@ -2131,7 +2214,6 @@ void InitDumpPatchesFiles()
}
}
extern IFileSystem *g_pOriginalPassThruFileSystem;
void VRAD_LoadBSP( char const *pFilename )
{
@ -2204,23 +2286,7 @@ void VRAD_LoadBSP( char const *pFilename )
VMPI_SetCurrentStage( "LoadBSPFile" );
#endif
LoadBSPFile (source);
#ifdef MPI
// Add this bsp to our search path so embedded resources can be found
if ( g_bUseMPI && g_bMPIMaster )
{
// MPI Master, MPI workers don't need to do anything
g_pOriginalPassThruFileSystem->AddSearchPath(source, "GAME", PATH_ADD_TO_HEAD);
g_pOriginalPassThruFileSystem->AddSearchPath(source, "MOD", PATH_ADD_TO_HEAD);
}
else if ( !g_bUseMPI )
#endif
{
// Non-MPI
g_pFullFileSystem->AddSearchPath(source, "GAME", PATH_ADD_TO_HEAD);
g_pFullFileSystem->AddSearchPath(source, "MOD", PATH_ADD_TO_HEAD);
}
// now, set whether or not static prop lighting is present
if (g_bStaticPropLighting)
g_LevelFlags |= g_bHDR? LVLFLAGS_BAKED_STATIC_PROP_LIGHTING_HDR : LVLFLAGS_BAKED_STATIC_PROP_LIGHTING_NONHDR;
@ -2295,6 +2361,7 @@ void VRAD_LoadBSP( char const *pFilename )
printf ( "Setting up ray-trace acceleration structure... ");
float start = Plat_FloatTime();
g_RtEnv.SetupAccelerationStructure();
g_RtEnv_LightBlockers.SetupAccelerationStructure();
float end = Plat_FloatTime();
printf ( "Done (%.2f seconds)\n", end-start );
@ -2390,16 +2457,29 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
{
*onlydetail = false;
int mapArg = -1;
// default to LDR
SetHDRMode( false );
int i;
for( i=1 ; i<argc ; i++ )
{
if ( !Q_stricmp( argv[i], "-StaticPropLighting" ) )
if ( !Q_stricmp( argv[i], "-StaticPropLighting" ) ) // use -final for higher quality
{
g_bStaticPropLighting = true;
extern int g_numVradStaticPropsLightingStreams;
g_numVradStaticPropsLightingStreams = 3;
}
else if ( !Q_stricmp( argv[i], "-StaticPropLightingFinal" ) ) // slower, higher quality - deprecated, remove soon
{
g_bStaticPropLighting = true;
extern int g_numVradStaticPropsLightingStreams;
g_numVradStaticPropsLightingStreams = 3;
}
else if ( !Q_stricmp( argv[i], "-StaticPropLighting3" ) ) // dump bump data - deprecated, remove soon
{
g_bStaticPropLighting = true;
extern int g_numVradStaticPropsLightingStreams;
g_numVradStaticPropsLightingStreams = 3;
g_bDumpBumpStaticProps = true;
}
else if ( !stricmp( argv[i], "-StaticPropNormals" ) )
{
@ -2417,11 +2497,15 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
{
g_bDisablePropSelfShadowing = true;
}
else if ( !stricmp( argv[i], "-StaticPropDisableInSolidTest" ) )
{
g_bDisableStaticPropVertexInSolidTest = true;
}
else if ( !Q_stricmp( argv[i], "-textureshadows" ) )
{
g_bTextureShadows = true;
}
else if ( !strcmp(argv[i], "-dump") )
else if ( !strcmp( argv[i], "-dump" ) )
{
g_bDumpPatches = true;
}
@ -2445,26 +2529,21 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
{
g_bLargeDispSampleRadius = true;
}
else if (!Q_stricmp( argv[i], "-dumppropmaps"))
{
g_bDumpPropLightmaps = true;
}
else if (!Q_stricmp(argv[i],"-bounce"))
{
if ( ++i < argc )
{
int bounceParam = atoi (argv[i]);
if ( bounceParam < 0 )
numbounce = atoi (argv[i]);
if ( numbounce < 0 )
{
Warning("Error: expected non-negative value after '-bounce'\n" );
return -1;
return 1;
}
numbounce = (unsigned)bounceParam;
}
else
{
Warning("Error: expected a value after '-bounce'\n" );
return -1;
return 1;
}
}
else if (!Q_stricmp(argv[i],"-verbose") || !Q_stricmp(argv[i],"-v"))
@ -2479,13 +2558,13 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
if ( numthreads <= 0 )
{
Warning("Error: expected positive value after '-threads'\n" );
return -1;
return 1;
}
}
else
{
Warning("Error: expected a value after '-threads'\n" );
return -1;
return 1;
}
}
else if ( !Q_stricmp(argv[i], "-lights" ) )
@ -2497,7 +2576,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected a filepath after '-lights'\n" );
return -1;
return 1;
}
}
else if (!Q_stricmp(argv[i],"-noextra"))
@ -2515,6 +2594,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else if (!Q_stricmp(argv[i],"-fast"))
{
do_fast = true;
g_bFastStaticProps = true;
}
else if (!Q_stricmp(argv[i],"-noskyboxrecurse"))
{
@ -2523,6 +2603,11 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else if (!Q_stricmp(argv[i],"-final"))
{
g_flSkySampleScale = 16.0;
g_flStaticPropSampleScale = 16.0;
}
else if (!Q_stricmp( argv[i], "-finitefalloff" ) )
{
g_bFiniteFalloffModel = true;
}
else if (!Q_stricmp(argv[i],"-extrasky"))
{
@ -2533,7 +2618,19 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected a scale factor after '-extrasky'\n" );
return -1;
return 1;
}
}
else if ( !Q_stricmp( argv[i], "-staticpropsamplescale" ) )
{
if ( ++i < argc && *argv[i] )
{
g_flStaticPropSampleScale = atof( argv[i] );
}
else
{
Warning( "Error: expected a scale factor after '-extraskystaticprops'\n" );
return 1;
}
}
else if (!Q_stricmp(argv[i],"-centersamples"))
@ -2549,7 +2646,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected an angle after '-smooth'\n" );
return -1;
return 1;
}
}
else if (!Q_stricmp(argv[i],"-dlightmap"))
@ -2567,7 +2664,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected a value after '-luxeldensity'\n" );
return -1;
return 1;
}
}
else if( !Q_stricmp( argv[i], "-low" ) )
@ -2593,7 +2690,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected an angular extent value (0..180) '-softsun'\n" );
return -1;
return 1;
}
}
else if ( !Q_stricmp( argv[i], "-maxdispsamplesize" ) )
@ -2605,7 +2702,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning( "Error: expected a sample size after '-maxdispsamplesize'\n" );
return -1;
return 1;
}
}
else if ( stricmp( argv[i], "-StopOnExit" ) == 0 )
@ -2648,13 +2745,13 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
if ( maxchop < 1 )
{
Warning("Error: expected positive value after '-maxchop'\n" );
return -1;
return 1;
}
}
else
{
Warning("Error: expected a value after '-maxchop'\n" );
return -1;
return 1;
}
}
else if (!Q_stricmp(argv[i],"-chop"))
@ -2665,14 +2762,14 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
if ( minchop < 1 )
{
Warning("Error: expected positive value after '-chop'\n" );
return -1;
return 1;
}
minchop = MIN( minchop, maxchop );
minchop = min( minchop, maxchop );
}
else
{
Warning("Error: expected a value after '-chop'\n" );
return -1;
return 1;
}
}
else if ( !Q_stricmp( argv[i], "-dispchop" ) )
@ -2683,13 +2780,13 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
if ( dispchop < 1.0f )
{
Warning( "Error: expected positive value after '-dipschop'\n" );
return -1;
return 1;
}
}
else
{
Warning( "Error: expected a value after '-dispchop'\n" );
return -1;
return 1;
}
}
else if ( !Q_stricmp( argv[i], "-disppatchradius" ) )
@ -2700,16 +2797,55 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
if ( g_MaxDispPatchRadius < 10.0f )
{
Warning( "Error: g_MaxDispPatchRadius < 10.0\n" );
return -1;
return 1;
}
}
else
{
Warning( "Error: expected a value after '-disppatchradius'\n" );
return -1;
return 1;
}
}
else if ( !Q_stricmp( argv[i], "-reflectivityscale" ) )
{
if ( ++i < argc )
{
reflectivityScale = (float)atof (argv[i]);
}
else
{
Warning("Error: expected a value after '-reflectivityscale'\n" );
return 1;
}
}
else if ( !Q_stricmp( argv[i],"-ambient" ) )
{
if ( i+3 < argc )
{
ambient[0] = (float)atof (argv[++i]) * 128;
ambient[1] = (float)atof (argv[++i]) * 128;
ambient[2] = (float)atof (argv[++i]) * 128;
}
else
{
Warning("Error: expected three color values after '-ambient'\n" );
return 1;
}
}
else if ( !Q_stricmp( argv[ i ], "-StaticPropBounce" ) )
{
if ( i + 1 < argc )
{
g_flStaticPropBounceBoost = (float)atof( argv[ ++i ] );
}
else
{
Warning("Error: expected bounce scale after '-StaticPropBounce'\n" );
return 1;
}
g_bStaticPropBounce = true;
}
#if ALLOWDEBUGOPTIONS
else if (!Q_stricmp(argv[i],"-scale"))
{
@ -2720,21 +2856,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected a value after '-scale'\n" );
return -1;
}
}
else if (!Q_stricmp(argv[i],"-ambient"))
{
if ( i+3 < argc )
{
ambient[0] = (float)atof (argv[++i]) * 128;
ambient[1] = (float)atof (argv[++i]) * 128;
ambient[2] = (float)atof (argv[++i]) * 128;
}
else
{
Warning("Error: expected three color values after '-ambient'\n" );
return -1;
return 1;
}
}
else if (!Q_stricmp(argv[i],"-dlight"))
@ -2746,7 +2868,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected a value after '-dlight'\n" );
return -1;
return 1;
}
}
else if (!Q_stricmp(argv[i],"-sky"))
@ -2758,7 +2880,7 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected a value after '-sky'\n" );
return -1;
return 1;
}
}
else if (!Q_stricmp(argv[i],"-notexscale"))
@ -2774,10 +2896,14 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
else
{
Warning("Error: expected a light threshold after '-coring'\n" );
return -1;
return 1;
}
}
#endif
else if ( !Q_stricmp( argv[i], "-tempcontent" ) )
{
// ... Do nothing, just let this pass to the filesystem
}
#ifdef MPI
// NOTE: the -mpi checks must come last here because they allow the previous argument
// to be -mpi as well. If it game before something else like -game, then if the previous
@ -2792,17 +2918,17 @@ int ParseCommandLine( int argc, char **argv, bool *onlydetail )
break;
}
#endif
else if ( mapArg == -1 )
else if ( !Q_stricmp( argv[i], "-processheap" ) )
{
mapArg = i;
// ... Do nothing, just let this pass to the mem system
}
else
{
return -1;
break;
}
}
return mapArg;
return i;
}
@ -2832,6 +2958,7 @@ void PrintUsage( int argc, char **argv )
" -fast : Quick and dirty lighting.\n"
" -fastambient : Per-leaf ambient sampling is lower quality to save compute time.\n"
" -final : High quality processing. equivalent to -extrasky 16.\n"
" -finitefalloff : use an alternative falloff model that falls off to exactly zero at the zero_percent_distance.\n"
" -extrasky n : trace N times as many rays for indirect light and sky ambient.\n"
" -low : Run as an idle-priority process.\n"
#ifdef MPI
@ -2853,9 +2980,11 @@ void PrintUsage( int argc, char **argv )
" level lights file.\n"
" -noextra : Disable supersampling.\n"
" -debugextra : Places debugging data in lightmaps to visualize\n"
" supersampling.\n"
" supersampling.\n"
" -smooth # : Set the threshold for smoothing groups, in degrees\n"
" (default 45).\n"
);
Warning(
" -dlightmap : Force direct lighting into different lightmap than\n"
" radiosity.\n"
" -stoponexit : Wait for a keypress on exit.\n"
@ -2873,19 +3002,18 @@ void PrintUsage( int argc, char **argv )
" -softsun <n> : Treat the sun as an area light source of size <n> degrees."
" Produces soft shadows.\n"
" Recommended values are between 0 and 5. Default is 0.\n"
#ifdef _WIN32
" -FullMinidumps : Write large minidumps on crash.\n"
#endif
" -chop : Smallest number of luxel widths for a bounce patch, used on edges\n"
" -maxchop : Coarsest allowed number of luxel widths for a patch, used in face interiors\n"
"\n"
" -LargeDispSampleRadius: This can be used if there are splotches of bounced light\n"
" on terrain. The compile will take longer, but it will gather\n"
" light across a wider area.\n"
" -StaticPropLighting : generate backed static prop vertex lighting\n"
" -maxchop : Coarsest allowed number of luxel widths for a patch, used in face interiors\n"
" -LargeDispSampleRadius: This can be used if there are splotches of bounced\n"
" light on terrain. The compile will take longer, but\n"
" it will gather light across a wider area.\n"
" -StaticPropLighting : generate baked static prop vertex lighting\n"
" -StaticPropLightingFinal : generate baked static prop vertex lighting (uses higher/final quality processing)\n"
" -StaticPropPolys : Perform shadow tests of static props at polygon precision\n"
" -OnlyStaticProps : Only perform direct static prop lighting (vrad debug option)\n"
" -StaticPropNormals : when lighting static props, just show their normal vector\n"
" -StaticPropBounce : Enable static props to bounce light. Experimental option, doesn't work with VMPI right now.\n"
" -textureshadows : Allows texture alpha channels to block light - rays intersecting alpha surfaces will sample the texture\n"
" -noskyboxrecurse : Turn off recursion into 3d skybox (skybox shadows on world)\n"
" -nossprops : Globally disable self-shadowing on static props\n"
@ -2937,23 +3065,17 @@ int RunVRAD( int argc, char **argv )
Msg("\n Valve Radiosity Simulator \n");
Q_strncpy(g_FileName, argv[0], MAX_PATH);
verbose = true; // Originally FALSE
bool onlydetail;
int i = ParseCommandLine( argc, argv, &onlydetail );
if (i == -1)
if (i != argc - 1)
{
PrintUsage( argc, argv );
DeleteCmdLine( argc, argv );
CmdLib_Exit( 1 );
Plat_ExitProcess( 0 );
}
// Initialize the filesystem, so additional commandline options can be loaded
Q_StripExtension( argv[ i ], source, sizeof( source ) );
CmdLib_InitFileSystem( argv[ i ] );
Q_FileBase( source, source, sizeof( source ) );
VRAD_LoadBSP( argv[i] );
if ( (! onlydetail) && (! g_bOnlyStaticProps ) )
@ -2984,7 +3106,14 @@ int VRAD_Main(int argc, char **argv)
#ifdef MPI
// This must come first.
VRAD_SetupMPI( argc, argv );
#endif
// Initialize the filesystem, so additional commandline options can be loaded
Q_StripExtension( argv[ argc - 1 ], source, sizeof( source ) );
CmdLib_InitFileSystem( argv[ argc - 1 ] );
Q_FileBase( source, source, sizeof( source ) );
#ifdef MPI
#if !defined( _DEBUG )
if ( g_bUseMPI && !g_bMPIMaster )
{

55
utils/vrad/vrad.h
View File

@ -34,12 +34,15 @@
#ifdef _WIN32
#include <windows.h>
#pragma warning(disable: 4142 4028)
#include <io.h>
#pragma warning(default: 4142 4028)
#include <direct.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <ctype.h>
@ -77,6 +80,11 @@ struct directlight_t
float soffset;
float toffset;
// Flag indicating that even though light.type is emit_skylight, treat this light as a
// directional light source in vrad
bool m_bSkyLightIsDirectionalLight;
float m_flSkyLightSunAngularExtent;
int dorecalc; // position, vector, spot angle, etc.
IncrementalLightID m_IncrementalID;
@ -89,6 +97,8 @@ struct directlight_t
directlight_t(void)
{
m_bSkyLightIsDirectionalLight = false;
m_flSkyLightSunAngularExtent = 0.0f;
m_flEndFadeDistance = -1.0; // end<start indicates not set
m_flStartFadeDistance= 0.0;
m_flCapDist = 1.0e22;
@ -232,6 +242,7 @@ struct CPatch
// struct patch_s *nextparent; // next in face
// struct patch_s *nextclusterchild; // next terminal child in cluster
int staticPropIdx; // Static prop this patch is from.
int numtransfers;
transfer_t *transfers;
@ -277,26 +288,39 @@ extern qboolean g_bLowPriority;
extern qboolean do_fast;
extern bool g_bInterrupt; // Was used with background lighting in WC. Tells VRAD to stop lighting.
extern IIncremental *g_pIncremental; // null if not doing incremental lighting
extern bool g_bDumpPropLightmaps;
extern float g_flSkySampleScale; // extra sampling factor for indirect light
extern float g_flStaticPropSampleScale; // extra sampling factor for indirect light (for static props)
extern bool g_bLargeDispSampleRadius;
extern bool g_bStaticPropPolys;
extern bool g_bTextureShadows;
extern bool g_bShowStaticPropNormals;
extern bool g_bDisablePropSelfShadowing;
extern bool g_bFiniteFalloffModel; // whether to use 1/xxx or not
extern bool g_bFastStaticProps;
extern bool g_bDumpBumpStaticProps;
extern bool g_bDisableStaticPropVertexInSolidTest;
extern bool g_bStaticPropBounce;
extern float g_flStaticPropBounceBoost;
extern CUtlVector<char const *> g_NonShadowCastingMaterialStrings;
extern void ForceTextureShadowsOnModel( const char *pModelName );
extern bool IsModelTextureShadowsForced( const char *pModelName );
extern int LoadShadowTexture( const char *pMaterialName );
extern int AddShadowTextureTriangle( int shadowTextureIndex, const Vector2D &t0, const Vector2D &t1, const Vector2D &t2 );
extern float ComputeCoverageForTriangle( int shadowTextureIndex, const Vector2D &t0, const Vector2D &t1, const Vector2D &t2 );
extern void GetShadowTextureMapping( int shadowTextureIndex, int *pWidth, int *pHeight );
// Raytracing
#define TRACE_ID_SKY 0x01000000 // sky face ray blocker
#define TRACE_ID_OPAQUE 0x02000000 // everyday light blocking face
#define TRACE_ID_STATICPROP 0x04000000 // static prop - lower bits are prop ID
#define TRACE_ID_PATCH 0x08000000 // patch - lower bits are patch ID
extern RayTracingEnvironment g_RtEnv;
extern RayTracingEnvironment g_RtEnv_LightBlockers;
extern RayTracingEnvironment g_RtEnv_RadiosityPatches; // Contains patches for final gather of indirect light for static prop lighting.
#include "mpivrad.h"
@ -307,6 +331,7 @@ void MakeShadowSplits (void);
void BuildVisMatrix (void);
void BuildClusterTable( void );
void AddDispsToClusterTable( void );
void AddStaticPropPatchesToClusterTable();
void FreeVisMatrix (void);
// qboolean CheckVisBit (unsigned int p1, unsigned int p2);
void TouchVMFFile (void);
@ -357,13 +382,11 @@ qboolean IsIncremental(char *filename);
int SaveIncremental(char *filename);
int PartialHead (void);
void BuildFacelights (int facenum, int threadnum);
void BuildStaticPropPatchlights( int iThread, int nPatch );
void PrecompLightmapOffsets();
void FinalLightFace (int threadnum, int facenum);
void PvsForOrigin (Vector& org, byte *pvs);
void ConvertRGBExp32ToRGBA8888( const ColorRGBExp32 *pSrc, unsigned char *pDst, Vector* _optOutLinear = NULL );
void ConvertRGBExp32ToLinear(const ColorRGBExp32 *pSrc, Vector* pDst);
void ConvertLinearToRGBA8888( const Vector *pSrc, unsigned char *pDst );
void ConvertRGBExp32ToRGBA8888( const ColorRGBExp32 *pSrc, unsigned char *pDst );
inline byte PVSCheck( const byte *pvs, int iCluster )
{
@ -382,6 +405,9 @@ inline byte PVSCheck( const byte *pvs, int iCluster )
// outputs 1 in fractionVisible if no occlusion, 0 if full occlusion, and in-between values
void TestLine( FourVectors const& start, FourVectors const& stop, fltx4 *pFractionVisible, int static_prop_index_to_ignore=-1);
void TestLine_IgnoreSky( FourVectors const& start, FourVectors const& stop, fltx4 *pFractionVisible, int static_prop_index_to_ignore=-1);
void TestLine_LightBlockers( const FourVectors& start, const FourVectors& stop, fltx4 *pFractionVisible );
// returns 1 if the ray sees the sky, 0 if it doesn't, and in-between values for partial coverage
void TestLine_DoesHitSky( FourVectors const& start, FourVectors const& stop,
fltx4 *pFractionVisible, bool canRecurse = true, int static_prop_to_skip=-1, bool bDoDebug = false );
@ -442,12 +468,14 @@ float TraceLeafBrushes( int leafIndex, const Vector &start, const Vector &end, C
struct SSE_sampleLightOutput_t
{
fltx4 m_flDot[NUM_BUMP_VECTS+1];
fltx4 m_flSunAmount[NUM_BUMP_VECTS + 1];
fltx4 m_flFalloff;
fltx4 m_flSunAmount;
};
#define GATHERLFLAGS_FORCE_FAST 1
#define GATHERLFLAGS_IGNORE_NORMALS 2
#define GATHERLFLAGS_FORCE_FAST 1 /* Use 4x fewer rays when sampling area lights */
#define GATHERLFLAGS_IGNORE_NORMALS 2 /* Ignore surface normals in lighting calculations */
#define GATHERLFLAGS_NO_OCCLUSION 4 /* Ignore occlusion for local lights (but not sun, sky or bounce lighting) */
#define GATHERLFLAGS_STATICPROP 8 /* Paths for static props */
// SSE Gather light stuff
void GatherSampleLightSSE( SSE_sampleLightOutput_t &out, directlight_t *dl, int facenum,
@ -471,6 +499,10 @@ void GatherSampleLightSSE( SSE_sampleLightOutput_t &out, directlight_t *dl, int
// int static_prop_to_skip=-1,
// float flEpsilon = 0.0 );
void ComputeDirectLightingAtPoint( Vector &position, Vector *normals, Vector *outColors, float *outSunAmount, int numNormals, bool bSkipSkyLight, int iThread,
int static_prop_id_to_skip = -1, int nLFlags = 0 );
//-----------------------------------------------------------------------------
// VRad Displacements
//-----------------------------------------------------------------------------
@ -514,6 +546,8 @@ public:
// utility
virtual void GetDispSurfNormal( int ndxFace, Vector &pt, Vector &ptNormal, bool bInside ) = 0;
virtual void GetDispSurfPointAndNormalFromUV( int ndxFace, Vector &pt, Vector &ptNormal,
Vector2D &uv, bool bInside ) = 0;
virtual void GetDispSurf( int ndxFace, CVRADDispColl **ppDispTree ) = 0;
// bsp tree functions
@ -577,7 +611,9 @@ extern int patchSamplesAdded;
void ComputeDetailPropLighting( int iThread );
void ComputeIndirectLightingAtPoint( Vector &position, Vector &normal, Vector &outColor,
int iThread, bool force_fast = false, bool bIgnoreNormals = false );
int iThread, bool force_fast = false, bool bIgnoreNormals = false, int nStaticPropToSkip = -1 );
void ComputeIndirectLightingAtPoint( Vector &position, Vector *normals, Vector *outColors, int numNormals,
int iThread, bool force_fast = false, bool bIgnoreNormals = false, int nStaticPropToSkip = -1 );
//-----------------------------------------------------------------------------
// VRad static props
@ -598,6 +634,7 @@ public:
virtual void Shutdown() = 0;
virtual void ComputeLighting( int iThread ) = 0;
virtual void AddPolysForRayTrace() = 0;
virtual void MakePatches() = 0;
};
//extern PropTested_t s_PropTested[MAX_TOOL_THREADS+1];

19
utils/vrad/vrad_dispcoll.cpp
View File

@ -101,7 +101,7 @@ void CVRADDispColl::CalcSampleRadius2AndBox( dface_t *pFace )
m_flSampleHeight = flHeight;
// Calculate the sample radius squared.
float flSampleRadius = sqrt( ( ( flWidth * flWidth ) + ( flHeight * flHeight ) ) ) * 2.2f;//RADIALDIST2;
float flSampleRadius = sqrt( ( ( flWidth * flWidth ) + ( flHeight * flHeight ) ) ); // * 2.2f;//RADIALDIST2; // AV - Removing the 2.2 scalar since 1.0 works better with CS:GO
if ( flSampleRadius > g_flMaxDispSampleSize )
{
flSampleRadius = g_flMaxDispSampleSize;
@ -110,8 +110,7 @@ void CVRADDispColl::CalcSampleRadius2AndBox( dface_t *pFace )
// Calculate the patch radius - the max sample edge length * the number of luxels per edge "chop."
float flSampleSize = max( m_flSampleWidth, m_flSampleHeight );
// Calculate the patch radius - the MAX sample edge length * the number of luxels per edge "chop."
float flPatchSampleRadius = flSampleSize * dispchop * 2.2f;
float flPatchSampleRadius = flSampleSize * dispchop * ( g_bLargeDispSampleRadius ? 2.2f : 1.0f ); // AV - Removing the 2.2 scalar since 1.0 works better with CS:GO. TS - It fixes lighting artefacts in maps with many small displacements.
if ( flPatchSampleRadius > g_MaxDispPatchRadius )
{
flPatchSampleRadius = g_MaxDispPatchRadius;
@ -441,7 +440,7 @@ void CVRADDispColl::CreateChildPatchesFromRoot( int iParentPatch, int *pChildPat
vecEdges[3] = pParentPatch->winding->p[3] - pParentPatch->winding->p[0];
// Should the patch be subdivided - check the area.
float flMaxLength = MAX( m_flSampleWidth, m_flSampleHeight );
float flMaxLength = max( m_flSampleWidth, m_flSampleHeight );
float flMinEdgeLength = flMaxLength * dispchop;
// Find the longest edge.
@ -552,7 +551,7 @@ void CVRADDispColl::CreateChildPatches( int iParentPatch, int nLevel )
return;
// Should the patch be subdivided - check the area.
float flMaxLength = MAX( m_flSampleWidth, m_flSampleHeight );
float flMaxLength = max( m_flSampleWidth, m_flSampleHeight );
float flMinEdgeLength = flMaxLength * dispchop;
// Split along the longest edge.
@ -660,14 +659,14 @@ void CVRADDispColl::CreateChildPatchesSub( int iParentPatch )
return;
// Should the patch be subdivided - check the area.
float flMaxLength = MAX( m_flSampleWidth, m_flSampleHeight );
float flMaxLength = max( m_flSampleWidth, m_flSampleHeight );
float flMinEdgeLength = flMaxLength * dispchop;
// Split along the longest edge.
Vector vecEdges[3];
vecEdges[0] = pParentPatch->winding->p[1] - pParentPatch->winding->p[0];
vecEdges[1] = pParentPatch->winding->p[2] - pParentPatch->winding->p[1];
vecEdges[2] = pParentPatch->winding->p[0] - pParentPatch->winding->p[2];
vecEdges[1] = pParentPatch->winding->p[2] - pParentPatch->winding->p[0];
vecEdges[2] = pParentPatch->winding->p[2] - pParentPatch->winding->p[1];
// Find the longest edge.
float flEdgeLength = 0.0f;
@ -818,6 +817,7 @@ bool CVRADDispColl::InitParentPatch( int iPatch, Vector *pPoints, float &flArea
pPatch->parent = g_Patches.InvalidIndex();
pPatch->ndxNextClusterChild = g_Patches.InvalidIndex();
pPatch->ndxNextParent = g_Patches.InvalidIndex();
pPatch->staticPropIdx = -1;
Vector vecEdges[2];
vecEdges[0] = pPoints[1] - pPoints[0];
@ -911,6 +911,7 @@ bool CVRADDispColl::InitPatch( int iPatch, int iParentPatch, int iChild, Vector
// Clear the patch data.
memset( pPatch, 0, sizeof( CPatch ) );
pPatch->staticPropIdx = -1;
// Setup the parent if we are not the parent.
CPatch *pParentPatch = NULL;
@ -1067,7 +1068,7 @@ void CVRADDispColl::AddPolysForRayTrace( void )
if ( !( m_nContents & MASK_OPAQUE ) )
return;
for ( int ndxTri = 0; ndxTri < m_aTris.Size(); ndxTri++ )
for ( int ndxTri = 0; ndxTri < m_aTris.Count(); ndxTri++ )
{
CDispCollTri *tri = m_aTris.Base() + ndxTri;
int v[3];

405
utils/vrad/vraddetailprops.cpp
View File

@ -24,6 +24,8 @@
#endif
#include "byteswap.h"
extern float SoftenCosineTerm( float flDot );
extern float CalculateAmbientOcclusion( Vector *pPosition, Vector *pNormal );
bool LoadStudioModel( char const* pModelName, CUtlBuffer& buf );
@ -228,12 +230,8 @@ static void ComputeMaxDirectLighting( DetailObjectLump_t& prop, Vector* maxcolor
origin4.DuplicateVector( origin );
normal4.DuplicateVector( normal );
GatherSampleLightSSE ( out, dl, -1, origin4, &normal4, 1, iThread );
#ifdef VRAD_SSE
VectorMA( maxcolor[dl->light.style], out.m_flFalloff.m128_f32[0] * out.m_flDot[0].m128_f32[0], dl->light.intensity, maxcolor[dl->light.style] );
#else
GatherSampleLightSSE ( out, dl, -1, origin4, &normal4, 1, iThread, GATHERLFLAGS_STATICPROP );
VectorMA( maxcolor[dl->light.style], out.m_flFalloff[0] * out.m_flDot[0][0], dl->light.intensity, maxcolor[dl->light.style] );
#endif
}
}
@ -659,23 +657,80 @@ static void ComputeAmbientLightingAtPoint( int iThread, const Vector &origin, Ve
}
//-----------------------------------------------------------------------------
// Trace hemispherical rays from a vertex, accumulating indirect
// sources at each ray termination.
//
// Trace a ray from position. in the specified direction to determine a positive
// hit for indirect lighting.
//
// Fire ray out from start, with end as start + direction*MAX_TRACE_LENGTH
// If hit then fire ray back to start to see if it hits a back facing surface that would natually block the incoming light ray
// If still okay then test explicitly against light blockers, test only in the hit to start direction
// Update surfEnum and return true if a valid intersection for indirect light.
//
//-----------------------------------------------------------------------------
void ComputeIndirectLightingAtPoint( Vector &position, Vector &normal, Vector &outColor,
int iThread, bool force_fast, bool bIgnoreNormals )
bool TraceIndirectLightingSample( Vector &position, Vector &direction, CLightSurface &surfEnum, int iThread, bool force_fast )
{
Ray_t ray;
CLightSurface surfEnum(iThread);
outColor.Init();
// trace to determine surface
Vector vEnd, vStart;
VectorScale( direction, MAX_TRACE_LENGTH, vEnd );
VectorAdd( position, vEnd, vEnd );
if ( force_fast )
{
vStart = position;
}
else
{
// offset ray start position to compensate for ray leakage due to coincident surfaces (we are seeing some ray tests leak in some situations - e.g. prop vertex lies on ground plane)
VectorScale( direction, -EQUAL_EPSILON, vStart );
VectorAdd( position, vStart, vStart );
}
ray.Init( vStart, vEnd, vec3_origin, vec3_origin );
if ( !surfEnum.FindIntersection( ray ) )
return false;
// Now test explicitly against light blockers (surfaces don't exist in the bsp nodes we're checking here, and this feels a safer change than updating indirect lighting for static props to use the slower rte path for all rays)
// test from hitfrac back to start only
VectorScale( direction, MAX_TRACE_LENGTH * surfEnum.m_HitFrac, vEnd );
VectorAdd( position, vEnd, vEnd );
FourVectors rayStart, rayEnd, rayDirection;
fltx4 fractionVisible = Four_Ones;
rayStart.DuplicateVector( vStart );
rayEnd.DuplicateVector( vEnd );
// rayDirection.DuplicateVector( direction );
// TestLine_LightBlockers( rayStart, rayEnd, &fractionVisible );
rayDirection.DuplicateVector( -direction );
TestLine_LightBlockers( rayEnd, rayStart, &fractionVisible );
if ( fractionVisible[0] < 1.0f )
{
// ray hit blocker
return false;
}
return true;
}
//-----------------------------------------------------------------------------
// Trace hemispherical rays from a vertex, accumulating indirect
// sources at each ray termination.
//
// force_fast = false currently implies 'new/improved' static prop lighting is to be used.
//-----------------------------------------------------------------------------
void ComputeIndirectLightingAtPoint( Vector &position, Vector &normal, Vector &outColor,
int iThread, bool force_fast, bool bIgnoreNormals, int nStaticPropToSkip )
{
outColor.Zero();
int nSamples = NUMVERTEXNORMALS;
if ( do_fast || force_fast )
nSamples /= 4;
else
nSamples *= g_flSkySampleScale;
if ( do_fast || force_fast )
nSamples /= 4;
else
nSamples *= g_flStaticPropSampleScale;
float totalDot = 0;
DirectionalSampler_t sampler;
@ -696,15 +751,44 @@ void ComputeIndirectLightingAtPoint( Vector &position, Vector &normal, Vector &o
}
totalDot += dot;
// trace static prop indirect
Vector staticPropIndirectColor( 0.0f, 0.0f, 0.0f );
float flStaticPropHitDist = FLT_MAX;
if ( g_bStaticPropBounce )
{
FourRays myrays;
myrays.origin.DuplicateVector( position );
myrays.direction.DuplicateVector( samplingNormal );
RayTracingResult rt_result;
g_RtEnv_RadiosityPatches.Trace4Rays( myrays, ReplicateX4( 10.0f ), ReplicateX4( MAX_TRACE_LENGTH ), &rt_result );
if ( rt_result.HitIds[ 0 ] != -1 )
{
const TriIntersectData_t &intersectData = g_RtEnv_RadiosityPatches.OptimizedTriangleList[ rt_result.HitIds[ 0 ] ].m_Data.m_IntersectData;
int nId = intersectData.m_nTriangleID;
if ( nId & TRACE_ID_PATCH )
{
int nPatchId = nId & ~TRACE_ID_PATCH;
CPatch &patch = g_Patches[ nPatchId ];
if ( patch.staticPropIdx != nStaticPropToSkip )
{
staticPropIndirectColor = dot * ( patch.totallight.light[ 0 ] + patch.directlight ) * patch.reflectivity;
flStaticPropHitDist = SubFloat( rt_result.HitDistance, 0 );
}
}
}
}
// important to put the constructor here to init m_hitfrac, etc
CLightSurface surfEnum( iThread );
// trace to determine surface
Vector vEnd;
VectorScale( samplingNormal, MAX_TRACE_LENGTH, vEnd );
VectorAdd( position, vEnd, vEnd );
ray.Init( position, vEnd, vec3_origin, vec3_origin );
if ( !surfEnum.FindIntersection( ray ) )
if ( !TraceIndirectLightingSample( position, samplingNormal, surfEnum, iThread, force_fast ) ||
flStaticPropHitDist < surfEnum.m_HitFrac * MAX_TRACE_LENGTH )
{
VectorAdd( outColor, staticPropIndirectColor, outColor ); // we may have hit a static prop patch
continue;
}
// get color from surface lightmap
texinfo_t* pTex = &texinfo[surfEnum.m_pSurface->texinfo];
@ -721,7 +805,6 @@ void ComputeIndirectLightingAtPoint( Vector &position, Vector &normal, Vector &o
continue;
}
Vector lightmapColor;
if ( !surfEnum.m_bHasLuxel )
{
@ -744,18 +827,282 @@ void ComputeIndirectLightingAtPoint( Vector &position, Vector &normal, Vector &o
ColorRGBExp32ToVector( *pLightmap, lightmapColor );
}
float invLengthSqr = 1.0f / (1.0f + ((vEnd - position) * surfEnum.m_HitFrac / 128.0).LengthSqr());
// Include falloff using invsqrlaw.
VectorMultiply( lightmapColor, invLengthSqr * dtexdata[pTex->texdata].reflectivity, lightmapColor );
if ( force_fast )
{
VectorMultiply( lightmapColor, dtexdata[pTex->texdata].reflectivity, lightmapColor );
}
else
{
// Include dot falloff on accumulating irradiance here
// have tried using inv sqr falloff from TF2 changes to vrad (CL#2394791 & 2395471), but the result is very sensitive to the scale factor that is used (too dark or too bright otherwise)
// this seems to give the most natural looking result (static props matching brushes)
VectorMultiply( lightmapColor, dot * dtexdata[pTex->texdata].reflectivity, lightmapColor );
}
VectorAdd( outColor, lightmapColor, outColor );
}
if ( totalDot )
{
VectorScale( outColor, 1.0f/totalDot, outColor );
VectorScale( outColor, 1.0f / totalDot, outColor );
}
}
void ComputeIndirectLightingAtPoint( Vector &position, Vector *normals, Vector *outColors, int numNormals,
int iThread, bool force_fast, bool bIgnoreNormals, int nStaticPropToSkip )
{
const Vector vZero(0.0f, 0.0f, 0.0f);
if ( numNormals != ( NUM_BUMP_VECTS + 1 ) )
{
for ( int k = 0; k < numNormals; ++k )
{
ComputeIndirectLightingAtPoint( position, normals[k], outColors[k], iThread, force_fast, bIgnoreNormals, nStaticPropToSkip );
}
return;
}
// optimize/unroll for num_bump_vects = 3
outColors[0].Zero();
outColors[1].Zero();
outColors[2].Zero();
outColors[3].Zero();
int nSamples = NUMVERTEXNORMALS;
if ( do_fast || force_fast )
nSamples /= 4;
else
nSamples *= g_flStaticPropSampleScale;
float totalDot[4] = {0.0f, 0.0f, 0.0f, 0.0f};
DirectionalSampler_t sampler;
for ( int j = 0; j < nSamples; j++ )
{
Vector samplingNormal = sampler.NextValue();
float dot[4];
if ( bIgnoreNormals )
{
dot[0] = dot[1] = dot[2] = dot[3] = (0.7071 / 2);
}
else
{
samplingNormal.NormalizeInPlace();
dot[0] = DotProduct( normals[0], samplingNormal );
dot[1] = DotProduct( normals[1], samplingNormal );
dot[2] = DotProduct( normals[2], samplingNormal );
dot[3] = DotProduct( normals[3], samplingNormal );
}
bool bDoRayTrace = false;
bool bIncLighting[4] = {false, false, false, false};
if ( dot[0] > EQUAL_EPSILON )
{
dot[0] = SoftenCosineTerm( dot[0] );
totalDot[0] += dot[0];
bDoRayTrace = true;
bIncLighting[0] = true;
}
else
{
dot[0] = 0.0f;
}
if ( dot[1] > EQUAL_EPSILON )
{
dot[1] = SoftenCosineTerm( dot[1] );
totalDot[1] += dot[1];
bDoRayTrace = true;
bIncLighting[1] = true;
}
else
{
dot[1] = 0.0f;
}
if ( dot[2] > EQUAL_EPSILON )
{
dot[2] = SoftenCosineTerm( dot[2] );
totalDot[2] += dot[2];
bDoRayTrace = true;
bIncLighting[2] = true;
}
else
{
dot[2] = 0.0f;
}
if ( dot[3] > EQUAL_EPSILON )
{
dot[3] = SoftenCosineTerm( dot[3] );
totalDot[3] += dot[3];
bDoRayTrace = true;
bIncLighting[3] = true;
}
else
{
dot[3] = 0.0f;
}
// important to skip
if ( dot[0] <= EQUAL_EPSILON )
{
continue;
}
if ( bDoRayTrace )
{
Vector staticPropIndirectColor( 0.0f, 0.0f, 0.0f );
float flStaticPropHitDist = FLT_MAX;
if ( g_bStaticPropBounce )
{
FourRays myrays;
myrays.origin.DuplicateVector( position );
myrays.direction.DuplicateVector( samplingNormal );
RayTracingResult rt_result;
g_RtEnv_RadiosityPatches.Trace4Rays( myrays, ReplicateX4( 10.0f ), ReplicateX4( MAX_TRACE_LENGTH ), &rt_result );
if ( rt_result.HitIds[ 0 ] != -1 )
{
const TriIntersectData_t &intersectData = g_RtEnv_RadiosityPatches.OptimizedTriangleList[ rt_result.HitIds[ 0 ] ].m_Data.m_IntersectData;
int nId = intersectData.m_nTriangleID;
if ( nId & TRACE_ID_PATCH )
{
int nPatchId = nId & ~TRACE_ID_PATCH;
CPatch &patch = g_Patches[ nPatchId ];
if ( patch.staticPropIdx != nStaticPropToSkip )
{
staticPropIndirectColor = ( patch.totallight.light[ 0 ] + patch.directlight ) * patch.reflectivity;
flStaticPropHitDist = SubFloat( rt_result.HitDistance, 0 );
}
}
}
}
// important to put the constructor here to init m_hitfrac, etc
CLightSurface surfEnum( iThread );
// trace to determine surface
if ( !TraceIndirectLightingSample( position, samplingNormal, surfEnum, iThread, force_fast ) ||
flStaticPropHitDist < surfEnum.m_HitFrac * MAX_TRACE_LENGTH )
{
// The dot values are 0 if bIncLighting is false so we don't actually need to branch here.
VectorAdd( outColors[ 0 ], dot[ 0 ] * staticPropIndirectColor, outColors[ 0 ] ); // we may have hit a static prop patch
VectorAdd( outColors[ 1 ], dot[ 1 ] * staticPropIndirectColor, outColors[ 1 ] );
VectorAdd( outColors[ 2 ], dot[ 2 ] * staticPropIndirectColor, outColors[ 2 ] );
VectorAdd( outColors[ 3 ], dot[ 3 ] * staticPropIndirectColor, outColors[ 3 ] );
continue;
}
// get color from surface lightmap
texinfo_t* pTex = &texinfo[surfEnum.m_pSurface->texinfo];
if ( !pTex || pTex->flags & SURF_SKY )
{
// ignore contribution from sky
// sky ambient already accounted for during direct pass
continue;
}
if ( surfEnum.m_pSurface->styles[0] == 255 || surfEnum.m_pSurface->lightofs < 0 )
{
// no light affects this face
continue;
}
Vector lightmapColor;
Vector lightmapColors[4];
if ( !surfEnum.m_bHasLuxel )
{
ColorRGBExp32* pAvgLightmapColor = dface_AvgLightColor( surfEnum.m_pSurface, 0 );
ColorRGBExp32ToVector( *pAvgLightmapColor, lightmapColor );
}
else
{
// get color from displacement
int smax = (surfEnum.m_pSurface->m_LightmapTextureSizeInLuxels[0]) + 1;
int tmax = (surfEnum.m_pSurface->m_LightmapTextureSizeInLuxels[1]) + 1;
// luxelcoord is in the space of the accumulated lightmap page; we need to convert
// it to be in the space of the surface
int ds = clamp( (int)surfEnum.m_LuxelCoord.x, 0, smax - 1 );
int dt = clamp( (int)surfEnum.m_LuxelCoord.y, 0, tmax - 1 );
ColorRGBExp32* pLightmap = (ColorRGBExp32*)&(*pdlightdata)[surfEnum.m_pSurface->lightofs];
pLightmap += dt * smax + ds;
ColorRGBExp32ToVector( *pLightmap, lightmapColor );
}
lightmapColor.Max( vZero );
if ( force_fast )
{
VectorMultiply( lightmapColor, dtexdata[pTex->texdata].reflectivity, lightmapColors[0] );
if ( bIncLighting[0] )
{
VectorAdd( outColors[0], lightmapColors[0], outColors[0] );
}
if ( bIncLighting[1] )
{
VectorAdd( outColors[1], lightmapColors[0], outColors[1] );
}
if ( bIncLighting[2] )
{
VectorAdd( outColors[2], lightmapColors[0], outColors[2] );
}
if ( bIncLighting[3] )
{
VectorAdd( outColors[3], lightmapColors[0], outColors[3] );
}
}
else
{
// Include dot falloff on accumulating irradiance here
// have tried using inv sqr falloff from TF2 changes to vrad (CL#2394791 & 2395471), but the result is very sensitive to the scale factor that is used (too dark or too bright otherwise)
// this seems to give the most natural looking result (static props matching brushes)
if ( bIncLighting[0] )
{
VectorMultiply( lightmapColor, dot[0] * dtexdata[pTex->texdata].reflectivity, lightmapColors[0] );
VectorAdd( outColors[0], lightmapColors[0], outColors[0] );
}
if ( bIncLighting[1] )
{
VectorMultiply( lightmapColor, dot[1] * dtexdata[pTex->texdata].reflectivity, lightmapColors[1] );
VectorAdd( outColors[1], lightmapColors[1], outColors[1] );
}
if ( bIncLighting[2] )
{
VectorMultiply( lightmapColor, dot[2] * dtexdata[pTex->texdata].reflectivity, lightmapColors[2] );
VectorAdd( outColors[2], lightmapColors[2], outColors[2] );
}
if ( bIncLighting[3] )
{
VectorMultiply( lightmapColor, dot[3] * dtexdata[pTex->texdata].reflectivity, lightmapColors[3] );
VectorAdd( outColors[3], lightmapColors[3], outColors[3] );
}
}
}
}
if ( totalDot[0] )
{
VectorScale( outColors[0], 1.0f / totalDot[0], outColors[0] );
}
if ( totalDot[1] )
{
VectorScale( outColors[1], 1.0f / totalDot[1], outColors[1] );
}
if ( totalDot[2] )
{
VectorScale( outColors[2], 1.0f / totalDot[2], outColors[2] );
}
if ( totalDot[3] )
{
VectorScale( outColors[3], 1.0f / totalDot[3], outColors[3] );
}
}
static void ComputeAmbientLighting( int iThread, DetailObjectLump_t& prop, Vector color[MAX_LIGHTSTYLES] )
{
Vector origin, normal;
@ -821,7 +1168,7 @@ static void ComputeLighting( DetailObjectLump_t& prop, int iThread )
{
if (!hasLightstyles)
{
prop.m_LightStyles = s_pDetailPropLightStyleLump->Size();
prop.m_LightStyles = s_pDetailPropLightStyleLump->Count();
hasLightstyles = true;
}
@ -921,14 +1268,14 @@ static void WriteDetailLightingLump( int lumpID, int lumpVersion, CUtlVector<Det
GameLumpHandle_t handle = g_GameLumps.GetGameLumpHandle(lumpID);
if (handle != g_GameLumps.InvalidGameLump())
g_GameLumps.DestroyGameLump(handle);
int lightsize = lumpData.Size() * sizeof(DetailPropLightstylesLump_t);
int lightsize = lumpData.Count() * sizeof(DetailPropLightstylesLump_t);
int lumpsize = lightsize + sizeof(int);
handle = g_GameLumps.CreateGameLump( lumpID, lumpsize, 0, lumpVersion );
// Serialize the data
CUtlBuffer buf( g_GameLumps.GetGameLump(handle), lumpsize );
buf.PutInt( lumpData.Size() );
buf.PutInt( lumpData.Count() );
if (lightsize)
buf.Put( lumpData.Base(), lightsize );
}

69
utils/vrad/vraddisps.cpp
View File

@ -105,6 +105,8 @@ public:
// utility
void GetDispSurfNormal( int ndxFace, Vector &pt, Vector &ptNormal, bool bInside );
void GetDispSurfPointAndNormalFromUV( int ndxFace, Vector &pt, Vector &ptNormal,
Vector2D &uv, bool bInside );
void GetDispSurf( int ndxFace, CVRADDispColl **ppDispTree );
// bsp tree functions
@ -163,7 +165,7 @@ private:
radial_t *pRadial, int ndxRadial, bool bBump,
CUtlVector<CPatch*> &interestingPatches );
bool IsNeighbor( int iDispFace, int iNeighborFace );
bool IsNeighbor( int iDispFace, int iNeighborFace, bool bCheck2ndDegreeNeighbors = false );
void GetInterestingPatchesForLuxels(
int ndxFace,
@ -329,7 +331,7 @@ void CVRadDispMgr::Init( void )
void CVRadDispMgr::Shutdown( void )
{
// remove all displacements from the tree
for( int ndxDisp = m_DispTrees.Size(); ndxDisp >= 0; ndxDisp-- )
for( int ndxDisp = m_DispTrees.Count(); ndxDisp >= 0; ndxDisp-- )
{
RemoveDispFromTree( ndxDisp );
}
@ -500,7 +502,7 @@ void CVRadDispMgr::MakePatches( void )
float flTotalArea = 0.0f;
// Create patches for all of the displacements.
int nTreeCount = m_DispTrees.Size();
int nTreeCount = m_DispTrees.Count();
for( int iTree = 0; iTree < nTreeCount; ++iTree )
{
// Get the current displacement collision tree.
@ -537,12 +539,12 @@ void CVRadDispMgr::SubdividePatch( int iPatch )
//-----------------------------------------------------------------------------
void CVRadDispMgr::StartRayTest( DispTested_t &dispTested )
{
if( m_DispTrees.Size() > 0 )
if( m_DispTrees.Count() > 0 )
{
if( dispTested.m_pTested == 0 )
{
dispTested.m_pTested = new int[m_DispTrees.Size()];
memset( dispTested.m_pTested, 0, m_DispTrees.Size() * sizeof( int ) );
dispTested.m_pTested = new int[m_DispTrees.Count()];
memset( dispTested.m_pTested, 0, m_DispTrees.Count() * sizeof( int ) );
dispTested.m_Enum = 0;
}
++dispTested.m_Enum;
@ -613,7 +615,7 @@ void CVRadDispMgr::ClipRayToDispInLeaf( DispTested_t &dispTested, Ray_t const &r
void CVRadDispMgr::AddPolysForRayTrace( void )
{
int nTreeCount = m_DispTrees.Size();
int nTreeCount = m_DispTrees.Count();
for( int iTree = 0; iTree < nTreeCount; ++iTree )
{
// Get the current displacement collision tree.
@ -656,6 +658,32 @@ void CVRadDispMgr::GetDispSurfNormal( int ndxFace, Vector &pt, Vector &ptNormal,
pDispTree->DispUVToSurfPoint( uv, pt, 1.0f );
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
void CVRadDispMgr::GetDispSurfPointAndNormalFromUV( int ndxFace, Vector &pt, Vector &ptNormal,
Vector2D &uv, bool bInside )
{
// get the displacement surface data
DispCollTree_t &dispTree = m_DispTrees[ g_pFaces[ ndxFace ].dispinfo ];
CVRADDispColl *pDispTree = dispTree.m_pDispTree;
if ( bInside )
{
if ( uv[ 0 ] < 0.0f || uv[ 0 ] > 1.0f ) { Msg( "Disp UV (%f) outside bounds!\n", uv[ 0 ] ); }
if ( uv[ 1 ] < 0.0f || uv[ 1 ] > 1.0f ) { Msg( "Disp UV (%f) outside bounds!\n", uv[ 1 ] ); }
}
if ( uv[ 0 ] < 0.0f ) { uv[ 0 ] = 0.0f; }
if ( uv[ 0 ] > 1.0f ) { uv[ 0 ] = 1.0f; }
if ( uv[ 1 ] < 0.0f ) { uv[ 1 ] = 0.0f; }
if ( uv[ 1 ] > 1.0f ) { uv[ 1 ] = 1.0f; }
// get the normal at "pt"
pDispTree->DispUVToSurfNormal( uv, ptNormal );
// get the new "pt"
pDispTree->DispUVToSurfPoint( uv, pt, 1.0f );
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@ -778,7 +806,7 @@ bool CVRadDispMgr::DispFaceList_EnumerateLeaf( int ndxLeaf, intp context )
// check to see if the face already lives in the list
int ndx;
int size = m_EnumDispFaceList.m_FaceList.Size();
int size = m_EnumDispFaceList.m_FaceList.Count();
for( ndx = 0; ndx < size; ndx++ )
{
if( m_EnumDispFaceList.m_FaceList[ndx] == ndxLeafFace )
@ -807,7 +835,7 @@ bool CVRadDispMgr::DispFaceList_EnumerateElement( int userId, intp context )
// check to see if the displacement already lives in the list
int ndx;
int size = m_EnumDispFaceList.m_DispList.Size();
int size = m_EnumDispFaceList.m_DispList.Count();
for( ndx = 0; ndx < size; ndx++ )
{
if( m_EnumDispFaceList.m_DispList[ndx] == pDispTree )
@ -906,7 +934,7 @@ void AddSampleLightToRadial( Vector const &samplePos, Vector const &sampleNormal
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool CVRadDispMgr::IsNeighbor( int iFace, int iNeighborFace )
bool CVRadDispMgr::IsNeighbor( int iFace, int iNeighborFace, bool bCheck2ndDegreeNeighbors )
{
if ( iFace == iNeighborFace )
return true;
@ -918,6 +946,19 @@ bool CVRadDispMgr::IsNeighbor( int iFace, int iNeighborFace )
return true;
}
if ( bCheck2ndDegreeNeighbors )
{
for ( int iNeighbor = 0; iNeighbor < pFaceNeighbor->numneighbors; iNeighbor++ )
{
faceneighbor_t *pFaceNeighbor2 = &faceneighbor[ pFaceNeighbor->neighbor[ iNeighbor ] ];
for ( int iNeighbor2 = 0; iNeighbor2 < pFaceNeighbor2->numneighbors; iNeighbor2++ )
{
if ( pFaceNeighbor2->neighbor[ iNeighbor2 ] == iNeighborFace )
return true;
}
}
}
return false;
}
@ -1134,7 +1175,7 @@ void AddPatchLightToRadial( Vector const &patchOrigin, Vector const &patchNormal
if( bNeighborBump )
{
float flScale = patchNormal.Dot( normals[0] );
flScale = MAX( 0.0f, flScale );
flScale = max( 0.0f, flScale );
float flBumpInfluence = influence * flScale;
for( int ndxBump = 0; ndxBump < ( NUM_BUMP_VECTS+1 ); ndxBump++ )
@ -1147,7 +1188,7 @@ void AddPatchLightToRadial( Vector const &patchOrigin, Vector const &patchNormal
else
{
float flScale = patchNormal.Dot( normals[0] );
flScale = MAX( 0.0f, flScale );
flScale = max( 0.0f, flScale );
float flBumpInfluence = influence * flScale * 0.05f;
for( int ndxBump = 0; ndxBump < ( NUM_BUMP_VECTS+1 ); ndxBump++ )
@ -1161,7 +1202,7 @@ void AddPatchLightToRadial( Vector const &patchOrigin, Vector const &patchNormal
else
{
float flScale = patchNormal.Dot( luxelNormal );
flScale = MAX( 0.0f, flScale );
flScale = max( 0.0f, flScale );
influence *= flScale;
pRadial->light[0][ndxRadial].AddWeighted( pPatchLight[0], influence );
@ -1337,7 +1378,7 @@ void CVRadDispMgr::GetInterestingPatchesForLuxels(
{
pPatch->m_IterationKey = curIterationKey;
if ( IsNeighbor( ndxFace, pPatch->faceNumber ) )
if ( IsNeighbor( ndxFace, pPatch->faceNumber, g_bLargeDispSampleRadius ) )
{
interestingPatches.AddToTail( pPatch );
}

2095
utils/vrad/vradstaticprops.cpp
View File

File diff suppressed because it is too large Load Diff

4
wscript
View File

@ -455,7 +455,6 @@ def configure(conf):
conf.load('mm_hook')
define_platform(conf)
conf.env.targets = list(set(conf.env.targets))
conf.env.REL_VERSION = VERSION
conf.env.BIT32_MANDATORY = not conf.options.ALLOW64
@ -610,7 +609,8 @@ def configure(conf):
conf.env.CC.insert(0, 'ccache')
conf.env.CXX.insert(0, 'ccache')
conf.add_subproject(conf.env.targets)
for v in set(conf.env.targets):
conf.add_subproject(v)
def build(bld):
if not os.environ.get('CCACHE_DIR'):