Skip to content

Scaling key frame time by frame rate. #9

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

Open
aschearer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Scaling key frame time by frame rate. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3c331c
Scaling key frame time by frame rate.
aschearer Feb 22, 2022
91081ca
Exposing property to set SpriteRenderer's material on import
aschearer Feb 25, 2022
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
8 changes: 7 additions & 1 deletion Aseprite2Unity/Assets/Aseprite2Unity/Editor/AsepriteImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ public class AsepriteImporter : ScriptedImporter, IAseVisitor
// Editor fields
public float m_PixelsPerUnit = 100.0f;
public SpriteAtlas m_SpriteAtlas;
public Material m_SpriteMaterial;
public float m_FrameRate = 60.0f;
public string m_SortingLayerName;
public int m_SortingOrder;
Expand Down Expand Up @@ -95,6 +96,11 @@ public void EndFileVisit(AseFile file)

var renderer = m_GameObject.AddComponent<SpriteRenderer>();
renderer.sprite = m_Sprites[0];
if (m_SpriteMaterial != null)
{
renderer.material = m_SpriteMaterial;
}

renderer.sortingLayerName = m_SortingLayerName;
renderer.sortingOrder = m_SortingOrder;

Expand Down Expand Up @@ -421,7 +427,7 @@ private void MakeAnimationClip(string name, bool isLooping, List<int> frameIndic
var key = new ObjectReferenceKeyframe();
key.time = time;
key.value = m_Sprites[frameIndex];
time += m_Frames[frameIndex].FrameDurationMs / 1000.0f;
time += (m_Frames[frameIndex].FrameDurationMs / 1000.0f) * (60f / clip.frameRate);

keys[i] = key;
}
Expand Down
3 changes: 3 additions & 0 deletions Aseprite2Unity/Assets/Aseprite2Unity/Editor/AsepriteImporterEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ public override void OnInspectorGUI()
EditorGUILayout.PropertyField(serializedObject.FindProperty("m_SpriteAtlas"),
new GUIContent("Sprite Atlas", "The sprites created by this import will be made part of this sprite atlas."));

EditorGUILayout.PropertyField(serializedObject.FindProperty("m_SpriteMaterial"),
new GUIContent("Sprite Material", "Material for the SpriteRenderer."));

DisplayStringChoiceProperty(serializedObject.FindProperty("m_SortingLayerName"),
SortingLayer.layers.Select(l => l.name).ToArray(),
new GUIContent("Sorting Layer", "Name of the SpriteRenderer's sorting layer."));
Expand Down