Merge pull request #36 from weenachuangkud/fix

Fix bugs, clean up docs, and improve code quality

Author: weenachuangkud

src/FastCast2/ActiveCast.luau

@@ -30,7 +30,7 @@ local EnumCastTypes = FastCastEnums.CastType
 
 -- Debugging
 local DBG_SEGMENT_SUB_COLOR = Color3.new(0.286275, 0.329412, 0.247059)
-local DBG_SEGMENT_SUB_COLOR2 = Color3.new(0.286275, 0.329412, 0.247059)
+local DBG_SEGMENT_SUB_COLOR2 = Color3.new(0.454902, 0.933333, 0.011765)
 
 local DBG_HIT_SUB_COLOR = Color3.new(0.0588235, 0.87451, 1)
 
@@ -395,13 +395,13 @@ local function SimulateCast(
 
 	local point = currentTarget
 	local part: Instance? = nil
-	local material = Enum.Material.Air
+	--local material = Enum.Material.Air
 	--local normal = Vector3.new()
 
 	if resultOfCast ~= nil then
 		point = resultOfCast.Position
 		part = resultOfCast.Instance
-		material = resultOfCast.Material
+		--material = resultOfCast.Material
 		--normal = resultOfCast.Normal
 	end
 
@@ -510,6 +510,7 @@ local function SimulateCast(
 					warn(
 						"Cascading cast lag encountered! The caster attempted to perform a high fidelity cast before the previous one completed, resulting in exponential cast lag. Consider increasing HighFidelitySegmentSize."
 					)
+					return
 				end
 
 				cast.StateInfo.IsActivelyResimulating = true
@@ -875,6 +876,7 @@ function ActiveCast.createCastData(
 				warn(
 					"Cascading cast lag encountered! The caster attempted to perform a high fidelity cast before the previous one completed, resulting in exponential cast lag. Consider increasing HighFidelitySegmentSize."
 				)
+				return
 			end
 
 			cast.StateInfo.IsActivelyResimulating = true
@@ -928,7 +930,7 @@ function ActiveCast.createCastData(
 			end
 
 			for segmentIndex = 1, numSegmentsReal do
-				if cast == nil or next(cast) == nil then
+				if next(cast) == nil then
 					return
 				end
 				if cast.StateInfo.CancelHighResCast then
@@ -944,7 +946,7 @@ function ActiveCast.createCastData(
 				SimulateCast(cast, timeIncrement, FastCastEvents, variant)
 			end
 
-			if cast == nil or next(cast) == nil then
+			if next(cast) == nil then
 				return
 			end
 			cast.StateInfo.IsActivelyResimulating = false

src/FastCast2/BaseCast.luau

@@ -45,8 +45,8 @@ local ActiveCastCleaner: BindableEvent = nil
 local ObjectCache: BindableEvent? = nil
 local CacheHolder = nil
 local NextProjectileID = 0
-
 local SyncChanges: BindableEvent = nil
+local CastFireFunc = nil
 
 -- Private functions
 
@@ -76,7 +76,7 @@ local function HandleBulkMoveTo()
 end
 
 local function SendCastFire(
-	cast: TypeDefinitions.ActiveCastData,
+	cast: TypeDef.ActiveCastData,
 	origin: Vector3,
 	direction: Vector3,
 	velocity: Vector3 | number,
@@ -85,13 +85,6 @@ local function SendCastFire(
 	cast.Caster.Output:Fire("CastFire", cast, origin, direction, velocity, behavior)
 end
 
-local function GetCastFireFunction()
-	if FastCastEventsModule then
-		local loadedModule = require(FastCastEventsModule)
-		return loadedModule.CastFire
-	end
-end
-
 --[=[
 
 @function Init
@@ -143,7 +136,7 @@ function BaseCast.Init(BindableOutput: BindableEvent, Data: any)
 	SyncChanges.Name = "SyncChanges"
 	SyncChanges.Parent = Actor
 
-	SyncChanges.Event:Connect(function(cast: TypeDef.ActiveCastCompement)
+	SyncChanges.Event:Connect(function(cast: TypeDef.ActiveCastData)
 		local ID = cast.ID
 		local TargetCast = Actives[ID]
 
@@ -196,9 +189,8 @@ function BaseCast:Raycast(
 		SendCastFire(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
 	end
 	if Behavior.FastCastEventsModuleConfig.UseCastFire then
-		local CastFireFunction = GetCastFireFunction()
-		if CastFireFunction then
-			CastFireFunction(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
+		if CastFireFunc then
+			CastFireFunc(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
 		end
 	end
 end
@@ -213,6 +205,14 @@ end
 ]=]
 function BaseCast:SetFastCastEventsModule(moduleScript: ModuleScript)
 	FastCastEventsModule = moduleScript
+	if moduleScript and typeof(moduleScript) == "Instance" and moduleScript:IsA("ModuleScript") then
+		CastFireFunc = require(moduleScript)
+		if CastFireFunc.CastFire then
+			CastFireFunc = CastFireFunc.CastFire
+		else
+			CastFireFunc = nil
+		end
+	end
 end
 
 --[=[
@@ -253,9 +253,8 @@ function BaseCast:Blockcast(
 		SendCastFire(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
 	end
 	if Behavior.FastCastEventsModuleConfig.UseCastFire then
-		local CastFireFunction = GetCastFireFunction()
-		if CastFireFunction then
-			CastFireFunction(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
+		if CastFireFunc then
+			CastFireFunc(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
 		end
 	end
 end
@@ -298,9 +297,8 @@ function BaseCast:Spherecast(
 		SendCastFire(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
 	end
 	if Behavior.FastCastEventsModuleConfig.UseCastFire then
-		local CastFireFunction = GetCastFireFunction()
-		if CastFireFunction then
-			CastFireFunction(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
+		if CastFireFunc then
+			CastFireFunc(Actives[NextProjectileID], Origin, Direction, Velocity, Behavior)
 		end
 	end
 end
@@ -317,7 +315,9 @@ Enables or disables the BulkMoveTo feature.
 ]=]
 function BaseCast:BindBulkMoveTo(bool: boolean)
 	if bool then
-		BulkMoveToConnection = RS.PreRender:ConnectParallel(HandleBulkMoveTo)
+		if not BulkMoveToConnection then
+    		BulkMoveToConnection = RS.PreRender:ConnectParallel(HandleBulkMoveTo)
+		end
 	else
 		if BulkMoveToConnection then
 			BulkMoveToConnection:Disconnect()