Merge pull request #12 from MiaGobble/SPHI-13-Extended-Functionality

Extended functionality

src/Components/Animation/Spring.lua

@@ -108,6 +108,25 @@ function Spring:__call(Value : any, Speed : number, Dampening : number) : Spring
                 return PackType(PackedValues, ValueType)
             elseif Index == "Changed" then
                 return ChangedSignal
+            elseif Index == "Impulse" then
+                return function(self, AmountValue : any)
+                    local UnpackedAmount = UnpackType(AmountValue, ValueType)
+
+                    for Index, Spring in ipairs(UnpackedSprings) do
+                        local Amount = UnpackedAmount[Index]
+                        local Position, Velocity = GetPositionDerivative(Speed, Dampening, Spring.Position0, Spring.Coordinate1, Spring.Coordinate2, Spring.Tick0)
+
+                        Spring.Tick0, Spring.Coordinate1 = os.clock(), Position
+
+                        if (Dampening >= 1) then
+                            Spring.Coordinate2 = Spring.Coordinate1 + (Velocity + Amount) / Speed
+                        else
+                            local High = math.sqrt(1 - Dampening * Dampening)
+
+                            Spring.Coordinate2 = Dampening / High * Spring.Coordinate1 + (Velocity + Amount) / (Speed * High)
+                        end
+                    end
+                end
             end
 
             return nil
@@ -133,6 +152,18 @@ function Spring:__call(Value : any, Speed : number, Dampening : number) : Spring
                         Spring.Coordinate2 = Dampening / High * Spring.Coordinate1 + Velocity / (Speed * High)
                     end
                 end
+            elseif Index == "Value" then
+                local UnpackedNewValue = UnpackType(NewValue, ValueType)
+
+                for Index, Spring in ipairs(UnpackedSprings) do
+                    Spring.Position0 = UnpackedNewValue[Index]
+                    Spring.Coordinate1, Spring.Coordinate2, Spring.Velocity = 0, 0, 0
+                    Spring.Tick0 = os.clock()
+                end
+            elseif Index == "Dampening" then
+                Dampening = NewValue
+            elseif Index == "Speed" then
+                Speed = NewValue
             end
         end,
 
@@ -159,6 +190,8 @@ end
 function Spring:__index(Index : string)
     if Index == "__SEAM_OBJECT" then
         return "Spring"
+    elseif Index == "__SEAM_CAN_BE_SCOPED" then
+        return true
     else
         return nil
     end

src/Components/Animation/Tween.lua

@@ -95,6 +95,16 @@ function Tween:__call(Value : any, TweenInformation : TweenInfo) : TweenInstance
                     Tween.Position1 = UnpackedTargetValue[Index]
                     Tween.Tick0 = os.clock()
                 end
+            elseif Index == "Value" then
+                local UnpackedValue = UnpackType(NewValue, ValueType)
+
+                for Index, Tween in ipairs(UnpackedTweens) do
+                    Tween.Position0 = UnpackedValue[Index]
+                    Tween.Position1 = UnpackedValue[Index]
+                    Tween.Tick0 = os.clock()
+                end
+            elseif Index == "TweenInformation" then
+                TweenInformation = NewValue
             end
         end,
 
@@ -121,6 +131,8 @@ end
 function Tween:__index(Index : string)
     if Index == "__SEAM_OBJECT" then
         return "Tween"
+    elseif Index == "__SEAM_CAN_BE_SCOPED" then
+        return true
     else
         return nil
     end

src/Components/Children.lua

@@ -33,6 +33,8 @@ end
 function Children:__index(Index : string)
     if Index == "__SEAM_INDEX" then
         return "Children"
+    elseif Index == "__SEAM_CAN_BE_SCOPED" then
+        return false
     else
         return nil
     end

src/Components/Computed.lua

@@ -44,7 +44,7 @@ function Computed:__call(Callback : () -> any?)
 
         __index = function(_, Index : string)
             if Index == "__SEAM_OBJECT" then
-                return "Computed"
+                return "ComputedInstance"
             elseif Index == "Value" then
                 return Callback()
             end
@@ -56,6 +56,20 @@ function Computed:__call(Callback : () -> any?)
     return ActiveComputation :: ComputedInstance
 end
 
+--[=[
+    @ignore
+]=]
+
+function Computed:__index(Key : string)
+    if Key == "__SEAM_INDEX" then
+        return "Computed"
+    elseif Key == "__SEAM_CAN_BE_SCOPED" then
+        return true
+    else
+        return nil
+    end
+end
+
 local Meta = setmetatable({}, Computed)
 
 return Meta :: ComputedConstructor

