@quenty/adorneeboundingbox 2.2.1 → 2.3.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/adorneeboundingbox@2.2.1...@quenty/adorneeboundingbox@2.3.0) (2023-12-14)
+
+
+### Features
+
+* Fix bounding box calculations to handle parts that are unanchored ([c252a99](https://github.com/Quenty/NevermoreEngine/commit/c252a99bbb1ba76bf86ec73a0fe80d0cf057309b))
+
+
+
+
+
 ## [2.2.1](https://github.com/Quenty/NevermoreEngine/compare/@quenty/adorneeboundingbox@2.2.0...@quenty/adorneeboundingbox@2.2.1) (2023-10-28)
 
 **Note:** Version bump only for package @quenty/adorneeboundingbox

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/adorneeboundingbox",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "Handles logic for reactive bounding box monitoring",
   "keywords": [
     "Roblox",
@@ -25,20 +25,20 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^7.0.0",
-    "@quenty/brio": "^9.1.1",
+    "@quenty/baseobject": "^7.1.0",
+    "@quenty/brio": "^9.2.0",
     "@quenty/draw": "^4.3.0",
-    "@quenty/instanceutils": "^8.1.1",
-    "@quenty/loader": "^7.0.0",
+    "@quenty/instanceutils": "^8.2.0",
+    "@quenty/loader": "^7.1.0",
     "@quenty/maid": "^2.6.0",
-    "@quenty/observablecollection": "^6.2.1",
-    "@quenty/rx": "^8.1.1",
-    "@quenty/selectionutils": "^3.1.1",
-    "@quenty/signal": "^3.0.0",
-    "@quenty/valueobject": "^8.1.1"
+    "@quenty/observablecollection": "^6.3.0",
+    "@quenty/rx": "^8.2.0",
+    "@quenty/selectionutils": "^3.2.0",
+    "@quenty/signal": "^3.1.0",
+    "@quenty/valueobject": "^8.2.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "440aca7ce2b50b74317ee05fdc0b8d1e58001af3"
+  "gitHead": "2c2dbbc0cb2fbb46b4f3270c559c63890fe18b26"
 }

package/src/Shared/AdorneeBoundingBox.lua

@@ -12,27 +12,45 @@ local RxBrioUtils = require("RxBrioUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
 local RxPartBoundingBoxUtils = require("RxPartBoundingBoxUtils")
 local ValueObject = require("ValueObject")
+local AdorneePartBoundingBox = require("AdorneePartBoundingBox")
 
 local AdorneeBoundingBox = setmetatable({}, BaseObject)
 AdorneeBoundingBox.ClassName = "AdorneeBoundingBox"
 AdorneeBoundingBox.__index = AdorneeBoundingBox
 
-function AdorneeBoundingBox.new(adornee)
-	assert(typeof(adornee) == "Instance", "Bad adornee")
+function AdorneeBoundingBox.new(initialAdornee)
+	local self = setmetatable(BaseObject.new(), AdorneeBoundingBox)
 
-	local self = setmetatable(BaseObject.new(adornee), AdorneeBoundingBox)
+	self._adornee = self._maid:Add(ValueObject.new(initialAdornee))
+	self._bbCFrame = self._maid:Add(ValueObject.new(nil))
+	self._bbSize = self._maid:Add(ValueObject.new(Vector3.zero, "Vector3"))
 
-	self._bbCFrame = ValueObject.new(nil)
-	self._maid:GiveTask(self._bbCFrame)
-
-	self._bbSize = ValueObject.new(Vector3.zero)
-	self._maid:GiveTask(self._bbSize)
+	self._maid:GiveTask(self._adornee:ObserveBrio(function(adornee)
+		return adornee ~= nil
+	end):Subscribe(function(brio)
+		if brio:IsDead() then
+			return
+		end
 
-	self:_setup()
+		local maid, adornee = brio:ToMaidAndValue()
+		self:_setup(maid, adornee)
+	end))
 
 	return self
 end
 
+function AdorneeBoundingBox:SetAdornee(adornee)
+	assert(typeof(adornee) == "Instance" or adornee == nil, "Bad adornee")
+
+	self._adornee.Value = adornee
+
+	return function()
+		if self._adornee.Value == adornee then
+			self._adornee.Value = nil
+		end
+	end
+end
+
 --[=[
 	Observes the cframe of the adornee
 	@return Observable<Vector3>
@@ -65,22 +83,26 @@ function AdorneeBoundingBox:GetSize()
 	return self._bbSize.Value
 end
 
-function AdorneeBoundingBox:_setup()
-	if self._obj:IsA("BasePart") then
-		self._maid:GiveTask(self:_setupPart(self._obj))
-	elseif self._obj:IsA("Model") then
-		self._maid:GiveTask(self:_setupModel(self._obj))
-	elseif self._obj:IsA("Attachment") then
-		self._maid:GiveTask(self:_setupAttachment(self._obj))
-	elseif self._obj:IsA("Humanoid") then
-		self._maid:GiveTask(self:_setupHumanoid(self._obj))
-	elseif self._obj:IsA("Accessory") or self._obj:IsA("Clothing") then
+function AdorneeBoundingBox:_setup(maid, adornee)
+	if adornee:IsA("BasePart") then
+		maid:GiveTask(self:_setupPart(adornee))
+	elseif adornee:IsA("Model") then
+		maid:GiveTask(self:_setupModel(adornee))
+	elseif adornee:IsA("Attachment") then
+		maid:GiveTask(self:_setupAttachment(adornee))
+	elseif adornee:IsA("Humanoid") then
+		maid:GiveTask(self:_setupHumanoid(adornee))
+	elseif adornee:IsA("Accessory") or adornee:IsA("Clothing") then
 		-- TODO: Rethink this contract
-		warn("Accessories and clothing not supported yet")
-	elseif self._obj:IsA("Tool") then
-		self._maid:GiveTask(self:_setupTool(self._obj))
+		warn("[AdorneeBoundingBox] - Accessories and clothing not supported yet")
+		self._bbCFrame.Value = nil
+		self._bbSize.Value = Vector3.zero
+	elseif adornee:IsA("Tool") then
+		maid:GiveTask(self:_setupTool(adornee))
 	else
-		warn("Unsupported adornee")
+		self._bbCFrame.Value = nil
+		self._bbSize.Value = Vector3.zero
+		warn("[AdorneeBoundingBox] - Unsupported adornee")
 	end
 end
 
@@ -109,9 +131,7 @@ function AdorneeBoundingBox:_setupModel(model)
 
 	local topMaid = Maid.new()
 
-	local adorneeModelBoundingBox = AdorneeModelBoundingBox.new(model)
-	topMaid:GiveTask(adorneeModelBoundingBox)
-
+	local adorneeModelBoundingBox = topMaid:Add(AdorneeModelBoundingBox.new(model))
 	topMaid:GiveTask(adorneeModelBoundingBox:ObserveCFrame():Subscribe(function(cframe)
 		self._bbCFrame.Value = cframe
 	end))
@@ -180,12 +200,13 @@ function AdorneeBoundingBox:_setupPart(part)
 
 	local maid = Maid.new()
 
-	maid:GiveTask(RxInstanceUtils.observeProperty(part, "Size"):Subscribe(function(size)
-		self._bbSize.Value = size
-	end))
-	maid:GiveTask(RxPartBoundingBoxUtils.observePartCFrame(part):Subscribe(function(cframe)
+	local partBoundingBox = maid:Add(AdorneePartBoundingBox.new(part))
+	maid:GiveTask(partBoundingBox:ObserveCFrame():Subscribe(function(cframe)
 		self._bbCFrame.Value = cframe
 	end))
+	maid:GiveTask(partBoundingBox:ObserveSize():Subscribe(function(size)
+		self._bbSize.Value = size
+	end))
 
 	return maid
 end

package/src/Shared/AdorneeModelBoundingBox.lua

@@ -20,17 +20,10 @@ AdorneeModelBoundingBox.__index = AdorneeModelBoundingBox
 function AdorneeModelBoundingBox.new(model)
 	local self = setmetatable(BaseObject.new(model), AdorneeModelBoundingBox)
 
-	self._bbCFrame = ValueObject.new(nil)
-	self._maid:GiveTask(self._bbCFrame)
-
-	self._bbSize = ValueObject.new(nil)
-	self._maid:GiveTask(self._bbSize)
-
-	self._isDirty = ValueObject.new(false, "boolean")
-	self._maid:GiveTask(self._isDirty)
-
-	self._unanchoredPartsSet = ObservableSet.new(false)
-	self._maid:GiveTask(self._unanchoredPartsSet)
+	self._bbCFrame = self._maid:Add(ValueObject.new(nil))
+	self._bbSize = self._maid:Add(ValueObject.new(Vector3.zero, "Vector3"))
+	self._isDirty = self._maid:Add(ValueObject.new(false, "boolean"))
+	self._unanchoredPartsSet = self._maid:Add(ObservableSet.new(false))
 
 	self._maid:GiveTask(RxInstanceUtils.observeDescendantsBrio(self._obj, function(part)
 		return part:IsA("BasePart")
@@ -39,8 +32,7 @@ function AdorneeModelBoundingBox.new(model)
 			return
 		end
 
-		local maid = brio:ToMaid()
-		local part = brio:GetValue()
+		local maid, part = brio:ToMaidAndValue()
 
 		self:_handlePart(maid, part)
 	end))

package/src/Shared/AdorneePartBoundingBox.lua

@@ -0,0 +1,65 @@
+--[=[
+	@class AdorneePartBoundingBox
+]=]
+
+local require = require(script.Parent.loader).load(script)
+
+local RunService = game:GetService("RunService")
+
+local BaseObject = require("BaseObject")
+local ValueObject = require("ValueObject")
+local RxInstanceUtils = require("RxInstanceUtils")
+
+local AdorneePartBoundingBox = setmetatable({}, BaseObject)
+AdorneePartBoundingBox.ClassName = "AdorneePartBoundingBox"
+AdorneePartBoundingBox.__index = AdorneePartBoundingBox
+
+function AdorneePartBoundingBox.new(part)
+	assert(typeof(part) == "Instance" and part:IsA("BasePart"), "Bad part")
+
+	local self = setmetatable(BaseObject.new(part), AdorneePartBoundingBox)
+
+	self._bbCFrame = self._maid:Add(ValueObject.new(nil))
+	self._bbSize = self._maid:Add(ValueObject.new(Vector3.zero, "Vector3"))
+
+	self._maid:GiveTask(RxInstanceUtils.observePropertyBrio(self._obj, "Anchored", function(anchored)
+		return not anchored
+	end):Subscribe(function(brio)
+		if brio:IsDead() then
+			return
+		end
+
+		local maid = brio:ToMaid()
+		self:_setupUnanchoredLoop(maid)
+	end))
+
+	self._maid:GiveTask(self._obj:GetPropertyChangedSignal("Size"):Connect(function()
+		self._bbSize.Value = self._obj.Size
+	end))
+	self._maid:GiveTask(self._obj:GetPropertyChangedSignal("CFrame"):Connect(function()
+		self:_update()
+	end))
+
+	return self
+end
+
+function AdorneePartBoundingBox:_setupUnanchoredLoop(maid)
+	-- Paranoid
+	maid:GiveTask(RunService.Heartbeat:Connect(function()
+		self._bbCFrame.Value = self._obj.CFrame
+	end))
+end
+
+function AdorneePartBoundingBox:_update()
+	self._bbCFrame.Value = self._obj.CFrame
+end
+
+function AdorneePartBoundingBox:ObserveCFrame()
+	return self._bbCFrame:Observe()
+end
+
+function AdorneePartBoundingBox:ObserveSize()
+	return self._bbSize:Observe()
+end
+
+return AdorneePartBoundingBox