xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Added script inspector and serialization support for RigAsset and AnimationClipAsset

This commit is contained in:
Kah Wei 2023-01-31 11:29:00 +08:00
parent a0bafcc526
commit 933e963950
4 changed files with 161 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SHADE_Managed/src/Editor/Editor.cxx
View File

@ -18,6 +18,7 @@ of DigiPen Institute of Technology is prohibited.
#include "Editor/Editor.hxx"
// STL Includes
#include <memory>
#include <string>
// Project Headers
#include "Components/Component.hxx"
#include "Scripts/ScriptStore.hxx"
@ -30,7 +31,8 @@ of DigiPen Institute of Technology is prohibited.
#include "RangeAttribute.hxx"
#include "Math/Vector2.hxx"
#include "Math/Vector3.hxx"
#include <string>
#include "Assets/RigAsset.hxx"
#include "Assets/AnimationClipAsset.hxx"
// Using Directives
using namespace System;
@ -179,7 +181,9 @@ namespace SHADE
renderSpecificField<int , System::Enum >(field, object, nullptr , &isHovered) ||
renderSpecificField<AssetID , FontAsset >(field, object, nullptr , &isHovered) ||
renderSpecificField<AssetID , MeshAsset >(field, object, nullptr , &isHovered) ||
renderSpecificField<AssetID , MaterialAsset >(field, object, nullptr , &isHovered);
renderSpecificField<AssetID , MaterialAsset >(field, object, nullptr , &isHovered) ||
renderSpecificField<AssetID , RigAsset >(field, object, nullptr , &isHovered) ||
renderSpecificField<AssetID , AnimationClipAsset>(field, object, nullptr , &isHovered);
if (!MODIFIED_PRIMITIVE)
{
@ -340,7 +344,9 @@ namespace SHADE
renderFieldEditor<int , System::Enum >(fieldName, object, nullptr , nullptr, rangeAttrib, modified) ||
renderFieldEditor<AssetID , FontAsset >(fieldName, object, nullptr , nullptr, rangeAttrib, modified) ||
renderFieldEditor<AssetID , MeshAsset >(fieldName, object, nullptr , nullptr, rangeAttrib, modified) ||
renderFieldEditor<AssetID , MaterialAsset >(fieldName, object, nullptr , nullptr, rangeAttrib, modified);
renderFieldEditor<AssetID , MaterialAsset >(fieldName, object, nullptr , nullptr, rangeAttrib, modified)||
renderFieldEditor<AssetID , RigAsset >(fieldName, object, nullptr , nullptr, rangeAttrib, modified) ||
renderFieldEditor<AssetID , AnimationClipAsset>(fieldName, object, nullptr , nullptr, rangeAttrib, modified);
return modified;
}

26
SHADE_Managed/src/Editor/Editor.h++
View File

@ -23,6 +23,8 @@ of DigiPen Institute of Technology is prohibited.
#include "Assets/FontAsset.hxx"
#include "Assets/MeshAsset.hxx"
#include "Assets/MaterialAsset.hxx"
#include "Assets/RigAsset.hxx"
#include "Assets/AnimationClipAsset.hxx"
namespace SHADE
{
@ -237,6 +239,30 @@ namespace SHADE
return true;
}
return false;
}
template<>
bool Editor::renderFieldEditorInternal<AssetID, RigAsset>(const std::string& fieldName, interior_ptr<RigAsset> managedValPtr, EditorFieldFunc<uint32_t>, bool* isHovered, RangeAttribute^)
{
uint32_t assetId = managedValPtr->NativeAssetID;
if (SHEditorUI::InputAssetField(fieldName, assetId, AssetType::MODEL, isHovered))
{
*managedValPtr = RigAsset(assetId);
return true;
}
return false;
}
template<>
bool Editor::renderFieldEditorInternal<AssetID, AnimationClipAsset>(const std::string& fieldName, interior_ptr<AnimationClipAsset> managedValPtr, EditorFieldFunc<uint32_t>, bool* isHovered, RangeAttribute^)
{
uint32_t assetId = managedValPtr->NativeAssetID;
if (SHEditorUI::InputAssetField(fieldName, assetId, AssetType::MODEL, isHovered))
{
*managedValPtr = AnimationClipAsset(assetId);
return true;
}
return false;
}
}

18
SHADE_Managed/src/Serialisation/SerialisationUtilities.cxx
View File

