]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commit
Added Draw_GetPicWidth, Draw_GetPicHeight, Draw_IsPicLoaded functions and moved cache...
authorhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 11 Apr 2018 05:28:24 +0000 (05:28 +0000)
committerhavoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Wed, 11 Apr 2018 05:28:24 +0000 (05:28 +0000)
commit0766a43538f3b526cba347157d5259bb3e5785a9
treef728e1906c19120174a4c3e29f96a1d381ecddf1
parent3d604171a34bc172c17a00109fb71b322c3f9d14
Added Draw_GetPicWidth, Draw_GetPicHeight, Draw_IsPicLoaded functions and moved cachepic_t to live in gl_draw.c (no longer visible to other modules).

Changed Draw_CachePic to use the R_SkinFrame_LoadExternal system, and reworked font loading to use Draw_CachePic rather than keeping track of textures itself.  R_SkinFrame_LoadExternal can now load gfx.wad lumps and gfx/*.lmp files, and the embedded images have been moved to image.c as they are now returned as raw images, suitable for R_SkinFrame_LoadExternal to use.

Reworked cl_video code to not need the cl_dyntexture system (which has been removed); it still uses dynamic texture callbacks (which is a feature of rtexture_t).

Changed the parameters to Mod_LoadCustomMaterial and a few other model_shared.c functions to not assume loadmodel is the owner of memory and textures; this was necessary for Draw_CachePic to be able to use R_SkinFrame_LoadExternal.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12385 d7cf8633-e32d-0410-b094-e92efae38249
32 files changed:
cl_dyntexture.c
cl_dyntexture.h
cl_particles.c
cl_screen.c
cl_video.c
cl_video.h
clvm_cmds.c
console.c
darkplaces-dedicated-vs2017.vcxproj
darkplaces-sdl2-vs2017.vcxproj
darkplaces-wgl-vs2017.vcxproj
draw.h
ft2.c
gl_draw.c
gl_rmain.c
gl_rsurf.c
gl_textures.c
image.c
image.h
libcurl.c
menu.c
model_alias.c
model_brush.c
model_shared.c
model_shared.h
model_sprite.c
prvm_cmds.c
r_lightning.c
render.h
sbar.c
wad.c
wad.h