Merge branch 'Preview4_0' of https://github.com/Areloch/Torque3D into Preview4_0

Engine/source/T3D/assets/GUIAsset.cpp

@@ -47,14 +47,14 @@
 
 IMPLEMENT_CONOBJECT(GUIAsset);
 
-ConsoleType(GUIAssetPtr, TypeGUIAssetPtr, GUIAsset, ASSET_ID_FIELD_PREFIX)
+ConsoleType(GUIAssetPtr, TypeGUIAssetPtr, String, ASSET_ID_FIELD_PREFIX)
 
 //-----------------------------------------------------------------------------
 
 ConsoleGetType(TypeGUIAssetPtr)
 {
    // Fetch asset Id.
-   return (*((AssetPtr<GUIAsset>*)dptr)).getAssetId();
+   return *((StringTableEntry*)dptr);
 }
 
 //-----------------------------------------------------------------------------
@@ -67,19 +67,11 @@ ConsoleSetType(TypeGUIAssetPtr)
       // Yes, so fetch field value.
       const char* pFieldValue = argv[0];
 
-      // Fetch asset pointer.
+      // Fetch asset Id.
-      AssetPtr<GUIAsset>* pAssetPtr = dynamic_cast<AssetPtr<GUIAsset>*>((AssetPtrBase*)(dptr));
+      StringTableEntry* assetId = (StringTableEntry*)(dptr);
 
-      // Is the asset pointer the correct type?
+      // Update asset value.
-      if (pAssetPtr == NULL)
+      *assetId = StringTable->insert(pFieldValue);
-      {
-         // No, so fail.
-         //Con::warnf("(TypeGUIAssetPtr) - Failed to set asset Id '%d'.", pFieldValue);
-         return;
-      }
-
-      // Set asset.
-      pAssetPtr->setAssetId(pFieldValue);
 
       return;
    }
@@ -268,4 +260,4 @@ bool GuiInspectorTypeGUIAssetPtr::updateRects()
    }
 
    return resized;
-}
+}

Engine/source/T3D/assets/GameObjectAsset.cpp

@@ -225,8 +225,6 @@ const char* GameObjectAsset::create()
    //Entity* e = dynamic_cast<Entity*>(pSimObject);
    //e->_setGameObject(getAssetId());
 
-   StringTableEntry assetId = getAssetId();
-
    pSimObject->setDataField(StringTable->insert("GameObject"), nullptr, getAssetId());
 
    return pSimObject->getIdString();

Engine/source/T3D/assets/ImageAsset.cpp

@@ -47,14 +47,14 @@
 
 IMPLEMENT_CONOBJECT(ImageAsset);
 
-ConsoleType(ImageAssetPtr, TypeImageAssetPtr, ImageAsset, ASSET_ID_FIELD_PREFIX)
+ConsoleType(ImageAssetPtr, TypeImageAssetPtr, String, ASSET_ID_FIELD_PREFIX)
 
 //-----------------------------------------------------------------------------
 
 ConsoleGetType(TypeImageAssetPtr)
 {
    // Fetch asset Id.
-   return (*((AssetPtr<ImageAsset>*)dptr)).getAssetId();
+   return *((StringTableEntry*)dptr);
 }
 
 //-----------------------------------------------------------------------------
@@ -67,19 +67,11 @@ ConsoleSetType(TypeImageAssetPtr)
       // Yes, so fetch field value.
       const char* pFieldValue = argv[0];
 
-      // Fetch asset pointer.
+      // Fetch asset Id.
-      AssetPtr<ImageAsset>* pAssetPtr = dynamic_cast<AssetPtr<ImageAsset>*>((AssetPtrBase*)(dptr));
+      StringTableEntry* assetId = (StringTableEntry*)(dptr);
 
-      // Is the asset pointer the correct type?
+      // Update asset value.
-      if (pAssetPtr == NULL)
+      *assetId = StringTable->insert(pFieldValue);
-      {
-         // No, so fail.
-         //Con::warnf("(TypeImageAssetPtr) - Failed to set asset Id '%d'.", pFieldValue);
-         return;
-      }
-
-      // Set asset.
-      pAssetPtr->setAssetId(pFieldValue);
 
       return;
    }

Engine/source/T3D/assets/LevelAsset.cpp

@@ -47,14 +47,14 @@
 
 IMPLEMENT_CONOBJECT(LevelAsset);
 
-ConsoleType(LevelAssetPtr, TypeLevelAssetPtr, LevelAsset, ASSET_ID_FIELD_PREFIX)
+ConsoleType(LevelAssetPtr, TypeLevelAssetPtr, String, ASSET_ID_FIELD_PREFIX)
 
 //-----------------------------------------------------------------------------
 
 ConsoleGetType(TypeLevelAssetPtr)
 {
    // Fetch asset Id.
-   return (*((AssetPtr<LevelAsset>*)dptr)).getAssetId();
+   return *((StringTableEntry*)dptr);
 }
 
 //-----------------------------------------------------------------------------
@@ -67,19 +67,11 @@ ConsoleSetType(TypeLevelAssetPtr)
       // Yes, so fetch field value.
       const char* pFieldValue = argv[0];
 
-      // Fetch asset pointer.
+      // Fetch asset Id.
-      AssetPtr<LevelAsset>* pAssetPtr = dynamic_cast<AssetPtr<LevelAsset>*>((AssetPtrBase*)(dptr));
+      StringTableEntry* assetId = (StringTableEntry*)(dptr);
 
-      // Is the asset pointer the correct type?
+      // Update asset value.
-      if (pAssetPtr == NULL)
+      *assetId = StringTable->insert(pFieldValue);
-      {
-         // No, so fail.
-         //Con::warnf("(TypeLevelAssetPtr) - Failed to set asset Id '%d'.", pFieldValue);
-         return;
-      }
-
-      // Set asset.
-      pAssetPtr->setAssetId(pFieldValue);
 
       return;
    }
@@ -121,6 +113,9 @@ void LevelAsset::initPersistFields()
    addField("LevelName", TypeString, Offset(mLevelName, LevelAsset), "Human-friendly name for the level.");
    addProtectedField("PreviewImage", TypeAssetLooseFilePath, Offset(mPreviewImage, LevelAsset),
       &setPreviewImageFile, &getPreviewImageFile, "Path to the image used for selection preview.");
+
+   addField("isSubScene", TypeString, Offset(mIsSubLevel, LevelAsset), "Is this a sublevel to another Scene");
+   addField("gameModeName", TypeString, Offset(mGamemodeName, LevelAsset), "Name of the Game Mode to be used with this level");
 }
 
 //------------------------------------------------------------------------------

Engine/source/T3D/assets/LevelAsset.h

@@ -51,6 +51,8 @@ class LevelAsset : public AssetBase
    bool                    mIsSubLevel;
    StringTableEntry        mMainLevelAsset;
 
+   StringTableEntry        mGamemodeName;
+
 public:
    LevelAsset();
    virtual ~LevelAsset();

Engine/source/T3D/lighting/boxEnvironmentProbe.cpp

@@ -122,24 +122,12 @@ void BoxEnvironmentProbe::onRemove()
    Parent::onRemove();
 }
 
-void BoxEnvironmentProbe::setTransform(const MatrixF & mat)
-{
-   // Let SceneObject handle all of the matrix manipulation
-   Parent::setTransform(mat);
-
-   mDirty = true;
-
-   // Dirty our network mask so that the new transform gets
-   // transmitted to the client object
-   setMaskBits(TransformMask);
-}
-
 U32 BoxEnvironmentProbe::packUpdate(NetConnection *conn, U32 mask, BitStream *stream)
 {
    // Allow the Parent to get a crack at writing its info
    U32 retMask = Parent::packUpdate(conn, mask, stream);
 
-   if (stream->writeFlag(mask & UpdateMask))
+   if (stream->writeFlag(mask & StaticDataMask))
    {
       stream->write(mAtten);
    }
@@ -152,7 +140,7 @@ void BoxEnvironmentProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
    // Let the Parent read any info it sent
    Parent::unpackUpdate(conn, stream);
 
-   if (stream->readFlag())  // UpdateMask
+   if (stream->readFlag())  // StaticDataMask
    {
       stream->read(&mAtten);
    }
@@ -164,17 +152,11 @@ void BoxEnvironmentProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
 
 void BoxEnvironmentProbe::updateProbeParams()
 {
-   Parent::updateProbeParams();
+   mProbeShapeType = ProbeRenderInst::Box;
-
-   mProbeInfo->mProbeShapeType = ProbeRenderInst::Box;
    mProbeInfo->mAtten = mAtten;
-
-   PROBEMGR->updateProbes();
-
-   updateCubemaps();
 }
 
 void BoxEnvironmentProbe::setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat)
 {
    Parent::setPreviewMatParameters(renderState, mat);
-}
+}

Engine/source/T3D/lighting/boxEnvironmentProbe.h

@@ -87,9 +87,6 @@ public:
    bool onAdd();
    void onRemove();
 
-   // Override this so that we can dirty the network flag when it is called
-   void setTransform(const MatrixF &mat);
-
    // This function handles sending the relevant data from the server
    // object to the client object
    U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
@@ -113,4 +110,4 @@ public:
    void setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat);
 };
 
