From c8c2846808553b226afe25e0ca983f97098849ee Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 10 Sep 2014 16:11:09 +0100 Subject: [PATCH] Updated Sequence editor to use serialised property --- Assets/Example/Scenes/Example.unity | Bin 128204 -> 128404 bytes .../FungusScript/Editor/FungusScriptEditor.cs | 2 -- .../FungusScript/Editor/FungusScriptWindow.cs | 4 +-- .../FungusScript/Editor/SequenceEditor.cs | 33 ++++++++---------- .../Fungus/FungusScript/Scripts/Sequence.cs | 3 ++ 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/Assets/Example/Scenes/Example.unity b/Assets/Example/Scenes/Example.unity index f564160db9941f4299691826383255d2b1fb9a01..2f4d97401a9c36af371936aae8a6afcfd513e151 100644 GIT binary patch delta 4575 zcmY+{dvsLA9l-Iq5X;&I*wRoUP3s~EX$yrDZ5xY^<-Js(i-Zs)A|Y&8LVzU?Su}7r zkVp_(*KTCPtET!#b5N2{t;w;7k%FX@gDF_aIW4$|MNnyDTT85u^gG#^Fqe}dyPy5d zAh)oB#lrfeP6%-`uOo-tqYk|Ir2F*1Snt8s)Uv?(ion{!z`TMr zf!OO!kyvE%pxDbzZfjKR&)(6o%I4Hq<;dZ&{rsL6cEwsI42hlbq{XH*kFai!&8-@3 zjg76Z^2D~knHKx~ZK<(Wn}@~Dq%M7NLd%rr>?l+Ir?DUYOD*}$@_#5w){_&fWa|B z%;ELNs&nOurm=0rZM(-sunL0o#CxzFtQt$GwpYfD6T-{;FV&*=VeQy-4C>43e$16A#80qyRNHa? zk#Rn3z76O}c7hFH36`ST^y{}ybbnWf8Y6B7R*#vBnTdJ6Cqy}eeWoU!CF8y?M2Nm$ zDDz>i@k02q&oNu>`)n`|%;5C})t*?Al@-PUyw?ldfh91rK6YZ+6NK;)cU?^q7&J92 zg1H6=adlv_Ev(ATs+}mrCS$zZs$4tEHOYA;iwKNjQD*H{1Lk3#Ea#OhmT{Q5=x2t{ zzoP|PW=wp~)$BXnKNO;q@$_O|`u4s%6F-s{NB;HI{SNf~I9VVGRw>)dSO-?i>rd5U zS}}jNbK*Kmh1h7srD2^I$r0Doc*8N*l)gD^@sYxBf?<$_ ziw~8Jz}he~GpV^trn#p&uVgS5#&*&-q1q74HO+aZthx2T%slKyQIr3*U^{4LVIAg~ z?##k3J7&*{VuzSOXCa39W;hpEhc#eP;`GV-G&X4_^?~WraTk`bLAiGt<6wA}5N{b) zkNLU3O0Z8J*9}d;TB~&|x)nex9cwELU zVE;n|>ErPYFtp&t@mR`dC$M(RT+Fh9BmM+d!{>T2Ib%L}AV^xwD_)3oVf)lV68z4^ z!rV%I^V({k7J*klbCMCIe_iOxb#6&I7Q!lx0dK*&G4qfbiG>$A$6K&;_@a8Og1&l7 z>>SXY=Nxb$7RAV{=ur#I#S&N)(3Wo66_|h9J{I}?!|&joCPOp&Mt1pSdX}(;w&sZ-)RS4`*?8(GY_Qav2HAxLH0kv zATP*34r*DM`sxm1VyQC=O_(3cAWj!%Y46bd5GHFur?m|0!OS8o$083qYpcQrJ3+HD zAHjSD&cfV)wPEJOZ|@)Ya2Li;|HS7o?{XnlVEXp#!WuD|>9<;ydf!K`#QR*xmqn#}6gvGjoRLWW_rn7RDh21yLf>(l`lH@*JRu;tS zF@D6~m94^DYm#ZzR*Z!)xlQk>xYbxEHl9W61(sl9UGiZkzs~o4|62nt16$~<1J`2i zP;x-Mz;#$q*(Ehe2y0jNuCn!5`ub#FZKYU9nSK!MdZpGb?g07eui*GAwZ&e}UB>J` zmg}(=%-ql2SSMx{Tx?EYwV(6&Q)9e3X&fkK0Y8m3Vh!^9pT6Qt{&^e1Qj?R%8V{oe=5(m!kj?#J4(sA0dt z{Er%)`Ro}Pht(Nz4Ore|H}+UQ#D0ynVKNIk{m){yoBY*+`U}JLhpv^>W9E1Fru;E$ z8a6v09L-odtFNYSifSz~4vX;qqN;^Mm z)_@hLN#*2kW3C!!A)UjPVe;zqUq8R-eY3I=3mAQ$#N3ZN7Zb&zHYn4tA39Hg>D!!( zsci4sl#LxX2Hb?nj%HPF#`3Uz#OVUIu^z0y;P@lQiS z6UhZ$P;pza1ZECcjrn&t`_^FHn4j^^tGq4BIDuidMo6ggMfx^|EqIIR7qE%(VKv}$eyOkZUddW(UPugasw4T~-^^8s(MC1d3 zvcihM3K2hc(DKIp&DNaOoF>bgmUY+3yDE8^h#LsW0s&S8Su}7H zAhJSQ*KTCPOH=*B4BBKV+At2qR76tC*ey_#nU1hXOM^%oT3gnNrr(o2C!Fg{4%z+W zJb&kR&b>5U7&Dohyc1#< z+KOW*+s9htWAo}K#MZYDkJZ+Xi9OHn(5+c9Z{p@ys%XLf&cr=0*|qfbNq>L;Dt>=; zenD>Mcp>KVIZKt{nEPfS%K83pRc{0q#$>&JDI19;u_*RmWlPr`%neKsq5`v2S%!6C zjeJiDVatC+4OlW!h`D^eq#D;AZJX4JJ&ozc>oL!_gviD2S7ifMqD(GE78?sIlM|Pv z4r|8b-$$!bf7EW90qC0|L=K-%sj{^!KR<{q=DVKYHY|ym`O%2w zeNPA<^)9PH77v?|AHuSS2yuRBrWDo}<%g#VvEJyfsJ_U~PlM)4im6yPjYMM9KGk6f z=E`@jq*T_!%t^m6=Kfn+uz)e}o##E%#jQdl=}%AQwHtR&PyRqIj`-`$`7rvFQ)fR*&%x7Q$pg{!jKN_x~uE z1kJFH8ymYL?{??W`6d>{WMiElIanXog#A-Z@TK=E?~L3bM2j&Q_lS4z&b!Om-wl`@ z15qw6=I!HZ#3445gc(*^*07f zV~k;oj}?9c4BjII6Biehjm26qGcv=A%4Uig&XtV7f>u)_(%4+S>pNxnO?zki zW|~P&{8xYp(2T-L%r(mygn)4D;OUoM00c#bjjk&H5bXo=tvW`gYuo zb=jcYJB@KLFh_`!hBadz&Q}fg9~GG$SSwa%)Z2;W6=ah2BUNt~mcV2L^;O+{e5fz` z$3$xg@z+P77b+k5NotUvrw%9By{?vK48)QW+hsOFs+I~x!KZVKU(u2Ge+UXDYowws*tQV8v zPpR@Y7UF?n-i}9Py$9HTvT*Qvd9vKYGAV zSj-g{Vx8D-HIWp*i?9GkX<%Gi?Nc$B1kFLluKG)1A7*Ze8!IVtUQ#z;J(zh(jl%-P z&i)=;Fs8T;Tf-#ume}*bG+1lQun-HEWTKE(6D-2IuqgHPO<0VTlsX6bZ1aiIF!nQJ zkSkdBL(U}p91A?e`IlL(kI5Hcl8URb^J?IJ%va`2IMHyTv;|{6qF2?ku=JN~@0*uO z{pHRJ=@l%AWfsi-r|9HWS&@rcW~N@t|>PsICshCXrt<7aT-ZY+195S5rdo;_Fu zGmr82-y2yW7IFT~##6x{$h|W7ET4uYF!Q{R@-1AL%?M_uyRa~p32P>*U&GRvdBU#8 zf@HK>h&`~H%G+}mML_exu^7v)a&}lH>tW_LRb%dI=QahgAZA9Z?cABF2xcz0{hWQK zst+_*m!P6A=#0X`bsq$y*frMGP%pxo2|*vx(${w-7FjC9K};w0V$8S9IYt%MB8~hL ze^(h?4W>c4Pv?{cu@FZ@o|3;QTY{wk8CGpeG5_++Ab(Z$mSL^f6eg`FScCPf$UN-i z>-@m`-*V8i()n~+f%RfCGJ1k5F)yP^JF5l>Va>`uRQ4#=_a$3}`5w)*)eoZWZ$#{+ zEg(OG861BjveeDJD_5uATAQ&5X71+>tQD)JUP_hN+{MfCxQ{>OJBuDDP106p2G%Fy zIjjzAk?(&xG~2;k?#9<>sP`_8^oVHz!UF8C z+|GeVx!nKVU=ox`qZ{wRq8x{)Vb5c^PZ*8)+Y7QD)@0Oc!SbHGy2tV%_Dd{+&F8ZY z|BINN0wbV)VYvM8#hM^7HQ(La$|o)lZE!v~+Ob}2Gi`NP6S5vFs>9BxT-b;8VLmLS z?AMrwN?!T?r%`m4tPO)LY@B{6`M7%5TKC4x|Mm2KUc^F}Iq>hrD^H{`u8_ffe-{gE za^}Y$uoQMRx0u;6&`)nUG}c$^pFQPIhOi2w!}qZsOolK^m2PZWgY&NVdH)}4!miUsVaoX_oN!CuUqOl@b+`s^)295E)d9!p~8WHw-V?4`^FoxnEMi47(k zf2+f$J)L commandNames = new List(); @@ -127,6 +123,7 @@ namespace Fungus.Script if (fungusScript.selectedSequence == null || selectedType == null) { + serializedObject.ApplyModifiedProperties(); return; } diff --git a/Assets/Fungus/FungusScript/Scripts/Sequence.cs b/Assets/Fungus/FungusScript/Scripts/Sequence.cs index e5e2117e..d620b286 100644 --- a/Assets/Fungus/FungusScript/Scripts/Sequence.cs +++ b/Assets/Fungus/FungusScript/Scripts/Sequence.cs @@ -15,6 +15,9 @@ namespace Fungus.Script [HideInInspector] public Rect nodeRect = new Rect(10, 10, 100, 40); + [HideInInspector] + public string sequenceName = ""; + [HideInInspector] public string description = "";