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

Property cleanup

Browse Source
This commit is contained in:
Aruki
2018-09-22 13:36:50 -06:00
parent e68b961a8c
commit 31dac74a64
97 changed files with 287 additions and 3319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ CDamageableTriggerExtra::CDamageableTriggerExtra(CScriptObject *pInstance, CScen
SetInheritance(true, false, false);
CreateMaterial();
CStructPropertyNew* pProperties = pInstance->Template()->Properties();
CStructProperty* pProperties = pInstance->Template()->Properties();
// Fetch render side
mRenderSide = TEnumRef<ERenderSide>(pInstance->PropertyData(), pProperties->ChildByIndex(5));
@@ -178,7 +178,7 @@ void CDamageableTriggerExtra::OnTransformed()
UpdatePlaneTransform();
}
void CDamageableTriggerExtra::PropertyModified(IPropertyNew* pProperty)
void CDamageableTriggerExtra::PropertyModified(IProperty* pProperty)
{
if (pProperty == mRenderSide || pProperty == mPlaneSize)
{

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

@@ -35,7 +35,7 @@ public:
ERenderSide RenderSideForDirection(const CVector3f& rkDir);
ERenderSide TransformRenderSide(ERenderSide Side);
void OnTransformed();
void PropertyModified(IPropertyNew* pProperty);
void PropertyModified(IProperty* pProperty);
bool ShouldDrawNormalAssets();
void AddToRenderer(CRenderer *pRenderer, const SViewInfo& rkViewInfo);
void Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand Command, const SViewInfo& rkViewInfo);

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

@@ -4,7 +4,7 @@
CDoorExtra::CDoorExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent)
: CScriptExtra(pInstance, pScene, pParent)
{
CStructPropertyNew* pProperties = pInstance->Template()->Properties();
CStructProperty* pProperties = pInstance->Template()->Properties();
mShieldModelProp = CAssetRef(pInstance->PropertyData(), pProperties->ChildByID(0xB20CC271));
if (mShieldModelProp.IsValid()) PropertyModified(mShieldModelProp.Property());
@@ -22,7 +22,7 @@ CDoorExtra::CDoorExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pP
}
}
void CDoorExtra::PropertyModified(IPropertyNew* pProperty)
void CDoorExtra::PropertyModified(IProperty* pProperty)
{
if (pProperty == mShieldModelProp)
{

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

@@ -15,7 +15,7 @@ class CDoorExtra : public CScriptExtra
public:
explicit CDoorExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent = 0);
void PropertyModified(IPropertyNew* pProperty);
void PropertyModified(IProperty* pProperty);
void AddToRenderer(CRenderer* pRenderer, const SViewInfo& rkViewInfo);
void Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand Command, const SViewInfo& rkViewInfo);
void DrawSelection();

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

