bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Added a tgi_arc function. Removed the old ellipse code and create a new

Browse Source 
ellipse module that calls tgi_arc.


git-svn-id: svn://svn.cc65.org/cc65/trunk@4446 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2009-11-05 19:52:18 +00:00
parent 78070d8bfb
commit de6050f21d
5 changed files with 125 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
asminc/tgi-kernel.inc
View File

@@ -150,44 +150,43 @@ TGI_TEXT_VERTICAL = 1
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
; C callable functions ; C callable functions
.global _tgi_load .global _tgi_arc
.global _tgi_load_driver .global _tgi_bar
.global _tgi_unload .global _tgi_circle
.global _tgi_install .global _tgi_clear
.global _tgi_uninstall
.global _tgi_init
.global _tgi_ioctl
.global _tgi_done .global _tgi_done
.global _tgi_ellipse
.global _tgi_getcolor
.global _tgi_getcolorcount
.global _tgi_getdefpalette
.global _tgi_geterror .global _tgi_geterror
.global _tgi_geterrormsg .global _tgi_geterrormsg
.global _tgi_clear
.global _tgi_getpagecount
.global _tgi_setviewpage
.global _tgi_setdrawpage
.global _tgi_getcolorcount
.global _tgi_getmaxcolor .global _tgi_getmaxcolor
.global _tgi_setcolor
.global _tgi_getcolor
.global _tgi_setpalette
.global _tgi_getpalette
.global _tgi_getdefpalette
.global _tgi_getxres
.global _tgi_getmaxx .global _tgi_getmaxx
.global _tgi_getyres
.global _tgi_getmaxy .global _tgi_getmaxy
.global _tgi_getpagecount
.global _tgi_getpalette
.global _tgi_getpixel .global _tgi_getpixel
.global _tgi_setpixel .global _tgi_getxres
.global _tgi_getyres
.global _tgi_gotoxy .global _tgi_gotoxy
.global _tgi_init
.global _tgi_install
.global _tgi_ioctl
.global _tgi_line .global _tgi_line
.global _tgi_lineto .global _tgi_lineto
.global _tgi_circle .global _tgi_load
.global _tgi_ellipse .global _tgi_load_driver
.global _tgi_bar .global _tgi_outtext
.global _tgi_outtextxy
.global _tgi_setcolor
.global _tgi_setdrawpage
.global _tgi_setpalette
.global _tgi_setpixel
.global _tgi_setviewpage
.global _tgi_textheight
.global _tgi_textscale .global _tgi_textscale
.global _tgi_textstyle .global _tgi_textstyle
.global _tgi_textwidth .global _tgi_textwidth
.global _tgi_textheight .global _tgi_uninstall
.global _tgi_outtext .global _tgi_unload
.global _tgi_outtextxy

36
doc/funcref.sgml
View File

@@ -505,6 +505,7 @@ It does not declare any functions.
<sect1><tt/tgi.h/<label id="tgi.h"><p> <sect1><tt/tgi.h/<label id="tgi.h"><p>
<itemize> <itemize>
<item><ref id="tgi_arc" name="tgi_arc">
<item><ref id="tgi_bar" name="tgi_bar"> <item><ref id="tgi_bar" name="tgi_bar">
<item><ref id="tgi_circle" name="tgi_circle"> <item><ref id="tgi_circle" name="tgi_circle">
<item><ref id="tgi_clear" name="tgi_clear"> <item><ref id="tgi_clear" name="tgi_clear">
@@ -4872,6 +4873,39 @@ be used in presence of a prototype.
</quote> </quote>
<sect1>tgi_arc<label id="tgi_arc"><p>
<quote>
<descrip>
<tag/Function/Draw an elliptic arc in the current color.
<tag/Header/<tt/<ref id="tgi.h" name="tgi.h">/
<tag/Declaration/<tt/void __fastcall__ tgi_arc (int x, int y,
unsigned char rx, unsigned char ry, unsigned sa, unsigned ea);/
<tag/Description/The function draws an elliptic arc with center at x/y and
radii rx/ry using the current drawing color. The arc covers the angle
between sa and ea (startangle and endangle), which must be in the range
0..360.
<tag/Limits/<itemize>
<item>The function is only available as fastcall function, so it may only
be used in presence of a prototype.
<item>The function behaves unexpectedly or may crash if the angles are out
of range.
</itemize>
<tag/Availability/cc65
<tag/See also/
<ref id="tgi_bar" name="tgi_bar">,
<ref id="tgi_circle" name="tgi_circle">,
<ref id="tgi_ellipse" name="tgi_ellipse">,
<ref id="tgi_setcolor" name="tgi_setcolor">
<tag/Example/<verb>
/* Draw the upper half of an ellipse */
tgi_setcolor(TGI_COLOR_BLUE);
tgi_arc (50, 50, 40, 20, 0, 180);
</verb>
</descrip>
</quote>
<sect1>tgi_bar<label id="tgi_bar"><p> <sect1>tgi_bar<label id="tgi_bar"><p>
<quote> <quote>
@@ -4910,6 +4944,7 @@ be used in presence of a prototype.
</itemize> </itemize>
<tag/Availability/cc65 <tag/Availability/cc65
<tag/See also/ <tag/See also/
<ref id="tgi_arc" name="tgi_arc">,
<ref id="tgi_bar" name="tgi_bar">, <ref id="tgi_bar" name="tgi_bar">,
<ref id="tgi_ellipse" name="tgi_ellipse">, <ref id="tgi_ellipse" name="tgi_ellipse">,
<ref id="tgi_setcolor" name="tgi_setcolor"> <ref id="tgi_setcolor" name="tgi_setcolor">
@@ -4975,6 +5010,7 @@ be used in presence of a prototype.
</itemize> </itemize>
<tag/Availability/cc65 <tag/Availability/cc65
<tag/See also/ <tag/See also/
<ref id="tgi_arc" name="tgi_arc">,
<ref id="tgi_bar" name="tgi_bar">, <ref id="tgi_bar" name="tgi_bar">,
<ref id="tgi_circle" name="tgi_circle">, <ref id="tgi_circle" name="tgi_circle">,
<ref id="tgi_setcolor" name="tgi_setcolor"> <ref id="tgi_setcolor" name="tgi_setcolor">

