AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-13 15:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed file properties to asset properties and modified asset properties to store a CAssetID instead of a CResourceInfo

Browse Source
This commit is contained in:
parax0
2016-09-01 00:24:46 -06:00
parent f6ae1376ac
commit 0929b20ba1
556 changed files with 2992 additions and 3461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Scene/CScriptAttachNode.cpp
View File

@@ -21,8 +21,8 @@ void CScriptAttachNode::AttachPropertyModified()
{
if (mpAttachAssetProp)
{
if (mpAttachAssetProp->Type() == eFileProperty)
mpAttachAsset = TPropCast<TFileProperty>(mpAttachAssetProp)->Get().Load();
if (mpAttachAssetProp->Type() == eAssetProperty)
mpAttachAsset = gpResourceStore->LoadResource( TPropCast<TAssetProperty>(mpAttachAssetProp)->Get(), "CMDL" );
else if (mpAttachAssetProp->Type() == eCharacterProperty)
mpAttachAsset = TPropCast<TCharacterProperty>(mpAttachAssetProp)->Get().AnimSet();

8
src/Core/Scene/CScriptNode.cpp
View File

@@ -472,16 +472,16 @@ void CScriptNode::PropertyModified(IProperty *pProp)
SetDisplayAsset(mpInstance->DisplayAsset());
}
else if (pProp->Type() == eFileProperty)
else if (pProp->Type() == eAssetProperty)
{
CFileTemplate *pFileTemp = static_cast<CFileTemplate*>(pProp->Template());
CAssetTemplate *pAssetTemp = static_cast<CAssetTemplate*>(pProp->Template());
if (pFileTemp->AcceptsExtension("CMDL") || pFileTemp->AcceptsExtension("TXTR") || pFileTemp->AcceptsExtension("ANCS") || pFileTemp->AcceptsExtension("CHAR"))
if (pAssetTemp->AcceptsExtension("CMDL") || pAssetTemp->AcceptsExtension("TXTR") || pAssetTemp->AcceptsExtension("ANCS") || pAssetTemp->AcceptsExtension("CHAR"))
{
mpInstance->EvaluateDisplayAsset();
SetDisplayAsset(mpInstance->DisplayAsset());
}
else if (pFileTemp->AcceptsExtension("DCLN"))
else if (pAssetTemp->AcceptsExtension("DCLN"))
{
mpInstance->EvaluateCollisionModel();
mpCollisionNode->SetCollision(mpInstance->Collision());