Fix default object crash

dpjudas · Jul 2, 2024 · 5cd116c · 5cd116c
1 parent 61425de
commit 5cd116c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/SurrealEngine/Editor/Export.cpp b/SurrealEngine/Editor/Export.cpp
@@ -57,7 +57,7 @@ MemoryStreamWriter Exporter::ExportClass(UClass* cls)
 
 	text << cls->ScriptText->Text;
 	text << "\r\ndefaultproperties\r\n{\r\n";
-	text << ExportObject(cls->GetDefaultObject(), 1, false);
+	text << ExportObject(cls->GetDefaultObject<UObject>(), 1, false);
 	return text;
 }
 

diff --git a/SurrealEngine/Render/RenderSprite.cpp b/SurrealEngine/Render/RenderSprite.cpp
@@ -17,7 +17,7 @@ void RenderSubsystem::DrawSprite(FSceneNode* frame, UActor* actor)
 
 	if (actor->DrawType() == DT_SpriteAnimOnce)
 	{
-		float t = (1.0f - actor->LifeSpan() / UObject::Cast<UActor>(actor->Class->GetDefaultObject())->LifeSpan());
+		float t = (1.0f - actor->LifeSpan() / actor->Class->GetDefaultObject<UActor>()->LifeSpan());
 		int count = texture->GetAnimTextureCount();
 		int index = (int)std::floor(clamp(t, 0.0f, 1.0f) * count);
 		for (int i = 0; i < index; i++)

diff --git a/SurrealEngine/UObject/UActor.cpp b/SurrealEngine/UObject/UActor.cpp
@@ -60,10 +60,10 @@ UActor* UActor::Spawn(UClass* SpawnClass, UActor* SpawnOwner, NameString SpawnTa
 	vec3 location = SpawnLocation ? *SpawnLocation : Location();
 	Rotator rotation = SpawnRotation ? *SpawnRotation : Rotation();
 
-	float radius = SpawnClass->GetDefaultObject()->GetFloat("CollisionRadius");
-	float height = SpawnClass->GetDefaultObject()->GetFloat("CollisionHeight");
-	bool bCollideWorld = SpawnClass->GetDefaultObject()->GetBool("bCollideWorld");
-	bool bCollideWhenPlacing = SpawnClass->GetDefaultObject()->GetBool("bCollideWhenPlacing");
+	float radius = SpawnClass->GetDefaultObject<UActor>()->CollisionRadius();
+	float height = SpawnClass->GetDefaultObject<UActor>()->CollisionHeight();
+	bool bCollideWorld = SpawnClass->GetDefaultObject<UActor>()->bCollideWorld();
+	bool bCollideWhenPlacing = SpawnClass->GetDefaultObject<UActor>()->bCollideWhenPlacing();
 	if (bCollideWorld || bCollideWhenPlacing)
 	{
 		auto result = CheckLocation(location, radius, height, bCollideWorld || bCollideWhenPlacing);
@@ -897,7 +897,7 @@ void UActor::TickInterpolating(float elapsed)
 		{
 			pawn->DesiredFlashScale() = mix(target->ScreenFlashScale(), next->ScreenFlashScale(), physAlpha);
 			pawn->DesiredFlashFog() = mix(target->ScreenFlashFog(), next->ScreenFlashFog(), physAlpha);
-			pawn->FovAngle() = mix(target->FovModifier(), next->FovModifier(), physAlpha) * Class->GetDefaultObject()->GetFloat("FovAngle");
+			pawn->FovAngle() = mix(target->FovModifier(), next->FovModifier(), physAlpha) * Class->GetDefaultObject<UPlayerPawn>()->FovAngle();
 			pawn->FlashScale() = vec3(pawn->DesiredFlashScale());
 			pawn->FlashFog() = pawn->DesiredFlashFog();
 		}

diff --git a/SurrealEngine/UObject/UClass.h b/SurrealEngine/UObject/UClass.h
@@ -181,7 +181,13 @@ class UClass : public UState
 	void Load(ObjectStream* stream) override;
 
 	UProperty* GetProperty(const NameString& name);
-	UObject* GetDefaultObject() { return this; }
+
+	template<typename T>
+	T* GetDefaultObject()
+	{
+		// Note: this is a horrible hack. The object is not actually the type returned, but our property getters are members on that type.
+		return static_cast<T*>(static_cast<UObject*>(this));
+	}
 
 	void SaveToConfig(PackageManager& packageManager);
 

diff --git a/SurrealEngine/VM/ExpressionEvaluator.cpp b/SurrealEngine/VM/ExpressionEvaluator.cpp
@@ -45,7 +45,7 @@ void ExpressionEvaluator::Expr(DefaultVariableExpression* expr)
 	if (UObject::TryCast<UClass>(Context))
 		Result.Value = ExpressionValue::Variable(Context->PropertyData.Data, expr->Variable);
 	else
-		Result.Value = ExpressionValue::Variable(Context->Class->GetDefaultObject()->PropertyData.Data, expr->Variable);
+		Result.Value = ExpressionValue::Variable(Context->Class->GetDefaultObject<UObject>()->PropertyData.Data, expr->Variable);
 }
 
 void ExpressionEvaluator::Expr(ReturnExpression* expr)
@@ -167,7 +167,7 @@ void ExpressionEvaluator::Expr(ClassContextExpression* expr)
 	UClass* cls = UObject::TryCast<UClass>(object.ToObject());
 	if (cls)
 	{
-		Result = Eval(expr->ContextExpr, Self, cls->GetDefaultObject(), LocalVariables);
+		Result = Eval(expr->ContextExpr, Self, cls->GetDefaultObject<UObject>(), LocalVariables);
 	}
 	else
 	{