From f4dbcf46f69e91e1c37d4cfc795d3d34b1a15df8 Mon Sep 17 00:00:00 2001
From: Andrew Kesterson <andrew@aklabs.net>
Date: Sat, 12 Jul 2014 08:21:22 -0700
Subject: [PATCH] Close #39 : Integrated better lightmeter, changed lightmeter
 color glow to red to make it more obvious to the player

---
 moonlight/gfx/ui/lightbar.png | Bin 908 -> 1548 bytes
 moonlight/gfx/ui/lightbox.png | Bin 269 -> 0 bytes
 moonlight/src/GameStates.js   |  31 ++++++++-----------------------
 3 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 moonlight/gfx/ui/lightbox.png

diff --git a/moonlight/gfx/ui/lightbar.png b/moonlight/gfx/ui/lightbar.png
index 9cbdea8ef85c187e6fbbe80bf66beab4c2334bdc..18921cfbb70ca0148f24446905af6243c6a07fcb 100644
GIT binary patch
delta 1537
zcmV+c2LAbs2aF6MiBL{Q4GJ0x0000DNk~Le0001h0000O2nGNE05S{p<&hyDe+LW?
z5;RT<cMJdk1*=I!K~!ko?OMHZ97PcRx@UIxPIuBu#-ebUaybzWENrSM0wO;EPe9<@
z8Sg+yswdzzcmN0F1TNbY0xNJ8w)J~|yVFf@J*T<#=@$!R>AGrbcV~L~Z+d!rdxoBG
zY%s<^cFp1HgW3h3T%25UXZZgof9N7WjJ5y>0K|uWzvJ5N96-EW!x83ibtYc`)Bq{~
zBLGAC@&5hqzJKy$6F>(*8$e+Z!Cjy*7X^F?W!6g~gCrB*2hdZIeSag*Z-;(g$@^sh
zOXdi<Il&yRhQp|>{Gm<$uGaOoj7D$hhqbj|zg}7C-)^^yY+<1w=L*+qe=z`-5SX3Q
zBxxW3WbFX}Bm`pTR6_9VTm`^M2+GdE@ao12jS1&OQKJzg1jo(+fY@^kTh8v3C`5+m
z*}2;AgSE5aGXRwk7=T(oO9%u2MnC2|lE{|wk1{&bh0>(iXo<-k@v7t#8s&(*VK$9=
zxP)IYeL^CSCbYC+e>I+-f1ML@E`-r2OKhIXT1iy}84jze-yi+e>-B!y-R=41Ec>SG
z9C{&O@b2BYKQ269xtAK!Icj;2GRx3rhW}!55oMm^?Qn>L5U}Jux>+_Jq&gLk9MPmb
zsDhLC^cle9y*c(gKp!|RIwAzUyy?wp^*xJSf-3f_3I`#8i10~Kf8fiqguk=83IOPe
z;Io@IvADJd$}&I%stSlC0sL^C%V;!i@*Zk9#0)S)>w5eg$B2NOgQ|j3N3cG%$sp&T
zCSc?>c?S;1+qfzE-b3qpx-b0*+E`TuIXA{haMSjtobSmE9P*pRC)Fd7G4=yElqJE5
zW2R(n>VAYiN7`xpe?f(+qQA9;ovkedRrsYP+*(<IFW1+>?KV~b6gO_nW91cw&fU9M
z84R%h;st!S3%|4kpOqziw>!7aH38RZp<G{wR24YO#(9BM)!Z`I4A}BK)(}9>&7I&n
z6&jKpiOK$7<9!Yv|D>KN5==5}p8v^z%y5?ZOL2X$-#Hl$f9J{IHGwb~OrpN;Z*GEH
zErebVi}&uqEiAm}P0jF<_D|IS=5VP&stPh3;^2=zz<Cbe>A>&4e2Kg)vHSKd`mbK0
zeE1MqSx$;Tv2dYDlE`^JRS+V}D5sp{h@7HX=!k7cIaXTuIF8<F+f#l=6^c&6Jx-o;
zh3|&`dQ2hfe?0s(1OUMB^=s@sdxl{M=#=G{=T8qF=vudny}HKEXoND)@o7;YV@4IL
zR~VOg1%M}-+K~YcOOml9oR)p#vtyoFQA^umMQfJwwFuZsxG8-mnv|d4OK_6DW@&ns
zBLdT9?IvE+_^~9O>KWU02EB;WlsWd#vdwV|D40zme~(BrH1tsbwJKiqdKihI%rY!_
zkDa=P|FhTIZ!=3b%V;sn7y#{66(z#ZBwGYfTYFF)Z*i%rXGTyZRaH}xj#)i%Cl53H
zXqNIS0P)FmPSbzf7>!D+s+ytcw2?&`6DDT#+(^1H?Ua9fRw5!D51u72j*xi@KPdxi
z<Ztste;CW6ZRfP*92AhhM<aQ*x2GP!&t;y!yVL1({PJ?w6-AqzD>%#8LK0h8q9g}U
zH1;7>#1V4<p!TduD4T3c8V*I8#4HW^W1}!bMPPKM4yQ!^D#DGtL;;YE6YE#wJ2l4M
zCwvXx8E-K<l;}YKn3zK%t0n<3og`|=8@HXKe=e~N))x6p9mQ+dhD;BMb~9bbWa312
zB>X%8QIT3h7}WdwwG4;5ueZ1Rt3|QrKX12x`S$VS-vN{Wx|lu{bQO+-U3MMxKcF8^
z1jW-p2e*KouYeuDU)P%ewgC+6p5gG2D189M=z@(yr~D+~m{qH|+UFmm1JpP?88lFl
zR{=fW*eEc44$%FJ$&aBbJE~em%p;t<l^y$wGdPCAPP(4pC@fVaZ=OCaRv$eY;P3=d
nxFnH7FNj8Tf_Ngh0#N@0M|X0yETa=?00000NkvXXu0mjfbaB&<

delta 892
zcmV-?1B3jG42%aMiBL{Q4GJ0x0000DNk~Le000180000D2m$~A07RYjW04^re+CZ$
zIV+GkEW`i+03B&mSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00RO^
zL_t(Y$Ay<kcH2M<M5{!eB%7Q!7tYV3F;a>w+j<nm?gmf;VE_K}OOhmnWl1P*Sk6!9
z!u_Qzac*7G4L7>bC2qLT1-H1+e=S{b!QI!o;nG>cCEdyg;F8wzxXw+aJ9f}Ze{UQo
zDwjtL9ZX!uhGevUiJMC2`FfpHM^QLQTSj@=uexU6F$l#PNtPvBr+Tt%=bG5k)M{+b
z>1P81mwn`ngZQ`-i{%v1BKML-<znOiR;21ue8>cvFK646@{T9YbB2Eoe+8d92tx!K
z9AuObI`6X_&lK%SOOPaH($<jGeK5J|=lDe<sdL)d>xa4!D?NxX%Xy;o13b?=oDc()
z^JmVjVq_+2D}M&VX1x!`l5>^CdOrA<;kxK8jmyKufELD4=o@8T4?+%1mQ4I4P7n$~
z=6}eE6Mhd?WLAUWuput-f6(xj4C6iEw$t2pmOIlr+KrVL^}p1`MYq<D^>h|^3jDz0
z<vk<`9^O<qH@FpU(UV%(j<r)HYdap&%yb7>RteK9T&=|4b;JnH1G@eq^~q2!iEWq+
zjk=qp55xClVp1V9XXG|OJ;2ccF|wAROk^^TkRc3HA7{tCAAHy8e*t0PRfQ3x8MLC!
z$Rd+s_@LXFj|4pXJ+s$OuyJ;d2;VgD{m@21!gj`*<(}SN&sP-u=)3Jwj&ALDscK@f
z?1u+&OX>_EF7dmAqOcCxn1p~iMFkc^o~K|QPEAzIgWNfMn8EPP+OImII_*;XWG9*&
znU3Qz#gyib3sBv}e>@9hXSJ<q$qcuJrk(R!s)w@Ztm=Q>K&=_fEkwTS$WPDmm`(UJ
z%Z-UFA>*;hk&9Ub<Gmw~O`>J2ZaX_d4<b|<-bPMV2X+rkt@JtIeCyLS_N4TgwzB+J
z#dfb&Xsl<q44XNI5%k6n(LLW|Zf;u|N49D#=J@&PMboMoQr$uF@ZnGXGAmBEZI6kj
z$5wY^FsmJEb?r2TQPJ!X12w-#7Im~f%$asCVNC~vBv~@IxEX`f$A4ztUjG0c<1K?s
Sr8X4+0000<MNUMnLSTZSv!Xlz

diff --git a/moonlight/gfx/ui/lightbox.png b/moonlight/gfx/ui/lightbox.png
deleted file mode 100644
index 93ec2fdac078cab3bc8667ca99fc98ed6982fc85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 269
zcmeAS@N?(olHy`uVBq!ia0vp^DL^dD!3HGLj;_!JQfx`y?k)`R48aU0Jbvw#KoQOY
zkH}&M25w;xW@MN(M*=9wUgGKN%6^ZHpV3TRPP|3|C?uO15>euupPQSSR|4cRFgO>b
zCYGe8D3oWGWGJ|M`Ua%vrLqIX3q4&NLn02py|IzA!GXu^Vf;ylnf@1?4z_OcFuU|k
z<lsA=AN%~?eA;o~u7F^BK$~Y!no%dyomk~$jS8n*PA}Hq4JiA+^Ng_YtBkwfPMd45
zmS_@SVNvAZa1sz`QBXK>{^spaIeE5+lJlmvE*Czuxms48r%m9h#jPU-AXj<1`njxg
HN@xNA(lJ#l

diff --git a/moonlight/src/GameStates.js b/moonlight/src/GameStates.js
index 6004ff8..1d8fb91 100644
--- a/moonlight/src/GameStates.js
+++ b/moonlight/src/GameStates.js
@@ -150,10 +150,6 @@ GameState.prototype.create = function()
 						this.uigroup);
     this.hud_clockoverlay.anchor.setTo(0.5, 0.5);
     
-    this.fpsText = this.game.add.text(
-        20, 20, '', { font: '16px Arial', fill: '#ffffff' }, this.uigroup
-    );
-
     // this.clockText = this.game.add.text(
     // 	20, SCREEN_HEIGHT - 40, '', { font : '16px Arial', fill: '#ffffff' }, this.uigroup
     // );
@@ -163,21 +159,12 @@ GameState.prototype.create = function()
 	{ font: '16px Arial', fill: '#ffffff' }, this.uigroup
     );
 
-    // this.lightbox = this.game.add.image(game.camera.width / 2 - 50,
-    // 					game.camera.height - 40,
-    // 					'lightbox',
-    // 					0,
-    // 					this.uigroup);
-    // this.lightbar = this.game.add.image(this.lightbox.x + 3,
-    // 					this.lightbox.y + 3,
-    // 					'lightbar',
-    // 					0,
-    // 					this.uigroup);
-    this.lightbar_image = game.cache.getImage('lightbar');
-    this.lightbar_crop = positiveRectangle(0,
-					   0,
-					   this.lightbar_image.width,
-					   this.lightbar_image.height);
+    this.lightbar = this.game.add.sprite(255,
+    					hudoffset + 7 + 6,
+    					'lightbar',
+    					0,
+    					this.uigroup);
+    this.lightbar.anchor.setTo(0, 0.5)
     this.uigroup.setAll('fixedToCamera', true);	
 }
 
@@ -305,7 +292,8 @@ GameState.prototype.update_player_lightmeter = function() {
     }, this)
     player.lightmeter += lightValue;
     player.lightmeter = Math.min(player.lightmeter, 1.0);
-    this.lightbar_crop.width = ((this.lightbar_image.width) * player.lightmeter);
+    this.lightbar.scale.y = player.lightmeter;
+    //this.lightbar_crop.width = ((this.lightbar_image.width) * player.lightmeter);
     //this.lightbar.crop(this.lightbar_crop);
 }
 
@@ -460,9 +448,6 @@ GameState.prototype.update = function()
     	}
     	this.aiSprites.forEach(_draw_aipath, this);
     }
-    if (game.time.fps !== 0) {
-        this.fpsText.setText(game.time.fps + ' FPS');
-    }
     var clockhour = this.clock.getHours();
     if ( this.clock.getHours() > 12 ) 
 	clockhour -= 12;