From 03f9475a382b3416ec9abd047d156424a77fe09d Mon Sep 17 00:00:00 2001 From: ousttrue Date: Wed, 18 Apr 2018 23:19:00 +0900 Subject: [PATCH] version label --- Scripts/Format/VRMVersion.cs | 8 ++++---- _RuntimeLoaderSample/Scripts/ViewerUI.cs | 9 +++++++++ _RuntimeLoaderSample/VRMViewer.unity | Bin 53080 -> 53888 bytes 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Scripts/Format/VRMVersion.cs b/Scripts/Format/VRMVersion.cs index 5356632da..cc147cd94 100644 --- a/Scripts/Format/VRMVersion.cs +++ b/Scripts/Format/VRMVersion.cs @@ -4,11 +4,11 @@ namespace VRM public static class VRMVersion { public const int MAJOR = 0; - public const int MINOR = 33; + public const int MINOR = 34; - public const string VERSION = "0.33"; + public const string VERSION = "0.34"; - public const string DecrementMenuName = "VRM/Version(0.33) Decrement"; - public const string IncrementMenuName = "VRM/Version(0.33) Increment"; + public const string DecrementMenuName = "VRM/Version(0.34) Decrement"; + public const string IncrementMenuName = "VRM/Version(0.34) Increment"; } } diff --git a/_RuntimeLoaderSample/Scripts/ViewerUI.cs b/_RuntimeLoaderSample/Scripts/ViewerUI.cs index 10198bc21..e79cacb3d 100644 --- a/_RuntimeLoaderSample/Scripts/ViewerUI.cs +++ b/_RuntimeLoaderSample/Scripts/ViewerUI.cs @@ -9,6 +9,9 @@ namespace VRM public class ViewerUI : MonoBehaviour { #region UI + [SerializeField] + Text m_version; + [SerializeField] Button m_open; @@ -34,9 +37,13 @@ namespace VRM m_enableLipSync = toggles.First(x => x.name == "EnableLipSync"); m_enableAutoBlink = toggles.First(x => x.name == "EnableAutoBlink"); + var texts= GameObject.FindObjectsOfType(); + m_version = texts.First(x => x.name == "Version"); + m_src = GameObject.FindObjectOfType(); m_target = GameObject.FindObjectOfType().gameObject; + } GameObject m_loaded; @@ -73,6 +80,8 @@ namespace VRM private void Start() { + m_version.text = string.Format("VRMViewer {0}.{1}", + VRMVersion.MAJOR, VRMVersion.MINOR); m_open.onClick.AddListener(OnOpenClicked); } diff --git a/_RuntimeLoaderSample/VRMViewer.unity b/_RuntimeLoaderSample/VRMViewer.unity index e601662bab2be65e984bf378ada0acd6f1b13830..b5224966c74cc59300b2392078ebcd26ab5dd8d9 100644 GIT binary patch delta 1231 zcmYMzTS(JU90%~RojQNc=%}7Cg zPNFL)6+{6WEhh@1ZbfKpL0GvdzEmn?i{=rPqE8y4bm37e3W~v0Gf@`4%h+fYR)Bgo zVlr6JiNa5%zskE(EMTGGzy9WZ=sZvv9KN0h`gv{;iRyQ!*tZKNV2jy3yI`8u0W)*>9DBm zgGgtqT1|8l^_7Tv|A)Q{C@Bg|Zhr%tdrfNl8`mLro7ik?Q`^6#Jzb_D7fdFW z3)#vx4oe5Yq@8RX zxcw?D9ahVxuaA%6k6)T@{Y!k1Ag~La&{RD&9u3#OF!7h=i3pXGBr+JzV*X=`I&4|4{WD(kQmgop6n2pUi5nW9C E2cG!_n*aa+ delta 979 zcmYMyUr5tY6bJCL|3h-kmD?)QRZBOMC@3}P&uo?J4>2-gP?;J+h1q(LSfm>yB2mz| zFVhFfRFZtz{AEZOiD)kNVDu2Nm+~R%CD_wge;)eY?TkGf?meG-@41Kj`$eWSU&b_M zqUUa+wEz)SVD3qnqmjy~t~Y<1XFh!0`0KmvUH12#I;_4>uJ*O6g=fE3)hPDby}Bd7 zv*OG{Z@HXZMr=S-i}jFA96spO-9|Pf(pZ0t*%+@o^Xn~x4l!qUDL)1+R@Hgs-)M&> z>`K3sMQGSgWL6VdFn6=Xwh}p!Z$iXlHJun}5jKudi%78D*hX{(`DVl{TN2iQyb__X z<=CvSR|N}`tE#Zk2At!K0az3{dZO2C8CVc`8A81py@i1~wi7+UD4Wr+Wng~fTcopj zstae)JL%Zsur>-4p()Zc8f%Ca=fGYoy=``EZokT9|(IXne*9@`_%>!j+S+I$1->y=@X0{~E#RU(sWt^pg$GTJZ zWIg+CqJFODVT-{gVY0y%wy>ubh=O=EI?nhLf1Vj;fO*++Xt~&Re{d~-i39&|2zzAH z18mP=#Y@6$zWP$V2wPxJzFt%Q8C=;3dD3#U!2VYLr6#xJL