Skip to content

3D skybox in water reflection #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
URAKOLOUY5 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

3D skybox in water reflection #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions sp/src/game/client/viewrender.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ ConVar r_entityclips( "r_entityclips", "1" ); //FIXME: Nvidia drivers before 81.
static ConVar r_drawopaqueworld( "r_drawopaqueworld", "1", FCVAR_CHEAT );
static ConVar r_drawtranslucentworld( "r_drawtranslucentworld", "1", FCVAR_CHEAT );
static ConVar r_3dsky( "r_3dsky","1", 0, "Enable the rendering of 3d sky boxes" );
#ifdef MAPBASE
static ConVar r_3dsky_water("r_3dsky_water", "1", FCVAR_ARCHIVE, "Enable the rendering of 3d sky boxes in water");
#endif
static ConVar r_skybox( "r_skybox","1", FCVAR_CHEAT, "Enable the rendering of sky boxes" );
#ifdef TF_CLIENT_DLL
ConVar r_drawviewmodel( "r_drawviewmodel","1", FCVAR_ARCHIVE );
Expand Down Expand Up @@ -4107,6 +4110,29 @@ void CRendering3dView::DrawWorld( float waterZAdjust )
render->DrawWorldLists( m_pWorldRenderList, engineFlags, waterZAdjust );
}

#ifdef MAPBASE
void CRendering3dView::Draw3DSkybox()
{
if (!(r_3dsky.GetBool() && r_3dsky_water.GetBool()))
return;

CMatRenderContextPtr pRenderContext(materials);
pRenderContext->SetHeightClipMode(MATERIAL_HEIGHTCLIPMODE_DISABLE);

CSkyboxView* pSkyView = new CSkyboxView(m_pMainView);

pRenderContext->OverrideDepthEnable(true, false);
SkyboxVisibility_t nSkyboxVisible = SKYBOX_NOT_VISIBLE;
if (pSkyView->Setup(*this, &m_ClearFlags, &nSkyboxVisible))
pSkyView->Draw();
SafeRelease(pSkyView);
pRenderContext->OverrideDepthEnable(false, false);

EnableWorldFog();
render->ViewSetupVis(m_pMainView->ShouldForceNoVis(), 1, &(m_pMainView->GetViewSetup()->origin));
pRenderContext->SetHeightClipMode(MATERIAL_HEIGHTCLIPMODE_RENDER_ABOVE_HEIGHT);
}
#endif

CMaterialReference g_material_WriteZ; //init'ed on by CViewRender::Init()

Expand Down Expand Up @@ -5208,7 +5234,12 @@ void CRendering3dView::SetFogVolumeState( const VisibleFogVolumeInfo_t &fogInfo,
//-----------------------------------------------------------------------------
SkyboxVisibility_t CSkyboxView::ComputeSkyboxVisibility()
{
return engine->IsSkyboxVisibleFromPoint( origin );
#ifdef MAPBASE
// Use origin of main view (fixes issue where sometimes 3D sky dissapears in water)
return engine->IsSkyboxVisibleFromPoint(m_pMainView->GetViewSetup()->origin);
#else
return engine->IsSkyboxVisibleFromPoint(origin);
#endif
}


Expand Down Expand Up @@ -5334,10 +5365,13 @@ void CSkyboxView::DrawInternal( view_id_t iSkyBoxViewID, bool bInvokePreAndPostR
m_pSky3dParams->fog.farz );
}
else
zNear = 2.0;

zFar = MAX_TRACE_LENGTH * 2; // Double up zFar to fix 3D skyboxes in water
#else
zNear = 2.0;
#endif
zFar = MAX_TRACE_LENGTH;
#endif

// scale origin by sky scale
if ( m_pSky3dParams->scale > 0 )
Expand Down Expand Up @@ -6079,6 +6113,12 @@ void CBaseWorldView::DrawExecute( float waterHeight, view_id_t viewID, float wat

if ( m_DrawFlags & DF_DRAW_ENTITITES )
{
#ifdef MAPBASE
// Render 3D skybox in water reflection only when rendering entities
if (viewID == VIEW_REFLECTION)
Draw3DSkybox();
#endif

DrawWorld( waterZAdjust );
DrawOpaqueRenderables( DepthMode );

Expand Down
4 changes: 4 additions & 0 deletions sp/src/game/client/viewrender.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,10 @@ class CRendering3dView : public CBase3dView

void DrawWorld( float waterZAdjust );

#ifdef MAPBASE
void Draw3DSkybox();
#endif

// Draws all opaque/translucent renderables in leaves that were rendered
void DrawOpaqueRenderables( ERenderDepthMode DepthMode );
void DrawTranslucentRenderables( bool bInSkybox, bool bShadowDepth );
Expand Down