eukara/ngunix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Warp resolution fix

Browse source
This commit is contained in:
eukos 2015-09-07 08:22:05 +02:00
parent 17a76c01bc
commit 023b90d805
4 changed files with 12 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
audio/snd_dma.c
View file

@ -263,10 +263,6 @@ Con_Printf("\n[SOUND] Initialization\n");
Con_Printf ("[SOUND] Sampling rate: %i\n", shm->speed);
// provides a tick sound until washed clean
// if (shm->buffer)
// shm->buffer[4] = shm->buffer[5] = 0x7f; // force a pop for debugging
ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav");
ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav");
@ -1181,15 +1177,11 @@ void S_Play(void)
}
else
strcpy(name, Cmd_Argv(i));
sfx = S_PrecacheSound(name);
S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 1.0);
// for (poop = 2; poop<8; poop++){
// float aw = 1.6 / poop;
// S_StartSoundDelayed(hash++, 0, sfx, listener_origin, (1 * aw), 1.0, (1 + aw));
//
// }
i++;
}
}
@ -1276,5 +1268,3 @@ void S_BeginPrecaching (void)
void S_EndPrecaching (void)
{
}

2
engine/console.c
View file

@ -101,7 +101,7 @@ void Con_ToggleConsole_f (void)
}
else{
key_dest = key_console;
VID_HandlePause (true);
VID_HandlePause (true);
}
SCR_EndLoadingPlaque ();

3
renderer/d_modech.c
View file

@ -111,6 +111,9 @@ void D_ViewChanged (void)
rowbytes = LOW_WIDTH;
else if (r_docrap == 2)
rowbytes = WARP_WIDTH;
if (r_dowarp && r_docrap == 1)
rowbytes = LOW_WIDTH;
else if (r_dowarp)
rowbytes = WARP_WIDTH;
else

59
renderer/r_sprite.c
View file

@ -22,13 +22,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "globaldef.h"
#include "r_local.h"
static int clip_current;
static vec5_t clip_verts[2][MAXWORKINGVERTS];
static int sprite_width, sprite_height;
static int clip_current;
static vec5_t clip_verts[2][MAXWORKINGVERTS];
static int sprite_width, sprite_height;
spritedesc_t r_spritedesc;
spritedesc_t r_spritedesc;
extern float lensreflection;
particle_t *currentparticle;
particle_t *currentparticle;
flare_t *currentflare;
extern int flared; // tells the renderer this is a flared flare
/*
@ -75,42 +75,6 @@ void R_RotateSprite3 (float beamlength)
}
/*
// for sparks
void R_RotateSprite2And (float beamlength)
{
vec3_t vec;
vec3_t verc;
// if (beamlength == 0.0)
// return;
VectorScale (r_spritedesc.vpn, -beamlength, vec);
VectorAdd (currentparticle->org, vec, currentparticle->org);
VectorSubtract (modelorg, vec, modelorg);
VectorAdd(currentparticle->org,verc, currentparticle->vel);
VectorAdd (verc, vec, verc);
VectorSubtract (modelorg, vec, modelorg);
}
void R_RotateSprite3What (float beamlength)
{
vec3_t vec;
float lensref;
lensref = temp2->value + 1;
/// if (beamlength == 0.0)
// return;
//VectorScale (r_spritedesc.vpn, -beamlength, vec);
VectorScale (r_spritedesc.vpn, lensref, vec);
// VectorAdd (currentflare->org, vec, currentflare->org);
VectorSubtract (modelorg, vec, modelorg);
}
*/
/*
=============
R_ClipSpriteFace
@ -212,16 +176,7 @@ void R_SetupAndDrawSprite ()
// backface cull
if (dot >= 0)
return;
// build the sprite poster in worldspace
/*
VectorScale (r_spritedesc.vright, r_spritedesc.pspriteframe->right, right);
VectorScale (r_spritedesc.vup, r_spritedesc.pspriteframe->up, up);
VectorScale (r_spritedesc.vright, r_spritedesc.pspriteframe->left, left);
VectorScale (r_spritedesc.vup, r_spritedesc.pspriteframe->down, down);
*/
// Manoel Kasimier - QC Scale - edited - begin
#ifdef SCALEE
VectorScale (r_spritedesc.vright, r_spritedesc.pspriteframe->right*currententity->scale2, right);
@ -240,7 +195,7 @@ void R_SetupAndDrawSprite ()
pverts = clip_verts[0];
pverts[0][0] = r_entorigin[0] + up[0] + left[0];
pverts[0][0] = r_entorigin[0] + up[0] + left[0];
pverts[0][1] = r_entorigin[1] + up[1] + left[1];
pverts[0][2] = r_entorigin[2] + up[2] + left[2];
pverts[0][3] = 0;