From 7b8fbb31da4d349b889ff4a736858267947d3866 Mon Sep 17 00:00:00 2001 From: uz Date: Fri, 30 Oct 2009 14:03:21 +0000 Subject: [PATCH] Rewrote the sinus display using the new cc65_sin function. git-svn-id: svn://svn.cc65.org/cc65/trunk@4403 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- samples/tgidemo.c | 78 +++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 47 deletions(-) diff --git a/samples/tgidemo.c b/samples/tgidemo.c index e974ca882..92121c9d9 100644 --- a/samples/tgidemo.c +++ b/samples/tgidemo.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -17,41 +18,6 @@ -static const unsigned char SinusTable[] = { - 0x64,0x63,0x61,0x5F,0x5D,0x5B,0x59,0x57,0x55,0x54, - 0x52,0x50,0x4E,0x4C,0x4A,0x49,0x47,0x45,0x43,0x42, - 0x40,0x3E,0x3C,0x3B,0x39,0x38,0x36,0x34,0x33,0x31, - 0x30,0x2E,0x2D,0x2B,0x2A,0x28,0x27,0x26,0x24,0x23, - 0x22,0x20,0x1F,0x1E,0x1D,0x1C,0x1B,0x1A,0x19,0x18, - 0x17,0x16,0x15,0x14,0x13,0x12,0x12,0x11,0x10,0x10, - 0x0F,0x0E,0x0E,0x0D,0x0D,0x0C,0x0C,0x0C,0x0B,0x0B, - 0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B,0x0B, - 0x0B,0x0B,0x0B,0x0C,0x0C,0x0C,0x0D,0x0D,0x0E,0x0E, - 0x0F,0x10,0x10,0x11,0x12,0x12,0x13,0x14,0x15,0x16, - 0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,0x20, - 0x22,0x23,0x24,0x26,0x27,0x28,0x2A,0x2B,0x2D,0x2E, - 0x30,0x31,0x33,0x34,0x36,0x38,0x39,0x3B,0x3C,0x3E, - 0x40,0x42,0x43,0x45,0x47,0x49,0x4A,0x4C,0x4E,0x50, - 0x52,0x54,0x55,0x57,0x59,0x5B,0x5D,0x5F,0x61,0x63, - 0x64,0x65,0x67,0x69,0x6B,0x6D,0x6F,0x71,0x73,0x74, - 0x76,0x78,0x7A,0x7C,0x7E,0x7F,0x81,0x83,0x85,0x86, - 0x88,0x8A,0x8C,0x8D,0x8F,0x91,0x92,0x94,0x95,0x97, - 0x98,0x9A,0x9B,0x9D,0x9E,0xA0,0xA1,0xA2,0xA4,0xA5, - 0xA6,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,0xB0, - 0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB6,0xB7,0xB8,0xB8, - 0xB9,0xBA,0xBA,0xBB,0xBB,0xBC,0xBC,0xBC,0xBD,0xBD, - 0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD,0xBD, - 0xBD,0xBD,0xBD,0xBC,0xBC,0xBC,0xBB,0xBB,0xBA,0xBA, - 0xB9,0xB8,0xB8,0xB7,0xB6,0xB6,0xB5,0xB4,0xB3,0xB2, - 0xB1,0xB0,0xAF,0xAE,0xAD,0xAC,0xAB,0xAA,0xA9,0xA8, - 0xA6,0xA5,0xA4,0xA2,0xA1,0xA0,0x9E,0x9D,0x9B,0x9A, - 0x98,0x97,0x95,0x94,0x92,0x91,0x8F,0x8D,0x8C,0x8A, - 0x88,0x86,0x85,0x83,0x81,0x7F,0x7E,0x7C,0x7A,0x78, - 0x76,0x74,0x73,0x71,0x6F,0x6D,0x6B,0x69,0x67,0x65 -}; - - - /* Driver stuff */ static unsigned MaxX; static unsigned MaxY; @@ -146,21 +112,39 @@ static void DoCheckerboard (void) static void DoDiagram (void) { static const unsigned char Palette[2] = { COLOR_WHITE, COLOR_BLACK }; - unsigned X, I; + int XOrigin, YOrigin; + int Amp; + int X, Y; + unsigned I; tgi_setpalette (Palette); tgi_setcolor (COLOR_FORE); - tgi_line (10, 10, 10, MaxY-10); - tgi_lineto (MaxX-10, MaxY-10); - tgi_line (8, 12, 10, 10); - tgi_lineto (12, 12); - tgi_line (MaxX-12, MaxY-12, MaxX-10, MaxY-10); - tgi_lineto (MaxX-12, MaxY-8); - for (I = 0, X = 10; X < MaxX-10; ++X) { - tgi_setpixel (X, SinusTable[I]); - if (++I >= sizeof (SinusTable)) { - I = 0; - } + + /* Determine zero and aplitude */ + YOrigin = MaxY / 2; + XOrigin = 10; + Amp = (MaxY - 19) / 2; + + /* Y axis */ + tgi_line (XOrigin, 10, XOrigin, MaxY-10); + tgi_line (XOrigin-2, 12, XOrigin, 10); + tgi_lineto (XOrigin+2, 12); + + /* X axis */ + tgi_line (XOrigin, YOrigin, MaxX-10, YOrigin); + tgi_line (MaxX-12, YOrigin-2, MaxX-10, YOrigin); + tgi_lineto (MaxX-12, YOrigin+2); + + /* Sine */ + tgi_gotoxy (XOrigin, YOrigin); + for (I = 0; I <= 360; I += 5) { + + /* Calculate the next points */ + X = (int) (((long) (MaxX - 19) * I) / 360); + Y = (int) (((long) Amp * -cc65_sin (I)) / 256); + + /* Draw the line */ + tgi_lineto (XOrigin + X, YOrigin + Y); } cgetc (); -- 2.39.5