fullike · KaosSpectrum · Jul 31, 2025
diff --git a/Source/RoadBuilder/Public/GroundActor.h b/Source/RoadBuilder/Public/GroundActor.h
@@ -34,7 +34,7 @@ struct ROADBUILDER_API FGroundPoint
 		return HashCombineFast(GetTypeHash(Point.Road), GetTypeHash(Point.Side << 16 | Point.Index));
 	}
 	UPROPERTY()
-	ARoadActor* Road;
+	TObjectPtr<ARoadActor> Road;
 
 	UPROPERTY()
 	int Side;
@@ -78,7 +78,7 @@ class ROADBUILDER_API AGroundActor : public AActor
 		Tags.Remove(TEXT("Expired"));
 	}
 	UPROPERTY(EditAnywhere, Category = Ground)
-	UMaterialInterface* Material;
+	TObjectPtr<UMaterialInterface> Material;
 
 	UPROPERTY()
 	TArray<FVector> ManualPoints;

diff --git a/Source/RoadBuilder/Public/LaneMarkStyle.h b/Source/RoadBuilder/Public/LaneMarkStyle.h
@@ -26,7 +26,7 @@ class ROADBUILDER_API UBaseMarkStyle : public UObject
 public:
 	virtual void BuildMesh(UObject* Caller, FRoadMesh& Builder, const FPolyline& Curve) {}
 	UPROPERTY(EditAnywhere, Category = Style)
-	UMaterialInterface* Material = nullptr;
+	TObjectPtr<UMaterialInterface> Material = nullptr;
 };
 
 UCLASS()

diff --git a/Source/RoadBuilder/Public/LaneShape.h b/Source/RoadBuilder/Public/LaneShape.h
@@ -22,7 +22,7 @@ struct FLaneCrossSection
 	GENERATED_USTRUCT_BODY()
 
 	UPROPERTY(EditAnywhere, Category = CrossSection)
-	UMaterialInterface* Material = nullptr;
+	TObjectPtr<UMaterialInterface> Material = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = CrossSection)
 	ELaneAlignment Alignment;

diff --git a/Source/RoadBuilder/Public/RoadActor.h b/Source/RoadBuilder/Public/RoadActor.h
@@ -29,13 +29,13 @@ struct FRoadLaneStyle
 	ELaneType LaneType;
 
 	UPROPERTY(EditAnywhere, Category = Style)
-	ULaneShape* LaneShape = nullptr;
+	TObjectPtr<ULaneShape> LaneShape = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Style)
-	ULaneMarkStyle* LaneMarking = nullptr;
+	TObjectPtr<ULaneMarkStyle> LaneMarking = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Style)
-	URoadProps* Props = nullptr;
+	TObjectPtr<URoadProps> Props = nullptr;
 };
 
 UCLASS()
@@ -63,10 +63,10 @@ class ROADBUILDER_API URoadStyle : public UObject
 	TArray<FRoadLaneStyle> RightLanes;
 
 	UPROPERTY(EditAnywhere, Category = Style)
-	ULaneMarkStyle* BaseCurveMark;
+	TObjectPtr<ULaneMarkStyle> BaseCurveMark;
 
 	UPROPERTY(EditAnywhere, Category = Style)
-	URoadProps* BaseCurveProps = nullptr;
+	TObjectPtr<URoadProps> BaseCurveProps = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Style)
 	bool bHasGround = false;
@@ -175,7 +175,7 @@ struct FConnectInfo
 	double ConnectionSign(ARoadActor* Parent);
 
 	UPROPERTY()
-	ARoadActor* Child;
+	TObjectPtr<ARoadActor> Child;
 
 	UPROPERTY()
 	int Index;
@@ -336,19 +336,19 @@ class ROADBUILDER_API ARoadActor : public AActor
 	TArray<FHeightSegment> HeightSegments;
 
 	UPROPERTY(EditAnywhere, Category = Road)
-	TArray<URoadLane*> Lanes;
+	TArray<TObjectPtr<URoadLane>> Lanes;
 
 	UPROPERTY(EditAnywhere, Category = Road)
-	TArray<URoadBoundary*> Boundaries;
+	TArray<TObjectPtr<URoadBoundary>> Boundaries;
 
 	UPROPERTY(EditAnywhere, Category = Road)
