Merge branch 'master' of https://github.com/whocares77/FlaxEngine into whocares77-master

Source/Engine/Level/Actors/EnvironmentProbe.cpp

@@ -13,6 +13,7 @@
 #include "Engine/ContentImporters/AssetsImportingManager.h"
 #include "Engine/Serialization/Serialization.h"
 #include "Engine/Level/Scene/Scene.h"
+#include "Engine/Graphics/Graphics.h"
 
 EnvironmentProbe::EnvironmentProbe(const SpawnParams& params)
     : Actor(params)
@@ -80,8 +81,12 @@ void EnvironmentProbe::Bake(float timeout)
 
 void EnvironmentProbe::SetProbeData(TextureData& data)
 {
+    int32 probeResolution = (int32)CubemapResolution;
+    // if Use Graphics Settings
+    if (probeResolution == 0) probeResolution = Graphics::DefaultProbeResolution;
+
     // Validate input data
-    ASSERT(data.GetArraySize() == 6 && data.Height == ENV_PROBES_RESOLUTION && data.Width == ENV_PROBES_RESOLUTION);
+    ASSERT(data.GetArraySize() == 6 && data.Height == probeResolution && data.Width == probeResolution);  
 
     // Check if was using custom probe
     if (_isUsingCustomProbe)
@@ -170,6 +175,7 @@ void EnvironmentProbe::Serialize(SerializeStream& stream, const void* otherObj)
     SERIALIZE_GET_OTHER_OBJ(EnvironmentProbe);
 
     SERIALIZE_MEMBER(Radius, _radius);
+    SERIALIZE(CubemapResolution);
     SERIALIZE(Brightness);
     SERIALIZE(AutoUpdate);
     SERIALIZE(CaptureNearPlane);
@@ -183,6 +189,7 @@ void EnvironmentProbe::Deserialize(DeserializeStream& stream, ISerializeModifier
     Actor::Deserialize(stream, modifier);
 
     DESERIALIZE_MEMBER(Radius, _radius);
+    DESERIALIZE(CubemapResolution);
     DESERIALIZE(Brightness);
     DESERIALIZE(AutoUpdate);
     DESERIALIZE(CaptureNearPlane);

Source/Engine/Level/Actors/EnvironmentProbe.h

@@ -19,6 +19,23 @@ private:
     AssetReference<CubeTexture> _probe;
 
 public:
+    /// <summary>
+    /// The reflections texture resolution.
+    /// </summary>
+    API_ENUM() enum class CubemapResolutions
+    {
+        UseGraphicsSettings = 0,
+        _64 = 64,
+        _128 = 128,
+        _256 = 256,
+        _512 = 512,
+        _1024 = 1024,
+        _2048 = 2048,
+        _4096 = 4096,
+    };
+    API_FIELD(Attributes = "EditorOrder(0), DefaultValue(CubemapResolutions.UseGraphicsSettings), EditorDisplay(\"Probe\")")
+    CubemapResolutions CubemapResolution = CubemapResolutions::UseGraphicsSettings;
+
     /// <summary>
     /// The reflections brightness.
     /// </summary>