From 9157369bd2c7d4c0bae7b9a79c345c80420c75bd Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 23 Apr 2014 13:18:05 +0100 Subject: [PATCH] Added property to control icon screen position Refactored Game property names --- Assets/Fungus/Prefabs/Game.prefab | Bin 7648 -> 7768 bytes Assets/Fungus/Scripts/Game.cs | 62 ++++++++++++------ .../{SwipeIcon.png => SwipePanIcon.png} | Bin ...ipeIcon.png.meta => SwipePanIcon.png.meta} | 0 Assets/FungusExample/Scenes/Example.unity | Bin 62576 -> 62696 bytes 5 files changed, 41 insertions(+), 21 deletions(-) rename Assets/Fungus/Textures/{SwipeIcon.png => SwipePanIcon.png} (100%) rename Assets/Fungus/Textures/{SwipeIcon.png.meta => SwipePanIcon.png.meta} (100%) diff --git a/Assets/Fungus/Prefabs/Game.prefab b/Assets/Fungus/Prefabs/Game.prefab index fc2b8be444cf606761e3f573da2037073e862610..e0c029cce279fbcd6a555ad823b32a3148d9e037 100644 GIT binary patch delta 493 zcmaE0eZxk8fk9?D1A|-y0|NsmkbPjHfIXwa#(?FllmD|TGAd722mwhl{8F3B%4N@K`O&d&?T zFU~B<%+CX>RtM?;0Y(tPp}@cdq|$Qo6H6E>7+8R8jmf;i^8A`0Ss;L_nq0^xCImF8 zBr~rx)f3178>I!dID;Kxu@1=M$@*MulmD}E3l*1V7NiCw=D`)~f)q3A0Trn*>cf>b zvCA_WfMpE9GDbjBe6j_H1f%ifKn_Di6Nocl?!a)ZDaf^qW|I$d=rNj4{=}inXaNo_ zV@~PG7dcZWZ|0O^v;jM_k;@Y3I9*12ux$=t+Z@5}*u^Ep=rs8(mky)zFsj4mJ( zHk)$i3kdE3TK^viih%Tj^zW<%lebETO;(f<6A(FV{{4!K_l0itQ(PPFT;DR;P)2`p foXjr~1_lL3W}xzhomwE$9)u?+$VyDEkxc;rUvYi5 delta 370 zcmca%^T1kwfkDQSfkE~G0|NsmkR32lz@AZlW59CO$vSL;f@z5-iu z%99dGq73aU{_c`UBNb4flHpz5+pPEA*aLSC0uHg?YZJ6Yj6uO z+E2FT)?su2njpy!^08x1K}I423(!)>%@eqr1O&GLng4;H2uLqT|IV5*Sy?7*a=(n2 zz~8-_+THYg-5RYM?i^DPJ3o28jQ->cGCw$&fl3>8YB5Z{BP#(kNx^aQ7ugg5D2Qc= diff --git a/Assets/Fungus/Scripts/Game.cs b/Assets/Fungus/Scripts/Game.cs index dac258d1..ea0006d5 100644 --- a/Assets/Fungus/Scripts/Game.cs +++ b/Assets/Fungus/Scripts/Game.cs @@ -48,30 +48,36 @@ namespace Fungus */ public float buttonFadeDuration = 0.25f; + /** + * Time which must elapse before buttons will automatically hide. + */ + public float autoHideButtonDuration = 5f; + /** * Full screen texture used for screen fade effect. */ - public Texture2D fadeTexture; + public Texture2D screenFadeTexture; /** - * Icon to display when swipe pan mode is active. + * Position of continue and swipe icons in normalized screen space coords. + * (0,0) = top left, (1,1) = bottom right */ - public Texture2D swipePanTexture; + public Vector2 iconPosition = new Vector2(1,1); /** * Icon to display when waiting for player input to continue */ - public Texture2D continueTexture; + public Texture2D continueIcon; /** - * Sound effect to play when buttons are clicked. + * Icon to display when swipe pan mode is active. */ - public AudioClip buttonClickClip; + public Texture2D swipePanIcon; /** - * Time which must elapse before buttons will automatically hide. + * Sound effect to play when buttons are clicked. */ - public float autoHideButtonDuration = 5f; + public AudioClip buttonClickClip; /** * Default screen position for Page when player enters a Room. @@ -192,13 +198,20 @@ namespace Fungus if (swipePanActive) { // Draw the swipe panning icon - if (swipePanTexture) + if (swipePanIcon) { - Rect rect = new Rect(Screen.width - swipePanTexture.width, - Screen.height - swipePanTexture.height, - swipePanTexture.width, - swipePanTexture.height); - GUI.DrawTexture(rect, swipePanTexture); + float x = Screen.width * iconPosition.x; + float y = Screen.height * iconPosition.y; + float width = swipePanIcon.width; + float height = swipePanIcon.height; + + x = Mathf.Max(x, 0); + y = Mathf.Max(y, 0); + x = Mathf.Min(x, Screen.width - width); + y = Mathf.Min(y, Screen.height - height); + + Rect rect = new Rect(x, y, width, height); + GUI.DrawTexture(rect, swipePanIcon); } } @@ -206,13 +219,20 @@ namespace Fungus activePage.FinishedWriting()) { // Draw the continue icon - if (continueTexture) + if (continueIcon) { - Rect rect = new Rect(Screen.width - continueTexture.width, - Screen.height - swipePanTexture.height, - continueTexture.width, - continueTexture.height); - GUI.DrawTexture(rect, continueTexture); + float x = Screen.width * iconPosition.x; + float y = Screen.height * iconPosition.y; + float width = continueIcon.width; + float height = continueIcon.height; + + x = Mathf.Max(x, 0); + y = Mathf.Max(y, 0); + x = Mathf.Min(x, Screen.width - width); + y = Mathf.Min(y, Screen.height - height); + + Rect rect = new Rect(x, y, width, height); + GUI.DrawTexture(rect, continueIcon); } } @@ -223,7 +243,7 @@ namespace Fungus // 0 = scene fully obscured GUI.color = new Color(1,1,1, 1f - fadeAlpha); GUI.depth = -1000; - GUI.DrawTexture(new Rect(0, 0, Screen.width, Screen.height), fadeTexture); + GUI.DrawTexture(new Rect(0, 0, Screen.width, Screen.height), screenFadeTexture); } } diff --git a/Assets/Fungus/Textures/SwipeIcon.png b/Assets/Fungus/Textures/SwipePanIcon.png similarity index 100% rename from Assets/Fungus/Textures/SwipeIcon.png rename to Assets/Fungus/Textures/SwipePanIcon.png diff --git a/Assets/Fungus/Textures/SwipeIcon.png.meta b/Assets/Fungus/Textures/SwipePanIcon.png.meta similarity index 100% rename from Assets/Fungus/Textures/SwipeIcon.png.meta rename to Assets/Fungus/Textures/SwipePanIcon.png.meta diff --git a/Assets/FungusExample/Scenes/Example.unity b/Assets/FungusExample/Scenes/Example.unity index ee561b448e4fd84dd47da8f9511459d3e4719e84..b6c855fe361c270f207e98a80f39c426828ab4ec 100644 GIT binary patch delta 1658 zcmZ9MUrbwd6vxjUXv#=jX*(&I*-BRjlomSNpg0Qcm=hRs?&PSh$&CBpQ2*XnBE%vT#3s&X}-Ew$zCI{fF4^%$K%uxHyli3$t^3I^wb% z-5WkEx61v!eQ}u#c*(&d`3`=s(87LujFA1vx_TnLk*=tk zUBHupEm9!|TDM3=xSF?yLcQ@Shvrzer<(9eZzS3$*W*Tg$Ej41ig_u^A-Uk6$Nr*h zQ_riBm>dd6|4nnNX(eh}DbgH#xyT}URJvWIWw_?@fYT~HfuYQN#<^MAp*FNrZKzyn zh;xfKNfo@yoyU#E7Rigu5;nPHUM}7&RVi-#sjHG>F1J*pdiz!HfHFA$N2pr~j=<79m zuLaw8rt96+>V?3jz+!@H3s@ol1c&x=eGeyYJhy)i?Ebp{Cd+wz;J{oZQ6C)ECNqJB zcze?9JNqP2r{HaYV%$aK1^Zj;VIx=_m^kg=2g!re{5l-QeMCnE?{~hv(PpeBssekU zIh+6sfr$<$!Djd>9IQ2ZhmY15$uH@*}}|=pLt(e z*iH02ve#x_0;{XlyWR#H<8C;tK>148rH(i6b<8}aU$w(v{=I33J6aDiSdu@1!#osm z)n0~TeOf>B<?p$H(H-f@7&tg){q;G| z^PH#Wow-vmJ5yjM%2W`|C5Wg9&-Lf*iknqtN8D$Y@_tWgX)l-4#wAaF?av8FtlJoiJNHk%I4NBc=6{tS#9-4E$9ne6i?gD6y6(zGShP zuyiGKy}{Z{J1nwJZ{|<4Fl-d2{{8A%)zt}eHCh|&l2X_V6gxb2?e(r4?1@mgv}#~i zu9@fv5}8w24hz1d7k*?EcEG-X#f8F7m~Fka@H4OgOim%t9L?a_boV&$hA@Rsf4COO zY$WOz3V#N(y-c(LmNyC?g9TyYL5{;N!8(Ly#^&4h**7ibOR1;%5~u*hzzeV(EQsI# zHi}$?l?ALtt{(b$e;U>yOlx*R>b>;}(O&E|r*$6|*lexwU_wgurhz>Od}0*ICwKSG z!oC%zaNwiI2QIy89sfa?)T$?(H}=M0!-kpvdmrpNOuU$H!0cPpgJAyV_`kb+vu_wE z-t;M$4I>aQQVu4=#DvqZQJ6UX?_r*;`r+n`2IuzVA>8V_vE*QG2T{FX z1;NQd>bBmQLYM**$G;SogEgU<{l!MaoA3n`8wHQ z_TBpZFmL*U*KQ9bvTHuyyo4(!SJ?C4od2Y?Hq`q5dgaDt*NUlZ`lO3x&u4b|Y-Px# Ud{s@nVxkPYT`k#$iLttW0WQYOGXMYp