-	TArray<URoadMarking*> Markings;
+	TArray<TObjectPtr<URoadMarking>> Markings;
 
 	UPROPERTY()
-	URoadBoundary* BaseCurve;
+	TObjectPtr<URoadBoundary> BaseCurve;
 
 	UPROPERTY(EditAnywhere, Category = Road)
-	ARoadActor* ConnectedParents[2] = { nullptr, nullptr };
+	TObjectPtr<ARoadActor> ConnectedParents[2] = { nullptr, nullptr };
 
 	UPROPERTY(EditAnywhere, Category = Road)
 	bool bHasGround = false;

diff --git a/Source/RoadBuilder/Public/RoadBoundary.h b/Source/RoadBuilder/Public/RoadBoundary.h
@@ -18,10 +18,10 @@ struct FBoundarySegment
 	double Dist = 0;
 
 	UPROPERTY(EditAnywhere, Category = Segment)
-	ULaneMarkStyle* LaneMarking = nullptr;
+	TObjectPtr<ULaneMarkStyle> LaneMarking = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Segment)
-	URoadProps* Props = nullptr;
+	TObjectPtr<URoadProps> Props = nullptr;
 };
 
 UCLASS()
@@ -47,16 +47,16 @@ class ROADBUILDER_API URoadBoundary : public URoadCurve
 	void Cut(double R_Start, double R_End);
 	double& SegmentStart(int i) { return Segments[i].Dist; }
 	double& SegmentEnd(int i) { return i + 1 < Segments.Num() ? Segments[i + 1].Dist : Length(); }
-	URoadLane*& GetLane(int Side) { return Side ? LeftLane : RightLane; }
+	URoadLane*& GetLane(int Side) { return Side ? MutableView(LeftLane) : MutableView(RightLane); }
 
 	UPROPERTY(EditAnywhere, Category = Boundary)
 	TArray<FBoundarySegment> Segments;
 
 	UPROPERTY()
-	URoadLane* LeftLane = nullptr;
+	TObjectPtr<URoadLane> LeftLane = nullptr;
 
 	UPROPERTY()
-	URoadLane* RightLane = nullptr;
+	TObjectPtr<URoadLane> RightLane = nullptr;
 
 	TArray<FOctreeElementId2> OctreeIds;
 };
diff --git a/Source/RoadBuilder/Public/RoadCurve.h b/Source/RoadBuilder/Public/RoadCurve.h
@@ -179,7 +179,7 @@ struct FPolyline
 	}
 	FVector GetStraightDir(int i) const
 	{
-		FVector Prev, Next;
+		FVector Prev, Next = FVector::ZeroVector;
 		if (i > 0)
 			Prev = (Points[i].Pos - Points[i - 1].Pos).GetSafeNormal();
 		if (i < Points.Num() - 1)
@@ -192,7 +192,7 @@ struct FPolyline
 	}
 	FVector GetStraightRight(int i) const
 	{
-		FVector Prev, Next;
+		FVector Prev, Next = FVector::ZeroVector;
 		if (i > 0)
 			Prev = (Points[i].Pos - Points[i - 1].Pos).GetSafeNormal();
 		if (i < Points.Num() - 1)

diff --git a/Source/RoadBuilder/Public/RoadLane.h b/Source/RoadBuilder/Public/RoadLane.h
@@ -38,7 +38,7 @@ struct FLaneSegment
 	double Dist = 0;
 
 	UPROPERTY(EditAnywhere, Category = Segment)
-	ULaneShape* LaneShape = nullptr;
+	TObjectPtr<ULaneShape> LaneShape = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Segment)
 	ELaneType LaneType = (ELaneType)0;
@@ -65,14 +65,14 @@ class ROADBUILDER_API URoadLane : public URoadCurve
 	double& SegmentStart(int i) { return Segments[i].Dist; }
 	double& SegmentEnd(int i) { return i + 1 < Segments.Num() ? Segments[i + 1].Dist : Length(); }
 	double GetWidth(double Dist) { return FMath::Abs(LeftBoundary->GetOffset(Dist) - RightBoundary->GetOffset(Dist)); }