@@ -8,7 +8,7 @@ CPointOfInterestExtra::CPointOfInterestExtra(CScriptObject *pInstance, CScene *p
, mpScanData(nullptr)
{
// Fetch scan data property
CStructPropertyNew* pProperties = pInstance->Template()->Properties();
CStructProperty* pProperties = pInstance->Template()->Properties();
if (mGame <= ePrime) mScanProperty = CAssetRef(pInstance->PropertyData(), pProperties->ChildByIDString("0x04:0x00"));
else mScanProperty = CAssetRef(pInstance->PropertyData(), pProperties->ChildByIDString("0xBDBEC295:0xB94E9BE7"));
@@ -16,7 +16,7 @@ CPointOfInterestExtra::CPointOfInterestExtra(CScriptObject *pInstance, CScene *p
PropertyModified(mScanProperty.Property());
}
void CPointOfInterestExtra::PropertyModified(IPropertyNew* pProperty)
void CPointOfInterestExtra::PropertyModified(IProperty* pProperty)
{
if (mScanProperty.Property() == pProperty)
mpScanData = gpResourceStore->LoadResource<CScan>( mScanProperty.Get() );

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

@@ -13,7 +13,7 @@ class CPointOfInterestExtra : public CScriptExtra
public:
explicit CPointOfInterestExtra(CScriptObject *pInstance, CScene *pScene, CScriptNode *pParent = 0);
void PropertyModified(IPropertyNew* pProperty);
void PropertyModified(IProperty* pProperty);
void ModifyTintColor(CColor& Color);
CScan* GetScan() const { return mpScanData; }

2
src/Core/ScriptExtra/CRadiusSphereExtra.cpp
View File

@@ -6,7 +6,7 @@ CRadiusSphereExtra::CRadiusSphereExtra(CScriptObject* pInstance, CScene* pScene,
: CScriptExtra(pInstance, pScene, pParent)
{
mObjectType = pInstance->ObjectTypeID();
CStructPropertyNew* pProperties = pInstance->Template()->Properties();
CStructProperty* pProperties = pInstance->Template()->Properties();
switch (mObjectType)
{

2
src/Core/ScriptExtra/CSandwormExtra.cpp
View File

@@ -17,7 +17,7 @@ CSandwormExtra::CSandwormExtra(CScriptObject* pInstance, CScene* pScene, CScript
if (mPincersScale.IsValid()) PropertyModified(mPincersScale.Property());
}
void CSandwormExtra::PropertyModified(IPropertyNew* pProp)
void CSandwormExtra::PropertyModified(IProperty* pProp)
{
if (pProp == mPincersScale)
{

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

@@ -10,7 +10,7 @@ class CSandwormExtra : public CScriptExtra
public:
explicit CSandwormExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent);
void PropertyModified(IPropertyNew* pProp);
void PropertyModified(IProperty* pProp);
};
#endif // CSANDWORMEXTRA_H

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

@@ -46,7 +46,7 @@ public:
// Virtual CScriptExtra functions
virtual void InstanceTransformed() {}
virtual void PropertyModified(IPropertyNew* /*pProperty*/) {}
virtual void PropertyModified(IProperty* /*pProperty*/) {}
virtual void DisplayAssetChanged(CResource* /*pNewDisplayAsset*/) {}
virtual void LinksModified() {}
virtual bool ShouldDrawNormalAssets() { return true; }

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

@@ -3,8 +3,8 @@
CSpacePirateExtra::CSpacePirateExtra(CScriptObject* pInstance, CScene* pScene, CScriptNode* pParent)
: CScriptExtra(pInstance, pScene ,pParent)
{
CStructPropertyNew* pBaseStruct = pInstance->Template()->Properties();
CStructPropertyNew* pVulnerabilities = TPropCast<CStructPropertyNew>(pBaseStruct->ChildByIDString("0x04:0x10"));
CStructProperty* pBaseStruct = pInstance->Template()->Properties();
CStructProperty* pVulnerabilities = TPropCast<CStructProperty>(pBaseStruct->ChildByIDString("0x04:0x10"));
if (pVulnerabilities)
{

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

@@ -2,7 +2,7 @@
#define CSPACEPIRATEEXTRA_H
#include "CScriptExtra.h"
#include "Core/Resource/Script/IProperty.h"
#include "Core/Resource/Script/Property/IProperty.h"
enum class EVulnerabilityTypeMP1
{

2
src/Core/ScriptExtra/CSplinePathExtra.cpp
View File

@@ -9,7 +9,7 @@ CSplinePathExtra::CSplinePathExtra(CScriptObject* pInstance, CScene* pScene, CSc
mPathColor = CColorRef(pInstance->PropertyData(), pInstance->Template()->Properties()->ChildByID(0x00DD86E2));
}
void CSplinePathExtra::PropertyModified(IPropertyNew* pProperty)
void CSplinePathExtra::PropertyModified(IProperty* pProperty)
{
if (pProperty == mPathColor.Property())
{

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

@@ -20,7 +20,7 @@ public:
inline CColor PathColor() const { return (mPathColor.IsValid() ? mPathColor.Get() : CColor::skBlack); }
void PostLoad();
void PropertyModified(IPropertyNew* pProperty);
void PropertyModified(IProperty* pProperty);
void FindAttachedWaypoints(std::set<CWaypointExtra*>& rChecked, CWaypointExtra* pWaypoint);
void AddWaypoints();