equal
deleted
inserted
replaced
685 r.w:= squaresize; |
685 r.w:= squaresize; |
686 r.h:= squaresize; |
686 r.h:= squaresize; |
687 |
687 |
688 DrawFromRect( -squaresize div 2, (cScreenHeight - squaresize) shr 1, @r, ProgrTex); |
688 DrawFromRect( -squaresize div 2, (cScreenHeight - squaresize) shr 1, @r, ProgrTex); |
689 |
689 |
690 SDL_GL_SwapBuffers(); |
|
691 {$IFDEF SDL13} |
690 {$IFDEF SDL13} |
692 SDL_RenderPresent(SDLrender); |
691 SDL_RenderPresent(SDLrender); |
|
692 {$ELSE} |
|
693 SDL_GL_SwapBuffers(); |
693 {$ENDIF} |
694 {$ENDIF} |
694 inc(Step); |
695 inc(Step); |
695 |
696 |
696 end; |
697 end; |
697 |
698 |
923 end; |
924 end; |
924 |
925 |
925 {$IFDEF SDL13} |
926 {$IFDEF SDL13} |
926 if SDLwindow = nil then |
927 if SDLwindow = nil then |
927 begin |
928 begin |
928 // on ipad, when second monitor is attached, display window in second monitor always |
929 // the values in x and y make the window appear in the center |
929 x:= {$IFDEF IPHONEOS}(SDL_WINDOWPOS_CENTERED_MASK or (SDL_GetNumVideoDisplays() - 1)){$ELSE}0{$ENDIF}; |
930 // on ios, make the sdl window appear on the second monitor when present |
930 y:= {$IFDEF IPHONEOS}(SDL_WINDOWPOS_CENTERED_MASK or (SDL_GetNumVideoDisplays() - 1)){$ELSE}0{$ENDIF}; |
931 x:= (SDL_WINDOWPOS_CENTERED_MASK or {$IFDEF IPHONEOS}SDL_GetNumVideoDisplays() - 1){$ELSE}0{$ENDIF}); |
|
932 y:= (SDL_WINDOWPOS_CENTERED_MASK or {$IFDEF IPHONEOS}SDL_GetNumVideoDisplays() - 1){$ELSE}0{$ENDIF}); |
931 SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, SDL_WINDOW_OPENGL or SDL_WINDOW_SHOWN |
933 SDLwindow:= SDL_CreateWindow('Hedgewars', x, y, cScreenWidth, cScreenHeight, SDL_WINDOW_OPENGL or SDL_WINDOW_SHOWN |
932 {$IFDEF IPHONEOS} or SDL_WINDOW_BORDERLESS {$ENDIF}); |
934 {$IFDEF IPHONEOS} or SDL_WINDOW_BORDERLESS {$ENDIF}); |
933 SDLrender:= SDL_CreateRenderer(SDLwindow, -1, SDL_RENDERER_ACCELERATED or SDL_RENDERER_PRESENTVSYNC); |
935 SDLrender:= SDL_CreateRenderer(SDLwindow, -1, SDL_RENDERER_ACCELERATED or SDL_RENDERER_PRESENTVSYNC); |
934 end; |
936 end; |
935 |
937 |