-	URoadBoundary*& GetBoundary(int Side) { return Side ? LeftBoundary : RightBoundary; }
+	URoadBoundary*& GetBoundary(int Side) { return Side ? MutableView(LeftBoundary) : MutableView(RightBoundary); }
 
 	UPROPERTY(EditAnywhere, Category = Lane)
 	TArray<FLaneSegment> Segments;
 
 	UPROPERTY()
-	URoadBoundary* LeftBoundary = nullptr;
+	TObjectPtr<URoadBoundary> LeftBoundary = nullptr;
 
 	UPROPERTY()
-	URoadBoundary* RightBoundary = nullptr;
+	TObjectPtr<URoadBoundary> RightBoundary = nullptr;
 };
diff --git a/Source/RoadBuilder/Public/RoadMarking.h b/Source/RoadBuilder/Public/RoadMarking.h
@@ -27,7 +27,7 @@ class ROADBUILDER_API UMarkingPoint : public URoadMarking
 	virtual void BuildMesh(FRoadActorBuilder& Builder);
 
 	UPROPERTY(EditAnywhere, Category = Point)
-	UStaticMesh* Mesh = nullptr;
+	TObjectPtr<UStaticMesh> Mesh = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Point)
 	FVector2D Point;
@@ -88,10 +88,10 @@ class ROADBUILDER_API UMarkingCurve : public URoadMarking
 	FPolyline CreatePolyline();
 
 	UPROPERTY(EditAnywhere, Category = Style, meta = (DisallowedClasses = "PolygonMarkStyle"))
-	UBaseMarkStyle* MarkStyle = nullptr;
+	TObjectPtr<UBaseMarkStyle> MarkStyle = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Style, meta = (EditCondition = "bClosedLoop"))
-	UPolygonMarkStyle* FillStyle = nullptr;
+	TObjectPtr<UPolygonMarkStyle> FillStyle = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Style, meta = (EditCondition = "bClosedLoop"))
 	double Orientation = 0;

diff --git a/Source/RoadBuilder/Public/RoadProps.h b/Source/RoadBuilder/Public/RoadProps.h
@@ -29,7 +29,7 @@ struct FRoadProp
 	}
 
 	UPROPERTY(EditAnywhere, Category = Prop)
-	TArray<UObject*> Assets;
+	TArray<TObjectPtr<UObject>> Assets;
 
 	UPROPERTY(EditAnywhere, Category = Prop)
 	FVector Offset = FVector::ZeroVector;

diff --git a/Source/RoadBuilder/Public/RoadScene.h b/Source/RoadBuilder/Public/RoadScene.h
@@ -67,13 +67,13 @@ struct FJunctionLink
 	void CreateRoad(AJunctionActor* Parent);
 	void Destroy();
 	UPROPERTY()
-	ARoadActor* Road = nullptr;
+	TObjectPtr<ARoadActor> Road = nullptr;
 
 	UPROPERTY()
-	ARoadActor* InputRoad = nullptr;
+	TObjectPtr<ARoadActor> InputRoad = nullptr;
 
 	UPROPERTY()
-	ARoadActor* OutputRoad = nullptr;
+	TObjectPtr<ARoadActor> OutputRoad = nullptr;
 
 	UPROPERTY(EditAnywhere, Category = Link)
 	double Radius = 1000;
@@ -139,7 +139,7 @@ struct FJunctionGate
 	void Renew(double D, double S);
 
 	UPROPERTY()
-	ARoadActor* Road;
+	TObjectPtr<ARoadActor> Road;
 
 	UPROPERTY()
 	double Radian;
@@ -247,13 +247,13 @@ class ROADBUILDER_API ARoadScene : public AActor
 #endif
 
 	UPROPERTY()
-	TArray<ARoadActor*> Roads;
+	TArray<TObjectPtr<ARoadActor>> Roads;
 
 	UPROPERTY()
-	TArray<AJunctionActor*> Junctions;
+	TArray<TObjectPtr<AJunctionActor>> Junctions;
 
 	UPROPERTY()
-	TArray<AGroundActor*> Grounds;
+	TArray<TObjectPtr<AGroundActor>> Grounds;
 
 	TOctree2<FRoadOctreeElement, FRoadOctreeSemantics> Octree;
 };