@quenty/viewport 6.0.0-canary.ff9fb44.0 → 6.0.0

package/CHANGELOG.md

@@ -3,7 +3,130 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [6.0.0-canary.ff9fb44.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.22.0...@quenty/viewport@6.0.0-canary.ff9fb44.0) (2023-06-03)
+# [6.0.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.36.0...@quenty/viewport@6.0.0) (2023-10-11)
+
+
+### Features
+
+* Viewport looks much better and has no outline if you set the background color3 ([5aa3676](https://github.com/Quenty/NevermoreEngine/commit/5aa3676ac6aec10b1a0e10632e28ffb9ab8bcb13))
+
+
+
+
+
+# [5.36.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.35.0...@quenty/viewport@5.36.0) (2023-09-21)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.35.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.34.0...@quenty/viewport@5.35.0) (2023-09-04)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.34.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.33.0...@quenty/viewport@5.34.0) (2023-08-23)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.33.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.32.0...@quenty/viewport@5.33.0) (2023-08-01)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.32.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.31.0...@quenty/viewport@5.32.0) (2023-07-28)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.31.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.30.0...@quenty/viewport@5.31.0) (2023-07-28)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.30.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.29.0...@quenty/viewport@5.30.0) (2023-07-25)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.29.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.28.0...@quenty/viewport@5.29.0) (2023-07-23)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.28.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.27.1...@quenty/viewport@5.28.0) (2023-07-15)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+## [5.27.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.27.0...@quenty/viewport@5.27.1) (2023-07-11)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.27.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.26.0...@quenty/viewport@5.27.0) (2023-07-10)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.26.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.25.0...@quenty/viewport@5.26.0) (2023-06-24)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.25.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.24.0...@quenty/viewport@5.25.0) (2023-06-18)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.24.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.23.0...@quenty/viewport@5.24.0) (2023-06-17)
+
+**Note:** Version bump only for package @quenty/viewport
+
+
+
+
+
+# [5.23.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/viewport@5.22.0...@quenty/viewport@5.23.0) (2023-06-05)
 
 **Note:** Version bump only for package @quenty/viewport
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/viewport",
-  "version": "6.0.0-canary.ff9fb44.0",
+  "version": "6.0.0",
   "description": "Rendering functionality for viewportFrames",
   "keywords": [
     "Roblox",
@@ -24,26 +24,26 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/adorneeutils": "3.1.0",
-    "@quenty/baseobject": "6.2.1",
-    "@quenty/basicpane": "7.14.0",
-    "@quenty/blend": "6.18.0",
-    "@quenty/camera": "10.0.0-canary.ff9fb44.0",
-    "@quenty/geometryutils": "2.6.0",
-    "@quenty/inputobjectutils": "4.1.0",
-    "@quenty/loader": "6.2.1",
-    "@quenty/maid": "2.5.0",
-    "@quenty/math": "2.3.0",
-    "@quenty/rx": "7.11.0",
-    "@quenty/signal": "2.4.0",
-    "@quenty/spring": "6.3.0",
-    "@quenty/valueobject": "7.14.0"
+    "@quenty/adorneeutils": "^3.1.0",
+    "@quenty/baseobject": "^7.0.0",
+    "@quenty/basicpane": "^8.0.0",
+    "@quenty/blend": "^7.0.0",
+    "@quenty/camera": "^10.0.0",
+    "@quenty/geometryutils": "^3.0.0",
+    "@quenty/inputobjectutils": "^4.1.0",
+    "@quenty/loader": "^7.0.0",
+    "@quenty/maid": "^2.6.0",
+    "@quenty/math": "^2.5.0",
+    "@quenty/rx": "^8.0.0",
+    "@quenty/signal": "^3.0.0",
+    "@quenty/spring": "^7.0.0",
+    "@quenty/valueobject": "^8.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
   "devDependencies": {
-    "@quenty/insertserviceutils": "6.5.0"
+    "@quenty/insertserviceutils": "^7.0.0"
   },
-  "gitHead": "ff9fb44bc6867fe6ac15ea58a744a028212c8601"
+  "gitHead": "fdeae46099587019ec5fc15317dc673aed379400"
 }

package/src/Client/Viewport.lua

@@ -48,28 +48,18 @@ Viewport.__index = Viewport
 function Viewport.new()
 	local self = setmetatable(BasicPane.new(), Viewport)
 
-	self._current = ValueObject.new(nil)
-	self._maid:GiveTask(self._current)
+	self._current = self._maid:Add(ValueObject.new(nil))
+	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._transparency = ValueObject.new(0, "number")
-	self._maid:GiveTask(self._transparency)
-
-	self._absoluteSize = ValueObject.new(Vector2.zero, "Vector2")
-	self._maid:GiveTask(self._absoluteSize)
-
-	self._fieldOfView = ValueObject.new(20, "number")
-	self._maid:GiveTask(self._fieldOfView)
-
-	self._rotationYawSpring = SpringObject.new(math.pi/4)
+	self._rotationYawSpring = self._maid:Add(SpringObject.new(math.rad(90 + 90 - 30)))
 	self._rotationYawSpring.Speed = 30
-	self._maid:GiveTask(self._rotationYawSpring)
 
-	self._rotationPitchSpring = SpringObject.new(-math.pi/6)
+	self._rotationPitchSpring = self._maid:Add(SpringObject.new(math.rad(-15)))
 	self._rotationPitchSpring.Speed = 30
-	self._maid:GiveTask(self._rotationPitchSpring)
 
-	self._notifyInstanceSizeChanged = Signal.new()
-	self._maid:GiveTask(self._notifyInstanceSizeChanged)
+	self._notifyInstanceSizeChanged = self._maid:Add(Signal.new())
 
 	return self
 end
@@ -132,6 +122,9 @@ function Viewport.blend(props)
 	end)
 end
 
+function Viewport:ObserveTransparency()
+	return self._transparency:Observe()
+end
 
 --[=[
 	Sets the field of view on the viewport.
@@ -171,6 +164,12 @@ function Viewport:SetInstance(instance)
 	assert(typeof(instance) == "Instance" or instance == nil, "Bad instance")
 
 	self._current.Value = instance
+
+	return function()
+		if self._current.Value == instance then
+			self._current.Value = nil
+		end
+	end
 end
 
 --[=[
@@ -181,26 +180,34 @@ function Viewport:NotifyInstanceSizeChanged()
 	self._notifyInstanceSizeChanged:Fire()
 end
 
-function Viewport:RotateBy(deltaV2, doNotAnimate)
-	local target = (self._rotationYawSpring.Value + deltaV2.x) % TAU
-	self._rotationYawSpring.Position = CircleUtils.updatePositionToSmallestDistOnCircle(self._rotationYawSpring.Position, target, TAU)
+function Viewport:SetYaw(yaw, doNotAnimate)
+	yaw = yaw % TAU
 
-	self._rotationYawSpring.Target = target
+	self._rotationYawSpring.Position = CircleUtils.updatePositionToSmallestDistOnCircle(self._rotationYawSpring.Position, yaw, TAU)
+	self._rotationYawSpring.Target = yaw
 
 	if doNotAnimate then
 		self._rotationYawSpring.Position = self._rotationYawSpring.Target
 	end
+end
 
-	self._rotationPitchSpring.Target = math.clamp(self._rotationPitchSpring.Value + deltaV2.y, MIN_PITCH, MAX_PITCH)
+function Viewport:SetPitch(pitch, doNotAnimate)
+	self._rotationPitchSpring.Target = math.clamp(pitch, MIN_PITCH, MAX_PITCH)
 	if doNotAnimate then
 		self._rotationPitchSpring.Position = self._rotationPitchSpring.Target
 	end
 end
 
+function Viewport:RotateBy(deltaV2, doNotAnimate)
+	self:SetYaw(self._rotationYawSpring.Value + deltaV2.x, doNotAnimate)
+	self:SetPitch(self._rotationPitchSpring.Value + deltaV2.y, doNotAnimate)
+end
+
 --[=[
 	Renders the viewport. Allows the following properties.
 
 	* Ambient - Color3
+	* ImageColor3 - Color3
 	* AnchorPoint - Vector2
 	* LayoutOrder - number
 	* LightColor - Color3
@@ -221,16 +228,25 @@ function Viewport:Render(props)
 	local currentCamera = ValueObject.new()
 	self._maid:GiveTask(currentCamera)
 
+	local lightDirectionCFrame = (CFrame.Angles(0, math.rad(180), 0)
+			* CFrame.Angles(math.rad(-45), 0, 0))
+	local brightness = 1.25
+	local ambientBrightness = 0.75
+
 	return Blend.New "ViewportFrame" {
 		Parent = props.Parent;
 		Size = props.Size or UDim2.new(1, 0, 1, 0);
 		AnchorPoint = props.AnchorPoint;
 		Position = props.Position;
+		ImageColor3 = props.ImageColor3;
 		LayoutOrder = props.LayoutOrder;
 		BackgroundTransparency = 1;
+		BackgroundColor3 = props.BackgroundColor3;
 		CurrentCamera = currentCamera;
-		LightColor = props.LightColor or Color3.fromRGB(200, 200, 200);
-		Ambient = props.Ambient or Color3.fromRGB(140, 140, 140);
+		-- selene:allow(roblox_incorrect_color3_new_bounds)
+		LightColor = props.LightColor or Color3.new(brightness, brightness, brightness + 0.15);
+		LightDirection = props.LightDirection or lightDirectionCFrame:vectorToWorldSpace(Vector3.new(0, 0, -1));
+		Ambient = props.Ambient or Color3.new(ambientBrightness, ambientBrightness, ambientBrightness + 0.15);
 		ImageTransparency = Blend.Computed(props.Transparency or 0, self._transparency,
 			function(propTransparency, selfTransparency)
 				return Math.map(propTransparency, 0, 1, selfTransparency, 1)
@@ -265,7 +281,10 @@ function Viewport:Render(props)
 			return maid
 		end)] = true;
 		[Blend.Children] = {
+			props[Blend.Children];
+
 			self._current;
+
 			Blend.New "Camera" {
 				[Blend.Instance] = currentCamera;
 				Name = "CurrentCamera";

package/src/Client/ViewportControls.lua

@@ -68,6 +68,10 @@ function ViewportControls:_startDrag(startInputObject)
 	end))
 
 	maid:GiveTask(function()
+		if not self._viewportModel.Destroy then
+			return
+		end
+
 		-- Compute rotation
 		if lastDelta then
 			self._viewportModel:RotateBy(lastDelta)