From 16367012ace0a2918276eb259a23e42542ccde60 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 22 Jul 2016 01:37:21 +0600 Subject: [PATCH] little clear code --- .../FlashTools/Examples/Scenes/Scene00.unity | 2 +- .../Editor/SwfTools/SwfContextExecuter.cs | 14 ++-- Assets/FlashTools/Scripts/SwfAnimation.cs | 69 ------------------- Assets/FlashTools/Shaders/FlashAnim.shader | 7 +- Assets/FlashTools/Shaders/FlashMask.shader | 2 +- Assets/FlashTools/Shaders/FlashMasked.shader | 2 +- 6 files changed, 14 insertions(+), 82 deletions(-) diff --git a/Assets/FlashTools/Examples/Scenes/Scene00.unity b/Assets/FlashTools/Examples/Scenes/Scene00.unity index 737ae8a..674532f 100644 --- a/Assets/FlashTools/Examples/Scenes/Scene00.unity +++ b/Assets/FlashTools/Examples/Scenes/Scene00.unity @@ -145,7 +145,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 2 + orthographic size: 5 m_Depth: -1 m_CullingMask: serializedVersion: 2 diff --git a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs index a05b557..5056234 100644 --- a/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs +++ b/Assets/FlashTools/Scripts/Internal/Editor/SwfTools/SwfContextExecuter.cs @@ -247,10 +247,9 @@ namespace FlashTools.Internal.SwfTools { public SwfDisplayList Visit(DefineSpriteTag tag, SwfDisplayList dl) { Debug.LogWarning(tag); - var define = new SwfLibrarySpriteDefine{ - ControlTags = tag.ControlTags - }; - MainContex.Library.Defines.Add(tag.SpriteId, define); + AddSpriteToLibrary( + tag.SpriteId, + tag.ControlTags); return dl; } @@ -285,5 +284,12 @@ namespace FlashTools.Internal.SwfTools { }; MainContex.Library.Defines.Add(define_id, define); } + + void AddSpriteToLibrary(ushort define_id, SwfControlTags control_tags) { + var define = new SwfLibrarySpriteDefine{ + ControlTags = control_tags + }; + MainContex.Library.Defines.Add(define_id, define); + } } } \ No newline at end of file diff --git a/Assets/FlashTools/Scripts/SwfAnimation.cs b/Assets/FlashTools/Scripts/SwfAnimation.cs index a6076a0..021e141 100644 --- a/Assets/FlashTools/Scripts/SwfAnimation.cs +++ b/Assets/FlashTools/Scripts/SwfAnimation.cs @@ -102,9 +102,6 @@ namespace FlashTools { _addcolors.Clear(); _groups.Clear(); - var last_group_id = 0; - var last_clip_depth = 0; - var frame = Asset.Data.Frames[currentFrame]; foreach ( var inst in frame.Instances ) { var bitmap = FindBitmap(inst.Bitmap); @@ -195,72 +192,6 @@ namespace FlashTools { _groups[_groups.Count - 1].Triangles.Add(_vertices.Count - 4 + 0); _groups[_groups.Count - 1].Triangles.Add(_vertices.Count - 4 + 3); _groups[_groups.Count - 1].Triangles.Add(_vertices.Count - 4 + 2); - - /* - if ( inst.ClipDepth != 0 ) { - ++last_group_id; - last_clip_depth = inst.ClipDepth; - - var gr = new Group(); - gr.Type = GroupType.Mask; - gr.Triangles = new List(); - _groups.Add(gr); - - //_triangles.Add(new List()); - //var material = new Material(Shader.Find("FlashTools/FlashMask")); - //material.SetTexture("_MainTex", Asset.Atlas); - //material.SetInt("_StencilID", last_group_id); - //materials.Add(material); - } else if ( inst.Depth < last_clip_depth ) { - if ( _groups.Count == 0 || _groups[_groups.Count - 1].Type != GroupType.Masked ) { - var gr = new Group(); - gr.Type = GroupType.Masked; - gr.Triangles = new List(); - _groups.Add(gr); - } - } else if ( (inst.Depth >= last_clip_depth && last_clip_depth > 0) || _groups.Count == 0 ) { - var gr = new Group(); - gr.Type = GroupType.Group; - gr.Triangles = new List(); - _groups.Add(gr); - }*/ - - /* - if ( inst.ClipDepth != 0 ) { - _triangles.Add(new List()); - ++last_group_id; - last_clip_depth = inst.ClipDepth; - var material = new Material(Shader.Find("FlashTools/FlashMask")); - material.SetTexture("_MainTex", Asset.Atlas); - material.SetInt("_StencilID", last_group_id); - materials.Add(material); - } else if ( inst.Depth < last_clip_depth ) { - var material = new Material(Shader.Find("FlashTools/FlashMasked")); - material.SetTexture("_MainTex", Asset.Atlas); - material.SetInt("_StencilID", last_group_id); - materials.Add(material); - } else if ( (inst.Depth >= last_clip_depth && last_clip_depth > 0) || materials.Count == 0 ) { - _triangles.Add(new List()); - ++last_group_id; - last_clip_depth = 0; - var material = new Material(Shader.Find("FlashTools/FlashAnim")); - material.SetTexture("_MainTex", Asset.Atlas); - material.SetInt("_StencilID", 0); - materials.Add(material); - }*/ - - /* - _triangles[_triangles.Count - 1].Add(_vertices.Count - 4 + 2); - _triangles[_triangles.Count - 1].Add(_vertices.Count - 4 + 1); - _triangles[_triangles.Count - 1].Add(_vertices.Count - 4 + 0); - _triangles[_triangles.Count - 1].Add(_vertices.Count - 4 + 0); - _triangles[_triangles.Count - 1].Add(_vertices.Count - 4 + 3); - _triangles[_triangles.Count - 1].Add(_vertices.Count - 4 + 2);*/ - - /* - if ( inst.ClipDepth != 0 ) { - _triangles.Add(new List()); - }*/ } } diff --git a/Assets/FlashTools/Shaders/FlashAnim.shader b/Assets/FlashTools/Shaders/FlashAnim.shader index f27b3e2..b0879bf 100644 --- a/Assets/FlashTools/Shaders/FlashAnim.shader +++ b/Assets/FlashTools/Shaders/FlashAnim.shader @@ -1,7 +1,6 @@ Shader "FlashTools/FlashAnim" { Properties { - [PerRendererData] _MainTex ("Main Texture", 2D ) = "white" {} - _StencilID ("Stencil ID" , Int) = 0 + [PerRendererData] _MainTex ("Main Texture", 2D) = "white" {} } SubShader { @@ -19,10 +18,6 @@ Shader "FlashTools/FlashAnim" { Blend One OneMinusSrcAlpha Pass { - Stencil { - Ref [_StencilID] - Comp always - } CGPROGRAM #pragma vertex vert #pragma fragment frag diff --git a/Assets/FlashTools/Shaders/FlashMask.shader b/Assets/FlashTools/Shaders/FlashMask.shader index 7a953c9..361b655 100644 --- a/Assets/FlashTools/Shaders/FlashMask.shader +++ b/Assets/FlashTools/Shaders/FlashMask.shader @@ -1,7 +1,7 @@ Shader "FlashTools/FlashMask" { Properties { [PerRendererData] _MainTex ("Main Texture", 2D ) = "white" {} - _StencilID ("Stencil ID" , Int) = 0 + [PerRendererData] _StencilID ("Stencil ID" , Int) = 0 } SubShader { diff --git a/Assets/FlashTools/Shaders/FlashMasked.shader b/Assets/FlashTools/Shaders/FlashMasked.shader index 9024b54..5cdc45a 100644 --- a/Assets/FlashTools/Shaders/FlashMasked.shader +++ b/Assets/FlashTools/Shaders/FlashMasked.shader @@ -1,7 +1,7 @@ Shader "FlashTools/FlashMasked" { Properties { [PerRendererData] _MainTex ("Main Texture", 2D ) = "white" {} - _StencilID ("Stencil ID" , Int) = 0 + [PerRendererData] _StencilID ("Stencil ID" , Int) = 0 } SubShader {