zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-15 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

- pull cvar uniform fixes from gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2022-02-09 07:26:59 -05:00
parent c2b35fee41
commit 0d54237eec
1 changed files with 33 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
source/core/r_data/gldefs.cpp
View file

@ -48,6 +48,7 @@
#include "hwrenderer/postprocessing/hw_postprocessshader.h"
#include "hw_material.h"
#include "texturemanager.h"
#include "gameconfigfile.h"
#if 0
void AddLightDefaults(FLightDefaults *defaults, double attnFactor);
@ -59,12 +60,14 @@ extern TDeletingArray<FLightDefaults *> LightDefaults;
extern int AttenuationIsSet;
#endif
bool addedcvars = false;
struct ExtraUniformCVARData
{
FString Shader;
FString Uniform;
double* vec4 = nullptr;
ExtraUniformCVARData* Next;
};
static void do_uniform_set(float value, ExtraUniformCVARData* data)
@ -88,6 +91,8 @@ static void do_uniform_set(float value, ExtraUniformCVARData* data)
vec4[2] = 0.0;
vec4[3] = 1.0;
}
if (data->Next)
do_uniform_set(value, data->Next);
}
void uniform_callback_int(FIntCVar &self)
@ -1528,6 +1533,7 @@ class GLDefsParser
if (is_cvar)
{
addedcvars = true;
if (!shaderdesc.Name.GetChars())
sc.ScriptError("Shader must have a name to use cvar uniforms");
@ -1553,36 +1559,53 @@ class GLDefsParser
sc.MustGetString();
cvarname = sc.String;
cvar = FindCVar(cvarname, NULL);
UCVarValue oldval;
UCVarValue val;
ExtraUniformCVARData* oldextra = nullptr;
sc.MustGetFloat();
val.Float = oldval.Float = sc.Float;
if (!cvar)
{
cvar = C_CreateCVar(cvarname, cvartype, cvarflags);
}
else if (cvar && (((cvar->GetFlags()) & CVAR_MOD) == CVAR_MOD))
{
// this value may have been previously loaded
oldval.Float = cvar->GetGenericRep(CVAR_Float).Float;
oldextra = (ExtraUniformCVARData*)cvar->GetExtraDataPointer();
}
if (!(cvar->GetFlags() & CVAR_MOD))
{
if (!((cvar->GetFlags() & (CVAR_AUTO | CVAR_UNSETTABLE)) == (CVAR_AUTO | CVAR_UNSETTABLE)))
sc.ScriptError("CVAR '%s' already in use!", cvarname.GetChars());
}
UCVarValue val;
sc.MustGetFloat();
val.Float = sc.Float;
// must've picked this up from an autoexec.cfg, handle accordingly
if (cvar && ((cvar->GetFlags() & (CVAR_MOD|CVAR_AUTO|CVAR_UNSETTABLE)) == (CVAR_AUTO | CVAR_UNSETTABLE)))
{
val = cvar->GetGenericRep(CVAR_Float);
oldval.Float = cvar->GetGenericRep(CVAR_Float).Float;
oldextra = (ExtraUniformCVARData*)cvar->GetExtraDataPointer();
delete cvar;
cvar = C_CreateCVar(cvarname, cvartype, cvarflags);
}
shaderdesc.Uniforms[uniformName].Values[0] = sc.Number;
shaderdesc.Uniforms[uniformName].Values[0] = oldval.Float;
cvar->SetGenericRepDefault(val, CVAR_Float);
if (val.Float != oldval.Float) // it's not default anymore
cvar->SetGenericRep(oldval.Float, CVAR_Float);
if (callback)
cvar->SetCallback(callback);
ExtraUniformCVARData* extra = new ExtraUniformCVARData;
extra->Shader = shaderdesc.Name.GetChars();
extra->Uniform = uniformName.GetChars();
extra->Next = oldextra;
cvar->SetExtraDataPointer(extra);
}
}
@ -1844,6 +1867,9 @@ public:
sc.SavePos();
if (!sc.GetToken ())
{
// *** fixme! need to load from config file
//if (addedcvars)
// GameConfig->DoModSetup (gameinfo.ConfigName);
return;
}
type = sc.MatchString(CoreKeywords);