From aad37bc0f516b32d114fae46a49dc3e87631abdd Mon Sep 17 00:00:00 2001
From: Areloch <areloch@gmail.com>
Date: Wed, 10 Oct 2018 01:52:19 -0500
Subject: [PATCH] Corrected some missed bits in the template, and a check in
 the forward-lit probes

---
 Engine/source/lighting/probeManager.cpp       |  3 +
 .../Full/game/core/art/grids/materials.cs     |  6 +-
 Templates/Full/game/levels/AProbeTest.mis     | 64 ++++++++++++-------
 3 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/Engine/source/lighting/probeManager.cpp b/Engine/source/lighting/probeManager.cpp
index 3e05d86ae..8f4c6719a 100644
--- a/Engine/source/lighting/probeManager.cpp
+++ b/Engine/source/lighting/probeManager.cpp
@@ -345,6 +345,9 @@ void ProbeManager::_update4ProbeConsts(   const SceneData &sgData,
          if (!probe)
             continue;
 
+         if (!probe->mIsEnabled)
+            continue;
+
          // The light positions and spot directions are 
          // in SoA order to make optimal use of the GPU.
          const Point3F &probePos = probe->getPosition();
diff --git a/Templates/Full/game/core/art/grids/materials.cs b/Templates/Full/game/core/art/grids/materials.cs
index 99078ddfa..00039aa17 100644
--- a/Templates/Full/game/core/art/grids/materials.cs
+++ b/Templates/Full/game/core/art/grids/materials.cs
@@ -30,14 +30,12 @@ singleton Material( Grid512_Black_Mat )
 singleton Material( Grid512_Blue_Mat )
 {
    mapTo = "Grid512_Blue_Mat";
-   diffuseMap[0] = "512_blue";
+   diffuseMap[0] = "core/art/grids/512_blue";
    materialTag0 = "TestMaterial";
    smoothness[0] = "1";
    metalness[0] = "0.803922";
    translucent = "1";
    translucentBlendOp = "Add";
-   diffuseColor[0] = "1 1 1 1";
-   effectColor[1] = "InvisibleBlack";
 };
 
 singleton Material( Grid512_ForestGreen_Mat )
@@ -68,7 +66,7 @@ singleton Material( Grid512_Green_Mat )
 singleton Material( Grid512_Grey_Mat )
 {
    mapTo = "Grid512_Grey_Mat";
-   diffuseMap[0] = "512_grey";
+   diffuseMap[0] = "core/art/grids/512_grey";
    materialTag0 = "TestMaterial";
 };
 
diff --git a/Templates/Full/game/levels/AProbeTest.mis b/Templates/Full/game/levels/AProbeTest.mis
index 65d58f5e2..aa9d3effd 100644
--- a/Templates/Full/game/levels/AProbeTest.mis
+++ b/Templates/Full/game/levels/AProbeTest.mis
@@ -38,15 +38,20 @@ new SimGroup(MissionGroup) {
       canSaveDynamicFields = "1";
    };
    new Skylight() {
-      enabled = "1";
+      enabled = "0";
+      ProbeShape = "Box";
+      radius = "10";
+      posOffset = "0 0 0";
+      ReflectionMode = "Static Cubemap";
+      reflectionPath = "levels/AProbeTest/probes/";
       StaticCubemap = "sky_day_hdr_cubemap";
+      Bake = "0";
       position = "0 0 0";
       rotation = "1 0 0 0";
       scale = "1 1 1";
       canSave = "1";
       canSaveDynamicFields = "1";
       persistentId = "e4c73467-4089-11e8-b478-cd227cd60b8b";
-         reflectionPath = "levels/AProbeTest/probes/";
    };
    new SimGroup(PlayerDropPoints) {
       canSave = "1";
@@ -105,10 +110,10 @@ new SimGroup(MissionGroup) {
       shadowType = "PSSM";
       texSize = "512";
       overDarkFactor = "2000 1000 500 100";
-      shadowDistance = "400";
+      shadowDistance = "200";
       shadowSoftness = "0.15";
       numSplits = "4";
-      logWeight = "0.91";
+      logWeight = "0.95";
       fadeStartDistance = "0";
       lastSplitTerrainOnly = "0";
       representedInLightmap = "0";
@@ -122,13 +127,14 @@ new SimGroup(MissionGroup) {
          direction = "1 1 -1";
    };
    new ReflectionProbe() {
-      enabled = "0";
-      ProbeShape = "Sphere";
-      radius = "10";
+      enabled = "1";
+      ProbeShape = "Box";
+      radius = "5";
+      posOffset = "0 0 0";
       ReflectionMode = "Baked Cubemap";
       reflectionPath = "levels/probeTest/probes/";
       Bake = "0";
-      position = "0 0.559989 4.53387";
+      position = "0 0.0825528 4.53387";
       rotation = "1 0 0 0";
       scale = "5 5 5";
       canSave = "1";
@@ -276,24 +282,36 @@ new SimGroup(MissionGroup) {
       canSave = "1";
       canSaveDynamicFields = "1";
    };
-   new ReflectionProbe() {
-      enabled = "0";
-      ProbeShape = "Box";
-      radius = "10";
-      ReflectionMode = "Baked Cubemap";
-      reflectionPath = "levels/probeTest/probes/";
-      Bake = "0";
-      position = "15.4549 0.559989 4.53387";
+   new PointLight() {
+      radius = "40";
+      isEnabled = "0";
+      color = "1 0.991102 1 1";
+      brightness = "1";
+      castShadows = "1";
+      staticRefreshFreq = "250";
+      dynamicRefreshFreq = "8";
+      priority = "1";
+      animate = "1";
+      animationPeriod = "1";
+      animationPhase = "1";
+      flareScale = "1";
+      attenuationRatio = "0 1 1";
+      shadowType = "CubeMap";
+      texSize = "512";
+      overDarkFactor = "2000 1000 500 100";
+      shadowDistance = "400";
+      shadowSoftness = "0.15";
+      numSplits = "1";
+      logWeight = "0.91";
+      fadeStartDistance = "0";
+      lastSplitTerrainOnly = "0";
+      representedInLightmap = "0";
+      shadowDarkenColor = "0 0 0 -1";
+      includeLightmappedGeometryInShadow = "0";
+      position = "0.351732 -18.4016 4.53337";
       rotation = "1 0 0 0";
-      scale = "5 5 5";
       canSave = "1";
       canSaveDynamicFields = "1";
-      persistentId = "4ec88e62-4e8f-11e8-ae68-993c6bb8eb5b";
-         GroundColor = "0.8 0.7 0.5 1";
-         IndirectLight = "1 1 1 1";
-         IndirectLightMode = "Spherical Harmonics";
-         Intensity = "1";
-         SkyColor = "0.5 0.5 1 1";
    };
 };
 //--- OBJECT WRITE END ---