Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add temp. accuracy workaround to Move & Rotate #160

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open

fix: Add temp. accuracy workaround to Move & Rotate #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions Libraries/SupportLibrary.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,4 +826,29 @@ function SupportLibrary.CreateConsecutiveCallDeferrer(MaxInterval)

end

--[=[
Returns objectCFrame:ToObjectSpace(cframe), with each component
rounded to an identity CFrame if it's fuzzily equal.

TODO: Figure out a more elegant solution to this.
]=]
function SupportLibrary.ToObjectSpace(objectCFrame: CFrame, cframe: CFrame): CFrame
local identity = CFrame.identity
local offset = objectCFrame:ToObjectSpace(cframe)
return CFrame.fromMatrix(
if offset.Position:FuzzyEq(identity.Position)
then identity.Position
else offset.Position,
if offset.XVector:FuzzyEq(identity.XVector)
then identity.XVector
else offset.XVector,
if offset.YVector:FuzzyEq(identity.YVector)
then identity.YVector
else offset.YVector,
if offset.ZVector:FuzzyEq(identity.ZVector)
then identity.ZVector
else offset.ZVector
)
end

return SupportLibrary;
14 changes: 9 additions & 5 deletions Tools/Move/Util.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
local Tool = script.Parent.Parent.Parent

-- Libraries
local Libraries = Tool:WaitForChild("Libraries")
local Support = require(Libraries:WaitForChild("SupportLibrary"))

local function TranslatePartsRelativeToPart(BasePart, InitialPartStates, InitialModelStates)
-- Moves the given parts in `InitialStates` to BasePart's current position, with their original offset from it

-- Get focused part's position for offsetting
local RelativeTo = InitialPartStates[BasePart].CFrame:inverse()
local PivotCFrame = InitialPartStates[BasePart].CFrame

-- Calculate offset and move each part
for Part, InitialState in pairs(InitialPartStates) do

-- Calculate how far apart we should be from the focused part
local Offset = RelativeTo * InitialState.CFrame
local Offset = Support.ToObjectSpace(PivotCFrame, InitialState.CFrame)

-- Move relative to the focused part by this part's offset from it
Part.CFrame = BasePart.CFrame * Offset
Expand All @@ -17,7 +21,7 @@ local function TranslatePartsRelativeToPart(BasePart, InitialPartStates, Initial

-- Calculate offset and move each model
for Model, InitialState in pairs(InitialModelStates) do
local Offset = RelativeTo * InitialState.Pivot
local Offset = Support.ToObjectSpace(PivotCFrame, InitialState.Pivot)
Model.WorldPivot = BasePart.CFrame * Offset
end
end
Expand Down
4 changes: 2 additions & 2 deletions Tools/Move/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@ function MoveTool:MovePartsAlongAxesByFace(Face, Distance, InitialPartStates, In

-- Move parts based on initial offset from focus
for Part, InitialState in pairs(InitialPartStates) do
local FocusOffset = InitialFocusCFrame:toObjectSpace(InitialState.CFrame)
local FocusOffset = Support.ToObjectSpace(InitialFocusCFrame, InitialState.CFrame)
Part.CFrame = FocusCFrame * FocusOffset
end
for Model, InitialState in pairs(InitialModelStates) do
local FocusOffset = InitialFocusCFrame:ToObjectSpace(InitialState.Pivot)
local FocusOffset = Support.ToObjectSpace(InitialFocusCFrame, InitialState.Pivot)
Model.WorldPivot = FocusCFrame * FocusOffset
end

Expand Down
4 changes: 2 additions & 2 deletions Tools/Rotate.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ function RotateSelectionAroundPivot(PivotMode, PivotPoint, Axis, Rotation, Initi
local RelativeTo = PivotPoint * RotationCFrame;

-- Calculate this part's offset from the focused part's rotation
local Offset = PivotPoint:toObjectSpace(InitialState.CFrame);
local Offset = Support.ToObjectSpace(PivotPoint, InitialState.CFrame)

-- Rotate relative to the focused part by this part's offset from it
Part.CFrame = RelativeTo * Offset;
Expand All @@ -486,7 +486,7 @@ function RotateSelectionAroundPivot(PivotMode, PivotPoint, Axis, Rotation, Initi
local RelativeTo = PivotPoint * RotationCFrame

-- Calculate this part's offset from the focused part's rotation
local Offset = PivotPoint:ToObjectSpace(InitialState.Pivot)
local Offset = Support.ToObjectSpace(PivotPoint, InitialState.Pivot)

-- Rotate relative to the focused part by this model's offset from it
Model.WorldPivot = RelativeTo * Offset
Expand Down