From 20ff747b7b4c3edbc5d9c0e182075ad797b42357 Mon Sep 17 00:00:00 2001 From: Shaun M Reed Date: Wed, 6 Sep 2017 20:05:59 -0400 Subject: [PATCH] Fixed changing shapes - Changing shapes no longer breaks menu functions - Moved all Change...() functions related to Player in SpinningCube.cs to ToggleMenus.cs script -- Add saving needed data --Color, shape (Speed between shapes, etc..) -Created two new functions to replace 10+ small functions with switch case -ChangeShape(string shape) & ChangeColor(string color) --- Assets/Prefabs/Capsule.prefab | Bin 7736 -> 8736 bytes Assets/Prefabs/Cube.prefab | Bin 11044 -> 8720 bytes Assets/Prefabs/Cube.prefab.meta | 3 +- Assets/Prefabs/Cylinder.prefab | Bin 7736 -> 8736 bytes Assets/Prefabs/Sphere.prefab | Bin 7664 -> 8648 bytes Assets/Scenes/Main.unity | Bin 114392 -> 114336 bytes Assets/Scripts/ExperienceBar.cs | 2 +- Assets/Scripts/SpinningCube.cs | 116 ++--------------- Assets/Scripts/ToggleMenus.cs | 222 ++++++++++++++++++++++++-------- 9 files changed, 183 insertions(+), 160 deletions(-) diff --git a/Assets/Prefabs/Capsule.prefab b/Assets/Prefabs/Capsule.prefab index 518bf18126e87d5f23b070772c61d34f7957035c..d31fda78abe619abb0f08d24d8c22b0eee2090b1 100644 GIT binary patch literal 8736 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 diff --git a/Assets/Prefabs/Cube.prefab b/Assets/Prefabs/Cube.prefab index e9836f5eb05a5f1e2425b9f0b23f78a67871399a..ae9dbcd4bb1311c160458f26481ed8925c45e48e 100644 GIT binary patch delta 1406 zcmZXST}TvB6vxlFx@+ab2EyXz$F{aRv-Y8@tY0DvaHjx;qKbZirLpr z1wv05w+DL&5+XtZS?fs>EU8S8dW(E0B_iL99)#$j&Y77z=ysN~_xyi%?)l$)XC9v( zZFd4x{sHjf2-^XwocElif+Od<;qv!Pym=CCDLpiEX?4A6B~<XYtg+v za(ko+m;8q3?_C`Qti@LzK7hIqvka3$z~4B4)`2x~H$e>I$8Df>WBnIn2SJT^fe^%s zl6X0b+FjWSoD}r5K^SK)Vv?@3xB%a=TO4%>W)&uYhq~$RS5c9>2XiC8j*9qB!W*8? zq9X1k44y2|cFEu-N;0S>zF`43*p z>%l*mS0=B=v4>{(#DY1|KoEoT&sdZ3eu5aBuV77_zDx?@UvNWfSQBq#=Y6%=*r1}w zsZ3-*mixdIovD~2Cy|1Z&O|ebbSfk(5jh53rfg3ra*Q}6d;e#bVHmDhOHV0@cp?RA zCOyC(g^ZjuMFe|9Q}KSe-Wd847mOlk43WVksB#Sbt;PLOHPaP}5KgE1)KFAaaqEh? zH5D9e+~>;9-xa59b%oH3C%vPe9$+~))A(%63G=82Fbin>`SNV>yD&5h0QXVbFl(kC zESy^#f{)1PR_V6hcK&*?I=2eNxG03W2(#nhiBCUz$AmM;o}#v6;u6ZOusl48B{pP3 zelJ_}M_HXHIm~UbUeVV|EhzZ5sOHvGb4#lEHmNpk*$1(VHHf8xz=VKkbrz+HlGpab z$L26+FFI4z?tn+`=ETv0$Lq>KYGpw(%J{A_a~7 clseG=9vuasG_JRs?pY75RkxXy+-Ozw53`OEAOHXW delta 3159 zcmZuzYitx%6uz@9eNjzG3d^f>3Y2QQZi~vB!Y;cl6a)(0)+e<4xGqblJ9T!}xEk0Y z{va_yAtQf`3W^Y7P(vUll8_V)An_56h8SWD#>5zunD~SE2l0G&c80x$)0~}qzjN-n z=bSs=ogR#SFx0?U+bqU97Ba@B(YWhSL!(l2x^=IA(XmS>60ub$Ti<=>n}6Fr3jZ*2 zW$=}+Z=dh$2%T%Wu|F~LJS`bj&Rp^L`ldZZ;~?oBl9}{m_MSR_ky(r>tb+Z*m^G(@ zS(Rj%4J!$7tlCXBteOMR0$wTnSJD*zb4ek<*U@t;Dg2uNTEM5Ur)a2=0-r}u2d^r! zy)-^hGBkUJYGpCGK(Rpe@ER%67T_cbs}XVBMCSvvfY-9aG(1LHPr85V+c|gkVp+_tB2RJ4TPVfITBh#PiKQVDbY6ghY)9~lqkBW2%XBd(MlwW`NOn- z$xtg6d`9z1(soh^Dwv?>x1`v(gPx_0MP=7$ipm1ON!*QR&=_$Z5txIQ7ls!B2^7%^ zRQ4xLut6t1oeic+m30y9R8}ulMn_aCpkAu%Q4e=oT~E6qp~pxe*!Ml!-h?ghq~Y3bWp3imbqcF5O5}Xn zGsxt8hHyxUoE|rybzp&)bMrai7W`#y?jTrBh`uwG1nz`Es7%gb4=*PtV5?IB+;YRYSwffG>Jjt?)M*tVi^_4yb6xV7xp z{skvK-cxyO?8=(nhDg_2hnBxSo4jz5;$^5-m_@htnXCRmUoE~fcvEKCf6eV|q;$qP zPq9okX>hb4$7<}GP5xrzy0c&HJ5a%JtK$ogIHz8k9=*NfLG~Su$4Pyp*McLrlAms4 zA#!+=<`twjR{CxXcIVkogyE}$?asdZ_vQARzq1Bf1l~^}{qpnE=hD8z$_Qam@~tB5 zpSQnwW0&u6NI6N7a06A7Vk0DQd**)!iH>(Lzh3x+ew{#USijub#DCoS+KNj*``$l8 zdD{o(&2N7|csM^=CSk;lLT5gkF$*eBWlY^r4W85UMv~|3 z2jbR^v0EF)ZcP}weZbhQ3*%Bf$X@gzl235N?bqT3PG^aJrIsE)ay4=!1s@2UN$ua% zCNG~m%}rA-RCPxt>=t!S{nDMcCIb71!WY%+7wqe*I^8`kMTirk(%z%KI?c79;n(o* zll^^jn-_L%OP_btBFED9Zl`G~1U4L_>*Jt|`DqZ-(`k)w*XfcXUj;+hyJ(9JNG3yMkU{^%&bM*`(>gM)nmbqM!~ zp6y;7?809_jpQ{mzrf(#S)MnIxE4_R^9e1J+{6npeUxXrvw2NJD(G3j?WEg-^0yF9 LjvNg$riT9qF1@A` diff --git a/Assets/Prefabs/Cube.prefab.meta b/Assets/Prefabs/Cube.prefab.meta index 4749716..6ff34c1 100644 --- a/Assets/Prefabs/Cube.prefab.meta +++ b/Assets/Prefabs/Cube.prefab.meta @@ -1,8 +1,9 @@ fileFormatVersion: 2 guid: 00e22d1ed21d14248801d764a0f6a057 -timeCreated: 1478187146 +timeCreated: 1504664152 licenseType: Free NativeFormatImporter: + mainObjectFileID: 100100000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/Cylinder.prefab b/Assets/Prefabs/Cylinder.prefab index 6b436a1fe8f49fafee5cfb63e59aee4c5808d022..93b9cb54032ad505d6fbfbbdc536c79f8a58bbb6 100644 GIT binary patch literal 8736 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 literal 7736 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 diff --git a/Assets/Prefabs/Sphere.prefab b/Assets/Prefabs/Sphere.prefab index 09d67eadf6c9cabffe765c12d51d4a3cb6ce0f74..ae0452480ea15cb1facffacb648fd053c9dc947c 100644 GIT binary patch literal 8648 zcmdT}ZIB#A8Sc5u2L=pLL6l&;OM*hckPk4C%ExXlIdXC#o4X_yKT>gSckXuL-p*xa z_L2iFHY$l96|qV{piEU_St)~7VGs~OMJ!VlL@-*Wi1|Ulj}onvRt1DoDxS~NJ?~D> z-X&iAXD6NQey02Bciy+(x8I&9HS1}m+K(!w-lf#6WB65z7A#ycf8qQE{fpJVM@L7U zslfiyiho8&UkD#K+4`$LKG*TDzqQZ&!HW9TKu@B!puXIq>PwWWW6CJHXes63&%stz zf7DU+Nr0S2WlO2|pmIFtJ9R#9Q7?jLHu{&Ka#b^@RlN+x8__3E%GIjogMT@&i%=({ zn(-~_IPgyN$v=g7ozGgGh2UW&&R27ON_>*$pNTo-CYRxvq&B0yEgAm~;&ncotVST` zr_iUI(}?RjB_rp>7H-SQIcEH1wH9lJ=u@6|60h^wl#HCyiRXw<&B%Evab2gX4Umy? zvOlAN8~(e{CqHaFF8{lU=f?8WKI8FU*1(M(?na;Qba?~M>fyZ>ZtLNS25#(iANrK@ zeZ=crJ8Q4^6VDOP+UrW{e=?3i`Hr#kj}o_rPEDz}w>u2E$&dBN!YCs#r79YjJfWFoy&|e2Y8it=E$Q zbVcS_A|)fh04M>90Vj`2oIz1GJOhrwC#kvEc&pIo`?4C`ID)({1CHSK`!e7d+ywA$ z^r-^|92N$42CnZw50sw)N7cv5uLDkQto%CQU<&2816LYw4F5)qAwL7oc>Frx5B-*Vp8lp(o8C7EVArMSaUXC`+4#-q z5vRY|_%if})8A}-1$xAdzmXs7LjO5n=<|Jft~k18_e1jmFLAuBG2YSV$9D8-uXc^s!DaOM8T83NTjTqIwx|Ot z-6wOJaM9=7CS3G+b%IYkUUUaVx6%{DCOg=vM${c@2V(^BLJ;{$)}Z^nz<7Xnl>JHx z=QWz0IOugS;fcLIEa|o$yrx$1!hCh0;zetHBo^A%qoaoluMJ$=kIy? z*@X~!MvGA|n(9JA2;JpeM>bVQmA9gb>1gWf(WiU!nZeJ0WD8I8ku5y-k$t`pB0S9@ zM0o5F(v2;!1)+%YrFR5J?T7p~C30VaUlwj9;vKr3gb+*=oJS;iObAKwQi9t@HhJXe z(IF&f#?v+TVmw__hmbn)mP{(5Lx>)qO+`!y;rLdy#&S&)LWmpJ6#eKU8*34_?M2rW zdp(HuAynFs+sfcA>dTN5_f?&~F@)Io(F9MAY~$j`fm4?ZAu^t+n#hwL*(OyJdohHF zJPbL1PIwqXSR_>t9y^5C@0ErSa~Jpr=2D(ERF-C*c8wX_<}o3JxT8bJ3i+k}5J z!RJ}{_ksNqm3p`iRq1t2=oNj^4u(H#mya}X6MA1w_~%=A8}`W=;0QbF291-;QN$g9 z#1|0HDaCZC$EzZ+A+$|Au6DRl+*@`_!4BSTdc2~CG%5ww1&phkaWM))4(Rp=%DDXm zecq#$M>Vl}Pn6W*1kvak1Q0?GHfGjP&~}gs1r!6P{_1E3ajB)MEUuK&2a-OxVcJFd;mA=IEMz zFCOj0xp#5Pf&C`zeA-Dlj|SI!KLioVmWPiV-0-o>mi>79Yi}-jwJ_(@r!Q6~ADR7! z6`y_K$~Sj^ZZ~YE{)x(Ury{moNGgIU=d__@oy|6sY?1agIyiqSB0SAD6rPFNP=_}@ajm>3UrXr$;=C21% zUGrp84yGau(M&D4r{wF$M86&^hMY`kn2I>{I_1pp>r^C1Jj>7bz*LQIz`EN|DYr>Q zh?^srMWqEYPf+Iu*$g&&tVE#OO2o zm19-|H@A=h^l2~JL8&(K>lETn^e9gos*Us3LcE=@HU2L2h%*&2xZ&T09{J}Gw#Ezp z+$LQ3nTpusg`cU2&Hq*O$j?;79xwc~gN+M6QxO{%e#SDJe;<0}*Qv-j@?X#47B2iu zMQmL7nTiPi0a)~5^r$zcA}q2W4x>$+sR)bUPoYhGAwd+upGBMaB7!J_{{n5|jK?g3 z{|;^9a!v{UYJzj0vJj_#{T*$N|0qF}iDpB^TF8&Py+fW?Qc0()S`58GesB(x%V)t0 zd%dEPyXa~^Y$Ob0F>_Issp~_3z^|$(4u)i?ioLCCFHy;6R||I+QJA9`cycE$_tIi`;+ zJU{5uy3~yx&y@o(_MIySpdV20&F2UA(S_sy!qa?y2+u^%58-J(KZIu*j)|pB+3_zrjI11E82)1KA^v?^tdIz#x%PF&I81F0!@dqf8edjrj>g2i7Or(+O@Y;@!R8G zR0s82XD)x@>`l|vQM89pxnn!yGhXqD4QeR{+>1VUTW4qMn$62=>KHIa32Nub-ydr! zx7_Dkgh}5m_nmUS2W&0+=?+usm61n)7(TV~((XNvRlBF$edO?tXO7(S zHWx_?4Jak_qM#NQz37Ho)sIKE_SKLD`qi!8&Ny^sQ2JSeNX739-EhQAXe;6WzG{`Y ztwDqleD{eI(b@UNi>^iCqEqsV-q;r1Xgtv|+oDIdsV}p8OuJCgpXm8$OrcEU$tCh| zg2P=#hg2IMuRYQA99@ij+*2#B8ISFJSbZhe;Gd*~h6A`}6QPRO3IJ=t#O`^(^TB@+<4xbN{QI&7_R2{{w5bCSCvl literal 7664 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 Bi4gz* diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index de0ce7a294f9b40038779eb29b2e0d1e8f87d601..c66b8c8eebfdeb0a608a9ce26621ceade69ddfa0 100644 GIT binary patch delta 9431 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 PmA+iERH3XtBxC;z+0JJu delta 8619 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 diff --git a/Assets/Scripts/ExperienceBar.cs b/Assets/Scripts/ExperienceBar.cs index f437b62..c5628c7 100644 --- a/Assets/Scripts/ExperienceBar.cs +++ b/Assets/Scripts/ExperienceBar.cs @@ -81,7 +81,7 @@ public class ExperienceBar : MonoBehaviour { previousExpRequired = currentRequirement; currentExp -= previousExpRequired; currentRequirement = Mathf.Pow(currentRequirement, 1.05f); - GameObject.FindGameObjectWithTag("Player").GetComponent().RaiseRotationSpeed(); + GameObject.Find("Main Panel").GetComponent().RaiseRotationSpeed(); notify = "Level " + currentLevel + "!"; eventSystem.GetComponent().RewardPopup(currentLevel, 2); diff --git a/Assets/Scripts/SpinningCube.cs b/Assets/Scripts/SpinningCube.cs index f16aea7..5189b8c 100644 --- a/Assets/Scripts/SpinningCube.cs +++ b/Assets/Scripts/SpinningCube.cs @@ -11,27 +11,27 @@ public class SpinningCube : MonoBehaviour public float rotationPerSec = 0.0f; - private string RotationDirection = "Up"; - private Vector3 m_RotationDirection = Vector3.up; - private Vector3 rotationOrigin; - private Vector3 stopRotation = Vector3.zero; - private Vector3 tempRotation; - private float angle2 = 0; - private float angledif, angle1; - private float angleSum = 0; + public string RotationDirection = "Up"; + public Vector3 m_RotationDirection = Vector3.up; + public Vector3 rotationOrigin; + public Vector3 stopRotation = Vector3.zero; + public Vector3 tempRotation; + public float angle2 = 0; + public float angledif, angle1; + public float angleSum = 0; [SerializeField] - private float secPerRotation = 0.0f; + public float secPerRotation = 0.0f; [SerializeField] - private float lastRPS = 0.0f; + public float lastRPS = 0.0f; [SerializeField] - private float secondsPassed = 0.0f; + public float secondsPassed = 0.0f; [SerializeField] - private int rotations; + public int rotations; public void Start() { @@ -44,98 +44,6 @@ public class SpinningCube : MonoBehaviour } */ } - - public void ToggleRotationDirection() - { - - if (m_RotationDirection == Vector3.up) - { - m_RotationDirection = Vector3.down; - RotationDirection = "Down"; - } - else - { - m_RotationDirection = Vector3.up; - RotationDirection = "Up"; - } - Debug.Log("Toggled rotation direction: " + RotationDirection); - - } - - public void ToggleRotation() - { - Debug.Log("Stopping Rotation. Last known rotation direction: " + RotationDirection); - stopRotation = Vector3.zero; - - if (m_RotationDirection == stopRotation) - { - m_RotationDirection = tempRotation; - } - else { - tempRotation = m_RotationDirection; - m_RotationDirection = stopRotation; - } - } - - public void RaiseRotationSpeed() - { - currentSpeed = currentSpeed + currentIncrement; - Debug.Log("Rotation Speed: " + currentSpeed); - } - - public void LowerRotationSpeed() - { - currentSpeed = currentSpeed - currentIncrement; - Debug.Log("Rotation Speed: " + currentSpeed); - } - - public void ResetRotationSpeed() - { - currentSpeed = 20.0f; - Debug.Log("Rotation Speed Reset"); - } - - public void ChangeColorWhite() - { - GameObject.FindGameObjectsWithTag("Player"); - gameObject.GetComponent().material.color = Color.white; - } - - public void ChangeColorBlue() - { - gameObject.GetComponent().material.color = Color.blue; - } - - public void ChangeColorBlack() - { - gameObject.GetComponent().material.color = Color.black; - } - - public void ChangeColorGreen() - { - gameObject.GetComponent().material.color = Color.green; - } - - public void ChangeColorRed() - { - gameObject.GetComponent().material.color = Color.red; - } - - public void ChangeColorMagenta() - { - gameObject.GetComponent().material.color = Color.magenta; - } - - public void ChangeColorYellow() - { - gameObject.GetComponent().material.color = Color.yellow; - } - - public void ChangeColorCyan() - { - gameObject.GetComponent().material.color = Color.cyan; - } - void FixedUpdate() { //Set angle1 = eulerAngle of axis being rotated prior to applying rotation diff --git a/Assets/Scripts/ToggleMenus.cs b/Assets/Scripts/ToggleMenus.cs index 34f291c..7247d22 100644 --- a/Assets/Scripts/ToggleMenus.cs +++ b/Assets/Scripts/ToggleMenus.cs @@ -16,29 +16,31 @@ public class ToggleMenus : MonoBehaviour //Shapes - Prefabs public GameObject player; - public GameObject Square; + public GameObject Cube; public GameObject Sphere; public GameObject Cylinder; public GameObject Capsule; public GameObject Temp; public GameObject mySpawn; - private string Spawn = "Spawn"; - private string Active = "Cube"; - //Use with lighting menu //private GameObject lighting = GameObject.FindGameObjectWithTag("Lighting"); public float lightRotX, lightRotY, lightRotZ; + private string Spawn = "Spawn"; + private string Active = "Cube"; + + // Use this for initialization void Start() { player = GameObject.FindGameObjectWithTag("Player"); + mySpawn = GameObject.Find("PlayerSpawn"); InitializeButtonArrays(); - Temp = Square; + Temp = Cube; lightRotX = 0; lightRotY = 0; lightRotZ = 0; @@ -159,41 +161,56 @@ public class ToggleMenus : MonoBehaviour expMenu.gameObject.SetActive(false); } - public void ChangeShapeSquare() + public void ChangeShape(string shape) { - Instantiate(Square, mySpawn.transform.position, mySpawn.transform.rotation); - Debug.Log("Destroy " + Active); - Destroy(GameObject.Find(Active)); - Active = "Cube(Clone)"; - Debug.Log(Active); + switch (shape) + { + case "Cube": + Instantiate(Cube, mySpawn.transform.position, mySpawn.transform.rotation); + Debug.Log("Destroy " + Active); + Destroy(GameObject.Find(Active)); + Active = "Cube(Clone)"; + player = GameObject.FindGameObjectWithTag("Player"); + Debug.Log(Active); + + break; + + case "Sphere": + Instantiate(Sphere, mySpawn.transform.position, mySpawn.transform.rotation); + Debug.Log("Destroy " + Active); + Destroy(GameObject.Find(Active)); + Active = "Sphere(Clone)"; + player = GameObject.FindGameObjectWithTag("Player"); + Debug.Log(Active); + + break; + + case "Capsule": + Instantiate(Capsule, mySpawn.transform.position, mySpawn.transform.rotation); + Debug.Log("Destroy " + Active); + Destroy(GameObject.Find(Active)); + Active = "Capsule(Clone)"; + player = GameObject.FindGameObjectWithTag("Player"); + Debug.Log(Active); + + break; + + case "Cylinder": + Instantiate(Cylinder, mySpawn.transform.position, mySpawn.transform.rotation); + Debug.Log("Destroy " + Active); + Destroy(GameObject.Find(Active)); + Active = "Cylinder(Clone)"; + player = GameObject.FindGameObjectWithTag("Player"); + Debug.Log(Active); + + break; + + default: + Debug.Log("Error - Not a valid shape : " + shape); + break; + } } - public void ChangeShapeSphere() - { - Instantiate(Sphere, mySpawn.transform.position, mySpawn.transform.rotation); - Debug.Log("Destroy " + Active); - Destroy(GameObject.Find(Active)); - Active = "Sphere(Clone)"; - Debug.Log(Active); - } - - public void ChangeShapeCapsule() - { - Instantiate(Capsule, mySpawn.transform.position, mySpawn.transform.rotation); - Debug.Log("Destroy " + Active); - Destroy(GameObject.Find(Active)); - Active = "Capsule(Clone)"; - Debug.Log(Active); - } - - public void ChangeShapeCylinder() - { - Instantiate(Cylinder, mySpawn.transform.position, mySpawn.transform.rotation); - Debug.Log("Destroy " + Active); - Destroy(GameObject.Find(Active)); - Active = "Cylinder(Clone)"; - Debug.Log(Active); - } /* public void EditLightingRotation() { @@ -310,25 +327,25 @@ public class ToggleMenus : MonoBehaviour mainButtons[3].onClick.AddListener(() => { ToggleLightingMenu(); }); mainButtons[4].onClick.AddListener(() => { ToggleExpMenu(); }); - rotationButtons[0].onClick.AddListener(() => { player.GetComponent().RaiseRotationSpeed(); }); - rotationButtons[1].onClick.AddListener(() => { player.GetComponent().LowerRotationSpeed(); }); - rotationButtons[2].onClick.AddListener(() => { player.GetComponent().ToggleRotation(); }); - rotationButtons[3].onClick.AddListener(() => { player.GetComponent().ToggleRotationDirection(); }); - rotationButtons[4].onClick.AddListener(() => { player.GetComponent().ResetRotationSpeed(); }); + rotationButtons[0].onClick.AddListener(() => { RaiseRotationSpeed(); }); + rotationButtons[1].onClick.AddListener(() => { LowerRotationSpeed(); }); + rotationButtons[2].onClick.AddListener(() => { ToggleRotation(); }); + rotationButtons[3].onClick.AddListener(() => { ToggleRotationDirection(); }); + rotationButtons[4].onClick.AddListener(() => { ResetRotationSpeed(); }); - colorButtons[0].onClick.AddListener(() => { player.GetComponent().ChangeColorBlack(); }); - colorButtons[1].onClick.AddListener(() => { player.GetComponent().ChangeColorWhite(); }); - colorButtons[2].onClick.AddListener(() => { player.GetComponent().ChangeColorRed(); }); - colorButtons[3].onClick.AddListener(() => { player.GetComponent().ChangeColorGreen(); }); - colorButtons[4].onClick.AddListener(() => { player.GetComponent().ChangeColorBlue(); }); - colorButtons[5].onClick.AddListener(() => { player.GetComponent().ChangeColorYellow(); }); - colorButtons[6].onClick.AddListener(() => { player.GetComponent().ChangeColorCyan(); }); - colorButtons[7].onClick.AddListener(() => { player.GetComponent().ChangeColorMagenta(); }); + colorButtons[0].onClick.AddListener(() => { ChangeColor("Black"); }); + colorButtons[1].onClick.AddListener(() => { ChangeColor("White"); }); + colorButtons[2].onClick.AddListener(() => { ChangeColor("Red"); }); + colorButtons[3].onClick.AddListener(() => { ChangeColor("Green"); }); + colorButtons[4].onClick.AddListener(() => { ChangeColor("Blue"); }); + colorButtons[5].onClick.AddListener(() => { ChangeColor("Yellow"); }); + colorButtons[6].onClick.AddListener(() => { ChangeColor("Cyan"); }); + colorButtons[7].onClick.AddListener(() => { ChangeColor("Magenta"); }); - shapesButtons[0].onClick.AddListener(() => { ChangeShapeCylinder(); }); - shapesButtons[1].onClick.AddListener(() => { ChangeShapeCapsule(); }); - shapesButtons[2].onClick.AddListener(() => { ChangeShapeSquare(); }); - shapesButtons[3].onClick.AddListener(() => { ChangeShapeSphere(); }); + shapesButtons[0].onClick.AddListener(() => { ChangeShape("Cylinder"); }); + shapesButtons[1].onClick.AddListener(() => { ChangeShape("Capsule"); }); + shapesButtons[2].onClick.AddListener(() => { ChangeShape("Cube"); }); + shapesButtons[3].onClick.AddListener(() => { ChangeShape("Sphere"); }); //Temporary save/load hidden in lighting for debug lightingButtons[0].onClick.AddListener(() => { GameObject.Find("EventSystem").GetComponent().Save(); }); @@ -340,4 +357,101 @@ public class ToggleMenus : MonoBehaviour expButtons[2].onClick.AddListener(() => { GameObject.Find("Gained Image").GetComponent().ResetExp(); }); } + + public void ToggleRotationDirection() + { + + if (GameObject.FindGameObjectWithTag("Player").GetComponent().m_RotationDirection == Vector3.up) + { + GameObject.FindGameObjectWithTag("Player").GetComponent().m_RotationDirection = Vector3.down; + GameObject.FindGameObjectWithTag("Player").GetComponent().RotationDirection = "Down"; + } + else + { + GameObject.FindGameObjectWithTag("Player").GetComponent().m_RotationDirection = Vector3.up; + GameObject.FindGameObjectWithTag("Player").GetComponent().RotationDirection = "Up"; + } + Debug.Log("Toggled rotation direction: " + GameObject.FindGameObjectWithTag("Player").GetComponent().RotationDirection); + + } + + public void ToggleRotation() + { + Debug.Log("Stopping Rotation. Last known rotation direction: " + GameObject.FindGameObjectWithTag("Player").GetComponent().RotationDirection); + GameObject.FindGameObjectWithTag("Player").GetComponent().stopRotation = Vector3.zero; + + if (GameObject.FindGameObjectWithTag("Player").GetComponent().m_RotationDirection == GameObject.FindGameObjectWithTag("Player").GetComponent().stopRotation) + { + GameObject.FindGameObjectWithTag("Player").GetComponent().m_RotationDirection = GameObject.FindGameObjectWithTag("Player").GetComponent().tempRotation; + } + else + { + GameObject.FindGameObjectWithTag("Player").GetComponent().tempRotation = GameObject.FindGameObjectWithTag("Player").GetComponent().m_RotationDirection; + GameObject.FindGameObjectWithTag("Player").GetComponent().m_RotationDirection = GameObject.FindGameObjectWithTag("Player").GetComponent().stopRotation; + } + } + + public void RaiseRotationSpeed() + { + GameObject.FindGameObjectWithTag("Player").GetComponent().currentSpeed = GameObject.FindGameObjectWithTag("Player").GetComponent().currentSpeed + GameObject.FindGameObjectWithTag("Player").GetComponent().currentIncrement; + Debug.Log("Rotation Speed: " + GameObject.FindGameObjectWithTag("Player").GetComponent().currentSpeed); + } + + public void LowerRotationSpeed() + { + GameObject.FindGameObjectWithTag("Player").GetComponent().currentSpeed = GameObject.FindGameObjectWithTag("Player").GetComponent().currentSpeed - GameObject.FindGameObjectWithTag("Player").GetComponent().currentIncrement; + Debug.Log("Rotation Speed: " + GameObject.FindGameObjectWithTag("Player").GetComponent().currentSpeed); + } + + public void ResetRotationSpeed() + { + GameObject.FindGameObjectWithTag("Player").GetComponent().currentSpeed = 20.0f; + Debug.Log("Rotation Speed Reset"); + } + + public void ChangeColor(string color) + { + switch (color) + { + + case "White": + GameObject.FindGameObjectWithTag("Player").GetComponent().material.color = Color.white; + break; + + case "Blue": + GameObject.FindGameObjectWithTag("Player").GetComponent().material.color = Color.blue; + break; + + case "Black": + GameObject.FindGameObjectWithTag("Player").GetComponent().material.color = Color.black; + break; + + case "Green": + GameObject.FindGameObjectWithTag("Player").GetComponent().material.color = Color.green; + break; + + case "Red": + GameObject.FindGameObjectWithTag("Player").GetComponent().material.color = Color.red; + break; + + case "Magenta": + GameObject.FindGameObjectWithTag("Player").GetComponent().material.color = Color.magenta; + break; + + case "Yellow": + GameObject.FindGameObjectWithTag("Player").GetComponent().material.color = Color.yellow; + break; + + case "Cyan": + GameObject.FindGameObjectWithTag("Player").GetComponent().material.color = Color.cyan; + break; + + + default: + Debug.Log("Error - no color named :" + color); + break; + + + } + } }