mirror of
https://github.com/jmarshall23/DoomRTX.git
synced 2026-08-12 00:01:49 +02:00
Lots of fixes.
This commit is contained in:
@@ -2738,7 +2738,7 @@ float TraceShadow(float3 origin, float3 dir, float maxT)
|
||||
|
||||
TraceRay(
|
||||
gSceneBVH,
|
||||
RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH | RAY_FLAG_CULL_FRONT_FACING_TRIANGLES,
|
||||
RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH,
|
||||
0xFF,
|
||||
0,
|
||||
0,
|
||||
@@ -2765,7 +2765,7 @@ bool TraceBounce(float3 origin, float3 dir, float maxT, out float hitT, out uint
|
||||
|
||||
TraceRay(
|
||||
gSceneBVH,
|
||||
RAY_FLAG_NONE,
|
||||
RAY_FLAG_ACCEPT_FIRST_HIT_AND_END_SEARCH,
|
||||
0xFF,
|
||||
1,
|
||||
0,
|
||||
@@ -4996,6 +4996,8 @@ void RayGen()
|
||||
finalColor += baseAlbedo * reactiveFinalGather;
|
||||
}
|
||||
|
||||
finalColor *= clamp(ao + 0.6, 0.0, 1.0);
|
||||
|
||||
// Volumetric light scattering is radiance in the camera ray, not surface
|
||||
// reflectance, so add it after surface albedo/specular composition. Because
|
||||
// it is written into the same path-trace target, the internal a-trous pass
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -371,8 +371,20 @@ typedef struct vidmode_s {
|
||||
} vidmode_t;
|
||||
|
||||
vidmode_t r_vidModes[] = {
|
||||
{ "Mode 0: 1280x720", 1280, 720 },
|
||||
{ "Mode 1: 1920x1080", 1920, 1080 }
|
||||
{ "Mode 0: 640x360", 640, 360 },
|
||||
{ "Mode 1: 854x480", 854, 480 },
|
||||
{ "Mode 2: 960x540", 960, 540 },
|
||||
{ "Mode 3: 1024x576", 1024, 576 },
|
||||
{ "Mode 4: 1280x720", 1280, 720 },
|
||||
{ "Mode 5: 1366x768", 1366, 768 },
|
||||
{ "Mode 6: 1600x900", 1600, 900 },
|
||||
{ "Mode 7: 1920x1080", 1920, 1080 },
|
||||
{ "Mode 8: 2048x1152", 2048, 1152 },
|
||||
{ "Mode 9: 2560x1440", 2560, 1440 },
|
||||
{ "Mode 10: 3200x1800", 3200, 1800 },
|
||||
{ "Mode 11: 3840x2160", 3840, 2160 },
|
||||
{ "Mode 12: 5120x2880", 5120, 2880 },
|
||||
{ "Mode 13: 7680x4320", 7680, 4320 }
|
||||
};
|
||||
static int s_numVidModes = ( sizeof( r_vidModes ) / sizeof( r_vidModes[0] ) );
|
||||
|
||||
|
||||
@@ -176,7 +176,7 @@ void RB_DXDrawInteractions(void)
|
||||
const float r = srcLight.shaderParms[SHADERPARM_RED];
|
||||
const float g = srcLight.shaderParms[SHADERPARM_GREEN];
|
||||
const float b = srcLight.shaderParms[SHADERPARM_BLUE];
|
||||
const float intensity = 4.0f;
|
||||
const float intensity = 6.0f;
|
||||
|
||||
glRaytracingLight_t light = {};
|
||||
bool supported = true;
|
||||
@@ -187,9 +187,9 @@ void RB_DXDrawInteractions(void)
|
||||
vLight->globalLightOrigin.x,
|
||||
vLight->globalLightOrigin.y,
|
||||
vLight->globalLightOrigin.z,
|
||||
srcLight.lightRadius[0] * 1.25f,
|
||||
srcLight.lightRadius[1] * 1.25f,
|
||||
srcLight.lightRadius[2] * 1.4f,
|
||||
srcLight.lightRadius[0] * 1.3f,
|
||||
srcLight.lightRadius[1] * 1.3f,
|
||||
srcLight.lightRadius[2] * 2.0f,
|
||||
r, g, b,
|
||||
intensity);
|
||||
|
||||
|
||||
@@ -17,10 +17,13 @@
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{57CFA45E-E1FD-4DFF-997D-68DD2700C7D7}</ProjectGuid>
|
||||
<RootNamespace>Game</RootNamespace>
|
||||
<SccProjectName>Perforce Project</SccProjectName>
|
||||
<SccProjectName>
|
||||
</SccProjectName>
|
||||
<SccAuxPath />
|
||||
<SccLocalPath>..</SccLocalPath>
|
||||
<SccProvider>MSSCCI:NXN alienbrain</SccProvider>
|
||||
<SccLocalPath>
|
||||
</SccLocalPath>
|
||||
<SccProvider>
|
||||
</SccProvider>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
<ProjectName>q4game</ProjectName>
|
||||
|
||||
Reference in New Issue
Block a user