aboutsummaryrefslogtreecommitdiffstats
path: root/demos/applications/combo/bounce.c
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2018-03-10 20:36:12 +1000
committerinmarket <andrewh@inmarket.com.au>2018-03-10 20:36:12 +1000
commit94f1cc2f0a4db0c6f1483e6d648068e031bcc094 (patch)
tree97f50372239108ec9e6e75a3d56e808e479cb7be /demos/applications/combo/bounce.c
parentf265924396167729e8d9fb36a0383263f36c1270 (diff)
downloaduGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.gz
uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.bz2
uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.zip
Change new colors to GFX_RED instead of GFXRED. Use the new color defs
Diffstat (limited to 'demos/applications/combo/bounce.c')
-rw-r--r--demos/applications/combo/bounce.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/demos/applications/combo/bounce.c b/demos/applications/combo/bounce.c
index 54938414..c669eff2 100644
--- a/demos/applications/combo/bounce.c
+++ b/demos/applications/combo/bounce.c
@@ -55,8 +55,8 @@ static gfxThreadHandle thread;
* #define GMISC_INVSQRT_REAL_SLOW GFXON
* in your gfxconf.h file. This should always work although it will probably be slow.
*/
-#define BALLCOLOR1 Red
-#define BALLCOLOR2 Yellow
+#define BALLCOLOR1 GFX_RED
+#define BALLCOLOR2 GFX_YELLOW
#define WALLCOLOR HTML2COLOR(0x303030)
#define BACKCOLOR HTML2COLOR(0xC0C0C0)
#define FLOORCOLOR HTML2COLOR(0x606060)
@@ -117,7 +117,7 @@ static DECLARE_THREAD_FUNCTION(task, param) {
// The ball shadow is darker
if (g*(g+.4)+h*(h+.1) < 1)
- colour = gdispBlendColor(colour, Black, SHADOWALPHA);
+ colour = gdispBlendColor(colour, GFX_BLACK, SHADOWALPHA);
}
gdispStreamColor(colour); /* pixel to the LCD */
}