Update to 1.7.1

Author: OverHash

README.md

@@ -1,7 +1,7 @@
 # aeroTS
 A port of [AeroGameFramework](https://sleitnick.github.io/AeroGameFramework/) to [roblox-ts](https://roblox-ts.github.io/)
 
-This was updated as of release [1.6.1 - 7edb161](https://github.com/Sleitnick/AeroGameFramework/tree/1.6.1)
+This was updated as of release [1.7.1 - b3cb92b](https://github.com/Sleitnick/AeroGameFramework/releases/tag/v1.7.1)
 
 Features:
 - IntelliSense for modules/service/controllers
@@ -15,6 +15,7 @@ It is easiest to clone this repository and copy relevant files across from there
 ## Usage
 - AeroGameFramework comes with a lot of preinstalled files. These can be removed
 	- The `Promise` library under Shared *must* exist - or the AeroClient will not be able to load.
+	- The `Internal` folder under Shared *must* exist - or the AeroClient will not be able to load.
 - Create a file under your desired location, and add it to `src/GlobalRegistry.d.ts` in the defined format
 - For examples on how to do this, see [examples](https://github.com/OverHash/aeroTS/tree/master/examples)
 

default.project.json

@@ -23,6 +23,9 @@
 					"AeroInternal": {
 						"$path": "out/internal/Aero"
 					}
+				},
+				"Internal": {
+					"$path": "out/internal/shared"
 				}
 			}
 		},

examples/exampleController.ts

@@ -1,11 +1,11 @@
 import Aero from 'internal/Aero/Aero';
 
 export = class exampleController extends Aero.Controller {
-	static Start(): void {
+	protected static Start(): void {
 		print('exampleController.ts started!');
 	}
 
-	static Init(): void {
+	protected static Init(): void {
 		print('Initiated from exampleController.ts!');
 	}
 

examples/exampleModule.ts

@@ -1,11 +1,11 @@
 import Aero from 'internal/Aero/Aero';
 
 export = class exampleModule extends Aero.SharedModule {
-	static Start(): void {
+	protected static Start(): void {
 		print('exampleModule.ts started!');
 	}
 
-	Init(): void {
+	protected static Init(): void {
 		print('Initiated from exampleModule.ts!');
 	}
 

examples/exampleService.ts

@@ -1,14 +1,14 @@
 import Aero from 'internal/Aero/Aero';
 
 export = class exampleService extends Aero.Service {
-	static Start(): void {
+	protected static Start(): void {
 		print('exampleService.ts started!');
 
 		// access exampleModule
 		this.Modules.exampleModule.foo('hello!');
 	}
 
-	static Init(): void {
+	protected static Init(): void {
 		print('Initiated from exampleService.ts!');
 	}
 };

src/Client/Controllers/UserInput/Gamepad.lua

@@ -36,6 +36,8 @@ local userInput = game:GetService("UserInputService")
 local hapticService = game:GetService("HapticService")
 local abs = math.abs
 
+local InverseLerp
+
 
 function Gamepad.new(gamepad)
 
@@ -49,11 +51,11 @@ function Gamepad.new(gamepad)
 		_isConnected = false;
 	}, Gamepad)
 
-	self.ButtonDown   = self.Shared.Event.new()
-	self.ButtonUp     = self.Shared.Event.new()
-	self.Changed      = self.Shared.Event.new()
-	self.Connected    = self.Shared.Event.new()
-	self.Disconnected = self.Shared.Event.new()
+	self.ButtonDown   = self.Shared.Signal.new()
+	self.ButtonUp     = self.Shared.Signal.new()
+	self.Changed      = self.Shared.Signal.new()
+	self.Connected    = self.Shared.Signal.new()
+	self.Disconnected = self.Shared.Signal.new()
 
 	self._listeners = self.Shared.ListenerList.new()
 
@@ -81,7 +83,7 @@ function Gamepad.new(gamepad)
 	end)
 
 	-- Map InputObject states to corresponding KeyCodes:
-	for _,input in pairs(userInput:GetGamepadState(gamepad)) do
+	for _,input in ipairs(userInput:GetGamepadState(gamepad)) do
 		self._state[input.KeyCode] = input
 	end
 
@@ -103,14 +105,14 @@ function Gamepad:ConnectAll()
 	end)
 
 	-- Input Ended:
-	self._listeners:Connect(userInput.InputEnded, function(input, processed)
+	self._listeners:Connect(userInput.InputEnded, function(input, _processed)
 		if (input.UserInputType == self._gamepadInput) then
 			self.ButtonUp:Fire(input.KeyCode)
 		end
 	end)
 
 	-- Input Changed:
-	self._listeners:Connect(userInput.InputChanged, function(input, processed)
+	self._listeners:Connect(userInput.InputChanged, function(input, _processed)
 		if (input.UserInputType == self._gamepadInput) then
 			self.Changed:Fire(input.KeyCode, input)
 		end
@@ -165,7 +167,7 @@ end
 
 
 function Gamepad:StopAllMotors()
-	for _,motor in pairs(Enum.VibrationMotor:GetEnumItems()) do
+	for _,motor in ipairs(Enum.VibrationMotor:GetEnumItems()) do
 		self:StopMotor(motor)
 	end
 end
@@ -174,10 +176,8 @@ end
 function Gamepad:ApplyDeadzone(value, deadzoneThreshold)
 	if (abs(value) < deadzoneThreshold) then
 		return 0
-	elseif (value > 0) then
-		return ((value - deadzoneThreshold) / (1 - deadzoneThreshold))
 	else
-		return ((value + deadzoneThreshold) / (1 - deadzoneThreshold))
+		return InverseLerp(deadzoneThreshold, 1, abs(value)) * (value > 0 and 1 or -1)
 	end
 end
 
@@ -188,7 +188,7 @@ end
 
 
 function Gamepad:Init()
-	
+	InverseLerp = self.Shared.NumberUtil.InverseLerp
 end
 
 

src/Client/Controllers/UserInput/Keyboard.lua

@@ -52,8 +52,8 @@ end
 
 function Keyboard:Init()
 
-	self.KeyDown = self.Shared.Event.new()
-	self.KeyUp = self.Shared.Event.new()
+	self.KeyDown = self.Shared.Signal.new()
+	self.KeyUp = self.Shared.Signal.new()
 
 	userInput.InputBegan:Connect(function(input, processed)
 		if (processed) then return end
@@ -63,6 +63,7 @@ function Keyboard:Init()
 	end)
 
 	userInput.InputEnded:Connect(function(input, processed)
+		if (processed) then return end
 		if (input.UserInputType == Enum.UserInputType.Keyboard) then
 			self.KeyUp:Fire(input.KeyCode)
 		end

src/Client/Controllers/UserInput/Mobile.lua

@@ -3,20 +3,33 @@
 -- December 28, 2017
 
 --[[
+
+	Mobile:GetDeviceAcceleration()
+	Mobile:GetDeviceGravity()
+	Mobile:GetDeviceRotation()
 	
 	Mobile.TouchStarted(position)
 	Mobile.TouchEnded(position)
 	Mobile.TouchMoved(position, delta)
 	Mobile.TouchTapInWorld(position)
-	Mobile.TouchPinch(scale, state)
+	Mobile.TouchPinch(touchPositions, scale, velocity, state)
+	Mobile.TouchLongPress(touchPositions, state)
+	Mobile.TouchPan(touchPositions, totalTranslation, velocity, state)
+	Mobile.TouchRotate(touchPositions, rotation, velocity, state)
+	Mobile.TouchSwipe(swipeDirection, numberOfTouches)
+	Mobile.TouchTap(touchPositions)
+	Mobile.DeviceAccelerationChanged(acceleration)
+	Mobile.DeviceGravityChanged(gravity)
+	Mobile.DeviceRotationChanged(rotation, cframe)
 	
 --]]
 
 
 
 local Mobile = {}
 
-local RAY = Ray.new
+local RAY_DISTANCE = 1000
+
 local workspace = workspace
 
 local userInput = game:GetService("UserInputService")
@@ -25,44 +38,54 @@ local cam = workspace.CurrentCamera
 
 function Mobile:GetRay(position)
 	local viewportMouseRay = cam:ViewportPointToRay(position.X, position.Y)
-	return RAY(viewportMouseRay.Origin, viewportMouseRay.Direction * 999)
+	return Ray.new(viewportMouseRay.Origin, viewportMouseRay.Direction * RAY_DISTANCE)
 end
 
 
 function Mobile:Cast(position, ignoreDescendantsInstance, terrainCellsAreCubes, ignoreWater)
+	warn("Mobile:Cast() is deprecated; please use Mouse:Raycast(raycastParams) instead")
 	return workspace:FindPartOnRay(self:GetRay(position), ignoreDescendantsInstance, terrainCellsAreCubes, ignoreWater)
 end
 
 
 function Mobile:CastWithIgnoreList(position, ignoreDescendantsTable, terrainCellsAreCubes, ignoreWater)
+	warn("Mobile:CastWithIgnoreList() is deprecated; please use Mouse:Raycast(raycastParams) instead")
 	return workspace:FindPartOnRayWithIgnoreList(self:GetRay(position), ignoreDescendantsTable, terrainCellsAreCubes, ignoreWater)
 end
 
 
 function Mobile:CastWithWhitelist(position, whitelistDescendantsTable, ignoreWater)
+	warn("Mobile:CastWithWhitelist() is deprecated; please use Mouse:Raycast(raycastParams) instead")
 	return workspace:FindPartOnRayWithWhitelist(self:GetRay(position), whitelistDescendantsTable, ignoreWater)
 end
 
 
-function Mobile:Start()
-	
+function Mobile:Raycast(raycastParams, distance)
+	local mousePos = userInput:GetMouseLocation()
+	local viewportMouseRay = cam:ViewportPointToRay(mousePos.X, mousePos.Y)
+	return workspace:Raycast(viewportMouseRay.Origin, viewportMouseRay.Direction * (distance or RAY_DISTANCE), raycastParams)
 end
 
 
 function Mobile:Init()
 
-	self.TouchStarted    = self.Shared.Event.new()
-	self.TouchEnded      = self.Shared.Event.new()
-	self.TouchMoved      = self.Shared.Event.new()
-	self.TouchTapInWorld = self.Shared.Event.new()
-	self.TouchPinch      = self.Shared.Event.new()
+	self.TouchStarted = self.Shared.Signal.new()
+	self.TouchEnded = self.Shared.Signal.new()
+	self.TouchMoved = self.Shared.Signal.new()
+	self.TouchTapInWorld = self.Shared.Signal.new()
+	self.TouchPinch = self.Shared.Signal.new()
+	self.TouchLongPress = self.Shared.Signal.new()
+	self.TouchPan = self.Shared.Signal.new()
+	self.TouchRotate = self.Shared.Signal.new()
+	self.TouchSwipe = self.Shared.Signal.new()
+	self.TouchTap = self.Shared.Signal.new()
 
 	userInput.TouchStarted:Connect(function(input, processed)
 		if (processed) then return end
 		self.TouchStarted:Fire(input.Position)
 	end)
 
-	userInput.TouchEnded:Connect(function(input, processed)
+	userInput.TouchEnded:Connect(function(input, _processed)
 		self.TouchEnded:Fire(input.Position)
 	end)
 
@@ -78,10 +101,42 @@ function Mobile:Init()
 
 	userInput.TouchPinch:Connect(function(touchPositions, scale, velocity, state, processed)
 		if (processed) then return end
-		self.TouchPinch:Fire(scale, state)
+		self.TouchPinch:Fire(touchPositions, scale, velocity, state)
+	end)
+
+	userInput.TouchLongPress:Connect(function(touchPositions, state, processed)
+		if (processed) then return end
+		self.TouchLongPress:Fire(touchPositions, state)
 	end)
+
+	userInput.TouchPan:Connect(function(touchPositions, totalTranslation, velocity, state, processed)
+		if (processed) then return end
+		self.TouchPan:Fire(touchPositions, totalTranslation, velocity, state)
+	end)
+
+	userInput.TouchRotate:Connect(function(touchPositions, rotation, velocity, state, processed)
+		if (processed) then return end
+		self.TouchRotate:Fire(touchPositions, rotation, velocity, state)
+	end)
+
+	userInput.TouchSwipe:Connect(function(swipeDirection, numberOfTouches, processed)
+		if (processed) then return end
+		self.TouchSwipe:Fire(swipeDirection, numberOfTouches)
+	end)
+
+	userInput.TouchTap:Connect(function(touchPositions, processed)
+		if (processed) then return end
+		self.TouchTap:Fire(touchPositions)
+	end)
+
+	self.GetDeviceAcceleration = userInput.GetDeviceAcceleration
+	self.GetDeviceGravity = userInput.GetDeviceGravity
+	self.GetDeviceRotation = userInput.GetDeviceRotation
+	self.DeviceAccelerationChanged = userInput.DeviceAccelerationChanged
+	self.DeviceGravityChanged = userInput.DeviceGravityChanged
+	self.DeviceRotationChanged = userInput.DeviceRotationChanged
 
 end
 
 
-return Mobile
+return Mobile