-#endif // BOX_ENVIRONMENT_PROBE_H
+#endif // BOX_ENVIRONMENT_PROBE_H

Engine/source/T3D/lighting/reflectionProbe.cpp

@@ -104,6 +104,7 @@ ReflectionProbe::ReflectionProbe()
    mEnabled = true;
    mBake = false;
    mDirty = false;
+   mCubemapDirty = false;
 
    mRadius = 10;
    mObjScale = Point3F::One * 10;
@@ -134,8 +135,6 @@ ReflectionProbe::ReflectionProbe()
    mProbeRefOffset = Point3F::Zero;
    mEditPosOffset = false;
 
-   mProbeInfoIdx = -1;
-
    mCaptureMask = REFLECTION_PROBE_CAPTURE_TYPEMASK;
 }
 
@@ -292,7 +291,9 @@ bool ReflectionProbe::onAdd()
    // Refresh this object's material (if any)
    if (isClientObject())
    {
-      createGeometry();
+      if (!createClientResources())
+         return false;
+
       updateProbeParams();
    }
   
@@ -305,8 +306,9 @@ void ReflectionProbe::onRemove()
 {
    if (isClientObject())
    {
-      PROBEMGR->unregisterProbe(mProbeInfoIdx);
+      PROBEMGR->unregisterProbe(mProbeInfo->mProbeIdx);
    }
+
    // Remove this object from the scene
    removeFromScene();
 
@@ -318,16 +320,19 @@ void ReflectionProbe::handleDeleteAction()
    //we're deleting it?
    //Then we need to clear out the processed cubemaps(if we have them)
 
-   String prefilPath = getPrefilterMapPath();
+   if (mReflectionModeType != StaticCubemap)
-   if (Platform::isFile(prefilPath))
    {
-      Platform::fileDelete(prefilPath);
+      String prefilPath = getPrefilterMapPath();
-   }
+      if (Platform::isFile(prefilPath))
+      {
+         Platform::fileDelete(prefilPath);
+      }
 
-   String irrPath = getIrradianceMapPath();
+      String irrPath = getIrradianceMapPath();
-   if (Platform::isFile(irrPath))
+      if (Platform::isFile(irrPath))
-   {
+      {
-      Platform::fileDelete(irrPath);
+         Platform::fileDelete(irrPath);
+      }
    }
 
    Parent::handleDeleteAction();
@@ -406,19 +411,13 @@ U32 ReflectionProbe::packUpdate(NetConnection *conn, U32 mask, BitStream *stream
       mathWrite(*stream, mProbeRefScale);
    }
 
-   if (stream->writeFlag(mask & ShapeTypeMask))
+   if (stream->writeFlag(mask & StaticDataMask))
    {
       stream->write((U32)mProbeShapeType);
-   }
-
-   if (stream->writeFlag(mask & UpdateMask))
-   {
       stream->write(mRadius);
-   }
-
-   if (stream->writeFlag(mask & BakeInfoMask))
-   {
       stream->write(mProbeUniqueID);
+      stream->write((U32)mReflectionModeType);
+      stream->write(mCubemapName);
    }
 
    if (stream->writeFlag(mask & EnabledMask))
@@ -426,16 +425,6 @@ U32 ReflectionProbe::packUpdate(NetConnection *conn, U32 mask, BitStream *stream
       stream->writeFlag(mEnabled);
    }
 
-   if (stream->writeFlag(mask & ModeMask))
-   {
-      stream->write((U32)mReflectionModeType);
-   }
-
-   if (stream->writeFlag(mask & CubemapMask))
-   {
-      stream->write(mCubemapName);
-   }
-
    return retMask;
 }
 
@@ -460,28 +449,28 @@ void ReflectionProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
       mDirty = true;
    }
 
-   if (stream->readFlag())  // ShapeTypeMask
+   if (stream->readFlag())  // StaticDataMask
    {
       U32 shapeType = ProbeRenderInst::Sphere;
       stream->read(&shapeType);
 
       mProbeShapeType = (ProbeRenderInst::ProbeShapeType)shapeType;
-      createGeometry();
 
-      mDirty = true;
-   }
-
-   if (stream->readFlag())  // UpdateMask
-   {
       stream->read(&mRadius);
 
-      mDirty = true;
-   }
-
-   if (stream->readFlag())  // BakeInfoMask
-   {
       stream->read(&mProbeUniqueID);
 
+      U32 oldReflectModeType = mReflectionModeType;
+      U32 reflectModeType = BakedCubemap;
+      stream->read(&reflectModeType);
+      mReflectionModeType = (ReflectionModeType)reflectModeType;
+
+      String oldCubemapName = mCubemapName;
+      stream->read(&mCubemapName);
+
+      if(oldReflectModeType != mReflectionModeType || oldCubemapName != mCubemapName)
+         mCubemapDirty = true;
+
       mDirty = true;
    }
 
@@ -492,28 +481,6 @@ void ReflectionProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
       mDirty = true;
    }
 
-   if (stream->readFlag())  // ModeMask
-   {
-      U32 reflectModeType = BakedCubemap;
-      stream->read(&reflectModeType);
-      mReflectionModeType = (ReflectionModeType)reflectModeType;
-
-      mDirty = true;
-   }
-
-   if (stream->readFlag())  // CubemapMask
-   {
-      String newCubemapName;
-      stream->read(&mCubemapName);
-
-      //if (newCubemapName != mCubemapName)
-      {
-         processStaticCubemap();
-      }
-
-      mDirty = true;
-   }
-
    if (mDirty)
    {
       updateProbeParams();
@@ -525,101 +492,80 @@ void ReflectionProbe::unpackUpdate(NetConnection *conn, BitStream *stream)
 //-----------------------------------------------------------------------------
 void ReflectionProbe::updateProbeParams()
 {
-   if (mProbeInfo == nullptr)
+   if (!mProbeInfo)
-   {
+      return;
-      mProbeInfo = new ProbeRenderInst();
-      mProbeInfoIdx = ProbeRenderInst::all.size() - 1;
-      mProbeInfo->mIsEnabled = false;
-
-      PROBEMGR->registerProbe(mProbeInfoIdx);
-   }
 
    mProbeInfo->mProbeShapeType = mProbeShapeType;
 
-   MatrixF transform = getTransform();
-   mProbeInfo->mPosition = getPosition();
-
    if (mProbeShapeType == ProbeRenderInst::Sphere)
       mObjScale.set(mRadius, mRadius, mRadius);
 
-   transform.scale(getScale());
+   Box3F bounds;
-   mProbeInfo->mTransform = transform.inverse();
+
+   if (mProbeShapeType == ProbeRenderInst::Skylight)
+   {
+      mProbeInfo->mPosition = Point3F::Zero;
+      mProbeInfo->mTransform = MatrixF::Identity;
+
+      mProbeInfo->mIsSkylight = true;
+
+      F32 visDist = gClientSceneGraph->getVisibleDistance();
+      Box3F skylightBounds = Box3F(visDist * 2);
+
+      skylightBounds.setCenter(Point3F::Zero);
+
+      bounds = skylightBounds;
+
+      setGlobalBounds();
+
+      mProbeInfo->mScore = -1.0f;
+   }
+   else
+   {
+      MatrixF transform = getTransform();
+      mProbeInfo->mPosition = getPosition();
+
+      transform.scale(getScale());
+      mProbeInfo->mTransform = transform.inverse();
+
+      mProbeInfo->mIsSkylight = false;
+
+      bounds = mWorldBox;
+
+      mProbeInfo->mScore = mMaxDrawDistance;
+   }
 
    // Skip our transform... it just dirties mask bits.
    Parent::setTransform(mObjToWorld);
 
    resetWorldBox();
 
-   mProbeInfo->mBounds = mWorldBox;
+   mProbeInfo->mBounds = bounds;
    mProbeInfo->mExtents = getScale();
    mProbeInfo->mRadius = mRadius;
 
-   mProbeInfo->mIsSkylight = false;
-
    mProbeInfo->mProbeRefOffset = mProbeRefOffset;
    mProbeInfo->mProbeRefScale = mProbeRefScale;
 
    mProbeInfo->mDirty = true;
-   mProbeInfo->mScore = mMaxDrawDistance;
+
+   if (mCubemapDirty)
+   {
+      if (mReflectionModeType == StaticCubemap)
+         processStaticCubemap();
+      else
+         processDynamicCubemap();
+   }
+
+   PROBEMGR->updateProbes();
 }
 
-void ReflectionProbe::processStaticCubemap()
+void ReflectionProbe::processDynamicCubemap()
 {
-   if (mReflectionModeType != StaticCubemap)
+   if (!mProbeInfo)
       return;
 
-   createClientResources();
+   mEnabled = false;
-
-   Sim::findObject(mCubemapName, mStaticCubemap);
-
-   if (!mStaticCubemap)
-   {
-      Con::errorf("ReflectionProbe::updateMaterial() - unable to find static cubemap file!");
-      return;
-   }
-
-   if (mStaticCubemap->mCubemap == nullptr)
-   {
-      mStaticCubemap->createMap();
-      mStaticCubemap->updateFaces();
-   }
-
-   String prefilPath = getPrefilterMapPath();
-   String irrPath = getIrradianceMapPath();
-
-   if (mUseHDRCaptures)
-   {
-      mIrridianceMap->mCubemap->initDynamic(mPrefilterSize, GFXFormatR16G16B16A16F);
-      mPrefilterMap->mCubemap->initDynamic(mPrefilterSize, GFXFormatR16G16B16A16F);
-   }
-   else
-   {
-      mIrridianceMap->mCubemap->initDynamic(mPrefilterSize, GFXFormatR8G8B8A8);
-      mPrefilterMap->mCubemap->initDynamic(mPrefilterSize, GFXFormatR8G8B8A8);
-   }
-
-   //if (!Platform::isFile(irrPath) || !Platform::isFile(prefilPath))
-   {
-      GFXTextureTargetRef renderTarget = GFX->allocRenderToTextureTarget(false);
-
-      IBLUtilities::GenerateIrradianceMap(renderTarget, mStaticCubemap->mCubemap, mIrridianceMap->mCubemap);
-      IBLUtilities::GeneratePrefilterMap(renderTarget, mStaticCubemap->mCubemap, mPrefilterMipLevels, mPrefilterMap->mCubemap);
-
-      IBLUtilities::SaveCubeMap(getIrradianceMapPath(), mIrridianceMap->mCubemap);
-      IBLUtilities::SaveCubeMap(getPrefilterMapPath(), mPrefilterMap->mCubemap);
-   }
-
-   mProbeInfo->mPrefilterCubemap = mPrefilterMap->mCubemap;
-   mProbeInfo->mIrradianceCubemap = mIrridianceMap->mCubemap;
-
-   //Update the probe manager with our new texture!
-   if(!mProbeInfo->mIsSkylight)
-      PROBEMGR->updateProbeTexture(mProbeInfo);
-}
-
-void ReflectionProbe::updateCubemaps()
-{
-   createClientResources();
 
    if (mReflectionModeType != DynamicCubemap)
    {
@@ -627,22 +573,36 @@ void ReflectionProbe::updateCubemaps()
 
       if ((mReflectionModeType == BakedCubemap) && !mProbeUniqueID.isEmpty())
       {
-         if (mPrefilterMap != nullptr && mPrefilterMap->mCubemap.isValid())
+         String irrPath = getIrradianceMapPath();
+         if (Platform::isFile(irrPath))
          {
-            mProbeInfo->mPrefilterCubemap = mPrefilterMap->mCubemap;
+            mIrridianceMap->setCubemapFile(FileName(irrPath));
+            //mIrridianceMap->updateFaces();
          }
-         else
+
+         if (mIrridianceMap == nullptr || mIrridianceMap->mCubemap.isNull())
          {
-            mEnabled = false;
+            Con::errorf("ReflectionProbe::processDynamicCubemap() - Unable to load baked irradiance map at %s", getIrradianceMapPath().c_str());
+            return;
          }
-         if (mIrridianceMap != nullptr && mIrridianceMap->mCubemap.isValid())
+
+         String prefilPath = getPrefilterMapPath();
+         if (Platform::isFile(prefilPath))
          {
-            mProbeInfo->mIrradianceCubemap = mIrridianceMap->mCubemap;
+            mPrefilterMap->setCubemapFile(FileName(prefilPath));
+            //mPrefilterMap->updateFaces();
          }
-         else
+
+         if (mPrefilterMap == nullptr || mPrefilterMap->mCubemap.isNull())
          {
-            mEnabled = false;
+            Con::errorf("ReflectionProbe::processDynamicCubemap() - Unable to load baked prefilter map at %s", getPrefilterMapPath().c_str());
+            return;
          }
+
+         //mProbeInfo->mPrefilterCubemap = mPrefilterMap->mCubemap;
+         //mProbeInfo->mIrradianceCubemap = mIrridianceMap->mCubemap;
+
+         mEnabled = true;
       }
    }
    else
@@ -659,18 +619,120 @@ void ReflectionProbe::updateCubemaps()
       }
    }
 
