127 Commits

Author SHA1 Message Date
hikerstk
6df020f13b Fixed camera in case of an explosion (or rescue).
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7749 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-22 21:38:49 +00:00
hikerstk
78cd11f881 Simplified computations in camera, which fixes also looking backwards
when going downhill.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7748 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-22 21:37:27 +00:00
hikerstk
ac5190c671 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7740 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-20 14:58:11 +00:00
mbjornstk
b8a0ab32b4 Apply camera changes provided by Jesse Smith to have v0.6 camera option.
Feel free to fix any C++ style issues, this saves you fighting with patch or
can be undone quickly by reverting this single commit.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-20 05:11:26 +00:00
hikerstk
66ff37eb80 Use normal particle terrain to make water splash; proper location
for water splashes is now being detected. Note: existing tracks
need to be updated.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7706 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-15 21:12:24 +00:00
hikerstk
4ab6331ff4 Update to bullet-2.77.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7579 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-02 22:04:13 +00:00
auria
f71b7437b7 Name cameras in debug mode, useful to debug particle effects (which need to be camera-specific)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7547 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-25 17:05:10 +00:00
auria
03af38c9b0 Work on water splash effect a bit; only lighthouse was changed for now, we can change other tracks when Joerg modified the track exported. The effect can still be improved of course, I mostly did the basic code aspect
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7375 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-01-12 03:01:57 +00:00
hikerstk
85979ee919 Removed debug output.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6486 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-11-09 21:50:14 +00:00
hikerstk
4976d9d60c Made the backwards facing camera using a higher angle to make
it more useful (actual angle can be determined in stk_config.xml).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6155 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-27 12:15:19 +00:00
hikerstk
87bb1cea34 Fixed incorrect camera angle when the kart is driving up a steep hill.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6141 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-24 12:22:56 +00:00
hikerstk
58116b66be Made the up-angle relative to the pitch of the kart configurable.
It now defaults to 15 degrees (it was 30 degrees, but accidentally
a hard coded value of 15 was committed in r6110).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6119 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-23 03:43:10 +00:00
auria
81aca22434 Fixed weird music being used on XR591
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6110 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-22 02:01:52 +00:00
hikerstk
b754d9c879 Fixed camera aiming at incorrect (previous) position when restarting a race.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6107 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-21 12:25:17 +00:00
hikerstk
6c7cdb1b7b Fixed crash in end camera - hopefully the last problem.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5634 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-05 00:10:58 +00:00
hikerstk
a4d5c1056d Fixed end camera if a track has no specific end camera defined (previously
an existing end camera from a previous race would be re-used).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5632 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-07-04 23:40:37 +00:00
hikerstk
c1c7daf2fa 1) Added support for new camera mode: end camera positions and types
can now be specified in the scene file. Currently supported are:
   - normal 'ahead of kart' camera (which is what we used so far)
   - fixed camera: camera is at a fixed position, always looking
     at the kart.
2) Removed camera.hpp dependency from kart.hpp.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-28 23:33:07 +00:00
hikerstk
f1c187d5d5 Fixed VS compilation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5584 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-28 23:24:04 +00:00
auria
ee514b08a7 Hopefully fixed bug where camera hanged
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5577 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-28 00:39:45 +00:00
auria
c19280e6d1 Added assertions to Camera so that we can catch the camera getting stuck bug
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5575 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-27 23:18:52 +00:00
hikerstk
07ac6f5c76 Added separate camera mode for end camera, added experimental new end camera
(which atm has hardcoded values for lighthouse track only and is disabled).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5542 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-23 22:37:48 +00:00
mbjornstk
32b1300adc Set camera near distance (magic number, needs fixing and documenting why 52
when range is 30) to see inside tunnels with --camera-debug.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5289 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-27 00:59:08 +00:00
hikerstk
200aa4ca36 Added new command line flag to enable debug debug camera (showing the view from high above
the kart down).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5286 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-26 23:28:11 +00:00
auria
297f0cceb4 Renamed SoundManager into MusicManager, since this makes it much clearer what it does (it was just confusing to have SoundManager and SFXManager)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5228 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-21 17:24:02 +00:00
auria
c12618a48a Moved some audio code around because the previous organisation was confusing, there was some SFX code among the music code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5227 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-21 17:16:49 +00:00
hikerstk
ca9eb71087 Removed unused file coord.hpp.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5204 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-16 00:01:25 +00:00
hikerstk
91feb49998 1) Added animation support for attachments, atm hardcoded for bomb only.
2) Instead of creating a new scene node every time something is attached
   to a kart, the same node will now be re-used (and is set as invisible
   otherwise).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5173 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-11 22:48:01 +00:00
