Droog71
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,490 Commits
1 Branch
0 Tags
1 GiB
Commit Graph

107 Commits (master)

Author SHA1 Message Date
Andrew Copland 224a4b32e8 Added a lot more profiling calls. 2013-12-10 21:42:49 +11:00
kko 53dda60929 Fix damage particle rendering (broken some months ago) 2013-07-01 17:24:10 -04:00
kko ac0d832585 Remove remnants of OpenGL matrix stack use, except in old GUI 2013-06-29 11:17:21 -04:00
kko d2e1140cd2 Replace all define constants in .cpp files with static const 2013-06-26 21:07:40 -04:00
shadmar da1af673ba initial 2013-03-13 23:21:03 +01:00
Robert Norris 91b8586653 happy new year 2013-01-01 12:36:52 +11:00
John Bartholomew 290b07765c use a std::vector for Frame children and iterate with normal iterators 2012-12-29 02:31:52 +00:00
John Bartholomew 1afe191ee8 Merge branch 'master' into autopilot-v3 
Conflicts:
	src/Camera.cpp
	src/DeathView.cpp
 2012-12-29 00:59:34 +00:00
shadmar 69daba59cf Fix : DrawPointSprites blend mode is always BLEND_ALPHA_ONE 2012-12-28 13:13:39 +00:00
John Jordan a6c5e4470f Rendering mostly working at least 2012-11-18 18:13:47 +00:00
John Bartholomew eacb8492cd make explosions a little slower to show the effect in all its glory 2012-09-25 00:42:12 +01:00
Robert Norris efbce7648a update license paths 2012-09-16 10:59:15 +10:00
Robert Norris e9f4448bba add copyright notices to all the code 2012-09-16 09:45:04 +10:00
kko c4d45724f5 More const references. 
Once again, mostly for consistency because we pass by const reference more often than not.
 2012-09-03 10:54:22 -04:00
kko c1577179a7 These materials need textures 2012-08-09 22:36:08 -04:00
kko db78a3d6c4 ECM particle material 2012-08-04 14:59:24 -04:00
kko 104b57d964 Use CreateMaterial for special effects 
(all three of them)
 2012-08-04 14:49:41 -04:00
John Bartholomew 151cdc20b4 remove trailing whitespace from all files under src/ 2012-07-04 20:13:48 +01:00
John Bartholomew 9d754b324a create a new 'galaxy' subdir and pull various files into it 2012-05-03 20:57:49 +01:00
John Bartholomew e47533063e put texture filename constants in the code at their point of use 2012-04-01 22:47:25 +01:00
Robert Norris 93caf21140 Merge branch 'master' into texture-renderer 
Conflicts:
	src/FaceVideoLink.cpp
	src/LmrModel.cpp
	src/LuaModelViewer.cpp
	src/Projectile.cpp
	src/Sfx.cpp
	src/Ship.cpp
	src/Texture.cpp
	src/WorldView.cpp
 2012-03-15 16:13:32 +11:00
Robert Norris f2fff6d1a9 rename SDLTextureBuilder to TextureBuilder. how it does things is not important 2012-03-11 08:22:57 +11:00
Robert Norris 4722b25051 convenience texture builders for common kinds of textures 2012-03-10 10:17:37 +11:00
Robert Norris 75f7a2efa8 converted everything except galaxy and lmr over to the cache 2012-03-10 07:58:30 +11:00
Robert Norris 036f6c1448 quicker way to create a texture from SDL. best case you can do it all in one line 2012-03-09 00:07:01 +11:00
Robert Norris c1e8dcd2da no magic, just a clean texture/descriptor split. sdl methods move out to a special builder class. very rough and unoptimised, and some gui glitches, but this is promising 2012-03-08 23:21:31 +11:00
Robert Norris 60d0aa647e convert everything to use the new infrastructure. compiles but there's an early double-free corrupting things 2012-03-07 08:02:45 +11:00
John Bartholomew 34ac4a384e Merge branch 'master' into filesystem 
Conflicts:
	src/Lang.h
	src/WorldView.cpp
 2012-03-05 17:32:45 +00:00
Robert Norris 796316345d Merge branch 'master' into texture-renderer 
Conflicts:
	src/Pi.cpp
	src/Sfx.cpp
	src/Ship.cpp
	src/graphics/Drawables.cpp
	src/graphics/Drawables.h
 2012-03-01 16:31:18 +11:00
