From 3ed5cd974af595a5e92c89c8fe0dd089b100b94f Mon Sep 17 00:00:00 2001 From: sippeangelo Date: Fri, 27 May 2016 06:16:43 +0200 Subject: [PATCH] =?UTF-8?q?VstyleR,=20rackamackaf=C3=A5n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Controller Left.prefab | Bin 20156 -> 20156 bytes Assets/Controller Right.prefab | Bin 20732 -> 21092 bytes Assets/Fonts/ARIAL Depth 256.mat | Bin 4900 -> 4900 bytes Assets/Fonts/OpenSans-Regular Depth 256.mat | Bin 4912 -> 4912 bytes Assets/Furniture Prefabs/Bed 1.prefab | Bin 8420 -> 8420 bytes Assets/Furniture Prefabs/Bed 2.prefab | Bin 8852 -> 8852 bytes Assets/Furniture Prefabs/Chair 1.prefab | Bin 12588 -> 12588 bytes Assets/Furniture Prefabs/Chair 2.prefab | Bin 8572 -> 8572 bytes Assets/Furniture Prefabs/Chair 3.prefab | Bin 11380 -> 11380 bytes Assets/Furniture Prefabs/Chair 4.prefab | Bin 10860 -> 10860 bytes Assets/Furniture Prefabs/Chair 5.prefab | Bin 20996 -> 20996 bytes Assets/Furniture Prefabs/Chair 6.prefab | Bin 15924 -> 15924 bytes ...oration 2 1.prefab => Decoration 3.prefab} | Bin 12300 -> 12292 bytes ...1.prefab.meta => Decoration 3.prefab.meta} | 0 Assets/Furniture Prefabs/Lamp 1.prefab | Bin 15060 -> 15060 bytes Assets/Furniture Prefabs/Sofa 1.prefab | Bin 8292 -> 8292 bytes Assets/Furniture Prefabs/Sofa 2.prefab | Bin 13876 -> 13876 bytes Assets/Furniture Prefabs/Sofa 3.prefab | Bin 19500 -> 19500 bytes Assets/Furniture Prefabs/Table 1.prefab | Bin 9820 -> 9820 bytes Assets/FurnitureMiniature.cs | 1 + Assets/LeftController.cs | 27 ++++---- Assets/Materials/None.mat | Bin 4940 -> 4940 bytes Assets/Measurement.cs | 21 ++++-- Assets/OutLineMaterial.mat.meta | 4 +- Assets/Outline.cs | 46 +++++++++++++ Assets/Outline.cs.meta | 12 ++++ Assets/Resources.meta | 9 +++ Assets/{ => Resources}/Measurement.prefab | Bin 12028 -> 12060 bytes .../{ => Resources}/Measurement.prefab.meta | 0 Assets/Resources/OutLineMaterial.mat | Bin 0 -> 4952 bytes Assets/Resources/OutLineMaterial.mat.meta | 8 +++ Assets/Resources/OutLineMaterialMini.mat | Bin 0 -> 4956 bytes Assets/Resources/OutLineMaterialMini.mat.meta | 8 +++ Assets/RightController.cs | 63 +++++++++++++++--- Assets/SteamVR/Extras/SteamVR_LaserPointer.cs | 2 +- Assets/Test.unity | Bin 126056 -> 123288 bytes Assets/Warehouse Row.prefab | Bin 14724 -> 12852 bytes Assets/WarehouseMiniatureAnim.cs | 8 +-- Assets/WarehouseRow.cs | 2 +- ProjectSettings/GraphicsSettings.asset | Bin 4256 -> 4256 bytes ProjectSettings/ProjectVersion.txt | 2 +- 41 files changed, 174 insertions(+), 39 deletions(-) rename Assets/Furniture Prefabs/{Decoration 2 1.prefab => Decoration 3.prefab} (85%) mode change 100644 => 100755 rename Assets/Furniture Prefabs/{Decoration 2 1.prefab.meta => Decoration 3.prefab.meta} (100%) mode change 100644 => 100755 Assets/Furniture Prefabs/Sofa 2.prefab mode change 100644 => 100755 Assets/OutLineMaterial.mat.meta create mode 100755 Assets/Outline.cs create mode 100755 Assets/Outline.cs.meta create mode 100755 Assets/Resources.meta rename Assets/{ => Resources}/Measurement.prefab (88%) mode change 100644 => 100755 rename Assets/{ => Resources}/Measurement.prefab.meta (100%) create mode 100755 Assets/Resources/OutLineMaterial.mat create mode 100644 Assets/Resources/OutLineMaterial.mat.meta create mode 100755 Assets/Resources/OutLineMaterialMini.mat create mode 100755 Assets/Resources/OutLineMaterialMini.mat.meta diff --git a/Assets/Controller Left.prefab b/Assets/Controller Left.prefab index 2ce84bcef3b9ea65bc7a9cfcbae68893a4673199..ff72b61534735b99a195169ce2d04540af755c51 100755 GIT binary patch delta 32 ocmdlpmvPTr#tl8*ELSTs?KV&F-orSV$B$?70w1=`alUbk0Oj`#x&QzG delta 28 jcmdlpmvPTr#tl8*EDS)fd4l&I#>q>3MK&k+#xMc^mwgG~ diff --git a/Assets/Controller Right.prefab b/Assets/Controller Right.prefab index 4985bea1abec36a1312d4d6e952fb4256e084e69..f957c6d9f89aac18a9bb04be403f4e9aabe64dd3 100755 GIT binary patch delta 861 zcmZ9HZAepL6vv-OuU@CKrliY!+tla<=jQv%UYu;UX6{8J)L3qJyO*VyFY6joUj_vk z37MxrC`c=WBx2)MV3{NYK}g`I1pOdUgwO{iArWgmcT;546(r-h-p z{5PXtVcNpbLNMl#e$tM`pRC<~@ei~h`&2j^^au}|8t^}(zn^l)s8MKX_9luRuXkXk z*-HyX4>y~sf&$y(-g2;Q>y*=ZpY?&zBmH#pZ$0`sSGV-z+wAJg4Cu3WP*eBJT3ECn fflx^Tg!BqH=oqKPH!D&U&{ClUr&A-WI&$zI#5M~8 delta 658 zcmaE|gz?WpMgax}JxvCNfIkcj4E#X0!$yI8F3~v$Mfz=`zUf^J{heNPGC)fjC>ykS zKc73(dfvJ0@4^#WS)^zNyzSd8(l{CtoW&SPkdojr!$`oRc*TjswY$2KhiT z(J&oIo&=MIMj-Y~Fv(~f50W(o%YsQm6A(MmFrM?*RG4{;rXaCQFnJM7g5;C(*`W3< zGy|E!Xbx5dCNF}?jW!7!*WrpRK+>F+Af=g>AofKt2{P)O3|y5JNCu>_2PRZ#4f4T5 zYmfw^c>;$%Ok$%ANJ!EaL^guSm$qQ<08QkGfjNGoT@@$ToeT^MOedSz$Fnmu3o%FZY|xpU<{9 delta 24 ZcmZ3YwnS}%h_FCZRFpjoGcYvR0{~!b2Own1%!g0O(!vlu&@^@jFQQC0Q~3=Q@GY+wiV delta 24 Zcmdm>wn1%!g0MhTRFpjoGcYvR0{~-q2Sxw@ diff --git a/Assets/Furniture Prefabs/Bed 1.prefab b/Assets/Furniture Prefabs/Bed 1.prefab index 0a97f264707671b5fe54322369f086e0741b2715..5a99e60f5c325505f6b4b51672c425021948cfbb 100755 GIT binary patch delta 15 WcmaFj_{4F;CV3_Wr_EdB4HyA9y#?n0 delta 15 WcmaFj_{4F;CV3_Yhs|5$4HyAAkp=|- diff --git a/Assets/Furniture Prefabs/Bed 2.prefab b/Assets/Furniture Prefabs/Bed 2.prefab index 186504b683d57c983170571dff618f417d94e015..3e7cb8de77cfe40c0f12d233c3fda6492e1904a9 100755 GIT binary patch delta 14 WcmbQ@I>mLvCPgL%r^#Cs9{>O=S_R?& delta 14 WcmbQ@I>mLvCPgL(hsj$M9{>O>5C#AM diff --git a/Assets/Furniture Prefabs/Chair 1.prefab b/Assets/Furniture Prefabs/Chair 1.prefab index 8257b97b7920c2d60495719800103c569c73c220..038809b2e22c7ae806ec5c4af622a7c9a553dc03 100755 GIT binary patch delta 14 VcmZ3Jv?ghTmjTlW$H_hh4*)PD20;J- delta 14 VcmZ3Jv?ghTmjRQ5!(<j+3WoKL7wZu?Ir{ delta 14 Wcmewo@g-uzByA=Khsjg49{>P0d4GI7N delta 31 hcmaD8@+M@1j4C$+LxVjOZ&p`LW?^!0nB1fJ005ot35x&# diff --git a/Assets/Furniture Prefabs/Chair 5.prefab b/Assets/Furniture Prefabs/Chair 5.prefab index 0372bb76a337314348295331a43880b7ddaed721..6d8ed77e4403f3e858e6196fc64703e6eed18dda 100755 GIT binary patch delta 16 XcmZo!!q~Eeaf4DI(+S7PDuE9GH9!Vw delta 16 XcmZo!!q~Eeaf4DIlY_%#mB0r8G7AOZ diff --git a/Assets/Furniture Prefabs/Chair 6.prefab b/Assets/Furniture Prefabs/Chair 6.prefab index 5289bf67e89a4238a46ab73620a561f5091d2b5c..fef0b0a2933ab9bf4c1410da83e823a4fce3849b 100755 GIT binary patch delta 14 Vcmdl|v!!N3kS)^*$H^hK4*)bp2Co1B delta 14 Vcmdl|v!!N3kS&vg!{iX#2LLe;1||Ri diff --git a/Assets/Furniture Prefabs/Decoration 2 1.prefab b/Assets/Furniture Prefabs/Decoration 3.prefab old mode 100644 new mode 100755 similarity index 85% rename from Assets/Furniture Prefabs/Decoration 2 1.prefab rename to Assets/Furniture Prefabs/Decoration 3.prefab index 95209659f3209f1b9f32f99ade69392b7311aa4c..0ce1d9946fdb6b44223bbeaed809e13a30f8fe7b GIT binary patch delta 341 zcmeB4Xi4B;U{IOKz+k|#k;6w(vXy~>ff0=V{|8bGCFhtx6vKtuOeJaA z6RZpjDL^?EFoxJ_P{0mWZ7_KuP~D8ldx50J<6GH9e`@gz!;({-lH181pvq} BP8$FK delta 342 zcmZok=t(yOeJaA z3#<$bDL^?EFoxJ_P{0mWZ83QvP~C#bdx50E<^$P9e`@gz!;({e87|M4()) { diff --git a/Assets/LeftController.cs b/Assets/LeftController.cs index d08bbc1..0d454e9 100755 --- a/Assets/LeftController.cs +++ b/Assets/LeftController.cs @@ -3,16 +3,13 @@ using System.Collections; public class LeftController : MonoBehaviour { - public bool AlwaysCenter = false; + public GameObject MainCamera; + public GameObject WarehouseCamera; Transform controllerRig; SteamVR_ControllerEvents controllerEvents; - GameObject mainCamera; - GameObject warehouseCamera; - CameraFade cameraFade; - SteamVR_Camera mainSteamVRCamera; bool inWarehouse = false; @@ -21,14 +18,11 @@ public class LeftController : MonoBehaviour { controllerEvents = GetComponent(); controllerEvents.TriggerAxisChanged += triggerAxisChanged; + + cameraFade = MainCamera.GetComponentInChildren(); } void Start () { - mainCamera = GameObject.Find("Main Camera (origin)"); - warehouseCamera = GameObject.Find("Warehouse Camera (origin)"); - - cameraFade = mainCamera.GetComponentInChildren(); - mainSteamVRCamera = mainCamera.GetComponentInChildren(); } void triggerAxisChanged(object sender, ControllerClickedEventArgs e) { @@ -36,18 +30,21 @@ public class LeftController : MonoBehaviour { if (alpha > 0.05) { cameraFade.SetFade(alpha); if (!inWarehouse) { - controllerRig.SetParent(warehouseCamera.transform, false); - if (AlwaysCenter) { - warehouseCamera.transform.localPosition = new Vector3(-mainSteamVRCamera.head.localPosition.x, warehouseCamera.transform.localPosition.y, -mainSteamVRCamera.head.localPosition.z); - } + WarehouseCamera.SetActive(true); + controllerRig.SetParent(WarehouseCamera.transform, false); inWarehouse = true; } } else { cameraFade.SetFade(0.0f); if (inWarehouse) { - controllerRig.SetParent(mainCamera.transform, false); + controllerRig.SetParent(MainCamera.transform, false); + WarehouseCamera.SetActive(false); inWarehouse = false; } } + + foreach (var measurement in GameObject.FindObjectsOfType()) { + measurement.InWarehouse = inWarehouse; + } } } diff --git a/Assets/Materials/None.mat b/Assets/Materials/None.mat index a132683d8467888ed64523602e4db2f2490fe285..83e44a4b83603d193b3cfd93ef81bf1f4052716f 100755 GIT binary patch delta 16 WcmX@3c1CSOgAfY?5KL|nIspJLd<7f; delta 16 YcmX@3c1CSOgAmKvGd%W_TZB#k06hB#00000 diff --git a/Assets/Measurement.cs b/Assets/Measurement.cs index 4c5445a..882cf21 100644 --- a/Assets/Measurement.cs +++ b/Assets/Measurement.cs @@ -15,6 +15,8 @@ public class Measurement : MonoBehaviour { private float LineWidth; + public bool InWarehouse = false; + // Use this for initialization void Start () { @@ -35,6 +37,10 @@ public class Measurement : MonoBehaviour { Vector3 middlePosition = (LocalStartPosition + (LocalEndPosition - LocalStartPosition) / 2.0f); float smallestScale = Mathf.Min(transform.lossyScale.x, Mathf.Min(transform.lossyScale.y, transform.lossyScale.z)); + + if(InWarehouse) { + smallestScale = smallestScale / 10.0f; + } if (smallestScale < 0.4f) { @@ -74,7 +80,7 @@ public class Measurement : MonoBehaviour { textMesh.text = textMagnitude.ToString("0.00") + "m"; - textMesh.characterSize = Mathf.Max(0.001f * Math.Min(1.0f , textMagnitude), 0.002f); + textMesh.characterSize = Mathf.Max(0.0005f * Math.Min(1.0f , textMagnitude), 0.0005f); HoleSize = Mathf.Max(0.1f * Math.Min(1.0f, magnitude), 0.05f); @@ -90,8 +96,13 @@ public class Measurement : MonoBehaviour { line2BaseRenderer.SetPosition(0, LocalEndPosition + lineUp * 0.01f); line2BaseRenderer.SetPosition(1, LocalEndPosition - lineUp * 0.01f); - - LineWidth = Mathf.Min(DefaultLineWith*smallestScale, 0.003f); + if(InWarehouse) { + LineWidth = 0.007f; + } + else { + LineWidth = Mathf.Min(DefaultLineWith * smallestScale, 0.003f); + } + line1Renderer.SetWidth(LineWidth, LineWidth); line2Renderer.SetWidth(LineWidth, LineWidth); @@ -105,7 +116,7 @@ public class Measurement : MonoBehaviour { LineRenderer lineMiddleRenderer = line1BaseTransform.GetComponent(); lineMiddleRenderer.SetWidth(LineWidth, LineWidth); - Vector3 upDistance = new Vector3(0, 2.0f, 0); + Vector3 upDistance = new Vector3(0, 20.0f, 0); upDistance = upDistance*smallestScale; textTransform.position = middlePosition + upDistance*1.1f; @@ -115,7 +126,7 @@ public class Measurement : MonoBehaviour { lineMiddleRenderer.SetPosition(1, middlePosition + upDistance); } else { Transform lineMiddleTransform = transform.FindChild("LineMiddle"); - LineRenderer lineMiddleRenderer = line1BaseTransform.GetComponent(); + LineRenderer lineMiddleRenderer = lineMiddleTransform.GetComponent(); lineMiddleRenderer.SetWidth(0, 0); } } diff --git a/Assets/OutLineMaterial.mat.meta b/Assets/OutLineMaterial.mat.meta old mode 100644 new mode 100755 index c2adc6c..1e2616e --- a/Assets/OutLineMaterial.mat.meta +++ b/Assets/OutLineMaterial.mat.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 90a52fc266c12ff41ab5b486a49bcb9c -timeCreated: 1464211843 +guid: cf1a2d53d09212446b0d9316c31c7fcb +timeCreated: 1464306843 licenseType: Free NativeFormatImporter: userData: diff --git a/Assets/Outline.cs b/Assets/Outline.cs new file mode 100755 index 0000000..76b6422 --- /dev/null +++ b/Assets/Outline.cs @@ -0,0 +1,46 @@ +using UnityEngine; +using System.Collections; +using System; +using System.Collections.Generic; + +public class Outline : MonoBehaviour { + public Material OutlineMaterial; + + void Start() { + OnEnable(); + } + + void OnEnable() { + foreach (var rend in GetComponentsInChildren()) { + bool end = false; + foreach (var mat in rend.sharedMaterials) { + if (mat == OutlineMaterial) { + end = true; + break; + } + } + if (end) { + continue; + } + + var newMats = rend.materials; + Array.Resize(ref newMats, newMats.Length + 1); + newMats[newMats.Length - 1] = OutlineMaterial; + rend.materials = newMats; + } + } + + void OnDisable() { + foreach (var rend in GetComponentsInChildren()) { + var newMats = new List(); + + foreach (var mat in rend.sharedMaterials) { + if (mat != OutlineMaterial) { + newMats.Add(mat); + } + } + + rend.materials = newMats.ToArray(); + } + } +} diff --git a/Assets/Outline.cs.meta b/Assets/Outline.cs.meta new file mode 100755 index 0000000..44d8165 --- /dev/null +++ b/Assets/Outline.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b18ebb98b5928ab489635cfad09a0f2f +timeCreated: 1464301950 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100755 index 0000000..bc6a429 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: e580c3590072d6743a2d665776ccc971 +folderAsset: yes +timeCreated: 1464302284 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Measurement.prefab b/Assets/Resources/Measurement.prefab old mode 100644 new mode 100755 similarity index 88% rename from Assets/Measurement.prefab rename to Assets/Resources/Measurement.prefab index 6eb0e2d4043c31bad7e09a882469476166713940..08c4770a974aaa054dc1bd1357b470f27104a96c GIT binary patch delta 187 zcmewpJ10(nfkD}cfk9t}fq{V^$WE9jpeZ_UN8fk9c0fkE#N0|Ns;knJ#0KvPuiUe-TLFP|qYBBun_?ywA307`mn^kZh8 ze2`6J@km7K0|b-rYwv`! T=j$NY@wy1MydHvmU(Xf*j=xK> diff --git a/Assets/Measurement.prefab.meta b/Assets/Resources/Measurement.prefab.meta similarity index 100% rename from Assets/Measurement.prefab.meta rename to Assets/Resources/Measurement.prefab.meta diff --git a/Assets/Resources/OutLineMaterial.mat b/Assets/Resources/OutLineMaterial.mat new file mode 100755 index 0000000000000000000000000000000000000000..6128f5af7033595fbab44f24eaba208a54bb20c5 GIT binary patch literal 4952 zcmeI0OKcle6o!wT*hy0!Eu}9?X?QvY~B)x$2qctO&F#ZMn4ji+J(>g1Ez{ft!Y2VYrhv4T4 z%=^=GwC3OYSxJ6O{p4EgTm3LTZJm`?KYfO03iwoNqQfBk&=kQ07aewC8)LVw$(cd6(fj&SRJ}9&`(LQubDy zY+-H#NLY|Wk zF>2QBF~jq!o>wquJdYdRXWf_2na;Q0y6=-rxuJTJe&_s^K~8GQySGN}AqM!r`u>xDi`+`@myjGWJ) z=GxDnn9F0>yS=Gnun6sY4N;f zgxt<|%5Xd1X~XS&XTUq$A&X?~|&2w@V5inoAJC8#}25~O0>hKR{tiuUtriI^3 z`73SwR?1Jdao&u6=2Bj8VmI_0UltbPaAcTUYtHhl?^HOSYD95Rd(Exm%2N%u;Yt*TUcGYK zsT7=LIaBxI)rBxvcEfmevFf@pojMoXatb|{UQW9!GxZCR)Sa5EuhB%GiW{NJ%Sw*# z%8IOFJioLQDPOaG;KVABzz@PmLaE4kaaa(M!Oep_C^^@ow;J2Az!Xpxec8YsZick*v-=9a zbs?Le+)@_{j#tO-fNWh7>=>z9l-*>bw#+SvCAJ;6WW{MWc0B*pAgnq5ZS47pfgMxm z_`b7p8(V&I7w1bQzrj7%24kGHV^O|mYF^aQ+_q&&(zpvw^bTgNV%xUlIN_gn%fW_F zZ2PTnRV<(;zVDTe`9TzIxBwRRHO!U$DK3VkNgsPbjA^6TbQG^M!G{^_rW$duv_vCq z)2u1Lz^|W;D4RE4553q0Nyb#ZDi*AkC{ouA;NK#9tha^Ajz2f7*L*P!-FhXi(mWaC zPYCV3HkaZ&f66JIIlJhVXfOC+z`PKY839G*(yWU{dOczh`v~i=16z)A_sE}Aip@Sw haZ{Qan?rgpbFNuSebnnl`!puFc41zNF|4(KOWt`6L|x_kB7Tl3d1?YX$C2$sdk z0*;jDMH1Mrt4Sh~!QYoTNq)#k(gR38S~Ic*<6psV!!fHkt+VnceC)%V_PG{51V4{s z-j|-EHUHkvO7c_cC*NY<>WA@Z>#Vf;=`}nf$Kn4Q_+k9KM<(Gl*~|gNLnUX-nKAO5 zigPcnVVwQsN^^1&wr@i@-)eY9;6si=nJ<;np6~67Y2F&=9fs>Tk73Su&@J3a*;{e4 zg`MKuMy}M3^KQd+zh1|jd2NSMSUc9UiZS^;gb?!U;O}9~c(_J7#k13JyKcM4A*|;< z^pSO=pWTEBd5`MLrzziKc;3qQUT~dn!RpIia-{{UFZUU){r97fyzcHh&7)B32oeVg(J4bNG5J!E)~mDj`M5Z0%)ZjTTq3sXF`#wRgw9l&NlZNNzM~qod)_6aZ!n%Er{{DJS8Gx|A5++yGKbEu6s{TwzttNM5ibJla1JYoEHAD=Va?jzopO4|GQg0Z*z_@d!< zA73)u?&A^gPJJ99S8Dh1WyABrda{qK8{b`SLxgd0x&U0_Mwi=W(dWAkGz39sa?Lb(n=_TKJ8W zztYBUru;-3=gsJ6F6Bihc0N2Zs&I0&a#W49i8LH(%IN;97C&Q4*l;KWr7 zl-*+0S#m?3)*~}G;jXH398>Q2qo*Jz?o#f{MAWo5^A zWmVQNo?l*$l&={-aAFlm;0IwOp;Y9&I4p?B;MPGNl$^`yt;P;4Fa?yw-^s^2zy9ps z`R@*XRD07K{t8B2=~kdyfo=u573fx=TY>+r0{jG=Z^Uz6-EHnxieBB*|8XDXhDZxP zy)W~77qSJ)ZFQ;Wcy;U$$TlRwu92!m*-bQRE8K=yV%u?BR+@5S$Mate!kXjX!k(WQ z*foWY?>novu;piWX}(ZNCk!N=4Mf_r3BlKZv4D7r?^4hPkporNyv3;bT9DF>Mr^isB6>_&9^zWFroi zmuaMJnl%OJ|LyY;W%I^sp%=R#$*9U##ex+RMe4eK{99s=_0~|?@h69knlHwoTd%}b znkS?D8KJ$`=2D#J&pD+tXBXWv?FAnVm=}X3MnF-yH0z>~UXNJFKEgURJ8*(); @@ -30,6 +35,10 @@ public class RightController : MonoBehaviour { controllerEvents.TriggerUnclicked += triggerUnclicked; controllerEvents.TouchpadClicked += touchpadClicked; controllerEvents.TouchpadUnclicked += touchpadUnclicked; + controllerEvents.ApplicationMenuClicked += applicationMenuClicked; + controllerEvents.ApplicationMenuUnclicked += applicationMenuUnclicked; + + boxCollider = GetComponent(); warehouse = GameObject.Find("Warehouse/Shelves/Column").GetComponent(); } @@ -49,6 +58,11 @@ public class RightController : MonoBehaviour { warehouse.Offset = whBaseOffset + (-whScrollOffset); whRow.Offset = whRowBaseOffset + whRowScrollOffset; } + + // Measurement + if (currentMeasurement != null) { + currentMeasurement.EndPosition = transform.localPosition; + } } void OnTriggerEnter(Collider other) { @@ -57,11 +71,17 @@ public class RightController : MonoBehaviour { return; } - touchingItems.Add(other.gameObject); + touchingItems.Add(mini.gameObject); + //mini.gameObject.AddComponent().OutlineMaterial = Resources.Load("OutLineMaterialMini"); } void OnTriggerExit(Collider other) { - touchingItems.Remove(other.gameObject); + var mini = other.GetComponentInParent(); + if (mini == null) { + return; + } + touchingItems.Remove(mini.gameObject); + //Destroy(mini.gameObject.GetComponent()); } // Furniture picking @@ -129,12 +149,15 @@ public class RightController : MonoBehaviour { if (warehouseItem) { var mini = warehouseItem.Pick(); mini.Grab(); + mini.transform.SetParent(MiniatureAttachmentPoint, false); + mini.transform.localPosition = Vector3.zero; + mini.transform.localScale = Vector3.one / 10.0f; - var anim = mini.gameObject.AddComponent(); - anim.OriginItem = warehouseItem; - anim.DestinationAttachment = MiniatureAttachmentPoint; - anim.GoalScale = new Vector3(0.05f, 0.05f, 0.05f); - anim.Duration = 0.33f; + //var anim = mini.gameObject.AddComponent(); + //anim.OriginItem = warehouseItem; + //anim.DestinationAttachment = MiniatureAttachmentPoint; + //anim.GoalScale = new Vector3(0.1f, 0.1f, 0.1f); + //anim.Duration = 0.33f; heldItem = mini.gameObject; @@ -145,11 +168,17 @@ public class RightController : MonoBehaviour { var furnitureMini = result.rigidbody.GetComponent(); if (furnitureMini) { furnitureMini.Grab(); + if (WarehouseCamera.activeSelf) { + furnitureMini.transform.SetParent(MiniatureAttachmentPoint, true); + furnitureMini.transform.localPosition = Vector3.zero; + } else { + furnitureMini.transform.SetParent(MiniatureAttachmentPoint, true); + } - var anim = furnitureMini.gameObject.AddComponent(); + //var anim = furnitureMini.gameObject.AddComponent(); //anim.OriginItem = furnitureMini; - anim.DestinationAttachment = MiniatureAttachmentPoint; - anim.Duration = 0.33f; + //anim.DestinationAttachment = MiniatureAttachmentPoint; + //anim.Duration = 0.33f; heldItem = furnitureMini.gameObject; return true; @@ -184,4 +213,18 @@ public class RightController : MonoBehaviour { whScrollStartPos = null; } } + + void applicationMenuClicked(object sender, ControllerClickedEventArgs e) { + if (currentMeasurement == null) { + var prefab = Resources.Load("Measurement"); + currentMeasurement = Instantiate(prefab).GetComponent(); + currentMeasurement.transform.SetParent(GameObject.Find("Scene").transform, false); + currentMeasurement.StartPosition = transform.localPosition; + currentMeasurement.EndPosition = transform.localPosition; + } + } + + void applicationMenuUnclicked(object sender, ControllerClickedEventArgs e) { + currentMeasurement = null; + } } diff --git a/Assets/SteamVR/Extras/SteamVR_LaserPointer.cs b/Assets/SteamVR/Extras/SteamVR_LaserPointer.cs index 45f8b7a..b47fceb 100755 --- a/Assets/SteamVR/Extras/SteamVR_LaserPointer.cs +++ b/Assets/SteamVR/Extras/SteamVR_LaserPointer.cs @@ -31,7 +31,7 @@ public class SteamVR_LaserPointer : MonoBehaviour void Start () { holder = new GameObject(); - holder.transform.parent = this.transform; + holder.transform.SetParent(transform, false); holder.transform.localPosition = Vector3.zero; pointer = GameObject.CreatePrimitive(PrimitiveType.Cube); diff --git a/Assets/Test.unity b/Assets/Test.unity index d71d81835b24ca8eef2653c0e1f56f2cff35c3fa..0f3379d2f2af791cd2b18a42eac22d56b4d31c71 100755 GIT binary patch delta 24731 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 delta 23993 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 delta 1698 zcmZuxZ)jUp6hAjf+oVg=+Bg%FQS$PqZL%e`U5DxD8tZVY;v}h}b)a3^yrvJb*1jZ| zXr&npR%K}A>_gQF3W8HX=i&$dAUgIz>82JDHvF*F4`PKWDg_16c+PuCEuja_yXXGS zpLhP;dp}5>%z6QWX@G%~0MJTuiB{Mb*&FGf>VIa7z&flDU0knm!=Lxk{RQxD0%H?b_)Sx(ql zPMGZv>?M~WVk_|uVlZ=H16-$|{BsjA>qHfg7@-u>&7h@QRRFoX{YQ?pc%Yqr;PL3Ayx%tP7e2KI3uhFA>105I|h1a58^Q zROe;{n5)ypr*vJxh+lhLVhw-xxWyPslHIcBvaVXCo!cvS7G>AGbUUORp+S%eu^B=-PKz5Yk8W8_b? zx{WS6q3fa+?C`ox7D@sScpVGTW`NV=G&c`8tXBa)w8Su4;?1XdrIR9zT#~$EL!nxuWMkPR2hQl)u^bnGW}Y3S6j#Ej>bvi zCq>n!2hjP3t~-YbpB>wLW`om)E}!e+b9CzK1ARR5o)*YSC%;}-P`=T0i=-PNiLdyn z>hNAm|4AdIp0?tQZ@;kMTRxR@*NE&lNtLs+d393G_T*=jTycCNPcMlwGcFf$YI4&` zzmU~!Mww8PYEgIaq~xh&K9loo2EyC@hjB1qE@%AfV$?)V%uKZt#SLbvHJ%e^sujdT zWvUI0UkW}=`sFLzI!BGdh{@m!M!G4O@Z0fvxDf|~X6sj1t{kW_u7;xcTku0;^VLiE zPG}z<3wGmOz2y*nMIcpcJdI35UaW!^#D`FC4+8E^~Q4JSbeX z8!0FYK_6Z@qgXfgcHV}bfCzg6yU+R`32IZm diff --git a/Assets/WarehouseMiniatureAnim.cs b/Assets/WarehouseMiniatureAnim.cs index a01eba2..7403752 100755 --- a/Assets/WarehouseMiniatureAnim.cs +++ b/Assets/WarehouseMiniatureAnim.cs @@ -14,7 +14,7 @@ public class WarehouseMiniatureAnim : MonoBehaviour { void Start () { originalPos = transform.position; - originalScale = Vector3.Scale(transform.localScale, GoalScale); + originalScale = transform.localScale; } void Update () { @@ -29,14 +29,14 @@ public class WarehouseMiniatureAnim : MonoBehaviour { var startPos = OriginItem ? OriginItem.transform.position : originalPos; transform.position = Vector3.Lerp(startPos, t2.position, alpha); //transform.rotation = Quaternion.Slerp(transform.rotation, t2.rotation, alpha); - var startScale = OriginItem ? OriginItem.transform.localScale : originalScale; - transform.localScale = Vector3.Lerp(startScale, Vector3.Scale(originalScale, t2.lossyScale), alpha); + var startScale = OriginItem.transform.localScale; + transform.localScale = Vector3.Lerp(startScale, Vector3.Scale(originalScale, GoalScale), alpha); } public void End() { transform.SetParent(DestinationAttachment, false); transform.localPosition = Vector3.zero; - transform.localScale = originalScale; + //transform.localScale = originalScale; Destroy(this); } } diff --git a/Assets/WarehouseRow.cs b/Assets/WarehouseRow.cs index 110a6e1..56c2cc7 100755 --- a/Assets/WarehouseRow.cs +++ b/Assets/WarehouseRow.cs @@ -45,7 +45,7 @@ public class WarehouseRow : MonoBehaviour { var i = t.GetSiblingIndex(); var distance = (float)i / (furniture.childCount) * curve.length + Offset; distance = Mathf.Repeat(distance, curve.length); - var pos = curve.GetPointAtDistance(distance); + var pos = curve.GetUniformPointAtDistance(distance); t.position = pos; } } diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 96548d5ef7218d34a18c32ab9fc5ee6908d02ebe..4ab962d6c50f6cc843e8ffb3804ce83b0336af1e 100755 GIT binary patch delta 12 TcmZ3WxIl4&1f$7D$#ww%8ovX< delta 12 TcmZ3WxIl4&1f%Ij$#ww%8pH#_ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 558807b..c4684cd 100755 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 5.3.5f1 +m_EditorVersion: 5.3.4f1 m_StandardAssetsVersion: 0