Переглянути джерело

EntityLatticeTestComponent post PR cleanup

Remove unneeded palification of lattice spacing and scale.
Prevent zero size spacing and scale.
Move performance test default value init to a function.

Signed-off-by: rgba16f <[email protected]>
rgba16f 3 роки тому
батько
коміт
2bd1c858d4

+ 8 - 6
Gem/Code/Source/EntityLatticeTestComponent.cpp

@@ -27,8 +27,10 @@ namespace AtomSampleViewer
     using namespace RPI;
 
     constexpr int32_t s_latticeSizeMax = ENTITY_LATTEST_TEST_COMPONENT_MAX;
-    constexpr float s_spacingMax = ENTITY_LATTEST_TEST_COMPONENT_SPACING_MAX;
-    constexpr float s_entityScaleMax = ENTITY_LATTEST_TEST_COMPONENT_ENTITY_SCALE_MAX;
+    constexpr float s_spacingMax = 100.0f;
+    constexpr float s_spacingMin = 0.5f;
+    constexpr float s_entityScaleMax = 10.0f;
+    constexpr float s_entityScaleMin = 0.1f;
 
     void EntityLatticeTestComponent::Reflect(ReflectContext* context)
     {
@@ -112,14 +114,14 @@ namespace AtomSampleViewer
 
     void EntityLatticeTestComponent::SetLatticeSpacing( float spaceX, float spaceY, float spaceZ)
     {
-        m_spacingX = AZ::GetClamp<float>(spaceX, 0.0f, s_spacingMax);
-        m_spacingY = AZ::GetClamp<float>(spaceY, 0.0f, s_spacingMax);
-        m_spacingZ = AZ::GetClamp<float>(spaceZ, 0.0f, s_spacingMax);
+        m_spacingX = AZ::GetClamp<float>(spaceX, s_spacingMin, s_spacingMax);
+        m_spacingY = AZ::GetClamp<float>(spaceY, s_spacingMin, s_spacingMax);
+        m_spacingZ = AZ::GetClamp<float>(spaceZ, s_spacingMin, s_spacingMax);
     }
 
     void EntityLatticeTestComponent::SetLatticeEntityScale(float scale)
     {
-        m_entityScale = AZ::GetClamp<float>(scale, 0.0f, s_entityScaleMax);
+        m_entityScale = AZ::GetClamp<float>(scale, s_entityScaleMin, s_entityScaleMax);
     }
 
     void EntityLatticeTestComponent::SetIBLExposure(float exposure)

+ 3 - 3
Gem/Code/Source/EntityLatticeTestComponent.h

@@ -79,9 +79,9 @@ namespace AtomSampleViewer
         int32_t m_latticeHeight = ENTITY_LATTICE_TEST_COMPONENT_HEIGHT;
         int32_t m_latticeDepth = ENTITY_LATTICE_TEST_COMPONENT_DEPTH;
 
-        float m_spacingX = ENTITY_LATTICE_TEST_COMPONENT_SPACING_X;
-        float m_spacingY = ENTITY_LATTICE_TEST_COMPONENT_SPACING_Y;
-        float m_spacingZ = ENTITY_LATTICE_TEST_COMPONENT_SPACING_Z;
+        float m_spacingX = 5.0f;
+        float m_spacingY = 5.0f;
+        float m_spacingZ = 5.0f;
 
         float m_entityScale = 1.0f;
         

+ 27 - 21
Gem/Code/Source/Performance/100KDraw_10KDrawable_MultiView_ExampleComponent.cpp

@@ -33,28 +33,34 @@ namespace AtomSampleViewer
     _100KDraw10KDrawableExampleComponent::_100KDraw10KDrawableExampleComponent() 
     {
         m_sampleName = "100KDraw10KEntityTest";
+        InitDefaultValues(m_testParameters);
+    }
 
-        for (int index = 0; index < 3; ++index)
-        {
-            m_testParameters.m_latticeSize[index] = 22;
-            m_testParameters.m_latticeSpacing[index] = 3.0f;
-        }
-        m_testParameters.m_numShadowCastingSpotLights = 7;
-        m_testParameters.m_shadowSpotlightInnerAngleDeg = 30.0f;
-        m_testParameters.m_shadowSpotlightOuterAngleDeg = 30.0f;
-        m_testParameters.m_shadowSpotlightMaxDistance = 200.0f;
-        m_testParameters.m_shadowSpotlightIntensity = 50000.f;
-
-        m_testParameters.m_activateDirectionalLight = true;
-        m_testParameters.m_directionalLightIntensity = 5.0f;
-
-        m_testParameters.m_cameraPosition[0] = -81.0f;
-        m_testParameters.m_cameraPosition[1] = 31.0f;
-        m_testParameters.m_cameraPosition[2] = 32.0f;
-        m_testParameters.m_cameraHeadingDeg = -90.0f;
-        m_testParameters.m_cameraPitchDeg = 0.0f;
-        m_testParameters.m_iblExposure = -10.0f;
+    void _100KDraw10KDrawableExampleComponent::InitDefaultValues(HighInstanceTestParameters& defaultParameters)
+    {
+        defaultParameters.m_latticeSize[0] = 22;
+        defaultParameters.m_latticeSize[1] = 22;
+        defaultParameters.m_latticeSize[2] = 22;
+
+        defaultParameters.m_latticeSpacing[0] = 3.0f;
+        defaultParameters.m_latticeSpacing[1] = 3.0f;
+        defaultParameters.m_latticeSpacing[2] = 3.0f;
+
+        defaultParameters.m_numShadowCastingSpotLights = 7;
+        defaultParameters.m_shadowSpotlightInnerAngleDeg = 30.0f;
+        defaultParameters.m_shadowSpotlightOuterAngleDeg = 30.0f;
+        defaultParameters.m_shadowSpotlightMaxDistance = 200.0f;
+        defaultParameters.m_shadowSpotlightIntensity = 50000.f;
+
+        defaultParameters.m_activateDirectionalLight = true;
+        defaultParameters.m_directionalLightIntensity = 5.0f;
+
+        defaultParameters.m_cameraPosition[0] = -81.0f;
+        defaultParameters.m_cameraPosition[1] = 31.0f;
+        defaultParameters.m_cameraPosition[2] = 32.0f;
+        defaultParameters.m_cameraHeadingDeg = -90.0f;
+        defaultParameters.m_cameraPitchDeg = 0.0f;
+        defaultParameters.m_iblExposure = -10.0f;
     }
 
-    
 } // namespace AtomSampleViewer

