mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +01:00
Code Issues Releases Wiki Activity
8,461 Commits 8 Branches 59 Tags
b16b6814aa3a2b4ee6685bf3fff4600a806b1987
Commit Graph

289 Commits

Author SHA1 Message Date
Michał Janiszewski
b16b6814aa Fix pointer types for 64 bit builds 2016-08-01 23:14:42 +02:00
Michał Janiszewski
ddb72b6f22 Fix sprite pointers for 64 bit builds 2016-08-01 23:14:42 +02:00
Michał Janiszewski
e6575f09ea Integrate scrolling text position offsets 2016-08-01 23:14:42 +02:00
LRFLEW
c9ce11a250 Fix GetOpenGLVersion() 
This is in response to the research I did on #4047. The implementation currently in the code will not work based on what I saw. The `SDL_GL_GetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, &major);` and `SDL_GL_GetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, &minor);` lines don't fetch the version retrieved, but the version requested. The solution I have here is the one I found worked consistently in my test case, and the one I suggested in [my comment](https://github.com/OpenRCT2/OpenRCT2/issues/4047#issuecomment-233268891).
 2016-07-27 22:26:33 +01:00
Alexander Overvoorde
3842728f38 Fix indentation and code style in various files 2016-07-27 16:31:25 +02:00
Alexander Overvoorde
8256b7f83b Fix missing override keyword for SetUncappedFrameRate functions 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
c56a683eed Disable OpenGL vsync when uncap fps option is enabled 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
acb5c68eac Remove debug code 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
6acbbcfb6b Fix assumption that colour texture and mask texture originate from same atlas 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
c107101aff Implement dynamic atlas allocation in texture cache 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
c506e08ac2 Add more atlases to increase space efficiency and derive atlas size from device limits 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
bb3fe8b804 Implement multiple texture atlas system to handle small and large images 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
9e6db92446 Fix type error 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
d8ce023170 Change TextureCache to use atlas instead of array 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
f16ec771c3 Clean up DrawImageShader code 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
360a92e906 Merge draw image and draw masked image shaders 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
fbb7029de4 Implement sprite batch drawing using instancing 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
84f2a8c17c Rewrite texture cache to use array texture 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
f8f996dfd6 Fix indentation 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
afd83fa13d Fix clipping in FlushImages 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
09b07174e3 Change command buffer flushes to only be called when necessary 
This currently breaks sprite draw order, I do not know why
 2016-07-27 04:01:25 +02:00
Alexander Overvoorde
e7626064f2 Change OpenGL renderer to use command buffers 2016-07-27 04:01:25 +02:00
Ted John
664c460aa0 Fix #4047: Game crashes when switching to OpenGL 2016-07-18 18:04:37 +01:00
Michał Janiszewski
dd25cdc4f4 Change gfx_clear argument type 
`colour` gets passed on to IDrawingContext::Clear, which expects
uint32
 2016-07-17 20:41:19 +01:00
Ted John
964cf66f6b Zero g1 elements when freeing images 
This is to help diagnose issues where we are drawing invalid sprites as well as general cleanliness
 2016-07-16 18:08:58 +01:00
duncanspumpkin
83fa818190 Use the correct count to work out if regions will overlap. Fix #4114 2016-07-16 18:07:13 +01:00
Ted John
be4668ee3a Fix #4108: Assertion an crash at startup 2016-07-16 15:33:26 +01:00
Ted John
c123673d6f Merge pull request #4106 from IntelOrca/improve-assertions 
Improve guard assertions so that they display the location of where the guard was and also allow a dump file to be created on abort.
 2016-07-16 15:12:30 +01:00
Ted John
5f41e3a0eb add function and line info to guards 2016-07-16 14:17:36 +01:00
duncanspumpkin
5426b655fe Try combine _freelists when freeing to reduce chance of running out of images. 2016-07-16 14:12:15 +01:00
Michał Janiszewski
a6d0e6916e Fix function definitions to match their declarations 
This makes sure every function is properly declared, which includes
proper `extern` wrappers.
 2016-07-14 14:11:49 +02:00
Marijn van der Werf
5204fb0ce9 Clean up string and sprite ID's (#3977) 2016-07-14 14:07:49 +02:00
Ted John
dca816cfd3 Merge pull request #4024 from IntelOrca/refactor/object-list 
Refactor and improve the object system:
- Objects are now exported to user directory under 'object'.
- Object directories are scanned recursively.
- Improves reliability of object loading and handling of bad objects.
- Improve performance of object scanning.
- Only load new objects when loading a new game.
- Improve changing language experience.
 2016-07-11 23:45:45 +01:00
Ted John
3c64010fe1 Make Console::Error::WriteLine formattable 2016-07-09 15:02:05 +01:00
Michał Janiszewski
639f19adbf Fix define checks in project 2016-07-09 10:05:12 +02:00
Ted John
4d3fca767d document and name G1 flags 2016-07-09 00:27:21 +01:00
Ted John
4e259920b1 fix and detect freeing invalid image lists 2016-07-08 22:58:38 +01:00
Ted John
52928e1e08 protect objects against invalid allocation ids 2016-07-08 22:58:38 +01:00
Ted John
3bfa747ce4 implement a proper image list allocation 2016-07-08 22:58:38 +01:00
Ted John
50b7e4222f remove a lot of old object code 2016-07-08 22:58:38 +01:00
Ted John
78e15b1d56 start getting object loading working 2016-07-08 22:58:38 +01:00
Charles Cook
8b36e4c54a Use four spaces instead of tabs in c++ 2016-07-05 20:32:37 -04:00
Charles Cook
6d268099f5 Follow coding standard for project. 2016-07-05 19:40:20 -04:00
Charles Cook
5c9110b99a Prevent viewport_invalidate from causing covered viewports to redraw and cache window and viewport visibility. 2016-07-05 18:02:23 -04:00
Michał Janiszewski
683eee827e Refactor gX.dat loading, make sure g2.dat loads too 2016-06-24 23:25:40 +02:00
Michał Janiszewski
dfa482b1b5 Revert "Merge pull request #3897 from janisozaur/rebase-no-rct2" 
This reverts commit 22c0cc92e6, reversing
changes made to 7b421c8052.
 2016-06-24 22:40:37 +02:00
Michał Janiszewski
644a36a310 Fixes to -Wall compilation 
By default, not all warnings are enabled. This change makes sure that
the project compiles correctly with following options turned on:

    -Wall -Wno-unused-but-set-variable -Wno-missing-braces \
    -Wno-unknown-pragmas -Wno-unused-function
 2016-06-20 13:46:27 +01:00
Michał Janiszewski
2273626bdd Refactor gX.dat loading, make sure g2.dat loads too 2016-06-19 18:12:14 +02:00
Michał Janiszewski
580789bcf4 Fixes to object loading for x86-64 2016-06-19 18:12:14 +02:00
duncanspumpkin
42029c031a Fix openGl zooming placement. 
Note there are still bugs with zooming
 2016-06-18 07:46:02 +01:00