@quenty/trajectory 2.7.0 → 2.7.1

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.7.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/trajectory@2.7.0...@quenty/trajectory@2.7.1) (2025-03-21)
+
+**Note:** Version bump only for package @quenty/trajectory
+
+
+
+
+
 # [2.7.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/trajectory@2.6.1...@quenty/trajectory@2.7.0) (2025-02-18)
 
 **Note:** Version bump only for package @quenty/trajectory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/trajectory",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "Utility function for estimating low and high arcs of projectiles. Solves for bullet drop given",
   "keywords": [
     "Roblox",
@@ -29,8 +29,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@quenty/draw": "^7.8.0",
+    "@quenty/draw": "^7.8.1",
     "@quenty/loader": "^10.8.0"
   },
-  "gitHead": "184a407d8d7366c39009444c3c9a7023cb176471"
+  "gitHead": "6b7c3e15e60cdb185986207b574e2b5591261e7a"
 }

package/src/Shared/MinEntranceVelocityUtils.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Class of functions that can be used to minimize entrance velocity of a projectile.
 	@class MinEntranceVelocityUtils
@@ -13,19 +14,19 @@ local SQRT_2 = math.sqrt(2)
 	@param origin Vector3
 	@param target Vector3
 	@param accel Vector3
-	@return number
+	@return Vector3
 ]=]
-function MinEntranceVelocityUtils.minimizeEntranceVelocity(origin, target, accel)
+function MinEntranceVelocityUtils.minimizeEntranceVelocity(origin: Vector3, target: Vector3, accel: Vector3): Vector3
 	local offset = target - origin
-	local accelDist = accel.magnitude
-	local offsetDist = offset.magnitude
+	local accelDist = accel.Magnitude
+	local offsetDist = offset.Magnitude
 
 	local lowerTerm = math.sqrt(2 * accelDist * offsetDist)
 	if lowerTerm == 0 then
 		return Vector3.zero
 	end
 
-	return (accelDist*offset - accel*offsetDist) / lowerTerm
+	return (accelDist * offset - accel * offsetDist) / lowerTerm
 end
 
 --[=[
@@ -41,9 +42,14 @@ end
 	@param accel Vector3
 	@return Vector3
 ]=]
-function MinEntranceVelocityUtils.computeEntranceVelocity(velocity, origin, target, accel)
+function MinEntranceVelocityUtils.computeEntranceVelocity(
+	velocity: Vector3,
+	origin: Vector3,
+	target: Vector3,
+	accel: Vector3
+): Vector3
 	local entranceTime = MinEntranceVelocityUtils.computeEntranceTime(velocity, origin, target, accel)
-	return accel*entranceTime + velocity
+	return accel * entranceTime + velocity
 end
 
 --[=[
@@ -59,7 +65,12 @@ end
 	@param accel Vector3
 	@return number
 ]=]
-function MinEntranceVelocityUtils.computeEntranceTime(velocity, origin, target, accel)
+function MinEntranceVelocityUtils.computeEntranceTime(
+	velocity: Vector3,
+	origin: Vector3,
+	target: Vector3,
+	accel: Vector3
+): number
 	local offset = target - origin
 	local aa = accel:Dot(accel)
 	local av = accel:Dot(velocity)
