Commit Graph
116 Commits
Author SHA1 Message Date
Goober5000 d68a225582 added fixes for #1415 and #1483, made sure every read_file_text had a corresponding setjmp, and sync'd the parse error messages between HEAD and stable
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4251 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:43:04 +10:00
taylor 4c9c897094 bm_unload_fast() should only unload the bitmap passed for animations, not the entire animation (fixes several issues)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4121 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:57 +10:00
taylor c116a2170a various bits of bmpman cleanup be sure to clean all three possible buffers with OGL init fix a couple of bmpman loading bugs that messed up animations fix bmpman bug that didn't properly account for free'd texture ram count with unload_fast
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4073 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:55 +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 2f39ad1a2a fix some breakage ;)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@4007 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:52 +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
taylor 0cc9741790 remove some dead code better texture memory handling (a work in-progress) new image finding/loading change the game_busy() reporting during bitmap page-in to only catch one frame of an animation fix numerous little bugs in gropenglbmpman relating to -img2dds
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3998 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:51 +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
taylor 15e8396c2e remove the non-dark stuff, it only works on PCX files and stuff to use it has already been ripped out per earlier discussions: remove -jpgtga and -pcx32, set image load order to DDS->TGA->JPG->PCX some debug log cleanup remove bitmap data from system memory once it's in API memory
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3882 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:45 +10:00
taylor 15cad9783b fix bm_page_in_texture() so that it will load all frames of an animation (caused slowdowns in-game with it)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3850 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 c29aa3e9e3 fixes for stuff_string() bounds checking stict compiler build fixes
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3548 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:34 +10:00
taylor 9203064801 ever so slight speed up for bm_set_components_* (this crap is slow, and it's called a LOT)
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3442 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:30 +10:00
taylor f106d752dd minor changes to game_busy() debug text - don't alloc it for bmpman, and make sure to only call on textures that we are loading - add text for model loading, gets rid of the long-wait issue when it appears to not be doing anything early on
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3354 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:27 +10:00
Goober5000 6fb59c5921 spelling
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3283 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
taylor f796a01756 fix various things that Valgrind complained about comp_type for DDS images will always be set to something, an 'uncompressed' type at the least
git-svn-id: svn://svn.icculus.org/fs2open/trunk/fs2_open@3258 387891d4-d844-0410-90c0-e4c51a9137d3
2015-04-29 18:42:22 +10:00
taylor c9af1ffaef clean up BM_TYPE_* stuff so it's a little easier to tell what is what
bm_load_sub_fast() doesn't need to lowercase filenames, so don't
byte-swap 16-bit DDS on big endian (they still don't look right though)
update bm_has_alpha_channel() to be less dumb
2006-05-27 17:20:48 +00:00
taylor 7a8789e334 OpenGL envmap support
newer OpenGL extension support
add GL_ARB_texture_rectangle support for non-power-of-2 textures as interface graphics
add cubemap reading and writing support to DDS loader
fix bug in DDS loader that made compressed images with mipmaps use more memory than they really required
add support for a default envmap named "cubemap.dds"
new mission flag "$Environment Map:" to use a pre-existing envmap
minor cleanup of compiler warning messages
get rid of wasteful math from gr_set_proj_matrix()
remove extra gr_set_*_matrix() calls from starfield.cpp as there was no longer a reason for them to be there
clean up bmpman flags in reguards to cubemaps and render targets
disable D3D envmap code until it can be upgraded to current level of code
remove bumpmap code from OpenGL stuff (sorry but it was getting in the way, if it was more than copy-paste it would be worth keeping)
replace gluPerspective() call with glFrustum() call, it's a lot less math this way and saves the extra function call
2006-05-13 07:29:52 +00:00
Goober5000 7e41877b7b proper capitalization according to Volition 2006-04-20 06:32:30 +00:00
taylor e35065bc0d remove all of the *_ex() parsing functions added for use by EFFs
add a pause/unpause for parsing so that we can safely start parsing something new then continue parsing something old
make Mission_text and Mission_text_raw only use the memory needed, and free it when it doesn't need to parse anymore
  (should work ok with FRED2, but I wasn't able to test it)
2006-04-14 18:44:16 +00:00
taylor 36f4910681 make filename length checks non-fatal 2006-03-06 16:30:06 +00:00
taylor 6880def156 attempt to fix bad out-of-bounds (and related) issues when weaponchoice icon is missing
be sure to always initialize frame count and FPS with bm_load_animation() calls in case caller got lazy
2006-02-23 06:21:56 +00:00
taylor bf18c71316 various bmpman related fixes
- some new error checking (and fixes related to that) and cleanup
 - fix EFFs not getting released/unloaded properly (was in a local tree but apparently missed CVS)
 - minor fixes for bm_release() to produce a more properly cleaned slot
 - use fast unloading for page_in stuff since we don't actually want really want the load count changing for texture maps
   and to make sure that we free the memory usage regardless of load count
2006-02-16 05:00:01 +00:00
wmcoolmon 24d8f7973f Scripting updates; Special scripting image list; Better operator meta; Orientation type; Wing type; Texture type. Fix for MSVC7 compiling. 2006-01-21 02:22:05 +00:00
taylor c69ff06b94 that wasn't too smart of me, move extra anim filename size check to *after* we have found an anim 2006-01-21 01:56:58 +00:00
taylor 9de1e7691d fix anim filename length check, they need at least 5 extra characters for the frame number on the filenames 2006-01-20 23:47:51 +00:00
taylor b84bce6e8f allow for 24-bit user created bitmap images
make sure we have proper memory size requirements for non-DDS EFFs
2005-12-28 22:04:00 +00:00
taylor d11422acc2 add base support for 8-bit DDS images
clean up some DDS error messages and other minor bug/comment fixes
move bitmap stuff from pstypes.h, it makes more sense here anyway
start of 8-bit palette conversion, needs work but is here for WMCoolmon to look at and play with
2005-12-06 03:05:53 +00:00
wmcoolmon 15b30e3177 Final commit of codebase 2005-12-04 19:07:49 +00:00
taylor e67246a0da correct a little EFF fubar from my -img2dds commit
vocalize EFF loading errors so that they get noticed and fixed sooner
2005-11-17 02:30:49 +00:00
taylor 0fe5be4fe9 small bit of EFF cleanup
add -img2dds support
cleanup some D3D stuff (missing a lot since the old code is so unstable I couldn't get it working like I wanted)
some minor OGL cleanup and small performance changes
converge the various pcx_read_bitmap* functions into one
cleanup/rename/remove some cmdline options
2005-11-13 06:44:18 +00:00
wmcoolmon 7cd75811db More warnings instead of Int3s/Asserts, better Lua scripting, weapons_expl.tbl is no longer needed nor read, added "$Disarmed ImpactSnd:", fire-beam fix 2005-11-08 01:04:02 +00:00
taylor 6e427e11e9 some minor cleanup and compiler warning fixes 2005-10-28 14:49:35 +00:00
taylor b35d857131 convert Jpegs from RGB to BGR after read, OpenGL had a problem with this, D3D still works fine 2005-10-26 20:53:02 +00:00
taylor dd21fa57f2 some cleanup, fix some general memory leaks, safety stuff and whatever else Valgrind complained about 2005-10-23 20:34:30 +00:00
taylor 2df63f7ab6 make sure that bm_make_render_target will handle failure 2005-10-15 20:42:40 +00:00
taylor d3481714d0 remove NO_NETWORK 2005-10-10 17:21:11 +00:00
taylor 0a7dea55ee remove -rlm, it's always on now since there was never a complaint and pretty much everyone uses it
add -cache_bitmaps and have bitmap caching between levels off by default
when -cache_bitmaps is used then use C-BMP for top-right memory listing, and just BMP otherwise
2005-09-30 09:47:06 +00:00
Goober5000 ff2eb59e13 moved these per taylor's recommendation
--Goober5000
2005-09-26 04:53:19 +00:00
Goober5000 2db3aade28 some more cleanup
--Goober5000
2005-09-26 04:08:54 +00:00
Goober5000 8efd3812ac okay, this should all be working :)
--Goober5000
2005-09-26 02:15:03 +00:00
Goober5000 81784bfa63 hopefully complete species upgrade
--Goober5000
2005-09-25 05:13:07 +00:00
Goober5000 374b2b21a0 another species overhaul
--Goober5000
2005-09-24 07:07:17 +00:00
taylor 16fee1c55e byte-swap for 32-bit uncompressed DDS images on big endian 2005-09-22 11:20:11 +00:00
taylor bf90cfdfdc send out multi pings during level load to prevent timeouts on slower computers (does not break network compatibility with older, or retail, clients/servers) 2005-08-26 00:56:17 +00:00
taylor 99dab0fc7d some bmpman and render_target function name changes so that they make sense
always use bm_set_render_target() rather than the gr_ version so that the graphics state is set properly
save the original gamma ramp on OGL init so that it can be restored on exit
2005-08-20 20:34:51 +00:00
Goober5000 12c90e780d remove PreProcDefine #includes in FS2
--Goober5000
2005-07-13 02:50:53 +00:00
taylor d12a2fb8b4 add a _fast version of bm_unload() to be used in modelinterp and future graphics API code
clean up some modelinterp code to not use memcpy() everywhere so it's more platform compatible and matches old code (Jens Granseuer)
NaN check to catch shards-of-death and prevent hitting an Assert() (Jens Granseuer)
fix jumpnode code to catch model errors and close a memory leak
make the call to bm_unload_all() after model_free_all() since we will get bmpman screwups otherwise
don't show hardware sound RAM when using OpenAL build, it will always be 0
print top-right memory figures in debug builds slighly further over when 1024+ res
2005-06-19 02:28:56 +00:00