UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] SpineEditorUtilities fixes.

Browse Source
This commit is contained in:
John 2016-12-03 05:58:35 +08:00 committed by GitHub
parent dfd0410acb
commit ac7979721a
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
spine-unity/Assets/spine-unity/Editor/SpineEditorUtilities.cs
View File

@ -1079,7 +1079,7 @@ namespace Spine.Unity.Editor {
AssetDatabase.CreateAsset(skeletonDataAsset, filePath); AssetDatabase.CreateAsset(skeletonDataAsset, filePath);
AssetDatabase.SaveAssets(); AssetDatabase.SaveAssets();
} else { } else {
skeletonDataAsset.Reset(); skeletonDataAsset.Clear();
skeletonDataAsset.GetSkeletonData(true); skeletonDataAsset.GetSkeletonData(true);
} }
@ -1312,16 +1312,16 @@ namespace Spine.Unity.Editor {
anim.skeletonDataAsset = skeletonDataAsset; anim.skeletonDataAsset = skeletonDataAsset;
// Detect "Lit" shader and automatically enable calculateNormals. // Detect "Lit" shader and automatically enable calculateNormals.
bool requiresNormals = false; // bool requiresNormals = false;
foreach (AtlasAsset atlasAsset in anim.skeletonDataAsset.atlasAssets) { // foreach (AtlasAsset atlasAsset in anim.skeletonDataAsset.atlasAssets) {
foreach (Material m in atlasAsset.materials) { // foreach (Material m in atlasAsset.materials) {
if (m.shader.name.Contains("Lit")) { // if (m.shader.name.Contains("Lit")) {
requiresNormals = true; // requiresNormals = true;
break; // break;
} // }
} // }
} // }
anim.calculateNormals = requiresNormals; // anim.calculateNormals = requiresNormals;
SkeletonData data = skeletonDataAsset.GetSkeletonData(true); SkeletonData data = skeletonDataAsset.GetSkeletonData(true);
if (data == null) { if (data == null) {
@ -1352,8 +1352,9 @@ namespace Spine.Unity.Editor {
static void EnableTK2D () { static void EnableTK2D () {
bool added = false; bool added = false;
foreach (BuildTargetGroup group in System.Enum.GetValues(typeof(BuildTargetGroup))) { foreach (BuildTargetGroup group in System.Enum.GetValues(typeof(BuildTargetGroup))) {
if (group == BuildTargetGroup.Unknown) int gi = (int)group;
if (gi == 15 || gi == 16 || group == BuildTargetGroup.Unknown)
continue; continue;
string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group); string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group);
@ -1379,6 +1380,10 @@ namespace Spine.Unity.Editor {
static void DisableTK2D () { static void DisableTK2D () {
bool removed = false; bool removed = false;
foreach (BuildTargetGroup group in System.Enum.GetValues(typeof(BuildTargetGroup))) { foreach (BuildTargetGroup group in System.Enum.GetValues(typeof(BuildTargetGroup))) {
int gi = (int)group;
if (gi == 15 || gi == 16 || group == BuildTargetGroup.Unknown)
continue;
string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group); string defines = PlayerSettings.GetScriptingDefineSymbolsForGroup(group);
if (defines.Contains(SPINE_TK2D_DEFINE)) { if (defines.Contains(SPINE_TK2D_DEFINE)) {
removed = true; removed = true;