Benau
8c5c85245f
Use full detail default
2016-12-27 18:31:06 +08:00
Benau
15469e555d
Allow track loading to take care of geometry details
2016-12-27 11:15:24 +08:00
Benau
7085c164b5
Merge remote-tracking branch 'origin/geometry_detail'
2016-12-26 23:56:18 +08:00
Benau
9831802c7f
Fix typo
2016-12-26 13:59:34 +08:00
Benau
c2d9f91c62
Allow to run cutscene(s) in artist debug menu
2016-12-26 13:51:40 +08:00
Benau
ebef08c3d8
Try to combine all text field dialogs
2016-12-26 10:53:14 +08:00
Benau
3c9174d278
Add a general debug dialog
...
To be used later
2016-12-25 16:41:55 +08:00
samuncle
e62edcc89a
Ground work for geometry detail option
2016-12-24 19:16:39 -05:00
Benau
6a142e8d2e
Allow animated models in track to have different animation
2016-12-24 13:11:08 +08:00
Deve
6486d1548b
Fixed clang compilation
2016-12-24 02:07:53 +01:00
Deve
26bbffe8b0
Don't declare features that are used for SDSM, AZDO and compute shaders and that are not available in GLES renderer anyway.
2016-12-24 01:26:18 +01:00
Deve
7b76804354
Allow to unlock all tracks in config.xml.
...
Can be used on android when only some tracks are included in the apk.
2016-12-23 23:36:39 +01:00
Deve
674e617018
Allow to use isDirectory function outside of file manager class.
...
It is used on android for extracting assets
2016-12-23 19:01:16 +01:00
Deve
8a88c9707b
Fixed rendering when UBO is disabled
2016-12-23 16:45:03 +01:00
Deve
424b62552e
Fixed MLAA in GLES renderer.
...
This function was used by Cand for his OpenGL 2.1 renderer. The round function is available since GLSL 1.3 (OpenGL 3.0), so there is no need to override it.
If it will be needed in future, I suggest to change the name to round_stk or something similar.
2016-12-23 15:12:16 +01:00
Benau
15d6c7207a
Minor improvements for non-instanced shaders
2016-12-23 19:22:30 +08:00
Benau
989234a0ba
Clean up header part 2
2016-12-23 17:12:53 +08:00
Benau
31f2a720ca
Try to reduce the header size of materials.hpp
...
Plus header clean up
2016-12-23 14:44:18 +08:00
Benau
d932451295
Don't out a interpolated color change
...
It will should be determined by colorization mask in fragment shader
2016-12-23 11:38:32 +08:00
Benau
f7e2122b79
Allow drawing instanced glow color without explicit location
2016-12-23 10:36:35 +08:00
Benau
a339975df6
Clean skidmark earlier if there are many karts
2016-12-23 10:08:12 +08:00
Benau
969592e3fc
Try to fix framerate drop after few laps
...
Because skidmark left are never culled
2016-12-23 09:19:46 +08:00
Tobias Markus
6fb93fa208
Fix compilation on macOS 10.12 ( #2701 )
2016-12-22 19:17:31 -05:00
Benau
8008ec851e
Allow to use hardware skinning with opengl 3.1
...
Now we only need UBO to store the joint matrices to support it
2016-12-23 01:31:13 +08:00
Benau
28841d601d
Remove old code for getting straight frame
...
With hardware skinning it is not necessary
2016-12-23 00:44:26 +08:00
Benau
bfd57659eb
Remove unused file
2016-12-22 11:17:52 +08:00
Benau
ffa4ad84cb
Merge branch 'hardware_skinning'
2016-12-22 10:38:06 +08:00
Deve
53ee40af70
Update multitouch device when settings are changed
2016-12-20 23:11:06 +01:00
Deve
082661db65
Add a possibility to change touch device settings in GUI
2016-12-20 23:10:57 +01:00
Benau
c26f8150f4
Fix server only build
2016-12-19 11:17:45 +08:00
Benau
581ca964fd
Fix hats with hardware skinning
2016-12-19 11:06:05 +08:00
Benau
2f07b6a8ea
Merge pull request #2694 from leyyin/hardware_skinning
...
Separate the non-cached shader loading in ShaderFilesManager
2016-12-18 19:49:35 +08:00
Daniel Butum
d0229cd85e
Separate the non-cached shader loading in ShaderFilesManager
2016-12-18 13:40:36 +02:00
Benau
4f2e2331ee
Correct the spelling of shader files
2016-12-18 14:59:37 +08:00
Benau
4477dbb0fb
Preload shaders that delay kart selection screen the most
...
Plus some suggestion from #1787
2016-12-18 14:51:27 +08:00
Benau
7ea4f30824
Make sure no duplicated shader is added somewhere else
2016-12-18 13:49:58 +08:00
Benau
2a9656bfdc
Allow all shader files to be loaded only once
...
Todo: preload
2016-12-18 10:51:05 +08:00
Benau
7894e5c864
Try to use a smarter approach
2016-12-18 09:27:50 +08:00
auria.mg
da795b69ed
Better fix for #2687
2016-12-17 18:49:00 -05:00
auria.mg
2b13a5643e
Ignore the "applesmc" accelerator as input device. see #2691
2016-12-17 17:43:03 -05:00
Deve
f314c1ff2a
Some improvements for multitouch steering GUI
...
- move it to separate class, so that it can be displayed in Overworld too
- add a possibility to scale the interface (atm. only in config.xml)
- touch steering buttons are created only for single player races
I removed unused drawEnergyMeter function from Overworld GUI. The reason was that I use this function from race_gui.cpp for nitro button and this function in overworld breaks it. And still the proper drawEnergyMeter function is available in race_gui.cpp and can be moved to RaceGuiBase if it will be needed in Overworld in future.
I moved the font size computation to the top of constructor because I use it to check available space for minimap.
2016-12-17 23:28:22 +01:00
Benau
90a556fe9c
Try to share shaders across different programs
...
Todo: non-instanced version
2016-12-17 15:59:40 +08:00
auria.mg
488af78fa3
Fix #2687 , reset cameras properly
2016-12-16 21:03:05 -05:00
auria.mg
fc9a51b7f4
Reset cameras when resetting 3 strikes battle. Fixes #2687
2016-12-16 20:33:30 -05:00
auria.mg
5f0a65a07b
Fix bug where an animated texture matrix could never be reset to identity. Fixes #2692
2016-12-16 20:21:09 -05:00
Benau
79e5aadd4d
Avoid using software skinning on empty joint objects
2016-12-16 10:04:35 +08:00
Benau
752d847b09
Add the remaining shaders for GL3 hardware skinning
...
Also use the same shader code for normal map shader
2016-12-15 15:55:14 +08:00
Benau
3d814d1036
Fix wrong case handling
2016-12-15 13:30:26 +08:00
Benau
035271d6ec
Remove GL error about draw2DLine
...
Use GL32_draw2DRectangle, only works if it's a straight line.
2016-12-15 12:57:39 +08:00
Benau
2e2345289c
Don't upload / bind skinning ubo if not supported
2016-12-15 12:17:39 +08:00