AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-13 07:06:19 +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/ScriptExtra/CDamageableTriggerExtra.cpp
View File

@@ -28,7 +28,7 @@ CDamageableTriggerExtra::CDamageableTriggerExtra(CScriptObject *pInstance, CScen
// Fetch textures
for (u32 iTex = 0; iTex < 3; iTex++)
{
mpTextureProps[iTex] = TPropCast<TFileProperty>(pBaseStruct->PropertyByIndex(0x6 + iTex));
mpTextureProps[iTex] = TPropCast<TAssetProperty>(pBaseStruct->PropertyByIndex(0x6 + iTex));
if (mpTextureProps[iTex]) PropertyModified(mpTextureProps[iTex]);
}
}
@@ -200,7 +200,7 @@ void CDamageableTriggerExtra::PropertyModified(IProperty *pProperty)
{
if (pProperty == mpTextureProps[iTex])
{
mpTextures[iTex] = mpTextureProps[iTex]->Get().Load();
mpTextures[iTex] = gpResourceStore->LoadResource( mpTextureProps[iTex]->Get(), "TXTR" );
if (mpTextures[iTex] && mpTextures[iTex]->Type() != eTexture)
mpTextures[iTex] = nullptr;

2
src/Core/ScriptExtra/CDamageableTriggerExtra.h
View File

@@ -19,7 +19,7 @@ class CDamageableTriggerExtra : public CScriptExtra
TVector3Property *mpSizeProp;
TEnumProperty *mpRenderSideProp;
TFileProperty *mpTextureProps[3];
TAssetProperty *mpTextureProps[3];
CVector3f mPlaneSize;
ERenderSide mRenderSide;

4
src/Core/ScriptExtra/CDoorExtra.cpp
View File

@@ -9,7 +9,7 @@ CDoorExtra::CDoorExtra(CScriptObject *pInstance, CScene *pScene, CScriptNode *pP
{
CPropertyStruct *pBaseStruct = pInstance->Properties();
mpShieldModelProp = TPropCast<TFileProperty>(pBaseStruct->PropertyByID(0xB20CC271));
mpShieldModelProp = TPropCast<TAssetProperty>(pBaseStruct->PropertyByID(0xB20CC271));
if (mpShieldModelProp) PropertyModified(mpShieldModelProp);
if (mGame >= eEchoes)
@@ -29,7 +29,7 @@ void CDoorExtra::PropertyModified(IProperty *pProperty)
{
if (pProperty == mpShieldModelProp)
{
mpShieldModel = mpShieldModelProp->Get().Load();
mpShieldModel = gpResourceStore->LoadResource( mpShieldModelProp->Get(), "CMDL" );
if (mpShieldModel)
mLocalAABox = mpShieldModel->AABox();

2
src/Core/ScriptExtra/CDoorExtra.h
View File

@@ -6,7 +6,7 @@
class CDoorExtra : public CScriptExtra
{
// Render colored door shield in MP2/3
TFileProperty *mpShieldModelProp;
TAssetProperty *mpShieldModelProp;
TColorProperty *mpShieldColorProp;
TBoolProperty *mpDisabledProp;
TResPtr<CModel> mpShieldModel;

6
src/Core/ScriptExtra/CPointOfInterestExtra.cpp
View File

@@ -11,15 +11,15 @@ CPointOfInterestExtra::CPointOfInterestExtra(CScriptObject *pInstance, CScene *p
// Fetch scan data property
CPropertyStruct *pBaseProp = pInstance->Properties();
if (mGame <= ePrime) mpScanProperty = TPropCast<TFileProperty>(pBaseProp->PropertyByIDString("0x04:0x00"));
else mpScanProperty = (TFileProperty*) pBaseProp->PropertyByIDString("0xBDBEC295:0xB94E9BE7");
if (mGame <= ePrime) mpScanProperty = TPropCast<TAssetProperty>(pBaseProp->PropertyByIDString("0x04:0x00"));
else mpScanProperty = (TAssetProperty*) pBaseProp->PropertyByIDString("0xBDBEC295:0xB94E9BE7");
if (mpScanProperty) PropertyModified(mpScanProperty);
}
void CPointOfInterestExtra::PropertyModified(IProperty* pProperty)
{
if (mpScanProperty == pProperty)
mpScanData = mpScanProperty->Get().Load();
mpScanData = gpResourceStore->LoadResource( mpScanProperty->Get(), "SCAN" );
}
void CPointOfInterestExtra::ModifyTintColor(CColor& Color)

2
src/Core/ScriptExtra/CPointOfInterestExtra.h
View File

@@ -8,7 +8,7 @@
class CPointOfInterestExtra : public CScriptExtra
{
// Tint POI billboard orange/red depending on scan importance
TFileProperty *mpScanProperty;
TAssetProperty *mpScanProperty;
TResPtr<CScan> mpScanData;
public: