zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-04-04 17:08:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up for Behavior API

Browse source 
Use TObjPtr to improve null checking. Add option to clear only specific kinds of Behaviors. Fixed removal checks while ticking. Don't stop at now-null behaviors when iterating.
This commit is contained in:
Boondorl 2025-01-28 07:38:52 -05:00 committed by Ricardo Luís Vaz Silva
parent 1e05bb2a55
commit 7efd301810
6 changed files with 88 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/playsim/actor.h
View file

@ -1386,7 +1386,7 @@ public:
// landing speed from a jump with normal gravity (squats the player's view)
// (note: this is put into AActor instead of the PlayerPawn because non-players also use the value)
double LandingSpeed;
TMap<FName, DBehavior*> Behaviors;
TMap<FName, TObjPtr<DBehavior*>> Behaviors;
// ThingIDs
@ -1448,16 +1448,16 @@ public:
return GetClass()->FindState(numnames, names, exact);
}
DBehavior* FindBehavior(const PClass& type) const
DBehavior* FindBehavior(FName type) const
{
auto b = Behaviors.CheckKey(type.TypeName);
return b != nullptr && *b != nullptr && !((*b)->ObjectFlags & OF_EuthanizeMe) ? *b : nullptr;
auto b = Behaviors.CheckKey(type);
return b != nullptr ? b->Get() : nullptr;
}
DBehavior* AddBehavior(PClass& type);
bool RemoveBehavior(const PClass& type);
bool RemoveBehavior(FName type);
void TickBehaviors();
void MoveBehaviors(AActor& from);
void ClearBehaviors();
void ClearBehaviors(PClass* type = nullptr);
// Internal only, mostly for traveling.
void UnlinkBehaviorsFromLevel();
void LinkBehaviorsToLevel();

108
src/playsim/p_mobj.cpp
View file

