BlackMATov/unity-flash-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-flash-tools.git synced 2026-03-22 12:55:32 +07:00
Code Issues Packages Projects Releases Wiki Activity

+ frame_rate

Browse Source
This commit is contained in:
Matvey Cherevko
2016-03-02 02:15:24 +06:00
parent 8da0d86018
commit 1d239b44f1
4 changed files with 28 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/FlashTools/Examples/Animations/Tests/0_keyframes.fla
View File

Binary file not shown.

41
Assets/FlashTools/Scripts/FlashAnim.cs
View File

@@ -183,14 +183,16 @@ namespace FlashTools {
}
void Update() {
_frame_timer += 25.0f * Time.deltaTime;
while ( _frame_timer > 1.0f ) {
_frame_timer -= 1.0f;
++_current_frame;
if ( _current_frame > frameCount - 1 ) {
_current_frame = 0;
if ( Asset ) {
_frame_timer += Asset.Data.FrameRate * Time.deltaTime;
while ( _frame_timer > 1.0f ) {
_frame_timer -= 1.0f;
++_current_frame;
if ( _current_frame > frameCount - 1 ) {
_current_frame = 0;
}
//Debug.LogFormat("Cur frame: {0}", _current_frame);
}
//Debug.LogFormat("Cur frame: {0}", _current_frame);
}
}
@@ -207,31 +209,6 @@ namespace FlashTools {
1.0f / Asset.PixelsPerUnit,
-1.0f / Asset.PixelsPerUnit,
1.0f / Asset.PixelsPerUnit)));
/*
if ( _vertices_arr.Length < _vertices.Count ) {
_vertices_arr = _vertices.ToArray();
} else {
_vertices.CopyTo(_vertices_arr);
}
if ( _triangles_arr.Length < _triangles.Count ) {
_triangles_arr = _triangles.ToArray();
} else {
_triangles.CopyTo(_triangles_arr);
}
if ( _uvs_arr.Length < _uvs.Count ) {
_uvs_arr = _uvs.ToArray();
} else {
_uvs.CopyTo(_uvs_arr);
}
var mesh = new Mesh();
mesh.vertices = _vertices_arr;
mesh.triangles = _triangles_arr;
mesh.uv = _uvs_arr;
mesh.RecalculateNormals();
GetComponent<MeshFilter>().mesh = mesh;*/
var mesh_filter = GetComponent<MeshFilter>();
if ( mesh_filter ) {
var mesh = mesh_filter.sharedMesh

7
Assets/FlashTools/Scripts/FlashAnimAsset.cs
View File

@@ -96,9 +96,10 @@ namespace FlashTools {
[System.Serializable]
public class FlashAnimData {
public FlashAnimSymbolData Stage = new FlashAnimSymbolData();
public FlashAnimLibraryData Library = new FlashAnimLibraryData();
public List<string> Strings = new List<string>();
public FlashAnimSymbolData Stage = new FlashAnimSymbolData();
public FlashAnimLibraryData Library = new FlashAnimLibraryData();
public List<string> Strings = new List<string>();
public int FrameRate = 24;
}
public class FlashAnimAsset : ScriptableObject {

21
Assets/FlashTools/Scripts/Internal/Editor/FlashAnimFtaPostprocessor.cs
View File

@@ -37,18 +37,27 @@ namespace FlashTools.Internal {
static FlashAnimData LoadFlashAnimFromFtaFile(string fta_path) {
try {
var fta_root_elem = XDocument.Load(fta_path).Document.Root;
var flash_anim_data = new FlashAnimData();
LoadFlashAnimStageFromFtaRootElem (fta_root_elem, flash_anim_data);
LoadFlashAnimLibraryFromFtaRootElem(fta_root_elem, flash_anim_data);
LoadFlashAnimStringsFromFtaRootElem(fta_root_elem, flash_anim_data);
return flash_anim_data;
return LoadFlashAnimDocFromFtaRootElem(
XDocument.Load(fta_path).Document.Root,
new FlashAnimData());
} catch ( Exception e ) {
Debug.LogErrorFormat("Parsing flash anim .fta file error: {0}", e.Message);
return null;
}
}
// -----------------------------
// Document
// -----------------------------
static FlashAnimData LoadFlashAnimDocFromFtaRootElem(XElement root_elem, FlashAnimData data) {
data.FrameRate = SafeLoadIntFromElemAttr(root_elem, "frame_rate", data.FrameRate);
LoadFlashAnimStageFromFtaRootElem (root_elem, data);
LoadFlashAnimLibraryFromFtaRootElem(root_elem, data);
LoadFlashAnimStringsFromFtaRootElem(root_elem, data);
return data;
}
// -----------------------------
// Stage
// -----------------------------