Commit 5fa0cbc4ba14406595e2ec03e18f0ecc6814e577
2016-03-27T22:25:13
iOS: Restored older version of rectangles demo. The demo did not draw rectangles like described in the demo README.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91
diff --git a/Xcode-iOS/Demos/src/rectangles.c b/Xcode-iOS/Demos/src/rectangles.c
index 86fce49..11e5f13 100644
--- a/Xcode-iOS/Demos/src/rectangles.c
+++ b/Xcode-iOS/Demos/src/rectangles.c
@@ -37,45 +37,50 @@ render(SDL_Renderer *renderer)
int
main(int argc, char *argv[])
{
- if (SDL_Init(SDL_INIT_VIDEO/* | SDL_INIT_AUDIO */) < 0)
- {
- printf("Unable to initialize SDL");
+
+ SDL_Window *window;
+ SDL_Renderer *renderer;
+ int done;
+ SDL_Event event;
+
+ /* initialize SDL */
+ if (SDL_Init(SDL_INIT_VIDEO) < 0) {
+ fatalError("Could not initialize SDL");
+ }
+
+ /* seed random number generator */
+ srand(time(NULL));
+
+ /* create window and renderer */
+ window =
+ SDL_CreateWindow(NULL, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT,
+ SDL_WINDOW_SHOWN);
+ if (window == 0) {
+ fatalError("Could not initialize Window");
}
-
- SDL_LogSetAllPriority(SDL_LOG_PRIORITY_WARN);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-
- int landscape = 1;
- int modes = SDL_GetNumDisplayModes(0);
- int sx = 0, sy = 0;
- for (int i = 0; i < modes; i++)
- {
- SDL_DisplayMode mode;
- SDL_GetDisplayMode(0, i, &mode);
- if (landscape ? mode.w > sx : mode.h > sy)
- {
- sx = mode.w;
- sy = mode.h;
+ renderer = SDL_CreateRenderer(window, -1, 0);
+ if (!renderer) {
+ fatalError("Could not create renderer");
+ }
+
+ /* Fill screen with black */
+ SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255);
+ SDL_RenderClear(renderer);
+
+ /* Enter render loop, waiting for user to quit */
+ done = 0;
+ while (!done) {
+ while (SDL_PollEvent(&event)) {
+ if (event.type == SDL_QUIT) {
+ done = 1;
+ }
}
+ render(renderer);
+ SDL_Delay(1);
}
-
- printf("picked: %d %d\n", sx, sy);
-
- SDL_Window *_sdl_window = NULL;
- SDL_GLContext _sdl_context = NULL;
-
- _sdl_window = SDL_CreateWindow("fred",
- 0, 0,
- sx, sy,
- SDL_WINDOW_OPENGL | SDL_WINDOW_BORDERLESS);
-
- SDL_SetHint("SDL_HINT_ORIENTATIONS", "LandscapeLeft LandscapeRight");
-
- int ax = 0, ay = 0;
- SDL_GetWindowSize(_sdl_window, &ax, &ay);
-
- printf("given: %d %d\n", ax, ay);
+
+ /* shutdown SDL */
+ SDL_Quit();
return 0;
}