@@ -67,12 +78,12 @@ function MinEntranceVelocityUtils.computeEntranceTime(velocity, origin, target,
 	local vo = velocity:Dot(offset)
 	local oo = offset:Dot(offset)
 
-	local lowerTerm = aa*vv - av*av
+	local lowerTerm = aa * vv - av * av
 	if lowerTerm == 0 then
 		return 0 -- We're already there
 	end
 
-	return SQRT_2*((vv*oo - vo*vo)/lowerTerm)^0.25
+	return SQRT_2 * ((vv * oo - vo * vo) / lowerTerm) ^ 0.25
 end
 
-return MinEntranceVelocityUtils
+return MinEntranceVelocityUtils

package/src/Shared/TrajectoryDrawUtils.lua

@@ -12,22 +12,25 @@ local FINISH_COLOR = Color3.new(1, 0, 0)
 
 local TrajectoryDrawUtils = {}
 
-function TrajectoryDrawUtils.draw(velocity, origin, target, accel)
+--[=[
+	Draws a trajectory out for debugging purposes
+]=]
+function TrajectoryDrawUtils.draw(velocity: Vector3, origin: Vector3, target: Vector3, accel: Vector3)
 	Draw.point(origin, ORIGIN_COLOR)
 	Draw.point(target, FINISH_COLOR)
 
 	local entranceTime = MinEntranceVelocityUtils.computeEntranceTime(velocity, origin, target, accel)
 
-	for t=0, entranceTime, 0.1 do
+	for t = 0, entranceTime, 0.1 do
 		local t0 = math.clamp(t, 0, entranceTime)
 		local t1 = math.clamp(t + 0.1, 0, entranceTime)
 
-		local p0 = origin + velocity*t0 + 0.5*accel*t0*t0
-		local p1 = origin + velocity*t1 + 0.5*accel*t1*t1
+		local p0 = origin + velocity * t0 + 0.5 * accel * t0 * t0
+		local p1 = origin + velocity * t1 + 0.5 * accel * t1 * t1
 
-		local percent = t/entranceTime
+		local percent = t / entranceTime
 		Draw.line(p0, p1, ORIGIN_COLOR:Lerp(FINISH_COLOR, percent))
 	end
 end
 
-return TrajectoryDrawUtils
+return TrajectoryDrawUtils

package/src/Shared/trajectory.lua

@@ -1,3 +1,4 @@
+--!strict
 --[=[
 	Utility function for estimating low and high arcs of projectiles. Solves for bullet
 	drop given
@@ -17,37 +18,44 @@
 	@return Vector3? -- highTrajectory Initial velocity for a high trajectory arc
 	@return Vector3? -- fallbackTrajectory Trajectory directly at target as afallback
 ]=]
-return function(origin, target, initialVelocity, gravityForce)
+local function trajectory(
+	origin: Vector3,
+	target: Vector3,
+	initialVelocity: number,
+	gravityForce: number
+): (Vector3?, Vector3?, Vector3?)
 	local g = -gravityForce
-	local ox,oy,oz=origin.x,origin.y,origin.z
-	local rx,rz=target.x-ox,target.z-oz
-	local tx2=rx*rx+rz*rz
-	local ty=target.y-oy
-	if tx2>0 then
-		local v2=initialVelocity*initialVelocity
-
-		local c0=tx2/(2*(tx2+ty*ty))
-		local c1=g*ty+v2
-		local c22=v2*(2*g*ty+v2)-g*g*tx2
-		if c22>0 then
-			local c2=c22^0.5
-			local t0x2=c0*(c1+c2)
-			local t1x2=c0*(c1-c2)
-
-			local tx,t0x,t1x=tx2^0.5,t0x2^0.5,t1x2^0.5
-
-			local v0x,v0y,v0z=rx/tx*t0x,(v2-t0x2)^0.5,rz/tx*t0x
-			local v1x,v1y,v1z=rx/tx*t1x,(v2-t1x2)^0.5,rz/tx*t1x
-
-			local v0=Vector3.new(v0x,ty>g*tx2/(2*v2) and v0y or -v0y,v0z)
-			local v1=Vector3.new(v1x,v1y,v1z)
-
-			return v0,v1
+	local ox, oy, oz = origin.X, origin.Y, origin.Z
+	local rx, rz = target.X - ox, target.Z - oz
+	local tx2 = rx * rx + rz * rz
+	local ty = target.Y - oy
+	if tx2 > 0 then
+		local v2 = initialVelocity * initialVelocity
+
+		local c0 = tx2 / (2 * (tx2 + ty * ty))
+		local c1 = g * ty + v2
+		local c22 = v2 * (2 * g * ty + v2) - g * g * tx2
+		if c22 > 0 then
+			local c2 = c22 ^ 0.5
+			local t0x2 = c0 * (c1 + c2)
+			local t1x2 = c0 * (c1 - c2)
+
+			local tx, t0x, t1x = tx2 ^ 0.5, t0x2 ^ 0.5, t1x2 ^ 0.5
+
+			local v0x, v0y, v0z = rx / tx * t0x, (v2 - t0x2) ^ 0.5, rz / tx * t0x
+			local v1x, v1y, v1z = rx / tx * t1x, (v2 - t1x2) ^ 0.5, rz / tx * t1x
+
+			local v0 = Vector3.new(v0x, ty > g * tx2 / (2 * v2) and v0y or -v0y, v0z)
+			local v1 = Vector3.new(v1x, v1y, v1z)
+
+			return v0, v1
 		else
-			return nil, nil, Vector3.new(rx, (tx2^0.5), rz).unit * initialVelocity
+			return nil, nil, Vector3.new(rx, (tx2 ^ 0.5), rz).Unit * initialVelocity
 		end
 	else
-		local v=Vector3.new(0,initialVelocity*(ty>0 and 1 or ty<0 and -1 or 0),0)
-		return v,v
+		local v = Vector3.new(0, initialVelocity * (ty > 0 and 1 or ty < 0 and -1 or 0), 0)
+		return v, v, nil
 	end
-end
+end
+
+return trajectory