A little more progress

This commit is contained in:
Joseph Carter 2000-05-12 23:19:23 +00:00
parent 2464548ffd
commit 9adb98d87e
7 changed files with 1557 additions and 156 deletions

View file

@ -20,6 +20,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// disable data conversion warnings
#ifdef _WIN32
#pragma warning(disable : 4244) // MIPS
#pragma warning(disable : 4136) // X86
#pragma warning(disable : 4051) // ALPHA
#include <windows.h>
#endif
@ -235,8 +239,8 @@ void GL_Bind (int texnum);
#define TEXTURE1_SGIS 0x835F
#ifdef _WIN32
typedef void (APIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat);
typedef void (APIENTRY *lpSelTexFUNC) (GLenum);
typedef void (GLAPIENTRY *lpMTexFUNC) (GLenum, GLfloat, GLfloat);
typedef void (GLAPIENTRY *lpSelTexFUNC) (GLenum);
extern lpMTexFUNC qglMTexCoord2fSGIS;
extern lpSelTexFUNC qglSelectTextureSGIS;
#endif
@ -270,6 +274,9 @@ void R_RotateForEntity (entity_t *e);
//
// gl_rlight.c
//
extern float v_blend[4];
void R_MarkLights (dlight_t *light, int bit, mnode_t *node);
void R_AnimateLight (void);
void R_RenderDlights (void);

View file

@ -56,12 +56,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "render.h"
#include "client.h"
#ifdef GLQUAKE
#include "gl_model.h"
#else
#include "model.h"
#include "d_iface.h"
#endif
//#ifdef GLQUAKE
//#include "gl_model.h"
//#else
//#include "model.h"
//#include "d_iface.h"
//#endif
#include "input.h"
#include "keys.h"
@ -72,9 +72,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "cdaudio.h"
#include "pmove.h"
#ifdef GLQUAKE
#include "glquake.h"
#endif
//#ifdef GLQUAKE
//#include "glquake.h"
//#endif
#ifndef max
#define max(a,b) ((a) > (b) ? (a) : (b))