Commit Graph

189 Commits

Author SHA1 Message Date
Marianne Gagnon
933e27052d Create a "default material" object and use it for materials that don't appear in materials.xml, instead of an hardcoded special case 2014-09-19 19:54:15 +02:00
Vincent Lejeune
24cd727899 Add glossytex to textures 2014-09-19 19:54:00 +02:00
vlj
9a114b2f6f Gather glsl material handling code 2014-09-19 19:22:04 +02:00
Vincent Lejeune
bb63cf9e86 Clean material handling code. 2014-09-19 19:22:03 +02:00
hiker
86b351fbf4 Turn sfx_manager into a singleton. 2014-09-17 21:38:21 +10:00
Vincent Lejeune
d501125e9d Remove some unused variables. 2014-07-06 21:06:27 +02:00
Marianne Gagnon
d6c983cac3 Add support to load new style glossmap (more work remains to do before this is complete) 2014-06-10 18:59:36 -04:00
Flakebi
af6c121a22 Run whitespaces.py 2014-06-04 15:10:20 +02:00
Marianne Gagnon
b5e6e5e054 Remove bogus check 2014-06-02 19:46:50 -04:00
Marianne Gagnon
aa1418050d Bugfix when GLSL disabled 2014-05-27 19:00:55 -04:00
Marianne Gagnon
986563fdf8 Fix transparency 2014-05-25 18:45:54 -04:00
Marianne Gagnon
8b8a17de21 Improve material compat fallback + update one handwritten materials XML 2014-05-20 20:04:21 -04:00
Marianne Gagnon
778649f182 More material work 2014-05-19 20:01:51 -04:00
Marianne Gagnon
6410cf8776 Start refactoring materials 2014-05-19 19:30:44 -04:00
Vincent Lejeune
838b44fc00 Remove Cautics effect
It's not used anywhere and I have no way to test it so it's useless.
2014-05-18 19:28:53 +02:00
konstin
7cc83e1475 running whitespaces.py update 1 2014-03-29 11:33:43 +01:00
konstin
663fffdebb Revert "Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces"
This reverts commit 65e2dcf2f0.
2014-03-29 11:32:04 +01:00
konstin
65e2dcf2f0 Running whitespaces.py; no more trailing whitespaces & tabs -> 4 spaces 2014-03-28 20:08:39 +01:00
hiker
1709ccc36d Started to set the gravity for selected material based on the
normal of the triangle where the kart is on.
2014-01-28 21:42:23 +11:00
Vincent Lejeune
2e994502e3 Properly handle unlit object. 2014-01-26 01:09:25 +01:00
Marianne Gagnon
190cc9fa9a Clarify a couple error messages 2014-01-24 18:48:40 -05:00
Vincent Lejeune
7da65c15f0 Enable tangents on every lod instance and fix normalmap
This will increase the memory footprint of lod object,
however this is the only way I found to make meshbuffer using
GE_NORMAL_MAP to provide the necessary info to this shader.

