@quenty/colorpicker 4.19.0 → 4.20.0

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.20.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpicker@4.19.0...@quenty/colorpicker@4.20.0) (2023-05-26)
+
+
+### Features
+
+* Convert ColorPicker to ValueObject instead of Roblox instnaces for viewmodel ([8f59d5e](https://github.com/Quenty/NevermoreEngine/commit/8f59d5e032acf47db5df4fb07ce4b8e0acfc8354))
+* Initial refactor of guis to use ValueObject instead of ValueObject ([723aba0](https://github.com/Quenty/NevermoreEngine/commit/723aba0208cae7e06c9d8bf2d8f0092d042d70ea))
+* Upgrade to ValueObject and measure values ([83235f7](https://github.com/Quenty/NevermoreEngine/commit/83235f77b7b4f515eac40b16ef1fd230a0c877e7))
+
+
+
+
+
 # [4.19.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/colorpicker@4.18.0...@quenty/colorpicker@4.19.0) (2023-05-08)
 
 **Note:** Version bump only for package @quenty/colorpicker

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/colorpicker",
-  "version": "4.19.0",
+  "version": "4.20.0",
   "description": "Color picking UI system for Roblox.",
   "keywords": [
     "Roblox",
@@ -29,14 +29,15 @@
   },
   "dependencies": {
     "@quenty/baseobject": "^6.2.1",
-    "@quenty/basicpane": "^7.13.0",
-    "@quenty/blend": "^6.17.0",
-    "@quenty/color3utils": "^5.18.0",
-    "@quenty/inputobjectutils": "^4.0.0",
-    "@quenty/instanceutils": "^7.13.0",
+    "@quenty/basicpane": "^7.14.0",
+    "@quenty/blend": "^6.18.0",
+    "@quenty/color3utils": "^5.19.0",
+    "@quenty/inputobjectutils": "^4.1.0",
+    "@quenty/instanceutils": "^7.14.0",
     "@quenty/loader": "^6.2.1",
     "@quenty/maid": "^2.5.0",
-    "@quenty/math": "^2.3.0"
+    "@quenty/math": "^2.3.0",
+    "@quenty/valueobject": "^7.14.0"
   },
-  "gitHead": "2ad8cea7dd3ad79a39afd7d7b785b489b90553fd"
+  "gitHead": "11058e90e51ea83d3dad6ae9abe59cc19c36b94b"
 }

package/src/Client/Cursor/ColorPickerCursorPreview.lua

@@ -11,6 +11,7 @@ local BasicPaneUtils = require("BasicPaneUtils")
 local Math = require("Math")
 local ColorPickerUtils = require("ColorPickerUtils")
 local LuvColor3Utils = require("LuvColor3Utils")
+local ValueObject = require("ValueObject")
 
 local ColorPickerCursorPreview = setmetatable({}, BasicPane)
 ColorPickerCursorPreview.ClassName = "ColorPickerCursorPreview"
@@ -19,28 +20,22 @@ ColorPickerCursorPreview.__index = ColorPickerCursorPreview
 function ColorPickerCursorPreview.new()
 	local self = setmetatable(BasicPane.new(), ColorPickerCursorPreview)
 
-	self._backgroundColorHint = Instance.new("Color3Value")
-	self._backgroundColorHint.Value = Color3.new(0, 0, 0)
+	self._backgroundColorHint = ValueObject.new(Color3.new(0, 0, 0), "Color3")
 	self._maid:GiveTask(self._backgroundColorHint)
 
-	self._heightAbs = Instance.new("NumberValue")
-	self._heightAbs.Value = 60
+	self._heightAbs = ValueObject.new(60, "number")
 	self._maid:GiveTask(self._heightAbs)
 
-	self._offsetAbs = Instance.new("NumberValue")
-	self._offsetAbs.Value = -20
+	self._offsetAbs = ValueObject.new(-20, "number")
 	self._maid:GiveTask(self._offsetAbs)
 
-	self._position = Instance.new("Vector3Value")
-	self._position.Value = Vector3.new(0, 0, 0)
+	self._position = ValueObject.new(Vector2.zero, "Vector2")
 	self._maid:GiveTask(self._position)
 
-	self._transparency = Instance.new("NumberValue")
-	self._transparency.Value = 0
+	self._transparency = ValueObject.new(0, "number")
 	self._maid:GiveTask(self._transparency)
 
-	self._colorValue = Instance.new("Color3Value")
-	self._colorValue.Value = Color3.new(0, 0, 0)
+	self._colorValue = ValueObject.new(Color3.new(0, 0, 0), "Color3")
 	self._maid:GiveTask(self._colorValue)
 
 	self._maid:GiveTask(self:_render():Subscribe(function(gui)
@@ -59,6 +54,8 @@ function ColorPickerCursorPreview:HintBackgroundColor(color)
 end
 
 function ColorPickerCursorPreview:SetPosition(position)
+	assert(typeof(position) == "Vector2", "Bad position")
+
 	self._position.Value = position
 end
 

package/src/Client/Cursor/ColorPickerTriangle.lua

@@ -7,6 +7,7 @@ local require = require(script.Parent.loader).load(script)
 local BaseObject = require("BaseObject")
 local Blend = require("Blend")
 local ColorPickerUtils = require("ColorPickerUtils")
+local ValueObject = require("ValueObject")
 
 local ColorPickerTriangle = setmetatable({}, BaseObject)
 ColorPickerTriangle.ClassName = "ColorPickerTriangle"
@@ -15,20 +16,16 @@ ColorPickerTriangle.__index = ColorPickerTriangle
 function ColorPickerTriangle.new()
 	local self = setmetatable(BaseObject.new(), ColorPickerTriangle)
 
-	self._transparency = Instance.new("NumberValue")
-	self._transparency.Value = 0
+	self._transparency = ValueObject.new(0, "number")
 	self._maid:GiveTask(self._transparency)
 
-	self._backgroundColorHint = Instance.new("Color3Value")
-	self._backgroundColorHint.Value = Color3.new(0, 0, 0)
+	self._backgroundColorHint = ValueObject.new(Color3.new(0, 0, 0), "Color3")
 	self._maid:GiveTask(self._backgroundColorHint)
 
-	self._color = Instance.new("Color3Value")
-	self._color.Value = Color3.new(1, 1, 1)
+	self._color = ValueObject.new(Color3.new(1, 1, 1), "Color3")
 	self._maid:GiveTask(self._color)
 
-	self._sizeValue = Instance.new("Vector3Value")
-	self._sizeValue.Value = Vector3.new(0.05, 0.1, 0)
+	self._sizeValue = ValueObject.new(Vector2.new(0.05, 0.1), "Vector2")
 	self._maid:GiveTask(self._sizeValue)
 
 	self._maid:GiveTask(self:_render():Subscribe(function(gui)
@@ -46,6 +43,10 @@ function ColorPickerTriangle:GetSizeValue()
 	return self._sizeValue
 end
 
+function ColorPickerTriangle:GetMeasureValue()
+	return self._sizeValue
+end
+
 function ColorPickerTriangle:SetColor(color)
 	self._color.Value = color
 end

package/src/Client/Cursor/HSColorPickerCursor.lua

@@ -9,6 +9,7 @@ local require = require(script.Parent.loader).load(script)
 local BaseObject = require("BaseObject")
 local Blend = require("Blend")
 local ColorPickerUtils = require("ColorPickerUtils")
+local ValueObject = require("ValueObject")
 
 local HSColorPickerCursor = setmetatable({}, BaseObject)
 HSColorPickerCursor.ClassName = "HSColorPickerCursor"
@@ -17,32 +18,25 @@ HSColorPickerCursor.__index = HSColorPickerCursor
 function HSColorPickerCursor.new()
 	local self = setmetatable(BaseObject.new(), HSColorPickerCursor)
 
-	self._backgroundColorHint = Instance.new("Color3Value")
-	self._backgroundColorHint.Value = Color3.new(0, 0, 0)
+	self._backgroundColorHint = ValueObject.new(Color3.new(0, 0, 0), "Color3")
 	self._maid:GiveTask(self._backgroundColorHint)
 
-	self._height = Instance.new("NumberValue")
-	self._height.Value = 0.075
+	self._height = ValueObject.new(0.075, "number")
 	self._maid:GiveTask(self._height)
 
-	self._crossHairWidthAbs = Instance.new("NumberValue")
-	self._crossHairWidthAbs.Value = 1
+	self._crossHairWidthAbs = ValueObject.new(1, "number")
 	self._maid:GiveTask(self._crossHairWidthAbs)
 
-	self._verticalHairVisible = Instance.new("BoolValue")
-	self._verticalHairVisible.Value = true
+	self._verticalHairVisible = ValueObject.new(true, "boolean")
 	self._maid:GiveTask(self._verticalHairVisible)
 
-	self._horizontalHairVisible = Instance.new("BoolValue")
-	self._horizontalHairVisible.Value = true
+	self._horizontalHairVisible = ValueObject.new(true, "boolean")
 	self._maid:GiveTask(self._horizontalHairVisible)
 
-	self._position = Instance.new("Vector3Value")
-	self._position.Value = Vector3.new(0, 0, 0)
+	self._position = ValueObject.new(Vector2.zero, "Vector2")
 	self._maid:GiveTask(self._position)
 
-	self._transparency = Instance.new("NumberValue")
-	self._transparency.Value = 0
+	self._transparency = ValueObject.new(0, "number")
 	self._maid:GiveTask(self._transparency)
 
 	self._maid:GiveTask(self:_render():Subscribe(function(gui)
@@ -88,6 +82,8 @@ end
 	@param position Vector2
 ]=]
 function HSColorPickerCursor:SetPosition(position)
+	assert(typeof(position) == "Vector2", "Bad position")
+
 	self._position.Value = position
 end
 

package/src/Client/HSV/HSColorPicker.lua

@@ -12,6 +12,7 @@ local Blend = require("Blend")
 local ColorPickerCursorPreview = require("ColorPickerCursorPreview")
 local ColorPickerInput = require("ColorPickerInput")
 local HSColorPickerCursor = require("HSColorPickerCursor")
+local ValueObject = require("ValueObject")
 
 local HSColorPicker = setmetatable({}, BaseObject)
 HSColorPicker.ClassName = "HSColorPicker"
@@ -21,17 +22,15 @@ function HSColorPicker.new()
 	local self = setmetatable(BaseObject.new(), HSColorPicker)
 
 	self._hsvColorValue = Instance.new("Vector3Value")
-	self._hsvColorValue.Value = Vector3.new(0, 0, 0)
+	self._hsvColorValue.Value = Vector3.zero
 	self._maid:GiveTask(self._hsvColorValue)
 
 	self.ColorChanged = self._hsvColorValue.Changed
 
-	self._sizeValue = Instance.new("Vector3Value")
-	self._sizeValue.Value = Vector3.new(4, 4, 0)
+	self._sizeValue = ValueObject.new(Vector2.new(4, 4), "Vector2")
 	self._maid:GiveTask(self._sizeValue)
 
-	self._transparency = Instance.new("NumberValue")
-	self._transparency.Value = 0
+	self._transparency = ValueObject.new(0, "number")
 	self._maid:GiveTask(self._transparency)
 
 	self._input = ColorPickerInput.new()
@@ -63,7 +62,7 @@ function HSColorPicker.new()
 	self._maid:GiveTask(self._hsvColorValue.Changed:Connect(function()
 		local current = self._hsvColorValue.Value
 		local h, s = current.x, current.y
-		self._cursor:SetPosition(Vector3.new(1 - h, 1 - s, 0))
+		self._cursor:SetPosition(Vector2.new(1 - h, 1 - s))
 	end))
 
 	-- Setup preview
@@ -149,6 +148,10 @@ function HSColorPicker:GetSizeValue()
 	return self._sizeValue
 end
 
+function HSColorPicker:GetMeasureValue()
+	return self._sizeValue
+end
+
 --[=[
 	Sets the transparency of the HSColorPicker
 
@@ -168,7 +171,7 @@ end
 function HSColorPicker:SetSize(height)
 	assert(type(height) == "number", "Bad height")
 
-	self._sizeValue.Value = Vector3.new(height, height, 0)
+	self._sizeValue.Value = Vector2.new(height, height)
 end
 
 function HSColorPicker:_render()

package/src/Client/HSV/HSVColorPicker.lua

@@ -12,6 +12,7 @@ local Blend = require("Blend")
 local HSColorPicker = require("HSColorPicker")
 local ValueColorPicker = require("ValueColorPicker")
 local Maid = require("Maid")
+local ValueObject = require("ValueObject")
 
 local HSVColorPicker = setmetatable({}, BaseObject)
 HSVColorPicker.ClassName = "HSVColorPicker"
@@ -32,21 +33,18 @@ function HSVColorPicker.new()
 	local self = setmetatable(BaseObject.new(), HSVColorPicker)
 
 	self._hsvColorValue = Instance.new("Vector3Value")
-	self._hsvColorValue.Value = Vector3.new(0, 0, 0)
+	self._hsvColorValue.Value = Vector3.zero
 	self._maid:GiveTask(self._hsvColorValue)
 
 	self.ColorChanged = self._hsvColorValue.Changed
 
-	self._sizeValue = Instance.new("Vector3Value")
-	self._sizeValue.Value = Vector3.new(6, 4, 0)
+	self._sizeValue = ValueObject.new(Vector2.new(6, 4), "Vector2")
 	self._maid:GiveTask(self._sizeValue)
 
-	self._innerPadding = Instance.new("NumberValue")
-	self._innerPadding.Value = 0.2
+	self._innerPadding = ValueObject.new(0.2, "number")
 	self._maid:GiveTask(self._innerPadding)
 
-	self._transparency = Instance.new("NumberValue")
-	self._transparency.Value = 0
+	self._transparency = ValueObject.new(0, "number")
 	self._maid:GiveTask(self._transparency)
 
 	self._hueSaturationPicker = HSColorPicker.new()
@@ -193,6 +191,10 @@ function HSVColorPicker:GetSizeValue()
 	return self._sizeValue
 end
 
+function HSVColorPicker:GetMeasureValue()
+	return self._sizeValue
+end
+
 --[=[
 	Sets the transparency of the color
 
@@ -211,7 +213,7 @@ function HSVColorPicker:_updateSize()
 	local width = valueSize.x + hueSize.x + self._innerPadding.Value
 	local height = math.max(valueSize.y, hueSize.y)
 
-	self._sizeValue.Value = Vector3.new(width, height)
+	self._sizeValue.Value = Vector2.new(width, height)
 end
 
 function HSVColorPicker:_render()
@@ -255,7 +257,7 @@ function HSVColorPicker:_render()
 			};
 
 			container(self._hueSaturationPicker, {
-				AnchorPoint = Vector2.new(0, 0);
+				AnchorPoint = Vector2.zero;
 				Position = UDim2.fromScale(0, 0);
 			});
 			container(self._valuePicker, {

package/src/Client/HSV/ValueColorPicker.lua

@@ -8,7 +8,7 @@ local require = require(script.Parent.loader).load(script)
 local BaseObject = require("BaseObject")
 local Blend = require("Blend")
 local ColorPickerInput = require("ColorPickerInput")
--- local HSColorPickerCursor = require("HSColorPickerCursor")
+local ValueObject = require("ValueObject")
 local ColorPickerCursorPreview = require("ColorPickerCursorPreview")
 local ColorPickerTriangle = require("ColorPickerTriangle")
 
@@ -19,26 +19,21 @@ ValueColorPicker.__index = ValueColorPicker
 function ValueColorPicker.new()
 	local self = setmetatable(BaseObject.new(), ValueColorPicker)
 
-	self._hsvColorValue = Instance.new("Vector3Value")
-	self._hsvColorValue.Value = Vector3.new(0, 0, 0)
+	self._hsvColorValue = ValueObject.new(Vector3.zero, "Vector3")
 	self._maid:GiveTask(self._hsvColorValue)
 
-	self._backgroundColorHint = Instance.new("Color3Value")
-	self._backgroundColorHint.Value = Color3.new(0, 0, 0)
+	self._backgroundColorHint = ValueObject.new(Color3.new(0, 0, 0), "Color3")
 	self._maid:GiveTask(self._backgroundColorHint)
 
 	self.ColorChanged = self._hsvColorValue.Changed
 
-	self._sizeValue = Instance.new("Vector3Value")
-	self._sizeValue.Value = Vector3.new(0, 4, 0)
+	self._sizeValue = ValueObject.new(Vector2.new(0, 4), "Vector2")
 	self._maid:GiveTask(self._sizeValue)
 
-	self._leftWidth = Instance.new("NumberValue")
-	self._leftWidth.Value = 0.25
+	self._leftWidth = ValueObject.new(0.25, "number")
 	self._maid:GiveTask(self._leftWidth)
 
-	self._transparency = Instance.new("NumberValue")
-	self._transparency.Value = 0
+	self._transparency = ValueObject.new(0, "number")
 	self._maid:GiveTask(self._transparency)
 
 	self._input = ColorPickerInput.new()
@@ -112,7 +107,6 @@ function ValueColorPicker.new()
 	end))
 	self:_updateSize()
 
-
 	return self
 end
 
@@ -127,7 +121,7 @@ function ValueColorPicker:HintBackgroundColor(color)
 end
 
 function ValueColorPicker:_updatePreviewPosition()
-	self._preview:SetPosition(Vector3.new(0.5, 1 - self._hsvColorValue.Value.z))
+	self._preview:SetPosition(Vector2.new(0.5, 1 - self._hsvColorValue.Value.z))
 end
 
 function ValueColorPicker:_updateSize(newHeight)
@@ -135,7 +129,7 @@ function ValueColorPicker:_updateSize(newHeight)
 	local width = self._leftWidth.Value + triangleSize.y
 	local height = newHeight or self._sizeValue.Value.y
 
-	self._sizeValue.Value = Vector3.new(width, height, 0)
+	self._sizeValue.Value = Vector2.new(width, height)
 end
 
 function ValueColorPicker:_updateHintedColors()
@@ -177,6 +171,10 @@ function ValueColorPicker:GetSizeValue()
 	return self._sizeValue
 end
 
+function ValueColorPicker:GetMeasureValue()
+	return self._sizeValue
+end
+
 function ValueColorPicker:SetTransparency(transparency)
 	assert(type(transparency) == "number", "Bad transparency")
 

package/src/Client/Input/ColorPickerInput.lua

@@ -9,6 +9,7 @@ local UserInputService = game:GetService("UserInputService")
 local BaseObject = require("BaseObject")
 local Maid = require("Maid")
 local InputObjectUtils = require("InputObjectUtils")
+local ValueObject = require("ValueObject")
 
 local ColorPickerInput = setmetatable({}, BaseObject)
 ColorPickerInput.ClassName = "ColorPickerInput"
@@ -25,8 +26,7 @@ function ColorPickerInput.new()
 	self._numFingerDown.Value = 0
 	self._maid:GiveTask(self._numFingerDown)
 
-	self._currentPosition = Instance.new("Vector3Value")
-	self._currentPosition.Value = Vector3.new(0, 0, 0)
+	self._currentPosition = ValueObject.new(Vector2.zero, "Vector2")
 	self._maid:GiveTask(self._currentPosition)
 
 	self._activePositions = {}
@@ -196,15 +196,15 @@ function ColorPickerInput:_stopTouchTrack(buttonMaid, inputObject)
 end
 
 function ColorPickerInput:_toButtonSpace(button, position)
-	local pos = Vector3.new(button.AbsolutePosition.x, button.AbsolutePosition.y, 0)
-	local size = Vector3.new(button.AbsoluteSize.x, button.AbsoluteSize.y, 1)
+	local pos = button.AbsolutePosition
+	local size = button.AbsoluteSize
 
-	local result = (position - pos)/size
-	return Vector3.new(math.clamp(result.x, 0, 1), math.clamp(result.y, 0, 1), 0)
+	local result = (Vector2.new(position.x, position.y) - pos)/size
+	return Vector2.new(math.clamp(result.x, 0, 1), math.clamp(result.y, 0, 1))
 end
 
 function ColorPickerInput:_updateCurrentPosition()
-	local current = Vector3.new(0, 0, 0)
+	local current = Vector2.zero
 	local count = 0
 	for _, item in pairs(self._activePositions) do
 		current = current + item