Commit Graph

16545 Commits

Author SHA1 Message Date
Elderme
a3c78a7245 Fixed polycount in kart selection screen 2016-07-30 11:31:23 +02:00
Elderme
a21d7b4b71 Merge branch 'master' into renderer_refactoring 2016-07-26 22:16:48 +02:00
Elderme
7812965d37 Fixed issue with colorization (mistake when merging) 2016-07-26 22:04:57 +02:00
Elderme
cd1b9a66a0 Merged master in branch 2016-07-26 21:31:52 +02:00
Benau
cefead119a Try to use c++11 typeid for getFont 2016-07-26 08:04:12 +08:00
Deve
29185f679b Merge pull request #2581 from qwertychouskie/patch-7
Update deps from INSTALL.md
2016-07-25 11:51:31 +02:00
Benau
8c38e9e79b Merge remote-tracking branch 'origin/fix_timer' 2016-07-25 14:46:58 +08:00
hiker
c64733e3d0 Merge branch 'dijkstra-test' 2016-07-25 16:42:24 +10:00
Benau
5a7f3caefd Fix the rest non-working timer-related function 2016-07-25 13:48:41 +08:00
Benau
d9e0d0d458 Fix #2580 2016-07-25 10:18:11 +08:00
hiker
7e91642eb7 Merge branch 'master' into dijkstra-test 2016-07-25 08:37:48 +10:00
hiker
7196ddfba8 The unit test for battle graph detects incorrect parents for some
(other) arenas. Those are false positives (often there is more
than one shortest path, all with the same length; e.g. in case of
a regular gridded section). Added more details in error reporting
to help in debugging, but generally disabled the test for identical
paths, only the actual path length is tested now.
2016-07-25 08:11:56 +10:00
Benau
6a4fe397d4 Thanks devnexen for spotting this out 2016-07-24 15:56:02 +08:00
Deve
91b41272d9 Merge pull request #2579 from qwertychouskie/patch-6
Update links
2016-07-24 08:10:26 +02:00
Benau
236c9c44a8 Minor improvements for font 2016-07-24 09:56:46 +08:00
qwertychouskie
3d3b7a7de7 Update deps from INSTALL.md
(and put them in alphabetical order.)
2016-07-23 16:12:59 -07:00
qwertychouskie
42b80d5e9c Update link 2016-07-23 14:23:36 -07:00
qwertychouskie
94440645a0 Update link 2016-07-23 14:22:03 -07:00
qwertychouskie
178fbbfefa Merge pull request #1 from qwertychouskie/patch-7
Update link
2016-07-23 14:19:07 -07:00
qwertychouskie
493030ba9c Update link 2016-07-23 14:17:30 -07:00
qwertychouskie
9cbf8a0641 Update link 2016-07-23 14:16:09 -07:00
Benau
5b4d8e1f8a Remove old font settings 2016-07-23 10:48:48 +08:00
Rob Clark
ce38df268b couple small performance optimizations (#2578)
* pass timeout to driver, rather than unconditional 1ms sleep

This way if the fence is signalled earlier, we can get on with life
sooner.

* optimize displacement bind/clear/render

Stop thrashing render targets, and group things together into single
render-passes.  And only bind/clear if we will actually draw.
2016-07-22 20:29:42 -04:00
hiker
2654705da1 Fixed linux compilation. 2016-07-22 11:50:41 +10:00
hiker
78fa5f08b6 Merge branch 'master' into dijkstra-test 2016-07-22 11:46:45 +10:00
hiker
9fcb55aac3 Use Dijkstra instead of Floy-Warshall for computing the paths in battle mode
(which is signiccantly faster). Added unit testing for dijksta based on
the F.W. algorithm.
2016-07-22 11:06:32 +10:00
hiker
d6a62a85b7 Removed unnecessary #include. 2016-07-22 09:58:10 +10:00
Benau
744a4705b6 Auto embolden glyph of bold face, without fallback font 2016-07-21 12:26:19 +08:00
hiker
2cfe99827f Merge branch 'master' into dijkstra-test 2016-07-21 09:18:07 +10:00
Benau
a72f67015c Remove 36MB CJK fonts, use the previous font instead 2016-07-20 09:49:10 +08:00
Benau
7f1e776bf6 Fix digit font drawing 2016-07-19 16:47:39 +08:00
Benau
03b92efba5 Fix wrong text alignment 2016-07-19 15:21:14 +08:00
Benau
89976def57 Remove not-used-anymore setReferenceCount 2016-07-19 13:58:38 +08:00
Benau
1079800376 Merge remote-tracking branch 'origin/master' into new_font_engine 2016-07-19 13:15:47 +08:00
Benau
e02a25f8f5 Use bold font for billboard text 2016-07-19 13:13:31 +08:00
Benau
b2ee606e7b Try to use float for dest_ret 2016-07-19 12:25:16 +08:00
Benau
89f06ed8d3 Fix crash with fixed pipeline 2016-07-18 23:56:14 +08:00
Benau
6a319cbed2 Clean up old font code 2016-07-18 23:00:40 +08:00
Benau
05419cd555 Initial work on new font rendering engine 2016-07-18 16:03:11 +08:00
David CARLIER
c890483931 small mem leak in this unit test (#2575) 2016-07-16 18:28:45 -04:00
Benau
9fd6fd2673 Fix crashes when using the uninitialized layer 8 texture 2016-07-15 15:23:17 +08:00
Benau
1d6c7fa60f Remove vector int in RenderInfo 2016-07-15 12:31:00 +08:00
Benau
8408a7c158 Merge remote-tracking branch 'origin/master' into colorful_track_object 2016-07-15 09:27:59 +08:00
Deve
93fc20e275 Merge OpenGL ES renderer branch
It adds support for OpenGL ES renderer, which is needed for Android port and for running STK on other embedded devices such as Raspberry Pi.

Currently it works in two ways:
- Shader-based pipeline, which requires OpenGL ES 3.0 (Android >= 4.3)
- Fallback to irrlicht-based fixed pipeline that needs OpenGL ES 2.0. The fixed pipeline generally works, but it is affected by the same issues as our OpenGL 2.1 fixed pipeline renderer.

I tried to modify our OpenGL renderer as little as possible to avoid regressions. The only one major change is that we are now using the "#stk_include" directive in shaders instead of linking multiple shaders into one program.

Currently it works only on linux. The Android port needs some refactoring. In theory it should be possible to make it working on Windows, but we would need some OpenGL ES SDK, or maybe modified libglew.

At this stage it is playable with current mesa drivers. I tested it on intel graphics card and I didn't notice any issues.

On Android only the OpenGL ES 2.0 renderer with fixed pipeline  has been tested for now.
2016-07-14 20:54:30 +02:00
Deve
eea30b3197 Handle glDebugMessageCallback extension in better way for OpenGL ES 2016-07-14 20:34:43 +02:00
Deve
8f8acdcef3 Remove android related code part2.
Again, it will be handled in different branch and hopefully with curl and sounds support.
2016-07-14 19:50:34 +02:00
Benau
53374176ad First try to support colorization texture mask 2016-07-15 00:53:22 +08:00
Elderme
d7ebde2e68 Do not upload UBO data when UBO are disabled by graphics restriction 2016-07-13 23:19:52 +02:00
auria.mg
1463cf9344 Fix uninitialized variables, fixes #2567 2016-07-12 19:39:44 -04:00
Deve
81b471be1f More proper solution for glDrawElementsBaseVertex function 2016-07-12 23:34:31 +02:00