SDL API renaming: SDL_render.h

Fixes https://github.com/libsdl-org/SDL/issues/6883
This commit is contained in:
Sam Lantinga
2022-12-27 06:21:13 -08:00
parent 083e436a1a
commit 0d54115235
41 changed files with 588 additions and 454 deletions

View File

@@ -98,13 +98,13 @@ render(SDL_Renderer *renderer, int w, int h, double deltaTime)
}
/* draw the background */
SDL_RenderCopy(renderer, space, NULL, NULL);
SDL_RenderTexture(renderer, space, NULL, NULL);
/* draw the ship */
shipData.rect.x = shipData.x;
shipData.rect.y = shipData.y;
SDL_RenderCopy(renderer, ship, NULL, &shipData.rect);
SDL_RenderTexture(renderer, ship, NULL, &shipData.rect);
/* update screen */
SDL_RenderPresent(renderer);
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, 0);
SDL_GetWindowSize(window, &w, &h);
SDL_RenderSetLogicalSize(renderer, w, h);
SDL_SetRenderLogicalSize(renderer, w, h);
/* print out some info about joysticks and try to open accelerometer for use */
printf("There are %d joysticks available\n", SDL_GetNumJoysticks());

View File

@@ -29,7 +29,7 @@ initializeHappyFaces(SDL_Renderer *renderer)
int i;
int w;
int h;
SDL_RenderGetLogicalSize(renderer, &w, &h);
SDL_GetRenderLogicalSize(renderer, &w, &h);
for (i = 0; i < NUM_HAPPY_FACES; i++) {
faces[i].x = randomFloat(0.0f, w - HAPPY_FACE_SIZE);
@@ -48,7 +48,7 @@ render(SDL_Renderer *renderer, double deltaTime)
int w;
int h;
SDL_RenderGetLogicalSize(renderer, &w, &h);
SDL_GetRenderLogicalSize(renderer, &w, &h);
/* setup boundaries for happyface bouncing */
int maxx = w - HAPPY_FACE_SIZE;
@@ -93,7 +93,7 @@ render(SDL_Renderer *renderer, double deltaTime)
}
dstRect.x = faces[i].x;
dstRect.y = faces[i].y;
SDL_RenderCopy(renderer, texture, &srcRect, &dstRect);
SDL_RenderTexture(renderer, texture, &srcRect, &dstRect);
}
/* update screen */
SDL_RenderPresent(renderer);
@@ -149,7 +149,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, 0);
SDL_GetWindowSize(window, &width, &height);
SDL_RenderSetLogicalSize(renderer, width, height);
SDL_SetRenderLogicalSize(renderer, width, height);
initializeTexture(renderer);
initializeHappyFaces(renderer);

View File

@@ -135,7 +135,7 @@ void
getPositionForCharNumber(int n, int *x, int *y)
{
int renderW, renderH;
SDL_RenderGetLogicalSize(renderer, &renderW, &renderH);
SDL_GetRenderLogicalSize(renderer, &renderW, &renderH);
int x_padding = 16; /* padding space on left and right side of screen */
int y_padding = 32; /* padding space at top of screen */
@@ -157,7 +157,7 @@ drawGlyph(int glyph, int positionIndex)
getPositionForCharNumber(positionIndex, &x, &y);
SDL_Rect srcRect = { GLYPH_SIZE_IMAGE * glyph, 0, GLYPH_SIZE_IMAGE, GLYPH_SIZE_IMAGE };
SDL_Rect dstRect = { x, y, GLYPH_SIZE_SCREEN, GLYPH_SIZE_SCREEN };
SDL_RenderCopy(renderer, texture, &srcRect, &dstRect);
SDL_RenderTexture(renderer, texture, &srcRect, &dstRect);
}
/* this function loads our font into an SDL_Texture and returns the SDL_Texture */
@@ -227,7 +227,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, SDL_RENDERER_PRESENTVSYNC);
SDL_GetWindowSize(window, &width, &height);
SDL_RenderSetLogicalSize(renderer, width, height);
SDL_SetRenderLogicalSize(renderer, width, height);
/* load up our font */
loadFont();
@@ -253,7 +253,7 @@ main(int argc, char *argv[])
if (event.window.event == SDL_WINDOWEVENT_RESIZED) {
width = event.window.data1;
height = event.window.data2;
SDL_RenderSetLogicalSize(renderer, width, height);
SDL_SetRenderLogicalSize(renderer, width, height);
#ifdef TEST_INPUT_RECT
textrect.x = 0;
textrect.y = height - GLYPH_SIZE_IMAGE;

View File

@@ -61,7 +61,7 @@ initializeButtons(SDL_Renderer *renderer)
SDL_Color downColor = { 191, 191, 221, 255 }; /* color of drum when pressed */
int renderW, renderH;
SDL_RenderGetLogicalSize(renderer, &renderW, &renderH);
SDL_GetRenderLogicalSize(renderer, &renderW, &renderH);
buttonRect.x = spacing;
buttonRect.y = spacing;
@@ -287,7 +287,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, 0);
SDL_GetWindowSize(window, &width, &height);
SDL_RenderSetLogicalSize(renderer, width, height);
SDL_SetRenderLogicalSize(renderer, width, height);
/* initialize the mixer */
SDL_memset(&mixer, 0, sizeof(mixer));

View File

@@ -17,7 +17,7 @@ render(SDL_Renderer *renderer)
int renderW;
int renderH;
SDL_RenderGetLogicalSize(renderer, &renderW, &renderH);
SDL_GetRenderLogicalSize(renderer, &renderW, &renderH);
/* Come up with a random rectangle */
SDL_Rect rect;
@@ -69,7 +69,7 @@ main(int argc, char *argv[])
}
SDL_GetWindowSize(window, &windowW, &windowH);
SDL_RenderSetLogicalSize(renderer, windowW, windowH);
SDL_SetRenderLogicalSize(renderer, windowW, windowH);
/* Fill screen with black */
SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);

View File

@@ -46,7 +46,7 @@ drawLine(SDL_Renderer *renderer, float startx, float starty, float dx, float dy)
x += dx_prime;
y += dy_prime;
/* draw brush blot */
SDL_RenderCopy(renderer, brush, NULL, &dstRect);
SDL_RenderTexture(renderer, brush, NULL, &dstRect);
}
}
@@ -96,7 +96,7 @@ main(int argc, char *argv[])
renderer = SDL_CreateRenderer(window, NULL, 0);
SDL_GetWindowSize(window, &w, &h);
SDL_RenderSetLogicalSize(renderer, w, h);
SDL_SetRenderLogicalSize(renderer, w, h);
/* load brush texture */
initializeTexture(renderer);
@@ -127,7 +127,7 @@ main(int argc, char *argv[])
}
}
SDL_RenderCopy(renderer, target, NULL, NULL);
SDL_RenderTexture(renderer, target, NULL, NULL);
SDL_RenderPresent(renderer);
}