-   //Make us ready to render
    if (mEnabled)
       mProbeInfo->mIsEnabled = true;
    else
       mProbeInfo->mIsEnabled = false;
 
+   //Update the probe manager with our new texture!
+   //if (!mProbeInfo->mIsSkylight && mProbeInfo->mPrefilterCubemap->isInitialized() && mProbeInfo->mIrradianceCubemap->isInitialized())
+   //   PROBEMGR->updateProbeTexture(mProbeInfo->mProbeIdx);
+}
+
+void ReflectionProbe::processStaticCubemap()
+{
+   if (!mProbeInfo)
+      return;
+
+   mEnabled = false;
+
+   String path = Con::getVariable("$pref::ReflectionProbes::CurrentLevelPath", "levels/");
+
+   char irradFileName[256];
+   dSprintf(irradFileName, 256, "%s_Irradiance.dds", path.c_str(), mCubemapName.c_str());
+
+   if (Platform::isFile(irradFileName))
+   {
+      mIrridianceMap->setCubemapFile(FileName(irradFileName));
+      mIrridianceMap->updateFaces();
+   }
+
+   if (mIrridianceMap == nullptr || mIrridianceMap->mCubemap.isNull())
+   {
+      Con::errorf("ReflectionProbe::processStaticCubemap() - Unable to load baked irradiance map at %s", irradFileName);
+      return;
+   }
+
+   char prefilterFileName[256];
+   dSprintf(prefilterFileName, 256, "%s%s_Prefilter.dds", path.c_str(), mCubemapName.c_str());
+
+   if (Platform::isFile(prefilterFileName))
+   {
+      mPrefilterMap->setCubemapFile(FileName(prefilterFileName));
+      mPrefilterMap->updateFaces();
+   }
+
+   if (mPrefilterMap == nullptr || mPrefilterMap->mCubemap.isNull())
+   {
+      Con::errorf("ReflectionProbe::processStaticCubemap() - Unable to load baked prefilter map at %s", prefilterFileName);
+      return;
+   }
+
+   if (!Platform::isFile(prefilterFileName) || !Platform::isFile(irradFileName))
+   {
+      //If we are missing either of the files, just re-run the bake
+      Sim::findObject(mCubemapName, mStaticCubemap);
+
+      if (!mStaticCubemap)
+      {
+         Con::errorf("ReflectionProbe::updateMaterial() - unable to find static cubemap file!");
+         return;
+      }
+
+      if (mStaticCubemap->mCubemap == nullptr)
+      {
+         mStaticCubemap->createMap();
+         mStaticCubemap->updateFaces();
+      }
+
+      if (mUseHDRCaptures)
+      {
+         mIrridianceMap->mCubemap->initDynamic(mPrefilterSize, GFXFormatR16G16B16A16F);
+         mPrefilterMap->mCubemap->initDynamic(mPrefilterSize, GFXFormatR16G16B16A16F);
+      }
+      else
+      {
+         mIrridianceMap->mCubemap->initDynamic(mPrefilterSize, GFXFormatR8G8B8A8);
+         mPrefilterMap->mCubemap->initDynamic(mPrefilterSize, GFXFormatR8G8B8A8);
+      }
+
+      GFXTextureTargetRef renderTarget = GFX->allocRenderToTextureTarget(false);
+
+      IBLUtilities::GenerateIrradianceMap(renderTarget, mStaticCubemap->mCubemap, mIrridianceMap->mCubemap);
+      IBLUtilities::GeneratePrefilterMap(renderTarget, mStaticCubemap->mCubemap, mPrefilterMipLevels, mPrefilterMap->mCubemap);
+
+      IBLUtilities::SaveCubeMap(irradFileName, mIrridianceMap->mCubemap);
+      IBLUtilities::SaveCubeMap(prefilterFileName, mPrefilterMap->mCubemap);
+   }
+
+   if ((mIrridianceMap != nullptr || !mIrridianceMap->mCubemap.isNull()) && (mPrefilterMap != nullptr || !mPrefilterMap->mCubemap.isNull()))
+   {
+      mProbeInfo->mPrefilterCubemap = mPrefilterMap->mCubemap;
+      mProbeInfo->mIrradianceCubemap = mIrridianceMap->mCubemap;
+      mEnabled = true;
+   }
+
+   if (mEnabled)
+      mProbeInfo->mIsEnabled = true;
+   else
+      mProbeInfo->mIsEnabled = false;
+
+   //Update the probe manager with our new texture!
    if (!mProbeInfo->mIsSkylight && mProbeInfo->mPrefilterCubemap->isInitialized() && mProbeInfo->mIrradianceCubemap->isInitialized())
-      PROBEMGR->updateProbeTexture(mProbeInfo);
+      PROBEMGR->updateProbeTexture(mProbeInfo->mProbeIdx);
 }
 
 bool ReflectionProbe::createClientResources()
 {
+   if (mProbeInfo == nullptr)
+   {
+      mProbeInfo = PROBEMGR->registerProbe(mProbeShapeType == ProbeRenderInst::Skylight);
+      if (!mProbeInfo)
+         return false;
+
+      mProbeInfo->mIsEnabled = false;
+   }
+
    //irridiance resources
    if (!mIrridianceMap)
    {
@@ -680,16 +742,6 @@ bool ReflectionProbe::createClientResources()
       mIrridianceMap->createMap();
    }
 
-   String irrPath = getIrradianceMapPath();
-   if (Platform::isFile(irrPath))
-   {
-      mIrridianceMap->setCubemapFile(FileName(irrPath));
-      mIrridianceMap->updateFaces();
-   }
-
-   if (mIrridianceMap->mCubemap.isNull())
-      Con::errorf("ReflectionProbe::createClientResources() - Unable to load baked irradiance map at %s", getIrradianceMapPath().c_str());
-
    //
    if (!mPrefilterMap)
    {
@@ -699,17 +751,8 @@ bool ReflectionProbe::createClientResources()
       mPrefilterMap->createMap();
    }
 
-   String prefilPath = getPrefilterMapPath();
-   if (Platform::isFile(prefilPath))
-   {
-      mPrefilterMap->setCubemapFile(FileName(prefilPath));
-      mPrefilterMap->updateFaces();
-   }
-
-   if (mPrefilterMap->mCubemap.isNull())
-      Con::errorf("ReflectionProbe::createClientResources() - Unable to load baked prefilter map at %s", getPrefilterMapPath().c_str());
-
    mResourcesCreated = true;
+   mCubemapDirty = true;
 
    return true;
 }
