fries/GRRLIB
1
0
Fork 0
mirror of https://github.com/GRRLIB/GRRLIB.git synced 2024-11-22 23:12:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CHG] change u32 color to an array for differents primitive allowing

Browse source 
better control.
This commit is contained in:
N0NameN0 2009-03-09 14:17:05 +00:00
parent 1a0b496d3b
commit acd4ffb972
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
GRRLIB/GRRLIB/GRRLIB.c
View file

@ -130,8 +130,9 @@ inline void GRRLIB_FillScreen(u32 color) {
*/ */
inline void GRRLIB_Plot(f32 x, f32 y, u32 color) { inline void GRRLIB_Plot(f32 x, f32 y, u32 color) {
Vector v[] = {{x,y,0.0f}}; Vector v[] = {{x,y,0.0f}};
u32 ncolor[] = {color};
GRRLIB_NPlot(v, color, 1); GRRLIB_NPlot(v, ncolor, 1);
} }
/** /**
@ -140,7 +141,7 @@ inline void GRRLIB_Plot(f32 x, f32 y, u32 color) {
* @param color The color of the points in RGBA format. * @param color The color of the points in RGBA format.
* @param n Number of points in the vector array. * @param n Number of points in the vector array.
*/ */
void GRRLIB_NPlot(Vector v[], u32 color, long n) { void GRRLIB_NPlot(Vector v[], u32 color[], long n) {
GRRLIB_GXEngine(v, color, n, GX_POINTS); GRRLIB_GXEngine(v, color, n, GX_POINTS);
} }
@ -154,8 +155,9 @@ void GRRLIB_NPlot(Vector v[], u32 color, long n) {
*/ */
inline void GRRLIB_Line(f32 x1, f32 y1, f32 x2, f32 y2, u32 color) { inline void GRRLIB_Line(f32 x1, f32 y1, f32 x2, f32 y2, u32 color) {
Vector v[] = {{x1,y1,0.0f}, {x2,y2,0.0f}}; Vector v[] = {{x1,y1,0.0f}, {x2,y2,0.0f}};
u32 ncolor[] = {color,color};
GRRLIB_NGone(v, color, 2); GRRLIB_NGone(v, ncolor, 2);
} }
/** /**
@ -171,12 +173,13 @@ inline void GRRLIB_Rectangle(f32 x, f32 y, f32 width, f32 height, u32 color, u8
f32 x2 = x+width; f32 x2 = x+width;
f32 y2 = y+height; f32 y2 = y+height;
Vector v[] = {{x,y,0.0f}, {x2,y,0.0f}, {x2,y2,0.0f}, {x,y2,0.0f}, {x,y,0.0f}}; Vector v[] = {{x,y,0.0f}, {x2,y,0.0f}, {x2,y2,0.0f}, {x,y2,0.0f}, {x,y,0.0f}};
u32 ncolor[]= {color,color,color,color,color};
if (!filled) { if (!filled) {
GRRLIB_NGone(v, color, 5); GRRLIB_NGone(v, ncolor, 5);
} }
else { else {
GRRLIB_NGoneFilled(v, color, 4); GRRLIB_NGoneFilled(v, ncolor, 4);
} }
} }
@ -191,6 +194,7 @@ inline void GRRLIB_Rectangle(f32 x, f32 y, f32 width, f32 height, u32 color, u8
*/ */
inline void GRRLIB_Circle(f32 x, f32 y, f32 radius, u32 color, u8 filled) { inline void GRRLIB_Circle(f32 x, f32 y, f32 radius, u32 color, u8 filled) {
Vector v[36]; Vector v[36];
u32 ncolor[36];
u32 a; u32 a;
f32 ra; f32 ra;
f32 G_DTOR = M_DTOR * 10; f32 G_DTOR = M_DTOR * 10;
@ -201,13 +205,14 @@ inline void GRRLIB_Circle(f32 x, f32 y, f32 radius, u32 color, u8 filled) {
v[a].x = cos(ra) * radius + x; v[a].x = cos(ra) * radius + x;
v[a].y = sin(ra) * radius + y; v[a].y = sin(ra) * radius + y;
v[a].z = 0.0f; v[a].z = 0.0f;
ncolor[a] = color;
} }
if (!filled) { if (!filled) {
GRRLIB_GXEngine(v, color, 36, GX_LINESTRIP); GRRLIB_GXEngine(v, ncolor, 36, GX_LINESTRIP);
} }
else { else {
GRRLIB_GXEngine(v, color, 36, GX_TRIANGLEFAN); GRRLIB_GXEngine(v, ncolor, 36, GX_TRIANGLEFAN);
} }
} }
@ -217,7 +222,7 @@ inline void GRRLIB_Circle(f32 x, f32 y, f32 radius, u32 color, u8 filled) {
* @param color The color of the filled polygon in RGBA format. * @param color The color of the filled polygon in RGBA format.
* @param n Number of points in the vector. * @param n Number of points in the vector.
*/ */
void GRRLIB_NGone(Vector v[], u32 color, long n) { void GRRLIB_NGone(Vector v[], u32 color[], long n) {
GRRLIB_GXEngine(v, color, n, GX_LINESTRIP); GRRLIB_GXEngine(v, color, n, GX_LINESTRIP);
} }
@ -227,7 +232,7 @@ void GRRLIB_NGone(Vector v[], u32 color, long n) {
* @param color The color of the filled polygon in RGBA format. * @param color The color of the filled polygon in RGBA format.
* @param n Number of points in the vector. * @param n Number of points in the vector.
*/ */
void GRRLIB_NGoneFilled(Vector v[], u32 color, long n) { void GRRLIB_NGoneFilled(Vector v[], u32 color[], long n) {
GRRLIB_GXEngine(v, color, n, GX_TRIANGLEFAN); GRRLIB_GXEngine(v, color, n, GX_TRIANGLEFAN);
} }
@ -1081,13 +1086,13 @@ void GRRLIB_BMFX_Scatter(struct GRRLIB_texImg texsrc, GRRLIB_texImg texdest, int
/** /**
* Draws a vector. * Draws a vector.
*/ */
void GRRLIB_GXEngine(Vector v[], u32 color, long n, u8 fmt) { void GRRLIB_GXEngine(Vector v[], u32 color[], long n, u8 fmt) {
int i; int i;
GX_Begin(fmt, GX_VTXFMT0, n); GX_Begin(fmt, GX_VTXFMT0, n);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
GX_Position3f32(v[i].x, v[i].y, v[i].z); GX_Position3f32(v[i].x, v[i].y, v[i].z);
GX_Color1u32(color); GX_Color1u32(color[i]);
} }
GX_End(); GX_End();
} }

8
GRRLIB/GRRLIB/GRRLIB.h
View file

@ -106,14 +106,14 @@ unsigned char GRRLIB_GetBlend();
inline void GRRLIB_FillScreen(u32 color); inline void GRRLIB_FillScreen(u32 color);
inline void GRRLIB_Plot(f32 x, f32 y, u32 color); inline void GRRLIB_Plot(f32 x, f32 y, u32 color);
void GRRLIB_NPlot(Vector v[], u32 color, long n); void GRRLIB_NPlot(Vector v[], u32 color[], long n);
inline void GRRLIB_Line(f32 x1, f32 y1, f32 x2, f32 y2, u32 color); inline void GRRLIB_Line(f32 x1, f32 y1, f32 x2, f32 y2, u32 color);
inline void GRRLIB_Rectangle(f32 x, f32 y, f32 width, f32 height, u32 color, u8 filled); inline void GRRLIB_Rectangle(f32 x, f32 y, f32 width, f32 height, u32 color, u8 filled);
inline void GRRLIB_Circle(f32 x, f32 y, f32 radius, u32 color, u8 filled); inline void GRRLIB_Circle(f32 x, f32 y, f32 radius, u32 color, u8 filled);
void GRRLIB_NGone(Vector v[], u32 color, long n); void GRRLIB_NGone(Vector v[], u32 color[], long n);
void GRRLIB_NGoneFilled(Vector v[], u32 color, long n); void GRRLIB_NGoneFilled(Vector v[], u32 color[], long n);
GRRLIB_texImg GRRLIB_CreateEmptyTexture(unsigned int, unsigned int); GRRLIB_texImg GRRLIB_CreateEmptyTexture(unsigned int, unsigned int);
GRRLIB_texImg GRRLIB_LoadTexture(const unsigned char my_img[]); GRRLIB_texImg GRRLIB_LoadTexture(const unsigned char my_img[]);
@ -155,7 +155,7 @@ void GRRLIB_BMFX_Blur(struct GRRLIB_texImg texsrc, GRRLIB_texImg texdest, int fa
void GRRLIB_BMFX_Scatter(struct GRRLIB_texImg texsrc, GRRLIB_texImg texdest, int factor); void GRRLIB_BMFX_Scatter(struct GRRLIB_texImg texsrc, GRRLIB_texImg texdest, int factor);
void GRRLIB_BMFX_Pixelate(struct GRRLIB_texImg texsrc, GRRLIB_texImg texdest, int factor); void GRRLIB_BMFX_Pixelate(struct GRRLIB_texImg texsrc, GRRLIB_texImg texdest, int factor);
void GRRLIB_GXEngine(Vector v[], u32 color, long count, u8 fmt); void GRRLIB_GXEngine(Vector v[], u32 color[], long count, u8 fmt);
void GRRLIB_Init(); void GRRLIB_Init();

3
examples/lesson1/source/main.c
View file

@ -63,6 +63,7 @@ int main() {
ir_t ir1; ir_t ir1;
u32 wpaddown, wpadheld; u32 wpaddown, wpadheld;
Vector triangle[] = {{400,200,0.0f}, {500,400,0.0f}, {300,400,0.0f}}; Vector triangle[] = {{400,200,0.0f}, {500,400,0.0f}, {300,400,0.0f}};
u32 trianglecolor[] = {GRRLIB_GREEN, GRRLIB_RED, GRRLIB_BLUE};
GRRLIB_Init(); GRRLIB_Init();
@ -145,7 +146,7 @@ int main() {
GRRLIB_Rectangle(100, 100, 200, 100, GRRLIB_RED, 1); GRRLIB_Rectangle(100, 100, 200, 100, GRRLIB_RED, 1);
GRRLIB_Line(100, 100, 350, 200, GRRLIB_SILVER); GRRLIB_Line(100, 100, 350, 200, GRRLIB_SILVER);
GRRLIB_NGoneFilled(triangle, GRRLIB_GRAY, 3); GRRLIB_NGoneFilled(triangle, trianglecolor, 3);
GRRLIB_Rectangle(left + 150, top + 150, 200, 200, 0x0000FFC8, 1); // Blue with alpha GRRLIB_Rectangle(left + 150, top + 150, 200, 200, 0x0000FFC8, 1); // Blue with alpha
GRRLIB_Circle(left + 300, top + 300, 50, GRRLIB_OLIVE, 1); GRRLIB_Circle(left + 300, top + 300, 50, GRRLIB_OLIVE, 1);