ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,200 Commits 9 Branches 28 Tags 433 MiB
8008ec851e
Commit Graph

17200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Benau
1f23e6e783 Remove code used to duplicate VAOs for animated meshes 2016-12-15 11:44:09 +08:00
Benau
6baed2b0dd Merge remote-tracking branch 'origin/master' into hardware_skinning 2016-12-15 10:01:12 +08:00
Benau
a696fd6dff Add transparent skinned mesh shader 2016-12-15 09:52:02 +08:00
Benau
85bd8c3146 Add unlit and normal map skinned mesh shader 
Also fix normal map with skinned mesh, now vertices and joints
will be recalculated for tangents mesh
 2016-12-14 16:28:37 +08:00
hiker
4ee6f6315f Made World::m_weather a singleton to further remove dependencies on World. 2016-12-13 17:14:29 +11:00
hiker
32f2196201 Removed unnecessary #include world.hpp. 2016-12-13 17:13:54 +11:00
hiker
ed7574ca85 Merge remote-tracking branch 'origin/master' into simplify-world 2016-12-13 09:19:24 +11:00
hiker
4d406490e1 Made ScriptingEngine a singleton and removed it from World, which reduces 
more dependencies on world.
 2016-12-13 09:18:59 +11:00
hiker
b12453e9ca Made Physics a singleton, removing the accessor functions from World. 
Removes dependency on World for a few files.
 2016-12-13 08:31:08 +11:00
hiker
cd149ab5d7 Moved m_track out of World into a static m_track in Track. Makes 
world smaller and removes a few dependencies on World.
 2016-12-13 07:53:33 +11:00
Benau
abe4ae2d6a Fix server only stk 2016-12-12 13:54:43 +08:00
Benau
c8e5238ce2 Merge remote-tracking branch 'origin/master' into hardware_skinning 2016-12-12 13:45:04 +08:00
Benau
269e440d0c Avoid translating artist debug mode only fps string 2016-12-12 13:43:01 +08:00
Benau
a420b09363 Disable all karts animation if UBO size not big enough 2016-12-12 13:24:34 +08:00
auria.mg
044e8c52e1 Fix tabs added in previous commit, used spaces instead... 2016-12-11 20:19:58 -05:00
auria.mg
ab7ded308a Make presentation of kart characteristics uniform and indepdendent of difficulty. Fixes #2684, fixes #2539 2016-12-11 20:16:44 -05:00
Corentin Pazdera
aaecd58fc0 Adding appveyor config file (#2652) 
I am unfamiliar with appveyor myself but I can merge the file. Next step would be for someone to take a look at settuping an account
 2016-12-11 19:52:15 -05:00
Daniel Ölschlegel
62e1a2ddcc Add a little more BSD detection (#2685) 
Tested for NetBSD, the same signature has DragonFly(http://fxr.watson.org/fxr/source/sys/endian.h?v=DFBSD#L42)
 2016-12-11 19:16:47 -05:00
Daniel Butum
244c812cf3 Add travis server only matrix configuration (#2682) 
Also increase number of threads for the gcc builds
 2016-12-11 19:15:37 -05:00
hiker
8785ddf148 Moved force-fog settings into track. 2016-12-12 08:05:07 +11:00
Benau
4327885f07 Add alpha test skinned mesh instanced shaders 2016-12-12 01:00:57 +08:00
Benau
e9b68a8a1f Use a non-hardcoded values for mat4 array (max 1024) 
Also cull mesh that doesn't have enough space to be rendered
 2016-12-11 15:50:53 +08:00
Benau
f6490b6fa6 Allow array to capture lambada 
Also use a correct sorting function, will be useful later if
we only need the more influetial bones.
 2016-12-11 13:21:17 +08:00