@@ -753,8 +796,9 @@ void ReflectionProbe::bake()
 
    PROBEMGR->bakeProbe(this);
 
-   setMaskBits(CubemapMask);
+   setMaskBits(StaticDataMask);
 }
+
 //-----------------------------------------------------------------------------
 //Rendering of editing/debug stuff
 //-----------------------------------------------------------------------------
@@ -812,8 +856,11 @@ void ReflectionProbe::prepRenderImage(SceneRenderState *state)
    //Register
    //PROBEMGR->registerProbe(mProbeInfoIdx);
 
-   if (ReflectionProbe::smRenderPreviewProbes && gEditingMission && mEditorShapeInst && mPrefilterMap != nullptr)
+   if (ReflectionProbe::smRenderPreviewProbes && gEditingMission && mPrefilterMap != nullptr)
    {
+      if(!mEditorShapeInst)
+         createGeometry();
+
       GFXTransformSaver saver;
 
       // Calculate the distance of this object from the camera
@@ -965,4 +1012,4 @@ DefineEngineMethod(ReflectionProbe, Bake, void, (), ,
    {
       clientProbe->bake();
    }
-}
+}

Engine/source/T3D/lighting/reflectionProbe.h

@@ -82,19 +82,15 @@ protected:
    enum MaskBits
    {
       TransformMask = Parent::NextFreeMask << 0,
-      UpdateMask = Parent::NextFreeMask << 1,
+      StaticDataMask = Parent::NextFreeMask << 1,
       EnabledMask = Parent::NextFreeMask << 2,
-      CubemapMask = Parent::NextFreeMask << 3,
+      NextFreeMask = Parent::NextFreeMask << 3
-      ModeMask = Parent::NextFreeMask << 4,
-      RadiusMask = Parent::NextFreeMask << 5,
-      ShapeTypeMask = Parent::NextFreeMask << 6,
-      BakeInfoMask = Parent::NextFreeMask << 7,
-      NextFreeMask = Parent::NextFreeMask << 8
    };
 
    bool mBake;
    bool mEnabled;
    bool mDirty;
+   bool mCubemapDirty;
 
    Resource<TSShape> mEditorShape;
    TSShapeInstance* mEditorShapeInst;
@@ -105,7 +101,6 @@ protected:
    ProbeRenderInst::ProbeShapeType mProbeShapeType;
 
    ProbeRenderInst* mProbeInfo;
-   U32 mProbeInfoIdx;
 
    //Reflection Contribution stuff
    ReflectionModeType mReflectionModeType;
@@ -221,13 +216,11 @@ public:
    // Create the geometry for rendering
    void createGeometry();
 
-   // Get the Material instance
-   void updateCubemaps();
-
    virtual void updateProbeParams();
 
    bool createClientResources();
 
+   void processDynamicCubemap();
    void processStaticCubemap();
 
    // This is the function that allows this object to submit itself for rendering
@@ -243,8 +236,6 @@ public:
    String getPrefilterMapPath();
    String getIrradianceMapPath();
    void bake();
-
-   const U32 getProbeInfoIndex() { return mProbeInfoIdx; }
 };
 
 typedef ProbeRenderInst::ProbeShapeType ReflectProbeType;
@@ -253,4 +244,4 @@ DefineEnumType(ReflectProbeType);
 typedef ReflectionProbe::ReflectionModeType ReflectionModeEnum;
 DefineEnumType(ReflectionModeEnum);
 
-#endif // _ReflectionProbe_H_
+#endif // _ReflectionProbe_H_

Engine/source/T3D/lighting/skylight.cpp

@@ -123,18 +123,6 @@ void Skylight::onRemove()
    Parent::onRemove();
 }
 
-void Skylight::setTransform(const MatrixF & mat)
-{
-   // Let SceneObject handle all of the matrix manipulation
-   Parent::setTransform(mat);
-
-   mDirty = true;
-
-   // Dirty our network mask so that the new transform gets
-   // transmitted to the client object
-   setMaskBits(TransformMask);
-}
-
 U32 Skylight::packUpdate(NetConnection *conn, U32 mask, BitStream *stream)
 {
    // Allow the Parent to get a crack at writing its info
@@ -155,34 +143,8 @@ void Skylight::unpackUpdate(NetConnection *conn, BitStream *stream)
 
 void Skylight::updateProbeParams()
 {
+   mProbeShapeType = ProbeRenderInst::Skylight;
    Parent::updateProbeParams();
-
-   mProbeInfo->mProbeShapeType = ProbeRenderInst::Skylight;
-
-   mProbeInfo->setPosition(getPosition());
-
-   // Skip our transform... it just dirties mask bits.
-   Parent::setTransform(mObjToWorld);
-
-   resetWorldBox();
-
-   F32 visDist = gClientSceneGraph->getVisibleDistance();
-   Box3F skylightBounds = Box3F(visDist * 2);
-
-   skylightBounds.setCenter(Point3F::Zero);
-
-   mProbeInfo->setPosition(Point3F::Zero);
-
-   mProbeInfo->mBounds = skylightBounds;
-
-   setGlobalBounds();
-
-   mProbeInfo->mIsSkylight = true; 
-   mProbeInfo->mScore = -1.0f; //sky comes first
-
-   PROBEMGR->updateProbes();
-
-   updateCubemaps();
 }
 
 void Skylight::prepRenderImage(SceneRenderState *state)
@@ -273,4 +235,4 @@ DefineEngineMethod(Skylight, postApply, void, (), ,
    "A utility method for forcing a network update.\n")
 {
    object->inspectPostApply();
-}
+}

Engine/source/T3D/lighting/skylight.h

@@ -86,9 +86,6 @@ public:
    bool onAdd();
    void onRemove();
 
-   // Override this so that we can dirty the network flag when it is called
-   void setTransform(const MatrixF &mat);
-
    // This function handles sending the relevant data from the server
    // object to the client object
    U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
@@ -112,4 +109,4 @@ public:
    void setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat);
 };
 
-#endif // _Skylight_H_
+#endif // _Skylight_H_

Engine/source/T3D/lighting/sphereEnvironmentProbe.cpp

@@ -119,18 +119,6 @@ void SphereEnvironmentProbe::onRemove()
    Parent::onRemove();
 }
 
-void SphereEnvironmentProbe::setTransform(const MatrixF & mat)
-{
-   // Let SceneObject handle all of the matrix manipulation
-   Parent::setTransform(mat);
-
-   mDirty = true;
-
-   // Dirty our network mask so that the new transform gets
-   // transmitted to the client object
-   setMaskBits(TransformMask);
-}
-
 U32 SphereEnvironmentProbe::packUpdate(NetConnection *conn, U32 mask, BitStream *stream)
 {
    // Allow the Parent to get a crack at writing its info
@@ -151,13 +139,8 @@ void SphereEnvironmentProbe::unpackUpdate(NetConnection *conn, BitStream *stream
 
 void SphereEnvironmentProbe::updateProbeParams()
 {
+   mProbeShapeType = ProbeRenderInst::Sphere;
    Parent::updateProbeParams();
-
-   mProbeInfo->mProbeShapeType = ProbeRenderInst::Sphere;
-
-   PROBEMGR->updateProbes();
-
-   updateCubemaps();
 }
 
 void SphereEnvironmentProbe::prepRenderImage(SceneRenderState *state)
@@ -234,4 +217,4 @@ void SphereEnvironmentProbe::prepRenderImage(SceneRenderState *state)
 void SphereEnvironmentProbe::setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat)
 {
    Parent::setPreviewMatParameters(renderState, mat);
-}
+}

Engine/source/T3D/lighting/sphereEnvironmentProbe.h

@@ -82,9 +82,6 @@ public:
    bool onAdd();
    void onRemove();
 
-   // Override this so that we can dirty the network flag when it is called
-   void setTransform(const MatrixF &mat);
-
    // This function handles sending the relevant data from the server
    // object to the client object
    U32 packUpdate(NetConnection *conn, U32 mask, BitStream *stream);
@@ -108,4 +105,4 @@ public:
    void setPreviewMatParameters(SceneRenderState* renderState, BaseMatInstance* mat);
 };
 
-#endif // SPHERE_ENVIRONMENT_PROBE_H
+#endif // SPHERE_ENVIRONMENT_PROBE_H

Engine/source/gfx/gfxTextureManager.cpp