+ 2 - 0
Gem/Code/Source/Performance/100KDraw_10KDrawable_MultiView_ExampleComponent.h

@@ -28,5 +28,7 @@ namespace AtomSampleViewer
 
     private:
         AZ_DISABLE_COPY_MOVE(_100KDraw10KDrawableExampleComponent);
+
+        static void InitDefaultValues(HighInstanceTestParameters& defaultParameters);
     };
 } // namespace AtomSampleViewer

+ 22 - 14
Gem/Code/Source/Performance/100KDrawable_SingleView_ExampleComponent.cpp

@@ -32,21 +32,29 @@ namespace AtomSampleViewer
     _100KDrawableExampleComponent::_100KDrawableExampleComponent() 
     {
         m_sampleName = "100KEntityTest";
+        InitDefaultValues(m_testParameters);
+    }
 
-        for (int index = 0; index < 3; ++index)
-        {
-            m_testParameters.m_latticeSize[index] = 46;
-            m_testParameters.m_latticeSpacing[index] = 3.0f;
-        }
-        m_testParameters.m_numShadowCastingSpotLights = 0;
-        m_testParameters.m_activateDirectionalLight = false;
-
-        m_testParameters.m_cameraPosition[0] = -173.0f;
-        m_testParameters.m_cameraPosition[1] = 66.0f;
-        m_testParameters.m_cameraPosition[2] = 68.0f;
-        m_testParameters.m_cameraHeadingDeg = -90.0f;
-        m_testParameters.m_cameraPitchDeg = 0.0f;
-        m_testParameters.m_iblExposure = 0.0f;
+    void _100KDrawableExampleComponent::InitDefaultValues(HighInstanceTestParameters& defaultParameters)
+    {
+        defaultParameters.m_latticeSize[0] = 46;
+        defaultParameters.m_latticeSize[1] = 46;
+        defaultParameters.m_latticeSize[2] = 46;
+
+        defaultParameters.m_latticeSpacing[0] = 3.0f;
+        defaultParameters.m_latticeSpacing[1] = 3.0f;
+        defaultParameters.m_latticeSpacing[2] = 3.0f;
+
+        defaultParameters.m_numShadowCastingSpotLights = 0;
+        defaultParameters.m_activateDirectionalLight = false;
+
+        defaultParameters.m_cameraPosition[0] = -173.0f;
+        defaultParameters.m_cameraPosition[1] = 66.0f;
+        defaultParameters.m_cameraPosition[2] = 68.0f;
+        defaultParameters.m_cameraHeadingDeg = -90.0f;
+        defaultParameters.m_cameraPitchDeg = 0.0f;
+        defaultParameters.m_iblExposure = 0.0f;
     }
