2004-08-23 00:15:46 +00:00
# include "quakedef.h"
2014-10-11 19:39:45 +00:00
# include "shader.h"
2004-08-23 00:15:46 +00:00
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
//#define PURGEIMAGES //somewhat experimental still. we're still flushing more than we should.
2014-10-05 20:04:11 +00:00
//FIXME
texid_t GL_FindTextureFallback ( const char * identifier , unsigned int flags , void * fallback , int fallbackwidth , int fallbackheight , uploadfmt_t fallbackfmt ) ;
//FIXME
2007-05-25 22:16:29 +00:00
2012-11-27 03:23:19 +00:00
# ifdef NPFTE
//#define Con_Printf(f, ...)
//hope you're on a littleendian machine
# define LittleShort(s) s
# define LittleLong(s) s
# else
2014-10-05 20:04:11 +00:00
cvar_t r_dodgytgafiles = CVARD ( " r_dodgytgafiles " , " 0 " , " Many old glquake engines had a buggy tga loader that ignored bottom-up flags. Naturally people worked around this and the world was plagued with buggy images. Most engines have now fixed the bug, but you can reenable it if you have bugged tga files. " ) ;
cvar_t r_dodgypcxfiles = CVARD ( " r_dodgypcxfiles " , " 0 " , " When enabled, this will ignore the palette stored within pcx files, for compatibility with quake2. " ) ;
2016-11-20 20:52:41 +00:00
cvar_t r_dodgymiptex = CVARD ( " r_dodgymiptex " , " 1 " , " When enabled, this will force regeneration of mipmaps, discarding mips1-4 like glquake did. This may eg solve fullbright issues with some maps, but may reduce distant detail levels. " ) ;
2014-01-13 02:42:25 +00:00
char * r_defaultimageextensions =
# ifdef IMAGEFMT_DDS
" dds " //compressed or something
# endif
" tga " //fairly fast to load
2015-04-21 04:12:00 +00:00
# if defined(AVAIL_PNGLIB) || defined(FTE_TARGET_WEB)
2014-01-13 02:42:25 +00:00
" png " //pngs, fairly common, but slow
# endif
//" bmp" //wtf? at least not lossy
2015-04-21 04:12:00 +00:00
# if defined(AVAIL_JPEGLIB) || defined(FTE_TARGET_WEB)
2014-01-13 02:42:25 +00:00
" jpg " //q3 uses some jpegs, for some reason
# endif
2015-10-11 11:34:58 +00:00
# ifndef NOLEGACY
2014-01-13 02:42:25 +00:00
" pcx " //pcxes are the original gamedata of q2. So we don't want them to override pngs.
2015-10-11 11:34:58 +00:00
# endif
2014-01-13 02:42:25 +00:00
;
2015-04-21 04:12:00 +00:00
static void QDECL R_ImageExtensions_Callback ( struct cvar_s * var , char * oldvalue ) ;
2016-07-12 00:40:13 +00:00
cvar_t r_imageexensions = CVARCD ( " r_imageexensions " , NULL , R_ImageExtensions_Callback , " The list of image file extensions which fte should attempt to load. " ) ;
cvar_t r_image_downloadsizelimit = CVARFD ( " r_image_downloadsizelimit " , " 64000 " , CVAR_NOTFROMSERVER , " The maximum allowed file size of images loaded from a web-based url. 0 disables completely, while empty imposes no limit. " ) ;
2014-10-05 20:04:11 +00:00
extern cvar_t gl_lerpimages ;
extern cvar_t gl_picmip2d ;
extern cvar_t gl_picmip ;
extern cvar_t r_shadow_bumpscale_basetexture ;
extern cvar_t r_shadow_bumpscale_bumpmap ;
2015-02-02 08:01:53 +00:00
extern cvar_t r_shadow_heightscale_basetexture ;
extern cvar_t r_shadow_heightscale_bumpmap ;
2014-10-05 20:04:11 +00:00
static bucket_t * imagetablebuckets [ 256 ] ;
static hashtable_t imagetable ;
static image_t * imagelist ;
2012-11-27 03:23:19 +00:00
# endif
2004-08-23 00:15:46 +00:00
# ifndef _WIN32
# include <unistd.h>
# endif
typedef struct { //cm = colourmap
char id_len ; //0
char cm_type ; //1
char version ; //2
short cm_idx ; //3
short cm_len ; //5
char cm_size ; //7
short originx ; //8 (ignored)
short originy ; //10 (ignored)
short width ; //12-13
short height ; //14-15
qbyte bpp ; //16
qbyte attribs ; //17
} tgaheader_t ;
char * ReadGreyTargaFile ( qbyte * data , int flen , tgaheader_t * tgahead , int asgrey ) //preswapped header
{
2013-05-11 05:03:07 +00:00
int columns , rows ;
2004-08-23 00:15:46 +00:00
int row , column ;
qbyte * pixbuf , * pal ;
qboolean flipped ;
qbyte * pixels = BZ_Malloc ( tgahead - > width * tgahead - > height * ( asgrey ? 1 : 4 ) ) ;
2007-10-12 10:27:51 +00:00
if ( tgahead - > version ! = 1
& & tgahead - > version ! = 3 )
2005-12-21 08:34:34 +00:00
{
Con_Printf ( " LoadGrayTGA: Only type 1 and 3 greyscale targa images are understood. \n " ) ;
BZ_Free ( pixels ) ;
return NULL ;
}
2004-08-23 00:15:46 +00:00
2013-05-11 05:03:07 +00:00
if ( tgahead - > version = = 1 & & tgahead - > bpp ! = 8 & &
2004-08-23 00:15:46 +00:00
tgahead - > cm_size ! = 24 & & tgahead - > cm_len ! = 256 )
2005-12-21 08:34:34 +00:00
{
Con_Printf ( " LoadGrayTGA: Strange palette type \n " ) ;
BZ_Free ( pixels ) ;
return NULL ;
}
2004-08-23 00:15:46 +00:00
columns = tgahead - > width ;
rows = tgahead - > height ;
flipped = ! ( ( tgahead - > attribs & 0x20 ) > > 5 ) ;
2012-11-27 03:23:19 +00:00
# ifndef NPFTE
2004-08-23 00:15:46 +00:00
if ( r_dodgytgafiles . value )
flipped = true ;
2012-11-27 03:23:19 +00:00
# endif
2004-08-23 00:15:46 +00:00
if ( tgahead - > version = = 1 )
{
pal = data ;
data + = tgahead - > cm_len * 3 ;
if ( asgrey )
{
for ( row = rows - 1 ; row > = 0 ; row - - )
{
if ( flipped )
pixbuf = pixels + row * columns ;
else
pixbuf = pixels + ( ( rows - 1 ) - row ) * columns ;
for ( column = 0 ; column < columns ; column + + )
2007-10-12 10:27:51 +00:00
* pixbuf + + = * data + + ;
2004-08-23 00:15:46 +00:00
}
}
else
{
for ( row = rows - 1 ; row > = 0 ; row - - )
{
if ( flipped )
pixbuf = pixels + row * columns * 4 ;
else
pixbuf = pixels + ( ( rows - 1 ) - row ) * columns * 4 ;
for ( column = 0 ; column < columns ; column + + )
{
* pixbuf + + = pal [ * data * 3 + 2 ] ;
* pixbuf + + = pal [ * data * 3 + 1 ] ;
* pixbuf + + = pal [ * data * 3 + 0 ] ;
* pixbuf + + = 255 ;
data + + ;
}
}
}
return pixels ;
}
//version 3 now
if ( asgrey )
{
for ( row = rows - 1 ; row > = 0 ; row - - )
{
if ( flipped )
pixbuf = pixels + row * columns ;
else
pixbuf = pixels + ( ( rows - 1 ) - row ) * columns ;
pixbuf = pixels + row * columns ;
for ( column = 0 ; column < columns ; column + + )
2007-10-12 10:27:51 +00:00
* pixbuf + + = * data + + ;
2004-08-23 00:15:46 +00:00
}
}
else
{
for ( row = rows - 1 ; row > = 0 ; row - - )
{
if ( flipped )
pixbuf = pixels + row * columns * 4 ;
else
pixbuf = pixels + ( ( rows - 1 ) - row ) * columns * 4 ;
for ( column = 0 ; column < columns ; column + + )
{
* pixbuf + + = * data ;
* pixbuf + + = * data ;
* pixbuf + + = * data ;
* pixbuf + + = 255 ;
data + + ;
}
}
}
return pixels ;
}
2017-04-18 11:12:17 +00:00
# define MISSHORT(ptr) (*(ptr) | (*(ptr+1) << 8))
2004-08-23 00:15:46 +00:00
//remember to free it
2012-02-12 05:18:31 +00:00
qbyte * ReadTargaFile ( qbyte * buf , int length , int * width , int * height , qboolean * hasalpha , int asgrey )
2004-08-23 00:15:46 +00:00
{
2014-04-12 03:31:59 +00:00
//tga files sadly lack a true magic header thing.
2004-11-19 03:09:38 +00:00
unsigned char * data ;
2004-08-23 00:15:46 +00:00
qboolean flipped ;
2014-04-12 03:31:59 +00:00
tgaheader_t tgaheader ; //things are misaligned, so no pointer.
2004-08-23 00:15:46 +00:00
2014-04-12 03:31:59 +00:00
if ( length < 18 | | buf [ 1 ] > 1 | | ( buf [ 16 ] ! = 8 & & buf [ 16 ] ! = 16 & & buf [ 16 ] ! = 24 & & buf [ 16 ] ! = 32 ) )
2004-08-23 00:15:46 +00:00
return NULL ; //BUMMER!
tgaheader . id_len = buf [ 0 ] ;
tgaheader . cm_type = buf [ 1 ] ;
tgaheader . version = buf [ 2 ] ;
2017-04-18 11:12:17 +00:00
tgaheader . cm_idx = MISSHORT ( buf + 3 ) ;
tgaheader . cm_len = MISSHORT ( buf + 5 ) ;
2004-08-23 00:15:46 +00:00
tgaheader . cm_size = buf [ 7 ] ;
tgaheader . originx = LittleShort ( * ( short * ) & buf [ 8 ] ) ;
tgaheader . originy = LittleShort ( * ( short * ) & buf [ 10 ] ) ;
tgaheader . width = LittleShort ( * ( short * ) & buf [ 12 ] ) ;
tgaheader . height = LittleShort ( * ( short * ) & buf [ 14 ] ) ;
tgaheader . bpp = buf [ 16 ] ;
tgaheader . attribs = buf [ 17 ] ;
2014-04-12 03:31:59 +00:00
switch ( tgaheader . version )
{
case 0 : //No image data included.
return NULL ; //not really valid for us. reject it after all
case 1 : //Uncompressed, color-mapped images.
case 2 : //Uncompressed, RGB images.
case 3 : //Uncompressed, black and white images.
case 9 : //Runlength encoded color-mapped images.
case 10 : //Runlength encoded RGB images.
case 11 : //Compressed, black and white images.
case 32 : //Compressed color-mapped data, using Huffman, Delta, and runlength encoding.
case 33 : //Compressed color-mapped data, using Huffman, Delta, and runlength encoding. 4-pass quadtree-type process.
break ;
default :
return NULL ;
}
//validate the size to some sanity limit.
if ( ( unsigned short ) tgaheader . width > 8192 | | ( unsigned short ) tgaheader . height > 8192 )
return NULL ;
2004-08-23 00:15:46 +00:00
flipped = ! ( ( tgaheader . attribs & 0x20 ) > > 5 ) ;
2012-11-27 03:23:19 +00:00
# ifndef NPFTE
2004-08-23 00:15:46 +00:00
if ( r_dodgytgafiles . value )
flipped = true ;
2012-11-27 03:23:19 +00:00
# endif
2004-08-23 00:15:46 +00:00
data = buf + 18 ;
data + = tgaheader . id_len ;
* width = tgaheader . width ;
* height = tgaheader . height ;
if ( asgrey = = 2 ) //grey only, load as 8 bit..
{
2014-10-05 20:04:11 +00:00
if ( ! ( tgaheader . version = = 1 ) & & ! ( tgaheader . version = = 3 ) )
2004-08-23 00:15:46 +00:00
return NULL ;
}
2007-10-12 10:27:51 +00:00
if ( tgaheader . version = = 1 | | tgaheader . version = = 3 )
2004-08-23 00:15:46 +00:00
{
return ReadGreyTargaFile ( data , length , & tgaheader , asgrey ) ;
}
2011-06-05 23:53:33 +00:00
else if ( tgaheader . version = = 10 | | tgaheader . version = = 9 | | tgaheader . version = = 11 )
2007-10-12 10:27:51 +00:00
{
2011-06-05 23:53:33 +00:00
//9:paletted
//10:bgr(a)
//11:greyscale
2004-08-23 00:15:46 +00:00
# undef getc
# define getc(x) *data++
2014-09-22 17:49:45 +00:00
unsigned int row , rows = tgaheader . height , column , columns = tgaheader . width , packetHeader , packetSize , j ;
2004-08-23 00:15:46 +00:00
qbyte * pixbuf , * targa_rgba = BZ_Malloc ( rows * columns * ( asgrey ? 1 : 4 ) ) , * inrow ;
qbyte blue , red , green , alphabyte ;
2011-06-05 23:53:33 +00:00
byte_vec4_t palette [ 256 ] ;
if ( tgaheader . version = = 9 )
{
for ( row = 0 ; row < 256 ; row + + )
{
palette [ row ] [ 0 ] = row ;
palette [ row ] [ 1 ] = row ;
palette [ row ] [ 2 ] = row ;
palette [ row ] [ 3 ] = 255 ;
}
if ( tgaheader . bpp ! = 8 )
return NULL ;
}
if ( tgaheader . version = = 10 )
{
if ( tgaheader . bpp = = 8 )
return NULL ;
2012-02-12 05:18:31 +00:00
* hasalpha = ( tgaheader . bpp = = 32 ) ;
2011-06-05 23:53:33 +00:00
}
if ( tgaheader . version = = 11 )
{
for ( row = 0 ; row < 256 ; row + + )
{
palette [ row ] [ 0 ] = row ;
palette [ row ] [ 1 ] = row ;
palette [ row ] [ 2 ] = row ;
palette [ row ] [ 3 ] = 255 ;
}
if ( tgaheader . bpp ! = 8 )
return NULL ;
}
if ( tgaheader . cm_type )
{
switch ( tgaheader . cm_size )
{
case 24 :
for ( row = 0 ; row < tgaheader . cm_len ; row + + )
{
palette [ row ] [ 0 ] = * data + + ;
palette [ row ] [ 1 ] = * data + + ;
palette [ row ] [ 2 ] = * data + + ;
palette [ row ] [ 3 ] = 255 ;
}
break ;
case 32 :
for ( row = 0 ; row < tgaheader . cm_len ; row + + )
{
palette [ row ] [ 0 ] = * data + + ;
palette [ row ] [ 1 ] = * data + + ;
palette [ row ] [ 2 ] = * data + + ;
palette [ row ] [ 3 ] = * data + + ;
}
2012-02-12 05:18:31 +00:00
* hasalpha = true ;
2011-06-05 23:53:33 +00:00
break ;
}
}
2004-08-23 00:15:46 +00:00
2014-10-05 20:04:11 +00:00
for ( row = rows ; row - - > 0 ; )
2004-08-23 00:15:46 +00:00
{
if ( flipped )
pixbuf = targa_rgba + row * columns * ( asgrey ? 1 : 4 ) ;
else
pixbuf = targa_rgba + ( ( rows - 1 ) - row ) * columns * ( asgrey ? 1 : 4 ) ;
for ( column = 0 ; column < columns ; )
{
2004-11-19 03:09:38 +00:00
packetHeader = * data + + ;
2004-08-23 00:15:46 +00:00
packetSize = 1 + ( packetHeader & 0x7f ) ;
if ( packetHeader & 0x80 )
2017-04-18 11:12:17 +00:00
{ // run-length packet
2004-08-23 00:15:46 +00:00
switch ( tgaheader . bpp )
{
2005-01-05 08:07:55 +00:00
case 8 : //we made sure this was version 11
2011-06-05 23:53:33 +00:00
blue = palette [ * data ] [ 0 ] ;
green = palette [ * data ] [ 1 ] ;
red = palette [ * data ] [ 2 ] ;
alphabyte = palette [ * data ] [ 3 ] ;
data + + ;
2005-01-05 08:07:55 +00:00
break ;
2004-08-23 00:15:46 +00:00
case 16 :
inrow = data ;
data + = 2 ;
red = ( ( inrow [ 1 ] & 0x7c ) > > 2 ) * 8 ; //red
green = ( ( ( inrow [ 1 ] & 0x03 ) < < 3 ) + ( ( inrow [ 0 ] & 0xe0 ) > > 5 ) ) * 8 ; //green
blue = ( inrow [ 0 ] & 0x1f ) * 8 ; //blue
2007-10-12 10:27:51 +00:00
alphabyte = ( int ) ( inrow [ 1 ] & 0x80 ) * 2 - 1 ; //alpha?
2004-08-23 00:15:46 +00:00
break ;
case 24 :
2004-11-19 03:09:38 +00:00
blue = * data + + ;
green = * data + + ;
red = * data + + ;
2004-08-23 00:15:46 +00:00
alphabyte = 255 ;
break ;
case 32 :
2004-11-19 03:09:38 +00:00
blue = * data + + ;
green = * data + + ;
red = * data + + ;
alphabyte = * data + + ;
2004-08-23 00:15:46 +00:00
break ;
default :
blue = 127 ;
green = 127 ;
red = 127 ;
alphabyte = 127 ;
break ;
}
2007-10-12 10:27:51 +00:00
2004-08-23 00:15:46 +00:00
if ( ! asgrey ) //keep colours
{
for ( j = 0 ; j < packetSize ; j + + )
{
* pixbuf + + = red ;
* pixbuf + + = green ;
* pixbuf + + = blue ;
* pixbuf + + = alphabyte ;
column + + ;
if ( column = = columns )
{ // run spans across rows
column = 0 ;
if ( row > 0 )
row - - ;
else
goto breakOut ;
2004-11-19 03:09:38 +00:00
if ( flipped )
pixbuf = targa_rgba + row * columns * 4 ;
else
pixbuf = targa_rgba + ( ( rows - 1 ) - row ) * columns * 4 ;
2004-08-23 00:15:46 +00:00
}
}
}
else //convert to greyscale
{
for ( j = 0 ; j < packetSize ; j + + )
{
* pixbuf + + = red * NTSC_RED + green * NTSC_GREEN + blue * NTSC_BLUE ;
column + + ;
if ( column = = columns )
{ // run spans across rows
column = 0 ;
if ( row > 0 )
row - - ;
else
goto breakOut ;
2004-11-19 03:09:38 +00:00
if ( flipped )
pixbuf = targa_rgba + row * columns * 1 ;
else
pixbuf = targa_rgba + ( ( rows - 1 ) - row ) * columns * 1 ;
2004-08-23 00:15:46 +00:00
}
2007-10-12 10:27:51 +00:00
}
2004-08-23 00:15:46 +00:00
}
}
else
{ // non run-length packet
if ( ! asgrey ) //keep colours
{
for ( j = 0 ; j < packetSize ; j + + )
{
switch ( tgaheader . bpp )
{
2005-01-05 08:07:55 +00:00
case 8 :
2011-06-05 23:53:33 +00:00
blue = palette [ * data ] [ 0 ] ;
green = palette [ * data ] [ 1 ] ;
red = palette [ * data ] [ 2 ] ;
2005-01-05 08:07:55 +00:00
* pixbuf + + = red ;
* pixbuf + + = green ;
* pixbuf + + = blue ;
2011-06-05 23:53:33 +00:00
* pixbuf + + = palette [ * data ] [ 3 ] ;
data + + ;
2005-01-05 08:07:55 +00:00
break ;
2004-08-23 00:15:46 +00:00
case 16 :
inrow = data ;
data + = 2 ;
red = ( ( inrow [ 1 ] & 0x7c ) > > 2 ) * 8 ; //red
green = ( ( ( inrow [ 1 ] & 0x03 ) < < 3 ) + ( ( inrow [ 0 ] & 0xe0 ) > > 5 ) ) * 8 ; //green
blue = ( inrow [ 0 ] & 0x1f ) * 8 ; //blue
alphabyte = ( int ) ( inrow [ 1 ] & 0x80 ) * 2 - 1 ; //alpha?
* pixbuf + + = red ;
* pixbuf + + = green ;
* pixbuf + + = blue ;
* pixbuf + + = alphabyte ;
break ;
case 24 :
2004-11-19 03:09:38 +00:00
blue = * data + + ;
green = * data + + ;
red = * data + + ;
2004-08-23 00:15:46 +00:00
* pixbuf + + = red ;
* pixbuf + + = green ;
* pixbuf + + = blue ;
* pixbuf + + = 255 ;
break ;
case 32 :
2004-11-19 03:09:38 +00:00
blue = * data + + ;
green = * data + + ;
red = * data + + ;
alphabyte = * data + + ;
2004-08-23 00:15:46 +00:00
* pixbuf + + = red ;
* pixbuf + + = green ;
* pixbuf + + = blue ;
* pixbuf + + = alphabyte ;
break ;
default :
blue = 127 ;
green = 127 ;
red = 127 ;
alphabyte = 127 ;
break ;
}
column + + ;
if ( column = = columns )
{ // pixel packet run spans across rows
column = 0 ;
if ( row > 0 )
row - - ;
else
goto breakOut ;
2004-11-19 03:09:38 +00:00
if ( flipped )
pixbuf = targa_rgba + row * columns * 4 ;
else
pixbuf = targa_rgba + ( ( rows - 1 ) - row ) * columns * 4 ;
2007-10-12 10:27:51 +00:00
}
2004-08-23 00:15:46 +00:00
}
}
else //convert to grey
{
for ( j = 0 ; j < packetSize ; j + + )
{
switch ( tgaheader . bpp )
{
2005-01-05 08:07:55 +00:00
case 8 :
2011-06-05 23:53:33 +00:00
blue = palette [ * data ] [ 0 ] ;
green = palette [ * data ] [ 1 ] ;
red = palette [ * data ] [ 2 ] ;
* pixbuf + + = ( blue + green + red ) / 3 ;
data + + ;
2005-01-05 08:07:55 +00:00
break ;
2004-08-23 00:15:46 +00:00
case 16 :
inrow = data ;
data + = 2 ;
red = ( ( inrow [ 1 ] & 0x7c ) > > 2 ) * 8 ; //red
green = ( ( ( inrow [ 1 ] & 0x03 ) < < 3 ) + ( ( inrow [ 0 ] & 0xe0 ) > > 5 ) ) * 8 ; //green
blue = ( inrow [ 0 ] & 0x1f ) * 8 ; //blue
alphabyte = ( int ) ( inrow [ 1 ] & 0x80 ) * 2 - 1 ; //alpha?
* pixbuf + + = red * NTSC_RED + green * NTSC_GREEN + blue * NTSC_BLUE ;
break ;
case 24 :
2004-11-19 03:09:38 +00:00
blue = * data + + ;
green = * data + + ;
red = * data + + ;
2004-08-23 00:15:46 +00:00
* pixbuf + + = red * NTSC_RED + green * NTSC_GREEN + blue * NTSC_BLUE ;
break ;
case 32 :
2004-11-19 03:09:38 +00:00
blue = * data + + ;
green = * data + + ;
red = * data + + ;
alphabyte = * data + + ;
2004-08-23 00:15:46 +00:00
* pixbuf + + = red * NTSC_RED + green * NTSC_GREEN + blue * NTSC_BLUE ;
break ;
default :
blue = 127 ;
green = 127 ;
red = 127 ;
alphabyte = 127 ;
break ;
}
column + + ;
if ( column = = columns )
{ // pixel packet run spans across rows
column = 0 ;
if ( row > 0 )
row - - ;
else
goto breakOut ;
2004-11-19 03:09:38 +00:00
if ( flipped )
pixbuf = targa_rgba + row * columns * 1 ;
else
pixbuf = targa_rgba + ( ( rows - 1 ) - row ) * columns * 1 ;
2007-10-12 10:27:51 +00:00
}
2004-08-23 00:15:46 +00:00
}
}
}
}
}
2007-10-12 10:27:51 +00:00
breakOut : ;
2004-08-23 00:15:46 +00:00
return targa_rgba ;
}
else if ( tgaheader . version = = 2 )
2007-10-12 10:27:51 +00:00
{
2004-08-23 00:15:46 +00:00
qbyte * initbuf = BZ_Malloc ( tgaheader . height * tgaheader . width * ( asgrey ? 1 : 4 ) ) ;
qbyte * inrow , * outrow ;
int x , y , mul ;
qbyte blue , red , green ;
2007-10-12 10:27:51 +00:00
if ( tgaheader . bpp = = 8 )
2004-08-23 00:15:46 +00:00
return NULL ;
mul = tgaheader . bpp / 8 ;
2012-02-12 05:18:31 +00:00
* hasalpha = mul = = 4 ;
2004-08-23 00:15:46 +00:00
//flip +convert to 32 bit
if ( asgrey )
outrow = & initbuf [ ( int ) ( 0 ) * tgaheader . width ] ;
else
outrow = & initbuf [ ( int ) ( 0 ) * tgaheader . width * mul ] ;
for ( y = 0 ; y < tgaheader . height ; y + = 1 )
{
if ( flipped )
inrow = & data [ ( int ) ( tgaheader . height - y - 1 ) * tgaheader . width * mul ] ;
else
inrow = & data [ ( int ) ( y ) * tgaheader . width * mul ] ;
if ( ! asgrey )
2007-10-12 10:27:51 +00:00
{
2004-08-23 00:15:46 +00:00
switch ( mul )
{
case 2 :
for ( x = 0 ; x < tgaheader . width ; x + = 1 )
{
* outrow + + = ( ( inrow [ 1 ] & 0x7c ) > > 2 ) * 8 ; //red
* outrow + + = ( ( ( inrow [ 1 ] & 0x03 ) < < 3 ) + ( ( inrow [ 0 ] & 0xe0 ) > > 5 ) ) * 8 ; //green
* outrow + + = ( inrow [ 0 ] & 0x1f ) * 8 ; //blue
* outrow + + = ( int ) ( inrow [ 1 ] & 0x80 ) * 2 - 1 ; //alpha?
inrow + = 2 ;
}
break ;
case 3 :
for ( x = 0 ; x < tgaheader . width ; x + = 1 )
{
* outrow + + = inrow [ 2 ] ;
* outrow + + = inrow [ 1 ] ;
* outrow + + = inrow [ 0 ] ;
* outrow + + = 255 ;
inrow + = 3 ;
}
break ;
case 4 :
for ( x = 0 ; x < tgaheader . width ; x + = 1 )
{
* outrow + + = inrow [ 2 ] ;
* outrow + + = inrow [ 1 ] ;
* outrow + + = inrow [ 0 ] ;
* outrow + + = inrow [ 3 ] ;
inrow + = 4 ;
}
break ;
}
}
else
2007-10-12 10:27:51 +00:00
{
2004-08-23 00:15:46 +00:00
switch ( mul )
{
case 2 :
for ( x = 0 ; x < tgaheader . width ; x + = 1 )
{
red = ( ( inrow [ 1 ] & 0x7c ) > > 2 ) * 8 ; //red
green = ( ( ( inrow [ 1 ] & 0x03 ) < < 3 ) + ( ( inrow [ 0 ] & 0xe0 ) > > 5 ) ) * 8 ; //green
blue = ( inrow [ 0 ] & 0x1f ) * 8 ; //blue
// alphabyte = (int)(inrow[1]&0x80)*2-1; //alpha?
* outrow + + = red * NTSC_RED + green * NTSC_GREEN + blue * NTSC_BLUE ;
inrow + = 2 ;
}
break ;
case 3 :
for ( x = 0 ; x < tgaheader . width ; x + = 1 )
{
red = inrow [ 2 ] ;
green = inrow [ 1 ] ;
blue = inrow [ 0 ] ;
* outrow + + = red * NTSC_RED + green * NTSC_GREEN + blue * NTSC_BLUE ;
inrow + = 3 ;
}
break ;
case 4 :
for ( x = 0 ; x < tgaheader . width ; x + = 1 )
{
red = inrow [ 2 ] ;
green = inrow [ 1 ] ;
blue = inrow [ 0 ] ;
* outrow + + = red * NTSC_RED + green * NTSC_GREEN + blue * NTSC_BLUE ;
inrow + = 4 ;
}
break ;
}
}
2007-10-12 10:27:51 +00:00
}
2004-08-23 00:15:46 +00:00
return initbuf ;
}
2011-06-05 23:53:33 +00:00
else
2014-04-12 03:31:59 +00:00
Con_Printf ( " TGA: Unsupported version \n " ) ;
2013-12-02 14:30:30 +00:00
return NULL ;
2004-08-23 00:15:46 +00:00
}
# ifdef AVAIL_PNGLIB
2007-05-25 23:03:49 +00:00
# ifndef AVAIL_ZLIB
# error PNGLIB requires ZLIB
# endif
2004-08-23 00:15:46 +00:00
2007-05-25 23:03:49 +00:00
# undef channels
2004-08-23 00:15:46 +00:00
2007-05-25 23:03:49 +00:00
# ifndef PNG_SUCKS_WITH_SETJMP
# if defined(MINGW)
2007-10-12 10:27:51 +00:00
# include "./mingw-libs/png.h"
2007-05-25 23:03:49 +00:00
# elif defined(_WIN32)
# include "png.h"
# else
# include <png.h>
# endif
# endif
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
# ifdef DYNAMIC_LIBPNG
# define PSTATIC(n)
static dllhandle_t * libpng_handle ;
# define LIBPNG_LOADED() (libpng_handle != NULL)
# else
# define LIBPNG_LOADED() 1
2010-11-11 13:27:05 +00:00
# define PSTATIC(n) = &n
2010-11-11 04:03:16 +00:00
# ifdef _MSC_VER
# ifdef _WIN64
# pragma comment(lib, MSVCLIBSPATH "libpng64.lib")
# else
# pragma comment(lib, MSVCLIBSPATH "libpng.lib")
# endif
2010-11-07 12:37:22 +00:00
# endif
2009-11-04 21:16:50 +00:00
# endif
2010-11-11 14:25:44 +00:00
# ifndef PNG_NORETURN
# define PNG_NORETURN
# endif
# ifndef PNG_ALLOCATED
# define PNG_ALLOCATED
# endif
2004-08-23 00:15:46 +00:00
2014-02-07 08:38:40 +00:00
# if PNG_LIBPNG_VER < 10500
# define png_const_infop png_infop
# define png_const_structp png_structp
# define png_const_bytep png_bytep
2016-07-12 00:40:13 +00:00
# define png_const_unknown_chunkp png_unknown_chunkp
2014-02-07 08:38:40 +00:00
# endif
# if PNG_LIBPNG_VER < 10600
2016-07-12 00:40:13 +00:00
# define png_inforp png_infop
2014-02-07 08:38:40 +00:00
# define png_const_inforp png_const_infop
2016-07-12 00:40:13 +00:00
# define png_structrp png_structp
# define png_const_structrp png_const_structp
2014-02-07 08:38:40 +00:00
# endif
2012-09-30 05:52:03 +00:00
2016-07-12 00:40:13 +00:00
void ( PNGAPI * qpng_error ) PNGARG ( ( png_const_structrp png_ptr , png_const_charp error_message ) ) PSTATIC ( png_error ) ;
2010-11-11 04:03:16 +00:00
void ( PNGAPI * qpng_read_end ) PNGARG ( ( png_structp png_ptr , png_infop info_ptr ) ) PSTATIC ( png_read_end ) ;
void ( PNGAPI * qpng_read_image ) PNGARG ( ( png_structp png_ptr , png_bytepp image ) ) PSTATIC ( png_read_image ) ;
2014-02-07 08:38:40 +00:00
png_byte ( PNGAPI * qpng_get_bit_depth ) PNGARG ( ( png_const_structp png_ptr , png_const_inforp info_ptr ) ) PSTATIC ( png_get_bit_depth ) ;
png_byte ( PNGAPI * qpng_get_channels ) PNGARG ( ( png_const_structp png_ptr , png_const_inforp info_ptr ) ) PSTATIC ( png_get_channels ) ;
png_size_t ( PNGAPI * qpng_get_rowbytes ) PNGARG ( ( png_const_structp png_ptr , png_const_inforp info_ptr ) ) PSTATIC ( png_get_rowbytes ) ;
2010-11-11 04:03:16 +00:00
void ( PNGAPI * qpng_read_update_info ) PNGARG ( ( png_structp png_ptr , png_infop info_ptr ) ) PSTATIC ( png_read_update_info ) ;
void ( PNGAPI * qpng_set_strip_16 ) PNGARG ( ( png_structp png_ptr ) ) PSTATIC ( png_set_strip_16 ) ;
void ( PNGAPI * qpng_set_expand ) PNGARG ( ( png_structp png_ptr ) ) PSTATIC ( png_set_expand ) ;
void ( PNGAPI * qpng_set_gray_to_rgb ) PNGARG ( ( png_structp png_ptr ) ) PSTATIC ( png_set_gray_to_rgb ) ;
void ( PNGAPI * qpng_set_tRNS_to_alpha ) PNGARG ( ( png_structp png_ptr ) ) PSTATIC ( png_set_tRNS_to_alpha ) ;
2012-09-30 05:52:03 +00:00
png_uint_32 ( PNGAPI * qpng_get_valid ) PNGARG ( ( png_const_structp png_ptr , png_const_infop info_ptr , png_uint_32 flag ) ) PSTATIC ( png_get_valid ) ;
2013-03-12 23:05:47 +00:00
# if PNG_LIBPNG_VER > 10400
2010-11-11 04:03:16 +00:00
void ( PNGAPI * qpng_set_expand_gray_1_2_4_to_8 ) PNGARG ( ( png_structp png_ptr ) ) PSTATIC ( png_set_expand_gray_1_2_4_to_8 ) ;
2013-03-12 23:05:47 +00:00
# else
void ( PNGAPI * qpng_set_gray_1_2_4_to_8 ) PNGARG ( ( png_structp png_ptr ) ) PSTATIC ( png_set_gray_1_2_4_to_8 ) ;
# endif
2015-08-14 02:46:38 +00:00
void ( PNGAPI * qpng_set_bgr ) PNGARG ( ( png_structp png_ptr ) ) PSTATIC ( png_set_bgr ) ;
2010-11-11 04:03:16 +00:00
void ( PNGAPI * qpng_set_filler ) PNGARG ( ( png_structp png_ptr , png_uint_32 filler , int flags ) ) PSTATIC ( png_set_filler ) ;
void ( PNGAPI * qpng_set_palette_to_rgb ) PNGARG ( ( png_structp png_ptr ) ) PSTATIC ( png_set_palette_to_rgb ) ;
2016-07-12 00:40:13 +00:00
png_uint_32 ( PNGAPI * qpng_get_IHDR ) PNGARG ( ( png_const_structrp png_ptr , png_const_inforp info_ptr , png_uint_32 * width , png_uint_32 * height ,
2010-11-11 04:03:16 +00:00
int * bit_depth , int * color_type , int * interlace_method , int * compression_method , int * filter_method ) ) PSTATIC ( png_get_IHDR ) ;
void ( PNGAPI * qpng_read_info ) PNGARG ( ( png_structp png_ptr , png_infop info_ptr ) ) PSTATIC ( png_read_info ) ;
void ( PNGAPI * qpng_set_sig_bytes ) PNGARG ( ( png_structp png_ptr , int num_bytes ) ) PSTATIC ( png_set_sig_bytes ) ;
void ( PNGAPI * qpng_set_read_fn ) PNGARG ( ( png_structp png_ptr , png_voidp io_ptr , png_rw_ptr read_data_fn ) ) PSTATIC ( png_set_read_fn ) ;
void ( PNGAPI * qpng_destroy_read_struct ) PNGARG ( ( png_structpp png_ptr_ptr , png_infopp info_ptr_ptr , png_infopp end_info_ptr_ptr ) ) PSTATIC ( png_destroy_read_struct ) ;
2016-07-12 00:40:13 +00:00
png_infop ( PNGAPI * qpng_create_info_struct ) PNGARG ( ( png_const_structrp png_ptr ) ) PSTATIC ( png_create_info_struct ) ;
2011-05-28 13:43:11 +00:00
png_structp ( PNGAPI * qpng_create_read_struct ) PNGARG ( ( png_const_charp user_png_ver , png_voidp error_ptr , png_error_ptr error_fn , png_error_ptr warn_fn ) ) PSTATIC ( png_create_read_struct ) ;
2012-09-30 05:52:03 +00:00
int ( PNGAPI * qpng_sig_cmp ) PNGARG ( ( png_const_bytep sig , png_size_t start , png_size_t num_to_check ) ) PSTATIC ( png_sig_cmp ) ;
2010-11-11 04:03:16 +00:00
2016-07-12 00:40:13 +00:00
void ( PNGAPI * qpng_write_end ) PNGARG ( ( png_structrp png_ptr , png_inforp info_ptr ) ) PSTATIC ( png_write_end ) ;
void ( PNGAPI * qpng_write_image ) PNGARG ( ( png_structrp png_ptr , png_bytepp image ) ) PSTATIC ( png_write_image ) ;
void ( PNGAPI * qpng_write_info ) PNGARG ( ( png_structrp png_ptr , png_const_inforp info_ptr ) ) PSTATIC ( png_write_info ) ;
void ( PNGAPI * qpng_set_IHDR ) PNGARG ( ( png_const_structrp png_ptr , png_infop info_ptr , png_uint_32 width , png_uint_32 height ,
2010-11-11 04:03:16 +00:00
int bit_depth , int color_type , int interlace_method , int compression_method , int filter_method ) ) PSTATIC ( png_set_IHDR ) ;
2016-07-12 00:40:13 +00:00
void ( PNGAPI * qpng_set_compression_level ) PNGARG ( ( png_structrp png_ptr , int level ) ) PSTATIC ( png_set_compression_level ) ;
2010-11-11 04:03:16 +00:00
void ( PNGAPI * qpng_init_io ) PNGARG ( ( png_structp png_ptr , png_FILE_p fp ) ) PSTATIC ( png_init_io ) ;
2016-07-12 00:40:13 +00:00
png_voidp ( PNGAPI * qpng_get_io_ptr ) PNGARG ( ( png_const_structrp png_ptr ) ) PSTATIC ( png_get_io_ptr ) ;
2010-11-11 04:03:16 +00:00
void ( PNGAPI * qpng_destroy_write_struct ) PNGARG ( ( png_structpp png_ptr_ptr , png_infopp info_ptr_ptr ) ) PSTATIC ( png_destroy_write_struct ) ;
2011-05-28 13:43:11 +00:00
png_structp ( PNGAPI * qpng_create_write_struct ) PNGARG ( ( png_const_charp user_png_ver , png_voidp error_ptr , png_error_ptr error_fn , png_error_ptr warn_fn ) ) PSTATIC ( png_create_write_struct ) ;
2016-07-12 00:40:13 +00:00
void ( PNGAPI * qpng_set_unknown_chunks ) PNGARG ( ( png_const_structrp png_ptr , png_inforp info_ptr , png_const_unknown_chunkp unknowns , int num_unknowns ) ) PSTATIC ( png_set_unknown_chunks ) ;
2010-11-11 04:03:16 +00:00
2016-07-12 00:40:13 +00:00
png_voidp ( PNGAPI * qpng_get_error_ptr ) PNGARG ( ( png_const_structrp png_ptr ) ) PSTATIC ( png_get_error_ptr ) ;
2014-02-17 15:12:44 +00:00
2010-11-11 04:03:16 +00:00
qboolean LibPNG_Init ( void )
{
# ifdef DYNAMIC_LIBPNG
static dllfunction_t pngfuncs [ ] =
{
{ ( void * * ) & qpng_error , " png_error " } ,
{ ( void * * ) & qpng_read_end , " png_read_end " } ,
{ ( void * * ) & qpng_read_image , " png_read_image " } ,
{ ( void * * ) & qpng_get_bit_depth , " png_get_bit_depth " } ,
{ ( void * * ) & qpng_get_channels , " png_get_channels " } ,
{ ( void * * ) & qpng_get_rowbytes , " png_get_rowbytes " } ,
{ ( void * * ) & qpng_read_update_info , " png_read_update_info " } ,
{ ( void * * ) & qpng_set_strip_16 , " png_set_strip_16 " } ,
{ ( void * * ) & qpng_set_expand , " png_set_expand " } ,
{ ( void * * ) & qpng_set_gray_to_rgb , " png_set_gray_to_rgb " } ,
{ ( void * * ) & qpng_set_tRNS_to_alpha , " png_set_tRNS_to_alpha " } ,
{ ( void * * ) & qpng_get_valid , " png_get_valid " } ,
2016-11-02 08:01:21 +00:00
# if PNG_LIBPNG_VER > 10400
2010-11-11 04:03:16 +00:00
{ ( void * * ) & qpng_set_expand_gray_1_2_4_to_8 , " png_set_expand_gray_1_2_4_to_8 " } ,
2016-11-02 08:01:21 +00:00
# else
2013-03-12 23:05:47 +00:00
{ ( void * * ) & qpng_set_gray_1_2_4_to_8 , " png_set_gray_1_2_4_to_8 " } ,
2016-11-02 08:01:21 +00:00
# endif
2015-08-14 02:46:38 +00:00
{ ( void * * ) & qpng_set_bgr , " png_set_bgr " } ,
2010-11-11 04:03:16 +00:00
{ ( void * * ) & qpng_set_filler , " png_set_filler " } ,
{ ( void * * ) & qpng_set_palette_to_rgb , " png_set_palette_to_rgb " } ,
{ ( void * * ) & qpng_get_IHDR , " png_get_IHDR " } ,
{ ( void * * ) & qpng_read_info , " png_read_info " } ,
{ ( void * * ) & qpng_set_sig_bytes , " png_set_sig_bytes " } ,
{ ( void * * ) & qpng_set_read_fn , " png_set_read_fn " } ,
{ ( void * * ) & qpng_destroy_read_struct , " png_destroy_read_struct " } ,
{ ( void * * ) & qpng_create_info_struct , " png_create_info_struct " } ,
{ ( void * * ) & qpng_create_read_struct , " png_create_read_struct " } ,
{ ( void * * ) & qpng_sig_cmp , " png_sig_cmp " } ,
{ ( void * * ) & qpng_write_end , " png_write_end " } ,
{ ( void * * ) & qpng_write_image , " png_write_image " } ,
{ ( void * * ) & qpng_write_info , " png_write_info " } ,
{ ( void * * ) & qpng_set_IHDR , " png_set_IHDR " } ,
{ ( void * * ) & qpng_set_compression_level , " png_set_compression_level " } ,
{ ( void * * ) & qpng_init_io , " png_init_io " } ,
2015-03-20 12:53:43 +00:00
{ ( void * * ) & qpng_get_io_ptr , " png_get_io_ptr " } ,
2010-11-11 04:03:16 +00:00
{ ( void * * ) & qpng_destroy_write_struct , " png_destroy_write_struct " } ,
{ ( void * * ) & qpng_create_write_struct , " png_create_write_struct " } ,
2016-02-10 23:23:43 +00:00
{ ( void * * ) & qpng_set_unknown_chunks , " png_set_unknown_chunks " } ,
2014-02-17 15:12:44 +00:00
{ ( void * * ) & qpng_get_error_ptr , " png_get_error_ptr " } ,
2010-11-11 04:03:16 +00:00
{ NULL , NULL }
} ;
2014-02-17 15:31:47 +00:00
static qboolean tried ;
if ( ! tried )
2014-02-07 08:38:40 +00:00
{
2014-02-17 15:31:47 +00:00
tried = true ;
if ( ! LIBPNG_LOADED ( ) )
{
2016-11-02 08:01:21 +00:00
char * libnames [ ] =
{
2014-02-17 15:31:47 +00:00
# ifdef _WIN32
2016-11-02 08:01:21 +00:00
va ( " libpng%i " , PNG_LIBPNG_VER_DLLNUM ) ;
2014-02-17 15:31:47 +00:00
# else
2016-11-02 08:01:21 +00:00
//linux...
//lsb uses 'libpng12.so' specifically, so make sure that works.
" libpng " STRINGIFY ( PNG_LIBPNG_VER_MAJOR ) STRINGIFY ( PNG_LIBPNG_VER_MINOR ) " .so. " STRINGIFY ( PNG_LIBPNG_VER_SONUM ) ,
" libpng " STRINGIFY ( PNG_LIBPNG_VER_MAJOR ) STRINGIFY ( PNG_LIBPNG_VER_MINOR ) " .so " ,
" libpng.so. " STRINGIFY ( PNG_LIBPNG_VER_SONUM )
" libpng.so " ,
2014-02-17 15:31:47 +00:00
# endif
2016-11-02 08:01:21 +00:00
} ;
size_t i ;
for ( i = 0 ; i < countof ( libnames ) ; i + + )
{
if ( libnames [ i ] )
{
libpng_handle = Sys_LoadLibrary ( libnames [ i ] , pngfuncs ) ;
if ( libpng_handle )
break ;
}
}
2014-02-17 15:31:47 +00:00
if ( ! libpng_handle )
2016-11-02 08:01:21 +00:00
Con_Printf ( " Unable to load %s \n " , libnames [ 0 ] ) ;
2014-02-17 15:31:47 +00:00
}
2014-02-07 08:38:40 +00:00
2014-02-17 15:31:47 +00:00
// if (!LIBPNG_LOADED())
// libpng_handle = Sys_LoadLibrary("libpng", pngfuncs);
}
2010-11-11 04:03:16 +00:00
# endif
return LIBPNG_LOADED ( ) ;
}
2007-10-12 10:27:51 +00:00
typedef struct {
2004-08-23 00:15:46 +00:00
char * data ;
int readposition ;
int filelen ;
} pngreadinfo_t ;
2007-05-25 23:03:49 +00:00
2014-02-16 18:05:28 +00:00
static void VARGS readpngdata ( png_structp png_ptr , png_bytep data , png_size_t len )
2004-08-23 00:15:46 +00:00
{
2013-03-12 23:05:47 +00:00
pngreadinfo_t * ri = ( pngreadinfo_t * ) qpng_get_io_ptr ( png_ptr ) ;
2004-08-23 00:15:46 +00:00
if ( ri - > readposition + len > ri - > filelen )
{
2010-11-11 04:03:16 +00:00
qpng_error ( png_ptr , " unexpected eof " ) ;
2004-08-23 00:15:46 +00:00
return ;
}
memcpy ( data , & ri - > data [ ri - > readposition ] , len ) ;
ri - > readposition + = len ;
}
2014-02-16 18:05:28 +00:00
struct pngerr
{
const char * fname ;
jmp_buf jbuf ;
} ;
static void VARGS png_onerror ( png_structp png_ptr , png_const_charp error_msg )
{
2014-02-17 15:12:44 +00:00
struct pngerr * err = qpng_get_error_ptr ( png_ptr ) ;
2015-04-14 23:12:17 +00:00
Con_Printf ( " libpng %s: %s \n " , err - > fname , error_msg ) ;
2014-02-16 18:05:28 +00:00
longjmp ( err - > jbuf , 1 ) ;
abort ( ) ;
}
static void VARGS png_onwarning ( png_structp png_ptr , png_const_charp warning_msg )
{
2014-02-17 15:12:44 +00:00
struct pngerr * err = qpng_get_error_ptr ( png_ptr ) ;
2015-04-21 21:49:08 +00:00
# ifndef NPFTE
2015-04-14 23:12:17 +00:00
Con_DPrintf ( " libpng %s: %s \n " , err - > fname , warning_msg ) ;
2015-04-21 21:49:08 +00:00
# endif
2014-02-16 18:05:28 +00:00
}
2009-04-01 22:03:56 +00:00
qbyte * ReadPNGFile ( qbyte * buf , int length , int * width , int * height , const char * fname )
2004-08-23 00:15:46 +00:00
{
qbyte header [ 8 ] , * * rowpointers = NULL , * data = NULL ;
png_structp png ;
png_infop pnginfo ;
int y , bitdepth , colortype , interlace , compression , filter , bytesperpixel ;
unsigned long rowbytes ;
pngreadinfo_t ri ;
2008-04-28 16:14:02 +00:00
png_uint_32 pngwidth , pngheight ;
2014-02-16 18:05:28 +00:00
struct pngerr errctx ;
2004-08-23 00:15:46 +00:00
2016-11-02 08:01:21 +00:00
if ( ! LibPNG_Init ( ) )
return NULL ;
2014-02-17 15:31:47 +00:00
2004-08-23 00:15:46 +00:00
memcpy ( header , buf , 8 ) ;
2014-02-16 18:05:28 +00:00
errctx . fname = fname ;
if ( setjmp ( errctx . jbuf ) )
{
error :
if ( data )
BZ_Free ( data ) ;
if ( rowpointers )
BZ_Free ( rowpointers ) ;
qpng_destroy_read_struct ( & png , & pnginfo , NULL ) ;
2014-02-17 15:31:47 +00:00
return NULL ;
2014-02-16 18:05:28 +00:00
}
2010-11-11 04:03:16 +00:00
if ( qpng_sig_cmp ( header , 0 , 8 ) )
2004-08-23 00:15:46 +00:00
{
2014-02-17 15:31:47 +00:00
return NULL ;
2004-08-23 00:15:46 +00:00
}
2014-02-16 18:05:28 +00:00
if ( ! ( png = qpng_create_read_struct ( PNG_LIBPNG_VER_STRING , & errctx , png_onerror , png_onwarning ) ) )
2004-08-23 00:15:46 +00:00
{
2014-02-17 15:31:47 +00:00
return NULL ;
2004-08-23 00:15:46 +00:00
}
2010-11-11 04:03:16 +00:00
if ( ! ( pnginfo = qpng_create_info_struct ( png ) ) )
2008-05-25 01:15:49 +00:00
{
2010-11-11 04:03:16 +00:00
qpng_destroy_read_struct ( & png , & pnginfo , NULL ) ;
2014-02-17 15:31:47 +00:00
return NULL ;
2004-08-23 00:15:46 +00:00
}
ri . data = buf ;
ri . readposition = 8 ;
ri . filelen = length ;
2010-11-11 04:03:16 +00:00
qpng_set_read_fn ( png , & ri , readpngdata ) ;
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
qpng_set_sig_bytes ( png , 8 ) ;
qpng_read_info ( png , pnginfo ) ;
qpng_get_IHDR ( png , pnginfo , & pngwidth , & pngheight , & bitdepth , & colortype , & interlace , & compression , & filter ) ;
2008-04-28 16:14:02 +00:00
* width = pngwidth ;
* height = pngheight ;
2004-08-23 00:15:46 +00:00
2008-05-25 01:15:49 +00:00
if ( colortype = = PNG_COLOR_TYPE_PALETTE )
{
2010-11-11 04:03:16 +00:00
qpng_set_palette_to_rgb ( png ) ;
qpng_set_filler ( png , 255 , PNG_FILLER_AFTER ) ;
2004-08-23 00:15:46 +00:00
}
2007-10-12 10:27:51 +00:00
if ( colortype = = PNG_COLOR_TYPE_GRAY & & bitdepth < 8 )
2010-11-07 12:37:22 +00:00
{
# if PNG_LIBPNG_VER > 10400
2010-11-11 04:03:16 +00:00
qpng_set_expand_gray_1_2_4_to_8 ( png ) ;
2010-11-07 12:37:22 +00:00
# else
2013-03-12 23:05:47 +00:00
qpng_set_gray_1_2_4_to_8 ( png ) ;
2010-11-07 12:37:22 +00:00
# endif
}
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
if ( qpng_get_valid ( png , pnginfo , PNG_INFO_tRNS ) )
qpng_set_tRNS_to_alpha ( png ) ;
2007-10-12 10:27:51 +00:00
if ( bitdepth > = 8 & & colortype = = PNG_COLOR_TYPE_RGB )
2010-11-11 04:03:16 +00:00
qpng_set_filler ( png , 255 , PNG_FILLER_AFTER ) ;
2007-10-12 10:27:51 +00:00
2008-05-25 01:15:49 +00:00
if ( colortype = = PNG_COLOR_TYPE_GRAY | | colortype = = PNG_COLOR_TYPE_GRAY_ALPHA )
{
2010-11-11 04:03:16 +00:00
qpng_set_gray_to_rgb ( png ) ;
qpng_set_filler ( png , 255 , PNG_FILLER_AFTER ) ;
2004-08-23 00:15:46 +00:00
}
if ( bitdepth < 8 )
2010-11-11 04:03:16 +00:00
qpng_set_expand ( png ) ;
2004-08-23 00:15:46 +00:00
else if ( bitdepth = = 16 )
2010-11-11 04:03:16 +00:00
qpng_set_strip_16 ( png ) ;
2004-08-23 00:15:46 +00:00
2007-10-12 10:27:51 +00:00
2010-11-11 04:03:16 +00:00
qpng_read_update_info ( png , pnginfo ) ;
rowbytes = qpng_get_rowbytes ( png , pnginfo ) ;
bytesperpixel = qpng_get_channels ( png , pnginfo ) ;
bitdepth = qpng_get_bit_depth ( png , pnginfo ) ;
2004-08-23 00:15:46 +00:00
2008-05-25 01:15:49 +00:00
if ( bitdepth ! = 8 | | bytesperpixel ! = 4 )
{
2007-10-12 10:27:51 +00:00
Con_Printf ( " Bad PNG color depth and/or bpp (%s) \n " , fname ) ;
2010-11-11 04:03:16 +00:00
qpng_destroy_read_struct ( & png , & pnginfo , NULL ) ;
2014-02-17 15:31:47 +00:00
return NULL ;
2004-08-23 00:15:46 +00:00
}
2008-05-25 01:15:49 +00:00
data = BZF_Malloc ( * height * rowbytes ) ;
2008-04-28 16:14:02 +00:00
rowpointers = BZF_Malloc ( * height * sizeof ( * rowpointers ) ) ;
2004-08-23 00:15:46 +00:00
if ( ! data | | ! rowpointers )
goto error ;
for ( y = 0 ; y < * height ; y + + )
rowpointers [ y ] = data + y * rowbytes ;
2010-11-11 04:03:16 +00:00
qpng_read_image ( png , rowpointers ) ;
qpng_read_end ( png , NULL ) ;
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
qpng_destroy_read_struct ( & png , & pnginfo , NULL ) ;
2007-10-12 10:27:51 +00:00
BZ_Free ( rowpointers ) ;
2014-02-17 15:31:47 +00:00
return data ;
2004-08-23 00:15:46 +00:00
}
2012-11-27 03:23:19 +00:00
# ifndef NPFTE
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
int Image_WritePNG ( char * filename , enum fs_relative fsroot , int compression , void * * buffers , int numbuffers , int bufferstride , int width , int height , enum uploadfmt fmt )
2008-05-25 01:15:49 +00:00
{
2004-08-23 00:15:46 +00:00
char name [ MAX_OSPATH ] ;
int i ;
FILE * fp ;
png_structp png_ptr ;
png_infop info_ptr ;
png_byte * * row_pointers ;
2014-02-16 18:05:28 +00:00
struct pngerr errctx ;
2015-08-14 02:46:38 +00:00
int pxsize ;
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
int outwidth = width ;
2016-02-10 23:23:43 +00:00
qbyte stereochunk = 0 ; //cross-eyed
png_unknown_chunk unknowns = { " sTER " , & stereochunk , sizeof ( stereochunk ) , PNG_HAVE_PLTE } ;
2007-10-12 10:27:51 +00:00
2015-06-04 06:15:14 +00:00
if ( ! FS_NativePath ( filename , fsroot , name , sizeof ( name ) ) )
2008-05-25 01:15:49 +00:00
return false ;
2016-02-10 23:23:43 +00:00
if ( numbuffers = = 2 )
{
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
outwidth = width ;
if ( outwidth & 7 ) //standard stereo images must be padded to 8 pixels width padding between
outwidth + = 8 - ( outwidth & 7 ) ;
outwidth + = width ;
2016-02-10 23:23:43 +00:00
}
else //arrange them all horizontally
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
outwidth = width * numbuffers ;
2016-02-10 23:23:43 +00:00
2014-02-17 15:31:47 +00:00
if ( ! LibPNG_Init ( ) )
return false ;
2008-05-25 01:15:49 +00:00
if ( ! ( fp = fopen ( name , " wb " ) ) )
{
2010-07-18 08:42:59 +00:00
FS_CreatePath ( filename , FS_GAMEONLY ) ;
2004-08-23 00:15:46 +00:00
if ( ! ( fp = fopen ( name , " wb " ) ) )
return false ;
}
2014-02-16 18:05:28 +00:00
errctx . fname = filename ;
if ( setjmp ( errctx . jbuf ) )
2008-05-25 01:15:49 +00:00
{
2014-02-16 18:05:28 +00:00
err :
qpng_destroy_write_struct ( & png_ptr , & info_ptr ) ;
2004-08-23 00:15:46 +00:00
fclose ( fp ) ;
2012-02-12 05:18:31 +00:00
return false ;
2004-08-23 00:15:46 +00:00
}
2014-02-16 18:05:28 +00:00
if ( ! ( png_ptr = qpng_create_write_struct ( PNG_LIBPNG_VER_STRING , & errctx , png_onerror , png_onwarning ) ) )
2008-05-25 01:15:49 +00:00
{
2004-08-23 00:15:46 +00:00
fclose ( fp ) ;
return false ;
2014-02-16 18:05:28 +00:00
}
2004-08-23 00:15:46 +00:00
2014-02-16 18:05:28 +00:00
if ( ! ( info_ptr = qpng_create_info_struct ( png_ptr ) ) )
2008-05-25 01:15:49 +00:00
{
2014-02-16 18:05:28 +00:00
qpng_destroy_write_struct ( & png_ptr , ( png_infopp ) NULL ) ;
fclose ( fp ) ;
2004-08-23 00:15:46 +00:00
return false ;
2014-02-16 18:05:28 +00:00
}
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
qpng_init_io ( png_ptr , fp ) ;
2006-06-17 04:18:52 +00:00
compression = bound ( 0 , compression , 100 ) ;
2011-05-28 13:43:11 +00:00
// had to add these when I migrated from libpng 1.4.x to 1.5.x
# ifndef Z_NO_COMPRESSION
2014-02-16 18:05:28 +00:00
# define Z_NO_COMPRESSION 0
2011-05-28 13:43:11 +00:00
# endif
# ifndef Z_BEST_COMPRESSION
2014-02-16 18:05:28 +00:00
# define Z_BEST_COMPRESSION 9
2011-05-28 13:43:11 +00:00
# endif
2010-11-11 04:03:16 +00:00
qpng_set_compression_level ( png_ptr , Z_NO_COMPRESSION + ( compression * ( Z_BEST_COMPRESSION - Z_NO_COMPRESSION ) ) / 100 ) ;
2004-08-23 00:15:46 +00:00
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
if ( fmt = = TF_BGR24 | | fmt = = TF_BGRA32 | | fmt = = TF_BGRX32 )
2015-08-14 02:46:38 +00:00
qpng_set_bgr ( png_ptr ) ;
if ( fmt = = TF_RGBA32 | | fmt = = TF_BGRA32 )
{
pxsize = 4 ;
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
qpng_set_IHDR ( png_ptr , info_ptr , outwidth , height , 8 , PNG_COLOR_TYPE_RGBA , PNG_INTERLACE_NONE , PNG_COMPRESSION_TYPE_DEFAULT , PNG_FILTER_TYPE_DEFAULT ) ;
}
else if ( fmt = = TF_RGBX32 | | fmt = = TF_BGRX32 )
{
pxsize = 4 ;
qpng_set_IHDR ( png_ptr , info_ptr , outwidth , height , 8 , PNG_COLOR_TYPE_RGB , PNG_INTERLACE_NONE , PNG_COMPRESSION_TYPE_DEFAULT , PNG_FILTER_TYPE_DEFAULT ) ;
2015-08-14 02:46:38 +00:00
}
else
{
pxsize = 3 ;
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
qpng_set_IHDR ( png_ptr , info_ptr , outwidth , height , 8 , PNG_COLOR_TYPE_RGB , PNG_INTERLACE_NONE , PNG_COMPRESSION_TYPE_DEFAULT , PNG_FILTER_TYPE_DEFAULT ) ;
2015-08-14 02:46:38 +00:00
}
2016-02-10 23:23:43 +00:00
if ( numbuffers = = 2 ) //flag it as a standard stereographic image
qpng_set_unknown_chunks ( png_ptr , info_ptr , & unknowns , 1 ) ;
2010-11-11 04:03:16 +00:00
qpng_write_info ( png_ptr , info_ptr ) ;
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
if ( fmt = = TF_RGBX32 | | fmt = = TF_BGRX32 )
png_set_filler ( png_ptr , 0 , PNG_FILLER_AFTER ) ;
2004-08-23 00:15:46 +00:00
2016-02-10 23:23:43 +00:00
if ( numbuffers = = 2 )
{ //standard stereographic png image.
qbyte * pixels , * left , * right ;
//we need to pack the data into a single image for libpng to use
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
row_pointers = Z_Malloc ( sizeof ( png_byte * ) * height + outwidth * height * pxsize ) ; //must be zeroed, because I'm too lazy to specially deal with padding.
2016-02-10 23:23:43 +00:00
if ( ! row_pointers )
goto err ;
pixels = ( qbyte * ) row_pointers + height ;
//png requires right then left, which is a bit weird.
right = pixels ;
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
left = right + ( outwidth - width ) * pxsize ;
2016-02-10 23:23:43 +00:00
for ( i = 0 ; i < height ; i + + )
{
if ( ( qbyte * ) buffers [ 1 ] )
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
memcpy ( right + i * outwidth * pxsize , ( qbyte * ) buffers [ 1 ] + i * bufferstride , pxsize * width ) ;
2016-02-10 23:23:43 +00:00
if ( ( qbyte * ) buffers [ 0 ] )
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
memcpy ( left + i * outwidth * pxsize , ( qbyte * ) buffers [ 0 ] + i * bufferstride , pxsize * width ) ;
row_pointers [ i ] = pixels + i * outwidth * pxsize ;
2016-02-10 23:23:43 +00:00
}
}
else if ( numbuffers = = 1 )
{
row_pointers = BZ_Malloc ( sizeof ( png_byte * ) * height ) ;
if ( ! row_pointers )
goto err ;
for ( i = 0 ; i < height ; i + + )
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
row_pointers [ i ] = ( qbyte * ) buffers [ 0 ] + i * bufferstride ;
2016-02-10 23:23:43 +00:00
}
else
{ //pack all images horizontally, because preventing people from doing the whole cross-eyed thing is cool, or something.
qbyte * pixels ;
int j ;
//we need to pack the data into a single image for libpng to use
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
row_pointers = BZ_Malloc ( sizeof ( png_byte * ) * height + outwidth * height * pxsize ) ;
2016-02-10 23:23:43 +00:00
if ( ! row_pointers )
goto err ;
pixels = ( qbyte * ) row_pointers + height ;
for ( i = 0 ; i < height ; i + + )
{
for ( j = 0 ; j < numbuffers ; j + + )
{
if ( buffers [ j ] )
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
memcpy ( pixels + ( width * j + i * outwidth ) * pxsize , ( qbyte * ) buffers [ j ] + i * bufferstride , pxsize * width ) ;
2016-02-10 23:23:43 +00:00
}
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
row_pointers [ i ] = pixels + i * outwidth * pxsize ;
2016-02-10 23:23:43 +00:00
}
}
2010-11-11 04:03:16 +00:00
qpng_write_image ( png_ptr , row_pointers ) ;
qpng_write_end ( png_ptr , info_ptr ) ;
2004-08-23 00:15:46 +00:00
BZ_Free ( row_pointers ) ;
2010-11-11 04:03:16 +00:00
qpng_destroy_write_struct ( & png_ptr , & info_ptr ) ;
2004-08-23 00:15:46 +00:00
fclose ( fp ) ;
return true ;
}
2012-11-27 03:23:19 +00:00
# endif
2004-08-23 00:15:46 +00:00
# endif
# ifdef AVAIL_JPEGLIB
2005-01-04 08:05:34 +00:00
# define XMD_H //fix for mingw
2007-10-12 10:27:51 +00:00
# if defined(MINGW)
# define JPEG_API VARGS
# include "./mingw-libs/jpeglib.h"
# include "./mingw-libs/jerror.h"
# elif defined(_WIN32)
2005-11-30 01:20:53 +00:00
# define JPEG_API VARGS
# include "jpeglib.h"
# include "jerror.h"
2004-08-23 00:15:46 +00:00
# else
2005-11-30 01:20:53 +00:00
// #include <jinclude.h>
# include <jpeglib.h>
# include <jerror.h>
2004-08-23 00:15:46 +00:00
# endif
2010-11-11 04:03:16 +00:00
# ifdef DYNAMIC_LIBJPEG
# define JSTATIC(n)
static dllhandle_t * libjpeg_handle ;
# define LIBJPEG_LOADED() (libjpeg_handle != NULL)
# else
# ifdef _MSC_VER
# ifdef _WIN64
# pragma comment(lib, MSVCLIBSPATH "libjpeg64.lib")
# else
# pragma comment(lib, MSVCLIBSPATH "jpeg.lib")
# endif
2010-11-09 21:04:03 +00:00
# endif
2010-11-11 04:03:16 +00:00
# define JSTATIC(n) = &n
# define LIBJPEG_LOADED() (1)
2009-11-04 21:16:50 +00:00
# endif
2010-11-15 02:40:31 +00:00
# ifndef JPEG_FALSE
# define JPEG_boolean boolean
# endif
2010-11-11 04:03:16 +00:00
# define qjpeg_create_compress(cinfo) \
qjpeg_CreateCompress ( ( cinfo ) , JPEG_LIB_VERSION , \
( size_t ) sizeof ( struct jpeg_compress_struct ) )
# define qjpeg_create_decompress(cinfo) \
qjpeg_CreateDecompress ( ( cinfo ) , JPEG_LIB_VERSION , \
( size_t ) sizeof ( struct jpeg_decompress_struct ) )
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
2010-11-11 04:03:16 +00:00
boolean ( VARGS * qjpeg_resync_to_restart ) JPP ( ( j_decompress_ptr cinfo , int desired ) ) JSTATIC ( jpeg_resync_to_restart ) ;
boolean ( VARGS * qjpeg_finish_decompress ) JPP ( ( j_decompress_ptr cinfo ) ) JSTATIC ( jpeg_finish_decompress ) ;
JDIMENSION ( VARGS * qjpeg_read_scanlines ) JPP ( ( j_decompress_ptr cinfo , JSAMPARRAY scanlines , JDIMENSION max_lines ) ) JSTATIC ( jpeg_read_scanlines ) ;
boolean ( VARGS * qjpeg_start_decompress ) JPP ( ( j_decompress_ptr cinfo ) ) JSTATIC ( jpeg_start_decompress ) ;
int ( VARGS * qjpeg_read_header ) JPP ( ( j_decompress_ptr cinfo , boolean require_image ) ) JSTATIC ( jpeg_read_header ) ;
void ( VARGS * qjpeg_CreateDecompress ) JPP ( ( j_decompress_ptr cinfo , int version , size_t structsize ) ) JSTATIC ( jpeg_CreateDecompress ) ;
void ( VARGS * qjpeg_destroy_decompress ) JPP ( ( j_decompress_ptr cinfo ) ) JSTATIC ( jpeg_destroy_decompress ) ;
struct jpeg_error_mgr * ( VARGS * qjpeg_std_error ) JPP ( ( struct jpeg_error_mgr * err ) ) JSTATIC ( jpeg_std_error ) ;
void ( VARGS * qjpeg_finish_compress ) JPP ( ( j_compress_ptr cinfo ) ) JSTATIC ( jpeg_finish_compress ) ;
JDIMENSION ( VARGS * qjpeg_write_scanlines ) JPP ( ( j_compress_ptr cinfo , JSAMPARRAY scanlines , JDIMENSION num_lines ) ) JSTATIC ( jpeg_write_scanlines ) ;
void ( VARGS * qjpeg_start_compress ) JPP ( ( j_compress_ptr cinfo , boolean write_all_tables ) ) JSTATIC ( jpeg_start_compress ) ;
void ( VARGS * qjpeg_set_quality ) JPP ( ( j_compress_ptr cinfo , int quality , boolean force_baseline ) ) JSTATIC ( jpeg_set_quality ) ;
void ( VARGS * qjpeg_set_defaults ) JPP ( ( j_compress_ptr cinfo ) ) JSTATIC ( jpeg_set_defaults ) ;
void ( VARGS * qjpeg_CreateCompress ) JPP ( ( j_compress_ptr cinfo , int version , size_t structsize ) ) JSTATIC ( jpeg_CreateCompress ) ;
void ( VARGS * qjpeg_destroy_compress ) JPP ( ( j_compress_ptr cinfo ) ) JSTATIC ( jpeg_destroy_compress ) ;
2010-12-07 12:23:56 +00:00
# endif
2010-11-11 04:03:16 +00:00
qboolean LibJPEG_Init ( void )
{
# ifdef DYNAMIC_LIBJPEG
static dllfunction_t jpegfuncs [ ] =
{
{ ( void * * ) & qjpeg_resync_to_restart , " jpeg_resync_to_restart " } ,
{ ( void * * ) & qjpeg_finish_decompress , " jpeg_finish_decompress " } ,
{ ( void * * ) & qjpeg_read_scanlines , " jpeg_read_scanlines " } ,
{ ( void * * ) & qjpeg_start_decompress , " jpeg_start_decompress " } ,
{ ( void * * ) & qjpeg_read_header , " jpeg_read_header " } ,
{ ( void * * ) & qjpeg_CreateDecompress , " jpeg_CreateDecompress " } ,
{ ( void * * ) & qjpeg_destroy_decompress , " jpeg_destroy_decompress " } ,
{ ( void * * ) & qjpeg_std_error , " jpeg_std_error " } ,
{ ( void * * ) & qjpeg_finish_compress , " jpeg_finish_compress " } ,
{ ( void * * ) & qjpeg_write_scanlines , " jpeg_write_scanlines " } ,
{ ( void * * ) & qjpeg_start_compress , " jpeg_start_compress " } ,
{ ( void * * ) & qjpeg_set_quality , " jpeg_set_quality " } ,
{ ( void * * ) & qjpeg_set_defaults , " jpeg_set_defaults " } ,
{ ( void * * ) & qjpeg_CreateCompress , " jpeg_CreateCompress " } ,
{ ( void * * ) & qjpeg_destroy_compress , " jpeg_destroy_compress " } ,
{ NULL , NULL }
} ;
if ( ! LIBJPEG_LOADED ( ) )
libjpeg_handle = Sys_LoadLibrary ( " libjpeg " , jpegfuncs ) ;
2013-05-13 14:37:47 +00:00
# ifndef _WIN32
if ( ! LIBJPEG_LOADED ( ) )
libjpeg_handle = Sys_LoadLibrary ( " libjpeg " ARCH_DL_POSTFIX " .8 " , jpegfuncs ) ;
if ( ! LIBJPEG_LOADED ( ) )
libjpeg_handle = Sys_LoadLibrary ( " libjpeg " ARCH_DL_POSTFIX " .62 " , jpegfuncs ) ;
# endif
2010-11-11 04:03:16 +00:00
# endif
2017-04-10 07:52:18 +00:00
if ( ! LIBJPEG_LOADED ( ) )
Con_Printf ( " Unable to init libjpeg \n " ) ;
2010-11-11 04:03:16 +00:00
return LIBJPEG_LOADED ( ) ;
}
/*begin jpeg read*/
2004-08-23 00:15:46 +00:00
struct my_error_mgr {
struct jpeg_error_mgr pub ; /* "public" fields */
jmp_buf setjmp_buffer ; /* for return to caller */
} ;
typedef struct my_error_mgr * my_error_ptr ;
/*
* Here ' s the routine that will replace the standard error_exit method :
*/
METHODDEF ( void )
my_error_exit ( j_common_ptr cinfo )
{
/* cinfo->err really points to a my_error_mgr struct, so coerce pointer */
my_error_ptr myerr = ( my_error_ptr ) cinfo - > err ;
/* Always display the message. */
/* We could postpone this until after returning, if we chose. */
( * cinfo - > err - > output_message ) ( cinfo ) ;
/* Return control to the setjmp point */
longjmp ( myerr - > setjmp_buffer , 1 ) ;
}
/*
* Sample routine for JPEG decompression . We assume that the source file name
* is passed in . We want to return 1 on success , 0 on error .
*/
/* Expanded data source object for stdio input */
typedef struct {
struct jpeg_source_mgr pub ; /* public fields */
qbyte * infile ; /* source stream */
int currentpos ;
int maxlen ;
JOCTET * buffer ; /* start of buffer */
2010-11-09 02:29:53 +00:00
JPEG_boolean start_of_file ; /* have we gotten any data yet? */
2004-08-23 00:15:46 +00:00
} my_source_mgr ;
typedef my_source_mgr * my_src_ptr ;
# define INPUT_BUF_SIZE 4096 /* choose an efficiently fread'able size */
METHODDEF ( void )
init_source ( j_decompress_ptr cinfo )
{
my_src_ptr src = ( my_src_ptr ) cinfo - > src ;
2012-01-25 04:41:12 +00:00
src - > start_of_file = true ;
2004-08-23 00:15:46 +00:00
}
2010-11-09 02:29:53 +00:00
METHODDEF ( JPEG_boolean )
2004-08-23 00:15:46 +00:00
fill_input_buffer ( j_decompress_ptr cinfo )
{
my_source_mgr * src = ( my_source_mgr * ) cinfo - > src ;
size_t nbytes ;
2007-10-12 10:27:51 +00:00
2004-08-23 00:15:46 +00:00
nbytes = src - > maxlen - src - > currentpos ;
if ( nbytes > INPUT_BUF_SIZE )
nbytes = INPUT_BUF_SIZE ;
memcpy ( src - > buffer , & src - > infile [ src - > currentpos ] , nbytes ) ;
src - > currentpos + = nbytes ;
2014-05-30 15:47:04 +00:00
if ( nbytes < = 0 )
{
2004-08-23 00:15:46 +00:00
if ( src - > start_of_file ) /* Treat empty input file as fatal error */
2014-05-30 15:47:04 +00:00
ERREXIT ( cinfo , JERR_INPUT_EMPTY ) ;
2004-08-23 00:15:46 +00:00
WARNMS ( cinfo , JWRN_JPEG_EOF ) ;
2014-02-16 18:05:28 +00:00
/* Insert a fake EOI marker */
2004-08-23 00:15:46 +00:00
src - > buffer [ 0 ] = ( JOCTET ) 0xFF ;
src - > buffer [ 1 ] = ( JOCTET ) JPEG_EOI ;
nbytes = 2 ;
}
src - > pub . next_input_byte = src - > buffer ;
src - > pub . bytes_in_buffer = nbytes ;
2012-01-25 04:41:12 +00:00
src - > start_of_file = false ;
2004-08-23 00:15:46 +00:00
2012-01-25 04:41:12 +00:00
return true ;
2004-08-23 00:15:46 +00:00
}
METHODDEF ( void )
skip_input_data ( j_decompress_ptr cinfo , long num_bytes )
{
my_source_mgr * src = ( my_source_mgr * ) cinfo - > src ;
if ( num_bytes > 0 ) {
while ( num_bytes > ( long ) src - > pub . bytes_in_buffer ) {
num_bytes - = ( long ) src - > pub . bytes_in_buffer ;
( void ) fill_input_buffer ( cinfo ) ;
}
src - > pub . next_input_byte + = ( size_t ) num_bytes ;
src - > pub . bytes_in_buffer - = ( size_t ) num_bytes ;
}
}
METHODDEF ( void )
term_source ( j_decompress_ptr cinfo )
{
}
2007-08-07 03:51:00 +00:00
# undef GLOBAL
# define GLOBAL(x) x
2007-07-23 18:52:11 +00:00
2004-08-23 00:15:46 +00:00
GLOBAL ( void )
2010-07-20 07:51:13 +00:00
ftejpeg_mem_src ( j_decompress_ptr cinfo , qbyte * infile , int maxlen )
2004-08-23 00:15:46 +00:00
{
my_source_mgr * src ;
if ( cinfo - > src = = NULL ) { /* first time for this JPEG object? */
cinfo - > src = ( struct jpeg_source_mgr * )
( * cinfo - > mem - > alloc_small ) ( ( j_common_ptr ) cinfo , JPOOL_PERMANENT ,
sizeof ( my_source_mgr ) ) ;
src = ( my_source_mgr * ) cinfo - > src ;
src - > buffer = ( JOCTET * )
( * cinfo - > mem - > alloc_small ) ( ( j_common_ptr ) cinfo , JPOOL_PERMANENT ,
INPUT_BUF_SIZE * sizeof ( JOCTET ) ) ;
}
src = ( my_source_mgr * ) cinfo - > src ;
src - > pub . init_source = init_source ;
src - > pub . fill_input_buffer = fill_input_buffer ;
src - > pub . skip_input_data = skip_input_data ;
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
src - > pub . resync_to_restart = qjpeg_resync_to_restart ; /* use default method */
# else
src - > pub . resync_to_restart = jpeg_resync_to_restart ; /* use default method */
# endif
2004-08-23 00:15:46 +00:00
src - > pub . term_source = term_source ;
src - > infile = infile ;
src - > pub . bytes_in_buffer = 0 ; /* forces fill_input_buffer on first read */
src - > pub . next_input_byte = NULL ; /* until buffer loaded */
src - > currentpos = 0 ;
src - > maxlen = maxlen ;
}
qbyte * ReadJPEGFile ( qbyte * infile , int length , int * width , int * height )
{
qbyte * mem = NULL , * in , * out ;
int i ;
2010-11-11 04:03:16 +00:00
/* This struct contains the JPEG decompression parameters and pointers to
* working space ( which is allocated as needed by the JPEG library ) .
*/
struct jpeg_decompress_struct cinfo ;
/* We use our private extension JPEG error handler.
* Note that this struct must live as long as the main JPEG parameter
* struct , to avoid dangling - pointer problems .
*/
struct my_error_mgr jerr ;
/* More stuff */
JSAMPARRAY buffer ; /* Output row buffer */
int size_stride ; /* physical row width in output buffer */
2014-05-30 15:47:04 +00:00
memset ( & cinfo , 0 , sizeof ( cinfo ) ) ;
2010-11-11 04:03:16 +00:00
if ( ! LIBJPEG_LOADED ( ) )
2017-04-10 07:52:18 +00:00
{
Con_DPrintf ( " libjpeg not available. \n " ) ;
2010-11-11 04:03:16 +00:00
return NULL ;
2017-04-10 07:52:18 +00:00
}
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
/* Step 1: allocate and initialize JPEG decompression object */
2006-03-14 01:17:35 +00:00
2010-11-11 04:03:16 +00:00
/* We set up the normal JPEG error routines, then override error_exit. */
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
cinfo . err = qjpeg_std_error ( & jerr . pub ) ;
# else
cinfo . err = jpeg_std_error ( & jerr . pub ) ;
# endif
2010-11-11 04:03:16 +00:00
jerr . pub . error_exit = my_error_exit ;
/* Establish the setjmp return context for my_error_exit to use. */
if ( setjmp ( jerr . setjmp_buffer ) )
{
// If we get here, the JPEG code has signaled an error.
2017-04-10 07:52:18 +00:00
Con_DPrintf ( " libjpeg failed to decode a file. \n " ) ;
2010-11-11 04:03:16 +00:00
badjpeg :
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
qjpeg_destroy_decompress ( & cinfo ) ;
# else
jpeg_destroy_decompress ( & cinfo ) ;
# endif
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
if ( mem )
BZ_Free ( mem ) ;
2017-04-10 07:52:18 +00:00
return NULL ;
2010-11-11 04:03:16 +00:00
}
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
qjpeg_create_decompress ( & cinfo ) ;
# else
jpeg_create_decompress ( & cinfo ) ;
# endif
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
ftejpeg_mem_src ( & cinfo , infile , length ) ;
2004-08-23 00:15:46 +00:00
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
2012-01-25 04:41:12 +00:00
( void ) qjpeg_read_header ( & cinfo , true ) ;
2010-12-07 12:23:56 +00:00
# else
2012-01-25 04:41:12 +00:00
( void ) jpeg_read_header ( & cinfo , true ) ;
2010-12-07 12:23:56 +00:00
# endif
2004-08-23 00:15:46 +00:00
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
( void ) qjpeg_start_decompress ( & cinfo ) ;
# else
( void ) jpeg_start_decompress ( & cinfo ) ;
# endif
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
if ( cinfo . output_components = = 0 )
{
2017-04-10 07:52:18 +00:00
Con_DPrintf ( " No JPEG Components, not a JPEG. \n " ) ;
2010-11-11 04:03:16 +00:00
goto badjpeg ;
}
2011-05-20 04:10:46 +00:00
if ( cinfo . output_components ! = 3 & & cinfo . output_components ! = 1 )
2010-11-11 04:03:16 +00:00
{
2017-04-10 07:52:18 +00:00
Con_DPrintf ( " Bad number of components in JPEG: '%d', should be '3'. \n " , cinfo . output_components ) ;
2006-03-14 01:17:35 +00:00
goto badjpeg ;
2007-10-12 10:27:51 +00:00
}
2010-11-11 04:03:16 +00:00
size_stride = cinfo . output_width * cinfo . output_components ;
/* Make a one-row-high sample array that will go away when done with image */
buffer = ( * cinfo . mem - > alloc_sarray ) ( ( j_common_ptr ) & cinfo , JPOOL_IMAGE , size_stride , 1 ) ;
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
out = mem = BZ_Malloc ( cinfo . output_height * cinfo . output_width * 4 ) ;
memset ( out , 0 , cinfo . output_height * cinfo . output_width * 4 ) ;
2004-08-23 00:15:46 +00:00
2011-05-20 04:10:46 +00:00
if ( cinfo . output_components = = 1 )
2010-11-11 04:03:16 +00:00
{
2011-05-20 04:10:46 +00:00
while ( cinfo . output_scanline < cinfo . output_height )
{
# ifdef DYNAMIC_LIBJPEG
( void ) qjpeg_read_scanlines ( & cinfo , buffer , 1 ) ;
# else
( void ) jpeg_read_scanlines ( & cinfo , buffer , 1 ) ;
# endif
in = buffer [ 0 ] ;
for ( i = 0 ; i < cinfo . output_width ; i + + )
{ //rgb to rgba
* out + + = * in ;
* out + + = * in ;
* out + + = * in ;
* out + + = 255 ;
in + + ;
}
}
}
else
{
while ( cinfo . output_scanline < cinfo . output_height )
{
# ifdef DYNAMIC_LIBJPEG
( void ) qjpeg_read_scanlines ( & cinfo , buffer , 1 ) ;
# else
( void ) jpeg_read_scanlines ( & cinfo , buffer , 1 ) ;
# endif
2010-11-11 04:03:16 +00:00
2011-05-20 04:10:46 +00:00
in = buffer [ 0 ] ;
for ( i = 0 ; i < cinfo . output_width ; i + + )
{ //rgb to rgba
* out + + = * in + + ;
* out + + = * in + + ;
* out + + = * in + + ;
* out + + = 255 ;
}
2010-11-11 04:03:16 +00:00
}
}
2004-08-23 00:15:46 +00:00
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
( void ) qjpeg_finish_decompress ( & cinfo ) ;
# else
( void ) jpeg_finish_decompress ( & cinfo ) ;
# endif
2004-08-23 00:15:46 +00:00
2010-12-07 12:23:56 +00:00
# ifdef DYNAMIC_LIBJPEG
qjpeg_destroy_decompress ( & cinfo ) ;
# else
jpeg_destroy_decompress ( & cinfo ) ;
# endif
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
* width = cinfo . output_width ;
* height = cinfo . output_height ;
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
return mem ;
2004-08-23 00:15:46 +00:00
2010-11-11 04:03:16 +00:00
}
/*end read*/
2012-11-27 03:23:19 +00:00
# ifndef NPFTE
2010-11-11 04:03:16 +00:00
/*begin write*/
2015-08-14 02:46:38 +00:00
# ifndef DYNAMIC_LIBJPEG
# define qjpeg_std_error jpeg_std_error
# define qjpeg_destroy_compress jpeg_destroy_compress
# define qjpeg_CreateCompress jpeg_CreateCompress
# define qjpeg_set_defaults jpeg_set_defaults
# define qjpeg_set_quality jpeg_set_quality
# define qjpeg_start_compress jpeg_start_compress
# define qjpeg_write_scanlines jpeg_write_scanlines
# define qjpeg_finish_compress jpeg_finish_compress
# define qjpeg_destroy_compress jpeg_destroy_compress
# endif
2005-12-21 03:07:33 +00:00
# define OUTPUT_BUF_SIZE 4096
2007-10-12 10:27:51 +00:00
typedef struct {
2010-11-11 04:03:16 +00:00
struct jpeg_error_mgr pub ;
2005-12-21 03:07:33 +00:00
2010-11-11 04:03:16 +00:00
jmp_buf setjmp_buffer ;
2004-08-23 00:15:46 +00:00
} jpeg_error_mgr_wrapper ;
2005-12-21 03:07:33 +00:00
typedef struct {
struct jpeg_destination_mgr pub ;
vfsfile_t * vfs ;
JOCTET buffer [ OUTPUT_BUF_SIZE ] ; /* start of buffer */
} my_destination_mgr ;
METHODDEF ( void ) init_destination ( j_compress_ptr cinfo )
{
my_destination_mgr * dest = ( my_destination_mgr * ) cinfo - > dest ;
dest - > pub . next_output_byte = dest - > buffer ;
dest - > pub . free_in_buffer = OUTPUT_BUF_SIZE ;
}
2010-11-09 02:29:53 +00:00
METHODDEF ( JPEG_boolean ) empty_output_buffer ( j_compress_ptr cinfo )
2005-12-21 03:07:33 +00:00
{
my_destination_mgr * dest = ( my_destination_mgr * ) cinfo - > dest ;
VFS_WRITE ( dest - > vfs , dest - > buffer , OUTPUT_BUF_SIZE ) ;
dest - > pub . next_output_byte = dest - > buffer ;
dest - > pub . free_in_buffer = OUTPUT_BUF_SIZE ;
2012-01-25 04:41:12 +00:00
return true ;
2005-12-21 03:07:33 +00:00
}
METHODDEF ( void ) term_destination ( j_compress_ptr cinfo )
{
my_destination_mgr * dest = ( my_destination_mgr * ) cinfo - > dest ;
VFS_WRITE ( dest - > vfs , dest - > buffer , OUTPUT_BUF_SIZE - dest - > pub . free_in_buffer ) ;
dest - > pub . next_output_byte = dest - > buffer ;
dest - > pub . free_in_buffer = OUTPUT_BUF_SIZE ;
}
2010-07-20 07:51:13 +00:00
void ftejpeg_mem_dest ( j_compress_ptr cinfo , vfsfile_t * vfs )
2005-12-21 03:07:33 +00:00
{
2010-11-11 04:03:16 +00:00
my_destination_mgr * dest ;
if ( cinfo - > dest = = NULL )
{ /* first time for this JPEG object? */
cinfo - > dest = ( struct jpeg_destination_mgr * )
( * cinfo - > mem - > alloc_small ) ( ( j_common_ptr ) cinfo , JPOOL_PERMANENT ,
sizeof ( my_destination_mgr ) ) ;
dest = ( my_destination_mgr * ) cinfo - > dest ;
// dest->buffer = (JOCTET *)
// (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
// OUTPUT_BUF_SIZE * sizeof(JOCTET));
}
2005-12-21 03:07:33 +00:00
dest = ( my_destination_mgr * ) cinfo - > dest ;
2010-11-11 04:03:16 +00:00
dest - > pub . init_destination = init_destination ;
dest - > pub . empty_output_buffer = empty_output_buffer ;
dest - > pub . term_destination = term_destination ;
dest - > pub . free_in_buffer = 0 ; /* forces fill_input_buffer on first read */
dest - > pub . next_output_byte = NULL ; /* until buffer loaded */
dest - > vfs = vfs ;
2005-12-21 03:07:33 +00:00
}
2010-11-11 04:03:16 +00:00
METHODDEF ( void ) jpeg_error_exit ( j_common_ptr cinfo )
{
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
longjmp ( ( ( jpeg_error_mgr_wrapper * ) cinfo - > err ) - > setjmp_buffer , 1 ) ;
2004-08-23 00:15:46 +00:00
}
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
qboolean screenshotJPEG ( char * filename , enum fs_relative fsroot , int compression , qbyte * screendata , int stride , int screenwidth , int screenheight , enum uploadfmt fmt )
2004-08-23 00:15:46 +00:00
{
qbyte * buffer ;
2005-12-21 03:07:33 +00:00
vfsfile_t * outfile ;
2004-08-23 00:15:46 +00:00
jpeg_error_mgr_wrapper jerr ;
struct jpeg_compress_struct cinfo ;
JSAMPROW row_pointer [ 1 ] ;
2010-12-07 12:23:56 +00:00
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
qbyte * rgbdata = NULL ;
2016-02-10 23:23:43 +00:00
//convert in-place if needed.
//bgr->rgb may require copying out entirely for the first pixel to work properly.
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
if ( fmt = = TF_BGRA32 | | fmt = = TF_BGRX32 | | fmt = = TF_BGR24 )
{ //byteswap and strip alpha
size_t ps = ( fmt = = TF_BGR24 ) ? 3 : 4 ;
qbyte * in = screendata , * out = rgbdata = Hunk_TempAlloc ( screenwidth * screenheight * 3 ) ;
size_t y , x ;
for ( y = 0 ; y < screenheight ; y + + )
2016-02-10 23:23:43 +00:00
{
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
for ( x = 0 ; x < screenwidth ; x + + )
{
int r = in [ 2 ] ;
int g = in [ 1 ] ;
int b = in [ 0 ] ;
out [ 0 ] = r ;
out [ 1 ] = g ;
out [ 2 ] = b ;
in + = ps ;
out + = 3 ;
}
in - = screenwidth * ps ;
in + = stride ;
2016-02-10 23:23:43 +00:00
}
fmt = TF_RGB24 ;
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
stride = screenwidth * 3 ;
screendata = rgbdata ;
}
else if ( fmt = = TF_RGBA32 | | fmt = = TF_RGBX32 | | ( fmt = = TF_RGB24 & & stride < 0 ) )
{ //strip alpha, no need to byteswap
size_t ps = ( fmt = = TF_RGB24 ) ? 3 : 4 ;
qbyte * in = screendata , * out = rgbdata = Hunk_TempAlloc ( screenwidth * screenheight * 3 ) ;
size_t y , x ;
for ( y = 0 ; y < screenheight ; y + + )
2016-02-10 23:23:43 +00:00
{
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
for ( x = 0 ; x < screenwidth ; x + + )
{
int r = in [ 0 ] ;
int g = in [ 1 ] ;
int b = in [ 2 ] ;
out [ 0 ] = r ;
out [ 1 ] = g ;
out [ 2 ] = b ;
in + = ps ;
out + = 3 ;
}
in - = screenwidth * ps ;
in + = stride ;
2016-02-10 23:23:43 +00:00
}
fmt = TF_RGB24 ;
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
stride = screenwidth * 3 ;
screendata = rgbdata ;
2016-02-10 23:23:43 +00:00
}
else if ( fmt ! = TF_RGB24 )
{
Con_Printf ( " screenshotJPEG: image format not supported \n " ) ;
2015-08-14 02:46:38 +00:00
return false ;
2016-02-10 23:23:43 +00:00
}
2015-08-14 02:46:38 +00:00
2010-11-11 04:03:16 +00:00
if ( ! LIBJPEG_LOADED ( ) )
2013-12-02 14:30:30 +00:00
return false ;
2004-08-23 00:15:46 +00:00
2015-06-04 06:15:14 +00:00
if ( ! ( outfile = FS_OpenVFS ( filename , " wb " , fsroot ) ) )
2005-12-21 03:07:33 +00:00
{
2015-06-04 06:15:14 +00:00
FS_CreatePath ( filename , fsroot ) ;
if ( ! ( outfile = FS_OpenVFS ( filename , " wb " , fsroot ) ) )
2006-02-22 01:26:09 +00:00
{
2006-02-22 01:24:22 +00:00
Con_Printf ( " Error opening %s \n " , filename ) ;
2013-12-02 14:30:30 +00:00
return false ;
2006-02-22 01:26:09 +00:00
}
2004-08-23 00:15:46 +00:00
}
2015-08-14 02:46:38 +00:00
cinfo . err = qjpeg_std_error ( & jerr . pub ) ;
2004-08-23 00:15:46 +00:00
jerr . pub . error_exit = jpeg_error_exit ;
2005-12-21 03:07:33 +00:00
if ( setjmp ( jerr . setjmp_buffer ) )
{
2015-08-14 02:46:38 +00:00
qjpeg_destroy_compress ( & cinfo ) ;
2005-12-21 03:07:33 +00:00
VFS_CLOSE ( outfile ) ;
FS_Remove ( filename , FS_GAME ) ;
2004-08-23 00:15:46 +00:00
Con_Printf ( " Failed to create jpeg \n " ) ;
2013-12-02 14:30:30 +00:00
return false ;
2004-08-23 00:15:46 +00:00
}
2015-08-14 02:46:38 +00:00
qjpeg_create_compress ( & cinfo ) ;
2004-08-23 00:15:46 +00:00
buffer = screendata ;
2007-10-12 10:27:51 +00:00
2010-07-20 07:51:13 +00:00
ftejpeg_mem_dest ( & cinfo , outfile ) ;
2007-10-12 10:27:51 +00:00
cinfo . image_width = screenwidth ;
2004-08-23 00:15:46 +00:00
cinfo . image_height = screenheight ;
cinfo . input_components = 3 ;
cinfo . in_color_space = JCS_RGB ;
2015-08-14 02:46:38 +00:00
qjpeg_set_defaults ( & cinfo ) ;
qjpeg_set_quality ( & cinfo , bound ( 0 , compression , 100 ) , true ) ;
qjpeg_start_compress ( & cinfo , true ) ;
2004-08-23 00:15:46 +00:00
2005-12-21 03:07:33 +00:00
while ( cinfo . next_scanline < cinfo . image_height )
{
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
* row_pointer = & buffer [ cinfo . next_scanline * stride ] ;
2015-08-14 02:46:38 +00:00
qjpeg_write_scanlines ( & cinfo , row_pointer , 1 ) ;
2004-08-23 00:15:46 +00:00
}
2015-08-14 02:46:38 +00:00
qjpeg_finish_compress ( & cinfo ) ;
2005-12-21 03:07:33 +00:00
VFS_CLOSE ( outfile ) ;
2015-08-14 02:46:38 +00:00
qjpeg_destroy_compress ( & cinfo ) ;
2013-12-02 14:30:30 +00:00
return true ;
2004-08-23 00:15:46 +00:00
}
# endif
2012-11-27 03:23:19 +00:00
# endif
2004-08-23 00:15:46 +00:00
2012-11-27 03:23:19 +00:00
# ifndef NPFTE
2007-10-12 10:27:51 +00:00
/*
= = = = = = = = = = = = = =
WritePCXfile
= = = = = = = = = = = = = =
*/
2015-06-04 06:15:14 +00:00
void WritePCXfile ( const char * filename , enum fs_relative fsroot , qbyte * data , int width , int height ,
2004-08-23 00:15:46 +00:00
int rowbytes , qbyte * palette , qboolean upload ) //data is 8bit.
{
int i , j , length ;
pcx_t * pcx ;
qbyte * pack ;
2007-10-12 10:27:51 +00:00
2004-08-23 00:15:46 +00:00
pcx = Hunk_TempAlloc ( width * height * 2 + 1000 ) ;
if ( pcx = = NULL )
{
2016-02-10 23:23:43 +00:00
Con_Printf ( " WritePCXfile: not enough memory \n " ) ;
2004-08-23 00:15:46 +00:00
return ;
2007-10-12 10:27:51 +00:00
}
2004-08-23 00:15:46 +00:00
pcx - > manufacturer = 0x0a ; // PCX id
pcx - > version = 5 ; // 256 color
pcx - > encoding = 1 ; // uncompressed
pcx - > bits_per_pixel = 8 ; // 256 color
pcx - > xmin = 0 ;
pcx - > ymin = 0 ;
pcx - > xmax = LittleShort ( ( short ) ( width - 1 ) ) ;
pcx - > ymax = LittleShort ( ( short ) ( height - 1 ) ) ;
pcx - > hres = LittleShort ( ( short ) width ) ;
pcx - > vres = LittleShort ( ( short ) height ) ;
Q_memset ( pcx - > palette , 0 , sizeof ( pcx - > palette ) ) ;
pcx - > color_planes = 1 ; // chunky image
pcx - > bytes_per_line = LittleShort ( ( short ) width ) ;
pcx - > palette_type = LittleShort ( 2 ) ; // not a grey scale
Q_memset ( pcx - > filler , 0 , sizeof ( pcx - > filler ) ) ;
// pack the image
pack = ( qbyte * ) ( pcx + 1 ) ;
for ( i = 0 ; i < height ; i + + )
{
for ( j = 0 ; j < width ; j + + )
{
if ( ( * data & 0xc0 ) ! = 0xc0 )
* pack + + = * data + + ;
else
{
* pack + + = 0xc1 ;
* pack + + = * data + + ;
}
}
data + = rowbytes - width ;
}
2007-10-12 10:27:51 +00:00
2004-08-23 00:15:46 +00:00
// write the palette
* pack + + = 0x0c ; // palette ID qbyte
for ( i = 0 ; i < 768 ; i + + )
* pack + + = * palette + + ;
2007-10-12 10:27:51 +00:00
// write output file
2004-08-23 00:15:46 +00:00
length = pack - ( qbyte * ) pcx ;
if ( upload )
CL_StartUpload ( ( void * ) pcx , length ) ;
else
2015-06-04 06:15:14 +00:00
COM_WriteFile ( filename , fsroot , pcx , length ) ;
2007-10-12 10:27:51 +00:00
}
2012-11-27 03:23:19 +00:00
# endif
2004-08-23 00:15:46 +00:00
/*
= = = = = = = = = = = =
LoadPCX
= = = = = = = = = = = =
*/
qbyte * ReadPCXFile ( qbyte * buf , int length , int * width , int * height )
{
pcx_t * pcx ;
// pcx_t pcxbuf;
qbyte * palette ;
qbyte * pix ;
int x , y ;
int dataByte , runLength ;
int count ;
qbyte * data ;
qbyte * pcx_rgb ;
2008-01-23 01:41:25 +00:00
unsigned short xmin , ymin , swidth , sheight ;
2005-05-19 00:13:59 +00:00
2004-08-23 00:15:46 +00:00
//
// parse the PCX file
2007-10-12 10:27:51 +00:00
//
2004-08-23 00:15:46 +00:00
2013-11-21 23:02:28 +00:00
if ( length < sizeof ( * pcx ) )
return NULL ;
2007-10-12 10:27:51 +00:00
pcx = ( pcx_t * ) buf ;
2005-05-19 00:13:59 +00:00
xmin = LittleShort ( pcx - > xmin ) ;
ymin = LittleShort ( pcx - > ymin ) ;
2008-01-23 01:41:25 +00:00
swidth = LittleShort ( pcx - > xmax ) - xmin + 1 ;
sheight = LittleShort ( pcx - > ymax ) - ymin + 1 ;
2004-08-23 00:15:46 +00:00
if ( pcx - > manufacturer ! = 0x0a
| | pcx - > version ! = 5
| | pcx - > encoding ! = 1
| | pcx - > bits_per_pixel ! = 8
2008-01-23 01:41:25 +00:00
| | swidth > = 1024
| | sheight > = 1024 )
2007-10-12 10:27:51 +00:00
{
2004-08-23 00:15:46 +00:00
return NULL ;
}
2008-01-23 01:41:25 +00:00
* width = swidth ;
* height = sheight ;
2004-08-23 00:15:46 +00:00
2012-11-27 03:23:19 +00:00
# ifndef NPFTE
2006-01-01 21:17:06 +00:00
if ( r_dodgypcxfiles . value )
palette = host_basepal ;
else
2012-11-27 03:23:19 +00:00
# endif
2006-01-01 21:17:06 +00:00
palette = buf + length - 768 ;
2004-08-23 00:15:46 +00:00
data = ( char * ) ( pcx + 1 ) ;
2008-01-23 01:41:25 +00:00
count = ( swidth ) * ( sheight ) ;
2004-08-23 00:15:46 +00:00
pcx_rgb = BZ_Malloc ( count * 4 ) ;
2008-02-02 07:14:56 +00:00
for ( y = 0 ; y < sheight ; y + + )
2004-08-23 00:15:46 +00:00
{
2008-01-23 01:41:25 +00:00
pix = pcx_rgb + 4 * y * ( swidth ) ;
2008-02-02 07:14:56 +00:00
for ( x = 0 ; x < swidth ; )
2004-08-23 00:15:46 +00:00
{
dataByte = * data ;
data + + ;
if ( ( dataByte & 0xC0 ) = = 0xC0 )
{
runLength = dataByte & 0x3F ;
2008-01-23 01:41:25 +00:00
if ( x + runLength > swidth )
{
Con_Printf ( " corrupt pcx \n " ) ;
BZ_Free ( pcx_rgb ) ;
return NULL ;
}
2004-08-23 00:15:46 +00:00
dataByte = * data ;
data + + ;
}
else
runLength = 1 ;
while ( runLength - - > 0 )
{
pix [ 0 ] = palette [ dataByte * 3 ] ;
pix [ 1 ] = palette [ dataByte * 3 + 1 ] ;
pix [ 2 ] = palette [ dataByte * 3 + 2 ] ;
pix [ 3 ] = 255 ;
if ( dataByte = = 255 )
2014-10-05 20:04:11 +00:00
{
pix [ 0 ] = 0 ; //linear filtering can mean transparent pixel colours are visible. black is a more neutral colour.
pix [ 1 ] = 0 ;
pix [ 2 ] = 0 ;
2004-08-23 00:15:46 +00:00
pix [ 3 ] = 0 ;
2014-10-05 20:04:11 +00:00
}
2004-08-23 00:15:46 +00:00
pix + = 4 ;
x + + ;
}
}
}
return pcx_rgb ;
}
2005-03-23 22:14:08 +00:00
qbyte * ReadPCXData ( qbyte * buf , int length , int width , int height , qbyte * result )
{
pcx_t * pcx ;
// pcx_t pcxbuf;
2013-05-11 05:03:07 +00:00
// qbyte *palette;
2005-03-23 22:14:08 +00:00
qbyte * pix ;
int x , y ;
int dataByte , runLength ;
2013-05-11 05:03:07 +00:00
// int count;
2005-03-23 22:14:08 +00:00
qbyte * data ;
2008-01-23 01:41:25 +00:00
unsigned short xmin , ymin , swidth , sheight ;
2005-05-19 00:13:59 +00:00
2005-03-23 22:14:08 +00:00
//
// parse the PCX file
2007-10-12 10:27:51 +00:00
//
2005-03-23 22:14:08 +00:00
pcx = ( pcx_t * ) buf ;
2005-05-19 00:13:59 +00:00
xmin = LittleShort ( pcx - > xmin ) ;
ymin = LittleShort ( pcx - > ymin ) ;
2008-01-23 01:41:25 +00:00
swidth = LittleShort ( pcx - > xmax ) - xmin + 1 ;
sheight = LittleShort ( pcx - > ymax ) - ymin + 1 ;
2005-05-19 00:13:59 +00:00
2005-03-23 22:14:08 +00:00
if ( pcx - > manufacturer ! = 0x0a
| | pcx - > version ! = 5
| | pcx - > encoding ! = 1
| | pcx - > bits_per_pixel ! = 8 )
2007-10-12 10:27:51 +00:00
{
2005-03-23 22:14:08 +00:00
return NULL ;
}
2008-01-23 01:41:25 +00:00
if ( width ! = swidth | |
height > sheight )
{
Con_Printf ( " unsupported pcx size \n " ) ;
return NULL ; //we can't feed the requester with enough info
}
2005-03-23 22:14:08 +00:00
data = ( char * ) ( pcx + 1 ) ;
for ( y = 0 ; y < height ; y + + )
{
2008-01-23 01:41:25 +00:00
pix = result + y * swidth ;
for ( x = 0 ; x < swidth ; )
2005-03-23 22:14:08 +00:00
{
dataByte = * data ;
data + + ;
if ( ( dataByte & 0xC0 ) = = 0xC0 )
{
runLength = dataByte & 0x3F ;
2008-01-23 01:41:25 +00:00
if ( x + runLength > swidth )
{
Con_Printf ( " corrupt pcx \n " ) ;
return NULL ;
}
2005-03-23 22:14:08 +00:00
dataByte = * data ;
data + + ;
}
else
runLength = 1 ;
while ( runLength - - > 0 )
{
* pix + + = dataByte ;
x + + ;
}
}
}
return result ;
}
2004-08-23 00:15:46 +00:00
qbyte * ReadPCXPalette ( qbyte * buf , int len , qbyte * out )
{
pcx_t * pcx ;
//
// parse the PCX file
2007-10-12 10:27:51 +00:00
//
2004-08-23 00:15:46 +00:00
pcx = ( pcx_t * ) buf ;
if ( pcx - > manufacturer ! = 0x0a
| | pcx - > version ! = 5
| | pcx - > encoding ! = 1
| | pcx - > bits_per_pixel ! = 8
2005-05-19 00:13:59 +00:00
| | LittleShort ( pcx - > xmax ) > = 1024
| | LittleShort ( pcx - > ymax ) > = 1024 )
2007-10-12 10:27:51 +00:00
{
2004-08-23 00:15:46 +00:00
return NULL ;
}
memcpy ( out , ( qbyte * ) pcx + len - 768 , 768 ) ;
return out ;
}
typedef struct bmpheader_s
{
2012-08-02 17:00:23 +00:00
/* unsigned short Type;*/
2017-06-26 09:31:02 +00:00
unsigned int Size ;
2004-08-23 00:15:46 +00:00
unsigned short Reserved1 ;
unsigned short Reserved2 ;
2017-06-26 09:31:02 +00:00
unsigned int OffsetofBMPBits ;
2017-07-31 17:15:37 +00:00
2017-06-26 09:31:02 +00:00
unsigned int SizeofBITMAPINFOHEADER ;
signed int Width ;
signed int Height ;
2004-08-23 00:15:46 +00:00
unsigned short Planes ;
unsigned short BitCount ;
2017-06-26 09:31:02 +00:00
unsigned int Compression ;
unsigned int ImageSize ;
signed int TargetDeviceXRes ;
signed int TargetDeviceYRes ;
unsigned int NumofColorIndices ;
unsigned int NumofImportantColorIndices ;
2004-08-23 00:15:46 +00:00
} bmpheader_t ;
2017-06-26 09:31:02 +00:00
typedef struct bmpheaderv4_s
{
unsigned int RedMask ;
unsigned int GreenMask ;
unsigned int BlueMask ;
unsigned int AlphaMask ;
qbyte ColourSpace [ 4 ] ; //"Win " or "sRGB"
2017-07-31 17:15:37 +00:00
qbyte ColourSpaceCrap [ 12 * 3 ] ;
unsigned int Gamma [ 3 ] ;
2017-06-26 09:31:02 +00:00
} bmpheaderv4_t ;
2004-08-23 00:15:46 +00:00
qbyte * ReadBMPFile ( qbyte * buf , int length , int * width , int * height )
{
unsigned int i ;
2012-08-02 17:00:23 +00:00
bmpheader_t h ;
2004-08-23 00:15:46 +00:00
qbyte * data ;
2012-08-02 17:00:23 +00:00
if ( buf [ 0 ] ! = ' B ' | | buf [ 1 ] ! = ' M ' )
2004-08-23 00:15:46 +00:00
return NULL ;
2012-08-02 17:00:23 +00:00
memcpy ( & h , ( bmpheader_t * ) ( buf + 2 ) , sizeof ( h ) ) ;
h . Size = LittleLong ( h . Size ) ;
h . Reserved1 = LittleShort ( h . Reserved1 ) ;
h . Reserved2 = LittleShort ( h . Reserved2 ) ;
h . OffsetofBMPBits = LittleLong ( h . OffsetofBMPBits ) ;
h . SizeofBITMAPINFOHEADER = LittleLong ( h . SizeofBITMAPINFOHEADER ) ;
h . Width = LittleLong ( h . Width ) ;
h . Height = LittleLong ( h . Height ) ;
h . Planes = LittleShort ( h . Planes ) ;
h . BitCount = LittleShort ( h . BitCount ) ;
h . Compression = LittleLong ( h . Compression ) ;
h . ImageSize = LittleLong ( h . ImageSize ) ;
h . TargetDeviceXRes = LittleLong ( h . TargetDeviceXRes ) ;
h . TargetDeviceYRes = LittleLong ( h . TargetDeviceYRes ) ;
h . NumofColorIndices = LittleLong ( h . NumofColorIndices ) ;
h . NumofImportantColorIndices = LittleLong ( h . NumofImportantColorIndices ) ;
2004-08-23 00:15:46 +00:00
2017-06-26 09:31:02 +00:00
if ( h . Compression ) //RLE? BITFIELDS (gah)?
2004-08-23 00:15:46 +00:00
return NULL ;
2017-08-29 02:29:06 +00:00
if ( length < h . Size )
return NULL ; //truncated...
2004-08-23 00:15:46 +00:00
* width = h . Width ;
* height = h . Height ;
2017-08-29 02:29:06 +00:00
if ( h . BitCount = = 4 ) //4 bit
2004-08-23 00:15:46 +00:00
{
int x , y ;
unsigned int * data32 ;
2017-08-29 02:29:06 +00:00
unsigned int pal [ 16 ] ;
2004-08-23 00:15:46 +00:00
if ( ! h . NumofColorIndices )
h . NumofColorIndices = ( int ) pow ( 2 , h . BitCount ) ;
2017-08-29 02:29:06 +00:00
if ( h . NumofColorIndices > 16 )
return NULL ;
if ( h . Width & 1 )
2004-08-23 00:15:46 +00:00
return NULL ;
data = buf + 2 ;
data + = sizeof ( h ) ;
for ( i = 0 ; i < h . NumofColorIndices ; i + + )
{
2017-08-29 02:29:06 +00:00
pal [ i ] = data [ i * 4 + 0 ] + ( data [ i * 4 + 1 ] < < 8 ) + ( data [ i * 4 + 2 ] < < 16 ) + ( 255 /*data[i*4+3]*/ < < 16 ) ;
2004-08-23 00:15:46 +00:00
}
buf + = h . OffsetofBMPBits ;
data32 = BZ_Malloc ( h . Width * h . Height * 4 ) ;
for ( y = 0 ; y < h . Height ; y + + )
{
i = ( h . Height - 1 - y ) * ( h . Width ) ;
2017-08-29 02:29:06 +00:00
for ( x = 0 ; x < h . Width / 2 ; x + + )
2004-08-23 00:15:46 +00:00
{
2017-08-29 02:29:06 +00:00
data32 [ i + + ] = pal [ buf [ x ] > > 4 ] ;
data32 [ i + + ] = pal [ buf [ x ] & 15 ] ;
2004-08-23 00:15:46 +00:00
}
2017-08-29 02:29:06 +00:00
buf + = h . Width > > 1 ;
2004-08-23 00:15:46 +00:00
}
return ( qbyte * ) data32 ;
}
2017-08-29 02:29:06 +00:00
else if ( h . BitCount = = 8 ) //8 bit
2004-08-23 00:15:46 +00:00
{
int x , y ;
unsigned int * data32 ;
2017-08-29 02:29:06 +00:00
unsigned int pal [ 256 ] ;
2004-08-23 00:15:46 +00:00
if ( ! h . NumofColorIndices )
h . NumofColorIndices = ( int ) pow ( 2 , h . BitCount ) ;
2017-08-29 02:29:06 +00:00
if ( h . NumofColorIndices > 256 )
2004-08-23 00:15:46 +00:00
return NULL ;
data = buf + 2 ;
data + = sizeof ( h ) ;
for ( i = 0 ; i < h . NumofColorIndices ; i + + )
{
2017-08-29 02:29:06 +00:00
pal [ i ] = data [ i * 4 + 2 ] + ( data [ i * 4 + 1 ] < < 8 ) + ( data [ i * 4 + 0 ] < < 16 ) + ( 255 /*data[i*4+3]*/ < < 24 ) ;
2004-08-23 00:15:46 +00:00
}
buf + = h . OffsetofBMPBits ;
data32 = BZ_Malloc ( h . Width * h . Height * 4 ) ;
for ( y = 0 ; y < h . Height ; y + + )
{
i = ( h . Height - 1 - y ) * ( h . Width ) ;
2017-08-29 02:29:06 +00:00
for ( x = 0 ; x < h . Width ; x + + )
2004-08-23 00:15:46 +00:00
{
2017-08-29 02:29:06 +00:00
data32 [ i ] = pal [ buf [ x ] ] ;
i + + ;
2004-08-23 00:15:46 +00:00
}
2017-08-29 02:29:06 +00:00
buf + = h . Width ;
2004-08-23 00:15:46 +00:00
}
return ( qbyte * ) data32 ;
}
else if ( h . BitCount = = 24 ) //24 bit... no 16?
{
int x , y ;
buf + = h . OffsetofBMPBits ;
data = BZ_Malloc ( h . Width * h . Height * 4 ) ;
for ( y = 0 ; y < h . Height ; y + + )
{
i = ( h . Height - 1 - y ) * ( h . Width ) ;
for ( x = 0 ; x < h . Width ; x + + )
{
data [ i * 4 + 0 ] = buf [ x * 3 + 2 ] ;
data [ i * 4 + 1 ] = buf [ x * 3 + 1 ] ;
data [ i * 4 + 2 ] = buf [ x * 3 + 0 ] ;
data [ i * 4 + 3 ] = 255 ;
i + + ;
}
buf + = h . Width * 3 ;
}
return data ;
}
2007-10-12 10:27:51 +00:00
else
2004-08-23 00:15:46 +00:00
return NULL ;
return NULL ;
}
2017-06-26 09:35:23 +00:00
qboolean WriteBMPFile ( char * filename , enum fs_relative fsroot , qbyte * in , int instride , int width , int height , uploadfmt_t fmt )
2004-08-23 00:15:46 +00:00
{
2017-06-26 09:31:02 +00:00
int y ;
bmpheader_t h ;
bmpheaderv4_t h4 ;
2004-08-23 00:15:46 +00:00
qbyte * data ;
qbyte * out ;
2017-06-26 09:31:02 +00:00
int outstride ;
int bits = 32 ;
int extraheadersize = sizeof ( h4 ) ;
memset ( & h4 , 0 , sizeof ( h4 ) ) ;
h4 . ColourSpace [ 0 ] = ' W ' ;
h4 . ColourSpace [ 1 ] = ' i ' ;
h4 . ColourSpace [ 2 ] = ' n ' ;
h4 . ColourSpace [ 3 ] = ' ' ;
switch ( fmt )
2004-08-23 00:15:46 +00:00
{
2017-06-26 09:31:02 +00:00
case TF_RGBA32 :
h4 . RedMask = 0x000000ff ;
h4 . GreenMask = 0x0000ff00 ;
h4 . BlueMask = 0x00ff0000 ;
h4 . AlphaMask = 0xff000000 ;
break ;
case TF_BGRA32 :
h4 . RedMask = 0x00ff0000 ;
h4 . GreenMask = 0x0000ff00 ;
h4 . BlueMask = 0x000000ff ;
h4 . AlphaMask = 0xff000000 ;
break ;
case TF_RGBX32 :
h4 . RedMask = 0x000000ff ;
h4 . GreenMask = 0x0000ff00 ;
h4 . BlueMask = 0x00ff0000 ;
h4 . AlphaMask = 0x00000000 ;
break ;
case TF_BGRX32 :
h4 . RedMask = 0x00ff0000 ;
h4 . GreenMask = 0x0000ff00 ;
h4 . BlueMask = 0x000000ff ;
h4 . AlphaMask = 0x00000000 ;
break ;
case TF_RGB24 :
h4 . RedMask = 0x000000ff ;
h4 . GreenMask = 0x0000ff00 ;
h4 . BlueMask = 0x00ff0000 ;
h4 . AlphaMask = 0x00000000 ;
bits = 3 ;
break ;
case TF_BGR24 :
h4 . RedMask = 0x00ff0000 ;
h4 . GreenMask = 0x0000ff00 ;
h4 . BlueMask = 0x000000ff ;
h4 . AlphaMask = 0x00000000 ;
bits = 3 ;
extraheadersize = 0 ;
break ;
2004-08-23 00:15:46 +00:00
2017-06-26 09:31:02 +00:00
default :
2017-06-26 09:35:23 +00:00
return false ;
2004-08-23 00:15:46 +00:00
}
2017-06-26 09:31:02 +00:00
outstride = width * ( bits / 8 ) ;
outstride = ( outstride + 3 ) & ~ 3 ; //bmp pads rows to a multiple of 4 bytes.
h . Size = 2 + sizeof ( h ) + extraheadersize + outstride * height ;
h . Reserved1 = 0 ;
h . Reserved2 = 0 ;
2017-07-31 17:15:37 +00:00
h . OffsetofBMPBits = 2 + sizeof ( h ) + extraheadersize ; //yes, this is misaligned.
h . SizeofBITMAPINFOHEADER = ( sizeof ( h ) - 12 ) + extraheadersize ;
2017-06-26 09:31:02 +00:00
h . Width = width ;
h . Height = height ;
h . Planes = 1 ;
h . BitCount = bits ;
h . Compression = extraheadersize ? 3 /*BI_BITFIELDS*/ : 0 /*BI_RGB aka BGR...*/ ;
h . ImageSize = outstride * height ;
h . TargetDeviceXRes = 2835 ; //72DPI
h . TargetDeviceYRes = 2835 ;
h . NumofColorIndices = 0 ;
h . NumofImportantColorIndices = 0 ;
2017-07-31 17:15:37 +00:00
//bmp is bottom-up so flip it now.
in + = instride * ( height - 1 ) ;
instride * = - 1 ;
out = data = BZ_Malloc ( h . Size ) ;
* out + + = ' B ' ;
* out + + = ' M ' ;
memcpy ( out , & h , sizeof ( h ) ) ;
out + = sizeof ( h ) ;
memcpy ( out , & h4 , extraheadersize ) ;
out + = extraheadersize ;
2017-06-26 09:31:02 +00:00
for ( y = 0 ; y < height ; y + + )
2004-08-23 00:15:46 +00:00
{
2017-06-26 09:31:02 +00:00
memcpy ( out , in , width * ( bits / 8 ) ) ;
memset ( out + width * ( bits / 8 ) , 0 , outstride - width * ( bits / 8 ) ) ;
out + = outstride ;
in + = instride ;
2004-08-23 00:15:46 +00:00
}
2017-06-26 09:31:02 +00:00
COM_WriteFile ( filename , fsroot , data , h . Size ) ;
BZ_Free ( data ) ;
2017-06-26 09:35:23 +00:00
return true ;
2017-06-26 09:31:02 +00:00
}
2004-08-23 00:15:46 +00:00
2012-11-27 03:23:19 +00:00
# ifndef NPFTE
2005-05-18 01:40:01 +00:00
// saturate function, stolen from jitspoe
void SaturateR8G8B8 ( qbyte * data , int size , float sat )
{
int i ;
float r , g , b , v ;
2004-08-23 00:15:46 +00:00
2005-05-18 01:40:01 +00:00
if ( sat > 1 )
{
for ( i = 0 ; i < size ; i + = 3 )
{
r = data [ i ] ;
g = data [ i + 1 ] ;
b = data [ i + 2 ] ;
2005-06-26 12:31:56 +00:00
v = r * NTSC_RED + g * NTSC_GREEN + b * NTSC_BLUE ;
2005-05-18 01:40:01 +00:00
r = v + ( r - v ) * sat ;
g = v + ( g - v ) * sat ;
b = v + ( b - v ) * sat ;
// bounds check
if ( r < 0 )
r = 0 ;
else if ( r > 255 )
r = 255 ;
if ( g < 0 )
g = 0 ;
else if ( g > 255 )
g = 255 ;
if ( b < 0 )
b = 0 ;
else if ( b > 255 )
b = 255 ;
// scale down to avoid overbright lightmaps
2005-06-26 12:31:56 +00:00
v = v / ( r * NTSC_RED + g * NTSC_GREEN + b * NTSC_BLUE ) ;
if ( v > NTSC_SUM )
v = NTSC_SUM ;
2005-05-18 01:40:01 +00:00
else
v * = v ;
2007-10-12 10:27:51 +00:00
2005-05-18 01:40:01 +00:00
data [ i ] = r * v ;
data [ i + 1 ] = g * v ;
data [ i + 2 ] = b * v ;
}
}
else // avoid bounds check for desaturation
{
if ( sat < 0 )
sat = 0 ;
for ( i = 0 ; i < size ; i + = 3 )
{
r = data [ i ] ;
g = data [ i + 1 ] ;
b = data [ i + 2 ] ;
2005-06-26 12:31:56 +00:00
v = r * NTSC_RED + g * NTSC_GREEN + b * NTSC_BLUE ;
2004-08-23 00:15:46 +00:00
2005-05-18 01:40:01 +00:00
data [ i ] = v + ( r - v ) * sat ;
data [ i + 1 ] = v + ( g - v ) * sat ;
data [ i + 2 ] = v + ( b - v ) * sat ;
}
}
}
2004-08-23 00:15:46 +00:00
void BoostGamma ( qbyte * rgba , int width , int height )
{
2016-07-12 00:40:13 +00:00
//note: should not be used where hardware gamma is supported.
2004-08-23 00:15:46 +00:00
int i ;
extern qbyte gammatable [ 256 ] ;
for ( i = 0 ; i < width * height * 4 ; i + = 4 )
{
rgba [ i + 0 ] = gammatable [ rgba [ i + 0 ] ] ;
rgba [ i + 1 ] = gammatable [ rgba [ i + 1 ] ] ;
rgba [ i + 2 ] = gammatable [ rgba [ i + 2 ] ] ;
//and not alpha
}
}
2007-05-25 22:16:29 +00:00
2014-10-05 20:04:11 +00:00
static void Image_LoadTexture_Failed ( void * ctx , void * data , size_t a , size_t b )
{
texid_t tex = ctx ;
tex - > status = TEX_FAILED ;
}
static void Image_LoadTextureMips ( void * ctx , void * data , size_t a , size_t b )
{
2015-07-01 23:15:25 +00:00
int i ;
2014-10-05 20:04:11 +00:00
texid_t tex = ctx ;
struct pendingtextureinfo * mips = data ;
2015-06-12 14:44:50 +00:00
2015-08-02 19:08:36 +00:00
//setting the dimensions here can break npot textures, so lets not do that.
2015-08-02 11:36:46 +00:00
// tex->width = mips->mip[0].width;
// tex->height = mips->mip[0].height;
2015-08-02 19:08:36 +00:00
2014-10-05 20:04:11 +00:00
if ( rf - > IMG_LoadTextureMips ( tex , mips ) )
tex - > status = TEX_LOADED ;
else
tex - > status = TEX_FAILED ;
2015-07-01 23:15:25 +00:00
for ( i = 0 ; i < mips - > mipcount ; i + + )
if ( mips - > mip [ i ] . needfree )
BZ_Free ( mips - > mip [ i ] . data ) ;
if ( mips - > extrafree )
BZ_Free ( mips - > extrafree ) ;
2014-10-05 20:04:11 +00:00
BZ_Free ( mips ) ;
2015-06-12 14:44:50 +00:00
2015-08-02 19:08:36 +00:00
//ezhud breaks without this. I assume other things will too. this is why you shouldn't depend upon querying an image's size.
2015-06-12 14:44:50 +00:00
if ( ! strncmp ( tex - > ident , " gfx/ " , 4 ) )
{
2016-08-25 00:12:14 +00:00
size_t lumpsize ;
qpic_t * pic = W_SafeGetLumpName ( tex - > ident + 4 , & lumpsize ) ;
if ( pic & & lumpsize = = 8 + pic - > width * pic - > height )
2015-06-12 14:44:50 +00:00
{
tex - > width = pic - > width ;
tex - > height = pic - > height ;
}
}
2015-08-02 19:08:36 +00:00
//FIXME: check loaded wad files too.
2014-10-05 20:04:11 +00:00
}
2007-05-25 22:16:29 +00:00
2013-10-29 17:38:22 +00:00
# ifdef IMAGEFMT_DDS
2005-08-26 22:56:51 +00:00
typedef struct {
unsigned int dwSize ;
unsigned int dwFlags ;
unsigned int dwFourCC ;
unsigned int unk [ 5 ] ;
} ddspixelformat ;
typedef struct {
unsigned int dwSize ;
unsigned int dwFlags ;
unsigned int dwHeight ;
unsigned int dwWidth ;
unsigned int dwPitchOrLinearSize ;
unsigned int dwDepth ;
unsigned int dwMipMapCount ;
unsigned int dwReserved1 [ 11 ] ;
ddspixelformat ddpfPixelFormat ;
unsigned int ddsCaps [ 4 ] ;
unsigned int dwReserved2 ;
} ddsheader ;
2014-10-05 20:04:11 +00:00
static qboolean Image_ReadDDSFile ( texid_t tex , unsigned int flags , char * fname , qbyte * filedata , size_t filesize )
2005-08-26 22:56:51 +00:00
{
int nummips ;
int mipnum ;
int datasize ;
int pad ;
2009-07-07 06:34:07 +00:00
unsigned int w , h ;
2011-12-05 15:23:40 +00:00
int divsize , blocksize ;
2014-10-05 20:04:11 +00:00
struct pendingtextureinfo * mips ;
int encoding ;
2005-08-26 22:56:51 +00:00
ddsheader fmtheader ;
2017-01-29 13:10:53 +00:00
if ( * ( int * ) filedata ! = ( ( ' D ' < < 0 ) | ( ' D ' < < 8 ) | ( ' S ' < < 16 ) | ( ' ' < < 24 ) ) )
2014-10-05 20:04:11 +00:00
return false ;
2005-08-26 22:56:51 +00:00
2014-10-05 20:04:11 +00:00
memcpy ( & fmtheader , filedata + 4 , sizeof ( fmtheader ) ) ;
2005-08-26 22:56:51 +00:00
if ( fmtheader . dwSize ! = sizeof ( fmtheader ) )
2014-10-05 20:04:11 +00:00
return false ; //corrupt/different version
2005-08-26 22:56:51 +00:00
nummips = fmtheader . dwMipMapCount ;
if ( nummips < 1 )
nummips = 1 ;
2017-01-29 13:10:53 +00:00
if ( * ( int * ) & fmtheader . ddpfPixelFormat . dwFourCC = = ( ( ' D ' < < 0 ) | ( ' X ' < < 8 ) | ( ' T ' < < 16 ) | ( ' 1 ' < < 24 ) ) )
2005-08-26 22:56:51 +00:00
{
2014-10-05 20:04:11 +00:00
encoding = PTI_S3RGBA1 ; //alpha or not? Assume yes, and let the drivers decide.
2005-08-26 22:56:51 +00:00
pad = 8 ;
2011-12-05 15:23:40 +00:00
divsize = 4 ;
blocksize = 8 ;
2005-08-26 22:56:51 +00:00
}
2017-01-29 13:10:53 +00:00
else if ( * ( int * ) & fmtheader . ddpfPixelFormat . dwFourCC = = ( ( ' D ' < < 0 ) | ( ' X ' < < 8 ) | ( ' T ' < < 16 ) | ( ' 2 ' < < 24 ) ) ) //dx3 with premultiplied alpha
2005-08-26 22:56:51 +00:00
{
2017-08-29 02:29:06 +00:00
// if (!(tex->flags & IF_PREMULTIPLYALPHA))
// return false;
2014-10-05 20:04:11 +00:00
encoding = PTI_S3RGBA3 ;
2005-08-26 22:56:51 +00:00
pad = 8 ;
2011-12-05 15:23:40 +00:00
divsize = 4 ;
blocksize = 16 ;
2005-08-26 22:56:51 +00:00
}
2017-01-29 13:10:53 +00:00
else if ( * ( int * ) & fmtheader . ddpfPixelFormat . dwFourCC = = ( ( ' D ' < < 0 ) | ( ' X ' < < 8 ) | ( ' T ' < < 16 ) | ( ' 3 ' < < 24 ) ) )
2005-08-26 22:56:51 +00:00
{
2017-08-29 02:29:06 +00:00
// if (tex->flags & IF_PREMULTIPLYALPHA)
// return false;
2015-07-06 14:47:46 +00:00
encoding = PTI_S3RGBA3 ;
pad = 8 ;
divsize = 4 ;
blocksize = 16 ;
}
2017-01-29 13:10:53 +00:00
else if ( * ( int * ) & fmtheader . ddpfPixelFormat . dwFourCC = = ( ( ' D ' < < 0 ) | ( ' X ' < < 8 ) | ( ' T ' < < 16 ) | ( ' 4 ' < < 24 ) ) ) //dx5 with premultiplied alpha
2015-07-06 14:47:46 +00:00
{
// if (!(tex->flags & IF_PREMULTIPLYALPHA))
2017-08-29 02:29:06 +00:00
// return false;
2015-07-06 14:47:46 +00:00
encoding = PTI_S3RGBA5 ;
pad = 8 ;
divsize = 4 ;
blocksize = 16 ;
}
2017-01-29 13:10:53 +00:00
else if ( * ( int * ) & fmtheader . ddpfPixelFormat . dwFourCC = = ( ( ' D ' < < 0 ) | ( ' X ' < < 8 ) | ( ' T ' < < 16 ) | ( ' 5 ' < < 24 ) ) )
2015-07-06 14:47:46 +00:00
{
2017-08-29 02:29:06 +00:00
// if (tex->flags & IF_PREMULTIPLYALPHA)
// return false;
2015-07-06 14:47:46 +00:00
2014-10-05 20:04:11 +00:00
encoding = PTI_S3RGBA5 ;
2005-08-26 22:56:51 +00:00
pad = 8 ;
2011-12-05 15:23:40 +00:00
divsize = 4 ;
blocksize = 16 ;
2005-08-26 22:56:51 +00:00
}
else
2014-05-30 15:47:04 +00:00
{
2014-10-05 20:04:11 +00:00
Con_Printf ( " Unsupported dds fourcc in %s \n " , fname ) ;
return false ;
2014-05-30 15:47:04 +00:00
}
2005-08-26 22:56:51 +00:00
2014-10-05 20:04:11 +00:00
mips = Z_Malloc ( sizeof ( * mips ) ) ;
mips - > mipcount = 0 ;
mips - > type = PTI_2D ;
mips - > extrafree = filedata ;
mips - > encoding = encoding ;
2005-08-26 22:56:51 +00:00
2014-10-05 20:04:11 +00:00
filedata + = 4 + fmtheader . dwSize ;
2009-06-21 17:45:33 +00:00
2005-08-26 22:56:51 +00:00
datasize = fmtheader . dwPitchOrLinearSize ;
2011-12-05 15:23:40 +00:00
w = fmtheader . dwWidth ;
h = fmtheader . dwHeight ;
2005-08-26 22:56:51 +00:00
for ( mipnum = 0 ; mipnum < nummips ; mipnum + + )
{
2016-07-12 00:40:13 +00:00
if ( nummips > = countof ( mips - > mip ) )
break ;
2005-08-26 22:56:51 +00:00
if ( datasize < pad )
datasize = pad ;
2016-07-12 00:40:13 +00:00
datasize = ( ( w + divsize - 1 ) / divsize ) * ( ( h + divsize - 1 ) / divsize ) * blocksize ;
2014-10-05 20:04:11 +00:00
mips - > mip [ mipnum ] . data = filedata ;
mips - > mip [ mipnum ] . datasize = datasize ;
mips - > mip [ mipnum ] . width = w ;
mips - > mip [ mipnum ] . height = h ;
filedata + = datasize ;
2011-12-05 15:23:40 +00:00
w = ( w + 1 ) > > 1 ;
h = ( h + 1 ) > > 1 ;
2005-08-26 22:56:51 +00:00
}
2014-10-05 20:04:11 +00:00
mips - > mipcount = mipnum ;
2014-05-30 15:47:04 +00:00
2016-07-12 00:40:13 +00:00
if ( flags & IF_NOWORKER )
Image_LoadTextureMips ( tex , mips , 0 , 0 ) ;
else
COM_AddWork ( WG_MAIN , Image_LoadTextureMips , tex , mips , 0 , 0 ) ;
2014-10-05 20:04:11 +00:00
return true ;
2005-08-26 22:56:51 +00:00
}
# endif
2013-10-29 17:38:22 +00:00
# ifdef IMAGEFMT_BLP
2014-10-05 20:04:11 +00:00
static qboolean Image_ReadBLPFile ( texid_t tex , unsigned int flags , char * fname , qbyte * filedata , size_t filesize )
2013-10-29 17:38:22 +00:00
{
//FIXME: cba with endian.
int miplevel ;
int w , h , i ;
struct blp_s
{
char blp2 [ 4 ] ;
int type ;
qbyte encoding ;
qbyte alphadepth ;
qbyte alphaencoding ;
qbyte hasmips ;
unsigned int xres ;
unsigned int yres ;
unsigned int mipoffset [ 16 ] ;
unsigned int mipsize [ 16 ] ;
unsigned int palette [ 256 ] ;
} * blp ;
unsigned int * tmpmem = NULL ;
unsigned char * in ;
unsigned int inlen ;
2014-10-05 20:04:11 +00:00
struct pendingtextureinfo * mips ;
2013-10-29 17:38:22 +00:00
2014-10-05 20:04:11 +00:00
blp = ( void * ) filedata ;
if ( memcmp ( blp - > blp2 , " BLP2 " , 4 ) | | blp - > type ! = 1 )
return false ;
2013-10-29 17:38:22 +00:00
2014-10-05 20:04:11 +00:00
mips = Z_Malloc ( sizeof ( * mips ) ) ;
mips - > mipcount = 0 ;
mips - > type = PTI_2D ;
2013-10-29 17:38:22 +00:00
2014-10-05 20:04:11 +00:00
w = LittleLong ( blp - > xres ) ;
h = LittleLong ( blp - > yres ) ;
2013-10-29 17:38:22 +00:00
2014-10-05 20:04:11 +00:00
if ( blp - > encoding = = 2 )
2013-10-29 17:38:22 +00:00
{
2014-10-05 20:04:11 +00:00
//s3tc/dxt
switch ( blp - > alphaencoding )
2013-10-29 17:38:22 +00:00
{
2014-10-05 20:04:11 +00:00
default :
case 0 : //dxt1
if ( blp - > alphadepth )
mips - > encoding = PTI_S3RGBA1 ;
else
mips - > encoding = PTI_S3RGB1 ;
break ;
case 1 : //dxt2/3
mips - > encoding = PTI_S3RGBA3 ;
break ;
case 7 : //dxt4/5
mips - > encoding = PTI_S3RGBA5 ;
2013-10-29 17:38:22 +00:00
break ;
}
2014-10-05 20:04:11 +00:00
for ( miplevel = 0 ; miplevel < 16 ; )
2013-10-29 17:38:22 +00:00
{
2014-10-05 20:04:11 +00:00
if ( ! w & & ! h ) //shrunk to no size
2013-10-29 17:38:22 +00:00
break ;
2014-10-05 20:04:11 +00:00
if ( ! w )
w = 1 ;
if ( ! h )
h = 1 ;
if ( ! blp - > mipoffset [ miplevel ] | | ! blp - > mipsize [ miplevel ] | | blp - > mipoffset [ miplevel ] + blp - > mipsize [ miplevel ] > filesize ) //no data
2013-10-29 17:38:22 +00:00
break ;
2014-10-05 20:04:11 +00:00
mips - > mip [ miplevel ] . width = w ;
mips - > mip [ miplevel ] . height = h ;
mips - > mip [ miplevel ] . data = filedata + LittleLong ( blp - > mipoffset [ miplevel ] ) ;
mips - > mip [ miplevel ] . datasize = LittleLong ( blp - > mipsize [ miplevel ] ) ;
miplevel + + ;
if ( ! blp - > hasmips | | ( flags & IF_NOMIPMAP ) )
2013-10-29 17:38:22 +00:00
break ;
2014-10-05 20:04:11 +00:00
w > > = 1 ;
h > > = 1 ;
}
mips - > mipcount = miplevel ;
mips - > extrafree = filedata ;
}
else
{
mips - > encoding = PTI_BGRA8 ;
for ( miplevel = 0 ; miplevel < 16 ; )
{
if ( ! w & & ! h )
break ;
if ( ! w )
w = 1 ;
if ( ! h )
h = 1 ;
//if we ran out of mips to load, give up.
if ( ! blp - > mipoffset [ miplevel ] | | ! blp - > mipsize [ miplevel ] | | blp - > mipoffset [ miplevel ] + blp - > mipsize [ miplevel ] > filesize )
2013-10-29 17:38:22 +00:00
{
2014-10-05 20:04:11 +00:00
//if we got at least one mip, cap the mips. might help save some ram? naaah...
//if this is the first mip, well, its completely fucked.
2013-10-29 17:38:22 +00:00
break ;
}
2014-10-05 20:04:11 +00:00
in = filedata + LittleLong ( blp - > mipoffset [ miplevel ] ) ;
inlen = LittleLong ( blp - > mipsize [ miplevel ] ) ;
2013-10-29 17:38:22 +00:00
if ( inlen ! = w * h + ( ( w * h * blp - > alphadepth + 7 ) > > 3 ) )
{
2014-10-05 20:04:11 +00:00
Con_Printf ( " %s: mip level %i does not contain the correct amount of data \n " , fname , miplevel ) ;
2013-10-29 17:38:22 +00:00
break ;
}
2014-10-05 20:04:11 +00:00
mips - > mip [ miplevel ] . width = w ;
mips - > mip [ miplevel ] . height = h ;
mips - > mip [ miplevel ] . datasize = 4 * w * h ;
mips - > mip [ miplevel ] . data = tmpmem = BZ_Malloc ( 4 * w * h ) ;
mips - > mip [ miplevel ] . needfree = true ;
2013-10-29 17:38:22 +00:00
2014-03-30 08:55:06 +00:00
//load the rgb data first (8-bit paletted)
2013-10-29 17:38:22 +00:00
for ( i = 0 ; i < w * h ; i + + )
tmpmem [ i ] = blp - > palette [ * in + + ] | 0xff000000 ;
2014-03-30 08:55:06 +00:00
//and then change the alpha bits accordingly.
2013-10-29 17:38:22 +00:00
switch ( blp - > alphadepth )
{
case 0 :
//BGRX palette, 8bit
break ;
case 1 :
//BGRX palette, 8bit
//1bit trailing alpha
2014-05-18 23:02:04 +00:00
for ( i = 0 ; i < w * h ; i + = 8 , in + + )
{
tmpmem [ i + 0 ] = ( tmpmem [ i + 0 ] & 0xffffff ) | ( ( * in & 0x01 ) ? 0xff000000 : 0 ) ;
tmpmem [ i + 1 ] = ( tmpmem [ i + 1 ] & 0xffffff ) | ( ( * in & 0x02 ) ? 0xff000000 : 0 ) ;
tmpmem [ i + 2 ] = ( tmpmem [ i + 2 ] & 0xffffff ) | ( ( * in & 0x04 ) ? 0xff000000 : 0 ) ;
tmpmem [ i + 3 ] = ( tmpmem [ i + 3 ] & 0xffffff ) | ( ( * in & 0x08 ) ? 0xff000000 : 0 ) ;
tmpmem [ i + 4 ] = ( tmpmem [ i + 4 ] & 0xffffff ) | ( ( * in & 0x10 ) ? 0xff000000 : 0 ) ;
tmpmem [ i + 5 ] = ( tmpmem [ i + 5 ] & 0xffffff ) | ( ( * in & 0x20 ) ? 0xff000000 : 0 ) ;
tmpmem [ i + 6 ] = ( tmpmem [ i + 6 ] & 0xffffff ) | ( ( * in & 0x40 ) ? 0xff000000 : 0 ) ;
tmpmem [ i + 7 ] = ( tmpmem [ i + 7 ] & 0xffffff ) | ( ( * in & 0x80 ) ? 0xff000000 : 0 ) ;
}
2013-10-29 17:38:22 +00:00
break ;
case 4 :
//BGRX palette, 8bit
//4bit trailing alpha
for ( i = 0 ; i < w * h ; i + + )
tmpmem [ i ] = ( tmpmem [ i ] & 0xffffff ) | ( * in + + * 0x11000000 ) ;
break ;
case 8 :
//BGRX palette, 8bit
//8bit trailing alpha
for ( i = 0 ; i < w * h ; i + + )
tmpmem [ i ] = ( tmpmem [ i ] & 0xffffff ) | ( * in + + < < 24 ) ;
break ;
}
2014-10-05 20:04:11 +00:00
miplevel + + ;
if ( ! blp - > hasmips | | ( flags & IF_NOMIPMAP ) )
break ;
w = w > > 1 ;
h = h > > 1 ;
}
BZ_Free ( filedata ) ;
mips - > mipcount = miplevel ;
2013-10-29 17:38:22 +00:00
}
2016-02-15 06:01:17 +00:00
COM_AddWork ( WG_MAIN , Image_LoadTextureMips , tex , mips , 0 , 0 ) ;
2014-10-05 20:04:11 +00:00
return true ;
2013-10-29 17:38:22 +00:00
}
# endif
2004-09-20 23:25:38 +00:00
//returns r8g8b8a8
2016-07-12 00:40:13 +00:00
qbyte * Read32BitImageFile ( qbyte * buf , int len , int * width , int * height , qboolean * hasalpha , const char * fname )
2004-09-20 23:25:38 +00:00
{
qbyte * data ;
2012-02-12 05:18:31 +00:00
if ( ( data = ReadTargaFile ( buf , len , width , height , hasalpha , false ) ) )
2004-10-10 06:32:29 +00:00
{
TRACE ( ( " dbg: Read32BitImageFile: tga \n " ) ) ;
2004-09-20 23:25:38 +00:00
return data ;
2004-10-10 06:32:29 +00:00
}
2007-10-12 10:27:51 +00:00
2004-09-20 23:25:38 +00:00
# ifdef AVAIL_PNGLIB
2013-11-21 23:02:28 +00:00
if ( len > 4 & & ( buf [ 0 ] = = 137 & & buf [ 1 ] = = ' P ' & & buf [ 2 ] = = ' N ' & & buf [ 3 ] = = ' G ' ) & & ( data = ReadPNGFile ( buf , len , width , height , fname ) ) )
2004-10-10 06:32:29 +00:00
{
TRACE ( ( " dbg: Read32BitImageFile: png \n " ) ) ;
2004-09-20 23:25:38 +00:00
return data ;
2004-10-10 06:32:29 +00:00
}
2004-09-20 23:25:38 +00:00
# endif
# ifdef AVAIL_JPEGLIB
//jpeg jfif only.
2017-04-10 07:52:18 +00:00
if ( len > 4 & & ( buf [ 0 ] = = 0xff & & buf [ 1 ] = = 0xd8 & & buf [ 2 ] = = 0xff /*&& buf[3] == 0xe0*/ ) & & ( data = ReadJPEGFile ( buf , len , width , height ) ) )
2004-10-10 06:32:29 +00:00
{
TRACE ( ( " dbg: Read32BitImageFile: jpeg \n " ) ) ;
2004-09-20 23:25:38 +00:00
return data ;
2004-10-10 06:32:29 +00:00
}
2004-09-20 23:25:38 +00:00
# endif
2013-11-21 23:02:28 +00:00
if ( ( data = ReadPCXFile ( buf , len , width , height ) ) )
2004-10-10 06:32:29 +00:00
{
TRACE ( ( " dbg: Read32BitImageFile: pcx \n " ) ) ;
2004-09-20 23:25:38 +00:00
return data ;
2004-10-10 06:32:29 +00:00
}
2004-09-20 23:25:38 +00:00
2013-11-21 23:02:28 +00:00
if ( len > 2 & & ( buf [ 0 ] = = ' B ' & & buf [ 1 ] = = ' M ' ) & & ( data = ReadBMPFile ( buf , len , width , height ) ) )
2004-10-10 06:32:29 +00:00
{
TRACE ( ( " dbg: Read32BitImageFile: bitmap \n " ) ) ;
2004-09-20 23:25:38 +00:00
return data ;
2004-10-10 06:32:29 +00:00
}
2014-01-13 02:42:25 +00:00
if ( len > = 8 ) //.lmp has no magic id. guess at it.
{
int w = LittleLong ( ( ( int * ) buf ) [ 0 ] ) ;
int h = LittleLong ( ( ( int * ) buf ) [ 1 ] ) ;
int i ;
2014-09-02 02:44:43 +00:00
if ( w > = 3 & & h > = 4 & & w * h + sizeof ( int ) * 2 = = len )
2014-01-13 02:42:25 +00:00
{
2014-02-07 08:38:40 +00:00
qboolean foundalpha = false ;
qbyte * in = ( qbyte * ) ( ( int * ) buf + 2 ) ;
2014-01-13 02:42:25 +00:00
data = BZ_Malloc ( w * h * sizeof ( int ) ) ;
for ( i = 0 ; i < w * h ; i + + )
{
2014-02-07 08:38:40 +00:00
if ( in [ i ] = = 255 )
foundalpha = true ;
2014-01-13 02:42:25 +00:00
( ( unsigned int * ) data ) [ i ] = d_8to24rgbtable [ in [ i ] ] ;
}
* width = w ;
* height = h ;
2014-02-07 08:38:40 +00:00
* hasalpha = foundalpha ;
2014-01-13 02:42:25 +00:00
return data ;
}
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
else if ( w > = 3 & & h > = 4 & & w * h + sizeof ( int ) * 2 + 768 + 2 = = len )
{
qboolean foundalpha = false ;
qbyte * in = ( qbyte * ) ( ( int * ) buf + 2 ) ;
qbyte * palette = in + w * h + 2 , * p ;
data = BZ_Malloc ( w * h * sizeof ( int ) ) ;
for ( i = 0 ; i < w * h ; i + + )
{
if ( in [ i ] = = 255 )
foundalpha = true ;
p = palette + 3 * in [ i ] ;
data [ ( i < < 2 ) + 0 ] = p [ 2 ] ;
data [ ( i < < 2 ) + 1 ] = p [ 1 ] ;
data [ ( i < < 2 ) + 2 ] = p [ 0 ] ;
data [ ( i < < 2 ) + 3 ] = 255 ;
}
* width = w ;
* height = h ;
* hasalpha = foundalpha ;
return data ;
}
2014-01-13 02:42:25 +00:00
}
2004-10-10 06:32:29 +00:00
TRACE ( ( " dbg: Read32BitImageFile: life sucks \n " ) ) ;
2004-09-20 23:25:38 +00:00
return NULL ;
}
2013-10-29 17:38:22 +00:00
static void * R_FlipImage32 ( void * in , int * inoutwidth , int * inoutheight , qboolean flipx , qboolean flipy , qboolean flipd )
{
int x , y ;
unsigned int * in32 , * inr , * out32 ;
void * out ;
int inwidth = * inoutwidth ;
int inheight = * inoutheight ;
int rowstride = inwidth ;
int colstride = 1 ;
//simply return if no operation
if ( ! flipx & & ! flipy & & ! flipd )
return in ;
inr = in ;
out32 = out = BZ_Malloc ( inwidth * inheight * 4 ) ;
if ( flipy )
{
inr + = inwidth * inheight - inwidth ; //start on the bottom row
rowstride * = - 1 ; //and we need to move up instead
}
if ( flipx )
{
colstride * = - 1 ; //move backwards
inr + = inwidth - 1 ; //start at the end of the row
}
if ( flipd )
{
//switch the dimensions
int tmp = inwidth ;
inwidth = inheight ;
inheight = tmp ;
//make sure the caller gets the new dimensions
* inoutwidth = inwidth ;
* inoutheight = inheight ;
//switch the strides
tmp = colstride ;
colstride = rowstride ;
rowstride = tmp ;
}
//rows->rows, columns->columns
for ( y = 0 ; y < inheight ; y + + )
{
in32 = inr ; //reset the input after each row, so we have truely independant row+column strides
inr + = rowstride ;
for ( x = 0 ; x < inheight ; x + + )
{
* out32 + + = * in32 ;
in32 + = colstride ;
}
}
BZ_Free ( in ) ;
return out ;
}
2014-01-13 02:42:25 +00:00
int tex_extensions_count ;
# define tex_extensions_max 15
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
static struct
{
2014-01-13 02:42:25 +00:00
char name [ 6 ] ;
} tex_extensions [ tex_extensions_max ] ;
2015-04-21 04:12:00 +00:00
static void QDECL R_ImageExtensions_Callback ( struct cvar_s * var , char * oldvalue )
2014-01-13 02:42:25 +00:00
{
char * v = var - > string ;
tex_extensions_count = 0 ;
while ( tex_extensions_count < tex_extensions_max )
{
v = COM_Parse ( v ) ;
if ( ! v )
break ;
Q_snprintfz ( tex_extensions [ tex_extensions_count ] . name , sizeof ( tex_extensions [ tex_extensions_count ] . name ) , " .%s " , com_token ) ;
tex_extensions_count + + ;
}
if ( tex_extensions_count < tex_extensions_max )
{
Q_snprintfz ( tex_extensions [ tex_extensions_count ] . name , sizeof ( tex_extensions [ tex_extensions_count ] . name ) , " " ) ;
tex_extensions_count + + ;
}
}
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
2010-11-09 02:29:53 +00:00
static struct
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
{
int args ;
char * path ;
int enabled ;
} tex_path [ ] =
{
/*if three args, first is the subpath*/
/*the last two args are texturename then extension*/
{ 2 , " %s%s " , 1 } , /*directly named texture*/
{ 3 , " textures/%s/%s%s " , 1 } , /*fuhquake compatibility*/
{ 3 , " %s/%s%s " , 1 } , /*fuhquake compatibility*/
{ 2 , " textures/%s%s " , 1 } , /*directly named texture with textures/ prefix*/
2015-10-11 11:34:58 +00:00
# ifndef NOLEGACY
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
{ 2 , " override/%s%s " , 1 } /*tenebrae compatibility*/
2015-10-11 11:34:58 +00:00
# endif
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
} ;
2014-10-11 19:39:45 +00:00
static void Image_MipMap8888 ( qbyte * in , int inwidth , int inheight , qbyte * out , int outwidth , int outheight )
2014-10-05 20:04:11 +00:00
{
int i , j ;
qbyte * inrow ;
int rowwidth = inwidth * 4 ; //rowwidth is the byte width of the input
inrow = in ;
//mips round down, except for when the input is 1. which bugs out.
if ( inwidth < = 1 & & inheight < = 1 )
{
out [ 0 ] = in [ 0 ] ;
out [ 1 ] = in [ 1 ] ;
out [ 2 ] = in [ 2 ] ;
out [ 3 ] = in [ 3 ] ;
}
else if ( inheight < = 1 )
{
//single row, don't peek at the next
for ( in = inrow , j = 0 ; j < outwidth ; j + + , out + = 4 , in + = 8 )
{
out [ 0 ] = ( in [ 0 ] + in [ 4 ] ) > > 1 ;
out [ 1 ] = ( in [ 1 ] + in [ 5 ] ) > > 1 ;
out [ 2 ] = ( in [ 2 ] + in [ 6 ] ) > > 1 ;
out [ 3 ] = ( in [ 3 ] + in [ 7 ] ) > > 1 ;
}
}
else if ( inwidth < = 1 )
{
//single colum, peek only at this pixel
for ( i = 0 ; i < outheight ; i + + , inrow + = rowwidth * 2 )
{
for ( in = inrow , j = 0 ; j < outwidth ; j + + , out + = 4 , in + = 8 )
{
out [ 0 ] = ( in [ 0 ] + in [ rowwidth + 0 ] ) > > 1 ;
out [ 1 ] = ( in [ 1 ] + in [ rowwidth + 1 ] ) > > 1 ;
out [ 2 ] = ( in [ 2 ] + in [ rowwidth + 2 ] ) > > 1 ;
out [ 3 ] = ( in [ 3 ] + in [ rowwidth + 3 ] ) > > 1 ;
}
}
}
else
{
for ( i = 0 ; i < outheight ; i + + , inrow + = rowwidth * 2 )
{
for ( in = inrow , j = 0 ; j < outwidth ; j + + , out + = 4 , in + = 8 )
{
out [ 0 ] = ( in [ 0 ] + in [ 4 ] + in [ rowwidth + 0 ] + in [ rowwidth + 4 ] ) > > 2 ;
out [ 1 ] = ( in [ 1 ] + in [ 5 ] + in [ rowwidth + 1 ] + in [ rowwidth + 5 ] ) > > 2 ;
out [ 2 ] = ( in [ 2 ] + in [ 6 ] + in [ rowwidth + 2 ] + in [ rowwidth + 6 ] ) > > 2 ;
out [ 3 ] = ( in [ 3 ] + in [ 7 ] + in [ rowwidth + 3 ] + in [ rowwidth + 7 ] ) > > 2 ;
}
}
}
}
2016-07-21 19:27:59 +00:00
static qbyte Image_BlendPalette_2 ( qbyte a , qbyte b )
{
return a ;
}
static qbyte Image_BlendPalette_4 ( qbyte a , qbyte b , qbyte c , qbyte d )
{
return a ;
}
//this is expected to be slow, thanks to those two expensive helpers.
static void Image_MipMap8Pal ( qbyte * in , int inwidth , int inheight , qbyte * out , int outwidth , int outheight )
{
int i , j ;
qbyte * inrow ;
int rowwidth = inwidth ; //rowwidth is the byte width of the input
inrow = in ;
//mips round down, except for when the input is 1. which bugs out.
if ( inwidth < = 1 & & inheight < = 1 )
out [ 0 ] = in [ 0 ] ;
else if ( inheight < = 1 )
{
//single row, don't peek at the next
for ( in = inrow , j = 0 ; j < outwidth ; j + + , out + = 1 , in + = 2 )
out [ 0 ] = Image_BlendPalette_2 ( in [ 0 ] , in [ 1 ] ) ;
}
else if ( inwidth < = 1 )
{
//single colum, peek only at this pixel
for ( i = 0 ; i < outheight ; i + + , inrow + = rowwidth * 2 )
for ( in = inrow , j = 0 ; j < outwidth ; j + + , out + = 1 , in + = 2 )
out [ 0 ] = Image_BlendPalette_2 ( in [ 0 ] , in [ rowwidth ] ) ;
}
else
{
for ( i = 0 ; i < outheight ; i + + , inrow + = rowwidth * 2 )
for ( in = inrow , j = 0 ; j < outwidth ; j + + , out + = 1 , in + = 2 )
out [ 0 ] = Image_BlendPalette_4 ( in [ 0 ] , in [ 1 ] , in [ rowwidth + 0 ] , in [ rowwidth + 1 ] ) ;
}
}
2014-10-05 20:04:11 +00:00
static void Image_GenerateMips ( struct pendingtextureinfo * mips , unsigned int flags )
{
int mip ;
if ( mips - > type ! = PTI_2D )
return ; //blurgh
2014-10-11 19:39:45 +00:00
if ( flags & IF_NOMIPMAP )
return ;
2014-10-05 20:04:11 +00:00
switch ( mips - > encoding )
{
2015-02-07 22:34:22 +00:00
case PTI_R8 :
2016-07-21 19:27:59 +00:00
if ( sh_config . can_mipcap )
return ; //if we can cap mips, do that. it'll save lots of expensive lookups and uglyness.
for ( mip = mips - > mipcount ; mip < 32 ; mip + + )
{
mips - > mip [ mip ] . width = mips - > mip [ mip - 1 ] . width > > 1 ;
mips - > mip [ mip ] . height = mips - > mip [ mip - 1 ] . height > > 1 ;
if ( mips - > mip [ mip ] . width < 1 & & mips - > mip [ mip ] . height < 1 )
break ;
if ( mips - > mip [ mip ] . width < 1 )
mips - > mip [ mip ] . width = 1 ;
if ( mips - > mip [ mip ] . height < 1 )
mips - > mip [ mip ] . height = 1 ;
mips - > mip [ mip ] . datasize = ( ( mips - > mip [ mip ] . width + 3 ) & ~ 3 ) * mips - > mip [ mip ] . height * 4 ;
mips - > mip [ mip ] . data = BZ_Malloc ( mips - > mip [ mip ] . datasize ) ;
mips - > mip [ mip ] . needfree = true ;
Image_MipMap8Pal ( mips - > mip [ mip - 1 ] . data , mips - > mip [ mip - 1 ] . width , mips - > mip [ mip - 1 ] . height , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height ) ;
mips - > mipcount = mip + 1 ;
}
2015-02-07 22:34:22 +00:00
return ;
2017-07-12 08:15:27 +00:00
case PTI_RGBA8_SRGB :
case PTI_RGBX8_SRGB :
case PTI_BGRA8_SRGB :
case PTI_BGRX8_SRGB :
2014-10-05 20:04:11 +00:00
case PTI_RGBA8 :
case PTI_RGBX8 :
case PTI_BGRA8 :
case PTI_BGRX8 :
2015-04-14 23:12:17 +00:00
for ( mip = mips - > mipcount ; mip < 32 ; mip + + )
2014-10-11 19:39:45 +00:00
{
mips - > mip [ mip ] . width = mips - > mip [ mip - 1 ] . width > > 1 ;
mips - > mip [ mip ] . height = mips - > mip [ mip - 1 ] . height > > 1 ;
if ( mips - > mip [ mip ] . width < 1 & & mips - > mip [ mip ] . height < 1 )
break ;
if ( mips - > mip [ mip ] . width < 1 )
mips - > mip [ mip ] . width = 1 ;
if ( mips - > mip [ mip ] . height < 1 )
mips - > mip [ mip ] . height = 1 ;
mips - > mip [ mip ] . datasize = ( ( mips - > mip [ mip ] . width + 3 ) & ~ 3 ) * mips - > mip [ mip ] . height * 4 ;
mips - > mip [ mip ] . data = BZ_Malloc ( mips - > mip [ mip ] . datasize ) ;
mips - > mip [ mip ] . needfree = true ;
Image_MipMap8888 ( mips - > mip [ mip - 1 ] . data , mips - > mip [ mip - 1 ] . width , mips - > mip [ mip - 1 ] . height , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height ) ;
mips - > mipcount = mip + 1 ;
}
2014-10-05 20:04:11 +00:00
break ;
2014-10-11 19:39:45 +00:00
case PTI_RGBA4444 :
case PTI_RGB565 :
case PTI_RGBA5551 :
return ; //convert to 16bit afterwards. always mipmap at 8 bit, to try to preserve what little precision there is.
2014-10-05 20:04:11 +00:00
default :
return ; //not supported.
}
}
//stolen from DP
static void Image_Resample32LerpLine ( const qbyte * in , qbyte * out , int inwidth , int outwidth )
{
int j , xi , oldx = 0 , f , fstep , endx , lerp ;
fstep = ( int ) ( inwidth * 65536.0f / outwidth ) ;
endx = ( inwidth - 1 ) ;
for ( j = 0 , f = 0 ; j < outwidth ; j + + , f + = fstep )
{
xi = f > > 16 ;
if ( xi ! = oldx )
{
in + = ( xi - oldx ) * 4 ;
oldx = xi ;
}
if ( xi < endx )
{
lerp = f & 0xFFFF ;
* out + + = ( qbyte ) ( ( ( ( in [ 4 ] - in [ 0 ] ) * lerp ) > > 16 ) + in [ 0 ] ) ;
* out + + = ( qbyte ) ( ( ( ( in [ 5 ] - in [ 1 ] ) * lerp ) > > 16 ) + in [ 1 ] ) ;
* out + + = ( qbyte ) ( ( ( ( in [ 6 ] - in [ 2 ] ) * lerp ) > > 16 ) + in [ 2 ] ) ;
* out + + = ( qbyte ) ( ( ( ( in [ 7 ] - in [ 3 ] ) * lerp ) > > 16 ) + in [ 3 ] ) ;
}
else // last pixel of the line has no pixel to lerp to
{
* out + + = in [ 0 ] ;
* out + + = in [ 1 ] ;
* out + + = in [ 2 ] ;
* out + + = in [ 3 ] ;
}
}
}
//yes, this is lordhavok's code too.
//superblur away!
# define LERPBYTE(i) r = row1[i];out[i] = (qbyte) ((((row2[i] - r) * lerp) >> 16) + r)
static void Image_Resample32Lerp ( const void * indata , int inwidth , int inheight , void * outdata , int outwidth , int outheight )
{
int i , j , r , yi , oldy , f , fstep , lerp , endy = ( inheight - 1 ) , inwidth4 = inwidth * 4 , outwidth4 = outwidth * 4 ;
qbyte * out ;
const qbyte * inrow ;
qbyte * tmem , * row1 , * row2 ;
tmem = row1 = BZ_Malloc ( 2 * ( outwidth * 4 ) ) ;
row2 = row1 + ( outwidth * 4 ) ;
out = outdata ;
fstep = ( int ) ( inheight * 65536.0f / outheight ) ;
inrow = indata ;
oldy = 0 ;
Image_Resample32LerpLine ( inrow , row1 , inwidth , outwidth ) ;
Image_Resample32LerpLine ( inrow + inwidth4 , row2 , inwidth , outwidth ) ;
for ( i = 0 , f = 0 ; i < outheight ; i + + , f + = fstep )
{
yi = f > > 16 ;
if ( yi < endy )
{
lerp = f & 0xFFFF ;
if ( yi ! = oldy )
{
inrow = ( qbyte * ) indata + inwidth4 * yi ;
if ( yi = = oldy + 1 )
memcpy ( row1 , row2 , outwidth4 ) ;
else
Image_Resample32LerpLine ( inrow , row1 , inwidth , outwidth ) ;
Image_Resample32LerpLine ( inrow + inwidth4 , row2 , inwidth , outwidth ) ;
oldy = yi ;
}
j = outwidth - 4 ;
while ( j > = 0 )
{
LERPBYTE ( 0 ) ;
LERPBYTE ( 1 ) ;
LERPBYTE ( 2 ) ;
LERPBYTE ( 3 ) ;
LERPBYTE ( 4 ) ;
LERPBYTE ( 5 ) ;
LERPBYTE ( 6 ) ;
LERPBYTE ( 7 ) ;
LERPBYTE ( 8 ) ;
LERPBYTE ( 9 ) ;
LERPBYTE ( 10 ) ;
LERPBYTE ( 11 ) ;
LERPBYTE ( 12 ) ;
LERPBYTE ( 13 ) ;
LERPBYTE ( 14 ) ;
LERPBYTE ( 15 ) ;
out + = 16 ;
row1 + = 16 ;
row2 + = 16 ;
j - = 4 ;
}
if ( j & 2 )
{
LERPBYTE ( 0 ) ;
LERPBYTE ( 1 ) ;
LERPBYTE ( 2 ) ;
LERPBYTE ( 3 ) ;
LERPBYTE ( 4 ) ;
LERPBYTE ( 5 ) ;
LERPBYTE ( 6 ) ;
LERPBYTE ( 7 ) ;
out + = 8 ;
row1 + = 8 ;
row2 + = 8 ;
}
if ( j & 1 )
{
LERPBYTE ( 0 ) ;
LERPBYTE ( 1 ) ;
LERPBYTE ( 2 ) ;
LERPBYTE ( 3 ) ;
out + = 4 ;
row1 + = 4 ;
row2 + = 4 ;
}
row1 - = outwidth4 ;
row2 - = outwidth4 ;
}
else
{
if ( yi ! = oldy )
{
inrow = ( qbyte * ) indata + inwidth4 * yi ;
if ( yi = = oldy + 1 )
memcpy ( row1 , row2 , outwidth4 ) ;
else
Image_Resample32LerpLine ( inrow , row1 , inwidth , outwidth ) ;
oldy = yi ;
}
memcpy ( out , row1 , outwidth4 ) ;
}
}
BZ_Free ( tmem ) ;
}
/*
= = = = = = = = = = = = = = = =
GL_ResampleTexture
= = = = = = = = = = = = = = = =
*/
void Image_ResampleTexture ( unsigned * in , int inwidth , int inheight , unsigned * out , int outwidth , int outheight )
{
int i , j ;
unsigned * inrow ;
unsigned frac , fracstep ;
if ( gl_lerpimages . ival )
{
Image_Resample32Lerp ( in , inwidth , inheight , out , outwidth , outheight ) ;
return ;
}
fracstep = inwidth * 0x10000 / outwidth ;
for ( i = 0 ; i < outheight ; i + + , out + = outwidth )
{
inrow = in + inwidth * ( i * inheight / outheight ) ;
frac = outwidth * fracstep ;
j = outwidth ;
while ( ( j ) & 3 )
{
j - - ;
frac - = fracstep ;
out [ j ] = inrow [ frac > > 16 ] ;
}
for ( ; j > = 4 ; )
{
j - = 4 ;
frac - = fracstep ;
out [ j + 3 ] = inrow [ frac > > 16 ] ;
frac - = fracstep ;
out [ j + 2 ] = inrow [ frac > > 16 ] ;
frac - = fracstep ;
out [ j + 1 ] = inrow [ frac > > 16 ] ;
frac - = fracstep ;
out [ j + 0 ] = inrow [ frac > > 16 ] ;
}
}
}
//ripped from tenebrae
2015-02-02 08:01:53 +00:00
static unsigned int * Image_GenerateNormalMap ( qbyte * pixels , unsigned int * nmap , int w , int h , float scale , float offsetscale )
2014-10-05 20:04:11 +00:00
{
int i , j , wr , hr ;
2015-02-02 08:01:53 +00:00
unsigned char r , g , b , height ;
2014-10-05 20:04:11 +00:00
float sqlen , reciplen , nx , ny , nz ;
const float oneOver255 = 1.0f / 255.0f ;
float c , cx , cy , dcx , dcy ;
wr = w ;
hr = h ;
for ( i = 0 ; i < h ; i + + )
{
for ( j = 0 ; j < w ; j + + )
{
/* Expand [0,255] texel values to the [0,1] range. */
c = pixels [ i * wr + j ] * oneOver255 ;
/* Expand the texel to its right. */
cx = pixels [ i * wr + ( j + 1 ) % wr ] * oneOver255 ;
/* Expand the texel one up. */
cy = pixels [ ( ( i + 1 ) % hr ) * wr + j ] * oneOver255 ;
dcx = scale * ( c - cx ) ;
dcy = scale * ( c - cy ) ;
/* Normalize the vector. */
sqlen = dcx * dcx + dcy * dcy + 1 ;
reciplen = 1.0f / ( float ) sqrt ( sqlen ) ;
nx = dcx * reciplen ;
ny = - dcy * reciplen ;
nz = reciplen ;
/* Repack the normalized vector into an RGB unsigned qbyte
vector in the normal map image . */
r = ( qbyte ) ( 128 + 127 * nx ) ;
g = ( qbyte ) ( 128 + 127 * ny ) ;
b = ( qbyte ) ( 128 + 127 * nz ) ;
/* The highest resolution mipmap level always has a
unit length magnitude . */
2015-02-02 08:01:53 +00:00
height = bound ( 0 , ( pixels [ i * wr + j ] * offsetscale ) + ( 255 * ( 1 - offsetscale ) ) , 255 ) ;
nmap [ i * w + j ] = LittleLong ( ( height < < 24 ) | ( b < < 16 ) | ( g < < 8 ) | ( r ) ) ; // <AWE> Added support for big endian.
2014-10-05 20:04:11 +00:00
}
}
return & nmap [ 0 ] ;
}
static void Image_RoundDimensions ( int * scaled_width , int * scaled_height , unsigned int flags )
{
2014-10-11 19:39:45 +00:00
if ( sh_config . texture_non_power_of_two ) //NPOT is a simple extension that relaxes errors.
2014-10-05 20:04:11 +00:00
{
//lax form
TRACE ( ( " dbg: GL_RoundDimensions: GL_ARB_texture_non_power_of_two \n " ) ) ;
}
2014-10-11 19:39:45 +00:00
else if ( ( flags & IF_CLAMP ) & & ( flags & IF_NOMIPMAP ) & & sh_config . texture_non_power_of_two_pic )
2014-10-05 20:04:11 +00:00
{
//more strict form
TRACE ( ( " dbg: GL_RoundDimensions: GL_OES_texture_npot \n " ) ) ;
}
else
{
int width = * scaled_width ;
int height = * scaled_height ;
for ( * scaled_width = 1 ; * scaled_width < width ; * scaled_width < < = 1 )
;
for ( * scaled_height = 1 ; * scaled_height < height ; * scaled_height < < = 1 )
;
/*round npot textures down if we're running on an embedded system*/
2014-10-11 19:39:45 +00:00
if ( sh_config . npot_rounddown )
2014-10-05 20:04:11 +00:00
{
if ( * scaled_width ! = width )
* scaled_width > > = 1 ;
if ( * scaled_height ! = height )
* scaled_height > > = 1 ;
}
}
2015-08-14 02:46:38 +00:00
if ( ! ( flags & IF_NOPICMIP ) )
2014-10-05 20:04:11 +00:00
{
2015-08-14 02:46:38 +00:00
if ( flags & IF_NOMIPMAP )
2015-07-06 14:47:46 +00:00
{
2015-08-14 02:46:38 +00:00
if ( gl_picmip2d . ival > 0 )
{
* scaled_width > > = gl_picmip2d . ival ;
* scaled_height > > = gl_picmip2d . ival ;
}
2015-07-06 14:47:46 +00:00
}
2015-08-14 02:46:38 +00:00
else
2015-07-06 14:47:46 +00:00
{
2015-08-14 02:46:38 +00:00
if ( gl_picmip . ival > 0 )
{
TRACE ( ( " dbg: GL_RoundDimensions: %f \n " , gl_picmip . value ) ) ;
* scaled_width > > = gl_picmip . ival ;
* scaled_height > > = gl_picmip . ival ;
}
2015-07-06 14:47:46 +00:00
}
2014-10-05 20:04:11 +00:00
}
TRACE ( ( " dbg: GL_RoundDimensions: %f \n " , gl_max_size . value ) ) ;
2014-10-11 19:39:45 +00:00
if ( sh_config . texture_maxsize )
2014-10-05 20:04:11 +00:00
{
2014-10-11 19:39:45 +00:00
if ( * scaled_width > sh_config . texture_maxsize )
* scaled_width = sh_config . texture_maxsize ;
if ( * scaled_height > sh_config . texture_maxsize )
* scaled_height = sh_config . texture_maxsize ;
2014-10-05 20:04:11 +00:00
}
2014-11-03 04:45:18 +00:00
if ( ! ( flags & ( IF_UIPIC | IF_RENDERTARGET ) ) )
2014-10-05 20:04:11 +00:00
{
if ( gl_max_size . value )
{
if ( * scaled_width > gl_max_size . value )
* scaled_width = gl_max_size . value ;
if ( * scaled_height > gl_max_size . value )
* scaled_height = gl_max_size . value ;
}
}
if ( * scaled_width < 1 )
* scaled_width = 1 ;
if ( * scaled_height < 1 )
* scaled_height = 1 ;
}
2014-10-11 19:39:45 +00:00
//may operate in place
static void Image_8888to565 ( qbyte * in , unsigned short * out , unsigned int w , unsigned int h , qboolean bgra )
{
unsigned int p = w * h ;
unsigned short tmp ;
if ( bgra )
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 3 ) < < 0 ) ; //b
tmp | = ( ( * in + + > > 2 ) < < 5 ) ; //g
tmp | = ( ( * in + + > > 3 ) < < 11 ) ; //r
in + + ;
* out + + = tmp ;
}
}
else
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 3 ) < < 11 ) ; //r
tmp | = ( ( * in + + > > 2 ) < < 5 ) ; //g
tmp | = ( ( * in + + > > 3 ) < < 0 ) ; //b
in + + ;
* out + + = tmp ;
}
}
}
//may operate in place
static void Image_8888to1555 ( qbyte * in , unsigned short * out , unsigned int w , unsigned int h , qboolean bgra )
{
unsigned int p = w * h ;
unsigned short tmp ;
if ( bgra )
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 3 ) < < 0 ) ; //b
tmp | = ( ( * in + + > > 3 ) < < 5 ) ; //g
tmp | = ( ( * in + + > > 3 ) < < 10 ) ; //r
tmp | = ( ( * in + + > > 7 ) < < 15 ) ; //a
* out + + = tmp ;
}
}
else
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 3 ) < < 10 ) ; //r
tmp | = ( ( * in + + > > 3 ) < < 5 ) ; //g
tmp | = ( ( * in + + > > 3 ) < < 0 ) ; //b
tmp | = ( ( * in + + > > 7 ) < < 15 ) ; //a
* out + + = tmp ;
}
}
}
//may operate in place
static void Image_8888to5551 ( qbyte * in , unsigned short * out , unsigned int w , unsigned int h , qboolean bgra )
{
unsigned int p = w * h ;
unsigned short tmp ;
if ( bgra )
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 3 ) < < 1 ) ; //b
tmp | = ( ( * in + + > > 3 ) < < 6 ) ; //g
tmp | = ( ( * in + + > > 3 ) < < 11 ) ; //r
tmp | = ( ( * in + + > > 7 ) < < 0 ) ; //a
* out + + = tmp ;
}
}
else
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 3 ) < < 11 ) ; //r
tmp | = ( ( * in + + > > 3 ) < < 6 ) ; //g
tmp | = ( ( * in + + > > 3 ) < < 1 ) ; //b
tmp | = ( ( * in + + > > 7 ) < < 0 ) ; //a
* out + + = tmp ;
}
}
}
//may operate in place
static void Image_8888to4444 ( qbyte * in , unsigned short * out , unsigned int w , unsigned int h , qboolean bgra )
{
unsigned int p = w * h ;
unsigned short tmp ;
if ( bgra )
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 4 ) < < 4 ) ; //b
tmp | = ( ( * in + + > > 4 ) < < 8 ) ; //g
tmp | = ( ( * in + + > > 4 ) < < 12 ) ; //r
tmp | = ( ( * in + + > > 4 ) < < 0 ) ; //a
* out + + = tmp ;
}
}
else
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 4 ) < < 12 ) ; //r
tmp | = ( ( * in + + > > 4 ) < < 8 ) ; //g
tmp | = ( ( * in + + > > 4 ) < < 4 ) ; //b
tmp | = ( ( * in + + > > 4 ) < < 0 ) ; //a
* out + + = tmp ;
}
}
}
//may operate in place
static void Image_8888toARGB4444 ( qbyte * in , unsigned short * out , unsigned int w , unsigned int h , qboolean bgra )
{
unsigned int p = w * h ;
unsigned short tmp ;
if ( bgra )
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 4 ) < < 0 ) ; //b
tmp | = ( ( * in + + > > 4 ) < < 4 ) ; //g
tmp | = ( ( * in + + > > 4 ) < < 8 ) ; //r
tmp | = ( ( * in + + > > 4 ) < < 12 ) ; //a
* out + + = tmp ;
}
}
else
{
while ( p - - > 0 )
{
tmp = ( ( * in + + > > 4 ) < < 8 ) ; //r
tmp | = ( ( * in + + > > 4 ) < < 4 ) ; //g
tmp | = ( ( * in + + > > 4 ) < < 0 ) ; //b
tmp | = ( ( * in + + > > 4 ) < < 12 ) ; //a
* out + + = tmp ;
}
}
}
2016-07-12 00:40:13 +00:00
//may operate in place
static void Image_8_BGR_RGB_Swap ( qbyte * data , unsigned int w , unsigned int h )
{
unsigned int p = w * h ;
qbyte tmp ;
while ( p - - > 0 )
{
tmp = data [ 0 ] ;
data [ 0 ] = data [ 2 ] ;
data [ 2 ] = tmp ;
data + = 4 ;
}
}
2016-11-25 08:14:54 +00:00
static void Image_ChangeFormat ( struct pendingtextureinfo * mips , unsigned int flags , uploadfmt_t origfmt )
2014-10-11 19:39:45 +00:00
{
int mip ;
if ( mips - > type ! = PTI_2D )
return ; //blurgh
2016-11-25 08:14:54 +00:00
if ( flags & IF_PALETTIZE )
{
if ( mips - > encoding = = PTI_RGBX8 )
{
mips - > encoding = PTI_R8 ;
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
{
unsigned int i ;
unsigned char * out ;
unsigned char * in ;
void * needfree = NULL ;
in = mips - > mip [ mip ] . data ;
if ( mips - > mip [ mip ] . needfree )
out = in ;
else
{
needfree = in ;
out = BZ_Malloc ( mips - > mip [ mip ] . width * mips - > mip [ mip ] . height * sizeof ( * out ) ) ;
mips - > mip [ mip ] . data = out ;
}
mips - > mip [ mip ] . datasize = mips - > mip [ mip ] . width * mips - > mip [ mip ] . height ;
mips - > mip [ mip ] . needfree = true ;
for ( i = 0 ; i < mips - > mip [ mip ] . width * mips - > mip [ mip ] . height ; i + + , in + = 4 )
out [ i ] = GetPaletteIndex ( in [ 0 ] , in [ 1 ] , in [ 2 ] ) ;
if ( needfree )
BZ_Free ( needfree ) ;
}
}
}
2014-10-11 19:39:45 +00:00
//if that format isn't supported/desired, try converting it.
2015-02-07 22:34:22 +00:00
if ( sh_config . texfmt [ mips - > encoding ] )
2014-10-11 19:39:45 +00:00
return ;
2015-02-07 22:34:22 +00:00
if ( mips - > encoding = = PTI_R8 )
{
if ( sh_config . texfmt [ PTI_BGRX8 ] ) //bgra8 is typically faster when supported.
mips - > encoding = PTI_BGRX8 ;
else if ( sh_config . texfmt [ PTI_BGRX8 ] )
mips - > encoding = PTI_RGBX8 ;
else if ( sh_config . texfmt [ PTI_BGRA8 ] )
mips - > encoding = PTI_BGRA8 ;
else
mips - > encoding = PTI_RGBA8 ;
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
{
unsigned int i ;
unsigned int * out ;
unsigned char * in ;
in = mips - > mip [ mip ] . data ;
out = BZ_Malloc ( mips - > mip [ mip ] . width * mips - > mip [ mip ] . height * sizeof ( * out ) ) ;
for ( i = 0 ; i < mips - > mip [ mip ] . width * mips - > mip [ mip ] . height ; i + + )
out [ i ] = in [ i ] * 0x01010101 ;
if ( mips - > mip [ mip ] . needfree )
BZ_Free ( in ) ;
mips - > mip [ mip ] . data = out ;
mips - > mip [ mip ] . needfree = true ;
mips - > mip [ mip ] . datasize = mips - > mip [ mip ] . width * mips - > mip [ mip ] . height * sizeof ( * out ) ;
}
if ( sh_config . texfmt [ mips - > encoding ] )
return ;
}
2016-07-12 00:40:13 +00:00
if ( ( mips - > encoding = = PTI_RGBX8 & & sh_config . texfmt [ PTI_BGRX8 ] ) | |
( mips - > encoding = = PTI_BGRX8 & & sh_config . texfmt [ PTI_RGBX8 ] ) | |
( mips - > encoding = = PTI_RGBA8 & & sh_config . texfmt [ PTI_BGRA8 ] ) | |
( mips - > encoding = = PTI_BGRA8 & & sh_config . texfmt [ PTI_RGBA8 ] ) )
{
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
Image_8_BGR_RGB_Swap ( mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height ) ;
if ( mips - > encoding = = PTI_RGBA8 )
mips - > encoding = PTI_BGRA8 ;
else if ( mips - > encoding = = PTI_BGRA8 )
mips - > encoding = PTI_RGBA8 ;
else if ( mips - > encoding = = PTI_RGBX8 )
mips - > encoding = PTI_BGRX8 ;
else // if (mips->encoding == PTI_BGRX8)
mips - > encoding = PTI_RGBX8 ;
}
2014-10-11 19:39:45 +00:00
//should we just use 5551 always?
2016-07-12 00:40:13 +00:00
else if ( mips - > encoding = = PTI_RGBX8 | | mips - > encoding = = PTI_BGRX8 )
2014-10-11 19:39:45 +00:00
{
/*if (0)
{ //prevent discolouration.
if ( sh_config . texfmt [ PTI_RGBA5551 ] )
{
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
Image_8888to5551 ( mips - > mip [ mip ] . data , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height , mips - > encoding = = PTI_BGRX8 ) ;
mips - > encoding = PTI_RGBA5551 ;
}
else
{
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
Image_8888to1555 ( mips - > mip [ mip ] . data , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height , mips - > encoding = = PTI_BGRX8 ) ;
mips - > encoding = PTI_ARGB1555 ;
}
}
else */
2015-02-07 22:34:22 +00:00
if ( sh_config . texfmt [ PTI_RGB565 ] )
2014-10-11 19:39:45 +00:00
{
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
Image_8888to565 ( mips - > mip [ mip ] . data , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height , mips - > encoding = = PTI_BGRX8 ) ;
mips - > encoding = PTI_RGB565 ;
}
}
else if ( mips - > encoding = = PTI_RGBA8 | | mips - > encoding = = PTI_BGRA8 )
{
if ( origfmt = = TF_TRANS8 | | origfmt = = TF_TRANS8_FULLBRIGHT | | origfmt = = TF_H2_TRANS8_0 | | ! ( sh_config . texfmt [ PTI_RGBA4444 ] | | sh_config . texfmt [ PTI_ARGB4444 ] ) )
{ //1-bit alpha is okay for these textures.
if ( sh_config . texfmt [ PTI_RGBA5551 ] )
{
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
Image_8888to5551 ( mips - > mip [ mip ] . data , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height , mips - > encoding = = PTI_BGRA8 ) ;
mips - > encoding = PTI_RGBA5551 ;
}
else
{
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
Image_8888to1555 ( mips - > mip [ mip ] . data , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height , mips - > encoding = = PTI_BGRA8 ) ;
mips - > encoding = PTI_ARGB1555 ;
}
}
else
{
if ( sh_config . texfmt [ PTI_RGBA4444 ] )
{
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
Image_8888to4444 ( mips - > mip [ mip ] . data , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height , mips - > encoding = = PTI_BGRA8 ) ;
mips - > encoding = PTI_RGBA4444 ;
}
else
{
for ( mip = 0 ; mip < mips - > mipcount ; mip + + )
Image_8888toARGB4444 ( mips - > mip [ mip ] . data , mips - > mip [ mip ] . data , mips - > mip [ mip ] . width , mips - > mip [ mip ] . height , mips - > encoding = = PTI_BGRA8 ) ;
mips - > encoding = PTI_ARGB4444 ;
}
}
}
}
2014-10-05 20:04:11 +00:00
//resamples and depalettes as required
static qboolean Image_GenMip0 ( struct pendingtextureinfo * mips , unsigned int flags , void * rawdata , void * palettedata , int imgwidth , int imgheight , uploadfmt_t fmt , qboolean freedata )
{
unsigned int * rgbadata = rawdata ;
int i ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
qboolean valid ;
2014-10-05 20:04:11 +00:00
mips - > mip [ 0 ] . width = imgwidth ;
mips - > mip [ 0 ] . height = imgheight ;
mips - > mipcount = 1 ;
switch ( fmt )
{
2014-10-14 16:42:48 +00:00
case TF_DEPTH16 :
mips - > encoding = PTI_DEPTH16 ;
break ;
case TF_DEPTH24 :
mips - > encoding = PTI_DEPTH24 ;
break ;
case TF_DEPTH32 :
mips - > encoding = PTI_DEPTH32 ;
break ;
case TF_RGBA16F :
case TF_RGBA32F :
if ( rawdata )
{
2015-04-14 23:12:17 +00:00
Con_Printf ( " R_LoadRawTexture: bad format \n " ) ;
2014-10-14 16:42:48 +00:00
if ( freedata )
BZ_Free ( rawdata ) ;
return false ;
}
2014-11-01 09:09:58 +00:00
mips - > encoding = ( fmt = = TF_RGBA16F ) ? PTI_RGBA16F : TF_RGBA32F ;
2014-10-14 16:42:48 +00:00
break ;
2014-10-05 20:04:11 +00:00
default :
case TF_INVALID :
2015-04-14 23:12:17 +00:00
Con_Printf ( " R_LoadRawTexture: bad format \n " ) ;
2014-10-05 20:04:11 +00:00
if ( freedata )
BZ_Free ( rawdata ) ;
return false ;
case TF_RGBX32 :
mips - > encoding = PTI_RGBX8 ;
break ;
case TF_RGBA32 :
mips - > encoding = PTI_RGBA8 ;
break ;
case TF_BGRX32 :
mips - > encoding = PTI_BGRX8 ;
break ;
case TF_BGRA32 :
mips - > encoding = PTI_BGRA8 ;
break ;
2015-04-14 23:12:17 +00:00
case TF_MIP4_LUM8 :
2016-12-09 09:09:12 +00:00
//8bit indexed data.
2015-04-14 23:12:17 +00:00
Image_RoundDimensions ( & mips - > mip [ 0 ] . width , & mips - > mip [ 0 ] . height , flags ) ;
2015-08-14 02:46:38 +00:00
flags | = IF_NOPICMIP ;
2016-11-25 08:14:54 +00:00
if ( /*!r_dodgymiptex.ival &&*/ mips - > mip [ 0 ] . width = = imgwidth & & mips - > mip [ 0 ] . height = = imgheight )
2015-04-14 23:12:17 +00:00
{
unsigned int pixels =
( imgwidth > > 0 ) * ( imgheight > > 0 ) +
( imgwidth > > 1 ) * ( imgheight > > 1 ) +
( imgwidth > > 2 ) * ( imgheight > > 2 ) +
( imgwidth > > 3 ) * ( imgheight > > 3 ) ;
mips - > encoding = PTI_R8 ;
rgbadata = BZ_Malloc ( pixels ) ;
memcpy ( rgbadata , rawdata , pixels ) ;
for ( i = 0 ; i < 4 ; i + + )
{
mips - > mip [ i ] . width = imgwidth > > i ;
mips - > mip [ i ] . height = imgheight > > i ;
mips - > mip [ i ] . datasize = mips - > mip [ i ] . width * mips - > mip [ i ] . height ;
mips - > mip [ i ] . needfree = false ;
}
mips - > mipcount = i ;
mips - > mip [ 0 ] . data = rgbadata ;
mips - > mip [ 1 ] . data = ( qbyte * ) mips - > mip [ 0 ] . data + mips - > mip [ 0 ] . datasize ;
mips - > mip [ 2 ] . data = ( qbyte * ) mips - > mip [ 1 ] . data + mips - > mip [ 1 ] . datasize ;
mips - > mip [ 3 ] . data = ( qbyte * ) mips - > mip [ 2 ] . data + mips - > mip [ 2 ] . datasize ;
mips - > extrafree = rgbadata ;
if ( freedata )
BZ_Free ( rawdata ) ;
return true ;
}
//fall through
2015-02-07 22:34:22 +00:00
case TF_LUM8 :
mips - > encoding = PTI_R8 ;
break ;
2015-04-14 23:12:17 +00:00
case TF_MIP4_SOLID8 :
//8bit opaque data
Image_RoundDimensions ( & mips - > mip [ 0 ] . width , & mips - > mip [ 0 ] . height , flags ) ;
2015-08-14 02:46:38 +00:00
flags | = IF_NOPICMIP ;
2016-12-09 09:09:12 +00:00
if ( ! r_dodgymiptex . ival & & mips - > mip [ 0 ] . width = = imgwidth & & mips - > mip [ 0 ] . height = = imgheight )
2016-07-12 00:40:13 +00:00
{ //special hack required to preserve the hand-drawn lower mips.
2015-04-14 23:12:17 +00:00
unsigned int pixels =
( imgwidth > > 0 ) * ( imgheight > > 0 ) +
( imgwidth > > 1 ) * ( imgheight > > 1 ) +
( imgwidth > > 2 ) * ( imgheight > > 2 ) +
( imgwidth > > 3 ) * ( imgheight > > 3 ) ;
mips - > encoding = PTI_RGBX8 ;
rgbadata = BZ_Malloc ( pixels * 4 ) ;
for ( i = 0 ; i < pixels ; i + + )
rgbadata [ i ] = d_8to24rgbtable [ ( ( qbyte * ) rawdata ) [ i ] ] ;
for ( i = 0 ; i < 4 ; i + + )
{
mips - > mip [ i ] . width = imgwidth > > i ;
mips - > mip [ i ] . height = imgheight > > i ;
mips - > mip [ i ] . datasize = mips - > mip [ i ] . width * mips - > mip [ i ] . height * 4 ;
mips - > mip [ i ] . needfree = false ;
}
mips - > mipcount = i ;
mips - > mip [ 0 ] . data = rgbadata ;
mips - > mip [ 1 ] . data = ( qbyte * ) mips - > mip [ 0 ] . data + mips - > mip [ 0 ] . datasize ;
mips - > mip [ 2 ] . data = ( qbyte * ) mips - > mip [ 1 ] . data + mips - > mip [ 1 ] . datasize ;
mips - > mip [ 3 ] . data = ( qbyte * ) mips - > mip [ 2 ] . data + mips - > mip [ 2 ] . datasize ;
mips - > extrafree = rgbadata ;
if ( freedata )
BZ_Free ( rawdata ) ;
return true ;
}
//fall through
2014-10-05 20:04:11 +00:00
case TF_SOLID8 :
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
2014-10-11 19:39:45 +00:00
if ( sh_config . texfmt [ PTI_BGRX8 ] )
{ //bgra8 is typically faster when supported.
mips - > encoding = PTI_BGRX8 ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
rgbadata [ i ] = d_8to24bgrtable [ ( ( qbyte * ) rawdata ) [ i ] ] ;
2014-10-05 20:04:11 +00:00
}
2014-10-11 19:39:45 +00:00
else
2014-10-05 20:04:11 +00:00
{
2014-10-11 19:39:45 +00:00
mips - > encoding = PTI_RGBX8 ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
2014-10-05 20:04:11 +00:00
rgbadata [ i ] = d_8to24rgbtable [ ( ( qbyte * ) rawdata ) [ i ] ] ;
}
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
break ;
case TF_TRANS8 :
2016-02-10 23:23:43 +00:00
{
mips - > encoding = PTI_RGBX8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
{
if ( ( ( qbyte * ) rawdata ) [ i ] = = 0xff )
{ //fixme: blend non-0xff neighbours. no, just use premultiplied alpha instead, where it matters.
rgbadata [ i ] = 0 ;
mips - > encoding = PTI_RGBA8 ;
}
else
rgbadata [ i ] = d_8to24rgbtable [ ( ( qbyte * ) rawdata ) [ i ] ] ;
}
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
}
break ;
2014-10-11 19:39:45 +00:00
case TF_H2_TRANS8_0 :
2014-10-05 20:04:11 +00:00
{
2014-10-11 19:39:45 +00:00
mips - > encoding = PTI_RGBX8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
2014-10-05 20:04:11 +00:00
{
2016-02-10 23:23:43 +00:00
if ( ( ( qbyte * ) rawdata ) [ i ] = = 0xff | | ( ( qbyte * ) rawdata ) [ i ] = = 0 )
2014-10-11 19:39:45 +00:00
{ //fixme: blend non-0xff neighbours. no, just use premultiplied alpha instead, where it matters.
rgbadata [ i ] = 0 ;
mips - > encoding = PTI_RGBA8 ;
}
else
rgbadata [ i ] = d_8to24rgbtable [ ( ( qbyte * ) rawdata ) [ i ] ] ;
2014-10-05 20:04:11 +00:00
}
2014-10-11 19:39:45 +00:00
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
2014-10-05 20:04:11 +00:00
}
break ;
case TF_TRANS8_FULLBRIGHT :
mips - > encoding = PTI_RGBA8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
for ( i = 0 , valid = false ; i < imgwidth * imgheight ; i + + )
2014-10-05 20:04:11 +00:00
{
2015-12-28 17:41:39 +00:00
if ( ( ( qbyte * ) rawdata ) [ i ] = = 255 | | ( ( qbyte * ) rawdata ) [ i ] < 256 - vid . fullbright )
2014-10-05 20:04:11 +00:00
rgbadata [ i ] = 0 ;
else
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
{
2014-10-05 20:04:11 +00:00
rgbadata [ i ] = d_8to24rgbtable [ ( ( qbyte * ) rawdata ) [ i ] ] ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
valid = true ;
}
2014-10-05 20:04:11 +00:00
}
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
if ( ! valid )
{
BZ_Free ( rgbadata ) ;
return false ;
}
2014-10-05 20:04:11 +00:00
break ;
case TF_HEIGHT8PAL :
mips - > encoding = PTI_RGBA8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 5 ) ;
{
qbyte * heights = ( qbyte * ) ( rgbadata + ( imgwidth * imgheight ) ) ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
{
unsigned int rgb = d_8to24rgbtable [ ( ( qbyte * ) rawdata ) [ i ] ] ;
heights [ i ] = ( ( ( rgb > > 16 ) & 0xff ) + ( ( rgb > > 8 ) & 0xff ) + ( ( rgb > > 0 ) & 0xff ) ) / 3 ;
}
2015-02-02 08:01:53 +00:00
Image_GenerateNormalMap ( heights , rgbadata , imgwidth , imgheight , r_shadow_bumpscale_basetexture . value ? r_shadow_bumpscale_basetexture . value : 4 , r_shadow_heightscale_basetexture . value ) ;
2014-10-05 20:04:11 +00:00
}
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
break ;
case TF_HEIGHT8 :
mips - > encoding = PTI_RGBA8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
2015-02-02 08:01:53 +00:00
Image_GenerateNormalMap ( rawdata , rgbadata , imgwidth , imgheight , r_shadow_bumpscale_bumpmap . value , r_shadow_heightscale_bumpmap . value ) ;
2014-10-05 20:04:11 +00:00
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
break ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
case TF_BGR24_FLIP :
mips - > encoding = PTI_RGBX8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
for ( i = 0 ; i < imgheight ; i + + )
{
int x ;
qbyte * in = ( qbyte * ) rawdata + ( imgheight - i - 1 ) * imgwidth * 3 ;
qbyte * out = ( qbyte * ) rgbadata + i * imgwidth * 4 ;
for ( x = 0 ; x < imgwidth ; x + + , in + = 3 , out + = 4 )
{
out [ 0 ] = in [ 2 ] ;
out [ 1 ] = in [ 1 ] ;
out [ 2 ] = in [ 0 ] ;
out [ 3 ] = 0xff ;
}
}
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
break ;
2016-12-09 09:09:12 +00:00
case TF_MIP4_8PAL24_T255 :
2015-10-11 11:34:58 +00:00
case TF_MIP4_8PAL24 :
//8bit opaque data
{
unsigned int pixels =
( imgwidth > > 0 ) * ( imgheight > > 0 ) +
( imgwidth > > 1 ) * ( imgheight > > 1 ) +
( imgwidth > > 2 ) * ( imgheight > > 2 ) +
( imgwidth > > 3 ) * ( imgheight > > 3 ) ;
palettedata = ( qbyte * ) rawdata + pixels ;
Image_RoundDimensions ( & mips - > mip [ 0 ] . width , & mips - > mip [ 0 ] . height , flags ) ;
flags | = IF_NOPICMIP ;
2016-12-09 09:09:12 +00:00
if ( ! r_dodgymiptex . ival & & mips - > mip [ 0 ] . width = = imgwidth & & mips - > mip [ 0 ] . height = = imgheight )
2015-10-11 11:34:58 +00:00
{
unsigned int pixels =
( imgwidth > > 0 ) * ( imgheight > > 0 ) +
( imgwidth > > 1 ) * ( imgheight > > 1 ) +
( imgwidth > > 2 ) * ( imgheight > > 2 ) +
( imgwidth > > 3 ) * ( imgheight > > 3 ) ;
rgbadata = BZ_Malloc ( pixels * 4 ) ;
2016-12-09 09:09:12 +00:00
if ( fmt = = TF_MIP4_8PAL24_T255 )
2015-10-11 11:34:58 +00:00
{
2016-12-09 09:09:12 +00:00
mips - > encoding = PTI_RGBA8 ;
for ( i = 0 ; i < pixels ; i + + )
{
qbyte idx = ( ( qbyte * ) rawdata ) [ i ] ;
if ( idx = = 255 )
rgbadata [ i ] = 0 ;
else
{
qbyte * p = ( ( qbyte * ) palettedata ) + idx * 3 ;
rgbadata [ i ] = 0xff000000 | ( p [ 0 ] < < 0 ) | ( p [ 1 ] < < 8 ) | ( p [ 2 ] < < 16 ) ; //FIXME: endian
}
}
}
else
{
mips - > encoding = PTI_RGBX8 ;
for ( i = 0 ; i < pixels ; i + + )
{
qbyte * p = ( ( qbyte * ) palettedata ) + ( ( qbyte * ) rawdata ) [ i ] * 3 ;
//FIXME: endian
rgbadata [ i ] = 0xff000000 | ( p [ 0 ] < < 0 ) | ( p [ 1 ] < < 8 ) | ( p [ 2 ] < < 16 ) ;
}
2015-10-11 11:34:58 +00:00
}
for ( i = 0 ; i < 4 ; i + + )
{
mips - > mip [ i ] . width = imgwidth > > i ;
mips - > mip [ i ] . height = imgheight > > i ;
mips - > mip [ i ] . datasize = mips - > mip [ i ] . width * mips - > mip [ i ] . height * 4 ;
mips - > mip [ i ] . needfree = false ;
}
mips - > mipcount = i ;
mips - > mip [ 0 ] . data = rgbadata ;
mips - > mip [ 1 ] . data = ( qbyte * ) mips - > mip [ 0 ] . data + mips - > mip [ 0 ] . datasize ;
mips - > mip [ 2 ] . data = ( qbyte * ) mips - > mip [ 1 ] . data + mips - > mip [ 1 ] . datasize ;
mips - > mip [ 3 ] . data = ( qbyte * ) mips - > mip [ 2 ] . data + mips - > mip [ 2 ] . datasize ;
mips - > extrafree = rgbadata ;
if ( freedata )
BZ_Free ( rawdata ) ;
return true ;
}
}
//fall through
2014-10-05 20:04:11 +00:00
case TF_8PAL24 :
if ( ! palettedata )
{
Con_Printf ( " TF_8PAL24: no palette " ) ;
if ( freedata )
BZ_Free ( rawdata ) ;
return false ;
}
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
2016-12-09 09:09:12 +00:00
if ( fmt = = TF_MIP4_8PAL24_T255 )
2014-10-05 20:04:11 +00:00
{
2016-12-09 09:09:12 +00:00
mips - > encoding = PTI_RGBA8 ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
{
qbyte idx = ( ( qbyte * ) rawdata ) [ i ] ;
if ( idx = = 255 )
rgbadata [ i ] = 0 ;
else
{
qbyte * p = ( ( qbyte * ) palettedata ) + idx * 3 ;
rgbadata [ i ] = 0xff000000 | ( p [ 0 ] < < 0 ) | ( p [ 1 ] < < 8 ) | ( p [ 2 ] < < 16 ) ; //FIXME: endian
}
}
}
else
{
mips - > encoding = PTI_RGBX8 ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
{
qbyte * p = ( ( qbyte * ) palettedata ) + ( ( qbyte * ) rawdata ) [ i ] * 3 ;
//FIXME: endian
rgbadata [ i ] = 0xff000000 | ( p [ 0 ] < < 0 ) | ( p [ 1 ] < < 8 ) | ( p [ 2 ] < < 16 ) ;
}
2014-10-05 20:04:11 +00:00
}
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
break ;
case TF_8PAL32 :
2015-02-02 08:01:53 +00:00
if ( ! palettedata )
2014-10-05 20:04:11 +00:00
{
2015-02-02 08:01:53 +00:00
Con_Printf ( " TF_8PAL32: no palette " ) ;
2014-10-05 20:04:11 +00:00
if ( freedata )
BZ_Free ( rawdata ) ;
return false ;
}
mips - > encoding = PTI_RGBA8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
rgbadata [ i ] = ( ( unsigned int * ) palettedata ) [ ( ( qbyte * ) rawdata ) [ i ] ] ;
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
break ;
2014-10-11 19:39:45 +00:00
# ifdef HEXEN2
2014-10-05 20:04:11 +00:00
case TF_H2_T7G1 : /*8bit data, odd indexes give greyscale transparence*/
mips - > encoding = PTI_RGBA8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
{
qbyte p = ( ( qbyte * ) rawdata ) [ i ] ;
rgbadata [ i ] = d_8to24rgbtable [ p ] & 0x00ffffff ;
if ( p = = 0 )
;
else if ( p & 1 )
rgbadata [ i ] | = 0x80000000 ;
else
rgbadata [ i ] | = 0xff000000 ;
}
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
break ;
2014-10-11 19:39:45 +00:00
case TF_H2_T4A4 : /*8bit data, weird packing*/
mips - > encoding = PTI_RGBA8 ;
rgbadata = BZ_Malloc ( imgwidth * imgheight * 4 ) ;
for ( i = 0 ; i < imgwidth * imgheight ; i + + )
{
static const int ColorIndex [ 16 ] = { 0 , 31 , 47 , 63 , 79 , 95 , 111 , 127 , 143 , 159 , 175 , 191 , 199 , 207 , 223 , 231 } ;
static const unsigned ColorPercent [ 16 ] = { 25 , 51 , 76 , 102 , 114 , 127 , 140 , 153 , 165 , 178 , 191 , 204 , 216 , 229 , 237 , 247 } ;
qbyte p = ( ( qbyte * ) rawdata ) [ i ] ;
rgbadata [ i ] = d_8to24rgbtable [ ColorIndex [ p > > 4 ] ] & 0x00ffffff ;
rgbadata [ i ] | = ( int ) ColorPercent [ p & 15 ] < < 24 ;
}
if ( freedata )
BZ_Free ( rawdata ) ;
freedata = true ;
break ;
# endif
2014-10-05 20:04:11 +00:00
}
if ( flags & IF_NOALPHA )
{
switch ( mips - > encoding )
{
case PTI_RGBA8 :
mips - > encoding = PTI_RGBX8 ;
break ;
case PTI_BGRA8 :
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
mips - > encoding = PTI_BGRX8 ;
2014-10-05 20:04:11 +00:00
break ;
2017-07-28 01:49:25 +00:00
case PTI_RGBA8_SRGB :
mips - > encoding = PTI_RGBX8_SRGB ;
break ;
case PTI_BGRA8_SRGB :
mips - > encoding = PTI_BGRX8_SRGB ;
break ;
2014-12-11 16:26:26 +00:00
case PTI_RGBA16F :
case PTI_RGBA32F :
case PTI_ARGB4444 :
case PTI_ARGB1555 :
2014-10-11 19:39:45 +00:00
case PTI_RGBA4444 :
case PTI_RGBA5551 :
break ; //erk
2014-10-05 20:04:11 +00:00
case PTI_S3RGBA1 : //mostly compatible, but I don't want to push it.
case PTI_S3RGBA3 :
case PTI_S3RGBA5 :
2015-05-03 19:57:46 +00:00
case PTI_WHOLEFILE :
2014-10-05 20:04:11 +00:00
//erk. meh.
break ;
2015-05-03 19:57:46 +00:00
case PTI_R8 :
case PTI_RG8 :
2014-10-11 19:39:45 +00:00
case PTI_RGB565 :
2014-10-05 20:04:11 +00:00
case PTI_RGBX8 :
case PTI_BGRX8 :
2017-07-28 01:49:25 +00:00
case PTI_RGBX8_SRGB :
case PTI_BGRX8_SRGB :
2014-10-05 20:04:11 +00:00
case PTI_S3RGB1 :
2015-05-03 19:57:46 +00:00
break ; //already no alpha in these formats
2014-10-11 19:39:45 +00:00
case PTI_DEPTH16 :
case PTI_DEPTH24 :
case PTI_DEPTH32 :
case PTI_DEPTH24_8 :
break ;
2015-05-03 19:57:46 +00:00
case PTI_MAX : break ; //stfu
2014-10-05 20:04:11 +00:00
}
//FIXME: fill alpha channel with 255?
}
2017-07-12 08:15:27 +00:00
if ( vid . srgb /*&& (flags & IF_SRGB)*/ & & ! ( flags & IF_NOSRGB ) )
{ //most modern editors write srgb images.
//however, that might not be supported.
int nf = PTI_MAX ;
switch ( mips - > encoding )
{
case PTI_RGBA8 : nf = PTI_RGBA8_SRGB ; break ;
case PTI_RGBX8 : nf = PTI_RGBX8_SRGB ; break ;
case PTI_BGRA8 : nf = PTI_BGRA8_SRGB ; break ;
case PTI_BGRX8 : nf = PTI_BGRX8_SRGB ; break ;
default :
if ( freedata )
BZ_Free ( rgbadata ) ;
return false ;
}
if ( sh_config . texfmt [ nf ] )
mips - > encoding = nf ;
else
{ //srgb->linear
int m = mips - > mip [ 0 ] . width * mips - > mip [ 0 ] . height * 4 ;
if ( mips - > type = = PTI_3D )
m * = mips - > mip [ 0 ] . height ;
for ( i = 0 ; i < m ; i + = 4 )
{
( ( qbyte * ) rgbadata ) [ i + 0 ] = 255 * Image_LinearFloatFromsRGBFloat ( ( ( qbyte * ) rgbadata ) [ i + 0 ] * ( 1.0 / 255 ) ) ;
( ( qbyte * ) rgbadata ) [ i + 1 ] = 255 * Image_LinearFloatFromsRGBFloat ( ( ( qbyte * ) rgbadata ) [ i + 1 ] * ( 1.0 / 255 ) ) ;
( ( qbyte * ) rgbadata ) [ i + 2 ] = 255 * Image_LinearFloatFromsRGBFloat ( ( ( qbyte * ) rgbadata ) [ i + 2 ] * ( 1.0 / 255 ) ) ;
}
}
}
2014-10-05 20:04:11 +00:00
2014-10-11 22:54:38 +00:00
Image_RoundDimensions ( & mips - > mip [ 0 ] . width , & mips - > mip [ 0 ] . height , flags ) ;
2014-10-11 22:53:26 +00:00
if ( rgbadata )
2014-10-05 20:04:11 +00:00
{
2014-10-11 22:53:26 +00:00
if ( mips - > mip [ 0 ] . width = = imgwidth & & mips - > mip [ 0 ] . height = = imgheight )
mips - > mip [ 0 ] . data = rgbadata ;
else
{
mips - > mip [ 0 ] . data = BZ_Malloc ( ( ( mips - > mip [ 0 ] . width + 3 ) & ~ 3 ) * mips - > mip [ 0 ] . height * 4 ) ;
2017-07-12 08:15:27 +00:00
//FIXME: should be sRGB-aware, but probably not a common path on hardware that can actually do srgb.
2014-10-11 22:53:26 +00:00
Image_ResampleTexture ( rgbadata , imgwidth , imgheight , mips - > mip [ 0 ] . data , mips - > mip [ 0 ] . width , mips - > mip [ 0 ] . height ) ;
if ( freedata )
BZ_Free ( rgbadata ) ;
freedata = true ;
}
2014-10-05 20:04:11 +00:00
}
2014-10-11 22:53:26 +00:00
else
mips - > mip [ 0 ] . data = NULL ;
2014-10-05 20:04:11 +00:00
mips - > mip [ 0 ] . datasize = mips - > mip [ 0 ] . width * mips - > mip [ 0 ] . height * 4 ;
if ( mips - > type = = PTI_3D )
{
qbyte * data2d = mips - > mip [ 0 ] . data , * data3d ;
mips - > mip [ 0 ] . data = NULL ;
/*our 2d input image is interlaced as y0z0,y0z1,y1z0,y1z1
however , hardware uses the more logical y0z0 , y1z0 , y0z1 , y1z1 ordering ( xis ordered properly already ) */
if ( mips - > mip [ 0 ] . height * mips - > mip [ 0 ] . height = = mips - > mip [ 0 ] . width & & ( mips - > encoding = = PTI_RGBA8 | | mips - > encoding = = PTI_RGBX8 | | mips - > encoding = = PTI_BGRA8 | | mips - > encoding = = PTI_BGRX8 ) )
{
int d , r ;
int size = mips - > mip [ 0 ] . height ;
mips - > mip [ 0 ] . data = data3d = BZ_Malloc ( size * size * size ) ;
for ( d = 0 ; d < size ; d + + )
for ( r = 0 ; r < size ; r + + )
memcpy ( data3d + ( r + d * size ) * size , data2d + ( r * size + d ) * size , size * 4 ) ;
mips - > mip [ 0 ] . datasize = size * size * size * 4 ;
}
if ( freedata )
BZ_Free ( data2d ) ;
if ( ! mips - > mip [ 0 ] . data )
return false ;
}
if ( flags & IF_PREMULTIPLYALPHA )
{
//works for rgba or bgra
int i ;
unsigned char * fte_restrict premul = ( unsigned char * ) mips - > mip [ 0 ] . data ;
for ( i = 0 ; i < mips - > mip [ 0 ] . width * mips - > mip [ 0 ] . height ; i + + , premul + = 4 )
{
premul [ 0 ] = ( premul [ 0 ] * premul [ 3 ] ) > > 8 ;
premul [ 1 ] = ( premul [ 1 ] * premul [ 3 ] ) > > 8 ;
premul [ 2 ] = ( premul [ 2 ] * premul [ 3 ] ) > > 8 ;
}
}
mips - > mip [ 0 ] . needfree = freedata ;
return true ;
}
//loads from a single mip. takes ownership of the data.
2015-02-02 08:01:53 +00:00
static qboolean Image_LoadRawTexture ( texid_t tex , unsigned int flags , void * rawdata , void * palettedata , int imgwidth , int imgheight , uploadfmt_t fmt )
2014-10-05 20:04:11 +00:00
{
struct pendingtextureinfo * mips ;
mips = Z_Malloc ( sizeof ( * mips ) ) ;
mips - > type = ( flags & IF_3DMAP ) ? PTI_3D : PTI_2D ;
2015-02-02 08:01:53 +00:00
if ( ! Image_GenMip0 ( mips , flags , rawdata , palettedata , imgwidth , imgheight , fmt , true ) )
2014-10-05 20:04:11 +00:00
{
Z_Free ( mips ) ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
if ( flags & IF_NOWORKER )
Image_LoadTexture_Failed ( tex , NULL , 0 , 0 ) ;
else
2016-02-15 06:01:17 +00:00
COM_AddWork ( WG_MAIN , Image_LoadTexture_Failed , tex , NULL , 0 , 0 ) ;
2014-10-05 20:04:11 +00:00
return false ;
}
Image_GenerateMips ( mips , flags ) ;
2016-11-25 08:14:54 +00:00
Image_ChangeFormat ( mips , flags , fmt ) ;
2014-10-05 20:04:11 +00:00
tex - > width = imgwidth ;
tex - > height = imgheight ;
2017-07-28 01:49:25 +00:00
//d3d9 needs to reconfigure samplers depending on whether the data is srgb or not.
2017-07-12 08:15:27 +00:00
tex - > flags & = ~ IF_SRGB ;
switch ( mips - > encoding )
{
case PTI_RGBA8_SRGB :
case PTI_RGBX8_SRGB :
case PTI_BGRA8_SRGB :
case PTI_BGRX8_SRGB :
tex - > flags | = IF_SRGB ;
break ;
2017-07-28 01:49:25 +00:00
default :
break ;
2017-07-12 08:15:27 +00:00
}
2014-10-05 20:04:11 +00:00
if ( flags & IF_NOWORKER )
Image_LoadTextureMips ( tex , mips , 0 , 0 ) ;
else
2016-02-15 06:01:17 +00:00
COM_AddWork ( WG_MAIN , Image_LoadTextureMips , tex , mips , 0 , 0 ) ;
2014-10-05 20:04:11 +00:00
return true ;
}
//always frees filedata, even on failure.
//also frees the textures fallback data, but only on success
qboolean Image_LoadTextureFromMemory ( texid_t tex , int flags , const char * iname , char * fname , qbyte * filedata , int filesize )
2014-02-07 08:38:40 +00:00
{
qboolean hasalpha ;
qbyte * rgbadata ;
2014-10-05 20:04:11 +00:00
int imgwidth , imgheight ;
2014-02-07 08:38:40 +00:00
//these formats have special handling, because they cannot be implemented via Read32BitImageFile - they don't result in rgba images.
# ifdef IMAGEFMT_DDS
2014-10-05 20:04:11 +00:00
if ( Image_ReadDDSFile ( tex , flags , fname , filedata , filesize ) )
2014-02-07 08:38:40 +00:00
return true ;
# endif
# ifdef IMAGEFMT_BLP
if ( filedata [ 0 ] = = ' B ' & & filedata [ 1 ] = = ' L ' & & filedata [ 2 ] = = ' P ' & & filedata [ 3 ] = = ' 2 ' )
{
2014-10-05 20:04:11 +00:00
if ( Image_ReadBLPFile ( tex , flags , fname , filedata , filesize ) )
2014-02-07 08:38:40 +00:00
return true ;
}
# endif
hasalpha = false ;
2014-10-05 20:04:11 +00:00
if ( ( rgbadata = Read32BitImageFile ( filedata , filesize , & imgwidth , & imgheight , & hasalpha , fname ) ) )
2014-02-07 08:38:40 +00:00
{
extern cvar_t vid_hardwaregamma ;
if ( ! ( flags & IF_NOGAMMA ) & & ! vid_hardwaregamma . value )
2014-10-05 20:04:11 +00:00
BoostGamma ( rgbadata , imgwidth , imgheight ) ;
2014-02-07 08:38:40 +00:00
2014-05-30 15:47:04 +00:00
if ( hasalpha )
2014-02-07 08:38:40 +00:00
flags & = ~ IF_NOALPHA ;
else if ( ! ( flags & IF_NOALPHA ) )
{
unsigned int alpha_width , alpha_height , p ;
char aname [ MAX_QPATH ] ;
unsigned char * alphadata ;
char * alph ;
2014-10-05 20:04:11 +00:00
size_t alphsize ;
char ext [ 8 ] ;
2014-02-07 08:38:40 +00:00
COM_StripExtension ( fname , aname , sizeof ( aname ) ) ;
2014-10-05 20:04:11 +00:00
COM_FileExtension ( fname , ext , sizeof ( ext ) ) ;
2014-05-30 15:47:04 +00:00
Q_strncatz ( aname , " _alpha. " , sizeof ( aname ) ) ;
2014-10-05 20:04:11 +00:00
Q_strncatz ( aname , ext , sizeof ( aname ) ) ;
2015-04-21 04:12:00 +00:00
if ( ! strchr ( aname , ' : ' ) & & ( alph = COM_LoadFile ( aname , 5 , & alphsize ) ) )
2014-02-07 08:38:40 +00:00
{
2014-10-05 20:04:11 +00:00
if ( ( alphadata = Read32BitImageFile ( alph , alphsize , & alpha_width , & alpha_height , & hasalpha , aname ) ) )
2014-02-07 08:38:40 +00:00
{
2014-10-05 20:04:11 +00:00
if ( alpha_width = = imgwidth & & alpha_height = = imgheight )
2014-02-07 08:38:40 +00:00
{
for ( p = 0 ; p < alpha_width * alpha_height ; p + + )
{
rgbadata [ ( p < < 2 ) + 3 ] = ( alphadata [ ( p < < 2 ) + 0 ] + alphadata [ ( p < < 2 ) + 1 ] + alphadata [ ( p < < 2 ) + 2 ] ) / 3 ;
}
}
BZ_Free ( alphadata ) ;
}
BZ_Free ( alph ) ;
}
}
2015-02-02 08:01:53 +00:00
if ( Image_LoadRawTexture ( tex , flags , rgbadata , NULL , imgwidth , imgheight , TF_RGBA32 ) )
2014-10-05 20:04:11 +00:00
{
BZ_Free ( filedata ) ;
2014-02-07 08:38:40 +00:00
2014-10-05 20:04:11 +00:00
//and kill the fallback now that its loaded, as it won't be needed any more.
BZ_Free ( tex - > fallbackdata ) ;
tex - > fallbackdata = NULL ;
return true ;
}
2014-02-07 08:38:40 +00:00
BZ_Free ( rgbadata ) ;
}
2015-04-21 04:12:00 +00:00
# ifdef FTE_TARGET_WEB
else if ( 1 )
{
struct pendingtextureinfo * mips ;
mips = Z_Malloc ( sizeof ( * mips ) ) ;
mips - > type = ( flags & IF_3DMAP ) ? PTI_3D : PTI_2D ;
mips - > mipcount = 1 ;
mips - > encoding = PTI_WHOLEFILE ;
mips - > extrafree = NULL ;
mips - > mip [ 0 ] . width = 1 ;
mips - > mip [ 0 ] . height = 1 ;
mips - > mip [ 0 ] . data = filedata ;
mips - > mip [ 0 ] . datasize = filesize ;
mips - > mip [ 0 ] . needfree = true ;
//width+height are not yet known. bah.
if ( flags & IF_NOWORKER )
Image_LoadTextureMips ( tex , mips , 0 , 0 ) ;
else
2016-02-15 06:01:17 +00:00
COM_AddWork ( WG_MAIN , Image_LoadTextureMips , tex , mips , 0 , 0 ) ;
2015-04-21 04:12:00 +00:00
return true ;
}
# endif
2014-02-07 08:38:40 +00:00
else
2017-04-10 07:52:18 +00:00
Con_Printf ( " Unable to read file %s (format unsupported) \n " , fname ) ;
2014-10-05 20:04:11 +00:00
BZ_Free ( filedata ) ;
2014-02-07 08:38:40 +00:00
return false ;
}
2014-10-05 20:04:11 +00:00
2017-08-29 02:29:06 +00:00
struct pendingtextureinfo * Image_LoadCubemapTextureData ( const char * nicename , char * subpath , unsigned int texflags )
2004-08-23 00:15:46 +00:00
{
2014-10-05 20:04:11 +00:00
static struct
{
char * suffix ;
qboolean flipx , flipy , flipd ;
} cmscheme [ ] =
{
{ " rt " , true , false , true } ,
{ " lf " , false , true , true } ,
{ " ft " , true , true , false } ,
{ " bk " , false , false , false } ,
{ " up " , true , false , true } ,
{ " dn " , true , false , true } ,
{ " px " , false , false , false } ,
{ " nx " , false , false , false } ,
{ " py " , false , false , false } ,
{ " ny " , false , false , false } ,
{ " pz " , false , false , false } ,
{ " nz " , false , false , false } ,
{ " posx " , false , false , false } ,
{ " negx " , false , false , false } ,
{ " posy " , false , false , false } ,
{ " negy " , false , false , false } ,
{ " posz " , false , false , false } ,
{ " negz " , false , false , false }
} ;
int i , j , e ;
struct pendingtextureinfo * mips ;
char fname [ MAX_QPATH ] ;
size_t filesize ;
int width , height ;
2012-02-12 05:18:31 +00:00
qboolean hasalpha ;
2017-08-29 02:29:06 +00:00
char * nextprefix , * prefixend ;
size_t prefixlen ;
2014-10-05 20:04:11 +00:00
mips = Z_Malloc ( sizeof ( * mips ) ) ;
mips - > type = PTI_CUBEMAP ;
mips - > mipcount = 6 ;
mips - > encoding = PTI_RGBA8 ;
mips - > extrafree = NULL ;
2004-08-23 00:15:46 +00:00
2014-10-05 20:04:11 +00:00
for ( i = 0 ; i < 6 ; i + + )
{
2017-08-29 02:29:06 +00:00
prefixlen = 0 ;
nextprefix = subpath ;
for ( ; ; )
2014-10-05 20:04:11 +00:00
{
2017-08-29 02:29:06 +00:00
for ( e = ( texflags & IF_EXACTEXTENSION ) ? tex_extensions_count - 1 : 0 ; e < tex_extensions_count ; e + + )
2014-10-05 20:04:11 +00:00
{
2017-08-29 02:29:06 +00:00
//try and open one
qbyte * buf = NULL , * data ;
filesize = 0 ;
2010-09-05 10:42:23 +00:00
2017-08-29 02:29:06 +00:00
for ( j = 0 ; j < sizeof ( cmscheme ) / sizeof ( cmscheme [ 0 ] ) / 6 ; j + + )
{
Q_snprintfz ( fname + prefixlen , sizeof ( fname ) - prefixlen , " %s_%s%s " , nicename , cmscheme [ i + 6 * j ] . suffix , tex_extensions [ e ] . name ) ;
buf = COM_LoadFile ( fname , 5 , & filesize ) ;
if ( buf )
break ;
Q_snprintfz ( fname + prefixlen , sizeof ( fname ) - prefixlen , " %s%s%s " , nicename , cmscheme [ i + 6 * j ] . suffix , tex_extensions [ e ] . name ) ;
buf = COM_LoadFile ( fname , 5 , & filesize ) ;
if ( buf )
break ;
}
//now read it
if ( buf )
2014-10-05 20:04:11 +00:00
{
2017-08-29 02:29:06 +00:00
if ( ( data = Read32BitImageFile ( buf , filesize , & width , & height , & hasalpha , fname ) ) )
2014-10-05 20:04:11 +00:00
{
2017-08-29 02:29:06 +00:00
extern cvar_t vid_hardwaregamma ;
if ( width = = height & & ( ! i | | width = = mips - > mip [ 0 ] . width ) ) //cubemaps must be square and all the same size (npot is fine though)
{ //(skies have a fallback for invalid sizes, but it'll run a bit slower)
if ( ! ( texflags & IF_NOGAMMA ) & & ! vid_hardwaregamma . value )
BoostGamma ( data , width , height ) ;
mips - > mip [ i ] . data = R_FlipImage32 ( data , & width , & height , cmscheme [ i + 6 * j ] . flipx , cmscheme [ i + 6 * j ] . flipy , cmscheme [ i + 6 * j ] . flipd ) ;
mips - > mip [ i ] . datasize = width * height * 4 ;
mips - > mip [ i ] . width = width ;
mips - > mip [ i ] . height = height ;
mips - > mip [ i ] . needfree = true ;
BZ_Free ( buf ) ;
goto nextface ;
}
BZ_Free ( data ) ;
2014-10-05 20:04:11 +00:00
}
BZ_Free ( buf ) ;
}
}
2017-08-29 02:29:06 +00:00
//get ready for the next prefix...
if ( ! nextprefix | | ! * nextprefix )
break ; //no more...
prefixend = strchr ( nextprefix , ' : ' ) ;
if ( ! prefixend )
prefixend = nextprefix + strlen ( nextprefix ) ;
prefixlen = prefixend - nextprefix ;
if ( prefixlen > = sizeof ( fname ) - 2 )
prefixlen = sizeof ( fname ) - 2 ;
memcpy ( fname , nextprefix , prefixlen ) ;
fname [ prefixlen + + ] = ' / ' ;
if ( * prefixend )
prefixend + + ;
nextprefix = prefixend ;
2014-10-05 20:04:11 +00:00
}
2009-11-04 21:16:50 +00:00
2017-08-29 02:29:06 +00:00
while ( i > 0 )
BZ_Free ( mips - > mip [ i - - ] . data ) ;
Z_Free ( mips ) ;
return NULL ;
nextface : ;
}
return mips ;
2014-10-05 20:04:11 +00:00
}
2004-08-23 00:15:46 +00:00
2017-01-24 20:15:14 +00:00
static qboolean Image_LocateHighResTexture ( image_t * tex , flocation_t * bestloc , char * bestname , size_t bestnamesize , unsigned int * bestflags )
2014-10-05 20:04:11 +00:00
{
2017-01-24 20:15:14 +00:00
char fname [ MAX_QPATH ] , nicename [ MAX_QPATH ] ;
2014-10-05 20:04:11 +00:00
int i , e ;
2016-08-25 00:12:14 +00:00
char * altname ;
char * nextalt ;
2017-01-13 00:39:50 +00:00
qboolean exactext = ! ! ( tex - > flags & IF_EXACTEXTENSION ) ;
2004-08-23 00:15:46 +00:00
2017-01-24 20:15:14 +00:00
int locflags = FSLF_DEPTH_INEXPLICIT | FSLF_DEEPONFAILURE ;
int bestdepth = 0x7fffffff , depth ;
int firstex = ( tex - > flags & IF_EXACTEXTENSION ) ? tex_extensions_count - 1 : 0 ;
flocation_t loc ;
2014-10-05 20:04:11 +00:00
2016-08-25 00:12:14 +00:00
for ( altname = tex - > ident ; altname ; altname = nextalt )
{
nextalt = strchr ( altname , ' : ' ) ;
if ( nextalt )
2013-05-11 14:02:55 +00:00
{
2016-08-25 00:12:14 +00:00
nextalt + + ;
if ( nextalt - altname > = sizeof ( fname ) )
continue ; //too long...
memcpy ( fname , altname , nextalt - altname - 1 ) ;
fname [ nextalt - altname - 1 ] = 0 ;
altname = fname ;
2013-05-11 14:02:55 +00:00
}
2014-10-05 20:04:11 +00:00
2016-08-25 00:12:14 +00:00
//see if we recognise the extension, and only strip it if we do.
2017-01-13 00:39:50 +00:00
if ( exactext )
e = tex_extensions_count ;
else
{
COM_FileExtension ( altname , nicename , sizeof ( nicename ) ) ;
e = 0 ;
if ( strcmp ( nicename , " lmp " ) & & strcmp ( nicename , " wal " ) )
for ( ; e < tex_extensions_count ; e + + )
{
if ( ! strcmp ( nicename , ( * tex_extensions [ e ] . name = = ' . ' ) ? tex_extensions [ e ] . name + 1 : tex_extensions [ e ] . name ) )
break ;
}
}
2014-10-05 20:04:11 +00:00
2016-08-25 00:12:14 +00:00
//strip it and try replacements if we do, otherwise assume that we're meant to be loading progs/foo.mdl_0.tga or whatever
2017-01-13 00:39:50 +00:00
if ( e = = tex_extensions_count | | exactext )
{
exactext = true ;
2016-08-25 00:12:14 +00:00
Q_strncpyz ( nicename , altname , sizeof ( nicename ) ) ;
2017-01-13 00:39:50 +00:00
}
2016-08-25 00:12:14 +00:00
else
COM_StripExtension ( altname , nicename , sizeof ( nicename ) ) ;
if ( ! tex - > fallbackdata | | ( gl_load24bit . ival & & ! ( tex - > flags & IF_NOREPLACE ) ) )
2015-02-02 08:01:53 +00:00
{
2016-08-25 00:12:14 +00:00
Q_snprintfz ( fname , sizeof ( fname ) , " dds/%s.dds " , nicename ) ;
2017-01-24 20:15:14 +00:00
depth = FS_FLocateFile ( fname , locflags , & loc ) ;
if ( depth < bestdepth )
2016-08-25 00:12:14 +00:00
{
2017-01-24 20:15:14 +00:00
Q_strncpyz ( bestname , fname , bestnamesize ) ;
bestdepth = depth ;
* bestloc = loc ;
bestflags = 0 ;
2016-08-25 00:12:14 +00:00
}
2015-02-02 08:01:53 +00:00
2016-08-25 00:12:14 +00:00
if ( strchr ( nicename , ' / ' ) | | strchr ( nicename , ' \\ ' ) ) //never look in a root dir for the pic
i = 0 ;
else
i = 1 ;
2013-10-29 17:38:22 +00:00
2016-08-25 00:12:14 +00:00
for ( ; i < sizeof ( tex_path ) / sizeof ( tex_path [ 0 ] ) ; i + + )
{
if ( ! tex_path [ i ] . enabled )
2014-10-05 20:04:11 +00:00
continue ;
2016-08-25 00:12:14 +00:00
if ( tex_path [ i ] . args > = 3 )
{ //this is a path that needs subpaths
char subpath [ MAX_QPATH ] ;
char basename [ MAX_QPATH ] ;
char * s , * n ;
if ( ! tex - > subpath | | ! * nicename )
continue ;
2013-10-29 17:38:22 +00:00
2016-08-25 00:12:14 +00:00
s = COM_SkipPath ( nicename ) ;
n = basename ;
2017-01-13 00:39:50 +00:00
while ( * s & & ( * s ! = ' . ' | | exactext ) & & n < basename + sizeof ( basename ) - 5 )
2014-10-05 20:04:11 +00:00
* n + + = * s + + ;
2016-08-25 00:12:14 +00:00
s = strchr ( s , ' _ ' ) ;
if ( s )
{
while ( * s & & n < basename + sizeof ( basename ) - 5 )
* n + + = * s + + ;
}
* n = 0 ;
2011-12-27 08:35:19 +00:00
2016-08-25 00:12:14 +00:00
for ( s = tex - > subpath ; s ; s = n )
2014-10-05 20:04:11 +00:00
{
2016-08-25 00:12:14 +00:00
//subpath a:b:c tries multiple possible sub paths, for compatibility
n = strchr ( s , ' : ' ) ;
if ( n )
{
if ( n - s > = sizeof ( subpath ) )
* subpath = 0 ;
else
{
memcpy ( subpath , s , n - s ) ;
subpath [ n - s ] = 0 ;
}
n + + ;
}
2014-10-05 20:04:11 +00:00
else
2016-08-25 00:12:14 +00:00
Q_strncpyz ( subpath , s , sizeof ( subpath ) ) ;
for ( e = firstex ; e < tex_extensions_count ; e + + )
2014-10-05 20:04:11 +00:00
{
2016-08-25 00:12:14 +00:00
if ( tex - > flags & IF_NOPCX )
if ( ! strcmp ( tex_extensions [ e ] . name , " .pcx " ) )
continue ;
Q_snprintfz ( fname , sizeof ( fname ) , tex_path [ i ] . path , subpath , basename , tex_extensions [ e ] . name ) ;
2017-01-24 20:15:14 +00:00
depth = FS_FLocateFile ( fname , locflags , & loc ) ;
if ( depth < bestdepth )
2016-08-25 00:12:14 +00:00
{
2017-01-24 20:15:14 +00:00
Q_strncpyz ( bestname , fname , bestnamesize ) ;
bestdepth = depth ;
* bestloc = loc ;
bestflags = 0 ;
2016-08-25 00:12:14 +00:00
}
2014-10-05 20:04:11 +00:00
}
}
2016-08-25 00:12:14 +00:00
}
else
{
2014-10-05 20:04:11 +00:00
for ( e = firstex ; e < tex_extensions_count ; e + + )
{
if ( tex - > flags & IF_NOPCX )
if ( ! strcmp ( tex_extensions [ e ] . name , " .pcx " ) )
continue ;
2016-08-25 00:12:14 +00:00
Q_snprintfz ( fname , sizeof ( fname ) , tex_path [ i ] . path , nicename , tex_extensions [ e ] . name ) ;
2017-01-24 20:15:14 +00:00
depth = FS_FLocateFile ( fname , locflags , & loc ) ;
if ( depth < bestdepth )
{
Q_strncpyz ( bestname , fname , bestnamesize ) ;
bestdepth = depth ;
* bestloc = loc ;
bestflags = 0 ;
}
2014-10-05 20:04:11 +00:00
}
}
2011-12-27 08:35:19 +00:00
2016-08-25 00:12:14 +00:00
//support expansion of _bump textures to _norm textures.
if ( tex - > flags & IF_TRYBUMP )
2014-10-05 20:04:11 +00:00
{
2016-08-25 00:12:14 +00:00
if ( tex_path [ i ] . args > = 3 )
2011-12-27 08:35:19 +00:00
{
2016-08-25 00:12:14 +00:00
/*no legacy compat needed, hopefully*/
2014-10-05 20:04:11 +00:00
}
2016-08-25 00:12:14 +00:00
else
2014-10-05 20:04:11 +00:00
{
2017-01-24 20:15:14 +00:00
char bumpname [ MAX_QPATH ] , * b ;
const char * n ;
2016-08-25 00:12:14 +00:00
b = bumpname ;
n = nicename ;
while ( * n )
2014-10-05 20:04:11 +00:00
{
2016-08-25 00:12:14 +00:00
if ( * n = = ' _ ' & & ! strcmp ( n , " _norm " ) )
2014-10-05 20:04:11 +00:00
{
2016-08-25 00:12:14 +00:00
strcpy ( b , " _bump " ) ;
b + = 5 ;
n + = 5 ;
break ;
}
* b + + = * n + + ;
}
if ( * n ) //no _norm, give up with that
continue ;
* b = 0 ;
for ( e = firstex ; e < tex_extensions_count ; e + + )
{
if ( ! strcmp ( tex_extensions [ e ] . name , " .tga " ) )
{
Q_snprintfz ( fname , sizeof ( fname ) , tex_path [ i ] . path , bumpname , tex_extensions [ e ] . name ) ;
2017-01-24 20:15:14 +00:00
Q_snprintfz ( fname , sizeof ( fname ) , tex_path [ i ] . path , nicename , tex_extensions [ e ] . name ) ;
depth = FS_FLocateFile ( fname , locflags , & loc ) ;
if ( depth < bestdepth )
2014-10-05 20:04:11 +00:00
{
2017-01-24 20:15:14 +00:00
Q_strncpyz ( bestname , fname , bestnamesize ) ;
bestdepth = depth ;
* bestloc = loc ;
* bestflags = IF_TRYBUMP ;
2014-10-05 20:04:11 +00:00
}
}
}
2011-12-27 08:35:19 +00:00
}
}
}
2010-08-16 02:03:02 +00:00
2016-08-25 00:12:14 +00:00
/*still failed? attempt to load quake lmp files, which have no real format id (hence why they're not above)*/
Q_strncpyz ( fname , nicename , sizeof ( fname ) ) ;
COM_DefaultExtension ( fname , " .lmp " , sizeof ( fname ) ) ;
2017-01-24 20:15:14 +00:00
if ( ! ( tex - > flags & IF_NOPCX ) )
2014-10-05 20:04:11 +00:00
{
2017-01-24 20:15:14 +00:00
depth = FS_FLocateFile ( fname , locflags , & loc ) ;
if ( depth < bestdepth )
{
Q_strncpyz ( bestname , fname , bestnamesize ) ;
bestdepth = depth ;
* bestloc = loc ;
bestflags = 0 ;
}
2016-08-25 00:12:14 +00:00
}
2017-01-24 20:15:14 +00:00
}
}
return bestdepth ! = 0x7fffffff ;
}
static void Image_LoadHiResTextureWorker ( void * ctx , void * data , size_t a , size_t b )
{
image_t * tex = ctx ;
char fname [ MAX_QPATH ] ;
char * altname ;
char * nextalt ;
flocation_t loc ;
2017-01-29 13:10:53 +00:00
unsigned int locflags = 0 ;
2017-01-24 20:15:14 +00:00
vfsfile_t * f ;
size_t fsize ;
char * buf ;
int imgwidth ;
int imgheight ;
qboolean alphaed ;
// Sys_Sleep(0.3);
if ( ( tex - > flags & IF_TEXTYPE ) = = IF_CUBEMAP )
{ //cubemaps require special handling because they are (normally) 6 files instead of 1.
//the exception is single-file dds cubemaps, but we don't support those.
for ( altname = tex - > ident ; altname ; altname = nextalt )
{
2017-08-29 02:29:06 +00:00
struct pendingtextureinfo * mips ;
2017-01-24 20:15:14 +00:00
nextalt = strchr ( altname , ' : ' ) ;
if ( nextalt )
2016-08-25 00:12:14 +00:00
{
2017-01-24 20:15:14 +00:00
nextalt + + ;
if ( nextalt - altname > = sizeof ( fname ) )
continue ; //too long...
memcpy ( fname , altname , nextalt - altname - 1 ) ;
fname [ nextalt - altname - 1 ] = 0 ;
altname = fname ;
}
2017-08-29 02:29:06 +00:00
mips = Image_LoadCubemapTextureData ( altname , tex - > subpath , tex - > flags ) ;
if ( mips )
2017-01-24 20:15:14 +00:00
{
2017-08-29 02:29:06 +00:00
tex - > width = mips - > mip [ 0 ] . width ;
tex - > height = mips - > mip [ 0 ] . height ;
2017-01-24 20:15:14 +00:00
if ( tex - > flags & IF_NOWORKER )
2017-08-29 02:29:06 +00:00
Image_LoadTextureMips ( tex , mips , 0 , 0 ) ;
2017-01-24 20:15:14 +00:00
else
2017-08-29 02:29:06 +00:00
COM_AddWork ( WG_MAIN , Image_LoadTextureMips , tex , mips , 0 , 0 ) ;
return ;
2017-01-24 20:15:14 +00:00
}
}
2017-08-29 02:29:06 +00:00
if ( tex - > flags & IF_NOWORKER )
Image_LoadTexture_Failed ( tex , NULL , 0 , 0 ) ;
else
COM_AddWork ( WG_MAIN , Image_LoadTexture_Failed , tex , NULL , 0 , 0 ) ;
2017-01-24 20:15:14 +00:00
return ;
}
if ( Image_LocateHighResTexture ( tex , & loc , fname , sizeof ( fname ) , & locflags ) )
{
f = FS_OpenReadLocation ( & loc ) ;
if ( f )
{
fsize = VFS_GETLEN ( f ) ;
buf = BZ_Malloc ( fsize ) ;
if ( buf )
{
VFS_READ ( f , buf , fsize ) ;
VFS_CLOSE ( f ) ;
if ( locflags & IF_TRYBUMP )
{ //it was supposed to be a heightmap image (that we need to convert to normalmap)
qbyte * d ;
int w , h ;
qboolean a ;
if ( ( d = ReadTargaFile ( buf , fsize , & w , & h , & a , 2 ) ) ) //Only load a greyscale image.
2016-08-25 00:12:14 +00:00
{
2017-01-24 20:15:14 +00:00
BZ_Free ( buf ) ;
if ( Image_LoadRawTexture ( tex , tex - > flags , d , NULL , w , h , TF_HEIGHT8 ) )
{
BZ_Free ( tex - > fallbackdata ) ;
tex - > fallbackdata = NULL ;
return ;
}
2016-08-25 00:12:14 +00:00
}
2017-01-24 20:15:14 +00:00
//guess not, fall back to normalmaps
}
2017-01-29 13:10:53 +00:00
if ( Image_LoadTextureFromMemory ( tex , tex - > flags , tex - > ident , fname , buf , fsize ) )
2017-01-24 20:15:14 +00:00
{
BZ_Free ( tex - > fallbackdata ) ;
tex - > fallbackdata = NULL ;
return ;
2014-10-05 20:04:11 +00:00
}
}
2017-01-24 20:15:14 +00:00
else
VFS_CLOSE ( f ) ;
2014-10-05 20:04:11 +00:00
}
2010-08-17 02:44:21 +00:00
}
2004-08-23 00:15:46 +00:00
2017-01-24 20:15:14 +00:00
//now look in wad files and swap over the fallback. (halflife compatability)
COM_StripExtension ( tex - > ident , fname , sizeof ( fname ) ) ;
buf = W_GetTexture ( fname , & imgwidth , & imgheight , & alphaed ) ;
if ( buf )
{
BZ_Free ( tex - > fallbackdata ) ;
tex - > fallbackdata = buf ;
tex - > fallbackfmt = TF_RGBA32 ;
tex - > fallbackwidth = imgwidth ;
tex - > fallbackheight = imgheight ;
}
2014-10-05 20:04:11 +00:00
if ( tex - > fallbackdata )
2012-11-27 03:23:19 +00:00
{
2015-02-02 08:01:53 +00:00
if ( Image_LoadRawTexture ( tex , tex - > flags , tex - > fallbackdata , ( char * ) tex - > fallbackdata + ( tex - > fallbackwidth * tex - > fallbackheight ) , tex - > fallbackwidth , tex - > fallbackheight , tex - > fallbackfmt ) )
2012-11-27 03:23:19 +00:00
{
2014-10-05 20:04:11 +00:00
tex - > fallbackdata = NULL ;
return ;
2012-11-27 03:23:19 +00:00
}
2014-10-05 20:04:11 +00:00
tex - > fallbackdata = NULL ;
2012-11-27 03:23:19 +00:00
}
2014-10-05 20:04:11 +00:00
// Sys_Printf("Texture %s failed\n", nicename);
//signal the main thread to set the final status instead of just setting it to avoid deadlock (it might already be waiting for it).
if ( tex - > flags & IF_NOWORKER )
Image_LoadTexture_Failed ( tex , NULL , 0 , 0 ) ;
2004-08-23 00:15:46 +00:00
else
2016-02-15 06:01:17 +00:00
COM_AddWork ( WG_MAIN , Image_LoadTexture_Failed , tex , NULL , 0 , 0 ) ;
2014-10-05 20:04:11 +00:00
}
2004-08-23 00:15:46 +00:00
2014-10-05 20:04:11 +00:00
//find an existing texture
image_t * Image_FindTexture ( const char * identifier , const char * subdir , unsigned int flags )
{
image_t * tex ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
if ( ! subdir )
subdir = " " ;
2014-10-05 20:04:11 +00:00
tex = Hash_Get ( & imagetable , identifier ) ;
while ( tex )
2004-08-23 00:15:46 +00:00
{
2017-07-12 08:15:27 +00:00
if ( ! ( ( tex - > flags ^ flags ) & ( IF_CLAMP | IF_PALETTIZE | IF_PREMULTIPLYALPHA ) ) )
2005-08-26 22:56:51 +00:00
{
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
# ifdef PURGEIMAGES
if ( ! strcmp ( subdir , tex - > subpath ? tex - > subpath : " " ) )
# endif
{
tex - > regsequence = r_regsequence ;
return tex ;
}
2004-08-23 00:15:46 +00:00
}
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
tex = Hash_GetNext ( & imagetable , identifier , tex ) ;
2014-10-05 20:04:11 +00:00
}
return NULL ;
}
//create a texture, with dupes. you'll need to load something into it too.
static image_t * Image_CreateTexture_Internal ( const char * identifier , const char * subdir , unsigned int flags )
{
image_t * tex ;
bucket_t * buck ;
tex = Z_Malloc ( sizeof ( * tex ) + sizeof ( bucket_t ) + strlen ( identifier ) + 1 + ( subdir ? strlen ( subdir ) + 1 : 0 ) ) ;
buck = ( bucket_t * ) ( tex + 1 ) ;
tex - > ident = ( char * ) ( buck + 1 ) ;
strcpy ( tex - > ident , identifier ) ;
2015-10-27 15:20:15 +00:00
# ifdef _DEBUG
Q_strncpyz ( tex - > dbgident , identifier , sizeof ( tex - > dbgident ) ) ;
# endif
2014-10-05 20:04:11 +00:00
if ( subdir & & * subdir )
{
tex - > subpath = tex - > ident + strlen ( identifier ) + 1 ;
strcpy ( tex - > subpath , subdir ) ;
}
tex - > next = imagelist ;
imagelist = tex ;
tex - > flags = flags ;
tex - > width = 0 ;
tex - > height = 0 ;
tex - > regsequence = r_regsequence ;
tex - > status = TEX_NOTLOADED ;
tex - > fallbackdata = NULL ;
tex - > fallbackwidth = 0 ;
tex - > fallbackheight = 0 ;
tex - > fallbackfmt = TF_INVALID ;
if ( * tex - > ident )
Hash_Add ( & imagetable , tex - > ident , tex , buck ) ;
return tex ;
}
image_t * Image_CreateTexture ( const char * identifier , const char * subdir , unsigned int flags )
{
image_t * image ;
# ifdef LOADERTHREAD
Sys_LockMutex ( com_resourcemutex ) ;
# endif
image = Image_CreateTexture_Internal ( identifier , subdir , flags ) ;
# ifdef LOADERTHREAD
Sys_UnlockMutex ( com_resourcemutex ) ;
# endif
return image ;
}
2016-07-12 00:40:13 +00:00
# ifdef WEBCLIENT
2015-04-21 04:12:00 +00:00
//called on main thread. oh well.
2016-07-12 00:40:13 +00:00
static void Image_Downloaded ( struct dl_download * dl )
2015-04-21 04:12:00 +00:00
{
qboolean success = false ;
image_t * tex = dl - > user_ctx ;
image_t * p ;
//make sure the renderer wasn't restarted mid-download
for ( p = imagelist ; p ; p = p - > next )
if ( p = = tex )
break ;
if ( p )
{
if ( dl - > status = = DL_FINISHED )
{
size_t fsize = VFS_GETLEN ( dl - > file ) ;
char * buf = BZ_Malloc ( fsize ) ;
if ( VFS_READ ( dl - > file , buf , fsize ) = = fsize )
if ( Image_LoadTextureFromMemory ( tex , tex - > flags , tex - > ident , dl - > url , buf , fsize ) )
success = true ;
}
if ( ! success )
Image_LoadTexture_Failed ( tex , NULL , 0 , 0 ) ;
}
}
2016-07-12 00:40:13 +00:00
# endif
2015-04-21 04:12:00 +00:00
2014-10-05 20:04:11 +00:00
//find a texture. will try to load it from disk, using the fallback if it would fail.
image_t * Image_GetTexture ( const char * identifier , const char * subpath , unsigned int flags , void * fallbackdata , void * fallbackpalette , int fallbackwidth , int fallbackheight , uploadfmt_t fallbackfmt )
{
image_t * tex ;
2015-03-03 00:14:43 +00:00
qboolean dontposttoworker = ( flags & ( IF_NOWORKER | IF_LOADNOW ) ) ;
2015-04-14 23:12:17 +00:00
qboolean lowpri = ( flags & IF_LOWPRIORITY ) ;
2015-05-03 19:57:46 +00:00
// qboolean highpri = (flags & IF_HIGHPRIORITY);
2015-04-14 23:12:17 +00:00
flags & = ~ ( IF_LOADNOW | IF_LOWPRIORITY | IF_HIGHPRIORITY ) ;
2015-03-03 00:14:43 +00:00
2014-10-05 20:04:11 +00:00
# ifdef LOADERTHREAD
Sys_LockMutex ( com_resourcemutex ) ;
# endif
tex = Image_FindTexture ( identifier , subpath , flags ) ;
if ( tex )
{
2015-01-21 18:18:37 +00:00
//FIXME: race condition is possible here
//if a non-replaced texture is given a fallback while a non-fallback version is still loading, it can still fail.
if ( tex - > status = = TEX_FAILED & & fallbackdata )
tex - > status = TEX_LOADING ;
else if ( tex - > status ! = TEX_NOTLOADED )
2014-10-11 19:39:45 +00:00
{
2014-10-05 20:04:11 +00:00
# ifdef LOADERTHREAD
2014-10-11 19:39:45 +00:00
Sys_UnlockMutex ( com_resourcemutex ) ;
2014-10-05 20:04:11 +00:00
# endif
2014-10-11 19:39:45 +00:00
return tex ; //already exists
}
tex - > flags = flags ;
2004-08-23 00:15:46 +00:00
}
2014-10-11 19:39:45 +00:00
else
tex = Image_CreateTexture_Internal ( identifier , subpath , flags ) ;
2014-10-05 20:04:11 +00:00
tex - > status = TEX_LOADING ;
if ( fallbackdata )
2009-11-04 21:16:50 +00:00
{
2015-04-14 23:12:17 +00:00
int b = fallbackwidth * fallbackheight , pb = 0 ;
2014-10-05 20:04:11 +00:00
switch ( fallbackfmt )
2009-11-04 21:16:50 +00:00
{
2014-10-05 20:04:11 +00:00
case TF_8PAL24 :
pb = 3 * 256 ;
2015-04-14 23:12:17 +00:00
b * = 1 ;
2014-10-05 20:04:11 +00:00
break ;
case TF_8PAL32 :
pb = 4 * 256 ;
2015-04-14 23:12:17 +00:00
b * = 1 ;
2014-10-05 20:04:11 +00:00
break ;
2015-02-07 22:34:22 +00:00
case TF_LUM8 :
2014-10-05 20:04:11 +00:00
case TF_SOLID8 :
case TF_TRANS8 :
case TF_TRANS8_FULLBRIGHT :
case TF_H2_T7G1 :
case TF_H2_TRANS8_0 :
case TF_H2_T4A4 :
case TF_HEIGHT8 :
case TF_HEIGHT8PAL : //we don't care about the actual palette.
2015-04-14 23:12:17 +00:00
b * = 1 ;
2014-10-05 20:04:11 +00:00
break ;
case TF_RGBX32 :
case TF_RGBA32 :
case TF_BGRX32 :
case TF_BGRA32 :
2015-04-14 23:12:17 +00:00
b * = 4 ;
break ;
2015-10-11 11:34:58 +00:00
case TF_MIP4_8PAL24 :
2016-12-09 09:09:12 +00:00
case TF_MIP4_8PAL24_T255 :
2015-10-11 11:34:58 +00:00
pb = 3 * 256 ;
2015-04-14 23:12:17 +00:00
case TF_MIP4_LUM8 :
case TF_MIP4_SOLID8 :
b = ( fallbackwidth > > 0 ) * ( fallbackheight > > 0 ) +
( fallbackwidth > > 1 ) * ( fallbackheight > > 1 ) +
( fallbackwidth > > 2 ) * ( fallbackheight > > 2 ) +
( fallbackwidth > > 3 ) * ( fallbackheight > > 3 ) ;
2014-10-05 20:04:11 +00:00
break ;
default :
2015-01-21 18:18:37 +00:00
Sys_Error ( " Image_GetTexture: bad format " ) ;
2009-11-04 21:16:50 +00:00
}
2015-04-14 23:12:17 +00:00
tex - > fallbackdata = BZ_Malloc ( b + pb ) ;
memcpy ( tex - > fallbackdata , fallbackdata , b ) ;
2014-10-05 20:04:11 +00:00
if ( pb )
2015-04-14 23:12:17 +00:00
memcpy ( ( qbyte * ) tex - > fallbackdata + b , fallbackpalette , pb ) ;
2014-10-05 20:04:11 +00:00
tex - > fallbackwidth = fallbackwidth ;
tex - > fallbackheight = fallbackheight ;
tex - > fallbackfmt = fallbackfmt ;
}
else
{
tex - > fallbackdata = NULL ;
tex - > fallbackwidth = 0 ;
tex - > fallbackheight = 0 ;
tex - > fallbackfmt = TF_INVALID ;
}
# ifdef LOADERTHREAD
Sys_UnlockMutex ( com_resourcemutex ) ;
# endif
//FIXME: pass fallback through this way instead?
2009-11-04 21:16:50 +00:00
2015-03-03 00:14:43 +00:00
if ( dontposttoworker )
2014-10-05 20:04:11 +00:00
Image_LoadHiResTextureWorker ( tex , NULL , 0 , 0 ) ;
else
2015-04-14 23:12:17 +00:00
{
2015-04-21 21:49:08 +00:00
# ifdef WEBCLIENT
2015-04-21 04:12:00 +00:00
if ( ! strncmp ( tex - > ident , " http:// " , 7 ) | | ! strncmp ( tex - > ident , " https:// " , 8 ) )
{
2016-07-12 00:40:13 +00:00
struct dl_download * dl ;
size_t sizelimit = max ( 0 , r_image_downloadsizelimit . ival ) ;
if ( sizelimit > 0 | | ! * r_image_downloadsizelimit . string )
dl = HTTP_CL_Get ( tex - > ident , NULL , Image_Downloaded ) ;
else
{
Con_Printf ( " r_image_downloadsizelimit: image downloading is blocked \n " ) ;
dl = NULL ;
}
if ( dl )
{
if ( sizelimit )
dl - > sizelimit = sizelimit ;
dl - > user_ctx = tex ;
playdemo accepts https urls now. will start playing before the file has finished downloading, to avoid unnecessary delays.
reworked network addresses to separate address family and connection type. this should make banning people more reliable, as well as simplifying a whole load of logic (no need to check for ipv4 AND ipv6).
tcpconnect will keep trying to connect even if the connection wasn't instant, instead of giving up instantly.
rewrote tcp connections quite a bit. sv_port_tcp now handles qtv+qizmo+http+ws+rtcbroker+tls equivalents.
qtv_streamport is now a legacy cvar and now acts equivalently to sv_port_tcp (but still separate).
rewrote screenshot and video capture code to use strides. this solves image-is-upside down issues with vulkan.
ignore alt key in browser port. oh no! no more red text! oh no! no more alt-being-wrongly-down-and-being-unable-to-type-anything-without-forcing-alt-released!
reworked audio decoder interface. now has clearly defined success/unavailable/end-of-file results. this should solve a whole load of issues with audio streaming.
fixed various openal audio streaming issues too. openal also got some workarounds for emscripten's poor emulation.
fixed ogg decoder to retain sync properly if seeked.
updated menu_media a bit. now reads vorbis comments/id3v1 tags to get proper track names. also saves the playlist so you don't have to manually repopulate the list so it might actually be usable now (after how many years?)
r_stains now defaults to 0, and is no longer enabled by presets. use decals if you want that sort of thing.
added fs_noreexec cvar, so configs will not be reexeced on gamedir change. this also means defaults won't be reapplied, etc.
added 'nvvk' renderer on windows, using nvidia's vulkan-inside-opengl gl extension. mostly just to see how much slower it is.
fixed up the ftp server quite a lot. more complete, more compliant, and should do ipv6 properly to-boot. file transfers also threaded.
fixed potential crash inside runclientphys.
experimental sv_antilag=3 setting. totally untested. the aim is to avoid missing due to lagged knockbacks. may be expensive for the server.
browser port's websockets support fixed. experimental support for webrtc ('works for me', requires a broker server).
updated avplug(renamed to ffmpeg so people know what it is) to use ffmpeg 3.2.4 properly, with its new encoder api. should be much more robust... also added experimental audio decoder for game music etc (currently doesn't resample, so playback rates are screwed, disabled by cvar).
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5097 fc73d0e0-1445-4013-8a0c-d673dee63da5
2017-05-10 02:08:58 +00:00
dl - > file = VFSPIPE_Open ( 1 , false ) ;
2016-07-12 00:40:13 +00:00
dl - > isquery = true ;
}
2015-04-21 04:12:00 +00:00
# ifdef MULTITHREAD
DL_CreateThread ( dl , NULL , NULL ) ;
# else
tex - > status = TEX_FAILED ; //HACK: so nothing waits for it.
# endif
}
2015-04-21 21:49:08 +00:00
else
# endif
if ( lowpri )
2016-02-15 06:01:17 +00:00
COM_AddWork ( WG_LOADER , Image_LoadHiResTextureWorker , tex , NULL , 0 , 0 ) ;
2015-04-14 23:12:17 +00:00
else
2016-02-15 06:01:17 +00:00
COM_AddWork ( WG_LOADER , Image_LoadHiResTextureWorker , tex , NULL , 0 , 0 ) ;
2015-04-14 23:12:17 +00:00
}
2014-10-05 20:04:11 +00:00
return tex ;
}
void Image_Upload ( texid_t tex , uploadfmt_t fmt , void * data , void * palette , int width , int height , unsigned int flags )
{
struct pendingtextureinfo mips ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
size_t i ;
2014-10-05 20:04:11 +00:00
mips . extrafree = NULL ;
mips . type = ( flags & IF_3DMAP ) ? PTI_3D : PTI_2D ;
if ( ! Image_GenMip0 ( & mips , flags , data , palette , width , height , fmt , false ) )
return ;
2014-10-11 19:39:45 +00:00
Image_GenerateMips ( & mips , flags ) ;
2016-11-25 08:14:54 +00:00
Image_ChangeFormat ( & mips , flags , fmt ) ;
2014-10-05 20:04:11 +00:00
rf - > IMG_LoadTextureMips ( tex , & mips ) ;
2015-08-07 17:49:49 +00:00
tex - > width = width ;
tex - > height = height ;
2014-10-05 20:04:11 +00:00
tex - > status = TEX_LOADED ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
for ( i = 0 ; i < mips . mipcount ; i + + )
if ( mips . mip [ i ] . needfree )
BZ_Free ( mips . mip [ i ] . data ) ;
if ( mips . extrafree )
BZ_Free ( mips . extrafree ) ;
2014-10-05 20:04:11 +00:00
}
typedef struct
{
char * name ;
char * legacyname ;
2015-02-02 08:01:53 +00:00
int maximize , minmip , minimize ;
2014-10-05 20:04:11 +00:00
} texmode_t ;
static texmode_t texmodes [ ] = {
{ " n " , " GL_NEAREST " , 0 , - 1 , 0 } ,
{ " l " , " GL_LINEAR " , 1 , - 1 , 1 } ,
{ " nn " , " GL_NEAREST_MIPMAP_NEAREST " , 0 , 0 , 0 } ,
{ " ln " , " GL_LINEAR_MIPMAP_NEAREST " , 1 , 0 , 1 } ,
{ " nl " , " GL_NEAREST_MIPMAP_LINEAR " , 0 , 1 , 0 } ,
{ " ll " , " GL_LINEAR_MIPMAP_LINEAR " , 1 , 1 , 1 } ,
//more explicit names
{ " n.n " , NULL , 0 , - 1 , 0 } ,
{ " l.l " , NULL , 1 , - 1 , 1 } ,
{ " nnn " , NULL , 0 , 0 , 0 } ,
{ " lnl " , NULL , 1 , 0 , 1 } ,
{ " nln " , NULL , 0 , 1 , 0 } ,
{ " lll " , NULL , 1 , 1 , 1 } ,
//inverted mag filters
{ " n.l " , NULL , 0 , - 1 , 1 } ,
{ " l.n " , NULL , 1 , - 1 , 0 } ,
{ " nnl " , NULL , 0 , 0 , 1 } ,
{ " lnn " , NULL , 1 , 0 , 0 } ,
{ " nll " , NULL , 0 , 1 , 1 } ,
{ " lln " , NULL , 1 , 1 , 0 }
} ;
static void Image_ParseTextureMode ( char * cvarname , char * modename , int modes [ 3 ] )
{
int i ;
modes [ 0 ] = 1 ;
modes [ 1 ] = 0 ;
modes [ 2 ] = 1 ;
for ( i = 0 ; i < sizeof ( texmodes ) / sizeof ( texmodes [ 0 ] ) ; i + + )
{
if ( ! Q_strcasecmp ( modename , texmodes [ i ] . name ) | | ( texmodes [ i ] . legacyname & & ! Q_strcasecmp ( modename , texmodes [ i ] . legacyname ) ) )
2010-08-17 02:44:21 +00:00
{
2014-10-05 20:04:11 +00:00
modes [ 0 ] = texmodes [ i ] . minimize ;
modes [ 1 ] = texmodes [ i ] . minmip ;
modes [ 2 ] = texmodes [ i ] . maximize ;
return ;
2010-08-17 02:44:21 +00:00
}
2010-07-12 22:46:37 +00:00
}
2014-10-05 20:04:11 +00:00
Con_Printf ( " %s: mode %s was not recognised \n " , cvarname , modename ) ;
}
2015-04-21 04:12:00 +00:00
void QDECL Image_TextureMode_Callback ( struct cvar_s * var , char * oldvalue )
2014-10-05 20:04:11 +00:00
{
int mip [ 3 ] = { 1 , 0 , 1 } , pic [ 3 ] = { 1 , - 1 , 1 } , mipcap [ 2 ] = { 0 , 1000 } ;
float anis = 1 ;
char * s ;
extern cvar_t gl_texturemode , gl_texturemode2d , gl_texture_anisotropic_filtering , gl_mipcap ;
Image_ParseTextureMode ( gl_texturemode . name , gl_texturemode . string , mip ) ;
Image_ParseTextureMode ( gl_texturemode2d . name , gl_texturemode2d . string , pic ) ;
anis = gl_texture_anisotropic_filtering . value ;
//parse d_mipcap (two values, nearest furthest)
s = COM_Parse ( gl_mipcap . string ) ;
mipcap [ 0 ] = * com_token ? atoi ( com_token ) : 0 ;
// if (mipcap[0] > 3) /*cap it to 3, so no 16*16 textures get bugged*/
// mipcap[0] = 3;
s = COM_Parse ( s ) ;
mipcap [ 1 ] = * com_token ? atoi ( com_token ) : 1000 ;
if ( mipcap [ 1 ] < mipcap [ 0 ] )
mipcap [ 1 ] = mipcap [ 0 ] ;
if ( rf & & rf - > IMG_UpdateFiltering )
rf - > IMG_UpdateFiltering ( imagelist , mip , pic , mipcap , anis ) ;
}
2015-01-21 18:18:37 +00:00
qboolean Image_UnloadTexture ( image_t * tex )
{
if ( tex - > status = = TEX_LOADED )
{
rf - > IMG_DestroyTexture ( tex ) ;
tex - > status = TEX_NOTLOADED ;
return true ;
}
return false ;
}
2015-03-03 00:14:43 +00:00
//nukes an existing texture, destroying all traces. any lingering references will cause problems, so be careful about how you access these.
void Image_DestroyTexture ( image_t * tex )
{
image_t * * link ;
if ( ! tex )
return ;
TEXDOWAIT ( tex ) ; //just in case.
# ifdef LOADERTHREAD
Sys_LockMutex ( com_resourcemutex ) ;
# endif
Image_UnloadTexture ( tex ) ;
for ( link = & imagelist ; * link ; link = & ( * link ) - > next )
{
if ( * link = = tex )
{
* link = tex - > next ;
break ;
}
}
# ifdef LOADERTHREAD
Sys_UnlockMutex ( com_resourcemutex ) ;
# endif
if ( * tex - > ident )
Hash_RemoveData ( & imagetable , tex - > ident , tex ) ;
Z_Free ( tex ) ;
}
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
void Shader_TouchTextures ( void ) ;
void Image_Purge ( void )
{
# ifdef PURGEIMAGES
image_t * tex , * a ;
int loaded = 0 , total = 0 ;
size_t mem = 0 ;
Shader_TouchTextures ( ) ;
for ( tex = imagelist ; tex ; tex = tex - > next )
{
if ( tex - > flags & IF_NOPURGE )
continue ;
if ( tex - > regsequence ! = r_regsequence )
Image_UnloadTexture ( tex ) ;
}
# endif
}
2015-03-03 00:14:43 +00:00
void Image_List_f ( void )
{
2017-01-24 20:15:14 +00:00
flocation_t loc ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
image_t * tex , * a ;
int loaded = 0 , total = 0 ;
size_t mem = 0 ;
2017-01-24 20:15:14 +00:00
unsigned int loadflags ;
char fname [ MAX_QPATH ] ;
2017-04-18 11:12:17 +00:00
const char * filter = Cmd_Argv ( 1 ) ;
2015-03-03 00:14:43 +00:00
for ( tex = imagelist ; tex ; tex = tex - > next )
{
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
total + + ;
2017-04-18 11:12:17 +00:00
if ( * filter & & ! strstr ( tex - > ident , filter ) )
continue ;
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
if ( tex - > subpath )
2017-01-24 20:15:14 +00:00
Con_Printf ( " ^h(%s)^h " , tex - > subpath ) ;
if ( Image_LocateHighResTexture ( tex , & loc , fname , sizeof ( fname ) , & loadflags ) )
{
char defuck [ MAX_OSPATH ] , * bullshit ;
Q_strncpyz ( defuck , loc . search - > logicalpath , sizeof ( defuck ) ) ;
while ( ( bullshit = strchr ( defuck , ' \\ ' ) ) )
* bullshit = ' / ' ;
Con_Printf ( " ^[%s \\ desc \\ %s/%s^]: " , tex - > ident , defuck , fname ) ;
}
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
else
Con_Printf ( " %s: " , tex - > ident ) ;
for ( a = tex - > aliasof ; a ; a = a - > aliasof )
{
if ( a - > subpath )
Con_Printf ( " ^3^h(%s)^h%s: " , a - > subpath , a - > ident ) ;
else
Con_Printf ( " ^3%s: " , a - > ident ) ;
}
2015-03-03 00:14:43 +00:00
if ( tex - > status = = TEX_LOADED )
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
{
Con_Printf ( " ^2loaded \n " ) ;
if ( ! tex - > aliasof )
{
mem + = tex - > width * tex - > height * 4 ;
loaded + + ;
}
}
2015-03-03 00:14:43 +00:00
else if ( tex - > status = = TEX_FAILED )
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
Con_Printf ( " ^1failed \n " ) ;
2015-03-03 00:14:43 +00:00
else if ( tex - > status = = TEX_NOTLOADED )
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
Con_Printf ( " ^5not loaded \n " ) ;
2015-03-03 00:14:43 +00:00
else
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
Con_Printf ( " ^bloading \n " ) ;
2015-03-03 00:14:43 +00:00
}
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
Con_Printf ( " %i images loaded (%i known) \n " , loaded , total ) ;
2015-03-03 00:14:43 +00:00
}
Reworked client support for DPP5+. less code now, its much more graceful.
added waterfog command. waterfog overrides regular fog only when the view is in water.
fixed 64bit printf format specifiers. should work better on winxp64.
fixed some spec angle weirdness.
fixed viewsize 99.99 weirdness with ezhud.
fixed extra offset on the console (exhibited in 64bit builds, but not limited to).
fixed .avi playback, can now actually display frames again.
reimplemented line sparks.
fixed r_editlights_save flipping the light's pitch.
fixed issue with oggs failing to load.
fixed condump to cope with unicode properly.
made sv_bigcoords default except in quake. hexen2 kinda needs it for bsp angle precision.
fixed nq server to not stall weirdly on map changes.
fixed qwprogs svc_cdtrack not bugging out with nq clients on the server.
fixed restart command to load the last map run by the server, instead of start.bsp (when idle)
optimised d3d9 renderer a little. now uses less draw calls, especially with complex scenes. seems to get higher framerates than opengl now.
fixed d3d9 renderer to not bug out quite so much when run fullscreen (shader subsystem is now correctly initialised).
fixed a couple of bugs from font change. also now supports utf-8 in a few more places.
r_editlights_reload no longer generates rtlights inside the void. this resolves a few glitches (but should also help framerates a little).
fixed so corona-only lights won't generate shadowmaps and waste lots of time.
removed lots of #defines from qclib. I should never have made them in the first place, but I was lazy. obviously there's more left that I cba to remove yet.
fixed nested calls with variant-vectors. this fixes csaddon's light editor.
fixed qcc hc calling conventions using redundant stores.
disabled keywords can still be used by using __keyword instead.
fixed ftegccgui grep feature.
fixed motionless-dog qcc bug.
tweaked qcc warnings a little. -Wall is now a viable setting. you should be able to fix all those warnings.
fixed qw svc_intermission + dpp5+ clients bug.
fixed annoying spam about disconnecting in hexen2.
rewrote status command a little to cope with ipv6 addresses more gracefully
fixed significant stall when hibernating/debugging a server with a player sitting on it.
fixed truelightning.
fixed rocketlight overriding pflags.
fixed torches vanishing on vid_restart.
fixed issue with decal scaling.
fixed findentityfield builtin.
fixed fteqcc issue with ptr+1
fixed use of arrays inside class functions.
fixed/implemented fteqcc emulation of pointer opcodes.
added __inout keyword to fteqcc, so that it doesn't feel so horrendous.
fixed sizeof(*foo)
fixed *struct = struct;
fixed recursive structs.
fixed fteqcc warning report.
fixed sdl2 controller support, hopefully.
attempted to implement xinput, including per-player audio playback.
slightly fixed relaxed attitude to mouse focus when running fullscreen.
fixed weird warnings/errors with 'ent.arrayhead' terms. now generates sane errors.
implemented bindmaps (for csqc).
fixed crashing bug with eprint builtin.
implemented subset of music_playlist_* functionality. significant changes to music playback.
fixed some more dpcsqc compat.
fixed binds menu. now displays and accepts modifiers.
fixed issues with huge lightmaps.
fixed protocol determinism with dp clients connecting to fte servers. the initial getchallenge request now inhibits vanilla nq connection requests.
implemented support for 'dupe' userinfo key, allowing clients to request client->server packet duplication. should probably queue them tbh.
implemented sv_saveentfile command.
fixed resume after breaking inside a stepped-over function.
fixed erroneous footer after debugging.
(I wonder just how many things I broke with these fixes)
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4946 fc73d0e0-1445-4013-8a0c-d673dee63da5
2015-07-26 10:56:18 +00:00
2014-10-05 20:04:11 +00:00
//may not create any images yet.
void Image_Init ( void )
{
2015-10-11 11:34:58 +00:00
wadmutex = Sys_CreateMutex ( ) ;
2014-10-05 20:04:11 +00:00
memset ( imagetablebuckets , 0 , sizeof ( imagetablebuckets ) ) ;
Hash_InitTable ( & imagetable , sizeof ( imagetablebuckets ) / sizeof ( imagetablebuckets [ 0 ] ) , imagetablebuckets ) ;
2015-03-03 00:14:43 +00:00
Cmd_AddCommandD ( " image_list " , Image_List_f , " Prints out a list of the currently-known textures. " ) ;
2014-10-05 20:04:11 +00:00
}
//destroys all textures
void Image_Shutdown ( void )
{
image_t * tex ;
int i = 0 , j = 0 ;
2015-03-03 00:14:43 +00:00
Cmd_RemoveCommand ( " image_list " ) ;
2014-10-05 20:04:11 +00:00
while ( imagelist )
{
tex = imagelist ;
if ( * tex - > ident )
Hash_RemoveData ( & imagetable , tex - > ident , tex ) ;
imagelist = tex - > next ;
if ( tex - > status = = TEX_LOADED )
j + + ;
rf - > IMG_DestroyTexture ( tex ) ;
Z_Free ( tex ) ;
i + + ;
}
if ( i )
2015-07-30 16:26:15 +00:00
Con_DPrintf ( " Destroyed %i/%i images \n " , j , i ) ;
2015-10-11 11:34:58 +00:00
if ( wadmutex )
Sys_DestroyMutex ( wadmutex ) ;
wadmutex = NULL ;
2014-10-05 20:04:11 +00:00
}
//load the named file, without failing.
texid_t R_LoadHiResTexture ( const char * name , const char * subpath , unsigned int flags )
{
char nicename [ MAX_QPATH ] , * data ;
if ( ! * name )
return r_nulltex ;
Q_strncpyz ( nicename , name , sizeof ( nicename ) ) ;
while ( ( data = strchr ( nicename , ' * ' ) ) )
* data = ' # ' ;
return Image_GetTexture ( nicename , subpath , flags , NULL , NULL , 0 , 0 , TF_INVALID ) ; //queues the texture creation.
2004-08-23 00:15:46 +00:00
}
2014-10-05 20:04:11 +00:00
//attempt to load the named texture
//will not load external textures if gl_load24bit is set (failing instantly if its just going to fail later on anyway)
//the specified data will be used if the high-res image is blocked/not found.
texid_t R_LoadReplacementTexture ( const char * name , const char * subpath , unsigned int flags , void * lowres , int lowreswidth , int lowresheight , uploadfmt_t format )
2004-08-23 00:15:46 +00:00
{
2014-10-05 20:04:11 +00:00
char nicename [ MAX_QPATH ] , * data ;
if ( ! * name )
2009-11-04 21:16:50 +00:00
return r_nulltex ;
2014-10-05 20:04:11 +00:00
if ( ! gl_load24bit . ival & & ! lowres )
return r_nulltex ;
Q_strncpyz ( nicename , name , sizeof ( nicename ) ) ;
while ( ( data = strchr ( nicename , ' * ' ) ) )
* data = ' # ' ;
return Image_GetTexture ( nicename , subpath , flags , lowres , NULL , lowreswidth , lowresheight , format ) ; //queues the texture creation.
}
# ifdef RTLIGHTS
void R_LoadNumberedLightTexture ( dlight_t * dl , int cubetexnum )
{
Q_snprintfz ( dl - > cubemapname , sizeof ( dl - > cubemapname ) , " cubemaps/%i " , cubetexnum ) ;
if ( ! gl_load24bit . ival )
dl - > cubetexture = r_nulltex ;
else
dl - > cubetexture = Image_GetTexture ( dl - > cubemapname , NULL , IF_CUBEMAP , NULL , NULL , 0 , 0 , TF_INVALID ) ;
2004-08-23 00:15:46 +00:00
}
2014-10-05 20:04:11 +00:00
# endif
2004-08-23 00:15:46 +00:00
2014-10-05 20:04:11 +00:00
#if 0
2005-08-03 23:14:59 +00:00
extern cvar_t r_shadow_bumpscale_bumpmap ;
2014-03-30 08:55:06 +00:00
texid_t R_LoadBumpmapTexture ( const char * name , const char * subpath )
2004-08-23 00:15:46 +00:00
{
char * buf , * data ;
2009-11-04 21:16:50 +00:00
texid_t tex ;
2004-08-23 00:15:46 +00:00
// int h;
2007-10-12 10:27:51 +00:00
char fname [ MAX_QPATH ] , nicename [ MAX_QPATH ] ;
2012-02-12 05:18:31 +00:00
qboolean hasalpha ;
2004-08-23 00:15:46 +00:00
2009-11-04 21:16:50 +00:00
static char * extensions [ ] =
{ //reverse order of preference - (match commas with optional file types)
2004-08-23 00:15:46 +00:00
" .tga " ,
" "
} ;
int i , e ;
2004-10-10 06:32:29 +00:00
TRACE ( ( " dbg: Mod_LoadBumpmapTexture: texture %s \n " , name ) ) ;
2006-03-11 03:12:10 +00:00
COM_StripExtension ( name , nicename , sizeof ( nicename ) ) ;
2004-08-23 00:15:46 +00:00
2012-07-20 01:46:05 +00:00
tex = R_FindTexture ( name , 0 ) ;
2009-11-04 21:16:50 +00:00
if ( TEXVALID ( tex ) ) //don't bother if it already exists.
2013-05-11 14:02:55 +00:00
{
2014-10-05 20:04:11 +00:00
image_width = tex - > width ;
image_height = tex - > height ;
2009-11-04 21:16:50 +00:00
return tex ;
2013-05-11 14:02:55 +00:00
}
2004-08-23 00:15:46 +00:00
2009-11-04 21:16:50 +00:00
tex = R_LoadCompressed ( name ) ;
if ( TEXVALID ( tex ) )
return tex ;
2004-08-23 00:15:46 +00:00
if ( strchr ( name , ' / ' ) ) //never look in a root dir for the pic
i = 0 ;
else
i = 1 ;
//should write this nicer.
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
for ( ; i < sizeof ( tex_path ) / sizeof ( tex_path [ 0 ] ) ; i + + )
2004-08-23 00:15:46 +00:00
{
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
if ( ! tex_path [ i ] . enabled )
continue ;
2004-08-23 00:15:46 +00:00
for ( e = sizeof ( extensions ) / sizeof ( char * ) - 1 ; e > = 0 ; e - - )
{
2014-10-05 20:04:11 +00:00
size_t fsize ;
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
if ( tex_path [ i ] . args > = 3 )
2004-08-23 00:15:46 +00:00
{
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
if ( ! subpath )
continue ;
snprintf ( fname , sizeof ( fname ) - 1 , tex_path [ i ] . path , subpath , nicename , extensions [ e ] ) ;
2004-08-23 00:15:46 +00:00
}
else
Fixes, workarounds, and breakages. Hexen2 should work much better (-hexen2 says no mission pack, -portals says h2mp). Started working on splitting bigcoords per client, far too much work still to go on that. Removed gl_ztrick entirely. Enabled csprogs download by default. Added client support for fitzquake's 666 protocol, needs testing, some cleanup for dp protocols too, no server support, couldn't selectively enable it anyway. Now attempting to cache shadow meshes for explosions and stuff. Played with lightmaps a little, should potentially run a little faster on certain (intel?) cards. Tweeked npfte a little to try to avoid deadlocks and crashes. Fixed sky worldspawn parsing. Added h2mp's model format. Fixed baseline issue in q2 client, made servers generate q2 baselines. MOVETYPE_PUSH will not rotate extra if rotation is forced. Made status command show allowed client types. Changed lighting on weapons - should now be shaded.
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3572 fc73d0e0-1445-4013-8a0c-d673dee63da5
2010-08-11 03:36:31 +00:00
snprintf ( fname , sizeof ( fname ) - 1 , tex_path [ i ] . path , nicename , extensions [ e ] ) ;
2004-10-10 06:32:29 +00:00
TRACE ( ( " dbg: Mod_LoadBumpmapTexture: opening %s \n " , fname ) ) ;
2014-10-05 20:04:11 +00:00
if ( ( buf = COM_LoadFile ( fname , 5 , & fsize ) ) )
2004-08-23 00:15:46 +00:00
{
2014-10-05 20:04:11 +00:00
if ( ( data = ReadTargaFile ( buf , fsize , & image_width , & image_height , & hasalpha , 2 ) ) ) //Only load a greyscale image.
2004-08-23 00:15:46 +00:00
{
2004-10-10 06:32:29 +00:00
TRACE ( ( " dbg: Mod_LoadBumpmapTexture: tga %s loaded \n " , name ) ) ;
2011-10-27 15:46:36 +00:00
TEXASSIGNF ( tex , R_LoadTexture8Bump ( name , image_width , image_height , data , IF_NOALPHA | IF_NOGAMMA ) ) ;
2004-08-23 00:15:46 +00:00
BZ_Free ( data ) ;
}
else
{
BZ_Free ( buf ) ;
continue ;
}
BZ_Free ( buf ) ;
2009-11-04 21:16:50 +00:00
return tex ;
2004-08-23 00:15:46 +00:00
}
}
}
2009-11-04 21:16:50 +00:00
return r_nulltex ;
2004-08-23 00:15:46 +00:00
}
2014-10-05 20:04:11 +00:00
# endif
2004-08-23 00:15:46 +00:00
2005-06-26 12:31:56 +00:00
// ocrana led functions
static int ledcolors [ 8 ] [ 3 ] =
{
// green
{ 0 , 255 , 0 } ,
{ 0 , 127 , 0 } ,
// red
{ 255 , 0 , 0 } ,
{ 127 , 0 , 0 } ,
// yellow
{ 255 , 255 , 0 } ,
{ 127 , 127 , 0 } ,
// blue
{ 0 , 0 , 255 } ,
{ 0 , 0 , 127 }
} ;
void AddOcranaLEDsIndexed ( qbyte * image , int h , int w )
{
int tridx [ 8 ] ; // transition indexes
qbyte * point ;
int i , idx , x , y , rs ;
int r , g , b , rd , gd , bd ;
2005-06-29 21:20:34 +00:00
// calc row size, character size
2005-06-26 12:31:56 +00:00
rs = w ;
h / = 16 ;
w / = 16 ;
2005-06-29 21:20:34 +00:00
// generate palettes
2005-06-26 12:31:56 +00:00
for ( i = 0 ; i < 4 ; i + + )
{
// get palette
r = ledcolors [ i * 2 ] [ 0 ] ;
g = ledcolors [ i * 2 ] [ 1 ] ;
b = ledcolors [ i * 2 ] [ 2 ] ;
rd = ( r - ledcolors [ i * 2 + 1 ] [ 0 ] ) / 8 ;
gd = ( g - ledcolors [ i * 2 + 1 ] [ 1 ] ) / 8 ;
bd = ( b - ledcolors [ i * 2 + 1 ] [ 2 ] ) / 8 ;
for ( idx = 0 ; idx < 8 ; idx + + )
{
2007-09-22 19:28:27 +00:00
tridx [ idx ] = GetPaletteIndex ( r , g , b ) ;
2005-06-26 12:31:56 +00:00
r - = rd ;
g - = gd ;
b - = bd ;
}
// generate LED into image
2005-06-29 21:20:34 +00:00
b = ( w * w + h * h ) / 16 ;
if ( b < 1 )
b = 1 ;
rd = w + 1 ;
gd = h + 1 ;
2005-06-26 12:31:56 +00:00
point = image + ( 8 * rs * h ) + ( ( 6 + i ) * w ) ;
for ( y = 1 ; y < = h ; y + + )
{
for ( x = 1 ; x < = w ; x + + )
{
2005-06-29 21:20:34 +00:00
r = rd - ( x * 2 ) ; r * = r ;
g = gd - ( y * 2 ) ; g * = g ;
idx = ( r + g ) / b ;
2007-10-12 10:27:51 +00:00
2005-06-29 21:20:34 +00:00
if ( idx > 7 )
* point + + = 0 ;
else
* point + + = tridx [ idx ] ;
2005-06-26 12:31:56 +00:00
}
point + = rs - w ;
}
}
2005-07-05 17:48:26 +00:00
}
2012-11-27 03:23:19 +00:00
# endif