@quenty/inputkeymaputils 3.0.0 → 3.0.2-canary.216.1c1ac8b.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.0.2-canary.216.1c1ac8b.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/inputkeymaputils@3.0.1...@quenty/inputkeymaputils@3.0.2-canary.216.1c1ac8b.0) (2021-10-02)
+
+
+### Bug Fixes
+
+* Update linting ([1c1ac8b](https://github.com/Quenty/NevermoreEngine/commit/1c1ac8b60f35fcaa134378dc1c8e75fd145a84f9))
+
+
+### Features
+
+* Handle slotted touch buttons so we can always position touch buttons in the same place ([eb6e615](https://github.com/Quenty/NevermoreEngine/commit/eb6e6154c76fea60510cff7c702978a7301a75c6))
+
+
+
+
+
+## [3.0.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/inputkeymaputils@3.0.0...@quenty/inputkeymaputils@3.0.1) (2021-09-18)
+
+**Note:** Version bump only for package @quenty/inputkeymaputils
+
+
+
+
+
 # [3.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/inputkeymaputils@2.1.0...@quenty/inputkeymaputils@3.0.0) (2021-09-11)
 
 

package/README.md

@@ -34,7 +34,7 @@ Converts keymap into ContextActionService friendly types
 
 ### `InputKeyMapUtils.getInputModes(inputKeyMapList)`
 
-### `InputKeyMapUtils.isTouchButton(inputKeyMapList)`
+### `InputKeyMapUtils.isRobloxTouchButton(inputKeyMapList)`
 
 ### `InputKeyMapUtils.isTapInWorld(inputKeyMapList)`
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/inputkeymaputils",
-  "version": "3.0.0",
+  "version": "3.0.2-canary.216.1c1ac8b.0",
   "description": "Utility methods for input map",
   "keywords": [
     "Roblox",
@@ -26,12 +26,12 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/inputmode": "^3.0.0",
-    "@quenty/loader": "^3.0.0",
-    "@quenty/table": "^2.0.0"
+    "@quenty/inputmode": "3.0.2-canary.216.1c1ac8b.0",
+    "@quenty/loader": "3.0.2-canary.216.1c1ac8b.0",
+    "@quenty/table": "2.0.1-canary.216.1c1ac8b.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b840adf5821b23b0371596ad9abe4d431a0803c1"
+  "gitHead": "1c1ac8b60f35fcaa134378dc1c8e75fd145a84f9"
 }

package/src/Client/InputKeyMapUtils.lua

@@ -9,6 +9,7 @@ local Table = require("Table")
 
 local InputKeyMapUtils = {}
 
+-- Should be called "createInputKeyMapList"
 function InputKeyMapUtils.createKeyMap(inputMode, inputTypes)
 	assert(type(inputMode) == "table", "Bad inputMode")
 	assert(type(inputTypes) == "table", "Bad inputTypes")
@@ -91,7 +92,51 @@ function InputKeyMapUtils.getInputModes(inputKeyMapList)
 	return modes
 end
 
-function InputKeyMapUtils.isTouchButton(inputKeyMapList)
+function InputKeyMapUtils.getSlottedTouchButtonData(inputKeyMapList)
+	local slottedTouchButtons = {}
+
+	for _, inputKeyMap in pairs(inputKeyMapList) do
+		assert(inputKeyMap.inputMode, "Bad inputKeyMap.inputMode")
+		assert(inputKeyMap.inputTypes, "Bad inputKeyMap.inputTypes")
+
+		for _, touchButtonData in pairs(inputKeyMap.inputTypes) do
+			if InputKeyMapUtils.isSlottedTouchButton(touchButtonData) then
+				table.insert(slottedTouchButtons, {
+					slotId = touchButtonData.slotId;
+					inputMode = inputKeyMap.inputMode;
+				})
+			end
+		end
+	end
+
+	return slottedTouchButtons
+end
+
+function InputKeyMapUtils.isSlottedTouchButton(inputType)
+	return type(inputType) == "table" and inputType.type == "SlottedTouchButton"
+end
+
+-- Touch buttons should always show up in the same position
+-- We use the SlotId to determine which slot we should put these buttons in
+function InputKeyMapUtils.createSlottedTouchButton(slotId)
+	assert(slotId == "primary1" or slotId == "primary2" or slotId == "primary3" or slotId == "primary4", "Bad slotId")
+
+	return {
+		type = "SlottedTouchButton";
+		slotId = slotId;
+	}
+end
+
+function InputKeyMapUtils.getUniqueKeyForInputType(inputType)
+	if InputKeyMapUtils.isSlottedTouchButton(inputType) then
+		return inputType.slotId
+	else
+		return inputType
+	end
+end
+
+-- Only returns true if we're a Roblox touch button
+function InputKeyMapUtils.isRobloxTouchButton(inputKeyMapList)
 	for _, inputKeyMap in pairs(inputKeyMapList) do
 		assert(inputKeyMap.inputMode, "Bad inputKeyMap.inputMode")
 		assert(inputKeyMap.inputTypes, "Bad inputKeyMap.inputTypes")