+
     
 } // namespace AtomSampleViewer

+ 2 - 0
Gem/Code/Source/Performance/100KDrawable_SingleView_ExampleComponent.h

@@ -27,5 +27,7 @@ namespace AtomSampleViewer
 
     private:
         AZ_DISABLE_COPY_MOVE(_100KDrawableExampleComponent);
+
+        static void InitDefaultValues(HighInstanceTestParameters& defaultParameters);
     };
 } // namespace AtomSampleViewer

+ 0 - 5
Gem/Code/Source/Platform/Android/EntityLatticeTestComponent_Traits_Platform.h

@@ -12,8 +12,3 @@
 #define ENTITY_LATTICE_TEST_COMPONENT_HEIGHT                    2
 #define ENTITY_LATTICE_TEST_COMPONENT_DEPTH                     2
 #define ENTITY_LATTEST_TEST_COMPONENT_MAX                       4
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_X                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Y                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Z                 5.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_SPACING_MAX               100.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_ENTITY_SCALE_MAX          10.0f

+ 0 - 5
Gem/Code/Source/Platform/Linux/EntityLatticeTestComponent_Traits_Platform.h

@@ -10,8 +10,3 @@
 #define ENTITY_LATTICE_TEST_COMPONENT_HEIGHT                    5
 #define ENTITY_LATTICE_TEST_COMPONENT_DEPTH                     5
 #define ENTITY_LATTEST_TEST_COMPONENT_MAX                       100
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_X                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Y                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Z                 5.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_SPACING_MAX               100.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_ENTITY_SCALE_MAX          10.0f

+ 0 - 5
Gem/Code/Source/Platform/Mac/EntityLatticeTestComponent_Traits_Platform.h

@@ -10,8 +10,3 @@
 #define ENTITY_LATTICE_TEST_COMPONENT_HEIGHT                    5
 #define ENTITY_LATTICE_TEST_COMPONENT_DEPTH                     5
 #define ENTITY_LATTEST_TEST_COMPONENT_MAX                       100
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_X                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Y                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Z                 5.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_SPACING_MAX               100.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_ENTITY_SCALE_MAX          10.0f

+ 0 - 5
Gem/Code/Source/Platform/Windows/EntityLatticeTestComponent_Traits_Platform.h

@@ -10,8 +10,3 @@
 #define ENTITY_LATTICE_TEST_COMPONENT_HEIGHT                    5
 #define ENTITY_LATTICE_TEST_COMPONENT_DEPTH                     5
 #define ENTITY_LATTEST_TEST_COMPONENT_MAX                       100
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_X                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Y                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Z                 5.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_SPACING_MAX               100.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_ENTITY_SCALE_MAX          10.0f

+ 0 - 5
Gem/Code/Source/Platform/iOS/EntityLatticeTestComponent_Traits_Platform.h

@@ -10,8 +10,3 @@
 #define ENTITY_LATTICE_TEST_COMPONENT_HEIGHT                    5
 #define ENTITY_LATTICE_TEST_COMPONENT_DEPTH                     5
 #define ENTITY_LATTEST_TEST_COMPONENT_MAX                       20
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_X                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Y                 5.0f
-#define ENTITY_LATTICE_TEST_COMPONENT_SPACING_Z                 5.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_SPACING_MAX               100.0f
-#define ENTITY_LATTEST_TEST_COMPONENT_ENTITY_SCALE_MAX          10.0f