nomenclature shift for clarity: bunch of stuff tagged as probe that refferenced things properly tied conceptually to the reflection refrence box.

This commit is contained in:
AzaezelX 2019-06-28 10:21:50 -05:00
parent 261bcd9a45
commit 01f6938746
8 changed files with 45 additions and 48 deletions

View file

@ -2927,12 +2927,12 @@ void ReflectionProbeFeatGLSL::processPix(Vector<ShaderComponent*>& componentList
inRefPosArray->uniform = true;
inRefPosArray->constSortPos = cspPotentialPrimitive;
Var * bbMinArray = new Var("inProbeBoxMin", "vec4");
Var * bbMinArray = new Var("inRefBoxMin", "vec4");
bbMinArray->arraySize = MAX_FORWARD_PROBES;
bbMinArray->uniform = true;
bbMinArray->constSortPos = cspPotentialPrimitive;
Var * bbMaxArray = new Var("inProbeBoxMax", "vec4");
Var * bbMaxArray = new Var("inRefBoxMax", "vec4");
bbMaxArray->arraySize = MAX_FORWARD_PROBES;
bbMaxArray->uniform = true;
bbMaxArray->constSortPos = cspPotentialPrimitive;

View file

@ -3002,12 +3002,12 @@ void ReflectionProbeFeatHLSL::processPix(Vector<ShaderComponent*> &componentList
inRefPosArray->uniform = true;
inRefPosArray->constSortPos = cspPotentialPrimitive;
Var *bbMinArray = new Var("inProbeBoxMin", "float4");
Var *bbMinArray = new Var("inRefBoxMin", "float4");
bbMinArray->arraySize = MAX_FORWARD_PROBES;
bbMinArray->uniform = true;
bbMinArray->constSortPos = cspPotentialPrimitive;
Var *bbMaxArray = new Var("inProbeBoxMax", "float4");
Var *bbMaxArray = new Var("inRefBoxMax", "float4");
bbMaxArray->arraySize = MAX_FORWARD_PROBES;
bbMaxArray->uniform = true;
bbMaxArray->constSortPos = cspPotentialPrimitive;

View file

@ -72,8 +72,8 @@ const String ShaderGenVars::metalness("$metalness");
//Reflection Probes
const String ShaderGenVars::probePosition("$inProbePosArray");
const String ShaderGenVars::probeRefPos("$inRefPosArray");
const String ShaderGenVars::probeBoxMin("$inProbeBoxMin");
const String ShaderGenVars::probeBoxMax("$inProbeBoxMax");
const String ShaderGenVars::refBoxMin("$inProbeBoxMin");
const String ShaderGenVars::refBoxMax("$inProbeBoxMax");
const String ShaderGenVars::worldToObjArray("$worldToObjArray");
const String ShaderGenVars::probeConfigData("$probeConfigData");
const String ShaderGenVars::specularCubemapAR("$specularCubemapAR");

View file

@ -85,8 +85,8 @@ struct ShaderGenVars
//Reflection Probes
const static String probePosition;
const static String probeRefPos;
const static String probeBoxMin;
const static String probeBoxMax;
const static String refBoxMin;
const static String refBoxMax;
const static String worldToObjArray;
const static String probeConfigData;
const static String specularCubemapAR;