@@ -47,6 +47,7 @@ String GFXTextureManager::smUnavailableTexturePath(Con::getVariable("$Core::UnAv
 String GFXTextureManager::smWarningTexturePath(Con::getVariable("$Core::WarningTexturePath"));
 String GFXTextureManager::smDefaultIrradianceCubemapPath(Con::getVariable("$Core::DefaultIrradianceCubemap"));
 String GFXTextureManager::smDefaultPrefilterCubemapPath(Con::getVariable("$Core::DefaultPrefilterCubemap"));
+String GFXTextureManager::smBRDFTexturePath(Con::getVariable("$Core::BRDFTexture"));
 
 GFXTextureManager::EventSignal GFXTextureManager::smEventSignal;
 
@@ -80,6 +81,10 @@ void GFXTextureManager::init()
    Con::addVariable("$Core::DefaultPrefilterCubemap", TypeRealString, &smDefaultPrefilterCubemapPath,
       "The file path of the texture used as the default specular cubemap for PBR.\n"
       "@ingroup GFX\n");
+
+   Con::addVariable("$Core::BRDFTexture", TypeRealString, &smBRDFTexturePath,
+      "The file path of the texture used as the default irradiance cubemap for PBR.\n"
+      "@ingroup GFX\n");
 }
 
 GFXTextureManager::GFXTextureManager()

Engine/source/gfx/gfxTextureManager.h

@@ -77,6 +77,8 @@ public:
    static const String& getDefaultIrradianceCubemapPath() { return smDefaultIrradianceCubemapPath; }
    static const String& getDefaultPrefilterCubemapPath() { return smDefaultPrefilterCubemapPath; }
 
+   static const String& getBRDFTexturePath() { return smBRDFTexturePath; }
+
    /// Update width and height based on available resources.
    ///
    /// We provide a simple interface for managing texture memory usage. Specifically,
@@ -215,6 +217,7 @@ protected:
 
    static String smDefaultIrradianceCubemapPath;
    static String smDefaultPrefilterCubemapPath;
+   static String smBRDFTexturePath;
 
    GFXTextureObject *mListHead;
    GFXTextureObject *mListTail;

Engine/source/gui/editor/inspector/variableField.cpp

@@ -27,6 +27,7 @@
 #include "gui/editor/guiInspector.h"
 #include "core/util/safeDelete.h"
 #include "gfx/gfxDrawUtil.h"
+#include "util/settings.h"
 
 //-----------------------------------------------------------------------------
 // GuiInspectorVariableField
@@ -104,7 +105,17 @@ void GuiInspectorVariableField::setData( const char* data, bool callbacks )
    {
       if (mOwnerObject != nullptr)
       {
-         mOwnerObject->setDataField(mVariableName, NULL, data);
+         //Special case: if our object is a Settings class, we'll assume that we're trying to get/set the fields via the Setting class's normal behavior
+         //otherwise, use fields as normal
+         Settings* setting = dynamic_cast<Settings*>(mOwnerObject);
+         if (setting)
+         {
+            setting->setValue(mVariableName, data);
+         }
+         else
+         {
+            mOwnerObject->setDataField(mVariableName, NULL, data);
+         }
       }
       else
       {
@@ -121,8 +132,16 @@ const char* GuiInspectorVariableField::getData( U32 inspectObjectIndex )
 {
    if ( !mCaption || mCaption[0] == 0 )
       return "";
-      
+
-   return Con::getVariable( mCaption );
+   Settings* setting = dynamic_cast<Settings*>(mOwnerObject);
+   if (setting)
+   {
+      return setting->value(mVariableName);
+   }
+   else
+   {
+      return Con::getVariable(mCaption);
+   }
 }
 
 void GuiInspectorVariableField::setValue( const char* newValue )
@@ -138,4 +157,4 @@ void GuiInspectorVariableField::updateValue()
       return;
    
    setValue( getData() );
-}
+}

Engine/source/gui/editor/inspector/variableInspector.cpp

@@ -60,7 +60,10 @@ void GuiVariableInspector::loadVars( String searchStr )
 
 void GuiVariableInspector::update()
 {
-   clearGroups();
+   for (U32 g = 0; g < mGroups.size(); g++)
+   {
+      mGroups[g]->clearFields();
+   }
 
    for (U32 i = 0; i < mFields.size(); i++)
    {
@@ -149,6 +152,8 @@ void GuiVariableInspector::addField(const char* name, const char* label, const c
       fieldTypeMask = TypeF32;
    else if (newField.mFieldTypeName == StringTable->insert("vector"))
       fieldTypeMask = TypePoint3F;
+   else if (newField.mFieldTypeName == StringTable->insert("vector2"))
+      fieldTypeMask = TypePoint2F;
    //else if (fieldType == StringTable->insert("material"))
    //   fieldTypeMask = TypeMaterialName;
    else if (newField.mFieldTypeName == StringTable->insert("image"))
@@ -264,4 +269,4 @@ DefineEngineMethod(GuiVariableInspector, setFieldEnabled, void, (const char* fie
 DefineEngineMethod( GuiVariableInspector, loadVars, void, ( const char * searchString ), , "loadVars( searchString )" )
 {
    object->loadVars( searchString );
-}
+}

Engine/source/materials/materialDefinition.cpp

@@ -117,6 +117,7 @@ Material::Material()
       mDiffuse[i].set( 1.0f, 1.0f, 1.0f, 1.0f );
       mDiffuseMapSRGB[i] = true;
       mDiffuseMapAsset[i] = StringTable->EmptyString();
+      mDiffuseMapAssetId[i] = StringTable->EmptyString();
 
       mSmoothness[i] = 0.0f;
       mMetalness[i] = 0.0f;
@@ -238,7 +239,7 @@ void Material::initPersistFields()
       addField("diffuseMap", TypeImageFilename, Offset(mDiffuseMapFilename, Material), MAX_STAGES,
          "The diffuse color texture map." );
 
-      addField("diffuseMapAsset", TypeImageAssetPtr, Offset(mDiffuseMapAsset, Material), MAX_STAGES,
+      addField("diffuseMapAsset", TypeImageAssetPtr, Offset(mDiffuseMapAssetId, Material), MAX_STAGES,
          "The diffuse color texture map." );
 
       addField("diffuseMapSRGB", TypeBool, Offset(mDiffuseMapSRGB, Material), MAX_STAGES,
@@ -585,6 +586,15 @@ bool Material::onAdd()
    if ( slash != String::NPos )
       mPath = scriptFile.substr( 0, slash + 1 );
 
+   //bind any assets we have
+   for (U32 i = 0; i < MAX_STAGES; i++)
+   {
+      if (mDiffuseMapAssetId[i] != StringTable->EmptyString())
+      {
+         mDiffuseMapAsset[0] = mDiffuseMapAssetId[0];
+      }
+   }
+
    _mapMaterial();
 
    return true;

Engine/source/materials/processedMaterial.cpp

@@ -409,7 +409,7 @@ void ProcessedMaterial::_setStageData()
             mStages[i].setTex(MFT_DiffuseMap, _createTexture(GFXTextureManager::getMissingTexturePath().c_str(), &GFXStaticTextureSRGBProfile));
          }
       }
-      else if (!mMaterial->mDiffuseMapAsset[i].isNull())
+      else if (mMaterial->mDiffuseMapAsset[i] && !mMaterial->mDiffuseMapAsset[i].isNull())
       {
          mStages[i].setTex(MFT_DiffuseMap, mMaterial->mDiffuseMapAsset[i]->getImage());
          if (!mStages[i].getTex(MFT_DiffuseMap))

Engine/source/module/moduleDefinition.h

@@ -191,8 +191,8 @@ public:
     inline void             increaseLoadCount( void )                           { ++mLoadCount; }
     inline void             reduceLoadCount( void )                             { --mLoadCount; }
     inline S32              getLoadCount( void ) const                          { return mLoadCount; }
-    inline void             setLocked( const bool status )                      { mLocked = status; }
+    inline void             setModuleLocked( const bool status )                { mLocked = status; }
-    inline bool             getLocked( void ) const                             { return mLocked; }
+    inline bool             getModuleLocked( void ) const                       { return mLocked; }
     inline ModuleManager*   getModuleManager( void ) const                      { return mpModuleManager; }
     bool                    save( void );
 

Engine/source/module/moduleManager.cpp

@@ -2121,7 +2121,7 @@ bool ModuleManager::registerModule( const char* pModulePath, const char* pModule
     pModuleDefinition->setSignature( formatBuffer );
 
     // Locked the module definition.
-    pModuleDefinition->setLocked( true );
+    pModuleDefinition->setModuleLocked( true );
 
     // Fetch modules definitions.
     ModuleDefinitionEntry* pDefinitions = findModuleId( moduleId );

Engine/source/postFx/postEffect.cpp

@@ -1076,11 +1076,6 @@ void PostEffect::_setupConstants( const SceneRenderState *state )
       setShaderConsts_callback();
    }   
 
-   if (mShaderName == String("PFX_ReflectionProbeArray") || getName() == StringTable->insert("reflectionProbeArrayPostFX"))
-   {
-      bool derp = true;
-   }
-
    EffectConstTable::Iterator iter = mEffectConsts.begin();
    for ( ; iter != mEffectConsts.end(); iter++ )
       iter->value->setToBuffer( mShaderConsts );
@@ -1607,6 +1602,22 @@ void PostEffect::setTexture( U32 index, const String &texFilePath )
     mTextureType[index] = NormalTextureType;
 }
 
+void PostEffect::setTexture(U32 index, const GFXTexHandle& texHandle)
+{
+   // Set the new texture name.
+   mTexFilename[index] = "";
+   mTextures[index].free();
+
+   // Skip empty stages or ones with variable or target names.
+   if (!texHandle.isValid())
+      return;
+
+   // Try to load the texture.
+   mTextures[index] = texHandle;
+
+   mTextureType[index] = NormalTextureType;
+}
+
 void PostEffect::setCubemapTexture(U32 index, const GFXCubemapHandle &cubemapHandle)
 {
    // Set the new texture name.
@@ -2048,4 +2059,4 @@ DefineEngineFunction( dumpRandomNormalMap, void, (),,
 
    String path = Torque::FS::MakeUniquePath( "", "randNormTex", "png" );
    tex->dumpToDisk( "png", path );   
-}
+}

Engine/source/postFx/postEffect.h

@@ -416,6 +416,7 @@ public:
    F32 getPriority() const { return mRenderPriority; }
 
    void setTexture( U32 index, const String &filePath );
+   void setTexture(U32 index, const GFXTexHandle& texHandle);
    void setCubemapTexture(U32 index, const GFXCubemapHandle &cubemapHandle);
    void setCubemapArrayTexture(U32 index, const GFXCubemapArrayHandle &cubemapArrayHandle);
 
@@ -451,4 +452,4 @@ public:
    };
 };
 
-#endif // _POST_EFFECT_H_
+#endif // _POST_EFFECT_H_

Engine/source/renderInstance/renderProbeMgr.cpp

@@ -73,7 +73,8 @@ S32 QSORT_CALLBACK AscendingReflectProbeInfluence(const void* a, const void* b)
 
 //
 //
-ProbeRenderInst::ProbeRenderInst() : SystemInterface(),
+ProbeRenderInst::ProbeRenderInst() :
+   mIsEnabled(true),
    mTransform(true),
    mDirty(false),
    mPriority(1.0f),
@@ -85,7 +86,8 @@ ProbeRenderInst::ProbeRenderInst() : SystemInterface(),
    mProbeRefScale(1,1,1),
    mAtten(0.0),
    mCubemapIndex(0),
-   mIsSkylight(false)
+   mIsSkylight(false),
+   mProbeIdx(0)
 {
 }
 
@@ -267,6 +269,13 @@ bool RenderProbeMgr::onAdd()
       return false;
    }
 
+   String brdfTexturePath = GFXTextureManager::getBRDFTexturePath();
+   if (!mBRDFTexture.set(brdfTexturePath, &GFXTexturePersistentSRGBProfile, "BRDFTexture"))
+   {
+      Con::errorf("RenderProbeMgr::onAdd: Failed to load BRDF Texture");
+      return false;
+   } 
+
    return true;
 }
 
@@ -305,21 +314,21 @@ void RenderProbeMgr::addElement(RenderInst *inst)
    }*/
 }
 