@ -213,8 +213,8 @@ void AActor::EnableNetworking(const bool enable)
size_t AActor::PropagateMark()
{
TMap<FName, DBehavior*>::Iterator it = { Behaviors };
TMap<FName, DBehavior*>::Pair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::Iterator it = { Behaviors };
TMap<FName, TObjPtr<DBehavior*>>::Pair* pair = nullptr;
while (it.NextPair(pair))
GC::Mark(pair->Value);
@ -491,33 +491,34 @@ void DBehavior::OnDestroy()
Super::OnDestroy();
}
bool AActor::RemoveBehavior(const PClass& type)
bool AActor::RemoveBehavior(FName type)
{
if (Behaviors.CheckKey(type.TypeName))
bool res = false;
auto b = Behaviors.CheckKey(type);
if (b != nullptr)
{
auto b = Behaviors[type.TypeName];
Behaviors.Remove(type.TypeName);
if (b != nullptr && !(b->ObjectFlags & OF_EuthanizeMe))
if (b->Get() != nullptr)
{
b->Destroy();
return true;
b->ForceGet()->Destroy();
res = true;
}
Behaviors.Remove(type);
}
return false;
return res;
}
static int RemoveBehavior(AActor* self, PClass* type)
{
return self->RemoveBehavior(*type);
return self->RemoveBehavior(type->TypeName);
}
DEFINE_ACTION_FUNCTION_NATIVE(AActor, RemoveBehavior, RemoveBehavior)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_CLASS_NOT_NULL(type, DBehavior);
ACTION_RETURN_BOOL(self->RemoveBehavior(*type));
ACTION_RETURN_BOOL(self->RemoveBehavior(type->TypeName));
}
DBehavior* AActor::AddBehavior(PClass& type)
@ -525,7 +526,7 @@ DBehavior* AActor::AddBehavior(PClass& type)
if (type.bAbstract || !type.IsDescendantOf(NAME_Behavior))
return nullptr;
auto b = FindBehavior(type);
auto b = FindBehavior(type.TypeName);
if (b == nullptr)
{
b = dyn_cast<DBehavior>(type.CreateNew());
@ -542,7 +543,7 @@ DBehavior* AActor::AddBehavior(PClass& type)
if (b->ObjectFlags & OF_EuthanizeMe)
{
RemoveBehavior(type);
RemoveBehavior(type.TypeName);
return nullptr;
}
}
@ -556,7 +557,7 @@ DBehavior* AActor::AddBehavior(PClass& type)
if (b->ObjectFlags & OF_EuthanizeMe)
{
RemoveBehavior(type);
RemoveBehavior(type.TypeName);
return nullptr;
}
}
@ -582,12 +583,12 @@ void AActor::TickBehaviors()
TArray<FName> toRemove = {};
TArray<DBehavior*> toTick = {};
TMap<FName, DBehavior*>::Iterator it = { Behaviors };
TMap<FName, DBehavior*>::Pair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::Iterator it = { Behaviors };
TMap<FName, TObjPtr<DBehavior*>>::Pair* pair = nullptr;
while (it.NextPair(pair))
{
auto b = pair->Value;
if (b == nullptr || (b->ObjectFlags & OF_EuthanizeMe))
auto b = pair->Value.Get();
if (b == nullptr)
{
toRemove.Push(pair->Key);
continue;
@ -598,9 +599,9 @@ void AActor::TickBehaviors()
for (auto& b : toTick)
{
if (b->Owner != this)
if ((b->ObjectFlags & OF_EuthanizeMe) || b->Owner != this)
{
toRemove.Push(pair->Key);
toRemove.Push(b->GetClass()->TypeName);
continue;
}
@ -610,12 +611,12 @@ void AActor::TickBehaviors()
VMCall(func, params, 1, nullptr, 0);
if (b->ObjectFlags & OF_EuthanizeMe)
toRemove.Push(pair->Key);
toRemove.Push(b->GetClass()->TypeName);
}
}
for (auto& type : toRemove)
RemoveBehavior(*PClass::FindClass(type));
RemoveBehavior(type);
}
static void TickBehaviors(AActor* self)
@ -632,14 +633,14 @@ DEFINE_ACTION_FUNCTION_NATIVE(AActor, TickBehaviors, TickBehaviors)
static DBehavior* FindBehavior(AActor* self, PClass* type)
{
return self->FindBehavior(*type);
return self->FindBehavior(type->TypeName);
}
DEFINE_ACTION_FUNCTION_NATIVE(AActor, FindBehavior, FindBehavior)
{
PARAM_SELF_PROLOGUE(AActor);
PARAM_CLASS_NOT_NULL(type, DBehavior);
ACTION_RETURN_OBJECT(self->FindBehavior(*type));
ACTION_RETURN_OBJECT(self->FindBehavior(type->TypeName));
}
void AActor::MoveBehaviors(AActor& from)
@ -653,12 +654,12 @@ void AActor::MoveBehaviors(AActor& from)
// Clean up any empty behaviors that remained as well while
// changing the owner.
TMap<FName, DBehavior*>::Iterator it = { Behaviors };
TMap<FName, DBehavior*>::Pair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::Iterator it = { Behaviors };
TMap<FName, TObjPtr<DBehavior*>>::Pair* pair = nullptr;
while (it.NextPair(pair))
{
auto b = pair->Value;
if (b == nullptr || (b->ObjectFlags & OF_EuthanizeMe))
auto b = pair->Value.Get();
if (b == nullptr)
{
toRemove.Push(pair->Key);
continue;
@ -673,7 +674,7 @@ void AActor::MoveBehaviors(AActor& from)
}
for (auto& type : toRemove)
RemoveBehavior(*PClass::FindClass(type));
RemoveBehavior(type);
}
static void MoveBehaviors(AActor* self, AActor* from)
@ -689,30 +690,37 @@ DEFINE_ACTION_FUNCTION_NATIVE(AActor, MoveBehaviors, MoveBehaviors)
return 0;
}
void AActor::ClearBehaviors()
void AActor::ClearBehaviors(PClass* type)
{
TArray<FName> toRemove = {};
TMap<FName, DBehavior*>::Iterator it = { Behaviors };
TMap<FName, DBehavior*>::Pair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::Iterator it = { Behaviors };
TMap<FName, TObjPtr<DBehavior*>>::Pair* pair = nullptr;
while (it.NextPair(pair))
toRemove.Push(pair->Key);
{
auto b = pair->Value.Get();
if (type == nullptr || b == nullptr || b->IsKindOf(type))
toRemove.Push(pair->Key);
}
for (auto& type : toRemove)
RemoveBehavior(*PClass::FindClass(type));
RemoveBehavior(type);
Behaviors.Clear();
// If not removing a specific type, clear whatever remains.
if (type == nullptr)
Behaviors.Clear();
}
static void ClearBehaviors(AActor* self)
static void ClearBehaviors(AActor* self, PClass* type)
{
self->ClearBehaviors();
self->ClearBehaviors(type);
}
DEFINE_ACTION_FUNCTION_NATIVE(AActor, ClearBehaviors, ClearBehaviors)
{
PARAM_SELF_PROLOGUE(AActor);
self->ClearBehaviors();
PARAM_CLASS(type, DBehavior);
self->ClearBehaviors(type);
return 0;
}
@ -720,38 +728,38 @@ void AActor::UnlinkBehaviorsFromLevel()
{
TArray<FName> toRemove = {};
TMap<FName, DBehavior*>::Iterator it = { Behaviors };
TMap<FName, DBehavior*>::Pair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::Iterator it = { Behaviors };
TMap<FName, TObjPtr<DBehavior*>>::Pair* pair = nullptr;
while (it.NextPair(pair))
{
auto b = pair->Value;
if (b == nullptr || (b->ObjectFlags & OF_EuthanizeMe))
auto b = pair->Value.Get();
if (b == nullptr)
toRemove.Push(pair->Key);
else
b->Level->RemoveActorBehavior(*b);
}
for (auto& type : toRemove)
RemoveBehavior(*PClass::FindClass(type));
RemoveBehavior(type);
}
void AActor::LinkBehaviorsToLevel()
{
TArray<FName> toRemove = {};
TMap<FName, DBehavior*>::Iterator it = { Behaviors };
TMap<FName, DBehavior*>::Pair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::Iterator it = { Behaviors };
TMap<FName, TObjPtr<DBehavior*>>::Pair* pair = nullptr;
while (it.NextPair(pair))
{
auto b = pair->Value;
if (b == nullptr || (b->ObjectFlags & OF_EuthanizeMe))
auto b = pair->Value.Get();
if (b == nullptr)
toRemove.Push(pair->Key);
else
Level->AddActorBehavior(*b);
}
for (auto& type : toRemove)
RemoveBehavior(*PClass::FindClass(type));
RemoveBehavior(type);
}
//==========================================================================

