ソースを参照

Follow up fix for ATOM-15066. Fixed a compiling issue with unity build. (#130) (#135)

(cherry picked from commit c03bc593a8e75a3857ec3851bb7bc99068e62d34)
Qing Tao 4 年 前
コミット
abce62b1bb

+ 0 - 6
Gem/Code/Source/MultiRenderPipelineExampleComponent.cpp

@@ -50,12 +50,6 @@ namespace AtomSampleViewer
 {
     using namespace AZ;
 
-    namespace
-    {
-        const char* BunnyModelFilePath = "objects/bunny.azmodel";
-        const char* CubeModelFilePath = "testdata/objects/cube/cube.azmodel";
-    };
-
     void MultiRenderPipelineExampleComponent::Reflect(AZ::ReflectContext* context)
     {
         if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))

+ 0 - 7
Gem/Code/Source/MultiSceneExampleComponent.cpp

@@ -43,13 +43,6 @@ namespace AtomSampleViewer
 {
     using namespace AZ;
 
-    namespace
-    {
-        const char* BunnyModelFilePath = "objects/bunny.azmodel";
-        const char* ShaderBallModelFilePath = "objects/shaderball_simple.azmodel";
-        const char* CubeModelFilePath = "testdata/objects/cube/cube.azmodel";
-    };
-
     //////////////////////////////////////////////////////////////////////////
     // SecondWindowedScene
 

+ 4 - 1
Gem/Code/Source/SampleComponentConfig.h

@@ -20,7 +20,10 @@
 
 namespace AtomSampleViewer
 {
-    static constexpr const char DefaultPbrMaterialPath[] = "materials/defaultpbr.azmaterial";
+    static constexpr const char DefaultPbrMaterialPath[] = "materials/defaultpbr.azmaterial";    
+    static constexpr const char BunnyModelFilePath[] = "objects/bunny.azmodel";
+    static constexpr const char ShaderBallModelFilePath[] = "objects/shaderball_simple.azmodel";
+    static constexpr const char CubeModelFilePath[] = "testdata/objects/cube/cube.azmodel";
 
     class SampleComponentConfig
         : public AZ::ComponentConfig

+ 0 - 6
Gem/Code/Source/ShadowExampleComponent.cpp

@@ -34,12 +34,6 @@
 
 namespace AtomSampleViewer
 {
-    namespace
-    {
-        const char* BunnyModelFilePath = "objects/bunny.azmodel";
-        const char* CubeModelFilePath = "testdata/objects/cube/cube.azmodel";
-    };
-
     const AZ::Color ShadowExampleComponent::DirectionalLightColor = AZ::Color::CreateOne();
     AZ::Color ShadowExampleComponent::s_positionalLightColors[] = {
         // they will be initialized in the constructor.