-void RenderProbeMgr::registerProbe(U32 probeIdx)
+ProbeRenderInst* RenderProbeMgr::registerProbe(const bool &isSkylight)
 {
-   //Mostly for consolidation, but also lets us sanity check or prep any other data we need for rendering this in one place at time of flagging for render
+   ProbeRenderInst newProbe;
-   if (probeIdx >= ProbeRenderInst::all.size())
+   newProbe.mIsSkylight = isSkylight;
-      return;
 
-   mRegisteredProbes.push_back_unique(probeIdx);
+   mRegisteredProbes.push_back(newProbe);
+   newProbe.mProbeIdx = mRegisteredProbes.size();
 
-   if (!ProbeRenderInst::all[probeIdx]->mIsSkylight)
+   if (!newProbe.mIsSkylight)
    {
       const U32 cubeIndex = _findNextEmptyCubeSlot();
       if (cubeIndex == INVALID_CUBE_SLOT)
       {
          Con::warnf("RenderProbeMgr::addProbe: Invalid cubemap slot.");
-         return;
+         return nullptr;
       }
 
       //check if we need to resize the cubemap array
@@ -342,33 +351,34 @@ void RenderProbeMgr::registerProbe(U32 probeIdx)
          mCubeSlotCount += PROBE_ARRAY_SLOT_BUFFER_SIZE;
       }
 
-      ProbeRenderInst::all[probeIdx]->mCubemapIndex = cubeIndex;
+      newProbe.mCubemapIndex = cubeIndex;
       //mark cubemap slot as taken
       mCubeMapSlots[cubeIndex] = true;
       mCubeMapCount++;
 
-      Con::warnf("RenderProbeMgr::registerProbe: Registered probe %u to cubeIndex %u", probeIdx, cubeIndex);
+      Con::warnf("RenderProbeMgr::registerProbe: Registered probe %u to cubeIndex %u", newProbe.mProbeIdx, cubeIndex);
    }
 
-   //rebuild our probe data
+   mProbesDirty = true;
-   _setupStaticParameters();
+
+   return &mRegisteredProbes.last();
 }
 
 void RenderProbeMgr::unregisterProbe(U32 probeIdx)
 {
    //Mostly for consolidation, but also lets us sanity check or prep any other data we need for rendering this in one place at time of flagging for render
-   if (probeIdx >= ProbeRenderInst::all.size())
+   if (probeIdx >= mRegisteredProbes.size())
       return;
 
-   mRegisteredProbes.remove(probeIdx);
+   if (mRegisteredProbes[probeIdx].mCubemapIndex == INVALID_CUBE_SLOT)
-
-   if (ProbeRenderInst::all[probeIdx]->mCubemapIndex == INVALID_CUBE_SLOT)
       return;
 
    //mark cubemap slot as available now
-   mCubeMapSlots[ProbeRenderInst::all[probeIdx]->mCubemapIndex] = false;
+   mCubeMapSlots[mRegisteredProbes[probeIdx].mCubemapIndex] = false;
    mCubeMapCount--;
 
+   mRegisteredProbes.erase(probeIdx);
+
    //rebuild our probe data
    _setupStaticParameters();
 }
@@ -400,7 +410,7 @@ void RenderProbeMgr::updateProbes()
 void RenderProbeMgr::_setupStaticParameters()
 {
    //Array rendering
-   U32 probeCount = ProbeRenderInst::all.size();
+   U32 probeCount = mRegisteredProbes.size();
 
    mEffectiveProbeCount = 0;
    mMipCount = 0;
@@ -426,10 +436,10 @@ void RenderProbeMgr::_setupStaticParameters()
    irradMaps.clear();
    Vector<U32> cubemapIdxes;
 
-   if (probeCount != 0 && ProbeRenderInst::all[0]->mPrefilterCubemap != nullptr)
+   if (probeCount != 0 && mRegisteredProbes[0].mPrefilterCubemap != nullptr)
    {
       //Get our mipCount
-      mMipCount = ProbeRenderInst::all[0]->mPrefilterCubemap.getPointer()->getMipMapLevels();
+      mMipCount = mRegisteredProbes[0].mPrefilterCubemap.getPointer()->getMipMapLevels();
    }
    else
    {
@@ -441,7 +451,7 @@ void RenderProbeMgr::_setupStaticParameters()
       if (mEffectiveProbeCount >= MAXPROBECOUNT)
          break;
 
-      const ProbeRenderInst& curEntry = *ProbeRenderInst::all[i];
+      const ProbeRenderInst& curEntry = mRegisteredProbes[i];
       if (!curEntry.mIsEnabled)
          continue;
 
@@ -482,29 +492,21 @@ void RenderProbeMgr::_setupStaticParameters()
    mProbesDirty = false;
 }
 
-void RenderProbeMgr::updateProbeTexture(ProbeRenderInst* probe)
-{
-   //We don't stuff skylights into the array, so we can just skip out on this if it's a skylight
-   if (probe->mIsSkylight)
-      return;
-
-   S32 probeIdx = ProbeRenderInst::all.find_next(probe);
-
-   if (probeIdx != -1) //i mean, the opposite shouldn't even be possible
-      updateProbeTexture(probeIdx);
-}
-
 void RenderProbeMgr::updateProbeTexture(U32 probeIdx)
 {
-   if (probeIdx >= ProbeRenderInst::all.size())
+   if (probeIdx >= mRegisteredProbes.size())
       return;
 
-   const U32 cubeIndex = ProbeRenderInst::all[probeIdx]->mCubemapIndex;
+   //We don't stuff skylights into the array, so we can just skip out on this if it's a skylight
-   mIrradianceArray->updateTexture(ProbeRenderInst::all[probeIdx]->mIrradianceCubemap, cubeIndex);
+   if (mRegisteredProbes[probeIdx].mIsSkylight)
-   mPrefilterArray->updateTexture(ProbeRenderInst::all[probeIdx]->mPrefilterCubemap, cubeIndex);
+      return;
+
+   const U32 cubeIndex = mRegisteredProbes[probeIdx].mCubemapIndex;
+   mIrradianceArray->updateTexture(mRegisteredProbes[probeIdx].mIrradianceCubemap, cubeIndex);
+   mPrefilterArray->updateTexture(mRegisteredProbes[probeIdx].mPrefilterCubemap, cubeIndex);
 
    Con::warnf("UpdatedProbeTexture - probeIdx: %u on cubeIndex %u, Irrad validity: %d, Prefilter validity: %d", probeIdx, cubeIndex, 
-      ProbeRenderInst::all[probeIdx]->mIrradianceCubemap->isInitialized(), ProbeRenderInst::all[probeIdx]->mPrefilterCubemap->isInitialized());
+      mRegisteredProbes[probeIdx].mIrradianceCubemap->isInitialized(), mRegisteredProbes[probeIdx].mPrefilterCubemap->isInitialized());
 }
 
 void RenderProbeMgr::_setupPerFrameParameters(const SceneRenderState *state)
