summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2009-12-09 15:56:56 +0000
committerSam Lantinga <slouken@libsdl.org>2009-12-09 15:56:56 +0000
commit8ee97202978d16e72b95ec62d9aa214d5527276e (patch)
treeadf2d5cb7d2a954df59b5b0211e21241faba2c3d /test
parent304a6bbb6c70a9506b08e803c176a3bf6253cf27 (diff)
Added interfaces for batch drawing of points, lines and rects:
SDL_DrawPoints() SDL_BlendPoints() SDL_BlendLines() SDL_DrawLines() SDL_FillRects() SDL_BlendRects() SDL_RenderPoints() SDL_RenderLines() SDL_RenderRects() Renamed SDL_RenderFill() to SDL_RenderRect() --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404279
Diffstat (limited to 'test')
-rw-r--r--test/automated/render/render.c24
-rw-r--r--test/testdraw2.c8
-rw-r--r--test/testintersections.c10
-rw-r--r--test/testnative.c6
-rw-r--r--test/testsprite2.c14
-rw-r--r--test/testspriteminimal.c2
6 files changed, 32 insertions, 32 deletions
diff --git a/test/automated/render/render.c b/test/automated/render/render.c
index 906e8cb5..91fe5138 100644
--- a/test/automated/render/render.c
+++ b/test/automated/render/render.c
@@ -340,9 +340,9 @@ static int render_clearScreen (void)
*/
/* Clear screen. */
- ret = SDL_RenderFill( NULL );
+ ret = SDL_RenderRect( NULL );
/*
- if (SDL_ATassert( "SDL_RenderFill", ret == 0))
+ if (SDL_ATassert( "SDL_RenderRect", ret == 0))
return -1;
*/
@@ -387,7 +387,7 @@ static int render_testPrimitives (void)
ret = SDL_SetRenderDrawColor( 13, 73, 200, SDL_ALPHA_OPAQUE );
if (SDL_ATassert( "SDL_SetRenderDrawColor", ret == 0))
return -1;
- ret = SDL_RenderFill( &rect );
+ ret = SDL_RenderRect( &rect );
if (SDL_ATassert( "SDL_RenderRect", ret == 0))
return -1;
@@ -399,7 +399,7 @@ static int render_testPrimitives (void)
ret = SDL_SetRenderDrawColor( 200, 0, 100, SDL_ALPHA_OPAQUE );
if (SDL_ATassert( "SDL_SetRenderDrawColor", ret == 0))
return -1;
- ret = SDL_RenderFill( &rect );
+ ret = SDL_RenderRect( &rect );
if (SDL_ATassert( "SDL_RenderRect", ret == 0))
return -1;
@@ -480,8 +480,8 @@ static int render_testPrimitivesBlend (void)
ret = SDL_SetRenderDrawBlendMode( SDL_BLENDMODE_NONE );
if (SDL_ATassert( "SDL_SetRenderDrawBlendMode", ret == 0))
return -1;
- ret = SDL_RenderFill( NULL );
- if (SDL_ATassert( "SDL_RenderFill", ret == 0))
+ ret = SDL_RenderRect( NULL );
+ if (SDL_ATassert( "SDL_RenderRect", ret == 0))
return -1;
rect.x = 10;
rect.y = 25;
@@ -493,8 +493,8 @@ static int render_testPrimitivesBlend (void)
ret = SDL_SetRenderDrawBlendMode( SDL_BLENDMODE_ADD );
if (SDL_ATassert( "SDL_SetRenderDrawBlendMode", ret == 0))
return -1;
- ret = SDL_RenderFill( &rect );
- if (SDL_ATassert( "SDL_RenderFill", ret == 0))
+ ret = SDL_RenderRect( &rect );
+ if (SDL_ATassert( "SDL_RenderRect", ret == 0))
return -1;
rect.x = 30;
rect.y = 40;
@@ -506,8 +506,8 @@ static int render_testPrimitivesBlend (void)
ret = SDL_SetRenderDrawBlendMode( SDL_BLENDMODE_BLEND );
if (SDL_ATassert( "SDL_SetRenderDrawBlendMode", ret == 0))
return -1;
- ret = SDL_RenderFill( &rect );
- if (SDL_ATassert( "SDL_RenderFill", ret == 0))
+ ret = SDL_RenderRect( &rect );
+ if (SDL_ATassert( "SDL_RenderRect", ret == 0))
return -1;
rect.x = 25;
rect.y = 25;
@@ -519,8 +519,8 @@ static int render_testPrimitivesBlend (void)
ret = SDL_SetRenderDrawBlendMode( SDL_BLENDMODE_MOD );
if (SDL_ATassert( "SDL_SetRenderDrawBlendMode", ret == 0))
return -1;
- ret = SDL_RenderFill( &rect );
- if (SDL_ATassert( "SDL_RenderFill", ret == 0))
+ ret = SDL_RenderRect( &rect );
+ if (SDL_ATassert( "SDL_RenderRect", ret == 0))
return -1;
/* Draw blended lines, lines for everyone. */
diff --git a/test/testdraw2.c b/test/testdraw2.c
index 80584ae2..32577964 100644
--- a/test/testdraw2.c
+++ b/test/testdraw2.c
@@ -159,7 +159,7 @@ DrawRects(SDL_WindowID window)
rect.h = rand() % (window_h / 2);
rect.x = (rand() % window_w) - (rect.w / 2);
rect.y = (rand() % window_w) - (rect.h / 2);
- SDL_RenderFill(&rect);
+ SDL_RenderRect(&rect);
}
SDL_SetRenderDrawBlendMode(SDL_BLENDMODE_NONE);
}
@@ -231,7 +231,7 @@ main(int argc, char *argv[])
for (i = 0; i < state->num_windows; ++i) {
SDL_SelectRenderer(state->windows[i]);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
}
srand(time(NULL));
@@ -251,7 +251,7 @@ main(int argc, char *argv[])
case SDL_WINDOWEVENT_EXPOSED:
SDL_SelectRenderer(event.window.windowID);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
break;
}
break;
@@ -262,7 +262,7 @@ main(int argc, char *argv[])
for (i = 0; i < state->num_windows; ++i) {
SDL_SelectRenderer(state->windows[i]);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
DrawRects(state->windows[i]);
DrawLines(state->windows[i]);
diff --git a/test/testintersections.c b/test/testintersections.c
index b935788f..b308c1d6 100644
--- a/test/testintersections.c
+++ b/test/testintersections.c
@@ -150,7 +150,7 @@ DrawRects(SDL_WindowID window)
SDL_SetRenderDrawBlendMode(SDL_BLENDMODE_NONE);
for (i = 0; i < num_rects; ++i) {
SDL_SetRenderDrawColor(255, 127, 0, 255);
- SDL_RenderFill(&rects[i]);
+ SDL_RenderRect(&rects[i]);
}
SDL_SetRenderDrawBlendMode(SDL_BLENDMODE_NONE);
}
@@ -197,7 +197,7 @@ DrawRectRectIntersections(SDL_WindowID window)
SDL_Rect r;
if (SDL_IntersectRect(&rects[i], &rects[j], &r)) {
SDL_SetRenderDrawColor(255, 200, 0, 255);
- SDL_RenderFill(&r);
+ SDL_RenderRect(&r);
}
}
@@ -272,7 +272,7 @@ main(int argc, char *argv[])
for (i = 0; i < state->num_windows; ++i) {
SDL_SelectRenderer(state->windows[i]);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
}
srand(time(NULL));
@@ -326,7 +326,7 @@ main(int argc, char *argv[])
case SDL_WINDOWEVENT_EXPOSED:
SDL_SelectRenderer(event.window.windowID);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
break;
}
break;
@@ -337,7 +337,7 @@ main(int argc, char *argv[])
for (i = 0; i < state->num_windows; ++i) {
SDL_SelectRenderer(state->windows[i]);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
DrawRects(state->windows[i]);
DrawPoints(state->windows[i]);
diff --git a/test/testnative.c b/test/testnative.c
index 7f531547..014927df 100644
--- a/test/testnative.c
+++ b/test/testnative.c
@@ -83,7 +83,7 @@ MoveSprites(SDL_WindowID window, SDL_TextureID sprite)
/* Move the sprite, bounce at the wall, and draw */
n = 0;
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
for (i = 0; i < NUM_SPRITES; ++i) {
position = &positions[i];
velocity = &velocities[i];
@@ -158,7 +158,7 @@ main(int argc, char *argv[])
/* Clear the window, load the sprite and go! */
SDL_SelectRenderer(window);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
sprite = LoadSprite(window, "icon.bmp");
if (!sprite) {
@@ -199,7 +199,7 @@ main(int argc, char *argv[])
case SDL_WINDOWEVENT_EXPOSED:
SDL_SelectRenderer(event.window.windowID);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
break;
}
break;
diff --git a/test/testsprite2.c b/test/testsprite2.c
index 94f33828..a8ab84ac 100644
--- a/test/testsprite2.c
+++ b/test/testsprite2.c
@@ -141,7 +141,7 @@ MoveSprites(SDL_WindowID window, SDL_TextureID sprite)
/* Draw a gray background */
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
/* Test points */
SDL_SetRenderDrawColor(0xFF, 0x00, 0x00, 0xFF);
@@ -163,25 +163,25 @@ MoveSprites(SDL_WindowID window, SDL_TextureID sprite)
temp.y = 1;
temp.w = sprite_w;
temp.h = sprite_h;
- SDL_RenderFill(&temp);
+ SDL_RenderRect(&temp);
SDL_RenderCopy(sprite, NULL, &temp);
temp.x = window_w-sprite_w-1;
temp.y = 1;
temp.w = sprite_w;
temp.h = sprite_h;
- SDL_RenderFill(&temp);
+ SDL_RenderRect(&temp);
SDL_RenderCopy(sprite, NULL, &temp);
temp.x = 1;
temp.y = window_h-sprite_h-1;
temp.w = sprite_w;
temp.h = sprite_h;
- SDL_RenderFill(&temp);
+ SDL_RenderRect(&temp);
SDL_RenderCopy(sprite, NULL, &temp);
temp.x = window_w-sprite_w-1;
temp.y = window_h-sprite_h-1;
temp.w = sprite_w;
temp.h = sprite_h;
- SDL_RenderFill(&temp);
+ SDL_RenderRect(&temp);
SDL_RenderCopy(sprite, NULL, &temp);
/* Test diagonal lines */
@@ -304,7 +304,7 @@ main(int argc, char *argv[])
for (i = 0; i < state->num_windows; ++i) {
SDL_SelectRenderer(state->windows[i]);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
}
if (LoadSprite("icon.bmp") < 0) {
quit(2);
@@ -350,7 +350,7 @@ main(int argc, char *argv[])
case SDL_WINDOWEVENT_EXPOSED:
SDL_SelectRenderer(event.window.windowID);
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
break;
}
break;
diff --git a/test/testspriteminimal.c b/test/testspriteminimal.c
index b1f6055f..3460496e 100644
--- a/test/testspriteminimal.c
+++ b/test/testspriteminimal.c
@@ -87,7 +87,7 @@ MoveSprites(SDL_WindowID window, SDL_TextureID sprite)
/* Draw a gray background */
SDL_SetRenderDrawColor(0xA0, 0xA0, 0xA0, 0xFF);
- SDL_RenderFill(NULL);
+ SDL_RenderRect(NULL);
/* Move the sprite, bounce at the wall, and draw */
for (i = 0; i < NUM_SPRITES; ++i) {