Now the pedestal in overlord looks perfectly normal mapped.
2014-01-17 21:55:25 +01:00
Vincent Lejeune
8e1d76dd8f Throw a fatal error if we ask a normalmap effect and the underlying mesh doesnt have one. 2014-01-17 21:15:43 +01:00
samuncle
54a9a94ed2 Oups I forget to remove some debug printf :3
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14907 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:34:38 +00:00
samuncle
aedb68a88a Minor correction for a window path
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14906 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-04 20:29:02 +00:00
auria
93643d660f misc minor stuff
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14880 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2014-01-01 21:21:48 +00:00
hikerstk
c450c97472 Allowed the music directory to be external. Renamed
getMusicFile to searchMusic and getTextureFile to
searchTexture. Removed m_root_dir from file_manager.
Added convenience function getTexture to irr_driver
which takes an asset type, so now less code is needed
to load textures (though that's proably not used
everywhere yet).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-18 22:29:08 +00:00
hikerstk
73c498daf3 Start to support 'externa' data directories. Most directories
from data can now be moved out (except music). STK prints
an overview of which directory is taken from where. More 
cleanups and improvements will come.
Also moved skins into a separate directory under data (from
data/skins), since it's likely that skins will be part
of a binary package (i.e. changes to skins not really
related to code), while gui files will more likely stay
with the code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14731 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-17 23:48:47 +00:00
hikerstk
55cd9dd09a Made 'min_speed' available for zipper only, re-exported spaceship track.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14716 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-12 05:37:15 +00:00
hikerstk
bce4a075ba Added support for a texture specific minimum speed. This fixes issues with
AI karts (esp. EndController) not being able to do long jumps. Added setting
for minimum speed to Enterprise track (EndController were not able to finish
the jump on the ramp).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14710 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 22:12:14 +00:00
auria
d18068f2f4 Remove forgotten debug log
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14701 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:03:59 +00:00
auria
afe826a814 Fix disabling lights on additive materials; fix disabling fog
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14700 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 01:02:20 +00:00
auria
aa848f0afd small fixes to material
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14698 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 00:40:51 +00:00
auria
b27a5363bd Fix objects that are unaffected by lights
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14697 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-11 00:37:07 +00:00
auria
95ffca1bf0 Remove alpha to coverage
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14693 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-09 23:38:53 +00:00
auria
f96a647a9c Modularize the rendering a little (I am aware this results in a very small loss of performance, but given the large amount of virtual method calls we make every frame, should be pretty insignificant, and will make the rendering much easier to follow). Fix VS 2013 support issues. Improve material to reject mutually exclusive settings that result in render bugs.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14665 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-08 20:06:44 +00:00
auria
eaef91fc4b Fix multiple crashes when new pipeline is turned off
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-01 19:42:14 +00:00
auria
5899a26aad Merge cand's graphical improvements branch!! There are many known issues folks, so don't cry victory just now, this is just the beginning. Especially, shadows do not work correctly at this time
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14590 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-30 21:33:06 +00:00
hikerstk
e6660d7c74 Improved warning messages: most warnings about textures not
found will now be prefixed with a line indicating what kart
or track it comes from. Fixed crash in referee when a texture
did not exist. Irrlicht's warnings about missing textures
while loading a mesh will be prefixed by a line about which
kart/track is missing as well.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14491 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-20 10:56:42 +00:00
hikerstk
8247f73604 Replaced tabs with spaces.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14448 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 12:52:39 +00:00
hikerstk
c5b8732087 Probably biggest commit (in terms of number of files) ever -
updated the (c) line of all files to -2013, added missing (c), 
changed format in some cases so that it will be easier in
the future to change them by script. No actualy code change.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14447 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-15 11:43:21 +00:00
deveee
ea2b34c52e Avoid bounce karts from edges in soccer field.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14428 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-11-14 19:03:35 +00:00
deveee
d8cfc75557 Fixed #1003. Avoid crash when mask file is missing.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14240 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-10-12 15:13:39 +00:00
deveee
4673c41987 Still work on #886.
- fixed resume sound after that when speed was near to 0 (broken in previous commit)
- pause sound while explosion animation

Tested on bridges in hacienda and snowmountain.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14171 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-09-29 22:19:48 +00:00
hikerstk
8ec6b13eee Fixed compiler warnings.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13542 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-08-22 03:50:50 +00:00
hikerstk
2ff62c4d97 Added support for jump animation, which will triggered
if either the estimated jump duration is long enough,
or the texture the kart was on before it jumped has
a jump property set.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-18 07:24:47 +00:00
auria
ddec322a01 Improve error reporting
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12949 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-23 22:40:04 +00:00
curaga
304dceae8c Add a common GLSL check.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12836 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-01 11:01:59 +00:00
curaga
ed9b4db88d Remove a no-op test
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12828 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-31 14:15:50 +00:00
curaga
b56bf4dc53 Remove trailing space, git doesn't like it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12797 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-29 22:04:35 +00:00