BlackMATov/unity-flash-tools
1
0
Fork 0
mirror of https://github.com/BlackMATov/unity-flash-tools.git synced 2026-01-04 23:46:51 +07:00
Code Issues Packages Projects Releases Wiki Activity

hide materials fix. animation properties fixes

Browse Source
This commit is contained in:
Matvey Cherevko
2016-08-28 19:55:22 +07:00
parent 411673578a
commit 31b30e42c3
3 changed files with 43 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/FlashTools/Scripts/Internal/Editor/SwfAnimationAssetPostprocessor.cs
View File

@@ -273,6 +273,7 @@ namespace FlashTools.Internal {
group.Type));
}
if ( group.Material ) {
group.Material.hideFlags = HideFlags.HideInInspector;
baked_materials.Add(group.Material);
} else {
throw new UnityException(string.Format(

3
Assets/FlashTools/Scripts/Internal/SwfConverterSettings.cs
View File

@@ -69,9 +69,6 @@ namespace FlashTools.Internal {
"SwfManager. Material not found: {0}",
path));
}
if ( material ) {
material.hideFlags = HideFlags.HideInInspector;
}
return material;
}

59
Assets/FlashTools/Scripts/SwfAnimation.cs
View File

@@ -6,8 +6,9 @@ namespace FlashTools {
[RequireComponent(typeof(MeshFilter), typeof(MeshRenderer))]
public class SwfAnimation : MonoBehaviour {
MeshFilter _meshFilter = null;
MeshRenderer _meshRenderer = null;
MeshFilter _meshFilter = null;
MeshRenderer _meshRenderer = null;
MaterialPropertyBlock _matPropBlock = null;
// ---------------------------------------------------------------------
//
@@ -109,18 +110,39 @@ namespace FlashTools {
//
// ---------------------------------------------------------------------
void UpdateAllProperties() {
asset = _asset;
currentFrame = _currentFrame;
sortingLayer = _sortingLayer;
sortingOrder = _sortingOrder;
}
void UpdateMaterialPropertyBlock() {
if ( _matPropBlock != null ) {
var atlas = asset && asset.Atlas ? asset.Atlas : null;
if ( atlas ) {
_matPropBlock.SetTexture("_MainTex", atlas);
} else {
_matPropBlock.Clear();
}
if ( _meshRenderer ) {
_meshRenderer.SetPropertyBlock(_matPropBlock);
}
}
}
void ChangeSortingProperties() {
_meshRenderer.sortingOrder = sortingOrder;
_meshRenderer.sortingLayerName = sortingLayer;
if ( _meshRenderer ) {
_meshRenderer.sortingOrder = sortingOrder;
_meshRenderer.sortingLayerName = sortingLayer;
}
}
void ChangeAsset() {
_meshRenderer.enabled = !!asset;
if ( asset ) {
var prop_block = new MaterialPropertyBlock();
prop_block.SetTexture("_MainTex", asset.Atlas);
_meshRenderer.SetPropertyBlock(prop_block);
if ( _meshRenderer ) {
_meshRenderer.enabled = !!asset;
}
UpdateMaterialPropertyBlock();
UpdateCurrentMesh();
}
@@ -132,9 +154,13 @@ namespace FlashTools {
}
void UpdateCurrentMesh() {
var baked_frame = GetCurrentBakedFrame();
_meshFilter.sharedMesh = baked_frame.Mesh;
_meshRenderer.sharedMaterials = baked_frame.Materials;
var baked_frame = GetCurrentBakedFrame();
if ( _meshFilter ) {
_meshFilter.sharedMesh = baked_frame.Mesh;
}
if ( _meshRenderer ) {
_meshRenderer.sharedMaterials = baked_frame.Materials;
}
}
SwfAnimationAsset.Frame GetCurrentBakedFrame() {
@@ -152,6 +178,8 @@ namespace FlashTools {
void Awake() {
_meshFilter = GetComponent<MeshFilter>();
_meshRenderer = GetComponent<MeshRenderer>();
_matPropBlock = new MaterialPropertyBlock();
UpdateAllProperties();
}
void OnEnable() {
@@ -170,14 +198,11 @@ namespace FlashTools {
#if UNITY_EDITOR
void Reset() {
OnValidate();
UpdateAllProperties();
}
void OnValidate() {
asset = _asset;
currentFrame = _currentFrame;
sortingLayer = _sortingLayer;
sortingOrder = _sortingOrder;
UpdateAllProperties();
}
#endif
}