27
src/scripting/vmiterators.cpp
View file

@ -400,21 +400,21 @@ class DBehaviorIterator : public DObject
{
DECLARE_ABSTRACT_CLASS(DBehaviorIterator, DObject)
size_t _index;
TArray<DBehavior*> _behaviors;
TArray<TObjPtr<DBehavior*>> _behaviors;
public:
DBehaviorIterator(const AActor& mobj, PClass* type)
{
TMap<FName, DBehavior*>::ConstIterator it = { mobj.Behaviors };
TMap<FName, DBehavior*>::ConstPair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::ConstIterator it = { mobj.Behaviors };
TMap<FName, TObjPtr<DBehavior*>>::ConstPair* pair = nullptr;
while (it.NextPair(pair))
{
auto b = pair->Value;
if (b == nullptr || (b->ObjectFlags & OF_EuthanizeMe))
auto b = pair->Value.Get();
if (b == nullptr)
continue;
if (type == nullptr || b->IsKindOf(type))
_behaviors.Push(b);
_behaviors.Push(pair->Value);
}
Reinit();
@ -424,14 +424,11 @@ public:
{
for (auto& b : level.ActorBehaviors)
{
if (b == nullptr || (b->ObjectFlags & OF_EuthanizeMe))
continue;
if (ownerType != nullptr && !b->Owner->IsKindOf(ownerType))
continue;
if (type == nullptr || b->IsKindOf(type))
_behaviors.Push(b);
_behaviors.Push(MakeObjPtr<DBehavior*>(b));
}
Reinit();
@ -439,10 +436,14 @@ public:
DBehavior* Next()
{
if (_index >= _behaviors.Size())
return nullptr;
while (_index < _behaviors.Size())
{
auto b = _behaviors[_index++].Get();
if (b != nullptr)
return b;
}
return _behaviors[_index++];
return nullptr;
}
void Reinit() { _index = 0u; }

12
src/serializer_doom.cpp
View file

@ -226,17 +226,21 @@ FSerializer& FDoomSerializer::StatePointer(const char* key, void* ptraddr, bool
}
FSerializer& Serialize(FSerializer& arc, const char* key, TMap<FName, DBehavior*>& value, TMap<FName, DBehavior*>* def)
FSerializer& Serialize(FSerializer& arc, const char* key, TMap<FName, TObjPtr<DBehavior*>>& value, TMap<FName, TObjPtr<DBehavior*>>* def)
{
if (!arc.BeginObject(key))
return arc;
if (arc.isWriting())
{
TMap<FName, DBehavior*>::Iterator it = { value };
TMap<FName, DBehavior*>::Pair* pair = nullptr;
TMap<FName, TObjPtr<DBehavior*>>::Iterator it = { value };
TMap<FName, TObjPtr<DBehavior*>>::Pair* pair = nullptr;
while (it.NextPair(pair))
arc(pair->Key.GetChars(), pair->Value);
{
auto b = pair->Value.Get();
if (b != nullptr)
arc(pair->Key.GetChars(), b);
}
}
else
{

2
src/serializer_doom.h
View file

@ -44,7 +44,7 @@ FSerializer &Serialize(FSerializer &arc, const char *key, ticcmd_t &sid, ticcmd_
FSerializer &Serialize(FSerializer &arc, const char *key, usercmd_t &cmd, usercmd_t *def);
FSerializer &Serialize(FSerializer &arc, const char *key, FInterpolator &rs, FInterpolator *def);
FSerializer& Serialize(FSerializer& arc, const char* key, struct FStandaloneAnimation& value, struct FStandaloneAnimation* defval);
FSerializer& Serialize(FSerializer& arc, const char* key, TMap<FName, DBehavior*>& value, TMap<FName, DBehavior*>* def);
FSerializer& Serialize(FSerializer& arc, const char* key, TMap<FName, TObjPtr<DBehavior*>>& value, TMap<FName, TObjPtr<DBehavior*>>* def);
template<> FSerializer &Serialize(FSerializer &arc, const char *key, FPolyObj *&value, FPolyObj **defval);
template<> FSerializer &Serialize(FSerializer &arc, const char *key, sector_t *&value, sector_t **defval);

2
wadsrc/static/zscript/actors/actor.zs
View file

@ -522,7 +522,7 @@ class Actor : Thinker native
native bool RemoveBehavior(class<Behavior> type);
native Behavior AddBehavior(class<Behavior> type);
native void TickBehaviors();
native void ClearBehaviors();
native void ClearBehaviors(class<Behavior> type = null);
native void MoveBehaviors(Actor from);
native clearscope bool isFrozen() const;