src/Components/DeclareComponent.lua

@@ -26,6 +26,14 @@ function DeclareComponent:__call(ComponentName : string, Constructor : Component
     ComponentsManager:PushComponent(ComponentName, Constructor)
 end
 
+function DeclareComponent:__index(Key : string)
+    if Key == "__SEAM_CAN_BE_SCOPED" then
+        return false
+    end
+
+    return nil
+end
+
 local Meta = setmetatable({}, DeclareComponent)
 
 return Meta :: DeclareComponent

src/Components/From.lua

@@ -32,4 +32,12 @@ function From:__call(ComponentName : string, ... : any)
     }
 end
 
+function From:__index(Key : string)
+    if Key == "__SEAM_CAN_BE_SCOPED" then
+        return false
+    end
+
+    return nil
+end
+
 return setmetatable({}, From)

src/Components/New.lua

@@ -61,6 +61,8 @@ end
 function New:__index(Index : string)
     if Index == "__SEAM_OBJECT" then
         return "New"
+    elseif Index == "__SEAM_CAN_BE_SCOPED" then
+        return true
     else
         return nil
     end

src/Components/OnChanged.lua

@@ -20,6 +20,8 @@ end
 function OnChanged:__index(Index : string)
     if Index == "__SEAM_INDEX" then
         return "OnChanged"
+    elseif Index == "__SEAM_CAN_BE_SCOPED" then
+        return false
     else
         return nil
     end

src/Components/OnEvent.lua

@@ -31,4 +31,12 @@ function OnEvent:__call(EventName : string)
     return EventBinding
 end
 
+function OnEvent:__index(Index : string)
+    if Index == "__SEAM_CAN_BE_SCOPED" then
+        return false
+    else
+        return nil
+    end
+end
+
 return setmetatable({}, OnEvent)

src/Components/Scope.lua

@@ -24,6 +24,8 @@ local Janitor = require(Modules.Janitor)
     @param Callback (self : Instance, PropertyName : string) -> any? -- The function to compute the value
 ]=]
 
+local Meta = setmetatable({}, Scope)
+
 function Scope:__call(ScopedObjects)
     local selfClass = {}
     local selfMeta = {}
@@ -35,8 +37,13 @@ function Scope:__call(ScopedObjects)
             return self[Key]
         end
 
-        if typeof(Object) ~= "table" then
-            error("Object is not a valid Seam object")
+        if typeof(Object) ~= "table" or not Object.__SEAM_CAN_BE_SCOPED then
+            if Object.__SEAM_OBJECT or Object.__SEAM_INDEX then
+                error((Object.__SEAM_OBJECT or Object.__SEAM_INDEX) .. " is not a valid scopable Seam object")
+            else
+                error("Object is not a valid scopable Seam object")
+            end
+
             return
         end
 
@@ -47,14 +54,29 @@ function Scope:__call(ScopedObjects)
                 return
             end
 
-            for Index, Value in ipairs(Tuple) do
+            for _, Value in ipairs(Tuple) do
                 self.Janitor:Add(Value)
             end
 
             return unpack(Tuple)
         end
     end
 
+    function selfClass:InnerScope()
+        local NewScope = Meta(ScopedObjects)
+        self.Janitor:Add(NewScope)
+        return NewScope
+    end
+
+    function selfClass:AddObject(Object : any)
+        self.Janitor:Add(Object)
+    end
+
+    function selfClass:RemoveObject(Object : any)
+        Object:Destroy()
+        self.Janitor[Object] = nil
+    end
+
     function selfClass:Destroy()
         self.Janitor:Destroy()
         self.Janitor = nil
@@ -68,6 +90,14 @@ function Scope:__call(ScopedObjects)
     return Object
 end
 
-local Meta = setmetatable({}, Scope)
+function Scope:__index(Key : string)
+    if Key == "__SEAM_OBJECT" then
+        return "Scope"
+    elseif Key == "__SEAM_CAN_BE_SCOPED" then
+        return true
+    else
+        return nil
+    end
+end
 
 return Meta :: ScopeConstructor

src/Components/Value.lua

@@ -81,6 +81,20 @@ function Value:__call(Value : any)
     return ActiveValue :: ValueInstance
 end
 
+--[=[
+    @ignore
+]=]
+
+function Value:__index(Index : string)
+    if Index == "__SEAM_INDEX" then
+        return "Value"
+    elseif Index == "__SEAM_CAN_BE_SCOPED" then
+        return true
+    else
+        return nil
+    end
+end
+
 local Meta = setmetatable({}, Value)
 
 return Meta :: ValueConstructor