@ -22,6 +22,8 @@ of DigiPen Institute of Technology is prohibited.
#include "Assets/MaterialAsset.hxx"
#include "Assets/MeshAsset.hxx"
#include "Scripts/Script.hxx"
#include "Assets/RigAsset.hxx"
#include "Assets/AnimationClipAsset.hxx"
/*-------------------------------------------------------------------------------------*/
/* File-Level Constants */
@ -161,7 +163,9 @@ namespace SHADE
fieldInsertYaml<GameObject >(fieldInfo, object, fieldNode) ||
fieldInsertYaml<FontAsset >(fieldInfo, object, fieldNode) ||
fieldInsertYaml<MaterialAsset >(fieldInfo, object, fieldNode) ||
fieldInsertYaml<MeshAsset >(fieldInfo, object, fieldNode);
fieldInsertYaml<MeshAsset >(fieldInfo, object, fieldNode) ||
fieldInsertYaml<RigAsset >(fieldInfo, object, fieldNode) ||
fieldInsertYaml<AnimationClipAsset>(fieldInfo, object, fieldNode);
// Serialization of more complex types
if (!PRIMITIVE_SERIALIZED)
@ -225,7 +229,9 @@ namespace SHADE
varInsertYamlInternal<GameObject >(object, fieldNode) ||
varInsertYamlInternal<FontAsset >(object, fieldNode) ||
varInsertYamlInternal<MaterialAsset >(object, fieldNode) ||
varInsertYamlInternal<MeshAsset >(object, fieldNode);
varInsertYamlInternal<MeshAsset >(object, fieldNode) ||
varInsertYamlInternal<RigAsset >(object, fieldNode) ||
varInsertYamlInternal<AnimationClipAsset>(object, fieldNode);
return INSERTED;
}
@ -252,7 +258,9 @@ namespace SHADE
fieldAssignYaml<GameObject> (fieldInfo, object, node) ||
fieldAssignYaml<FontAsset> (fieldInfo, object, node) ||
fieldAssignYaml<MaterialAsset> (fieldInfo, object, node) ||
fieldAssignYaml<MeshAsset> (fieldInfo, object, node);
fieldAssignYaml<MeshAsset> (fieldInfo, object, node) ||
fieldAssignYaml<RigAsset> (fieldInfo, object, node) ||
fieldAssignYaml<AnimationClipAsset>(fieldInfo, object, node);
if (!ASSIGNED)
{
if (ReflectionUtilities::FieldIsList(fieldInfo))
@ -326,7 +334,9 @@ namespace SHADE
varAssignYamlInternal<GameObject> (object, node) ||
varAssignYamlInternal<FontAsset> (object, node) ||
varAssignYamlInternal<MaterialAsset> (object, node) ||
varAssignYamlInternal<MeshAsset> (object, node);
varAssignYamlInternal<MeshAsset> (object, node) ||
varAssignYamlInternal<RigAsset> (object, node) ||
varAssignYamlInternal<AnimationClipAsset>(object, node);
return DESERIALISED;
}
}

12
SHADE_Managed/src/Serialisation/SerialisationUtilities.h++
View File

@ -62,7 +62,9 @@ namespace SHADE
}
else if constexpr (std::is_same_v<FieldType, FontAsset> ||
std::is_same_v<FieldType, MaterialAsset> ||
std::is_same_v<FieldType, MeshAsset>)
std::is_same_v<FieldType, MeshAsset> ||
std::is_same_v<FieldType, RigAsset> ||
std::is_same_v<FieldType, AnimationClipAsset>)
{
fieldNode = INVALID_ASSET_ID;
}
@ -130,7 +132,9 @@ namespace SHADE
}
else if constexpr (std::is_same_v<FieldType, FontAsset> ||
std::is_same_v<FieldType, MaterialAsset> ||
std::is_same_v<FieldType, MeshAsset>)
std::is_same_v<FieldType, MeshAsset> ||
std::is_same_v<FieldType, RigAsset> ||
std::is_same_v<FieldType, AnimationClipAsset>)
{
if (object->GetType() == FieldType::typeid)
{
@ -256,7 +260,9 @@ namespace SHADE
}
else if constexpr (std::is_same_v<FieldType, FontAsset> ||
std::is_same_v<FieldType, MaterialAsset> ||
std::is_same_v<FieldType, MeshAsset>)
std::is_same_v<FieldType, MeshAsset> ||
std::is_same_v<FieldType, RigAsset> ||
std::is_same_v<FieldType, AnimationClipAsset>)
{
if (object->GetType() == FieldType::typeid)
{