@@ -554,6 +556,7 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
    ProbeShaderConstants *probeShaderConsts,
    GFXShaderConstBuffer *shaderConsts)
 {
+   return;
    PROFILE_SCOPE(ProbeManager_Update4ProbeConsts);
 
    // Skip over gathering lights if we don't have to!
@@ -585,7 +588,7 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
       matSet.restoreSceneViewProjection();
 
       //Array rendering
-      U32 probeCount = ProbeRenderInst::all.size();
+      U32 probeCount = mRegisteredProbes.size();
 
       S8 bestPickProbes[4] = { -1,-1,-1,-1 };
 
@@ -595,7 +598,7 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
          //if (effectiveProbeCount >= MAX_FORWARD_PROBES)
          //   break;
 
-         const ProbeRenderInst& curEntry = *ProbeRenderInst::all[i];
+         const ProbeRenderInst& curEntry = mRegisteredProbes[i];
          if (!curEntry.mIsEnabled)
             continue;
 
@@ -606,13 +609,13 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
             if (dist > curEntry.mRadius || dist > curEntry.mExtents.len())
                continue;
 
-            if(bestPickProbes[0] == -1 || (Point3F(sgData.objTrans->getPosition() - ProbeRenderInst::all[bestPickProbes[0]]->mPosition).len() > dist))
+            if(bestPickProbes[0] == -1 || (Point3F(sgData.objTrans->getPosition() - mRegisteredProbes[bestPickProbes[0]].mPosition).len() > dist))
                bestPickProbes[0] = i;
-            else if (bestPickProbes[1] == -1 || (Point3F(sgData.objTrans->getPosition() - ProbeRenderInst::all[bestPickProbes[1]]->mPosition).len() > dist))
+            else if (bestPickProbes[1] == -1 || (Point3F(sgData.objTrans->getPosition() - mRegisteredProbes[bestPickProbes[1]].mPosition).len() > dist))
                bestPickProbes[1] = i;
-            else if (bestPickProbes[2] == -1 || (Point3F(sgData.objTrans->getPosition() - ProbeRenderInst::all[bestPickProbes[2]]->mPosition).len() > dist))
+            else if (bestPickProbes[2] == -1 || (Point3F(sgData.objTrans->getPosition() - mRegisteredProbes[bestPickProbes[2]].mPosition).len() > dist))
                bestPickProbes[2] = i;
-            else if (bestPickProbes[3] == -1 || (Point3F(sgData.objTrans->getPosition() - ProbeRenderInst::all[bestPickProbes[3]]->mPosition).len() > dist))
+            else if (bestPickProbes[3] == -1 || (Point3F(sgData.objTrans->getPosition() - mRegisteredProbes[bestPickProbes[3]].mPosition).len() > dist))
                bestPickProbes[3] = i;
          }
       }
@@ -623,7 +626,7 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
          if (bestPickProbes[i] == -1)
             continue;
 
-         const ProbeRenderInst& curEntry = *ProbeRenderInst::all[bestPickProbes[i]];
+         const ProbeRenderInst& curEntry = mRegisteredProbes[bestPickProbes[i]];
 
          probePositionArray[effectiveProbeCount] = curEntry.getPosition();
          probeRefPositionArray[effectiveProbeCount] = curEntry.mProbeRefOffset;
@@ -658,6 +661,9 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
       shaderConsts->setSafe(probeShaderConsts->mProbeBoxMaxSC, probeBoxMaxArray);
       shaderConsts->setSafe(probeShaderConsts->mProbeConfigDataSC, probeConfigArray);
 
+      if (mBRDFTexture.isValid())
+         GFX->setTexture(3, mBRDFTexture);
+
       if(probeShaderConsts->mProbeSpecularCubemapSC->getSamplerRegister() != -1)
          GFX->setCubeArrayTexture(probeShaderConsts->mProbeSpecularCubemapSC->getSamplerRegister(), mPrefilterArray);
       if(probeShaderConsts->mProbeIrradianceCubemapSC->getSamplerRegister() != -1)
