From 6c75a9091112be82645c352631b6a4d30b874425 Mon Sep 17 00:00:00 2001 From: Dexter Date: Tue, 18 Mar 2014 06:38:15 +0000 Subject: [PATCH] made shader editor WIN32 only, sources arent included on linux atm and dont build --- mp/src/game/client/client_ff.vpc | 5 +++++ mp/src/game/client/viewrender.cpp | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/mp/src/game/client/client_ff.vpc b/mp/src/game/client/client_ff.vpc index 25a781fe..948bc2af 100644 --- a/mp/src/game/client/client_ff.vpc +++ b/mp/src/game/client/client_ff.vpc @@ -113,5 +113,10 @@ $Project "Client (FF)" //$File "$SRCDIR\game\client\ShaderEditor\Grass\CGrassCluster.cpp" } } + $Folder "Shader Libraries" + { + $Lib mathlib + $Lib shaderlib + } } } diff --git a/mp/src/game/client/viewrender.cpp b/mp/src/game/client/viewrender.cpp index ec48f115..a8ec8883 100644 --- a/mp/src/game/client/viewrender.cpp +++ b/mp/src/game/client/viewrender.cpp @@ -77,8 +77,9 @@ // Projective textures #include "C_Env_Projected_Texture.h" +#if defined (WIN32) #include "ShaderEditor/ShaderEditorSystem.h" // FF --> hlstriker: Added - +#endif // memdbgon must be the last include file in a .cpp file!!! #include "tier0/memdbgon.h" @@ -1368,11 +1369,13 @@ void CViewRender::ViewDrawScene( bool bDrew3dSkybox, SkyboxVisibility_t nSkyboxV DrawWorldAndEntities( drawSkybox, view, nClearFlags, pCustomVisibility ); // FF --> hlstriker: Added +#if defined (WIN32) VisibleFogVolumeInfo_t fogVolumeInfo; render->GetVisibleFogVolume( view.origin, &fogVolumeInfo ); WaterRenderInfo_t info; DetermineWaterRenderInfo( fogVolumeInfo, info ); g_ShaderEditorSystem->CustomViewRender( &g_CurrentViewID, fogVolumeInfo, info ); +#endif // <-- // Disable fog for the rest of the stuff @@ -2001,7 +2004,9 @@ void CViewRender::RenderView( const CViewSetup &view, int nClearFlags, int whatT if ( ( bDrew3dSkybox = pSkyView->Setup( view, &nClearFlags, &nSkyboxVisible ) ) != false ) { AddViewToScene( pSkyView ); +#if defined (WIN32) g_ShaderEditorSystem->UpdateSkymask(); // FF --> hlstriker: Added +#endif } SafeRelease( pSkyView ); @@ -2059,7 +2064,9 @@ void CViewRender::RenderView( const CViewSetup &view, int nClearFlags, int whatT // Now actually draw the viewmodel DrawViewModels( view, whatToDraw & RENDERVIEW_DRAWVIEWMODEL ); +#if defined (WIN32) g_ShaderEditorSystem->UpdateSkymask( bDrew3dSkybox ); // FF --> hlstriker: Added +#endif DrawUnderwaterOverlay(); @@ -2097,8 +2104,9 @@ void CViewRender::RenderView( const CViewSetup &view, int nClearFlags, int whatT } pRenderContext.SafeRelease(); } - +#if defined (WIN32) g_ShaderEditorSystem->CustomPostRender(); // FF --> hlstriker: Added +#endif // And here are the screen-space effects