TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

made lines width scale to resolution; fixed compiler warnings

Browse source
This commit is contained in:
zicodxx 2006-10-20 23:18:04 +00:00
parent 8cb08cd86f
commit 8de8a3f968
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
arch/ogl/ogl.c
View file

@ -136,7 +136,7 @@ extern GLubyte texbuf[OGLTEXBUFSIZE];
void ogl_filltexbuf(unsigned char *data, GLubyte *texp, int truewidth, int width, int height, int dxo, int dyo, int twidth, int theight, int type, int bm_flags, int data_format); void ogl_filltexbuf(unsigned char *data, GLubyte *texp, int truewidth, int width, int height, int dxo, int dyo, int twidth, int theight, int type, int bm_flags, int data_format);
void ogl_loadbmtexture(grs_bitmap *bm); void ogl_loadbmtexture(grs_bitmap *bm);
//void ogl_loadtexture(unsigned char * data, int width, int height,int dxo,intdyo , int *texid,float *u,float *v,char domipmap,float prio); //void ogl_loadtexture(unsigned char * data, int width, int height,int dxo,intdyo , int *texid,float *u,float *v,char domipmap,float prio);
void ogl_loadtexture(unsigned char *data, int dxo, int dyo, ogl_texture *tex, int bm_flags, int data_format); int ogl_loadtexture(unsigned char *data, int dxo, int dyo, ogl_texture *tex, int bm_flags, int data_format);
void ogl_freetexture(ogl_texture *gltexture); void ogl_freetexture(ogl_texture *gltexture);
void ogl_do_palfx(void); void ogl_do_palfx(void);
@ -552,6 +552,7 @@ bool g3_draw_line(g3s_point *p0,g3s_point *p1)
int c; int c;
c=grd_curcanv->cv_color; c=grd_curcanv->cv_color;
OGL_DISABLE(TEXTURE_2D); OGL_DISABLE(TEXTURE_2D);
glLineWidth(grd_curscreen->sc_w/640);
glColor3f(PAL2Tr(c),PAL2Tg(c),PAL2Tb(c)); glColor3f(PAL2Tr(c),PAL2Tg(c),PAL2Tb(c));
glBegin(GL_LINES); glBegin(GL_LINES);
glVertex3f(f2glf(p0->p3_vec.x),f2glf(p0->p3_vec.y),-f2glf(p0->p3_vec.z)); glVertex3f(f2glf(p0->p3_vec.x),f2glf(p0->p3_vec.y),-f2glf(p0->p3_vec.z));
@ -602,6 +603,7 @@ void ogl_draw_reticle(int cross,int primary,int secondary){
if (!cross_lh[cross]){ if (!cross_lh[cross]){
cross_lh[cross]=glGenLists(1); cross_lh[cross]=glGenLists(1);
glNewList(cross_lh[cross], GL_COMPILE_AND_EXECUTE); glNewList(cross_lh[cross], GL_COMPILE_AND_EXECUTE);
glLineWidth(grd_curscreen->sc_w/640);
glBegin(GL_LINES); glBegin(GL_LINES);
//cross top left //cross top left
glColor3fv(darker_g); glColor3fv(darker_g);
@ -645,8 +647,8 @@ void ogl_draw_reticle(int cross,int primary,int secondary){
if (!primary_lh[primary]){ if (!primary_lh[primary]){
primary_lh[primary]=glGenLists(1); primary_lh[primary]=glGenLists(1);
glNewList(primary_lh[primary], GL_COMPILE_AND_EXECUTE); glNewList(primary_lh[primary], GL_COMPILE_AND_EXECUTE);
glColor3fv(dark_g); glColor3fv(dark_g);
glLineWidth(grd_curscreen->sc_w/640);
glBegin(GL_LINES); glBegin(GL_LINES);
//left primary bar //left primary bar
glVertex2f(-14.0,-8.0); glVertex2f(-14.0,-8.0);
@ -1738,7 +1740,7 @@ void tex_set_size(ogl_texture *tex){
//In theory this could be a problem for repeating textures, but all real //In theory this could be a problem for repeating textures, but all real
//textures (not sprites, etc) in descent are 64x64, so we are ok. //textures (not sprites, etc) in descent are 64x64, so we are ok.
//stores OpenGL textured id in *texid and u/v values required to get only the real data in *u/*v //stores OpenGL textured id in *texid and u/v values required to get only the real data in *u/*v
void ogl_loadtexture (unsigned char *data, int dxo, int dyo, ogl_texture *tex, int bm_flags, int data_format) int ogl_loadtexture (unsigned char *data, int dxo, int dyo, ogl_texture *tex, int bm_flags, int data_format)
{ {
GLubyte *bufP = texbuf; GLubyte *bufP = texbuf;
tex->tw = pow2ize (tex->w); tex->tw = pow2ize (tex->w);
@ -1756,7 +1758,7 @@ void ogl_loadtexture (unsigned char *data, int dxo, int dyo, ogl_texture *tex, i
tex->u = (float) ((double) tex->w / (double) tex->tw); tex->u = (float) ((double) tex->w / (double) tex->tw);
tex->v = (float) ((double) tex->h / (double) tex->th); tex->v = (float) ((double) tex->h / (double) tex->th);
if (data) if (data) {
if (bm_flags >= 0) if (bm_flags >= 0)
ogl_filltexbuf (data, texbuf, tex->lw, tex->w, tex->h, dxo, dyo, tex->tw, tex->th, ogl_filltexbuf (data, texbuf, tex->lw, tex->w, tex->h, dxo, dyo, tex->tw, tex->th,
tex->format, bm_flags, data_format); tex->format, bm_flags, data_format);
@ -1767,7 +1769,7 @@ void ogl_loadtexture (unsigned char *data, int dxo, int dyo, ogl_texture *tex, i
if (!dxo && !dyo && (tex->w == tex->tw) && (tex->h == tex->th)) if (!dxo && !dyo && (tex->w == tex->tw) && (tex->h == tex->th))
bufP = data; bufP = data;
else { else {
int y, h, w, tw; int h, w, tw;
h = tex->lw / tex->w; h = tex->lw / tex->w;
w = (tex->w - dxo) * h; w = (tex->w - dxo) * h;
@ -1775,7 +1777,7 @@ void ogl_loadtexture (unsigned char *data, int dxo, int dyo, ogl_texture *tex, i
bufP = texbuf; bufP = texbuf;
tw = tex->tw * h; tw = tex->tw * h;
h = tw - w; h = tw - w;
for (y; dyo < tex->h; dyo++, data += tex->lw) { for (; dyo < tex->h; dyo++, data += tex->lw) {
memcpy (bufP, data, w); memcpy (bufP, data, w);
bufP += w; bufP += w;
memset (bufP, 0, h); memset (bufP, 0, h);
@ -1786,6 +1788,7 @@ void ogl_loadtexture (unsigned char *data, int dxo, int dyo, ogl_texture *tex, i
} }
#endif #endif
} }
}
// Generate OpenGL texture IDs. // Generate OpenGL texture IDs.
glGenTextures (1, &tex->handle); glGenTextures (1, &tex->handle);
//set priority //set priority