Fix actor base must tick before actor

dpjudas · Jul 18, 2024 · e1dc7c3 · e1dc7c3
1 parent 7689c48
commit e1dc7c3
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 34 deletions.
diff --git a/SurrealEngine/UObject/UActor.cpp b/SurrealEngine/UObject/UActor.cpp
@@ -348,10 +348,8 @@ void UActor::SetBase(UActor* newBase, bool sendBaseChangeEvent)
 	}
 }
 
-void UActor::Tick(float elapsed, bool tickedFlag)
+void UActor::Tick(float elapsed)
 {
-	bTicked() = tickedFlag;
-
 	TickAnimation(elapsed);
 
 	if (Role() >= ROLE_SimulatedProxy && IsEventEnabled(EventName::Tick))
@@ -2157,7 +2155,7 @@ void UPawn::UpdateActorZone()
 		PlayerReplicationInfo()->PlayerZone() = Region().Zone;
 }
 
-void UPawn::Tick(float elapsed, bool tickedFlag)
+void UPawn::Tick(float elapsed)
 {
 	MoveTimer() -= elapsed;
 
@@ -2233,7 +2231,7 @@ void UPawn::Tick(float elapsed, bool tickedFlag)
 		}
 	}
 
-	UActor::Tick(elapsed, tickedFlag);
+	UActor::Tick(elapsed);
 
 	if (bIsPlayer() && Role() >= ROLE_AutonomousProxy)
 	{
@@ -2429,9 +2427,9 @@ float UPawn::GetSpeed()
 
 /////////////////////////////////////////////////////////////////////////////
 
-void UPlayerPawn::Tick(float elapsed, bool tickedFlag)
+void UPlayerPawn::Tick(float elapsed)
 {
-	UPawn::Tick(elapsed, tickedFlag);
+	UPawn::Tick(elapsed);
 
 	if (Role() >= ROLE_SimulatedProxy)
 	{

diff --git a/SurrealEngine/UObject/UActor.h b/SurrealEngine/UObject/UActor.h
@@ -158,7 +158,7 @@ class UActor : public UObject
 	virtual void UpdateActorZone();
 	PointRegion FindRegion(const vec3& offset = vec3(0.0f));
 
-	virtual void Tick(float elapsed, bool tickedFlag);
+	virtual void Tick(float elapsed);
 
 	void TickAnimation(float elapsed);
 
@@ -1388,7 +1388,7 @@ class UPawn : public UActor
 public:
 	using UActor::UActor;
 
-	void Tick(float elapsed, bool tickedFlag) override;
+	void Tick(float elapsed) override;
 	void TickRotating(float elapsed) override;
 
 	void InitActorZone() override;
@@ -1572,7 +1572,7 @@ class UPlayerPawn : public UPawn
 public:
 	using UPawn::UPawn;
 
-	void Tick(float elapsed, bool tickedFlag) override;
+	void Tick(float elapsed) override;
 	void TickRotating(float elapsed) override;
 
 	float& AppliedBob() { return Value<float>(PropOffsets_PlayerPawn.AppliedBob); }

diff --git a/SurrealEngine/UObject/UInternetLink.cpp b/SurrealEngine/UObject/UInternetLink.cpp
@@ -26,9 +26,9 @@ UInternetLink::~UInternetLink()
 		Thread.join();
 }
 
-void UInternetLink::Tick(float elapsed, bool tickedFlag)
+void UInternetLink::Tick(float elapsed)
 {
-	UInternetInfo::Tick(elapsed, tickedFlag);
+	UInternetInfo::Tick(elapsed);
 
 	std::unique_lock<std::mutex> lock(Mutex);
 	IpAddr resolvedAddr = ResolvedAddr;
@@ -151,9 +151,9 @@ UTcpLink::~UTcpLink()
 		closesocket(handle);
 }
 
-void UTcpLink::Tick(float elapsed, bool tickedFlag)
+void UTcpLink::Tick(float elapsed)
 {
-	UInternetLink::Tick(elapsed, tickedFlag);
+	UInternetLink::Tick(elapsed);
 
 	// event ReceivedText(string Text);
 	// event ReceivedLine(string Line);
@@ -232,9 +232,9 @@ UUdpLink::~UUdpLink()
 		closesocket(handle);
 }
 
-void UUdpLink::Tick(float elapsed, bool tickedFlag)
+void UUdpLink::Tick(float elapsed)
 {
-	UInternetLink::Tick(elapsed, tickedFlag);
+	UInternetLink::Tick(elapsed);
 
 	// int result = recvfrom(handle, (char*)data, size, 0, (sockaddr *)&addr, &addr_len);
 

diff --git a/SurrealEngine/UObject/UInternetLink.h b/SurrealEngine/UObject/UInternetLink.h
@@ -31,7 +31,7 @@ class UInternetLink : public UInternetInfo
 	using UInternetInfo::UInternetInfo;
 	~UInternetLink();
 
-	void Tick(float elapsed, bool tickedFlag) override;
+	void Tick(float elapsed) override;
 
 	int GetLastError();
 	IpAddr GetLocalIP();
@@ -63,7 +63,7 @@ class UTcpLink : public UInternetLink
 	UTcpLink(NameString name, UClass* base, ObjectFlags flags);
 	~UTcpLink();
 
-	void Tick(float elapsed, bool tickedFlag) override;
+	void Tick(float elapsed) override;
 
 	int BindPort(int Port, bool bUseNextAvailable);
 	bool Listen();
@@ -93,7 +93,7 @@ class UUdpLink : public UInternetLink
 	UUdpLink(NameString name, UClass* base, ObjectFlags flags);
 	~UUdpLink();
 
-	void Tick(float elapsed, bool tickedFlag) override;
+	void Tick(float elapsed) override;
 
 	int BindPort(int Port, bool bUseNextAvailable);
 

diff --git a/SurrealEngine/UObject/ULevel.cpp b/SurrealEngine/UObject/ULevel.cpp
@@ -81,26 +81,45 @@ void ULevel::Load(ObjectStream* stream)
 	}
 }
 
+void ULevel::TickActor(float elapsed, UActor* actor)
+{
+	if (!actor)
+		return;
+
+	// If we have an owner, tick it first
+	if (!actor->bDeleteMe() && actor->Owner())
+	{
+		TickActor(elapsed, actor->Owner());
+	}
+
+	// Do we have an actor? is it deleted? did it already tick?
+	if (actor->bDeleteMe() || actor->bTicked() == ticked)
+		return;
+
+	// Mark actor as ticked
+	actor->bTicked() = ticked;
+
+	// Tick the actor for this turn
+	actor->Tick(elapsed);
+
+	// Destroy the actor if its time
+	if (actor->Role() >= ROLE_SimulatedProxy && actor->LifeSpan() != 0.0f)
+	{
+		actor->LifeSpan() = std::max(actor->LifeSpan() - elapsed, 0.0f);
+		if (actor->LifeSpan() == 0.0f)
+		{
+			CallEvent(actor, EventName::Expired);
+			actor->Destroy();
+		}
+	}
+}
+
 void ULevel::Tick(float elapsed)
 {
 	// To do: owned actors must tick before their children:
 	for (size_t i = 0; i < Actors.size(); i++)
 	{
-		UActor* actor = Actors[i];
-		if (actor)
-		{
-			actor->Tick(elapsed, ticked);
-
-			if (actor->Role() >= ROLE_SimulatedProxy && actor->LifeSpan() != 0.0f)
-			{
-				actor->LifeSpan() = std::max(actor->LifeSpan() - elapsed, 0.0f);
-				if (actor->LifeSpan() == 0.0f)
-				{
-					CallEvent(actor, EventName::Expired);
-					actor->Destroy();
-				}
-			}
-		}
+		TickActor(elapsed, Actors[i]);
 	}
 
 	Array<UActor*> newActorList;

diff --git a/SurrealEngine/UObject/ULevel.h b/SurrealEngine/UObject/ULevel.h
@@ -269,6 +269,8 @@ class ULevel : public ULevelBase
 	std::map<std::string, std::string> TravelInfo;
 
 private:
+	void TickActor(float elapsed, UActor* actor);
+
 	bool ticked = false;
 };