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

10379 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vincentlj
4c725ac8f4 GPUParticles: Got PointEmitter to draw something at last. 
Still WIP, uses a #ifdef to disable it but I wanted to keep a working commit
somewhere in case I mess up somewhere.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14829 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-29 18:23:36 +00:00
deveee
681f095140 Move action-trigger to the center of garage. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14826 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-28 22:30:29 +00:00
auria
db44852d8b Make lights fade in when they appear 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14824 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-28 22:02:29 +00:00
auria
ad3ea6c5e0 Remove uneeded code 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14823 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-28 02:10:12 +00:00
auria
4c2c76088a Change pt-BR name to be more accurate 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14822 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-28 02:09:08 +00:00
samuncle
1bb766a84f Add animated light :) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14821 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-28 01:58:43 +00:00
auria
6b4d91effa Misc code style improvements and warning fixes 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14819 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 23:56:42 +00:00
auria
14655bcdb9 Change lights to be TrackObjects, so that they can be animated. Exporter part not yet committed 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14818 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 23:55:57 +00:00
vincentlj
e72e2de8ca GPUParticle: Make RainNode a child of GPUParticle 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 22:52:44 +00:00
deveee
4dd0c066df Fixed problem with distance in my previous commit 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14816 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 22:02:52 +00:00
vincentlj
187abe584b GPUParticles: Reenable rain, windows build is fixed 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14815 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 22:02:12 +00:00
vincentlj
df2bd304ab GPUParticles: Put it in its own file 
Disable rain while doing ping-pong between os to get windows opengl callback

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14814 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 20:56:29 +00:00
vincentlj
6d0e6a67b2 PointLight:Fix shader arithmetic type mismatch reported by mesa 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14813 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 17:03:02 +00:00
vincentlj
616a2e7a75 Rain: Precompute as many shader data as possible 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14812 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 17:01:45 +00:00
vincentlj
9826af0747 Rain: Avoid making a draw call that won't be used and make some cleanup 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14811 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 16:37:24 +00:00
vincentlj
224b246f17 Irrlicht: make setRenderStates3DMode public 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14810 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 16:37:15 +00:00
samuncle
8695d355eb New color correction 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14809 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 04:08:34 +00:00
samuncle
7b90be2e29 Add a massive vegetation under water to test 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14808 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 03:52:08 +00:00
auria
f1aac9e317 Adjust logging to make STK less annoying to debug under visual studio : output the logging directly to VS's output pane, instead of having to reply on the small cmd.exe popup that closes as soon as the application exits 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14807 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 03:02:33 +00:00
vincentlj
053170fc27 Rain: Use transform feedback to decouple simulation from rendering 
It's the base for a future gpu based particle system

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14806 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 02:50:25 +00:00
samuncle
cb21815054 Improved the specularity by adding a little offset to the energy 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14805 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 02:41:58 +00:00
deveee
27e397d2c7 Fixed #1086 - Popup message was displayed constantly when you were in garage in overworld. 
TODO: Compare distance between garage and kart with for example length
of the kart or distance of object defined in scene.xml.
Currently (m_garage_pos-m_kart_pos).length2_2d() gives much higher values than
getKart(0)->getKartModel()->getLength() and I must look at this closer.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14804 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 02:12:16 +00:00
samuncle
32a61d770e Allow kart to use specular map 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14803 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 02:06:08 +00:00
vincentlj
0506b98540 Lights: Add a metric to measure light count pressure in a scene. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14802 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 01:00:20 +00:00
vincentlj
30a030bd4c Light: Pseudo sort lights distance using bucket to evict them fast. 
Lower max light level to 16 as it proves sufficient.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14801 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-27 00:34:41 +00:00
vincentlj
4d0b9236b2 Lights: improve bandwidth usage 
It should improve performance a lot, but it handles at most 32 simultaneous lights on screen.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14800 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 22:55:15 +00:00
vincentlj
508d866a2b Lights: Improve culling system 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14799 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 20:14:49 +00:00
samuncle
46cce1e347 I updated the requirements to something a but more realistic 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14798 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 19:42:11 +00:00
vincentlj
4f36e43b14 Fix unexported FragData 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 18:28:35 +00:00
vincentlj
5512a72d62 Lights: Remove hard edge and attenuate specular 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14796 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 18:00:54 +00:00
samuncle
067564c7cf A little change to make the SSAO better (IMHO) other opinions are welcome) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14795 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 02:55:10 +00:00
samuncle
5c03faab06 Better glow 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14794 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 01:21:03 +00:00
samuncle
122567f0d3 Increase the max distance of the displacement effect 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14793 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 01:01:12 +00:00
samuncle
9be8adaa15 Reduce the color correction 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14792 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-26 00:02:55 +00:00
samuncle
22440ddc60 Minor correction 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14791 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 23:39:06 +00:00
samuncle
55f7817286 Some tweak to test the new light system 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14790 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 23:29:32 +00:00
vincentlj
c2b18a0a1c Light: Export the correct value for specmap in grass/splatting shaders 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14789 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 20:48:27 +00:00
vincentlj
3a6e75b656 Light: Fix skybox bug with specmap and update grass/splatting shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14788 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 20:40:14 +00:00
samuncle
702b9cca97 Add an alpha channel to test the specular map 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14787 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 20:23:51 +00:00
vincentlj
ec3fd4fa13 Light: Support for specularmap 
The specular map is embedded in the alpha component of texture.
Alpha value of 1. means no specular, alpha of 0. means 100% specular.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14786 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 20:19:18 +00:00
samuncle
4435ffbaa0 Better lights (with color correction, and glow :) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14785 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 19:36:07 +00:00
samuncle
6b4f44acbc We don't need lightmap 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14783 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 05:54:21 +00:00
samuncle
42829e3c8d I have add some dynamic lights in the old mine just to test the new pipeline 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14782 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 05:52:08 +00:00
samuncle
292fbadc33 Correction of a bug caused by the skybox 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14780 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-25 02:58:30 +00:00
vincentlj
c9b8734717 Plug-in energy parameter into pointlight shader 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-24 23:07:42 +00:00
vincentlj
8c44b06e9f Revert "Test commit, to be reverted" 
This reverts commit 6cbdcff4da246b940cad4affc2beff101dd3fcc0.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14778 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-24 22:35:19 +00:00
vincentlj
65b32757f3 Separate Diffuse and Specular components 
This allows to bypass alpha test, and have colored specular lights.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14777 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-24 20:51:53 +00:00
vincentlj
5f23483bd9 Fix some shaders not building with mesa 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-24 02:47:33 +00:00
vincentlj
7f51c9737b Test commit, to be reverted 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14770 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-24 01:59:35 +00:00
vincentlj
88ac0ba6cf Attempt to mimic blender light behavior. 
The attenuation assumes a power distributed on the whole sphere surface.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14769 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-24 01:44:40 +00:00