@@ -669,12 +675,12 @@ void RenderProbeMgr::_update4ProbeConsts(const SceneData &sgData,
       && probeShaderConsts->mSkylightSpecularMap->isValid())
    {
       //Array rendering
-      U32 probeCount = ProbeRenderInst::all.size();
+      U32 probeCount = mRegisteredProbes.size();
 
       bool hasSkylight = false;
       for (U32 i = 0; i < probeCount; i++)
       {
-         const ProbeRenderInst& curEntry = *ProbeRenderInst::all[i];
+         const ProbeRenderInst& curEntry = mRegisteredProbes[i];
          if (!curEntry.mIsEnabled)
             continue;
 
@@ -743,7 +749,6 @@ void RenderProbeMgr::setProbeInfo(ProcessedMaterial *pmat,
 //-----------------------------------------------------------------------------
 void RenderProbeMgr::render( SceneRenderState *state )
 {
-   //PROFILE_SCOPE(RenderProbeMgr_render);
    if (getProbeArrayEffect() == nullptr)
       return;
 
@@ -751,7 +756,7 @@ void RenderProbeMgr::render( SceneRenderState *state )
 	   _setupStaticParameters();
 
    // Early out if nothing to draw.
-   if (!RenderProbeMgr::smRenderReflectionProbes || !state->isDiffusePass() || (!ProbeRenderInst::all.size() || mEffectiveProbeCount == 0 || mCubeMapCount != 0 ) && !mHasSkylight)
+   if (!RenderProbeMgr::smRenderReflectionProbes || !state->isDiffusePass() || (!mRegisteredProbes.size() || mEffectiveProbeCount == 0 || mCubeMapCount != 0 ) && !mHasSkylight)
    {
       getProbeArrayEffect()->setSkip(true);
       return;
@@ -779,7 +784,7 @@ void RenderProbeMgr::render( SceneRenderState *state )
    mProbeArrayEffect->setShaderMacro("DEBUGVIZ_CONTRIB", useDebugContrib);
    
    //Array rendering
-   //U32 probeCount = ProbeRenderInst::all.size();
+   //U32 probeCount = mRegisteredProbes.size();
 
    mProbeArrayEffect->setShaderConst("$hasSkylight", (float)mHasSkylight);
    if (mHasSkylight)
@@ -793,6 +798,7 @@ void RenderProbeMgr::render( SceneRenderState *state )
    mProbeArrayEffect->setShaderConst("$cubeMips", (float)mMipCount);
    if (mEffectiveProbeCount != 0)
    {
+      mProbeArrayEffect->setTexture(3, mBRDFTexture);
       mProbeArrayEffect->setCubemapArrayTexture(4, mPrefilterArray);
       mProbeArrayEffect->setCubemapArrayTexture(5, mIrradianceArray);
 

Engine/source/renderInstance/renderProbeMgr.h

@@ -57,8 +57,10 @@ static U32 MAXPROBECOUNT = 50;
 class PostEffect;
 class ReflectionProbe;
 
-struct ProbeRenderInst : public SystemInterface<ProbeRenderInst>
+struct ProbeRenderInst
 {
+   bool mIsEnabled;
+
    MatrixF mTransform;
 
    F32 mRadius;
@@ -99,6 +101,8 @@ struct ProbeRenderInst : public SystemInterface<ProbeRenderInst>
 
    U32 mCubemapIndex;
 
+   U32 mProbeIdx;
+
 public:
 
    ProbeRenderInst();
@@ -124,6 +128,11 @@ public:
    F32 getScore() const { return mScore; }
 
    void clear();
+
+   inline bool ProbeRenderInst::operator ==(const ProbeRenderInst& b) const
+   {
+      return mProbeIdx == b.mProbeIdx;
+   }
 };
 
 struct ProbeShaderConstants
@@ -168,7 +177,7 @@ class RenderProbeMgr : public RenderBinManager
 {
    typedef RenderBinManager Parent;
 
-   Vector<U32> mRegisteredProbes;
+   Vector<ProbeRenderInst> mRegisteredProbes;
 
    bool mProbesDirty;
 
@@ -254,7 +263,6 @@ protected:
       GFXShaderConstBuffer *shaderConsts);
 
    void _setupStaticParameters();
-   void updateProbeTexture(U32 probeIdx);
    void _setupPerFrameParameters(const SceneRenderState *state);
    virtual void addElement(RenderInst *inst);
    virtual void render(SceneRenderState * state);
@@ -263,29 +271,6 @@ protected:
 
    PostEffect* getProbeArrayEffect();
 
-public:
-   // RenderBinMgr
-   void updateProbes();
-   void updateProbeTexture(ProbeRenderInst* probe);
-
-   /// Returns the active LM.
-   static inline RenderProbeMgr* getProbeManager();
-
-   void registerProbe(U32 probeIdx);
-   void unregisterProbe(U32 probeIdx);
-
-   virtual void setProbeInfo(ProcessedMaterial *pmat,
-	   const Material *mat,
-	   const SceneData &sgData,
-	   const SceneRenderState *state,
-	   U32 pass,
-	   GFXShaderConstBuffer *shaderConsts);
-
-   /// Debug rendering
-   static bool smRenderReflectionProbes;
-
-   void bakeProbe(ReflectionProbe *probeInfo);
-   void bakeProbes();
 
    U32 _findNextEmptyCubeSlot()
    {
@@ -296,6 +281,31 @@ public:
       }
       return INVALID_CUBE_SLOT;
    }
+
+public:
+   // RenderBinMgr
+   void updateProbes();
+
+   /// Returns the active LM.
+   static inline RenderProbeMgr* getProbeManager();
+
+   ProbeRenderInst* registerProbe(const bool& isSkylight);
+   void unregisterProbe(U32 probeIdx);
+
+   virtual void setProbeInfo(ProcessedMaterial *pmat,
+	   const Material *mat,
+	   const SceneData &sgData,
+	   const SceneRenderState *state,
+	   U32 pass,
+	   GFXShaderConstBuffer *shaderConsts);
+
+   void updateProbeTexture(U32 probeIdx);
+
+   /// Debug rendering
+   static bool smRenderReflectionProbes;
+
+   void bakeProbe(ReflectionProbe *probeInfo);
+   void bakeProbes();
 };
 
 RenderProbeMgr* RenderProbeMgr::getProbeManager()

Templates/BaseGame/game/core/postFX/scripts/pbr.cs

@@ -15,5 +15,4 @@ singleton PostEffect( reflectionProbeArrayPostFX )
    texture[0] = "#deferred";
    texture[1] = "#color";
    texture[2] = "#matinfo";
-   texture[3] = "core/rendering/images/brdfTexture.dds";   
 };

Templates/BaseGame/game/core/rendering/Core_Rendering.cs

@@ -7,6 +7,7 @@ function Core_Rendering::onCreate(%this)
    $Core::CommonShaderPath = "core/rendering/shaders";
    $Core::DefaultIrradianceCubemap = "core/rendering/images/default_irradiance.dds";
    $Core::DefaultPrefilterCubemap = "core/rendering/images/default_prefilter.dds";
+   $Core::BRDFTexture = "core/rendering/images/brdfTexture.dds";
    
    exec("./scripts/renderManager.cs");
    exec("./scripts/gfxData/clouds.cs");

Templates/BaseGame/game/data/TTR/Images/Conc39_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Conc39_ALBEDO"
+    imageFile="@assetFile=Conc39.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/Conc39.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/CorrugatedWall6_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="CorrugatedWall6_ALBEDO"
+    imageFile="@assetFile=CorrugatedWall6.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/CorrugatedWall6.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Danger_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Danger_ALBEDO"
+    imageFile="@assetFile=Danger"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Danger"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Grass_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Grass_ALBEDO"
+    imageFile="@assetFile=Grass"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Grass"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Rock3_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Rock3_ALBEDO"
+    imageFile="@assetFile=Rock3.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/Rock3.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/SMBunkWall66_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="SMBunkWall66_ALBEDO"
+    imageFile="@assetFile=SMBunkWall66.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/SMBunkWall66.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/SMFan05_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="SMFan05_ALBEDO"
+    imageFile="@assetFile=SMFan05"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/SMFan05"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/SMFloorGrateNM2a_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="SMFloorGrateNM2a_ALBEDO"
+    imageFile="@assetFile=SMFloorGrateNM2a.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/SMFloorGrateNM2a.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/SMIntWall8756_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="SMIntWall8756_ALBEDO"
+    imageFile="@assetFile=SMIntWall8756.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/SMIntWall8756.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/SMOldWood23_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="SMOldWood23_ALBEDO"
+    imageFile="@assetFile=SMOldWood23"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/SMOldWood23"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/SMPOWWall34_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="SMPOWWall34_ALBEDO"
+    imageFile="@assetFile=SMPOWWall34"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/SMPOWWall34"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/SMPOWWall35_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="SMPOWWall35_ALBEDO"
+    imageFile="@assetFile=SMPOWWall35"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/SMPOWWall35"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/SMRoadStr63215_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="SMRoadStr63215_ALBEDO"
+    imageFile="@assetFile=SMRoadStr63215"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/SMRoadStr63215"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/ULoker67_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="ULoker67_ALBEDO"
+    imageFile="@assetFile=ULoker67"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/ULoker67"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Ubench_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Ubench_ALBEDO"
+    imageFile="@assetFile=Ubench"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Ubench"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Uboxpil_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Uboxpil_ALBEDO"
+    imageFile="@assetFile=Uboxpil"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Uboxpil"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Ucntrlos_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Ucntrlos_ALBEDO"
+    imageFile="@assetFile=Ucntrlos"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Ucntrlos"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Ucntrlss2_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Ucntrlss2_ALBEDO"
+    imageFile="@assetFile=Ucntrlss2"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Ucntrlss2"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Ucrate1cnew_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Ucrate1cnew_ALBEDO"
+    imageFile="@assetFile=Ucrate1cnew"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Ucrate1cnew"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Ucratswas_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Ucratswas_ALBEDO"
+    imageFile="@assetFile=Ucratswas"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Ucratswas"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Udubdors_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Udubdors_ALBEDO"
+    imageFile="@assetFile=Udubdors"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Udubdors"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Uflorwood_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Uflorwood_ALBEDO"
+    imageFile="@assetFile=Uflorwood"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Uflorwood"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Ulitblok2_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Ulitblok2_ALBEDO"
+    imageFile="@assetFile=Ulitblok2"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Ulitblok2"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Umaindor2_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Umaindor2_ALBEDO"
+    imageFile="@assetFile=Umaindor2"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Umaindor2"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Umaindor_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Umaindor_ALBEDO"
+    imageFile="@assetFile=Umaindor.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/Umaindor.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Upipes3_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Upipes3_ALBEDO"
+    imageFile="@assetFile=Upipes3"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Upipes3"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Urofstrut_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Urofstrut_ALBEDO"
+    imageFile="@assetFile=Urofstrut"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Urofstrut"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Urstfnce_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Urstfnce_ALBEDO"
+    imageFile="@assetFile=Urstfnce"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Urstfnce"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/Utoilt_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="Utoilt_ALBEDO"
+    imageFile="@assetFile=Utoilt"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/Utoilt"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/WALL104_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="WALL104_ALBEDO"
+    imageFile="@assetFile=WALL104"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/WALL104"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/conc20_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="conc20_ALBEDO"
+    imageFile="@assetFile=conc20.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/conc20.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/conc21_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="conc21_ALBEDO"
+    imageFile="@assetFile=conc21.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/conc21.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/crate9_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="crate9_ALBEDO"
+    imageFile="@assetFile=crate9"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/crate9"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/door9_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="door9_ALBEDO"
+    imageFile="@assetFile=door9.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/door9.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/gr42_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="gr42_ALBEDO"
+    imageFile="@assetFile=gr42.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/gr42.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/gr53_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="gr53_ALBEDO"
+    imageFile="@assetFile=gr53.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/gr53.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/gr55_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="gr55_ALBEDO"
+    imageFile="@assetFile=gr55.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/gr55.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/gr80_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="gr80_ALBEDO"
+    imageFile="@assetFile=gr80.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/gr80.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/met13_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="met13_ALBEDO"
+    imageFile="@assetFile=met13.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/met13.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/met19_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="met19_ALBEDO"
+    imageFile="@assetFile=met19.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/met19.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/met2_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="met2_ALBEDO"
+    imageFile="@assetFile=met2"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/met2"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/met32_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="met32_ALBEDO"
+    imageFile="@assetFile=met32.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/met32.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/met33_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="met33_ALBEDO"
+    imageFile="@assetFile=met33.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/met33.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/misc43_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="misc43_ALBEDO"
+    imageFile="@assetFile=misc43.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/misc43.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/roof11_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="roof11_ALBEDO"
+    imageFile="@assetFile=roof11.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/roof11.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/trim10_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="trim10_ALBEDO"
+    imageFile="@assetFile=trim10.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/trim10.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/trim13_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="trim13_ALBEDO"
+    imageFile="@assetFile=trim13.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/trim13.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/veh20_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="veh20_ALBEDO"
+    imageFile="@assetFile=veh20"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/veh20"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/wall69_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="wall69_ALBEDO"
+    imageFile="@assetFile=wall69.png"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="E:/Gamedev/TTR/TTRClassic/levels/Exported/wall69.png"
+    VersionId="1" />

Templates/BaseGame/game/data/TTR/Images/wall72_ALBEDO.asset.taml

@@ -0,0 +1,9 @@
+<ImageAsset
+    canSave="true"
+    canSaveDynamicFields="true"
+    AssetName="wall72_ALBEDO"
+    imageFile="@assetFile=wall72"
+    useMips="true"
+    isHDRImage="false"
+    originalFilePath="/wall72"
+    VersionId="1" />