23e712a730
Tilemap: Draw consecutive scanrows in one draw call
...
If consecutive scanrows in the scene list have no foreign
elements in between them, we batch them up and draw them
in one glDrawElements() call.
This should reduce the Tilemap induced draw calls on
average by at least 50 percent.
2013-10-13 22:00:38 +02:00
99cfe9aefd
Tilemap: Optimize scanrow z ordering
2013-10-13 12:58:56 +02:00
69637c75af
Replace Qt functions deprecated in 5.0
2013-10-11 10:32:56 +02:00
8b96174457
Fix broken asset include path
2013-10-10 12:50:04 +02:00
4af4f5bd6b
Ensure attached autotiles aren't mega surfaces
2013-10-09 18:08:44 +02:00
8b53681e11
Turn on 'fixedAspectRatio' by default
...
This is more consistent with RMXP's behavior.
2013-10-09 14:17:21 +02:00
f8e8ece946
Forgot to add license header
2013-10-09 13:44:15 +02:00
cb6f73f7df
Rename 'GlobalState' to 'SharedState' to avoid confusion with GLState
...
This was particularly nasty with the shorthand macros
'gState' and 'glState'. The former is now 'shState'.
2013-10-09 12:30:33 +02:00
807bee5748
Print info about shader compilation to console
2013-10-09 12:26:42 +02:00
ba304feb54
Minor code move
...
Move animation based state data together and add comments
2013-10-09 11:52:39 +02:00
34d4103111
Always request OpenGL Core profile
2013-10-08 06:29:05 +02:00
dd25323cdd
Ifdef out more RGSS2 functionality
2013-10-06 10:28:03 +02:00
49e7b66a53
Bitmap: s/tex/gl
2013-10-06 08:54:16 +02:00
89238aebe9
s/rgss/RGSS
2013-10-06 07:11:03 +02:00
26843f2e51
Implement FPS display (F2 to toggle ON/OFF)
2013-10-06 07:05:01 +02:00
41675859dd
Actually destroy duplicated PHYSFS_Io instance on close
...
Fixes crash after loading about a hundred maps
2013-10-06 05:11:22 +02:00
958af38442
Optimize archive reading
...
This should be almost as fast as reading unencrypted
files from disk now. I also don't see any possible further
optimizations, so this is probably as fast as it gets.
2013-10-04 07:52:40 +02:00
a9fc44f79d
Fix filesystem init for relative 'gamePath's
2013-10-03 22:11:25 +02:00
4ddc487f17
Fix a critical bug with seeking in archives
...
Also, other small cleanups on the way.
2013-10-03 22:09:35 +02:00
d20b652155
No point in drawing spaces
2013-10-03 00:48:12 +02:00
d8dab9c429
Start ifdef'ing out RGSS2 functionality
2013-10-02 22:40:09 +02:00
751b9c3ae5
Clip text surface to texture bounds on fast upload
2013-10-02 21:39:44 +02:00
bb70c39811
Ensure SDL_image and SDL_ttf initialize correctly
2013-10-02 13:50:58 +02:00
0f58852e2b
Remove GL_ARB_imaging requirement
...
Mesa doesn't have it, and I'm not sure it really
serves any purpose at all.
2013-10-02 13:35:14 +02:00
7b97075282
Remove unnecessary allocations
2013-10-01 18:27:22 +02:00
a54acce6b7
Implement Bitmap 'blur'
...
I was a bit confused at first because I thought Enterbrain
had actually implemented a full Gaussian blur, but nope,
just dumb averaging.
2013-10-01 18:12:52 +02:00
20ec560145
Wrap color clear in 'FBO::clear()' convenience function
2013-10-01 13:10:14 +02:00
ceb7821362
Minor code style fix
2013-10-01 12:15:28 +02:00
8baa76541c
Merge branch 'bitmap_blur'
2013-10-01 12:06:40 +02:00
baff4e362e
Fix minor GPU timer query issue
2013-10-01 12:05:58 +02:00
9f26ff9fb0
Port over Bitmap 'radial_blur' from old SFML codebase
...
This implementation is also heaps better than the old
one as it doesn't use a (differently sized) aux texture,
meaning the Bitmap discards its old texture and aquires
one of same size, making reuse through the TexPool a
lot more likely. It also saves on the aux texture blits
and binding switches.
As the setup / resource acquisition far outweighs the
actual rendering cost, operation time is relatively
constant no matter how many divisions are used.
2013-10-01 12:03:20 +02:00
b5afeadb5b
Fix null deref
2013-10-01 02:29:02 +02:00
73d5cb5bad
Comment out unsupported audio formats
2013-10-01 02:28:46 +02:00
408864339f
Implement case insensitive path resolution
2013-09-30 21:20:29 +02:00
f49b03ba23
Window: Always rebuild cursor_rect tex coords
...
If the same Window updated its control verts without a visble
cursor_rect, these tex coords will get randomly overwritten by
further control parts.
2013-09-30 19:32:45 +02:00
05f73f0b98
Ensure Elements don't unlink from an already dead Scene
2013-09-30 19:30:27 +02:00
9d34fc966b
Tilemap: Clamp sampled tileset height to multiple of 32
2013-09-30 01:38:46 +02:00
2226927b08
Null deref fixes / cleanups
2013-09-28 21:48:02 +02:00
1737ec9af4
Fix 'Rect::isEmpty()' and small performance fixes
...
Specifically, don't emit the 'valueChanged' signal
if nothing actually changed.
2013-09-28 21:45:33 +02:00
4c06b676ad
Spacing and minor fixes
2013-09-28 21:30:51 +02:00
307eeb732d
Factor out performance timers into separate files
...
This should make graphics.cpp somewhat easier to navigate/read.
GL_EXT_timer_query is also made optional, and if it's not present
dummy functions will be called instead.
2013-09-27 16:54:01 +02:00
92525cd077
Make this mess of performance measuring a bit more readable
2013-09-27 04:47:12 +02:00
12c92d6dd0
Fix Tilemap's scanrow z sorting for good
...
Also make it a tad faster.
2013-09-27 04:42:22 +02:00
97d0794c7c
Remove Serializable's virtual destructor. It didn't do anything anyway.
...
To still make the compiler happy, add virtual destructors
to all descendants of Serializable.
2013-09-27 04:39:35 +02:00
92ab65ba52
Fix window opacity not being applied on vert (re)construction
2013-09-27 04:37:56 +02:00
43aacc13d9
Add equality op that compares against a clamped integer
2013-09-27 00:55:48 +02:00
35521c25c0
Don't hide cursor when window isn't focused
2013-09-25 20:35:00 +02:00
dff2d79a70
Implement blits from mega surfaces to regular Bitmaps
...
This is used in events that take their sprite from a tile
out of the tileset.
2013-09-25 17:07:43 +02:00
0fc6022dd0
Use BlitSurface instead of UpperBlit (for forward-compat)
2013-09-25 17:07:26 +02:00
cfcfc2fd5e
Fix wrong pixel format specified for upload
2013-09-25 15:13:45 +02:00
0a17f9ccad
Return advance as width for italic characters
2013-09-25 13:49:54 +02:00
32361e513a
Track 'tainted' area of Bitmaps to optimize blit operations
...
The 'tainted' area of a Bitmap describes what parts are no
longer in a 'cleared' state. When we blit to a fully cleared
are of a Bitmap at full opacity, we can completely disregard
the existing pixels in the operation, meaning we can skip any
blending calculations and just blit / upload straight to the
texture. This greatly speeds up text message rendering.
In the process, pixman has become a new dependency for mkxp,
but the results of this optimization are well worth it!
2013-09-25 13:49:24 +02:00
e903d8cb0f
One last null pointer deref slipped through ;)
2013-09-24 23:00:16 +02:00
fe557bca1d
Implement "show_cursor" attribute in Graphics module
...
If false (the default), the system cursor is hidden
inside the game window.
2013-09-24 22:56:25 +02:00
a9454fdf9c
Fix nullpointer deref
2013-09-24 22:42:10 +02:00
4f08382c69
Replace 'tiles.bufferCount' with function
2013-09-24 20:11:55 +02:00
41e1187063
Just realized the word 'Row' makes no sense whatsoever
2013-09-24 20:06:11 +02:00
a327d4c324
Fix valgrind warning (value might be uninitialized)
2013-09-24 19:56:36 +02:00
10ec55e39b
Implement a new tileset atlas layout to allow for bigger tilesets
...
The atlas packing algorithm has been reworked to pack autotiles
and tileset very efficiently into a texture, splitting the tileset
in multiple ways and eliminating the previous duplication of image
data in the atlas across "frames". Animation, which these frames
were designed for, is now done via duplicated buffer frames,
ie. each animation frame has its own VBO and IBO data. This was
not done to save on VRAM (hardly less memory is used), but to
make place for the new atlas layout.
Thanks to this new layout, even with a max texture size of 2048,
one can use tilesets with up to 15000 height. Of course, such
a tileset couldn't be stored in a regular Bitmap to begin with,
which is why I also introduced a hack called "mega surfaces":
software surfaces stored in RAM and wrapped inside a Bitmap,
whose sole purpose is to be passed to a Tilemap as tilesets.
Various other minor changes and fixes are included.
2013-09-24 19:35:38 +02:00
b85988d194
Fix typo
2013-09-23 11:18:20 +02:00
da4e0fbed0
Implement smooth scaling
2013-09-23 11:00:50 +02:00
f00136c489
Implement fixed aspect ratio
2013-09-23 10:39:16 +02:00
7a6c05bba0
Implement animated flash tiles in Tilemap
...
Flash tiles start with an alpha of 60, which ramps up to 120
in 16 frames and 4 steps, then ramps down again over the same period.
2013-09-23 08:27:28 +02:00
9e63fb6b64
Remove the remaining bits of deprecated GL usage
...
The drawing is now completely shader based, which makes away
with all usage of the depracted matrix stack. This also allows
us to do things like simple translations and texture coordinate
translation directly instead of doing everything indirectly
through matrices.
Fixed vertex attributes ('vertexPointer()' etc) are also
replaced with user defined attribute arrays.
2013-09-23 07:50:22 +02:00
abce6c94b0
Properly emit valueChanged in Rect setters
2013-09-23 00:03:43 +02:00
660cb9e05a
Always set rqTermAck to true after binding returns
2013-09-23 00:02:28 +02:00
f4f0748d68
Cosmetic changes
2013-09-21 14:45:27 +02:00
4aed9ef1a7
Add Vec2 conversion method to 'Vec2i'
2013-09-10 04:25:58 +02:00
d1bfc1e50c
Properly free RWops associated with Font objects
2013-09-10 04:19:45 +02:00
6f711184ac
Spacing
2013-09-09 21:32:34 +02:00
39233a036b
Rename constant
2013-09-09 21:23:56 +02:00
a66b15bd08
Pack REQUEST event codes into enum
2013-09-09 21:22:31 +02:00
4620901002
Forgot some EXT functions
2013-09-07 02:42:56 +02:00
051c939f8d
Free SDL surface if 'TexPool::request' throws
2013-09-06 15:52:45 +02:00
6c7d751dbd
Remove 'Default' FBO binding (only allow 'Read' and 'Draw')
...
Also make code more verbose by removing default mode
parameter value to 'FBO::bind'
2013-09-06 14:56:30 +02:00
abc927c91d
Use EXT version of gl functions
2013-09-06 14:37:28 +02:00
ef6bacf201
Only require EXT framebuffer extensions
2013-09-06 14:21:35 +02:00
a9f400e64a
Undef utility macro in header
2013-09-06 13:14:34 +02:00
3bd9df1191
Move draw order sorting into SceneElement
2013-09-06 13:10:41 +02:00
5ca513fcec
Document gl-util types
2013-09-06 12:33:33 +02:00
b151a22f6e
Rename 'Tex' to 'TEX' for consistency
2013-09-06 12:26:41 +02:00
ba3b904f34
Thanks to the ID abstraction, we can use proper overloading now!
2013-09-06 12:22:55 +02:00
55596e9da9
Rename 'RB'(renderbuffer) to 'RBO'(renderbuffer object)
2013-09-06 12:16:24 +02:00
a21423ca1c
Move GL state initialization into GLState
2013-09-04 21:05:47 +02:00
f89cd2d207
Provide general purpose Quad in GlobalState
2013-09-04 19:07:28 +02:00
efa55ce6c2
Raise exception on invalid bitmap sizes
...
A difference to RMXP is that negative height values
will result in exceptions too.
Also change Bitmap constructors to not allocate Private
struct before potential exceptions.
2013-09-04 18:14:29 +02:00
6a85699e11
Properly destroy fade thread
2013-09-04 17:53:12 +02:00
abd59be30d
Properly delete[] arrays
2013-09-04 17:52:03 +02:00
689a31580c
Beautify constant
2013-09-04 17:03:00 +02:00
1401578f92
Add bounds check to setter
2013-09-04 17:01:51 +02:00
4a945f8d6c
Null PhysFS handle after closing
2013-09-04 13:32:11 +02:00
0253b6ed2b
Use C99 integer types instead of Qt's
2013-09-04 13:30:14 +02:00
a75dea3ffe
Rename 'resetInput' to 'resetInputStates'
2013-09-04 13:28:05 +02:00
d0fa2dd37a
Document 'WindowSizeNotify'
2013-09-04 12:09:09 +02:00
5b6d4e0026
Clean up remainind references to 'render thread'
2013-09-04 12:07:59 +02:00
c2585660b7
Remove unnecessary variable
2013-09-04 11:31:35 +02:00
3761c62d86
Spacing
2013-09-03 16:47:53 +02:00
84db116d0c
Rename 'bound' to 'clamp'
2013-09-03 15:31:29 +02:00
f81e20cc68
Raise exception on too big textures
2013-09-03 15:22:00 +02:00
31c007b541
Mark internal methods
2013-09-03 15:21:44 +02:00
6a133cf04b
Clean up unused code and documentation
2013-09-03 14:51:55 +02:00
6c5745c4bf
FloatRect: add implicit IntRect conversion
2013-09-03 14:51:13 +02:00
108392217f
Remove empty line
2013-09-03 11:15:04 +02:00
57c806e9b5
Add "[Binding]" config subgroup
...
Binding specific configuration goes here. It is stored as
a String->Value hash.
2013-09-03 11:07:56 +02:00
8674cb8e06
Always glClear before blitting to screen
...
Prevents a distorted screen when an error happens during
script loading (ie. before the first drawn frame) and fullscreen
is turned on in the config.
This will also be necessarry once fixed aspect ratio is implemented.
2013-09-02 17:31:34 +02:00
0477c3f8db
Remove wrong extension check
2013-09-02 13:40:16 +02:00
7ea875ae5d
Minor cleanups and documentation
2013-09-02 12:32:53 +02:00
0ab438af64
Add more gl extensions and spacing
2013-09-02 11:13:22 +02:00
6bebfa90e1
Fix spacing
2013-09-02 06:14:46 +02:00
dff6acebca
Remove more leftovers
2013-09-02 06:02:50 +02:00
691c4b7728
Add GPL license header
2013-09-01 18:26:36 +02:00
ff25887f41
Initial commit
2013-09-01 16:27:21 +02:00
Jonas Kulla