Browse Source

Updates names of probe forward shader consts to be consistent with shadergen, allowing proper data throughput

Jeff Raab 6 years ago
parent
commit
38b0d0f1fe

+ 2 - 2
Engine/source/renderInstance/renderProbeMgr.cpp

@@ -642,8 +642,8 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
          Point3F refBoxMin = refPos - curEntry.mProbeRefScale/2 * curEntry.getTransform().getScale();
          Point3F refBoxMax = refPos + curEntry.mProbeRefScale/2 * curEntry.getTransform().getScale();
 
-         refBoxMinArray[mEffectiveProbeCount] = Point4F(refBoxMin.x, refBoxMin.y, refBoxMin.z, 0);
-         refBoxMaxArray[mEffectiveProbeCount] = Point4F(refBoxMax.x, refBoxMax.y, refBoxMax.z, 0);
+         refBoxMinArray[effectiveProbeCount] = Point4F(refBoxMin.x, refBoxMin.y, refBoxMin.z, 0);
+         refBoxMaxArray[effectiveProbeCount] = Point4F(refBoxMax.x, refBoxMax.y, refBoxMax.z, 0);
          probeConfigArray[effectiveProbeCount] = Point4F(curEntry.mProbeShapeType,
             curEntry.mRadius,
             curEntry.mAtten,

+ 2 - 2
Engine/source/shaderGen/shaderGenVars.cpp

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

+ 1 - 0
Tools/CMake/torque3d.cmake

@@ -72,6 +72,7 @@ if(WIN32)
     set(ALSOFT_NO_CONFIG_UTIL OFF CACHE BOOL "Disable building the alsoft-config utility" FORCE)
     set(ALSOFT_HRTF_DEFS OFF CACHE BOOL "Install HRTF definition files" FORCE)
     set(ALSOFT_AMBDEC_PRESETS OFF CACHE BOOL "Install AmbDec presets" FORCE)
+    set(ALSOFT_EMBED_HRTF_DATA OFF CACHE BOOL "Embed the HRTF data (increases library footprint)" FORCE)
     
     add_subdirectory( ${libDir}/openal-soft ${CMAKE_CURRENT_BINARY_DIR}/openal-soft)
 endif()