@quenty/viewport 11.5.0 → 11.6.1

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [11.6.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@11.6.0...@quenty/viewport@11.6.1) (2024-07-16)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [11.6.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@11.5.0...@quenty/viewport@11.6.0) (2024-07-08)
+
+
+### Features
+
+* added enabled controls to viewport controls ([e945319](https://github.com/Quenty/NevermoreEngine/commit/e94531946e293f2e4b4da821f0d94f2c89d70248))
+
+
+
+
+
 # [11.5.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@11.4.0...@quenty/viewport@11.5.0) (2024-05-09)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/viewport",
-  "version": "11.5.0",
+  "version": "11.6.1",
   "description": "Rendering functionality for viewportFrames",
   "keywords": [
     "Roblox",
@@ -28,7 +28,7 @@
     "@quenty/baseobject": "^10.3.0",
     "@quenty/basicpane": "^13.3.0",
     "@quenty/blend": "^12.3.0",
-    "@quenty/camera": "^14.5.0",
+    "@quenty/camera": "^14.5.1",
     "@quenty/geometryutils": "^6.3.0",
     "@quenty/inputobjectutils": "^4.4.0",
     "@quenty/loader": "^10.3.0",
@@ -45,5 +45,5 @@
   "devDependencies": {
     "@quenty/insertserviceutils": "^10.3.0"
   },
-  "gitHead": "3fd5cdca3128bf34c8d9dfae1e92d62533b6e6f5"
+  "gitHead": "d9ffcf779b43c299fbb2dd0bd15d56b83b3e5043"
 }

package/src/Client/Viewport.lua

@@ -52,6 +52,7 @@ function Viewport.new()
 	self._transparency = self._maid:Add(ValueObject.new(0, "number"))
 	self._absoluteSize = self._maid:Add(ValueObject.new(Vector2.zero, "Vector2"))
 	self._fieldOfView = self._maid:Add(ValueObject.new(20, "number"))
+	self._controlsEnabled = self._maid:Add(ValueObject.new(true, "boolean"))
 
 	self._rotationYawSpring = self._maid:Add(SpringObject.new(math.rad(90 + 90 - 30)))
 	self._rotationYawSpring.Speed = 30
@@ -126,6 +127,17 @@ function Viewport:ObserveTransparency()
 	return self._transparency:Observe()
 end
 
+--[=[
+	Sets the enabled state of the ViewportControls
+
+	@param enabled boolean
+]=]
+function Viewport:SetControlsEnabled(enabled)
+	assert(type(enabled) == "boolean", "Bad enabled")
+
+	self._controlsEnabled.Value = enabled
+end
+
 --[=[
 	Sets the field of view on the viewport.
 
@@ -253,7 +265,16 @@ function Viewport:Render(props)
 			end);
 		[Blend.OnChange "AbsoluteSize"] = self._absoluteSize;
 		[Blend.Attached(function(viewport)
-			return ViewportControls.new(viewport, self)
+			local controlsMaid = Maid.new()
+
+			-- create viewport controls and obey enabled state
+			local viewportControls = ViewportControls.new(viewport, self)
+			controlsMaid:Add(viewportControls)
+			controlsMaid:Add(self._controlsEnabled:Observe():Subscribe(function(controlsEnabled)
+				viewportControls:SetEnabled(controlsEnabled)
+			end))
+
+			return controlsMaid
 		end)] = true;
 		[Blend.Attached(function(viewport)
 			-- custom parenting scheme to ensure we don't call destroy on children

package/src/Client/ViewportControls.lua

@@ -8,6 +8,7 @@ local require = require(script.Parent.loader).load(script)
 local BaseObject = require("BaseObject")
 local Maid = require("Maid")
 local InputObjectUtils = require("InputObjectUtils")
+local ValueObject = require("ValueObject")
 
 local SENSITIVITY = Vector2.new(8, 4)
 
@@ -25,11 +26,13 @@ function ViewportControls.new(viewport, viewportModel)
 	local self = setmetatable(BaseObject.new(viewport), ViewportControls)
 
 	self._viewportModel = assert(viewportModel, "No rotationYaw")
+	self._enabled = self._maid:Add(ValueObject.new(true, "boolean"))
 
 	self._maid:GiveTask(self._obj.InputBegan:Connect(function(inputObject)
 		if inputObject.UserInputType == Enum.UserInputType.MouseButton1
 			or inputObject.UserInputType == Enum.UserInputType.MouseButton2
-			or inputObject.UserInputType == Enum.UserInputType.Touch then
+			or inputObject.UserInputType == Enum.UserInputType.Touch
+			and self._enabled.Value then
 			self:_startDrag(inputObject)
 		end
 	end))
@@ -37,6 +40,17 @@ function ViewportControls.new(viewport, viewportModel)
 	return self
 end
 
+--[=[
+	Sets the enabled state of the controls
+
+	@param enabled boolean
+]=]
+function ViewportControls:SetEnabled(enabled)
+	assert(type(enabled) == "boolean", "Bad enabled")
+
+	self._enabled.Value = enabled
+end
+
 function ViewportControls:_startDrag(startInputObject)
 	if self._maid._dragging then
 		return