From b096766fe571957493bf461a1045dd4c74415601 Mon Sep 17 00:00:00 2001 From: NathanSweet Date: Mon, 3 Jun 2013 21:18:12 +0200 Subject: [PATCH] Compute scale using sprite collection's target ortho size. Removed scale from skeletondata asset. --- spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs | 8 +++----- .../tk2dSpineSkeletonDataAssetInspector.cs | 3 --- spine-tk2d/Example/Example.unity | Bin 19464 -> 21180 bytes .../SpineboyAtlas Data/SpineboyAtlas.prefab | Bin 18384 -> 18384 bytes .../Spineboy/Atlas/SpineboyAtlas.prefab | Bin 22312 -> 22312 bytes .../Skeleton/SpineboySkeletonAsset.asset | Bin 4204 -> 4244 bytes 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs b/spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs index eafa1e616..c6382f26c 100644 --- a/spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs +++ b/spine-tk2d/Code/tk2dSpineSkeletonDataAsset.cs @@ -8,9 +8,7 @@ public class tk2dSpineSkeletonDataAsset : ScriptableObject { public tk2dSpriteCollection.NormalGenerationMode normalGenerationMode = tk2dSpriteCollection.NormalGenerationMode.None; public TextAsset skeletonJSON; - - public float scale = 1; - + public string[] fromAnimation; public string[] toAnimation; public float[] duration; @@ -44,8 +42,8 @@ public class tk2dSpineSkeletonDataAsset : ScriptableObject { } SkeletonJson json = new SkeletonJson(new tk2dSpineAttachmentLoader(spritesData)); - json.Scale = scale; - + json.Scale = 1.0f / (spritesData.invOrthoSize * spritesData.halfTargetHeight); + try { skeletonData = json.ReadSkeletonData(new StringReader(skeletonJSON.text)); } catch (Exception ex) { diff --git a/spine-tk2d/Editor/tk2dSpineSkeletonDataAssetInspector.cs b/spine-tk2d/Editor/tk2dSpineSkeletonDataAssetInspector.cs index cc97f67ce..b04e839bf 100644 --- a/spine-tk2d/Editor/tk2dSpineSkeletonDataAssetInspector.cs +++ b/spine-tk2d/Editor/tk2dSpineSkeletonDataAssetInspector.cs @@ -11,7 +11,6 @@ public class tk2dSpineSkeletonDataAssetInspector : Editor { /* */ private SerializedProperty skeletonJSON; - private SerializedProperty scale; private SerializedProperty fromAnimation; private SerializedProperty toAnimation; private SerializedProperty duration; @@ -34,7 +33,6 @@ public class tk2dSpineSkeletonDataAssetInspector : Editor { } skeletonJSON = serializedObject.FindProperty("skeletonJSON"); - scale = serializedObject.FindProperty("scale"); fromAnimation = serializedObject.FindProperty("fromAnimation"); toAnimation = serializedObject.FindProperty("toAnimation"); duration = serializedObject.FindProperty("duration"); @@ -65,7 +63,6 @@ public class tk2dSpineSkeletonDataAssetInspector : Editor { } EditorGUILayout.PropertyField(skeletonJSON); - EditorGUILayout.PropertyField(scale); SkeletonData skeletonData = asset.GetSkeletonData(); if(skeletonData != null) { diff --git a/spine-tk2d/Example/Example.unity b/spine-tk2d/Example/Example.unity index 5894de0582d3e5d2fcdebaeb73a4271dd9c8d324..702f61b67efaec80caa91dbd37830075a0af1921 100644 GIT binary patch delta 1231 zcmZvaUr1AN6vuzpZT?ATZisGbw2?wYPOVWw$YzdRx2v{I$u`;Kl!*OV|gZ;{8v*sIiNBT~=%aESaSqw`jT)K3|m}%O71bKr> zL>W1k7@1_p=PoWR=B2{c=w42K<_0yd= z+!t5F$?-%~R>QeS4WcBJ#oY8^Oo>w&J&AZqP0Dcc)tK_ZT&AF<7BZtzC8Z?dp0FAo zR$=67GZ$?jlaKGwr{5g-VilVB6HjDX{Nc8?h%fz5+8!?tVM2et+lgkP^|KbS?wrda@h`b;_iIHto?Vbjz|XG%@lQy;s0y!D7g()$}UZHkb|mNlmYTSqynLg!|bL0@vw44Nk!)odXMk zd0_w4UiY;1!-WN~;%=>i1xj}ovqpJf#V>vawhh*d^9r4L9ssnJ?QG#X*ce!Gt6zZ4 zgSoM}Fp>?hk6^{!GVnQX10VGs6c!I z5X9bG+p#d32hE0r=0z2f&^&3bBsA}WP5%QGLPGxwjf#Xu$ld-RZx{7?`nmXLshPKk z79%-AK8Xo@McQXACip$r=H#PXT*og;ZTZc1aW76Xepm#wDl!cPU~{41wUs4fUP9qvNnoRF94&Ov#94y>3NTx zXczt8Fc)x-aQ}z7gp)B@7|&ITT*1x3)qxd}Yq&i)KiJxb^^F_2ESv}Zr&;qWZz0_h zQ5R&lh{V?e)vmM1!+UCGa$vcbZ9lPww2kWluPeHh=qMR-^env%r5EEblASAB1@F>| zjk|!#jM4sk#y@l?ZwuD5Ts{`mxUPr!WvG-lhKBR73X%(DoT&jjd9&ugJzo+2lAa^S PxMJ^|4Yo3gw-0LH3>JDP diff --git a/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab b/spine-tk2d/Example/Spineboy/Atlas/SpineboyAtlas Data/SpineboyAtlas.prefab index 04503b94395a965326e7b53710ecef044dd2180c..edc774a6060fe6c4c37e59586a8ec3d34dfa7399 100644 GIT binary patch delta 2788 zcmcguJ!lj`6rM}sFIS`pk$}Qgf<#U5Ur+CL=lmgvASuKy3n>g3NE+)qIV^<31m_AB zgsUvXK!`*Oh3p-I1{4p=U=c`Rlh(pN@cqs1%-z{KaM^Fa_h!B~Z{EC3dm+se)&c`=?=o znU~xX-<5l<3g-RTinnh}d(huI1jpuu5Dm6eP~{NfA($_id6s29G}nV+^K*QqW8YIC zSnDmCOKqNLya9sQ7GnX*^!+XMqCO97Zg^h<8{~;$9#LFdx?bx~mZAL42kT%m42n!-_#VGMc2Un0iIyPTx z3)X}m4m`9J!==WCB)r8$*gftkYIV0@wokqAs|ua}RmzUd3j{lsO)z#cif&C|zQn^qLeO)3o%1iCn|>MSOL6R|ThSkUT+xq223 zJeYt3$D(i#L7W|%ryZ<=#sScW5v+qof{|x!=0h`k?!zpcDpaqG=!S;H;AaJU+dM(_ z1;mnT3j%_fr?vR>v)C`&5jX(pew##`9;wY2!EcfM9@Ri3!N|iq4&p=8KK~J#LLEBT zy0a5@p}&p|Cc*CI1Bf4i{ zaNy1bBadff`2;h=U)-9>7nf#W-hZi6X!#wrvUv*vcH6E~D~`?EFm(jE3;|v$!OZi9 zna5)sHc!G=Wp9VHuq{r^hO>LId4lx)+~y49jSCVCw*gud4!VhgiLfmxgqBn{pY;;P z0A*seUWaP)V(*iVQ=1ou8f(Idava!pEk<5iI<;eqy*OsfuTqoSf9|oPD^B>p_AfS1 z7u$bsq(z>%c8ZawwMZYZ*?;MsY*ZE=e*kx&-w||9*s*znc>8U;#edQ)W}XwyJY$i< dl7`mza_aJqO!iyhOGay}Ni%;X`U`<{vtSv=Us5i|%WY zD;J?4nnB?cg{T(ymC#CP;i^?TSN#C{&Y2(gT=6ZtaJ`@3nK|E?GiT1c?b){N*|z2N z{;AC@8&KhykD6H)(Z5IVwz4&|u|ax|VoW_f+W>CRoFwVRe2X2=z8ue(#?eD_r`4Pp zJh#R%KT(?d8W(Yy9TiRp@$P?ttc$IpY z?qIIPj%QzvkIZy7s)Clsm%67`Pe56h4+PrGk0>=D+u@9PkIX*IFy;&%1rFK!6?}8vL)EBn29TfB# zrH%BM0x3B`;yw0@up8WGrb=7YX4Z}b&jejRhQ87!buk_ZZg1EzGe~g2#IrB*N!ZL^ zX-+lm;jJaTsQjL=nXGk)O={JWg$BJe7GE6xfE)Y!uULzCkJ%^w*fpLQuBd0R`FVA* zP*tb|Ow3DJR+Y5LK&WH+1XIWI*zp{Q;~C39rqy?I<{Ec0?qXCy&1{j!`RekUEp0`8 zI?bV?3e|ewjPhx2jrq#x*V$+d=&}`bwMB*4khbeyrOu1{whq zKP31e^KjtvLz&QK*4^?5OPds|rzt8a99tyIV#m7#+v^DZavNow(V#*`DJpuTO^N_R zWUOJwjA4Gj#IrB@(rdPdGBkw=)UPSlFH6uxm)kHwT!1^+w$2S2W*bMq#IrBQ$L4QT zYzp=CHukD32vS<}I>~KPu$FwpZI`-LWoRlE6JOHCttvxPu-L^PZo9$ZrO905|JEs5 zez8{SX&*A2w_RCB(pFsXLO2+7sQe+JPT||G<7peaOnu}nb%Ssc$uVW&u#@O*Qjpp! z9CC)~#0iYku)rB6-eZ~JiW)&nnloQ3OH;dIH*3jr%%t9LE>5T91kM zEuDCei*ZbvKclw&D^(4;ehhulzQJ3Y)TQ>1D~WZj?|_Mq?A#fAcO%n%8K-Ps%D$V!go%NHfdz=m6LYdbbXI9@0Za_UhRK1% KX3d;w2f_fwi4vax delta 37 jcmbQD_(p+)fr0%o1A{=$Mvgh`j5(W^vhU{LVL$=^vCRi3