birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FBX -> Scene, part 2. Code changes, file renames (#1704)

Browse Source 
* First pass FBX -> Scene File conversion.
This is the simple pass, minimizing code changes and focused on comments.

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Step 1 of part 2 of the FBX -> Scene rename

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renaming FbxSceneBuilder folder to SceneBuilder

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* Renamed files

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>

* More FBX -> Scene

Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
This commit is contained in:
AMZN-stankowi
2021-07-01 15:46:55 -07:00
committed by GitHub
parent 328a0f09a5
commit 73522e90c9
83 changed files with 475 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.cpp
+2 -2
View File
@@ -15,8 +15,8 @@ namespace AZ
{
namespace AssImpSDKWrapper
{
AssImpNodeWrapper::AssImpNodeWrapper(aiNode* fbxNode)
:SDKNode::NodeWrapper(fbxNode)
AssImpNodeWrapper::AssImpNodeWrapper(aiNode* sourceNode)
:SDKNode::NodeWrapper(sourceNode)
{
AZ_Assert(m_assImpNode, "Asset Importer Node cannot be null");
}
Code/Tools/SceneAPI/SDKWrapper/AssImpNodeWrapper.h
+1 -1
View File
@@ -18,7 +18,7 @@ namespace AZ
{
public:
AZ_RTTI(AssImpNodeWrapper, "{1043260B-9076-49B7-AD38-EF62E85F7C1D}", SDKNode::NodeWrapper);
AssImpNodeWrapper(aiNode* fbxNode);
AssImpNodeWrapper(aiNode* sourceNode);
~AssImpNodeWrapper() override;
const char* GetName() const override;
AZ::u64 GetUniqueId() const override;
Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.cpp
+1 -14
View File
@@ -11,29 +11,16 @@ namespace AZ
{
namespace SDKMaterial
{
MaterialWrapper::MaterialWrapper(fbxsdk::FbxSurfaceMaterial* fbxMaterial)
:m_fbxMaterial(fbxMaterial)
, m_assImpMaterial(nullptr)
{
}
MaterialWrapper::MaterialWrapper(aiMaterial* assImpMaterial)
:m_fbxMaterial(nullptr)
, m_assImpMaterial(assImpMaterial)
: m_assImpMaterial(assImpMaterial)
{
}
MaterialWrapper::~MaterialWrapper()
{
m_fbxMaterial = nullptr;
m_assImpMaterial = nullptr;
}
fbxsdk::FbxSurfaceMaterial* MaterialWrapper::GetFbxMaterial()
{
return m_fbxMaterial;
}
aiMaterial* MaterialWrapper::GetAssImpMaterial()
{
return m_assImpMaterial;
Code/Tools/SceneAPI/SDKWrapper/MaterialWrapper.h
-9
View File
@@ -10,14 +10,8 @@
#include <AzCore/std/string/string.h>
#include <AzCore/Math/Vector3.h>
namespace fbxsdk
{
class FbxSurfaceMaterial;
}
struct aiMaterial;
namespace AZ
{
namespace SDKMaterial
@@ -39,11 +33,9 @@ namespace AZ
BaseColor
};
MaterialWrapper(fbxsdk::FbxSurfaceMaterial* fbxMaterial);
MaterialWrapper(aiMaterial* assImpmaterial);
virtual ~MaterialWrapper();
fbxsdk::FbxSurfaceMaterial* GetFbxMaterial();
aiMaterial* GetAssImpMaterial();
virtual AZStd::string GetName() const;
@@ -56,7 +48,6 @@ namespace AZ
virtual float GetShininess() const;
protected:
fbxsdk::FbxSurfaceMaterial* m_fbxMaterial = nullptr;
aiMaterial* m_assImpMaterial = nullptr;
};
} // namespace SDKMaterial
Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.cpp
+1 -14
View File
@@ -11,29 +11,16 @@ namespace AZ
{
namespace SDKNode
{
NodeWrapper::NodeWrapper(fbxsdk::FbxNode* fbxNode)
:m_fbxNode(fbxNode)
, m_assImpNode(nullptr)
{
}
NodeWrapper::NodeWrapper(aiNode* aiNode)
:m_fbxNode(nullptr)
, m_assImpNode(aiNode)
: m_assImpNode(aiNode)
{
}
NodeWrapper::~NodeWrapper()
{
m_fbxNode = nullptr;
m_assImpNode = nullptr;
}
fbxsdk::FbxNode* NodeWrapper::GetFbxNode()
{
return m_fbxNode;
}
aiNode* NodeWrapper::GetAssImpNode()
{
return m_assImpNode;
Code/Tools/SceneAPI/SDKWrapper/NodeWrapper.h
-8
View File
@@ -6,10 +6,6 @@
*/
#pragma once
#include <AzCore/RTTI/RTTI.h>
namespace fbxsdk
{
class FbxNode;
}
struct aiNode;
@@ -23,7 +19,6 @@ namespace AZ
AZ_RTTI(NodeWrapper, "{5EB0897B-9728-44B7-B056-BA34AAF14715}");
NodeWrapper() = default;
NodeWrapper(fbxsdk::FbxNode* fbxNode);
NodeWrapper(aiNode* aiNode);
virtual ~NodeWrapper();
@@ -34,7 +29,6 @@ namespace AZ
Component_Z
};
fbxsdk::FbxNode* GetFbxNode();
aiNode* GetAssImpNode();
virtual const char* GetName() const;
@@ -44,8 +38,6 @@ namespace AZ
virtual int GetChildCount()const;
virtual const std::shared_ptr<NodeWrapper> GetChild(int childIndex) const;
fbxsdk::FbxNode* m_fbxNode = nullptr;
aiNode* m_assImpNode = nullptr;
};
} //namespace Node
Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.cpp
+1 -13
View File
@@ -12,15 +12,8 @@ namespace AZ
{
const char* SceneWrapperBase::s_defaultSceneName = "myScene";
SceneWrapperBase::SceneWrapperBase(fbxsdk::FbxScene* fbxScene)
:m_fbxScene(fbxScene)
, m_assImpScene(nullptr)
{
}
SceneWrapperBase::SceneWrapperBase(aiScene* aiScene)
:m_fbxScene(nullptr)
, m_assImpScene(aiScene)
: m_assImpScene(aiScene)
{
}
@@ -47,11 +40,6 @@ namespace AZ
{
}
fbxsdk::FbxScene* SceneWrapperBase::GetFbxScene() const
{
return m_fbxScene;
}
const aiScene* SceneWrapperBase::GetAssImpScene() const
{
return m_assImpScene;
Code/Tools/SceneAPI/SDKWrapper/SceneWrapper.h
-8
View File
@@ -8,14 +8,9 @@
#include <AzCore/std/smart_ptr/shared_ptr.h>
#include <AzCore/std/string/string.h>
#include <SceneAPI/SDKWrapper/NodeWrapper.h>
namespace fbxsdk
{
class FbxScene;
}
struct aiScene;
namespace AZ
{
namespace SDKScene
@@ -25,7 +20,6 @@ namespace AZ
public:
AZ_RTTI(SceneWrapperBase, "{703CD344-2C75-4F30-8CE2-6BDEF2511AFD}");
SceneWrapperBase() = default;
SceneWrapperBase(fbxsdk::FbxScene* fbxScene);
virtual ~SceneWrapperBase() = default;
SceneWrapperBase(aiScene* aiScene);
@@ -37,10 +31,8 @@ namespace AZ
virtual void Clear();
virtual fbxsdk::FbxScene* GetFbxScene() const;
virtual const aiScene* GetAssImpScene() const;
fbxsdk::FbxScene* m_fbxScene = nullptr;
const aiScene* m_assImpScene = nullptr;
static const char* s_defaultSceneName;