mirror of https://github.com/AxioDL/metaforce.git
Lots of ScriptObject and Collision work
This commit is contained in:
parent
daa7d510f8
commit
b765ce3eb7
|
@ -12,7 +12,6 @@ namespace DNAMP1
|
||||||
struct ControllerAction : IScriptObject
|
struct ControllerAction : IScriptObject
|
||||||
{
|
{
|
||||||
DECL_YAML
|
DECL_YAML
|
||||||
Value<atUint32> propertyCount;
|
|
||||||
String<-1> name;
|
String<-1> name;
|
||||||
Value<bool> unknown1;
|
Value<bool> unknown1;
|
||||||
Value<atUint32> unknown2;
|
Value<atUint32> unknown2;
|
||||||
|
|
|
@ -18,7 +18,7 @@ struct Dock : IScriptObject
|
||||||
Value<atVec3f> volume;
|
Value<atVec3f> volume;
|
||||||
Value<atUint32> dock;
|
Value<atUint32> dock;
|
||||||
Value<atUint32> room;
|
Value<atUint32> room;
|
||||||
Value<bool> autoLoad;
|
Value<bool> loadConnected;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,7 +44,7 @@ void CRelayTracker::RemoveRelay(TEditorId id)
|
||||||
|
|
||||||
void CRelayTracker::SendMsgs(const TAreaId& areaId, CStateManager& stateMgr)
|
void CRelayTracker::SendMsgs(const TAreaId& areaId, CStateManager& stateMgr)
|
||||||
{
|
{
|
||||||
const CWorld* world = stateMgr.GetWorld();
|
const CWorld* world = stateMgr.WorldNC();
|
||||||
u32 relayCount = world->GetRelayCount();
|
u32 relayCount = world->GetRelayCount();
|
||||||
|
|
||||||
bool hasActiveRelays = false;
|
bool hasActiveRelays = false;
|
||||||
|
|
|
@ -15,4 +15,14 @@ void CSortedListManager::Reset()
|
||||||
xb000_sortedLists[i].Reset();
|
xb000_sortedLists[i].Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CSortedListManager::RemoveFromList(ESortedList list, s16 id)
|
||||||
|
{
|
||||||
|
SSortedList& sl = xb000_sortedLists[u32(list)];
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSortedListManager::Remove(const CActor *)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,14 +6,25 @@
|
||||||
|
|
||||||
namespace urde
|
namespace urde
|
||||||
{
|
{
|
||||||
|
enum ESortedList
|
||||||
|
{
|
||||||
|
Zero,
|
||||||
|
One,
|
||||||
|
Two,
|
||||||
|
Three,
|
||||||
|
Four,
|
||||||
|
Five
|
||||||
|
};
|
||||||
|
|
||||||
struct SSortedList
|
struct SSortedList
|
||||||
{
|
{
|
||||||
TUniqueId x0_ids[1024];
|
TUniqueId x0_ids[1024];
|
||||||
|
u32 x800_;
|
||||||
void Reset() {std::fill(std::begin(x0_ids), std::end(x0_ids), -1);}
|
void Reset() {std::fill(std::begin(x0_ids), std::end(x0_ids), -1);}
|
||||||
SSortedList() {Reset();}
|
SSortedList() {Reset();}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class CActor;
|
||||||
class CSortedListManager
|
class CSortedListManager
|
||||||
{
|
{
|
||||||
struct SNode
|
struct SNode
|
||||||
|
@ -31,6 +42,8 @@ class CSortedListManager
|
||||||
public:
|
public:
|
||||||
CSortedListManager();
|
CSortedListManager();
|
||||||
void Reset();
|
void Reset();
|
||||||
|
void RemoveFromList(ESortedList, s16);
|
||||||
|
void Remove(const CActor*);
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -725,8 +725,27 @@ void CStateManager::ClearGraveyard()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void CStateManager::DeleteObjectRequest(TUniqueId)
|
void CStateManager::DeleteObjectRequest(TUniqueId id)
|
||||||
{
|
{
|
||||||
|
CEntity* entity = ObjectById(id);
|
||||||
|
if (!entity)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (entity->IsInGraveyard())
|
||||||
|
return;
|
||||||
|
|
||||||
|
entity->SetIsInGraveyard(true);
|
||||||
|
|
||||||
|
x858_objectGraveyard.push_back(entity->GetUniqueId());
|
||||||
|
entity->AcceptScriptMsg(EScriptObjectMessage::InternalMessage12, kInvalidUniqueId, *this);
|
||||||
|
entity->SetIsScriptingBlocked(true);
|
||||||
|
|
||||||
|
CActor* actor = static_cast<CActor*>(entity);
|
||||||
|
if (actor)
|
||||||
|
{
|
||||||
|
x874_sortedListManager->Remove(actor);
|
||||||
|
actor->SetUseInSortedList(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CEntity* CStateManager::ObjectById(TUniqueId uid)
|
CEntity* CStateManager::ObjectById(TUniqueId uid)
|
||||||
|
|
|
@ -251,6 +251,7 @@ public:
|
||||||
void RemoveObject(TUniqueId);
|
void RemoveObject(TUniqueId);
|
||||||
void RemoveActor(TUniqueId);
|
void RemoveActor(TUniqueId);
|
||||||
void UpdateRoomAcoustics(TAreaId);
|
void UpdateRoomAcoustics(TAreaId);
|
||||||
|
TAreaId GetNextAreaId() const { return x8cc_nextAreaId; }
|
||||||
void SetCurrentAreaId(TAreaId);
|
void SetCurrentAreaId(TAreaId);
|
||||||
void ClearGraveyard();
|
void ClearGraveyard();
|
||||||
void DeleteObjectRequest(TUniqueId);
|
void DeleteObjectRequest(TUniqueId);
|
||||||
|
@ -285,7 +286,8 @@ public:
|
||||||
CCameraFilterPass& GetCameraFilterPass(int idx) {return xb84_camFilterPasses[idx];}
|
CCameraFilterPass& GetCameraFilterPass(int idx) {return xb84_camFilterPasses[idx];}
|
||||||
|
|
||||||
CEnvFxManager* GetEnvFxManager() { return x880_envFxManager; }
|
CEnvFxManager* GetEnvFxManager() { return x880_envFxManager; }
|
||||||
CWorld* GetWorld() {return x850_world.get();}
|
CWorld* WorldNC() {return x850_world.get();}
|
||||||
|
const CWorld* GetWorld() const { return x850_world.get(); }
|
||||||
CRelayTracker* GetRelayTracker() { return x8bc_relayTracker.get(); }
|
CRelayTracker* GetRelayTracker() { return x8bc_relayTracker.get(); }
|
||||||
CCameraManager* GetCameraManager() const { return x870_cameraManager; }
|
CCameraManager* GetCameraManager() const { return x870_cameraManager; }
|
||||||
|
|
||||||
|
@ -303,7 +305,6 @@ public:
|
||||||
CListeningAiList& GetListeningAiObjectList() const { return *x834_listenAiObjs; }
|
CListeningAiList& GetListeningAiObjectList() const { return *x834_listenAiObjs; }
|
||||||
CAiWaypointList& GetAiWaypointObjectList() const { return *x83c_aiWaypointObjs; }
|
CAiWaypointList& GetAiWaypointObjectList() const { return *x83c_aiWaypointObjs; }
|
||||||
CPlatformAndDoorList& GetPlatformAndDoorObjectList() const { return *x844_platformAndDoorObjs; }
|
CPlatformAndDoorList& GetPlatformAndDoorObjectList() const { return *x844_platformAndDoorObjs; }
|
||||||
|
|
||||||
std::pair<u32, u32> CalculateScanCompletionRate() const;
|
std::pair<u32, u32> CalculateScanCompletionRate() const;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -140,6 +140,7 @@ public:
|
||||||
const CActorLights* lights, const CModelFlags& drawFlags);
|
const CActorLights* lights, const CModelFlags& drawFlags);
|
||||||
|
|
||||||
CAnimData* AnimationData() { return x10_animData.get(); }
|
CAnimData* AnimationData() { return x10_animData.get(); }
|
||||||
|
const CAnimData* GetAnimationData() const { return x10_animData.get(); }
|
||||||
const TLockedToken<CModel>& GetNormalModel() const { return x1c_normalModel; }
|
const TLockedToken<CModel>& GetNormalModel() const { return x1c_normalModel; }
|
||||||
const TLockedToken<CModel>& GetXRayModel() const { return x2c_xrayModel; }
|
const TLockedToken<CModel>& GetXRayModel() const { return x2c_xrayModel; }
|
||||||
const TLockedToken<CModel>& GetThermalModel() const { return x3c_infraModel; }
|
const TLockedToken<CModel>& GetThermalModel() const { return x3c_infraModel; }
|
||||||
|
|
|
@ -54,4 +54,29 @@ void CCollidableAABox::SetStaticTableIndex(u32 index)
|
||||||
{
|
{
|
||||||
sTableIndex = index;
|
sTableIndex = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CCollidableAABox::CollideMovingAABox(const CInternalCollisionStructure &, const zeus::CVector3f &, double &, CCollisionInfo &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CCollidableAABox::CollideMovingSphere(const CInternalCollisionStructure &, const zeus::CVector3f &, double &, CCollisionInfo &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Collide
|
||||||
|
{
|
||||||
|
|
||||||
|
bool AABox_AABox(const CInternalCollisionStructure &, CCollisionInfoList &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool AABox_AABox_Bool(const CInternalCollisionStructure &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ namespace urde
|
||||||
namespace Collide
|
namespace Collide
|
||||||
{
|
{
|
||||||
bool AABox_AABox(const CInternalCollisionStructure&, CCollisionInfoList&);
|
bool AABox_AABox(const CInternalCollisionStructure&, CCollisionInfoList&);
|
||||||
bool AABox_AABox_Bool(const CInternalCollisionStructure&, CCollisionInfoList&);
|
bool AABox_AABox_Bool(const CInternalCollisionStructure&);
|
||||||
}
|
}
|
||||||
|
|
||||||
class CCollidableAABox : public CCollisionPrimitive
|
class CCollidableAABox : public CCollisionPrimitive
|
||||||
|
@ -17,6 +17,7 @@ class CCollidableAABox : public CCollisionPrimitive
|
||||||
static u32 sTableIndex;
|
static u32 sTableIndex;
|
||||||
|
|
||||||
zeus::CAABox x10_aabox;
|
zeus::CAABox x10_aabox;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CCollidableAABox();
|
CCollidableAABox();
|
||||||
CCollidableAABox(const zeus::CAABox&, const CMaterialList&);
|
CCollidableAABox(const zeus::CAABox&, const CMaterialList&);
|
||||||
|
@ -30,6 +31,10 @@ public:
|
||||||
|
|
||||||
static const CCollisionPrimitive::Type& GetType();
|
static const CCollisionPrimitive::Type& GetType();
|
||||||
static void SetStaticTableIndex(u32 index);
|
static void SetStaticTableIndex(u32 index);
|
||||||
|
static bool CollideMovingAABox(const CInternalCollisionStructure&, const zeus::CVector3f&, double&,
|
||||||
|
CCollisionInfo&);
|
||||||
|
static bool CollideMovingSphere(const CInternalCollisionStructure&, const zeus::CVector3f&, double&,
|
||||||
|
CCollisionInfo&);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,36 @@ void CCollidableOBBTreeGroup::SetStaticTableIndex(u32 index)
|
||||||
sTableIndex = index;
|
sTableIndex = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CCollidableOBBTreeGroup::SphereCollide(const CInternalCollisionStructure &, CCollisionInfoList &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CCollidableOBBTreeGroup::SphereCollideBoolean(const CInternalCollisionStructure &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CCollidableOBBTreeGroup::CollideMovingSphere(const CInternalCollisionStructure &, const zeus::CVector3f &, double &, CCollisionInfo &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CCollidableOBBTreeGroup::AABoxCollide(const CInternalCollisionStructure &, CCollisionInfoList &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CCollidableOBBTreeGroup::AABoxCollideBoolean(const CInternalCollisionStructure &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CCollidableOBBTreeGroup::CollideMovingAABox(const CInternalCollisionStructure &, const zeus::CVector3f &, double &, CCollisionInfo &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
CFactoryFnReturn FCollidableOBBTreeGroupFactory(const SObjectTag &tag, CInputStream& in,
|
CFactoryFnReturn FCollidableOBBTreeGroupFactory(const SObjectTag &tag, CInputStream& in,
|
||||||
const CVParamTransfer& vparms,
|
const CVParamTransfer& vparms,
|
||||||
CObjectReference* selfRef)
|
CObjectReference* selfRef)
|
||||||
|
|
|
@ -15,6 +15,7 @@ class CCollidableOBBTreeGroup : public CCollisionPrimitive
|
||||||
static u32 sTableIndex;
|
static u32 sTableIndex;
|
||||||
std::vector<std::unique_ptr<COBBTree>> x0_trees;
|
std::vector<std::unique_ptr<COBBTree>> x0_trees;
|
||||||
std::vector<zeus::CAABox> x10_aabbs;
|
std::vector<zeus::CAABox> x10_aabbs;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CCollidableOBBTreeGroup(CInputStream& in);
|
CCollidableOBBTreeGroup(CInputStream& in);
|
||||||
virtual ~CCollidableOBBTreeGroup() {}
|
virtual ~CCollidableOBBTreeGroup() {}
|
||||||
|
@ -28,12 +29,20 @@ public:
|
||||||
|
|
||||||
static const Type& GetType();
|
static const Type& GetType();
|
||||||
static void SetStaticTableIndex(u32 index);
|
static void SetStaticTableIndex(u32 index);
|
||||||
|
/* Sphere Collide */
|
||||||
|
static bool SphereCollide(const CInternalCollisionStructure&, CCollisionInfoList&);
|
||||||
|
static bool SphereCollideBoolean(const CInternalCollisionStructure&);
|
||||||
|
static bool CollideMovingSphere(const CInternalCollisionStructure&, const zeus::CVector3f&, double&,
|
||||||
|
CCollisionInfo&);
|
||||||
|
/* AABox Collide */
|
||||||
|
static bool AABoxCollide(const CInternalCollisionStructure&, CCollisionInfoList&);
|
||||||
|
static bool AABoxCollideBoolean(const CInternalCollisionStructure&);
|
||||||
|
static bool CollideMovingAABox(const CInternalCollisionStructure&, const zeus::CVector3f&, double&,
|
||||||
|
CCollisionInfo&);
|
||||||
};
|
};
|
||||||
|
|
||||||
CFactoryFnReturn FCollidableOBBTreeGroupFactory(const SObjectTag &tag, CInputStream& in,
|
CFactoryFnReturn FCollidableOBBTreeGroupFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms,
|
||||||
const CVParamTransfer& vparms,
|
|
||||||
CObjectReference* selfRef);
|
CObjectReference* selfRef);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // __URDE_CCOLLIDABLEOBBTREEGROUP_HPP__
|
#endif // __URDE_CCOLLIDABLEOBBTREEGROUP_HPP__
|
||||||
|
|
|
@ -40,4 +40,39 @@ void CCollidableSphere::SetStaticTableIndex(u32 index)
|
||||||
sTableIndex = index;
|
sTableIndex = index;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CCollidableSphere::CollideMovingAABox(const CInternalCollisionStructure &, const zeus::CVector3f &, double &, CCollisionInfo &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CCollidableSphere::CollideMovingSphere(const CInternalCollisionStructure &, const zeus::CVector3f &, double &, CCollisionInfo &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace Collide
|
||||||
|
{
|
||||||
|
|
||||||
|
bool Sphere_AABox(const CInternalCollisionStructure &, CCollisionInfoList &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Sphere_AABox_Bool(const CInternalCollisionStructure &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Sphere_Sphere(const CInternalCollisionStructure &, CCollisionInfoList &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Sphere_Sphere_Bool(const CInternalCollisionStructure &)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,12 +5,19 @@
|
||||||
|
|
||||||
namespace urde
|
namespace urde
|
||||||
{
|
{
|
||||||
|
namespace Collide
|
||||||
|
{
|
||||||
|
bool Sphere_AABox(const CInternalCollisionStructure&, CCollisionInfoList&);
|
||||||
|
bool Sphere_AABox_Bool(const CInternalCollisionStructure&);
|
||||||
|
bool Sphere_Sphere(const CInternalCollisionStructure&, CCollisionInfoList&);
|
||||||
|
bool Sphere_Sphere_Bool(const CInternalCollisionStructure&);
|
||||||
|
}
|
||||||
class CCollidableSphere : public CCollisionPrimitive
|
class CCollidableSphere : public CCollisionPrimitive
|
||||||
{
|
{
|
||||||
static const Type sType;
|
static const Type sType;
|
||||||
static u32 sTableIndex;
|
static u32 sTableIndex;
|
||||||
public:
|
|
||||||
|
|
||||||
|
public:
|
||||||
virtual u32 GetTableIndex() const;
|
virtual u32 GetTableIndex() const;
|
||||||
virtual zeus::CAABox CalculateAABox(const zeus::CTransform&) const;
|
virtual zeus::CAABox CalculateAABox(const zeus::CTransform&) const;
|
||||||
virtual zeus::CAABox CalculateLocalAABox() const;
|
virtual zeus::CAABox CalculateLocalAABox() const;
|
||||||
|
@ -19,6 +26,10 @@ public:
|
||||||
|
|
||||||
static const Type& GetType();
|
static const Type& GetType();
|
||||||
static void SetStaticTableIndex(u32 index);
|
static void SetStaticTableIndex(u32 index);
|
||||||
|
static bool CollideMovingAABox(const CInternalCollisionStructure&, const zeus::CVector3f&, double&,
|
||||||
|
CCollisionInfo&);
|
||||||
|
static bool CollideMovingSphere(const CInternalCollisionStructure&, const zeus::CVector3f&, double&,
|
||||||
|
CCollisionInfo&);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,4 +3,9 @@
|
||||||
namespace urde
|
namespace urde
|
||||||
{
|
{
|
||||||
|
|
||||||
|
zeus::CVector3f CCollisionInfo::GetExtreme() const
|
||||||
|
{
|
||||||
|
return (x18_ + (x0_aabox.min + x0_aabox.max) + x24_);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@ public:
|
||||||
bool IsValid() const;
|
bool IsValid() const;
|
||||||
void GetMaterialLeft() const;
|
void GetMaterialLeft() const;
|
||||||
void GetMaterialRight() const;
|
void GetMaterialRight() const;
|
||||||
void GetExtreme() const;
|
zeus::CVector3f GetExtreme() const;
|
||||||
void Swap();
|
void Swap();
|
||||||
void Transform(const zeus::CTransform&);
|
void Transform(const zeus::CTransform&);
|
||||||
zeus::CVector3f GetNormalLeft() const;
|
zeus::CVector3f GetNormalLeft() const;
|
||||||
|
|
|
@ -6,25 +6,21 @@
|
||||||
namespace urde
|
namespace urde
|
||||||
{
|
{
|
||||||
std::unique_ptr<std::vector<CCollisionPrimitive::Type>> CCollisionPrimitive::sCollisionTypeList;
|
std::unique_ptr<std::vector<CCollisionPrimitive::Type>> CCollisionPrimitive::sCollisionTypeList;
|
||||||
|
std::unique_ptr<std::vector<ComparisonFunc>> CCollisionPrimitive::sTableOfCollidables;
|
||||||
|
std::unique_ptr<std::vector<BooleanComparisonFunc>> CCollisionPrimitive::sTableOfBooleanCollidables;
|
||||||
|
std::unique_ptr<std::vector<MovingComparisonFunc>> CCollisionPrimitive::sTableOfMovingCollidables;
|
||||||
|
bool CCollisionPrimitive::sTypesAdded = false;
|
||||||
bool CCollisionPrimitive::sTypesAdding = false;
|
bool CCollisionPrimitive::sTypesAdding = false;
|
||||||
CCollisionPrimitive::CCollisionPrimitive(const CMaterialList& list)
|
bool CCollisionPrimitive::sCollidersAdded = false;
|
||||||
: x8_material(list)
|
bool CCollisionPrimitive::sCollidersAdding = false;
|
||||||
{
|
CCollisionPrimitive::CCollisionPrimitive(const CMaterialList& list) : x8_material(list) {}
|
||||||
}
|
|
||||||
|
|
||||||
void CCollisionPrimitive::SetMaterial(const CMaterialList& material)
|
void CCollisionPrimitive::SetMaterial(const CMaterialList& material) { x8_material = material; }
|
||||||
{
|
|
||||||
x8_material = material;
|
|
||||||
}
|
|
||||||
|
|
||||||
const CMaterialList& CCollisionPrimitive::GetMaterial() const
|
const CMaterialList& CCollisionPrimitive::GetMaterial() const { return x8_material; }
|
||||||
{
|
|
||||||
return x8_material;
|
|
||||||
|
|
||||||
}
|
CRayCastResult CCollisionPrimitive::CastRay(const zeus::CVector3f& start, const zeus::CVector3f& end, float d,
|
||||||
|
const CMaterialFilter& filter, const zeus::CTransform& xf) const
|
||||||
CRayCastResult CCollisionPrimitive::CastRay(const zeus::CVector3f& start, const zeus::CVector3f& end, float d, const
|
|
||||||
CMaterialFilter& filter, const zeus::CTransform& xf) const
|
|
||||||
{
|
{
|
||||||
return CastRayInternal(CInternalRayCastStructure(start, end, d, xf, filter));
|
return CastRayInternal(CInternalRayCastStructure(start, end, d, xf, filter));
|
||||||
}
|
}
|
||||||
|
@ -45,25 +41,46 @@ void CCollisionPrimitive::InitAddType(const CCollisionPrimitive::Type& tp)
|
||||||
sCollisionTypeList->push_back(tp);
|
sCollisionTypeList->push_back(tp);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CCollisionPrimitive::InitEndTypes()
|
void CCollisionPrimitive::InitEndTypes() { sTypesAdding = false; }
|
||||||
|
|
||||||
|
void CCollisionPrimitive::InitBeginColliders()
|
||||||
{
|
{
|
||||||
sTypesAdding = false;
|
sTableOfCollidables.reset(new std::vector<ComparisonFunc>());
|
||||||
|
sTableOfBooleanCollidables.reset(new std::vector<BooleanComparisonFunc>());
|
||||||
|
sTableOfMovingCollidables.reset(new std::vector<MovingComparisonFunc>());
|
||||||
|
sCollidersAdding = true;
|
||||||
|
InternalColliders::AddColliders();
|
||||||
|
}
|
||||||
|
|
||||||
|
void CCollisionPrimitive::InitAddBooleanCollider(const CCollisionPrimitive::BooleanComparison& cmp)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void CCollisionPrimitive::InitAddBooleanCollider(const BooleanComparisonFunc& cmp, const char* a, const char* b)
|
||||||
|
{
|
||||||
|
InitAddBooleanCollider({std::move(cmp), a, b});
|
||||||
|
}
|
||||||
|
|
||||||
|
void CCollisionPrimitive::InitAddMovingCollider(const CCollisionPrimitive::MovingComparison& cmp) {}
|
||||||
|
|
||||||
|
void CCollisionPrimitive::InitAddMovingCollider(const MovingComparisonFunc& cmp, const char* a, const char* b)
|
||||||
|
{
|
||||||
|
InitAddMovingCollider({std::move(cmp), a, b});
|
||||||
|
}
|
||||||
|
|
||||||
|
void CCollisionPrimitive::InitAddCollider(const CCollisionPrimitive::Comparison& cmp) {}
|
||||||
|
|
||||||
|
void CCollisionPrimitive::InitAddCollider(const ComparisonFunc& cmp, const char* a, const char* b)
|
||||||
|
{
|
||||||
|
InitAddCollider({std::move(cmp), a, b});
|
||||||
}
|
}
|
||||||
|
|
||||||
CCollisionPrimitive::Type::Type(const std::function<void(u32)>& setter, const char* info)
|
CCollisionPrimitive::Type::Type(const std::function<void(u32)>& setter, const char* info)
|
||||||
: x0_setter(setter),
|
: x0_setter(setter), x4_info(info)
|
||||||
x4_info(info)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *CCollisionPrimitive::Type::GetInfo() const
|
const char* CCollisionPrimitive::Type::GetInfo() const { return x4_info; }
|
||||||
{
|
|
||||||
return x4_info;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::function<void (u32)> CCollisionPrimitive::Type::GetSetter() const
|
|
||||||
{
|
|
||||||
return x0_setter;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
std::function<void(u32)> CCollisionPrimitive::Type::GetSetter() const { return x0_setter; }
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,20 +16,19 @@ class CCollisionInfo;
|
||||||
class CCollisionInfoList;
|
class CCollisionInfoList;
|
||||||
class CInternalRayCastStructure;
|
class CInternalRayCastStructure;
|
||||||
class CMaterialFilter;
|
class CMaterialFilter;
|
||||||
|
using ComparisonFunc = std::function<bool(const CInternalCollisionStructure&, CCollisionInfoList&)>;
|
||||||
|
using MovingComparisonFunc =
|
||||||
|
std::function<bool(const CInternalCollisionStructure&, const zeus::CVector3f&, double&, CCollisionInfo&)>;
|
||||||
|
using BooleanComparisonFunc = std::function<bool(const CInternalCollisionStructure&)>;
|
||||||
|
|
||||||
class CCollisionPrimitive
|
class CCollisionPrimitive
|
||||||
{
|
{
|
||||||
public:
|
|
||||||
class Type;
|
|
||||||
private:
|
|
||||||
|
|
||||||
CMaterialList x8_material;
|
|
||||||
static std::unique_ptr<std::vector<Type>> sCollisionTypeList;
|
|
||||||
static bool sTypesAdding;
|
|
||||||
public:
|
public:
|
||||||
class Type
|
class Type
|
||||||
{
|
{
|
||||||
std::function<void(u32)> x0_setter;
|
std::function<void(u32)> x0_setter;
|
||||||
const char* x4_info;
|
const char* x4_info;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Type() = default;
|
Type() = default;
|
||||||
Type(const std::function<void(u32)>& setter, const char* info);
|
Type(const std::function<void(u32)>& setter, const char* info);
|
||||||
|
@ -41,64 +40,66 @@ public:
|
||||||
|
|
||||||
class Comparison
|
class Comparison
|
||||||
{
|
{
|
||||||
std::function<bool(const CInternalCollisionStructure&, CCollisionInfoList&)> x0_collider;
|
ComparisonFunc x0_collider;
|
||||||
const char* x4_type1;
|
const char* x4_type1;
|
||||||
const char* x8_type2;
|
const char* x8_type2;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Comparison(const std::function<bool(const CInternalCollisionStructure&, CCollisionInfoList&)>& collider,
|
Comparison(const ComparisonFunc& collider, const char* type1, const char* type2)
|
||||||
const char* type1, const char* type2)
|
: x0_collider(collider), x4_type1(type1), x8_type2(type2)
|
||||||
: x0_collider(collider),
|
|
||||||
x4_type1(type1),
|
|
||||||
x8_type2(type2)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
std::function<bool(const CInternalCollisionStructure&, CCollisionInfoList&)> GetCollider() const { return x0_collider; }
|
const ComparisonFunc& GetCollider() const { return x0_collider; }
|
||||||
const char* GetType1() const { return x4_type1; }
|
const char* GetType1() const { return x4_type1; }
|
||||||
const char* GetType2() const { return x8_type2; }
|
const char* GetType2() const { return x8_type2; }
|
||||||
};
|
};
|
||||||
|
|
||||||
class MovingComparison
|
class MovingComparison
|
||||||
{
|
{
|
||||||
std::function<bool(const CInternalCollisionStructure&, const zeus::CVector2f&, double&,
|
MovingComparisonFunc x0_collider;
|
||||||
CCollisionInfo&)> x0_collider;
|
|
||||||
const char* x4_type1;
|
const char* x4_type1;
|
||||||
const char* x8_type2;
|
const char* x8_type2;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
MovingComparison(const std::function<bool(const CInternalCollisionStructure&, const zeus::CVector2f&, double&,
|
MovingComparison(const MovingComparisonFunc& collider, const char* type1, const char* type2)
|
||||||
CCollisionInfo&)>& collider, const char* type1, const char* type2)
|
: x0_collider(collider), x4_type1(type1), x8_type2(type2)
|
||||||
: x0_collider(collider),
|
|
||||||
x4_type1(type1),
|
|
||||||
x8_type2(type2)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
std::function<bool(const CInternalCollisionStructure&, const zeus::CVector2f&, double&,
|
const MovingComparisonFunc& GetCollider() const { return x0_collider; }
|
||||||
CCollisionInfo&)> GetCollider() const { return x0_collider; }
|
|
||||||
const char* GetType1() const { return x4_type1; }
|
const char* GetType1() const { return x4_type1; }
|
||||||
const char* GetType2() const { return x8_type2; }
|
const char* GetType2() const { return x8_type2; }
|
||||||
};
|
};
|
||||||
|
|
||||||
class BooleanComparison
|
class BooleanComparison
|
||||||
{
|
{
|
||||||
std::function<bool(const CInternalCollisionStructure&)> x0_collider;
|
BooleanComparisonFunc x0_collider;
|
||||||
const char* x4_type1;
|
const char* x4_type1;
|
||||||
const char* x8_type2;
|
const char* x8_type2;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
BooleanComparison(const std::function<bool(const CInternalCollisionStructure&)>& collider, const char* type1,
|
BooleanComparison(const BooleanComparisonFunc& collider, const char* type1, const char* type2)
|
||||||
const char* type2)
|
: x0_collider(collider), x4_type1(type1), x8_type2(type2)
|
||||||
: x0_collider(collider),
|
|
||||||
x4_type1(type1),
|
|
||||||
x8_type2(type2)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
std::function<bool(const CInternalCollisionStructure&)> GetCollider() const { return x0_collider; }
|
const BooleanComparisonFunc& GetCollider() const { return x0_collider; }
|
||||||
const char* GetType1() const { return x4_type1; }
|
const char* GetType1() const { return x4_type1; }
|
||||||
const char* GetType2() const { return x8_type2; }
|
const char* GetType2() const { return x8_type2; }
|
||||||
};
|
};
|
||||||
|
private:
|
||||||
|
CMaterialList x8_material;
|
||||||
|
static std::unique_ptr<std::vector<Type>> sCollisionTypeList;
|
||||||
|
static std::unique_ptr<std::vector<ComparisonFunc>> sTableOfCollidables;
|
||||||
|
static std::unique_ptr<std::vector<BooleanComparisonFunc>> sTableOfBooleanCollidables;
|
||||||
|
static std::unique_ptr<std::vector<MovingComparisonFunc>> sTableOfMovingCollidables;
|
||||||
|
static bool sTypesAdded;
|
||||||
|
static bool sTypesAdding;
|
||||||
|
static bool sCollidersAdded;
|
||||||
|
static bool sCollidersAdding;
|
||||||
|
|
||||||
|
public:
|
||||||
CCollisionPrimitive() = default;
|
CCollisionPrimitive() = default;
|
||||||
CCollisionPrimitive(const CMaterialList& list);
|
CCollisionPrimitive(const CMaterialList& list);
|
||||||
virtual u32 GetTableIndex() const = 0;
|
virtual u32 GetTableIndex() const = 0;
|
||||||
|
@ -112,18 +113,19 @@ public:
|
||||||
CRayCastResult CastRay(const zeus::CVector3f&, const zeus::CVector3f&, float, const CMaterialFilter&,
|
CRayCastResult CastRay(const zeus::CVector3f&, const zeus::CVector3f&, float, const CMaterialFilter&,
|
||||||
const zeus::CTransform&) const;
|
const zeus::CTransform&) const;
|
||||||
|
|
||||||
|
|
||||||
static void InitBeginTypes();
|
static void InitBeginTypes();
|
||||||
static void InitAddType(const Type& tp);
|
static void InitAddType(const Type& tp);
|
||||||
static void InitEndTypes();
|
static void InitEndTypes();
|
||||||
|
|
||||||
static void InitBeginColliders();
|
static void InitBeginColliders();
|
||||||
static void InitAddBooleanCollider(const BooleanComparison& cmp);
|
static void InitAddBooleanCollider(const BooleanComparison& cmp);
|
||||||
|
static void InitAddBooleanCollider(const BooleanComparisonFunc&, const char*, const char*);
|
||||||
static void InitAddMovingCollider(const MovingComparison& cmp);
|
static void InitAddMovingCollider(const MovingComparison& cmp);
|
||||||
|
static void InitAddMovingCollider(const MovingComparisonFunc&, const char*, const char*);
|
||||||
static void InitAddCollider(const Comparison& cmp);
|
static void InitAddCollider(const Comparison& cmp);
|
||||||
|
static void InitAddCollider(const ComparisonFunc&, const char*, const char*);
|
||||||
static void InitEndColliders();
|
static void InitEndColliders();
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // __URDE_CCOLLISIONPRIMITIVE_HPP__
|
#endif // __URDE_CCOLLISIONPRIMITIVE_HPP__
|
||||||
|
|
|
@ -1,13 +1,79 @@
|
||||||
#include "CMaterialFilter.hpp"
|
|
||||||
#include "CGameCollision.hpp"
|
#include "CGameCollision.hpp"
|
||||||
#include "CCollidableOBBTreeGroup.hpp"
|
#include "CCollidableOBBTreeGroup.hpp"
|
||||||
|
#include "CMaterialFilter.hpp"
|
||||||
|
#include "CMaterialList.hpp"
|
||||||
|
#include "World/CActor.hpp"
|
||||||
|
#include "CStateManager.hpp"
|
||||||
|
|
||||||
namespace urde
|
namespace urde
|
||||||
{
|
{
|
||||||
|
|
||||||
void CGameCollision::InitCollision()
|
float CollisionImpulseFiniteVsInfinite(float f1, float f2, float f3) { return f1 * ((1.f / f3) * f2); }
|
||||||
|
|
||||||
|
float CollisionImpulseFiniteVsFinite(float f1, float f2, float f3, float f4)
|
||||||
{
|
{
|
||||||
CCollisionPrimitive::InitBeginTypes();
|
return (-(1.f + f4) * f3) / ((1.f / f1) + (1.f / f2));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CGameCollision::InitCollision()
|
||||||
|
{
|
||||||
|
/* Types */
|
||||||
|
CCollisionPrimitive::InitBeginTypes();
|
||||||
|
CCollisionPrimitive::InitAddType(CCollidableOBBTreeGroup::GetType());
|
||||||
|
CCollisionPrimitive::InitEndTypes();
|
||||||
|
|
||||||
|
/* Colliders */
|
||||||
|
CCollisionPrimitive::InitBeginColliders();
|
||||||
|
CCollisionPrimitive::InitAddCollider(CCollidableOBBTreeGroup::SphereCollide, "CCollidableSphere",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitAddCollider(CCollidableOBBTreeGroup::AABoxCollide, "CCollidableAABox",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitAddBooleanCollider(CCollidableOBBTreeGroup::SphereCollideBoolean, "CCollidableSphere",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitAddBooleanCollider(CCollidableOBBTreeGroup::AABoxCollideBoolean, "CCollidableAABox",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitAddMovingCollider(CCollidableOBBTreeGroup::CollideMovingAABox, "CCollidableAABox",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitAddMovingCollider(CCollidableOBBTreeGroup::CollideMovingSphere, "CCollidableSphere",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitAddCollider(CGameCollision::NullCollisionCollider, "CCollidableOBBTreeGroup",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitAddBooleanCollider(CGameCollision::NullBooleanCollider, "CCollidableOBBTreeGroup",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitAddMovingCollider(CGameCollision::NullMovingCollider, "CCollidableOBBTreeGroup",
|
||||||
|
"CCollidableOBBTreeGroup");
|
||||||
|
CCollisionPrimitive::InitEndColliders();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CGameCollision::CanBlock(const CMaterialList& mat, const zeus::CVector3f& v)
|
||||||
|
{
|
||||||
|
if ((mat.HasMaterial(EMaterialTypes::Character) && !mat.HasMaterial(EMaterialTypes::Scannable)) ||
|
||||||
|
mat.HasMaterial(EMaterialTypes::Occluder))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (mat.HasMaterial(EMaterialTypes::Occluder) || mat.HasMaterial(EMaterialTypes::Floor))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
return (v.z > 0.85f);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CGameCollision::IsFloor(const CMaterialList& mat, const zeus::CVector3f& v)
|
||||||
|
{
|
||||||
|
if (mat.HasMaterial(EMaterialTypes::Floor))
|
||||||
|
return true;
|
||||||
|
return (v.z > 0.85f);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CGameCollision::SendMaterialMessage(CStateManager& mgr, const CMaterialList& mat, CActor& act)
|
||||||
|
{
|
||||||
|
EScriptObjectMessage msg;
|
||||||
|
if (mat.HasMaterial(EMaterialTypes::Ice))
|
||||||
|
msg = EScriptObjectMessage::InternalMessage05;
|
||||||
|
else if (mat.HasMaterial(EMaterialTypes::MudSlow))
|
||||||
|
msg = EScriptObjectMessage::InternalMessage06;
|
||||||
|
else
|
||||||
|
msg = EScriptObjectMessage::InternalMessage07;
|
||||||
|
|
||||||
|
mgr.SendScriptMsg(&act, kInvalidUniqueId, msg);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#ifndef __URDE_CGAMECOLLISION_HPP__
|
#ifndef __URDE_CGAMECOLLISION_HPP__
|
||||||
#define __URDE_CGAMECOLLISION_HPP__
|
#define __URDE_CGAMECOLLISION_HPP__
|
||||||
|
#include "zeus/CVector3f.hpp"
|
||||||
|
|
||||||
namespace urde
|
namespace urde
|
||||||
{
|
{
|
||||||
|
@ -8,13 +9,26 @@ class CInternalCollisionStructure
|
||||||
{
|
{
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class CActor;
|
||||||
|
class CCollisionInfo;
|
||||||
|
class CCollisionInfoList;
|
||||||
|
class CMaterialList;
|
||||||
|
class CStateManager;
|
||||||
class CGameCollision
|
class CGameCollision
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
static bool NullMovingCollider(const CInternalCollisionStructure&, const zeus::CVector3f&, double&, CCollisionInfo&)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
static bool NullBooleanCollider(const CInternalCollisionStructure&) { return false; }
|
||||||
|
static bool NullCollisionCollider(const CInternalCollisionStructure&, CCollisionInfoList&) { return false; }
|
||||||
static void InitCollision();
|
static void InitCollision();
|
||||||
|
|
||||||
|
static bool CanBlock(const CMaterialList&, const zeus::CVector3f&);
|
||||||
|
static bool IsFloor(const CMaterialList&, const zeus::CVector3f&);
|
||||||
|
void SendMaterialMessage(CStateManager&, const CMaterialList&, CActor&);
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // __URDE_CGAMECOLLISION_HPP__
|
#endif // __URDE_CGAMECOLLISION_HPP__
|
||||||
|
|
|
@ -13,5 +13,23 @@ void AddTypes()
|
||||||
CCollisionPrimitive::InitAddType(CCollidableCollisionSurface::GetType());
|
CCollisionPrimitive::InitAddType(CCollidableCollisionSurface::GetType());
|
||||||
CCollisionPrimitive::InitAddType(CCollidableSphere::GetType());
|
CCollisionPrimitive::InitAddType(CCollidableSphere::GetType());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AddColliders()
|
||||||
|
{
|
||||||
|
CCollisionPrimitive::InitAddCollider(Collide::AABox_AABox, "CCollidableAABox", "CCollidableAABox");
|
||||||
|
CCollisionPrimitive::InitAddCollider(Collide::Sphere_AABox, "CCollidableSphere", "CCollidableAABox");
|
||||||
|
CCollisionPrimitive::InitAddCollider(Collide::Sphere_Sphere, "CCollidableSphere", "CCollidableSphere");
|
||||||
|
CCollisionPrimitive::InitAddBooleanCollider(Collide::AABox_AABox_Bool, "CCollidableAABox", "CCollidableAABox");
|
||||||
|
CCollisionPrimitive::InitAddBooleanCollider(Collide::Sphere_AABox_Bool, "CCollidableSphere", "CCollidableAABox");
|
||||||
|
CCollisionPrimitive::InitAddBooleanCollider(Collide::Sphere_Sphere_Bool, "CCollidableSphere", "CCollidableSphere");
|
||||||
|
CCollisionPrimitive::InitAddMovingCollider(CCollidableAABox::CollideMovingAABox, "CCollidableAABox",
|
||||||
|
"CCollidableAABox");
|
||||||
|
CCollisionPrimitive::InitAddMovingCollider(CCollidableAABox::CollideMovingSphere, "CCollidableAABox",
|
||||||
|
"CCollidableSphere");
|
||||||
|
CCollisionPrimitive::InitAddMovingCollider(CCollidableSphere::CollideMovingAABox, "CCollidableSphere",
|
||||||
|
"CCollidableAABox");
|
||||||
|
CCollisionPrimitive::InitAddMovingCollider(CCollidableSphere::CollideMovingSphere, "CCollidableSphere",
|
||||||
|
"CCollidableSphere");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ namespace urde
|
||||||
namespace InternalColliders
|
namespace InternalColliders
|
||||||
{
|
{
|
||||||
void AddTypes();
|
void AddTypes();
|
||||||
|
void AddColliders();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif // __URDE_INTERNALCOLLIDERS_HPP__
|
#endif // __URDE_INTERNALCOLLIDERS_HPP__
|
||||||
|
|
|
@ -40,6 +40,7 @@ class CTexture
|
||||||
void BuildC8(const void* data, size_t length);
|
void BuildC8(const void* data, size_t length);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
CTexture(ETexelFormat, s16, s16, s32);
|
||||||
CTexture(std::unique_ptr<u8[]>&& in, u32 length, bool otex);
|
CTexture(std::unique_ptr<u8[]>&& in, u32 length, bool otex);
|
||||||
enum class EClampMode
|
enum class EClampMode
|
||||||
{
|
{
|
||||||
|
|
|
@ -684,6 +684,19 @@ void CTexture::BuildC8(const void* data, size_t length)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CTexture::CTexture(ETexelFormat fmt, s16 w, s16 h, s32 mips)
|
||||||
|
: x0_fmt(fmt)
|
||||||
|
, x4_w(w)
|
||||||
|
, x6_h(h)
|
||||||
|
, x8_mips(mips)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
x64_ = sMangleMipmaps;
|
||||||
|
InitBitmapBuffers(fmt, w, h, mips);
|
||||||
|
InitTextureObjs();
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
|
||||||
CTexture::CTexture(std::unique_ptr<u8[]>&& in, u32 length, bool otex)
|
CTexture::CTexture(std::unique_ptr<u8[]>&& in, u32 length, bool otex)
|
||||||
{
|
{
|
||||||
std::unique_ptr<u8[]> owned = std::move(in);
|
std::unique_ptr<u8[]> owned = std::move(in);
|
||||||
|
|
|
@ -19,8 +19,8 @@ static CMaterialList MakeActorMaterialList(const CMaterialList& materialList, co
|
||||||
CActor::CActor(TUniqueId uid, bool active, const std::string& name, const CEntityInfo& info, const zeus::CTransform&,
|
CActor::CActor(TUniqueId uid, bool active, const std::string& name, const CEntityInfo& info, const zeus::CTransform&,
|
||||||
CModelData&& mData, const CMaterialList& list, const CActorParameters& params, TUniqueId otherUid)
|
CModelData&& mData, const CMaterialList& list, const CActorParameters& params, TUniqueId otherUid)
|
||||||
: CEntity(uid, info, active, name)
|
: CEntity(uid, info, active, name)
|
||||||
, x60_material(MakeActorMaterialList(list, params))
|
, x68_material(MakeActorMaterialList(list, params))
|
||||||
, x70_(CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {EMaterialTypes::Unknown}))
|
, x70_materialFilter(CMaterialFilter::MakeIncludeExclude({EMaterialTypes::Solid}, {EMaterialTypes::Unknown}))
|
||||||
, xc6_(otherUid)
|
, xc6_(otherUid)
|
||||||
{
|
{
|
||||||
if (mData.x10_animData || mData.x1c_normalModel)
|
if (mData.x10_animData || mData.x1c_normalModel)
|
||||||
|
@ -163,52 +163,52 @@ void CActor::DoUserAnimEvent(CStateManager&, CInt32POINode&, EUserEventType) {}
|
||||||
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, EMaterialTypes t4,
|
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, EMaterialTypes t4,
|
||||||
CStateManager& mgr)
|
CStateManager& mgr)
|
||||||
{
|
{
|
||||||
x60_material.Remove(t1);
|
x68_material.Remove(t1);
|
||||||
RemoveMaterial(t2, t3, t4, mgr);
|
RemoveMaterial(t2, t3, t4, mgr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, CStateManager& mgr)
|
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, CStateManager& mgr)
|
||||||
{
|
{
|
||||||
x60_material.Remove(t1);
|
x68_material.Remove(t1);
|
||||||
RemoveMaterial(t2, t3, mgr);
|
RemoveMaterial(t2, t3, mgr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, CStateManager& mgr) { x60_material.Remove(t1); }
|
void CActor::RemoveMaterial(EMaterialTypes t1, EMaterialTypes t2, CStateManager& mgr) { x68_material.Remove(t1); }
|
||||||
|
|
||||||
void CActor::RemoveMaterial(EMaterialTypes t, CStateManager& mgr)
|
void CActor::RemoveMaterial(EMaterialTypes t, CStateManager& mgr)
|
||||||
{
|
{
|
||||||
x60_material.Remove(t);
|
x68_material.Remove(t);
|
||||||
mgr.UpdateObjectInLists(*this);
|
mgr.UpdateObjectInLists(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CActor::AddMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, EMaterialTypes t4, EMaterialTypes t5,
|
void CActor::AddMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, EMaterialTypes t4, EMaterialTypes t5,
|
||||||
CStateManager& mgr)
|
CStateManager& mgr)
|
||||||
{
|
{
|
||||||
x60_material.Add(t1);
|
x68_material.Add(t1);
|
||||||
AddMaterial(t2, t3, t4, t5, mgr);
|
AddMaterial(t2, t3, t4, t5, mgr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CActor::AddMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, EMaterialTypes t4, CStateManager& mgr)
|
void CActor::AddMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, EMaterialTypes t4, CStateManager& mgr)
|
||||||
{
|
{
|
||||||
x60_material.Add(t1);
|
x68_material.Add(t1);
|
||||||
AddMaterial(t2, t3, t4, mgr);
|
AddMaterial(t2, t3, t4, mgr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CActor::AddMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, CStateManager& mgr)
|
void CActor::AddMaterial(EMaterialTypes t1, EMaterialTypes t2, EMaterialTypes t3, CStateManager& mgr)
|
||||||
{
|
{
|
||||||
x60_material.Add(t1);
|
x68_material.Add(t1);
|
||||||
AddMaterial(t2, t3, mgr);
|
AddMaterial(t2, t3, mgr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CActor::AddMaterial(EMaterialTypes t1, EMaterialTypes t2, CStateManager& mgr)
|
void CActor::AddMaterial(EMaterialTypes t1, EMaterialTypes t2, CStateManager& mgr)
|
||||||
{
|
{
|
||||||
x60_material.Add(t1);
|
x68_material.Add(t1);
|
||||||
AddMaterial(t2, mgr);
|
AddMaterial(t2, mgr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CActor::AddMaterial(EMaterialTypes type, CStateManager& mgr)
|
void CActor::AddMaterial(EMaterialTypes type, CStateManager& mgr)
|
||||||
{
|
{
|
||||||
x60_material.Add(type);
|
x68_material.Add(type);
|
||||||
mgr.UpdateObjectInLists(*this);
|
mgr.UpdateObjectInLists(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,8 +29,8 @@ class CActor : public CEntity
|
||||||
protected:
|
protected:
|
||||||
zeus::CTransform x34_transform;
|
zeus::CTransform x34_transform;
|
||||||
std::unique_ptr<CModelData> x64_modelData;
|
std::unique_ptr<CModelData> x64_modelData;
|
||||||
CMaterialList x60_material;
|
CMaterialList x68_material;
|
||||||
CMaterialFilter x70_;
|
CMaterialFilter x70_materialFilter;
|
||||||
s16 x88_sfxId = -1;
|
s16 x88_sfxId = -1;
|
||||||
std::unique_ptr<CSfxHandle> x8c_sfxHandle;
|
std::unique_ptr<CSfxHandle> x8c_sfxHandle;
|
||||||
std::unique_ptr<CActorLights> x90_actorLights;
|
std::unique_ptr<CActorLights> x90_actorLights;
|
||||||
|
@ -133,8 +133,9 @@ public:
|
||||||
bool GetCallTouch() const;
|
bool GetCallTouch() const;
|
||||||
void SetUseInSortedList(bool use);
|
void SetUseInSortedList(bool use);
|
||||||
bool GetUseInSortedLists() const;
|
bool GetUseInSortedLists() const;
|
||||||
const CMaterialFilter& GetMaterialFilter() const { return x70_; }
|
const CMaterialFilter& GetMaterialFilter() const { return x70_materialFilter; }
|
||||||
const CMaterialList& GetMaterialList() const { return x60_material; }
|
void SetMaterialFilter(const CMaterialFilter& filter) { x70_materialFilter = filter; }
|
||||||
|
const CMaterialList& GetMaterialList() const { return x68_material; }
|
||||||
void SetInFluid(bool in, TUniqueId uid);
|
void SetInFluid(bool in, TUniqueId uid);
|
||||||
bool HasModelData() const;
|
bool HasModelData() const;
|
||||||
const CSfxHandle* GetSfxHandle() const;
|
const CSfxHandle* GetSfxHandle() const;
|
||||||
|
@ -143,6 +144,7 @@ public:
|
||||||
void SetAddedToken(u32 tok);
|
void SetAddedToken(u32 tok);
|
||||||
float GetPitch() const;
|
float GetPitch() const;
|
||||||
float GetYaw() const;
|
float GetYaw() const;
|
||||||
|
const CModelData* GetModelData() const { return x64_modelData.get(); }
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,7 @@ protected:
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
bool x30_24_active : 1;
|
bool x30_24_active : 1;
|
||||||
bool x30_25_ : 1;
|
bool x30_25_inGraveyard : 1;
|
||||||
bool x30_26_scriptingBlocked : 1;
|
bool x30_26_scriptingBlocked : 1;
|
||||||
bool x30_27_ : 1;
|
bool x30_27_ : 1;
|
||||||
};
|
};
|
||||||
|
@ -66,6 +66,11 @@ public:
|
||||||
x30_24_active ^= 1;
|
x30_24_active ^= 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool IsInGraveyard() const { return x30_25_inGraveyard; }
|
||||||
|
void SetIsInGraveyard(bool in) { x30_25_inGraveyard = in; }
|
||||||
|
bool IsScriptingBlocked() const { return x30_26_scriptingBlocked; }
|
||||||
|
void SetIsScriptingBlocked(bool blocked) { x30_26_scriptingBlocked = blocked; }
|
||||||
|
|
||||||
TAreaId GetAreaId() const
|
TAreaId GetAreaId() const
|
||||||
{
|
{
|
||||||
if (x30_27_)
|
if (x30_27_)
|
||||||
|
|
|
@ -301,13 +301,16 @@ public:
|
||||||
const zeus::CAABox& GetAABB() const {return x6c_aabb;}
|
const zeus::CAABox& GetAABB() const {return x6c_aabb;}
|
||||||
|
|
||||||
const std::vector<Dock> GetDocks() const {return xcc_docks;}
|
const std::vector<Dock> GetDocks() const {return xcc_docks;}
|
||||||
|
const Dock* GetDock(s32 dock) const { return &xcc_docks[dock]; }
|
||||||
|
s32 GetDockCount() const { return xcc_docks.size(); }
|
||||||
Dock* DockNC(s32 dock) { return &xcc_docks[dock]; }
|
Dock* DockNC(s32 dock) { return &xcc_docks[dock]; }
|
||||||
|
|
||||||
bool IsPostConstructed() const {return xf0_24_postConstructed;}
|
bool IsPostConstructed() const {return xf0_24_postConstructed;}
|
||||||
const CPostConstructed* GetPostConstructed() const {return x12c_postConstructed.get();}
|
const CPostConstructed* GetPostConstructed() const {return x12c_postConstructed.get();}
|
||||||
|
|
||||||
void SetAreaAttributes(const CScriptAreaAttributes* areaAttributes);
|
void SetAreaAttributes(const CScriptAreaAttributes* areaAttributes);
|
||||||
|
bool GetActive() const { return xf0_25_active; }
|
||||||
|
void SetActive(bool active) { xf0_25_active = active; }
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -70,6 +70,8 @@ set(WORLD_SOURCES
|
||||||
CScriptCameraPitchVolume.hpp CScriptCameraPitchVolume.cpp
|
CScriptCameraPitchVolume.hpp CScriptCameraPitchVolume.cpp
|
||||||
CScriptCameraHintTrigger.hpp CScriptCameraHintTrigger.cpp
|
CScriptCameraHintTrigger.hpp CScriptCameraHintTrigger.cpp
|
||||||
CScriptBeam.hpp CScriptBeam.cpp
|
CScriptBeam.hpp CScriptBeam.cpp
|
||||||
|
CScriptMazeNode.hpp CScriptMazeNode.cpp
|
||||||
|
CScriptShadowProjector.hpp CScriptShadowProjector.cpp
|
||||||
CGrappleParameters.hpp
|
CGrappleParameters.hpp
|
||||||
CActorParameters.hpp
|
CActorParameters.hpp
|
||||||
CLightParameters.hpp
|
CLightParameters.hpp
|
||||||
|
@ -84,6 +86,7 @@ set(WORLD_SOURCES
|
||||||
CPatterned.hpp CPatterned.cpp
|
CPatterned.hpp CPatterned.cpp
|
||||||
CHUDMemoParms.hpp CHUDMemoParms.cpp
|
CHUDMemoParms.hpp CHUDMemoParms.cpp
|
||||||
CWorldShadow.hpp CWorldShadow.cpp
|
CWorldShadow.hpp CWorldShadow.cpp
|
||||||
|
CProjectedShadow.hpp CProjectedShadow.cpp
|
||||||
CGameLight.hpp CGameLight.cpp
|
CGameLight.hpp CGameLight.cpp
|
||||||
CFluidPlane.hpp CFluidPlane.cpp
|
CFluidPlane.hpp CFluidPlane.cpp
|
||||||
CFluidPlaneCPU.hpp CFluidPlaneCPU.cpp
|
CFluidPlaneCPU.hpp CFluidPlaneCPU.cpp
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
#include "World/CProjectedShadow.hpp"
|
||||||
|
|
||||||
|
namespace urde
|
||||||
|
{
|
||||||
|
|
||||||
|
CProjectedShadow::CProjectedShadow(u32 w, u32 h, bool persistent)
|
||||||
|
: x0_texture(CTexture(ETexelFormat::I4, w, h, 1))
|
||||||
|
, x81_persistent(persistent)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
zeus::CAABox CProjectedShadow::CalculateRenderBounds()
|
||||||
|
{
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
void CProjectedShadow::Render(CStateManager&, const CModelData&, const zeus::CTransform&, s32,
|
||||||
|
const zeus::CVector3f&, float, float)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,32 @@
|
||||||
|
#ifndef __URDE_CPROJECTEDSHADOW_HPP__
|
||||||
|
#define __URDE_CPROJECTEDSHADOW_HPP__
|
||||||
|
|
||||||
|
#include "Graphics/CTexture.hpp"
|
||||||
|
#include "zeus/CTransform.hpp"
|
||||||
|
#include "zeus/CAABox.hpp"
|
||||||
|
|
||||||
|
namespace urde
|
||||||
|
{
|
||||||
|
class CStateManager;
|
||||||
|
class CModelData;
|
||||||
|
class CProjectedShadow
|
||||||
|
{
|
||||||
|
CTexture x0_texture;
|
||||||
|
zeus::CAABox x68_ = zeus::CAABox::skInvertedBox;
|
||||||
|
bool x80_;
|
||||||
|
bool x81_persistent;
|
||||||
|
float x84_ = 1.f;
|
||||||
|
zeus::CVector3f x88_ = zeus::CVector3f::skZero;
|
||||||
|
float x94_zDistanceAdjust = 0.f;
|
||||||
|
float x98_ = 1.f;
|
||||||
|
|
||||||
|
public:
|
||||||
|
CProjectedShadow() = default;
|
||||||
|
CProjectedShadow(u32, u32, bool);
|
||||||
|
|
||||||
|
zeus::CAABox CalculateRenderBounds();
|
||||||
|
void Render(CStateManager&, const CModelData&, const zeus::CTransform&, s32, const zeus::CVector3f&, float,
|
||||||
|
float);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
#endif // __URDE_CPROJECTEDSHADOW_HPP__
|
|
@ -29,13 +29,13 @@ void CScriptAreaAttributes::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId
|
||||||
|
|
||||||
if (msg == EScriptObjectMessage::InternalMessage13)
|
if (msg == EScriptObjectMessage::InternalMessage13)
|
||||||
{
|
{
|
||||||
CGameArea* area = stateMgr.GetWorld()->GetArea(x4_areaId);
|
CGameArea* area = stateMgr.WorldNC()->GetArea(x4_areaId);
|
||||||
area->SetAreaAttributes(this);
|
area->SetAreaAttributes(this);
|
||||||
stateMgr.GetEnvFxManager()->SetFxDensity(500, x3c_envFxDensity);
|
stateMgr.GetEnvFxManager()->SetFxDensity(500, x3c_envFxDensity);
|
||||||
}
|
}
|
||||||
else if (msg >= EScriptObjectMessage::InternalMessage12)
|
else if (msg >= EScriptObjectMessage::InternalMessage12)
|
||||||
{
|
{
|
||||||
CGameArea* area = stateMgr.GetWorld()->GetArea(x4_areaId);
|
CGameArea* area = stateMgr.WorldNC()->GetArea(x4_areaId);
|
||||||
|
|
||||||
if (!area->IsPostConstructed())
|
if (!area->IsPostConstructed())
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -120,7 +120,7 @@ void CScriptCoverPoint::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
|
||||||
for (const SConnection& con : x20_conns)
|
for (const SConnection& con : x20_conns)
|
||||||
if (con.x0_state == EScriptObjectState::Retreat)
|
if (con.x0_state == EScriptObjectState::Retreat)
|
||||||
{
|
{
|
||||||
xfc_ = mgr.GetIdForScript(con.x8_objId);
|
xfc_retreating = mgr.GetIdForScript(con.x8_objId);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,7 +31,7 @@ class CScriptCoverPoint : public CActor
|
||||||
u32 xf8_flags = 0;
|
u32 xf8_flags = 0;
|
||||||
};
|
};
|
||||||
TUniqueId xfa_occupant = kInvalidUniqueId;
|
TUniqueId xfa_occupant = kInvalidUniqueId;
|
||||||
TUniqueId xfc_ = kInvalidUniqueId;
|
TUniqueId xfc_retreating = kInvalidUniqueId;
|
||||||
std::experimental::optional<zeus::CAABox> x100_touchBounds;
|
std::experimental::optional<zeus::CAABox> x100_touchBounds;
|
||||||
float x11c_timeLeft = 0.f;
|
float x11c_timeLeft = 0.f;
|
||||||
public:
|
public:
|
||||||
|
|
|
@ -39,7 +39,7 @@ void CScriptDistanceFog::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId obj
|
||||||
{
|
{
|
||||||
if (!x60_explicit)
|
if (!x60_explicit)
|
||||||
return;
|
return;
|
||||||
CGameArea::CAreaFog* fog = stateMgr.GetWorld()->GetArea(x4_areaId)->AreaFog();
|
CGameArea::CAreaFog* fog = stateMgr.WorldNC()->GetArea(x4_areaId)->AreaFog();
|
||||||
if (x34_mode == ERglFogMode::None)
|
if (x34_mode == ERglFogMode::None)
|
||||||
fog->DisableFog();
|
fog->DisableFog();
|
||||||
else
|
else
|
||||||
|
@ -50,7 +50,7 @@ void CScriptDistanceFog::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId obj
|
||||||
if (!x61_nonZero)
|
if (!x61_nonZero)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CGameArea::CAreaFog* fog = stateMgr.GetWorld()->GetArea(x4_areaId)->AreaFog();
|
CGameArea::CAreaFog* fog = stateMgr.WorldNC()->GetArea(x4_areaId)->AreaFog();
|
||||||
if (x34_mode == ERglFogMode::None)
|
if (x34_mode == ERglFogMode::None)
|
||||||
fog->RollFogOut(x48_rangeDelta.x, x44_colorDelta, x38_color);
|
fog->RollFogOut(x48_rangeDelta.x, x44_colorDelta, x38_color);
|
||||||
else
|
else
|
||||||
|
@ -58,13 +58,13 @@ void CScriptDistanceFog::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId obj
|
||||||
|
|
||||||
if (zeus::close_enough(x54_thermalSpeed, 0.f) && !zeus::close_enough(x5c_xraySpeed, 0.f))
|
if (zeus::close_enough(x54_thermalSpeed, 0.f) && !zeus::close_enough(x5c_xraySpeed, 0.f))
|
||||||
{
|
{
|
||||||
CWorld* world = stateMgr.GetWorld();
|
CWorld* world = stateMgr.WorldNC();
|
||||||
CGameArea* area = world->GetArea(x4_areaId);
|
CGameArea* area = world->GetArea(x4_areaId);
|
||||||
area->SetXRaySpeedAndTarget(x5c_xraySpeed, x58_xrayTarget);
|
area->SetXRaySpeedAndTarget(x5c_xraySpeed, x58_xrayTarget);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
CWorld* world = stateMgr.GetWorld();
|
CWorld* world = stateMgr.WorldNC();
|
||||||
CGameArea* area = world->GetArea(x4_areaId);
|
CGameArea* area = world->GetArea(x4_areaId);
|
||||||
area->SetThermalSpeedAndTarget(x54_thermalSpeed, x50_thermalTarget);
|
area->SetThermalSpeedAndTarget(x54_thermalSpeed, x50_thermalTarget);
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,6 +4,8 @@
|
||||||
#include "Collision/CMaterialList.hpp"
|
#include "Collision/CMaterialList.hpp"
|
||||||
#include "CWorld.hpp"
|
#include "CWorld.hpp"
|
||||||
#include "CStateManager.hpp"
|
#include "CStateManager.hpp"
|
||||||
|
#include "CScriptDoor.hpp"
|
||||||
|
#include "CPlayer.hpp"
|
||||||
|
|
||||||
namespace urde
|
namespace urde
|
||||||
{
|
{
|
||||||
|
@ -18,27 +20,202 @@ CMaterialList MakeDockMaterialList()
|
||||||
|
|
||||||
CScriptDock::CScriptDock(TUniqueId uid, const std::string& name, const CEntityInfo& info,
|
CScriptDock::CScriptDock(TUniqueId uid, const std::string& name, const CEntityInfo& info,
|
||||||
const zeus::CVector3f position, const zeus::CVector3f& extents, s32 dock, TAreaId area,
|
const zeus::CVector3f position, const zeus::CVector3f& extents, s32 dock, TAreaId area,
|
||||||
bool active, s32 w1, bool b1)
|
bool active, s32 w1, bool loadConnected)
|
||||||
: CPhysicsActor(uid, active, name, info, zeus::CTransform(zeus::CMatrix3f::skIdentityMatrix3f, position),
|
: CPhysicsActor(uid, active, name, info, zeus::CTransform(zeus::CMatrix3f::skIdentityMatrix3f, position),
|
||||||
CModelData::CModelDataNull(), MakeDockMaterialList(), zeus::CAABox(-extents * 0.5f, extents * 0.5f),
|
CModelData::CModelDataNull(), MakeDockMaterialList(), zeus::CAABox(-extents * 0.5f, extents * 0.5f),
|
||||||
SMoverData(1.f), CActorParameters::None(), 0.3f, 0.1f),
|
SMoverData(1.f), CActorParameters::None(), 0.3f, 0.1f)
|
||||||
x258_(w1),
|
, x258_dockReferenceCount(w1)
|
||||||
x25c_dock(dock),
|
, x25c_dock(dock)
|
||||||
x260_area(area),
|
, x260_area(area)
|
||||||
x264_(3)
|
, x268_25_loadConnected(loadConnected)
|
||||||
{
|
{
|
||||||
x268_24_ = false;
|
}
|
||||||
x268_25_ = b1;
|
|
||||||
x268_26_ = false;
|
void CScriptDock::Think(float dt, CStateManager& mgr)
|
||||||
|
{
|
||||||
|
if (!GetActive())
|
||||||
|
{
|
||||||
|
UpdateAreaActivateFlags(mgr);
|
||||||
|
x268_24_dockReferenced = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
CGameArea* area = mgr.WorldNC()->GetArea(x260_area);
|
||||||
|
if (x268_26_areaPostConstructed != area->IsPostConstructed())
|
||||||
|
{
|
||||||
|
if (area->IsPostConstructed())
|
||||||
|
CEntity::SendScriptMsgs(EScriptObjectState::MaxReached, mgr, EScriptObjectMessage::None);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptDock::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr)
|
||||||
|
{
|
||||||
|
switch (msg)
|
||||||
|
{
|
||||||
|
case EScriptObjectMessage::InternalMessage11:
|
||||||
|
{
|
||||||
|
CGameArea* area = mgr.WorldNC()->GetArea(x260_area);
|
||||||
|
if (area->GetDockCount() <= x25c_dock)
|
||||||
|
return;
|
||||||
|
IGameArea::Dock* dock = area->DockNC(x25c_dock);
|
||||||
|
if (!dock->IsReferenced())
|
||||||
|
dock->SetReferenceCount(x258_dockReferenceCount);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case EScriptObjectMessage::InternalMessage12:
|
||||||
|
CleanUp();
|
||||||
|
break;
|
||||||
|
case EScriptObjectMessage::InternalMessage13:
|
||||||
|
AreaLoaded(mgr);
|
||||||
|
break;
|
||||||
|
case EScriptObjectMessage::InternalMessage14:
|
||||||
|
{
|
||||||
|
UpdateAreaActivateFlags(mgr);
|
||||||
|
CMaterialList exclude = GetMaterialFilter().GetExcludeList();
|
||||||
|
CMaterialList include = GetMaterialFilter().GetIncludeList();
|
||||||
|
include.Add(EMaterialTypes::AIBlock);
|
||||||
|
SetMaterialFilter({include, exclude, CMaterialFilter::EFilterType::Three});
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case EScriptObjectMessage::SetToZero:
|
||||||
|
{
|
||||||
|
if (mgr.GetNextAreaId() != x260_area)
|
||||||
|
return;
|
||||||
|
|
||||||
|
SetLoadConnected(mgr, false);
|
||||||
|
|
||||||
|
CGameArea* area = mgr.WorldNC()->GetArea(x260_area);
|
||||||
|
IGameArea::Dock* dock = area->DockNC(x25c_dock);
|
||||||
|
|
||||||
|
TAreaId aid = dock->GetConnectedAreaId(dock->GetReferenceCount());
|
||||||
|
|
||||||
|
CPlatformAndDoorList& lst = mgr.GetPlatformAndDoorObjectList();
|
||||||
|
for (CEntity* ent : lst)
|
||||||
|
{
|
||||||
|
CScriptDoor* door = static_cast<CScriptDoor*>(ent);
|
||||||
|
if (door && !door->IsConnectedToArea(mgr, aid))
|
||||||
|
door->ForceClosed(mgr);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case EScriptObjectMessage::SetToMax:
|
||||||
|
if (mgr.GetNextAreaId() != x260_area)
|
||||||
|
return;
|
||||||
|
|
||||||
|
SetLoadConnected(mgr, true);
|
||||||
|
break;
|
||||||
|
case EScriptObjectMessage::Increment:
|
||||||
|
SetLoadConnected(mgr, true);
|
||||||
|
case EScriptObjectMessage::Decrement:
|
||||||
|
{
|
||||||
|
TAreaId aid = x260_area;
|
||||||
|
if (mgr.GetNextAreaId() == x260_area)
|
||||||
|
{
|
||||||
|
IGameArea::Dock* dock = mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock);
|
||||||
|
aid = dock->GetConnectedAreaId(dock->GetReferenceCount());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (aid == 0 || mgr.GetWorld()->GetNumAreas() <= aid)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!mgr.WorldNC()->GetArea(aid)->GetActive())
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#if 0
|
||||||
|
/* Propogate through area chain */
|
||||||
|
sub800C40DC((msg == EScriptObjectMessage::Increment), mgr.GetWorld()->GetAreaAlways(aid), mgr.WorldNC());
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
CPhysicsActor::AcceptScriptMsg(msg, uid, mgr);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
rstl::optional_object<zeus::CAABox> CScriptDock::GetTouchBounds() const
|
||||||
|
{
|
||||||
|
if (x264_dockState == EDockState::Three)
|
||||||
|
return {};
|
||||||
|
|
||||||
|
return GetBoundingBox();
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptDock::Touch(CActor& act, CStateManager&)
|
||||||
|
{
|
||||||
|
if (x264_dockState == EDockState::Three)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (static_cast<CPlayer*>(&act) != nullptr)
|
||||||
|
x264_dockState = EDockState::PlayerTouched;
|
||||||
|
}
|
||||||
|
|
||||||
|
zeus::CPlane CScriptDock::GetPlane(const CStateManager& mgr) const
|
||||||
|
{
|
||||||
|
const IGameArea::Dock* dock = mgr.GetWorld()->GetAreaAlways(x260_area)->GetDock(x25c_dock);
|
||||||
|
|
||||||
|
return zeus::CPlane(dock->GetPoint(0), dock->GetPoint(1), dock->GetPoint(2));
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptDock::SetDockReference(CStateManager& mgr, s32 ref)
|
||||||
|
{
|
||||||
|
mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock)->SetReferenceCount(ref);
|
||||||
|
x268_24_dockReferenced = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
s32 CScriptDock::GetDockReference(CStateManager& mgr) const
|
||||||
|
{
|
||||||
|
return mgr.GetWorld()->GetAreaAlways(x260_area)->GetDock(x25c_dock)->GetReferenceCount();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
TAreaId CScriptDock::GetCurrentConnectedAreaId(const CStateManager& mgr) const
|
||||||
|
{
|
||||||
|
if (mgr.GetWorld()->GetNumAreas() < x260_area)
|
||||||
|
return kInvalidAreaId;
|
||||||
|
const CGameArea* area = mgr.GetWorld()->GetAreaAlways(x260_area);
|
||||||
|
if (area->GetDockCount() < x25c_dock)
|
||||||
|
return kInvalidAreaId;
|
||||||
|
|
||||||
|
const IGameArea::Dock* dock = area->GetDock(x25c_dock);
|
||||||
|
return dock->GetConnectedAreaId(dock->GetReferenceCount());
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptDock::UpdateAreaActivateFlags(CStateManager& mgr)
|
||||||
|
{
|
||||||
|
CWorld* world = mgr.WorldNC();
|
||||||
|
if (x260_area >= world->GetNumAreas())
|
||||||
|
return;
|
||||||
|
|
||||||
|
CGameArea* area = world->GetArea(x260_area);
|
||||||
|
|
||||||
|
if (x25c_dock >= area->GetDockCount())
|
||||||
|
return;
|
||||||
|
|
||||||
|
IGameArea::Dock* dock = area->DockNC(x25c_dock);
|
||||||
|
|
||||||
|
for (s32 i = 0; i < dock->GetDockRefs().size(); ++i)
|
||||||
|
{
|
||||||
|
s32 dockRefCount = dock->GetReferenceCount();
|
||||||
|
TAreaId aid = dock->GetConnectedAreaId(i);
|
||||||
|
if (aid != kInvalidAreaId)
|
||||||
|
world->GetArea(aid)->SetActive(i == dockRefCount);
|
||||||
|
}
|
||||||
|
mgr.SetCurrentAreaId(mgr.GetNextAreaId());
|
||||||
}
|
}
|
||||||
|
|
||||||
void CScriptDock::AreaLoaded(CStateManager& mgr)
|
void CScriptDock::AreaLoaded(CStateManager& mgr)
|
||||||
{
|
{
|
||||||
SetLoadConnected(mgr, x268_25_);
|
SetLoadConnected(mgr, x268_25_loadConnected);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CScriptDock::SetLoadConnected(CStateManager& mgr, bool loadOther)
|
void CScriptDock::SetLoadConnected(CStateManager& mgr, bool loadOther)
|
||||||
{
|
{
|
||||||
IGameArea::Dock* dock = mgr.GetWorld()->GetArea(x260_area)->DockNC(x25c_dock);
|
IGameArea::Dock* dock = mgr.WorldNC()->GetArea(x260_area)->DockNC(x25c_dock);
|
||||||
|
bool cur = dock->GetShouldLoadOther(dock->GetReferenceCount());
|
||||||
|
if (cur == loadOther)
|
||||||
|
return;
|
||||||
|
|
||||||
|
dock->SetShouldLoadOther(dock->GetReferenceCount(), loadOther);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,29 +8,43 @@ namespace urde
|
||||||
|
|
||||||
class CScriptDock : public CPhysicsActor
|
class CScriptDock : public CPhysicsActor
|
||||||
{
|
{
|
||||||
|
enum EDockState
|
||||||
|
{
|
||||||
|
Zero,
|
||||||
|
PlayerTouched,
|
||||||
|
Two,
|
||||||
|
Three
|
||||||
|
};
|
||||||
|
|
||||||
friend class CScriptDoor;
|
friend class CScriptDoor;
|
||||||
s32 x258_;
|
s32 x258_dockReferenceCount;
|
||||||
s32 x25c_dock;
|
s32 x25c_dock;
|
||||||
TAreaId x260_area;
|
TAreaId x260_area;
|
||||||
u32 x264_;
|
EDockState x264_dockState = EDockState::Three;
|
||||||
union
|
union {
|
||||||
{
|
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
bool x268_24_ : 1;
|
bool x268_24_dockReferenced : 1;
|
||||||
bool x268_25_ : 1;
|
bool x268_25_loadConnected : 1;
|
||||||
bool x268_26_ : 1;
|
bool x268_26_areaPostConstructed : 1;
|
||||||
};
|
};
|
||||||
u8 dummy = 0;
|
u8 dummy = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CScriptDock(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CVector3f position,
|
CScriptDock(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CVector3f position,
|
||||||
const zeus::CVector3f& extent, s32, TAreaId, bool active, s32 w1, bool b1);
|
const zeus::CVector3f& extent, s32, TAreaId, bool active, s32 w1, bool b1);
|
||||||
|
|
||||||
TAreaId GetAreaId() const { return x260_area; }
|
void Think(float, CStateManager&);
|
||||||
|
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&);
|
||||||
|
rstl::optional_object<zeus::CAABox> GetTouchBounds() const;
|
||||||
|
void Touch(CActor&, CStateManager&);
|
||||||
|
void CleanUp() {}
|
||||||
|
zeus::CPlane GetPlane(const CStateManager&) const;
|
||||||
|
TAreaId GetDestinationAreaId() const { return x260_area; }
|
||||||
s32 GetDockId() const { return x25c_dock; }
|
s32 GetDockId() const { return x25c_dock; }
|
||||||
void SetDockReference(s32) {}
|
void SetDockReference(CStateManager& mgr, s32);
|
||||||
void GetDockReference(s32) {}
|
s32 GetDockReference(CStateManager& mgr) const;
|
||||||
TAreaId GetCurrentConnectedAreaId(const CStateManager&) const;
|
TAreaId GetCurrentConnectedAreaId(const CStateManager&) const;
|
||||||
void UpdateAreaActivateFlags(CStateManager&);
|
void UpdateAreaActivateFlags(CStateManager&);
|
||||||
bool HasPointCrossedDock(const CStateManager&, const zeus::CVector3f&) const;
|
bool HasPointCrossedDock(const CStateManager&, const zeus::CVector3f&) const;
|
||||||
|
|
|
@ -25,7 +25,7 @@ void CScriptDockAreaChange::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId
|
||||||
TUniqueId id = it->second;
|
TUniqueId id = it->second;
|
||||||
CScriptDock* dock = dynamic_cast<CScriptDock*>(stateMgr.ObjectById(id));
|
CScriptDock* dock = dynamic_cast<CScriptDock*>(stateMgr.ObjectById(id));
|
||||||
if (dock)
|
if (dock)
|
||||||
dock->SetDockReference(x34_dockReference);
|
dock->SetDockReference(stateMgr, x34_dockReference);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -111,7 +111,7 @@ bool CScriptDoor::IsConnectedToArea(const CStateManager& mgr, TAreaId area)
|
||||||
const CScriptDock* dock = dynamic_cast<const CScriptDock*>(mgr.GetObjectById(x282_dockId));
|
const CScriptDock* dock = dynamic_cast<const CScriptDock*>(mgr.GetObjectById(x282_dockId));
|
||||||
if (dock)
|
if (dock)
|
||||||
{
|
{
|
||||||
if (dock->x260_area == area)
|
if (dock->GetDestinationAreaId() == area)
|
||||||
return true;
|
return true;
|
||||||
/*
|
/*
|
||||||
* TODO: Determine what's going on here
|
* TODO: Determine what's going on here
|
||||||
|
|
|
@ -10,15 +10,24 @@ CScriptMazeNode::CScriptMazeNode(TUniqueId uid, const std::string& name, const C
|
||||||
const zeus::CTransform& xf, bool active, s32 w1, s32 w2, s32 w3,
|
const zeus::CTransform& xf, bool active, s32 w1, s32 w2, s32 w3,
|
||||||
const zeus::CVector3f& vec1, const zeus::CVector3f& vec2, const zeus::CVector3f& vec3)
|
const zeus::CVector3f& vec1, const zeus::CVector3f& vec2, const zeus::CVector3f& vec3)
|
||||||
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(), CActorParameters::None(),
|
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(), CActorParameters::None(),
|
||||||
kInvalidUniqueId),
|
kInvalidUniqueId)
|
||||||
xe8_(w1), xec_(w1), xf0_(w2),
|
, xe8_(w1)
|
||||||
x100_(vec1), x110_(vec2), x120_(vec3)
|
, xec_(w1)
|
||||||
|
, xf0_(w2)
|
||||||
|
, x100_(vec1)
|
||||||
|
, x110_(vec2)
|
||||||
|
, x120_(vec3)
|
||||||
{
|
{
|
||||||
x13c_24_ = true;
|
x13c_24_ = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CScriptMazeNode::LoadSeeds()
|
void CScriptMazeNode::LoadSeeds()
|
||||||
{
|
{
|
||||||
|
const SObjectTag* tag = g_ResFactory->GetResourceIdByName("DUMB_MazeSeeds");
|
||||||
|
u32 resSize = g_ResFactory->ResourceSize(*tag);
|
||||||
|
std::unique_ptr<u8[]> buf = g_ResFactory->LoadResourceSync(*tag);
|
||||||
|
CMemoryInStream in(buf.get(), resSize);
|
||||||
|
for (u32 i = 0; i<300 ; ++i)
|
||||||
|
sMazeSeeds[i] = in.readUint32Big();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ namespace urde
|
||||||
{
|
{
|
||||||
class CScriptMazeNode : CActor
|
class CScriptMazeNode : CActor
|
||||||
{
|
{
|
||||||
|
static u32 sMazeSeeds[300];
|
||||||
s32 xe8_;
|
s32 xe8_;
|
||||||
s32 xec_;
|
s32 xec_;
|
||||||
s32 xf0_;
|
s32 xf0_;
|
||||||
|
|
|
@ -0,0 +1,91 @@
|
||||||
|
#include "World/CScriptShadowProjector.hpp"
|
||||||
|
#include "World/CActorParameters.hpp"
|
||||||
|
#include "World/CProjectedShadow.hpp"
|
||||||
|
#include "CStateManager.hpp"
|
||||||
|
|
||||||
|
namespace urde
|
||||||
|
{
|
||||||
|
|
||||||
|
CScriptShadowProjector::CScriptShadowProjector(TUniqueId uid, const std::string& name, const CEntityInfo& info,
|
||||||
|
const zeus::CTransform& xf, bool active, const zeus::CVector3f& offset,
|
||||||
|
bool b2, float scale, float f2, float opacity, float opacityQ,
|
||||||
|
s32 textureSize)
|
||||||
|
: CActor(uid, active, name, info, xf, CModelData::CModelDataNull(), CMaterialList(), CActorParameters::None(),
|
||||||
|
kInvalidUniqueId)
|
||||||
|
, xe8_scale(scale)
|
||||||
|
, xec_offset(offset)
|
||||||
|
, xf8_zOffsetAdjust(f2)
|
||||||
|
, xfc_opacity(opacity)
|
||||||
|
, x100_opacityRecip(opacity < 0.00001 ? 1.f : opacityQ / opacity)
|
||||||
|
, x10c_textureSize(textureSize)
|
||||||
|
, x110_24_persistent(b2)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptShadowProjector::Think(float dt, CStateManager& mgr)
|
||||||
|
{
|
||||||
|
if (GetActive() && x110_25_shadowInvalidated)
|
||||||
|
{
|
||||||
|
xfc_opacity = (x100_opacityRecip * xfc_opacity) - dt;
|
||||||
|
if (dt > 0.f)
|
||||||
|
return;
|
||||||
|
|
||||||
|
x108_projectedShadow.reset();
|
||||||
|
|
||||||
|
x110_25_shadowInvalidated = false;
|
||||||
|
SendScriptMsgs(EScriptObjectState::Zero, mgr, EScriptObjectMessage::None);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptShadowProjector::CreateProjectedShadow()
|
||||||
|
{
|
||||||
|
if (!GetActive() || x104_target == kInvalidUniqueId || xfc_opacity <= 0.f)
|
||||||
|
x108_projectedShadow.reset();
|
||||||
|
else
|
||||||
|
x108_projectedShadow.reset(new CProjectedShadow(x10c_textureSize, x10c_textureSize, x110_24_persistent));
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptShadowProjector::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr)
|
||||||
|
{
|
||||||
|
CActor::AcceptScriptMsg(msg, uid, mgr);
|
||||||
|
if (msg == EScriptObjectMessage::Decrement)
|
||||||
|
{
|
||||||
|
if (x110_24_persistent)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (xfc_opacity <= 0.f)
|
||||||
|
return;
|
||||||
|
|
||||||
|
x110_25_shadowInvalidated = true;
|
||||||
|
}
|
||||||
|
else if (msg == EScriptObjectMessage::InternalMessage13)
|
||||||
|
{
|
||||||
|
for (const SConnection& conn : x20_conns)
|
||||||
|
{
|
||||||
|
if (conn.x0_state != EScriptObjectState::Play)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
const CActor* act = dynamic_cast<const CActor*>(mgr.GetObjectById(mgr.GetIdForScript(conn.x8_objId)));
|
||||||
|
if (!act)
|
||||||
|
continue;
|
||||||
|
const CModelData* mData = act->GetModelData();
|
||||||
|
if (!mData || (!mData->GetAnimationData() && !mData->GetNormalModel()))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
x104_target = act->GetUniqueId();
|
||||||
|
}
|
||||||
|
if (x104_target == kInvalidUniqueId)
|
||||||
|
mgr.DeleteObjectRequest(GetUniqueId());
|
||||||
|
else
|
||||||
|
CreateProjectedShadow();
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (msg == EScriptObjectMessage::Activate)
|
||||||
|
CreateProjectedShadow();
|
||||||
|
}
|
||||||
|
|
||||||
|
void CScriptShadowProjector::PreRender(const zeus::CFrustum &, const CStateManager &)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
#ifndef __URDE_CSCRIPTSHADOWPROJECTOR_HPP__
|
||||||
|
#define __URDE_CSCRIPTSHADOWPROJECTOR_HPP__
|
||||||
|
|
||||||
|
#include "World/CActor.hpp"
|
||||||
|
|
||||||
|
namespace urde
|
||||||
|
{
|
||||||
|
class CProjectedShadow;
|
||||||
|
class CScriptShadowProjector : public CActor
|
||||||
|
{
|
||||||
|
float xe8_scale;
|
||||||
|
zeus::CVector3f xec_offset;
|
||||||
|
float xf8_zOffsetAdjust;
|
||||||
|
float xfc_opacity;
|
||||||
|
float x100_opacityRecip;
|
||||||
|
TUniqueId x104_target;
|
||||||
|
std::unique_ptr<CProjectedShadow> x108_projectedShadow;
|
||||||
|
u32 x10c_textureSize;
|
||||||
|
|
||||||
|
union {
|
||||||
|
struct
|
||||||
|
{
|
||||||
|
bool x110_24_persistent : 1;
|
||||||
|
bool x110_25_shadowInvalidated : 1;
|
||||||
|
};
|
||||||
|
u8 x110_dummy = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
public:
|
||||||
|
CScriptShadowProjector(TUniqueId, const std::string&, const CEntityInfo&, const zeus::CTransform&, bool,
|
||||||
|
const zeus::CVector3f&, bool, float, float, float, float, s32);
|
||||||
|
|
||||||
|
void Think(float, CStateManager &);
|
||||||
|
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager &);
|
||||||
|
void PreRender(const zeus::CFrustum &, const CStateManager &);
|
||||||
|
void AddToRenderer(const zeus::CFrustum &, const CStateManager &) const {}
|
||||||
|
void CreateProjectedShadow();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // __URDE_CSCRIPTSHADOWPROJECTOR_HPP__
|
|
@ -36,14 +36,13 @@ CStateMachine::CStateMachine(CInputStream& in)
|
||||||
std::string name = in.readString(31);
|
std::string name = in.readString(31);
|
||||||
CAiTriggerFunc func = CAi::GetTrigerFunc(name.c_str());
|
CAiTriggerFunc func = CAi::GetTrigerFunc(name.c_str());
|
||||||
float f31 = in.readFloatBig();
|
float f31 = in.readFloatBig();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
s32 CStateMachine::GetStateIndex(const std::string& state)
|
s32 CStateMachine::GetStateIndex(const std::string& state) const
|
||||||
{
|
{
|
||||||
auto it = std::find_if(x0_states.begin(), x0_states.end(), [&state](const CAiState& st) -> bool {
|
auto it = std::find_if(x0_states.begin(), x0_states.end(), [&state](const CAiState& st) -> bool {
|
||||||
return (strncmp(st.GetName(), state.c_str(), 31) == 0);
|
return (strncmp(st.GetName(), state.c_str(), 31) == 0);
|
||||||
|
@ -54,14 +53,24 @@ s32 CStateMachine::GetStateIndex(const std::string& state)
|
||||||
return it - x0_states.begin();
|
return it - x0_states.begin();
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::vector<CAiState>& CStateMachine::GetStateVector() const
|
const std::vector<CAiState>& CStateMachine::GetStateVector() const { return x0_states; }
|
||||||
|
|
||||||
|
float CStateMachineState::GetTime() const { return 0.f; }
|
||||||
|
|
||||||
|
void CStateMachineState::SetState(CStateManager &, CAi &, s32 idx)
|
||||||
{
|
{
|
||||||
return x0_states;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
float CStateMachineState::GetTime() const
|
void CStateMachineState::SetState(CStateManager& mgr, CAi& ai, const CStateMachine* machine, const std::string& state)
|
||||||
{
|
{
|
||||||
return 0.f;
|
if (!machine)
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!x0_machine)
|
||||||
|
x0_machine = machine;
|
||||||
|
|
||||||
|
s32 idx = machine->GetStateIndex(state);
|
||||||
|
SetState(mgr, ai, idx);
|
||||||
}
|
}
|
||||||
|
|
||||||
const std::vector<CAiState>* CStateMachineState::GetStateVector() const
|
const std::vector<CAiState>* CStateMachineState::GetStateVector() const
|
||||||
|
@ -76,14 +85,10 @@ void CStateMachineState::Setup(const CStateMachine *machine)
|
||||||
{
|
{
|
||||||
x0_machine = machine;
|
x0_machine = machine;
|
||||||
x4_state = nullptr;
|
x4_state = nullptr;
|
||||||
x8_ = 0.f;
|
x8_time = 0.f;
|
||||||
xc_ = 0.f;
|
xc_ = 0.f;
|
||||||
x10_ = 0.f;
|
x10_ = 0.f;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string CStateMachineState::GetName() const
|
std::string CStateMachineState::GetName() const { return {}; }
|
||||||
{
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -68,7 +68,7 @@ class CStateMachine
|
||||||
public:
|
public:
|
||||||
CStateMachine(CInputStream& in);
|
CStateMachine(CInputStream& in);
|
||||||
|
|
||||||
s32 GetStateIndex(const std::string& state);
|
s32 GetStateIndex(const std::string& state) const;
|
||||||
const std::vector<CAiState>& GetStateVector() const;
|
const std::vector<CAiState>& GetStateVector() const;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -76,9 +76,9 @@ class CStateMachineState
|
||||||
{
|
{
|
||||||
const CStateMachine* x0_machine = nullptr;
|
const CStateMachine* x0_machine = nullptr;
|
||||||
CAiState* x4_state = nullptr;
|
CAiState* x4_state = nullptr;
|
||||||
float x8_ = 0;
|
float x8_time = 0.f;
|
||||||
float xc_ = 0;
|
float xc_ = 0.f;
|
||||||
float x10_ = 0;
|
float x10_ = 0.f;
|
||||||
union
|
union
|
||||||
{
|
{
|
||||||
struct
|
struct
|
||||||
|
@ -95,12 +95,12 @@ public:
|
||||||
|
|
||||||
void Update(CStateManager& mgr, CAi& ai, float delta)
|
void Update(CStateManager& mgr, CAi& ai, float delta)
|
||||||
{
|
{
|
||||||
x8_ += delta;
|
x8_time += delta;
|
||||||
if (x4_state)
|
if (x4_state)
|
||||||
x4_state->CallFunc(mgr, ai, EStateMsg::One, delta);
|
x4_state->CallFunc(mgr, ai, EStateMsg::One, delta);
|
||||||
}
|
}
|
||||||
void SetState(CStateManager&, CAi&, s32);
|
void SetState(CStateManager&, CAi&, s32);
|
||||||
void SetState(CStateManager &, CAi &, const std::string&);
|
void SetState(CStateManager&, CAi&, const CStateMachine*, const std::string&);
|
||||||
const std::vector<CAiState>* GetStateVector() const;
|
const std::vector<CAiState>* GetStateVector() const;
|
||||||
void Setup(const CStateMachine* machine);
|
void Setup(const CStateMachine* machine);
|
||||||
std::string GetName() const;
|
std::string GetName() const;
|
||||||
|
|
|
@ -170,6 +170,7 @@ public:
|
||||||
CMapWorld* IMapWorld();
|
CMapWorld* IMapWorld();
|
||||||
const CGameArea* GetAreaAlways(TAreaId) const;
|
const CGameArea* GetAreaAlways(TAreaId) const;
|
||||||
CGameArea* GetArea(TAreaId);
|
CGameArea* GetArea(TAreaId);
|
||||||
|
s32 GetNumAreas() const { return x18_areas.size(); }
|
||||||
const IGameArea* IGetAreaAlways(TAreaId id) const;
|
const IGameArea* IGetAreaAlways(TAreaId id) const;
|
||||||
TAreaId IGetCurrentAreaId() const;
|
TAreaId IGetCurrentAreaId() const;
|
||||||
TAreaId IGetAreaId(ResId id) const;
|
TAreaId IGetAreaId(ResId id) const;
|
||||||
|
|
|
@ -45,16 +45,23 @@ bool IGameArea::Dock::GetShouldLoadOther(s32 other) const
|
||||||
if (other >= x4_dockReferences.size())
|
if (other >= x4_dockReferences.size())
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
return false; //return x4_dockReferences[other].GetShouldLoad();
|
return x4_dockReferences[other].x6_loadOther;
|
||||||
}
|
}
|
||||||
|
|
||||||
void IGameArea::Dock::SetShouldLoadOther(s32 other, bool should)
|
void IGameArea::Dock::SetShouldLoadOther(s32 other, bool should)
|
||||||
{
|
{
|
||||||
|
if (other >= x4_dockReferences.size())
|
||||||
|
return;
|
||||||
|
|
||||||
|
x4_dockReferences[other].x6_loadOther = should;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IGameArea::Dock::ShouldLoadOtherArea(s32 other) const
|
bool IGameArea::Dock::ShouldLoadOtherArea(s32 other) const
|
||||||
{
|
{
|
||||||
|
if (x4_dockReferences.size() == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
return x4_dockReferences[other].x6_loadOther;
|
||||||
}
|
}
|
||||||
|
|
||||||
zeus::CVector3f IGameArea::Dock::GetPoint(s32 idx) const
|
zeus::CVector3f IGameArea::Dock::GetPoint(s32 idx) const
|
||||||
|
|
|
@ -16,23 +16,16 @@ public:
|
||||||
public:
|
public:
|
||||||
struct SDockReference
|
struct SDockReference
|
||||||
{
|
{
|
||||||
u32 x0_area;
|
u32 x0_area = 0;
|
||||||
s16 x4_dock;
|
s16 x4_dock = 0;
|
||||||
union
|
bool x6_loadOther = false;
|
||||||
{
|
|
||||||
struct
|
|
||||||
{
|
|
||||||
bool x6_16_ : 1;
|
|
||||||
};
|
|
||||||
u16 x6_ = 0;
|
|
||||||
};
|
|
||||||
SDockReference() = default;
|
SDockReference() = default;
|
||||||
};
|
};
|
||||||
private:
|
private:
|
||||||
u32 x0_referenceCount = 0;
|
u32 x0_referenceCount = 0;
|
||||||
std::vector<SDockReference> x4_dockReferences;
|
std::vector<SDockReference> x4_dockReferences;
|
||||||
rstl::reserved_vector<zeus::CVector3f, 4> x14_planeVertices;
|
rstl::reserved_vector<zeus::CVector3f, 4> x14_planeVertices;
|
||||||
bool x48_;
|
bool x48_isReferenced;
|
||||||
public:
|
public:
|
||||||
|
|
||||||
const rstl::reserved_vector<zeus::CVector3f, 4>& GetPlaneVertices() const {return x14_planeVertices;}
|
const rstl::reserved_vector<zeus::CVector3f, 4>& GetPlaneVertices() const {return x14_planeVertices;}
|
||||||
|
@ -45,6 +38,8 @@ public:
|
||||||
void SetShouldLoadOther(s32 other, bool should);
|
void SetShouldLoadOther(s32 other, bool should);
|
||||||
bool ShouldLoadOtherArea(s32 other) const;
|
bool ShouldLoadOtherArea(s32 other) const;
|
||||||
zeus::CVector3f GetPoint(s32 idx) const;
|
zeus::CVector3f GetPoint(s32 idx) const;
|
||||||
|
bool IsReferenced() const { return x48_isReferenced; }
|
||||||
|
void SetReferenceCount(s32 v) { x0_referenceCount = v; x48_isReferenced = true; }
|
||||||
};
|
};
|
||||||
|
|
||||||
struct IAreaObjectList
|
struct IAreaObjectList
|
||||||
|
|
|
@ -59,6 +59,7 @@
|
||||||
#include "MP1/CBeetle.hpp"
|
#include "MP1/CBeetle.hpp"
|
||||||
#include "MP1/CWarWasp.hpp"
|
#include "MP1/CWarWasp.hpp"
|
||||||
#include "MP1/CSpacePirate.hpp"
|
#include "MP1/CSpacePirate.hpp"
|
||||||
|
#include "CScriptShadowProjector.hpp"
|
||||||
#include "CPatternedInfo.hpp"
|
#include "CPatternedInfo.hpp"
|
||||||
#include "CSimplePool.hpp"
|
#include "CSimplePool.hpp"
|
||||||
#include "Collision/CCollidableOBBTreeGroup.hpp"
|
#include "Collision/CCollidableOBBTreeGroup.hpp"
|
||||||
|
@ -140,7 +141,7 @@ static zeus::CAABox GetCollisionBox(CStateManager& stateMgr, TAreaId id, const z
|
||||||
const zeus::CVector3f& offset)
|
const zeus::CVector3f& offset)
|
||||||
{
|
{
|
||||||
zeus::CAABox box(-extent * 0.5f + offset, extent * 0.5f + offset);
|
zeus::CAABox box(-extent * 0.5f + offset, extent * 0.5f + offset);
|
||||||
const zeus::CTransform& rot = stateMgr.GetWorld()->GetGameAreas()[id]->GetTransform().getRotation();
|
const zeus::CTransform& rot = stateMgr.WorldNC()->GetGameAreas()[id]->GetTransform().getRotation();
|
||||||
return box.getTransformedAABox(rot);
|
return box.getTransformedAABox(rot);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -520,7 +521,7 @@ CEntity* ScriptLoader::LoadTrigger(CStateManager& mgr, CInputStream& in, int pro
|
||||||
|
|
||||||
zeus::CAABox box(-extent * 0.5f, extent * 0.5f);
|
zeus::CAABox box(-extent * 0.5f, extent * 0.5f);
|
||||||
|
|
||||||
const zeus::CTransform& areaXf = mgr.GetWorld()->GetGameAreas()[info.GetAreaId()]->GetTransform();
|
const zeus::CTransform& areaXf = mgr.WorldNC()->GetGameAreas()[info.GetAreaId()]->GetTransform();
|
||||||
zeus::CVector3f orientedForce = areaXf.basis * forceVec;
|
zeus::CVector3f orientedForce = areaXf.basis * forceVec;
|
||||||
|
|
||||||
return new CScriptTrigger(mgr.AllocateUniqueId(), *name, info, position, box, dInfo, orientedForce, flags, active,
|
return new CScriptTrigger(mgr.AllocateUniqueId(), *name, info, position, box, dInfo, orientedForce, flags, active,
|
||||||
|
@ -1074,7 +1075,7 @@ u32 ClassifyVector(const zeus::CVector3f& dir)
|
||||||
|
|
||||||
u32 TransformDamagableTriggerFlags(CStateManager& mgr, TAreaId aId, u32 flags)
|
u32 TransformDamagableTriggerFlags(CStateManager& mgr, TAreaId aId, u32 flags)
|
||||||
{
|
{
|
||||||
CGameArea* area = mgr.GetWorld()->GetGameAreas().at(u32(aId)).get();
|
CGameArea* area = mgr.WorldNC()->GetGameAreas().at(u32(aId)).get();
|
||||||
zeus::CTransform rotation = area->GetTransform().getRotation();
|
zeus::CTransform rotation = area->GetTransform().getRotation();
|
||||||
|
|
||||||
u32 ret = 0;
|
u32 ret = 0;
|
||||||
|
@ -2010,8 +2011,8 @@ CEntity* ScriptLoader::LoadBeam(CStateManager& mgr, CInputStream& in, int propCo
|
||||||
CDamageInfo dInfo(in);
|
CDamageInfo dInfo(in);
|
||||||
TToken<CWeaponDescription> weaponDesc = g_SimplePool->GetObj({SBIG('WPSC'), weaponDescId});
|
TToken<CWeaponDescription> weaponDesc = g_SimplePool->GetObj({SBIG('WPSC'), weaponDescId});
|
||||||
|
|
||||||
return new CScriptBeam(mgr.AllocateUniqueId(), aHead.x0_name, info, aHead.x10_transform, active,
|
return new CScriptBeam(mgr.AllocateUniqueId(), aHead.x0_name, info, aHead.x10_transform, active, weaponDesc,
|
||||||
weaponDesc, beamInfo, dInfo);
|
beamInfo, dInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
CEntity* ScriptLoader::LoadWorldLightFader(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
|
CEntity* ScriptLoader::LoadWorldLightFader(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
|
||||||
|
@ -2062,7 +2063,21 @@ CEntity* ScriptLoader::LoadNewCameraShaker(CStateManager& mgr, CInputStream& in,
|
||||||
|
|
||||||
CEntity* ScriptLoader::LoadShadowProjector(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
|
CEntity* ScriptLoader::LoadShadowProjector(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
|
||||||
{
|
{
|
||||||
|
if (!EnsurePropertyCount(propCount, 10, "ShadowProjector"))
|
||||||
return nullptr;
|
return nullptr;
|
||||||
|
|
||||||
|
const std::string* name = mgr.HashInstanceName(in);
|
||||||
|
zeus::CVector3f position(zeus::CVector3f::ReadBig(in));
|
||||||
|
bool b1 = in.readBool();
|
||||||
|
float f1 = in.readFloatBig();
|
||||||
|
zeus::CVector3f vec2(zeus::CVector3f::ReadBig(in));
|
||||||
|
float f2 = in.readFloatBig();
|
||||||
|
float f3 = in.readFloatBig();
|
||||||
|
float f4 = in.readFloatBig();
|
||||||
|
bool b2 = in.readBool();
|
||||||
|
u32 w1 = in.readUint32Big();
|
||||||
|
return new CScriptShadowProjector(mgr.AllocateUniqueId(), *name, info, zeus::CTransform::Translate(position), b1,
|
||||||
|
vec2, b2, f1, f2, f3, f4, w1);
|
||||||
}
|
}
|
||||||
|
|
||||||
CEntity* ScriptLoader::LoadEnergyBall(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
|
CEntity* ScriptLoader::LoadEnergyBall(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)
|
||||||
|
|
Loading…
Reference in New Issue