Skip to content

Commit

Permalink
Clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
Luca3317 committed Jan 7, 2025
1 parent 13325ae commit 71c2f9b
Show file tree
Hide file tree
Showing 83 changed files with 21 additions and 7,573 deletions.
8 changes: 4 additions & 4 deletions Package/Editor/GenericAnimation/GenericAnimationEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
using UnityEngine;

[CustomEditor(typeof(GenericAnimation))]
public class GenericAnimationEditor : BaseGenericAnimationEditor
internal class GenericAnimationEditor : BaseGenericAnimationEditor
{
}

[CustomEditor(typeof(GenericHideAnimation))]

Check notice on line 24 in Package/Editor/GenericAnimation/GenericAnimationEditor.cs

View check run for this annotation

codefactor.io / CodeFactor

Package/Editor/GenericAnimation/GenericAnimationEditor.cs#L24

File may only contain a single type. (SA1402)
public class GenericShowAnimationEditor : BaseGenericAnimationEditor
internal class GenericShowAnimationEditor : BaseGenericAnimationEditor
{
}

Check notice on line 28 in Package/Editor/GenericAnimation/GenericAnimationEditor.cs

View check run for this annotation

codefactor.io / CodeFactor

Package/Editor/GenericAnimation/GenericAnimationEditor.cs#L28

File may only contain a single type. (SA1402)
[CustomEditor(typeof(GenericShowAnimation))]
public class GenericHideAnimationEditor : BaseGenericAnimationEditor
internal class GenericHideAnimationEditor : BaseGenericAnimationEditor
{
}

Check notice on line 33 in Package/Editor/GenericAnimation/GenericAnimationEditor.cs

View check run for this annotation

codefactor.io / CodeFactor

Package/Editor/GenericAnimation/GenericAnimationEditor.cs#L33

File may only contain a single type. (SA1402)
public class BaseGenericAnimationEditor : TMPAnimationEditorBase
internal class BaseGenericAnimationEditor : TMPAnimationEditorBase
{
// private const string ExportPathKey = "TMPEffects.EditorPrefKeys.GenericAnimationExportPath";
// private static string exportPath = "Assets/Exported TMPEffects Animations";
Expand Down
2 changes: 1 addition & 1 deletion Package/Editor/TMPAnimation Editor/TMPAnimationEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
namespace TMPEffects.Editor
{
[CustomEditor(typeof(TMPAnimation), true)]
public class TMPAnimationEditor : TMPAnimationEditorBase
internal class TMPAnimationEditor : TMPAnimationEditorBase
{ }
}
8 changes: 6 additions & 2 deletions Package/Editor/TMPAnimation Editor/TMPAnimationEditorBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

namespace TMPEffects.Editor
{
public class TMPAnimationEditorBase : UnityEditor.Editor
internal class TMPAnimationEditorBase : UnityEditor.Editor
{
protected PreviewRenderUtility previewUtility;
protected GameObject targetObject;
Expand Down Expand Up @@ -112,14 +112,18 @@ public override void DrawPreview(Rect previewArea)
DrawPreviewBar();
}

public override void ReloadPreviewInstances()
{
}

protected virtual void UpdateAnimation()
{
if (!animate)
{
lastUpdateTime = Time.time;
return;
}

animator.UpdateAnimations(lastUpdateTime == -1f ? 0f : Time.time - lastUpdateTime);
lastUpdateTime = Time.time;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
namespace TMPEffects.Editor
{
[CustomEditor(typeof(TMPHideAnimation), true)]
public class TMPHideAnimationEditor : TMPAnimationEditorBase
internal class TMPHideAnimationEditor : TMPAnimationEditorBase
{
protected float restartDelay = 2f;
protected float timeDone;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
namespace TMPEffects.Editor
{
[CustomEditor(typeof(TMPSceneAnimation), true)]
public class TMPSceneAnimationEditor : TMPAnimationEditor
internal class TMPSceneAnimationEditor : TMPAnimationEditor
{ }
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
namespace TMPEffects.Editor
{
[CustomEditor(typeof(TMPSceneHideAnimation), true)]
public class TMPSceneHideAnimationEditor : TMPHideAnimationEditor
internal class TMPSceneHideAnimationEditor : TMPHideAnimationEditor
{ }
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
namespace TMPEffects.Editor
{
[CustomEditor(typeof(TMPSceneShowAnimation), true)]
public class TMPSceneShowAnimationEditor : TMPShowAnimationEditor
internal class TMPSceneShowAnimationEditor : TMPShowAnimationEditor
{ }
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace TMPEffects.Editor
{
[CustomEditor(typeof(TMPShowAnimation), true)]
public class TMPShowAnimationEditor : TMPAnimationEditorBase
internal class TMPShowAnimationEditor : TMPAnimationEditorBase
{
protected float restartDelay = 2f;
protected float timeDone = -1f;
Expand Down
2 changes: 1 addition & 1 deletion Package/Editor/Timeline/TMPAnimationClipInspectorEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public override void OnInspectorGUI()
EditorPrefs.SetBool(TMPEffectsTimelineEditorPrefsKeys.DRAW_CURVES_EDITORPREFS_KEY, set);

animation.objectReferenceValue =
EditorGUILayout.ObjectField("Animation Asset", animation.objectReferenceValue, typeof(ITMPAnimation));
EditorGUILayout.ObjectField("Animation Asset", animation.objectReferenceValue, typeof(ITMPAnimation), true);

entryCurve.isExpanded = EditorGUILayout.Foldout(entryCurve.isExpanded, "Entry");
if (entryCurve.isExpanded)
Expand Down
3 changes: 0 additions & 3 deletions Package/Editor/Timeline/TimelineAnimationStepDrawer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
[CustomPropertyDrawer(typeof(TimelineAnimationStep), false)]
public class TimelineAnimationStepDrawer : AnimationStepDrawer
{
private bool entry = false;


private SerializedProperty entryCurve;
private SerializedProperty exitCurve;
private SerializedProperty entryDuration;
Expand Down
8 changes: 0 additions & 8 deletions Package/Example SceneAnimations.meta

This file was deleted.

8 changes: 0 additions & 8 deletions Package/Example SceneAnimations/Basic.meta

This file was deleted.

161 changes: 0 additions & 161 deletions Package/Example SceneAnimations/Basic/DraggableAnimation.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Package/Example SceneAnimations/Basic/DraggableAnimation.cs.meta

This file was deleted.

Loading

0 comments on commit 71c2f9b

Please sign in to comment.