Robert Norris c2d4e1105b move Texture into Graphics, with its subclasses split as necessary. Remove GUI dependency on TextureCache 2012-02-28 07:48:46 +11:00
kko 1e194757a5 Replace gluSphere in the explosion effect 2012-02-26 18:27:50 -05:00
kko edb89f0763 Use a global model for the shields 2012-02-26 18:27:37 -05:00
John Bartholomew c8a5263271 Merge branch 'master' into filesystem 
Conflicts:
	src/FaceVideoLink.cpp
	src/LmrModel.cpp
	src/LuaModelViewer.cpp
	src/Makefile.am
	src/Pi.cpp
	src/Projectile.cpp
	src/Sfx.cpp
	src/Ship.cpp
	src/SystemInfoView.cpp
	src/WorldView.cpp
	src/graphics/Shader.cpp
	src/render/Render.cpp
	win32/vc2010/modelviewer.vcxproj
	win32/vc2010/modelviewer.vcxproj.filters
	win32/vc2010/pioneer.vcxproj.filters
 2012-02-21 22:31:36 +00:00
Robert Norris 484f060dce move all the render stuff, old and new, under the Graphics:: namespace. still needs work 2012-02-21 21:04:06 +11:00
John Bartholomew 419d9b0bca modify Texture and LmrModel's .obj loader to use FileSystem 
this necessitates removing PIONEER_DATA_DIR from practically everywhere,
since FileSystem doesn't like hard-coded paths
 2012-02-18 09:01:45 +00:00
kko bebd9a3e93 Replace remaining GL_BLEND handling, except GUI and TextureFont 2012-02-15 11:12:05 -05:00
kko b005a76a2a Replace some matrix handling 2012-02-14 10:16:52 -05:00
kko 12a3e31631 Use DrawPointSprites in several places 
It still uses Render::PutPointSprites behind the scenes
 2012-02-13 18:38:46 -05:00
kko 5e455f6064 Use BillboardTexture for particle effects, lasers and thruster flares 2012-02-11 19:45:25 -05:00
Robert Norris fefe7ae729 add named ui textures to the cache 2011-12-21 09:19:08 +11:00
Robert Norris 54496a291b texture baseclass concept from luomu. hackishly done so far but this is a good place to checkpoint 2011-12-20 16:22:25 +11:00
Robert Norris 2ee94dcbd1 rename TextureManager to TextureCache 2011-12-19 22:24:20 +11:00
Robert Norris 5b6d5642b9 make texturemanager into an object and create one at the top 2011-12-19 21:33:49 +11:00
John Bartholomew e8f750a04e Use TextureManager to get the smoke texture in Sfx 2011-11-01 12:12:15 +00:00
kko ba20d96128 Move Render.h/cpp to render/ 2011-08-20 18:12:27 +03:00
tom e523753ea5 remove unsafe texture name getting function from TextureManager. it binds the texture if loading is necessary, which you might not expect. necessary change to PutPointSprites arguments 2011-07-07 13:36:07 +01:00
Darren Salt 70944debf9 Clean up casts: convert to C++-style. 2011-05-12 20:29:02 +01:00
Darren Salt cdc987cc03 Fix up remaining "data/..." to use PIONEER_DATA_DIR. 
This is one step to making Pioneer installable.
 2011-05-08 15:35:46 +01:00
tompox 6a7855a2eb save games in sections so it will be easier to import old savefiles in the future. this breaks compatibility with savefiles before this commit 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@641 e632f14b-6550-0410-b89e-a82653faca30
 2010-08-03 10:28:18 +00:00
tompox fe16b00059 re-jig userdata serialization for lua modules. wrap SBodyPath and SysLoc a bit. a little more fiddling with general serialization 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@595 e632f14b-6550-0410-b89e-a82653faca30
 2010-05-22 17:27:43 +00:00
tompox 388cc95128 make serialize and unserialize functions use reader and writer objects (needed to serializing C objects from lua isn't such a pain -- but it is generally a better idea anyway) 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@593 e632f14b-6550-0410-b89e-a82653faca30
 2010-05-22 17:26:25 +00:00
tompox b9c1172f73 do shaders in a less awful way 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@556 e632f14b-6550-0410-b89e-a82653faca30
 2010-03-10 19:55:35 +00:00
tompox c60dd53e0c faster particle sfx crap. 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@450 e632f14b-6550-0410-b89e-a82653faca30
 2009-10-22 10:35:34 +00:00
tompox 0ef18fcbd6 get alpha working in sbre with vertex shaders enabled. some work on point sprite nonsense for sfx and lasers. code thrash due to vector3.h change 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@392 e632f14b-6550-0410-b89e-a82653faca30
 2009-09-13 22:48:13 +00:00
tompox d037364097 replace beam lasers with projectiles (unfinished), as space combat is miserable with point and zap. reduce verbosity throughout the turd. fiddle with AI. 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@391 e632f14b-6550-0410-b89e-a82653faca30
 2009-09-12 17:25:15 +00:00
tompox 329666a7d1 spawn pirates on entry to system. not determining strength by system yet. 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@214 e632f14b-6550-0410-b89e-a82653faca30
 2009-02-19 18:40:11 +00:00
tompox f715f267f3 explosion effects when ships die 
git-svn-id: https://pioneer.svn.sourceforge.net/svnroot/pioneer/trunk@157 e632f14b-6550-0410-b89e-a82653faca30
 2008-11-14 11:11:51 +00:00