Commit Graph
194 Commits
Author SHA1 Message Date
taylor 2180e4a5c7 add the rest of the texture page-in code changes that I skipped before (should fix Mantis #1389)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4158 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:59 +10:00
taylor 4ab2a0d1af bit of cleanup and minor performance tweaks render ship insignia with a bit of alpha to help with blending/lighting dynamic thruster particle limits update for generic_bitmap/anim changes make use of flag_def_list for ship flags rather than a ton of if-else statements use generic_bitmap and generic_anim where possible to faciliate delayed graphics loading (after all ship related tbls are parsed) use VALID_FNAME()
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4089 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:56 +10:00
Goober5000 aefb3efe15 the great big duplicate model removal commit
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4050 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:54 +10:00
Goober5000 d9fb4b15b9 revert Bobboau's commits for the past two months; these will be added in later in a less messy/buggy manner
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4041 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:53 +10:00
Goober5000 b5a7b399db remove obsolete and misleading comments which should have been edited when the code was upgraded
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4037 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:53 +10:00
taylor 88fe40282f fix a couple of breaks from my commits
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4005 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:52 +10:00
Goober5000 14965a90b0 d'oh... thanks phreak
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3935 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:48 +10:00
Goober5000 c908adb515 fixed two of Bobboau's bizarre bugs
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3932 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:48 +10:00
phreak ff9ee24bf3 Do clip plane testing on thruster glows and thruster particles
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3929 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:48 +10:00
wmcoolmon 03d4e7b41b Finish off warning fixage
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3908 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:47 +10:00
bobboau aea0422b0a fixing a thruster bug, a geometry batcher bug, and trying to fix a shield bug
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3905 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:47 +10:00
wmcoolmon ff8572af7d Fix CVS & correct various warnings under MSVC 2003
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3904 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:47 +10:00
bobboau a3daa5ff3b ok, something aparently went wrong, last time, so I'm commiting again hopefully it should work this time damnit WORK!!!
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3900 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:46 +10:00
wmcoolmon 9405a8c1e2 Attempt to remove various warnings under MSVC 2003, mostly related to casting, but also some instances of inaccessible code.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3898 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:46 +10:00
bobboau 9404744602 made a last second change of mind on something, made it a bit safer
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3895 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:46 +10:00
taylor 030270f2a8 add support for new IBX format which can support up to UINT_MAX worth of verts (NOTE: D3D code still needs to be made compatible with this!!)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3885 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:45 +10:00
taylor ba421d8d68 fix tertiary glow sizes fix model vertex normal data that was being read/written incorrectly under OS X (still don't know why this was a problem, but this fixes it)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3863 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:44 +10:00
wmcoolmon fb94960327 WMC codebase commit. See pre-commit build thread for details on changes.
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3821 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:42 +10:00
taylor f4a3cb0a0f make glow_point array for thrusters and glow_point_banks dynamic (a proper fix for old Mantis bug #43)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3717 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:40 +10:00
taylor 420c35aba5 forgot to reset default value for Interp_warp_alpha when it was changed earlier be sure that we are using the proper zbuffer setting when rendering thruster glows
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3716 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:40 +10:00
taylor fca993a805 ok, so apparently that did actually do something ;)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3714 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:40 +10:00
taylor 4403762592 more cleanup of warp_global crap scale render/detail box limits with detail level setting make sure that we reset culling and zbuffer after each model buffer that gets rendered
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3712 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:40 +10:00
taylor 36f80a7355 rename set_warp_globals() to model_set_warp_globals() remove two old/unused MR flags (MR_ALWAYS_REDRAW, used for caching that doesn't work; MR_SHOW_DAMAGE, didn't do anything) add MR_FULL_DETAIL to render an object regardless of render/detail box setting change "model_current_LOD" to a global "Interp_detail_level" and the static "Interp_detail_level" to "Interp_detail_level_locked", a bit more descriptive minor bits of cleanup change a couple of vm_vec_scale_add2() calls to just vm_vec_add2() calls in ship.cpp, since that was the final result anyway
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3708 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:39 +10:00
taylor 60ee8f6044 a LOT of cleanup: * remove a bunch of old/dead code * some reformatting to help with readability * rearrange/rename some code so that it is a little clearer * move thruster glow code to it's own function (model_render_thrusters()) make HTL model buffers dynamic fix detail boxes so that they actually work for the first time
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3707 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:39 +10:00
taylor 1ed5c7d6c7 various small compiler warning and strict compiling fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3542 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:33 +10:00
taylor 240fabbdd0 fix things that strict compiling balked at (from compiling with -ansi and -pedantic)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3511 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:32 +10:00
taylor dff718944b fix some missile autocentering issues - use MR_AUTOCENTER and MR_IS_MISSILE flags to generate an autocenter for a missile if one doesn't already exist - don't try to autocenter loadout icons when rendered 3d
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3344 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:26 +10:00
Goober5000 2f9ad571c5 stage 2 of animation fix (add base frame time to each ship) --Goober5000
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3340 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:26 +10:00
taylor 3beb39f3de fix for animated texture map issues (*part one*), this should be faster than before too, and fix inf-loop/div-by-0 issues
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3335 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:26 +10:00
taylor d689cd9f6b make sure to reset the optional maps after each buffer render (little scary that this wasn't noticed a long time ago)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3310 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:24 +10:00
taylor 2f0d12e022 rest of the map/glow changes - put glowmap activity back on a per-ship basis (via a SF2_* flag) rather than per-model - same for glowpoints, back on a per-ship basis - put specmaps and bumpmap back on a LOD0 and LOD1 affect (got changed to LOD0 only recently) - fix glowmaps for shockwaves again - add support for animated specmaps (mainly for TBP and Starfox mods) some minor code cleanup and compiler warning fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3304 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:24 +10:00
Goober5000 1f9f692bfd 1) complete (almost) changeover to reorganized texture mapping system 2) finally fix texture animation; textures now animate at the correct speed --Goober5000
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3285 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:23 +10:00
Goober5000 b4fcd028f0 cvs comment tweaks
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3282 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:23 +10:00
Goober5000 a622bf7e8e --in preparation for fixing an annoying animated texture bug, reorganize the various texture structs and glow point structs and clarify several parts of the texture code :P --this breaks animated glow maps, and animated regular maps still aren't fixed, but these will be remedied shortly --Goober5000
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3279 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:23 +10:00
taylor 907a14d209 be sure that we properly apply light to submodels (mainly for debris), looks *really* bad otherwise
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3144 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:18 +10:00
taylor 6bc34644ad comment out the model cache stuff, it's old and not actually used anyway
minor cleanup of some modelinterp.cpp code, to make it more readable
fix tertiary thruster batcher which had the radius value swapped
comment out a couple places where we were doing a D3D or OGL check (it's always true so why bother)
add more support for NO_DIRECT3D so that it can be used on Windows to build without D3D
2006-05-27 16:57:13 +00:00
taylor a39e8900e1 minor cleanup and a couple extra error checks
get rid of some wasteful math from the gr_set_proj_matrix() calls
2006-05-13 07:09:25 +00:00
Goober5000 7e41877b7b proper capitalization according to Volition 2006-04-20 06:32:30 +00:00
bobboau 7c36a78db8 bugfix for the animation system 2006-04-18 00:56:28 +00:00
taylor b296bcea3a compiler warning fix, missed this one previously 2006-04-16 05:24:58 +00:00
taylor ac57d4d55e more s/colour/color/ changes
throw in a couple of safety checks for some neb2 functions
2006-04-12 01:03:00 +00:00
taylor ab5ce4d7e1 modelinterp.cpp: that little bit really isn't needed
popup.cpp:  GCC 4.1 warning fixes
2006-03-25 10:41:44 +00:00
wmcoolmon d95d6165b5 New subobject animation stuff and Lua functions. 2006-03-24 07:38:36 +00:00
taylor 13a9c694c9 make the main vital TMAP_MAX_VERTS stuff dynamic, should handle the major non-HTL related crashes 2006-03-18 10:23:46 +00:00
taylor 92e49f9bef beyond some possible out-of-bounds issues, I think this stuff was messing up non-HTL lighting too 2006-03-16 14:23:35 +00:00
Goober5000 4c272613da fix the animation type triggers 2006-02-28 05:16:55 +00:00
Goober5000 b52b6b1e00 spelling 2006-02-25 21:47:19 +00:00
taylor 9e857ae2c4 NULL vec warning fix (basically just setup as if it were NULL and skip the extra work if needed)
more bmpman related fixes, mainly addresses the condition where it would try to render textures that have been released
have model_unload() run through Ship_info[] and clear out modelnum's when they are free'd (makes more sense here than doing it on level load to keep counts right)
fix missing subsystem warning messages
2006-02-16 05:31:00 +00:00
taylor 7d3c621d15 don't attempt to draw glowpoints or engine glows when in wireframe mode (this may need to be a flag or something, but I'm not sure) 2006-01-19 14:06:33 +00:00
taylor 16b6d96c61 oops! :) 2006-01-18 16:36:32 +00:00