3
libsrc/tgi/Makefile
View File

@@ -29,7 +29,7 @@ CFLAGS = -Osir -g -T -t $(SYS) --forget-inc-paths -I . -I ../../include
#-------------------------------------------------------------------------- #--------------------------------------------------------------------------
# Object files # Object files
C_OBJS = tgi_ellipse.o \ C_OBJS = tgi_arc.o \
tgi_load.o \ tgi_load.o \
tgi_load_driver.o \ tgi_load_driver.o \
tgi_load_vectorfont.o tgi_load_vectorfont.o
@@ -41,6 +41,7 @@ S_OBJS = tgi-kernel.o \
tgi_clipline.o \ tgi_clipline.o \
tgi_curtoxy.o \ tgi_curtoxy.o \
tgi_done.o \ tgi_done.o \
tgi_ellipse.o \
tgi_free_vectorfont.o \ tgi_free_vectorfont.o \
tgi_getcolor.o \ tgi_getcolor.o \
tgi_getcolorcount.o \ tgi_getcolorcount.o \

53
libsrc/tgi/tgi_ellipse.c → libsrc/tgi/tgi_arc.c
View File

@@ -1,8 +1,8 @@
/*****************************************************************************/ /*****************************************************************************/
/* */ /* */
/* tgi_ellipse.c */ /* tgi_arc.c */
/* */ /* */
/* Draw a full ellipse */ /* Draw an ellipse arc */
/* */ /* */
/* */ /* */
/* */ /* */
@@ -56,36 +56,45 @@ static int RoundMul (int rhs, int lhs)
void __fastcall__ tgi_ellipse (int x, int y, unsigned char rx, unsigned char ry) void __fastcall__ tgi_arc (int x, int y, unsigned char rx, unsigned char ry,
/* Draw a full ellipse with center at x/y and radii rx/ry using the current unsigned sa, unsigned ea)
* drawing color. /* Draw an ellipse arc with center at x/y and radii rx/ry using the current
* drawing color. The arc covers the angle between sa and ea (startangle and
* endangle), which must be in the range 0..360 (otherwise the function may
* bevave unextectedly).
*/ */
{ {
int x1, y1, x2, y2; int x1, y1, x2, y2;
unsigned angle;
unsigned char inc; unsigned char inc;
unsigned size = rx + ry; unsigned char done = 0;
if (size >= 128) { /* Bail out if there's nothing to do */
inc = 12; if (sa > ea) {
} else if (size >= 32) { return;
inc = 15;
} else if (size >= 12) {
inc = 20;
} else {
inc = 45;
} }
x1 = x + rx; /* Determine the number of segments to use. This may be refined ... */
y1 = y; if (rx + ry >= 25) {
angle = 0; inc = 12;
for (angle = 0; angle <= 360; angle += inc) { } else {
x2 = x + RoundMul (rx, cc65_cos (angle)); inc = 24;
y2 = y + RoundMul (ry, cc65_sin (angle)); }
/* Calculate the start coords */
x1 = x + RoundMul (rx, cc65_cos (sa));
y1 = y + RoundMul (ry, cc65_sin (sa));
do {
sa += inc;
if (sa >= ea) {
sa = ea;
done = 1;
}
x2 = x + RoundMul (rx, cc65_cos (sa));
y2 = y - RoundMul (ry, cc65_sin (sa));
tgi_line (x1, y1, x2, y2); tgi_line (x1, y1, x2, y2);
x1 = x2; x1 = x2;
y1 = y2; y1 = y2;
} } while (!done);
} }

28
libsrc/tgi/tgi_ellipse.s Normal file
View File

@@ -0,0 +1,28 @@
;
; Ullrich von Bassewitz, 2009-11-05
;
; void __fastcall__ tgi_ellipse (int x, int y, unsigned char rx, unsigned char ry);
; /* Draw a full ellipse with center at x/y and radii rx/ry using the current
; * drawing color.
; */
;
.include "tgi-kernel.inc"
.import pusha, push0
;----------------------------------------------------------------------------
;
.code
.proc _tgi_ellipse
jsr pusha ; Push ry
jsr push0 ; Start angle is 0
lda #<360
ldx #>360 ; End angle is 360
jmp _tgi_arc
.endproc