TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
Jeff Raab 2019-07-16 09:34:31 -05:00
parent ee01ff54d4
commit c873d534c7
8 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/renderInstance/renderProbeMgr.cpp
View file

@ -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,

4
Engine/source/shaderGen/shaderGenVars.cpp
View file

@ -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");

12
Templates/BaseGame/game/data/pbr/levels/PbrMatTest.mis
View file

@ -86,7 +86,7 @@ new Scene(PbrMatTestLevel) {
surfaceTexture = "Floor_Material";
surface = "0 0 0 1 0 0 0.5 1 0 0 1 1 0 1 1";
surface = "0 1 0 0 0 0 -0.5 1 0 0 1 1 0 1 1";
surface = "0.707107 0 0 0.707107 0 4 0 1 0 0 1 1 0 1 1";
surface = "0.707107 0 0 0.707106 0 4 0 1 0 0 1 1 0 1 1";
surface = "0 0.707107 -0.707107 0 0 -4 -2.27374e-13 1 0 0 1 1 0 1 1";
surface = "0.5 0.5 -0.5 0.5 -4 0 -1.49012e-08 1 0 0 1 1 0 1 1";
surface = "0.5 -0.5 0.5 0.5 4 0 -1.49012e-08 1 0 0 1 1 0 1 1";
@ -266,7 +266,7 @@ new Scene(PbrMatTestLevel) {
surface = "0 0 0 1 0 0 0.837898 0 0 0 1 1 0 1 1";
surface = "0 1 0 0 0 0 -0.837898 0 0 0 1 1 0 1 1";
surface = "0.707107 0 0 0.707106 0 0.847632 0 0 0 0 1 1 0 1 1";
surface = "0.707107 0 0 0.707107 0 0.847632 0 0 0 0 1 1 0 1 1";
surface = "0 0.707107 -0.707107 0 0 -0.847632 0 0 0 0 1 1 0 1 1";
surface = "0.5 0.5 -0.5 0.5 -0.412576 0 -1.53859e-07 0 0 0 1 1 0 1 1";
surface = "0.5 -0.5 0.5 0.5 0.412576 0 -1.53859e-07 0 0 0 1 1 0 1 1";
@ -274,15 +274,15 @@ new Scene(PbrMatTestLevel) {
new BoxEnvironmentProbe() {
Enabled = "1";
refOffset = "0 0 0";
refScale = "10 10 10";
refScale = "5 5 5";
ReflectionMode = "Baked Cubemap";
position = "-0.0463406 0.0380459 2.23039";
position = "1.36811 -1.0083 2.23039";
rotation = "1 0 0 0";
scale = "10 10 10";
scale = "5 5 5";
canSave = "1";
canSaveDynamicFields = "1";
persistentId = "29579d61-9b0f-11e9-b718-be72e303d0f8";
attenuation = "1";
attenuation = "0";
};
new PointLight() {
radius = "5";

BIN
Templates/BaseGame/game/data/pbr/levels/PbrMatTest/probes/1703285932_Irradiance.dds
View file

Binary file not shown.

BIN
Templates/BaseGame/game/data/pbr/levels/PbrMatTest/probes/1703285932_Prefilter.dds
View file

Binary file not shown.

BIN
Templates/BaseGame/game/data/pbr/levels/PbrMatTest/probes/693653254_Irradiance.dds
View file

Binary file not shown.

BIN
Templates/BaseGame/game/data/pbr/levels/PbrMatTest/probes/693653254_Prefilter.dds
View file

Binary file not shown.

1
Tools/CMake/torque3d.cmake
View file

@ -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()