quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* render Q3 shader based skyboxes

Browse Source 
logic: load 6 skybox textures when shader gets used by scene, don't unload dynamically, just on 'flush'
texture browser only uses normal preview image and doesn't trigger potentially heavy box loading
also fix R_ResampleTexture for [2+x upscaling
This commit is contained in:
Garux
2022-07-18 10:05:19 +03:00
parent 22377bb255
commit d3e48d8c31
11 changed files with 219 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/shaders/shaders.cpp
View File

@@ -279,6 +279,7 @@ public:
ShaderParameters m_params;
TextureExpression m_textureName;
TextureExpression m_skyBox;
TextureExpression m_diffuse;
TextureExpression m_bump;
ShaderValue m_heightmapScale;
@@ -838,6 +839,7 @@ class CShader : public IShader
CopiedString m_Name;
qtexture_t* m_pTexture;
qtexture_t* m_pSkyBox;
qtexture_t* m_notfound;
qtexture_t* m_pDiffuse;
float m_heightmapScale;
@@ -860,6 +862,7 @@ public:
m_blendFunc( BLEND_SRC_ALPHA, BLEND_ONE_MINUS_SRC_ALPHA ),
m_bInUse( false ){
m_pTexture = 0;
m_pSkyBox = 0;
m_pDiffuse = 0;
m_pBump = 0;
m_pSpecular = 0;
@@ -893,6 +896,13 @@ public:
qtexture_t* getTexture() const {
return m_pTexture;
}
qtexture_t* getSkyBox() override {
/* load skybox if only used */
if( m_pSkyBox == nullptr && !m_template.m_skyBox.empty() )
m_pSkyBox = GlobalTexturesCache().capture( LoadImageCallback( 0, GlobalTexturesCache().defaultLoader().m_func, true ), m_template.m_skyBox.c_str() );
return m_pSkyBox;
}
qtexture_t* getDiffuse() const {
return m_pDiffuse;
}
@@ -966,6 +976,10 @@ public:
GlobalTexturesCache().release( m_notfound );
}
if ( m_pSkyBox != 0 ) {
GlobalTexturesCache().release( m_pSkyBox );
}
unrealiseLighting();
}
@@ -1220,6 +1234,18 @@ bool ShaderTemplate::parseQuake3( Tokeniser& tokeniser ){
RETURN_FALSE_IF_FAIL( Tokeniser_getFloat( tokeniser, m_AlphaRef ) );
}
else if ( string_equal_nocase( token, "skyparms" ) ) {
const char* sky = tokeniser.getToken();
if ( sky == 0 ) {
Tokeniser_unexpectedError( tokeniser, sky, "#skyparms" );
return false;
}
if( !string_equal( sky, "-" ) ){
m_skyBox = sky;
}
}
else if ( string_equal_nocase( token, "cull" ) ) {
const char* cull = tokeniser.getToken();