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.

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

Animation #47

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
b2b86ad
Added BezierEasing to allow Custom Easing Function
Kulltero Oct 31, 2022
2f08c9d
Fixed Class name
Kulltero Oct 31, 2022
c369398
Added a MouseListener Component
Kulltero Oct 31, 2022
d2754b0
Add the Animation Component
Kulltero Oct 31, 2022
cd23e8d
Added Animation, RectMask & Mask Components
Kulltero Oct 31, 2022
5d2e043
Added HasForCondition
Kulltero Oct 31, 2022
e3820e1
Uploaded Animation Test (Feature Showcase) & AnimationExample (usecas…
Kulltero Oct 31, 2022
470b173
Merge branch 'Facepunch:master' into Animation
Kulltero Nov 11, 2022
a0ea130
Implement IMouseListener in Animation behaviour
Kulltero Nov 11, 2022
dd756d3
Abstract receivers into an interface
Kulltero Nov 11, 2022
978c186
Refactor Code to support multiple Animation Components
Kulltero Nov 21, 2022
88a245f
Adjusted RPC call behaviour
Kulltero Nov 21, 2022
2b2bac3
test recreation for the latest test
Kulltero Nov 23, 2022
6768b67
Renaming, Refactoring based on Jake's Feedback
Kulltero Nov 28, 2022
0abb224
changed condition to trigger
Kulltero Dec 1, 2022
c36996e
Refactoring Initialization Logic
Kulltero Dec 18, 2022
bbe0b90
Major Refactor & Generalization
Kulltero Dec 25, 2022
d2f5bbf
Change to Structs (thanks @WheteThunger)
Kulltero Dec 26, 2022
cf46eb6
move Examples to folder
Kulltero Jan 5, 2023
d49f7f2
Added DynamicVector Capacity
Kulltero Jan 10, 2023
7f803e4
Comments, Cleanup & Merging Enable/DisableGraphic
Kulltero Jan 12, 2023
bc7679a
Merge branch 'master' into Animation
Kulltero May 14, 2023
00aa987
Removed Interface
Kulltero May 16, 2023
370f963
Changed MouseListener to work without interface
Kulltero May 16, 2023
5d055df
Made a single Animation Component handle all animations on an object …
Kulltero May 16, 2023
4a64bc4
Removed Support for Multiple Animation Components,
Kulltero May 16, 2023
1209381
Remove old FadeOut Component
Kulltero May 16, 2023
c7c100f
remove old meta file
Kulltero May 16, 2023
f0daa49
Updated Example for recent commits
Kulltero May 16, 2023
9aceac4
Fixed Animations not stopping
Kulltero May 17, 2023
4da3a1d
Indent fix
Kulltero May 17, 2023
7c9a981
Added maskSoftness to RectMask2D JSON api
Kulltero May 17, 2023
1feddd6
Fixed for update
Kulltero May 17, 2023
95e8c78
Delete Old incompatible example
Kulltero May 17, 2023
e09a937
FadeOut not FadeIn
Kulltero May 17, 2023
4f8d779
easing default fix
Kulltero May 17, 2023
eff31d5
Fix CanvasGroup sometimes not getting created
Kulltero May 19, 2023
e199196
Fix Mask & RectMask2D cases
Kulltero Aug 13, 2023
93bd1d7
Client Test changes
Kulltero Aug 14, 2023
1fd91f3
Fix culture dependant float parsing
Kulltero Aug 22, 2023
e262652
Fix RawImage sprite
Kulltero Aug 22, 2023
341b9e0
Fix Invalid JSON
Kulltero Aug 22, 2023
af91ea0
continue instead of return
Kulltero Aug 22, 2023
f7606ae
Simplified Bezier Easing Implementation
Kulltero Aug 23, 2023
88657c8
Comment fixes
Kulltero Aug 23, 2023
6f7c165
add == operator overrides
Kulltero Aug 23, 2023
56e28c7
Refactor to use BezierPoints
Kulltero Aug 23, 2023
5d020b9
Update CommunityEntity.UI.Animation.cs
Kulltero Aug 25, 2023
f3d5fc9
Update ParseAnimation Class
Kulltero Aug 25, 2023
d61c8bd
Fix not supplying panel to OnDrag Trigger start
Kulltero Oct 4, 2023
817502d
add shouldRaycast to graphic
Kulltero Oct 11, 2023
0c655c8
Re-Introduce shouldRaycast tracking
Kulltero Oct 11, 2023
9ca0603
Merge branch 'master' into Animation
Kulltero Jul 7, 2024
377aab8
Move examples into Test folder
Kulltero Jul 7, 2024
f1964d9
Merge branch 'master' into Animation
Kulltero Aug 30, 2024
ca639b4
Merge branch 'master' into Animation
Kulltero Feb 7, 2025
3edde1e
Minor Cleanup
Kulltero Feb 7, 2025
e61d304
Comment out DragNDrop integrations
Kulltero Feb 7, 2025
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
Prev Previous commit
Next Next commit
Fix Mask & RectMask2D cases
fixed wrong type an AddComponent
made both cases Update compliant
Kulltero authored Aug 13, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit e19919606440948b074f1012cbcb33949f7c943a
15 changes: 9 additions & 6 deletions CommunityEntity.UI.cs
Original file line number Diff line number Diff line change
@@ -436,20 +436,23 @@ T GetOrAddComponent<T>() where T : Component
}
case "UnityEngine.UI.RectMask2D":
{
var c = GetOrAddComponent<NeedsKeyboard>();
if( ShouldUpdateField("maskSoftness") )
c.softness = Vector2Int.RoundToInt(Vector2Ex.Parse( obj.GetString( "maskSoftness", "0.0 0.0" )));
var c = GetOrAddComponent<RectMask2D>();
if( ShouldUpdateField("maskSoftness") )
c.softness = Vector2Int.RoundToInt(Vector2Ex.Parse( obj.GetString( "maskSoftness", "0.0 0.0" )));

HandleEnableState( obj, c );
break;
}
case "UnityEngine.UI.Mask":
{
var c = go.AddComponent<Mask>();
c.showMaskGraphic = obj.GetBoolean("showMaskGraphic", true);
var c = GetOrAddComponent<Mask>();
if( ShouldUpdateField("showMaskGraphic") )
c.showMaskGraphic = obj.GetBoolean("showMaskGraphic", true);

HandleEnableState( obj, c );
break;
}
case "Animation":
case "Animation":
{
// Moved Setup to its own function in CommunityEntity.UI.Animation.cs
// now shares the code with the AddAnimation RPC function