hikerstk
667b208aab Converted all kart.xml files from lisp to .xml files.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5029 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-19 04:23:32 +00:00
hikerstk
2a33313d24 Removed compiler warning.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5013 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-17 04:11:32 +00:00
hikerstk
d50bd9dbe6 Merged the switch_coordinate_system branch with trunk. This means
that now all coordinate systems are y up, z forwards - including
the file format. For now only one track has been ported, the
rest will follow shortly.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4985 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-12 02:16:11 +00:00
hikerstk
7ef21a38ed Fixed camera rotation.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4984 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-11 23:23:15 +00:00
hikerstk
5de3555ac2 Fixed 'relaxed' camera view, fixed (usually unused) camera debug mode,
removed unused code.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-11 22:06:41 +00:00
hikerstk
f09a083597 Updated default AI, added getPitch() to moveable so that camera can get the
pitch in the range it needed it (-90 to 90, not -180 to 180).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4946 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-06 00:44:17 +00:00
hikerstk
2813e3d75c More fixes related to camera handling.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4903 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-02 05:14:56 +00:00
hikerstk
d7c44cc93d Physics debug mode now cycles through off, show karts and collision shape,
to show only collission shape and then back to off. The command line
option --bullet-debug was removed.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4853 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-26 07:03:12 +00:00
hikerstk
bd33113f20 Fixed incorrect heading and pitch in vec3, fixed rescue (again),
fixed checklines, improved camera (still not fully working), fixed
incorrect 'wrong heading' messages.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4844 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 13:20:22 +00:00
hikerstk
13f4c5c8ab Removed unused final camera.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4843 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 03:33:39 +00:00
auria
2945e55d89 Fixed camera doing ugly moves when restarting race
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4836 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-25 00:16:06 +00:00
hikerstk
fbeaa0524f More fixes to swap the bullet axis.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4822 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-24 05:23:00 +00:00
hikerstk
092a59a7d2 Very first changes. Doesn't really work yet and will most likely crash - not recommended to use :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/switch_coordinate_system@4813 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-23 13:27:01 +00:00
hikerstk
9a767dcdbe Added support of far camera to stk, updated final camera handling of track exporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4775 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-20 01:42:32 +00:00
hikerstk
da3de6d131 Big code refactoring: instead of having auto_kart, player_kart, the karts
now use a 'controller' object which is responsible for its steering, e.g.
a default_ai_controller, player_controller etc. This makes it easier to
switch a player kart to use a end-of-race computer controller to drive
the kart once the race is finished (though that's not implemented yet).
I expect some bugs with restarting race, and perhaps end of race
behaviour at this stage.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4714 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-15 00:54:28 +00:00
hikerstk
328373289a 1) Moved access to world object from race_manager to static functions in
world.
2) Removed more dujplicated/unnecessary functions from race_manager
   (getPlayerKart, getTrack).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4682 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-11 07:11:52 +00:00
hikerstk
c6bf95a64c Started to remove the various kart lists in various objects.
1) Removed getKart from RaceManager.
2) Renamged RaceManager::getNumKarts() to getNumberOfKarts.
   This function should only be called when the world
   does not exist (or is not yet initialised). 	In all
   other cases world::getNumKarts() should be called.
3) Improved several 'const' functions.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4676 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-02-10 11:40:33 +00:00
hikerstk
9aba7a2b1e Removed debug output.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-17 02:44:09 +00:00
hikerstk
de0e948c9a Simplified camera code somewhat, added support for final-camera, and made reverse
faster.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4306 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-16 21:37:33 +00:00
mbjornstk
22d233b46c Wrap some lines with {} so g++ 4.3 does not abort.
For reference, and in case there is a better fix, the error reported was:
graphics/camera.cpp:124: error: jump to case label
graphics/camera.cpp:117: error:   crosses initialization of "const int y2"
graphics/camera.cpp:116: error:   crosses initialization of "const int x2"
graphics/camera.cpp:115: error:   crosses initialization of "const int y1"
graphics/camera.cpp:114: error:   crosses initialization of "const int x1"


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4269 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 21:03:59 +00:00
auria
edf2a43676 As suggested on the mailing list : 3-player-plit-screen should divide in 4 and use the 4th window to put stuff like minimap and players
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4261 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 18:35:58 +00:00
auria
ce83dccecf Fixed 4-player split-screen (Seems like Hiker loves ternary operators; but they made it totally unobvious that screen width was used to compute viewport y ;) )
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4260 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 18:17:10 +00:00
auria
3c67c88720 Decreased FOV in multiplayer mode, will look much less weird
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4259 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 17:56:41 +00:00