zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 19:20:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Couple of things from JonoF. Incidentally, they are commented out. This commit sucks. :D

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@118 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-26 19:32:18 +00:00
parent e316013c1d
commit dbd7df89de
3 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
polymer/build/src/engine.c
View file

@ -6093,10 +6093,6 @@ void drawmapview(long dax, long day, long zoome, short ang)
long bakgxvect, bakgyvect, sortnum, gap, npoints; long bakgxvect, bakgyvect, sortnum, gap, npoints;
long xvect, yvect, xvect2, yvect2, daslope; long xvect, yvect, xvect2, yvect2, daslope;
#ifdef POLYMOST
//if (rendmode == 3) return;
#endif
beforedrawrooms = 0; beforedrawrooms = 0;
clearbuf(&gotsector[0],(long)((numsectors+31)>>5),0L); clearbuf(&gotsector[0],(long)((numsectors+31)>>5),0L);
@ -6178,7 +6174,7 @@ void drawmapview(long dax, long day, long zoome, short ang)
if (palookup[sec->floorpal] != globalpalwritten) if (palookup[sec->floorpal] != globalpalwritten)
{ {
globalpalwritten = palookup[sec->floorpal]; globalpalwritten = palookup[sec->floorpal];
if (!globalpalwritten) globalpalwritten = palookup[globalpal]; // JBF: fixes null-pointer crash if (!globalpalwritten) globalpalwritten = palookup[0]; // JBF: fixes null-pointer crash
setpalookupaddress(globalpalwritten); setpalookupaddress(globalpalwritten);
} }
globalpicnum = sec->floorpicnum; globalpicnum = sec->floorpicnum;
@ -9897,11 +9893,13 @@ void drawline256(long x1, long y1, long x2, long y2, char col)
setpolymost2dview(); // JBF 20040205: more efficient setup setpolymost2dview(); // JBF 20040205: more efficient setup
//bglEnable(GL_BLEND); // When using line antialiasing, this is needed
bglBegin(GL_LINES); bglBegin(GL_LINES);
bglColor4ub(p.r,p.g,p.b,255); bglColor4ub(p.r,p.g,p.b,255);
bglVertex2f((float)x1/4096.0,(float)y1/4096.0); bglVertex2f((float)x1/4096.0,(float)y1/4096.0);
bglVertex2f((float)x2/4096.0,(float)y2/4096.0); bglVertex2f((float)x2/4096.0,(float)y2/4096.0);
bglEnd(); bglEnd();
//bglDisable(GL_BLEND);
return; return;
} }

13
polymer/build/src/jfaud_sound.cpp
View file

@ -1,15 +1,16 @@
#ifdef __APPLE__
# include <jfaud/jfaud.hpp>
#else
# include "jfaud.hpp"
#endif
#include <ctype.h> #include <ctype.h>
#include "compat.h" #include "compat.h"
#include "baselayer.h" #include "baselayer.h"
#include "cache1d.h" #include "cache1d.h"
typedef uint64 uint64_t;
#ifdef __APPLE__
# include <jfaud/jfaud.hpp>
#else
# include "jfaud.hpp"
#endif
extern "C" { extern "C" {
void initsb(char,char,long,char,char,char,char); void initsb(char,char,long,char,char,char,char);
void uninitsb(void); void uninitsb(void);

13
polymer/build/src/polymost.c
View file

@ -543,6 +543,9 @@ void polymost_glinit()
bglBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); bglBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
//bglHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
//bglEnable(GL_LINE_SMOOTH);
if (glmultisample > 0 && glinfo.multisample) { if (glmultisample > 0 && glinfo.multisample) {
if (glinfo.nvmultisamplehint) if (glinfo.nvmultisamplehint)
bglHint(GL_MULTISAMPLE_FILTER_HINT_NV, glnvmultisamplehint ? GL_NICEST:GL_FASTEST); bglHint(GL_MULTISAMPLE_FILTER_HINT_NV, glnvmultisamplehint ? GL_NICEST:GL_FASTEST);
@ -2755,11 +2758,11 @@ static void polymost_drawalls (long bunch)
if ((oy < cy0) && (oy < cy1)) domost(x1,oy,x0,oy); if ((oy < cy0) && (oy < cy1)) domost(x1,oy,x0,oy);
else if ((oy < cy0) != (oy < cy1)) else if ((oy < cy0) != (oy < cy1))
{ /* cy1 cy0 { /* cy1 cy0
// / \ // / \
//oy---------- oy--------- //oy---------- oy---------
// / \ // / \
// cy0 cy1 // cy0 cy1
*/ */
ox = (oy-cy0)*(x1-x0)/(cy1-cy0) + x0; ox = (oy-cy0)*(x1-x0)/(cy1-cy0) + x0;
if (oy < cy0) { domost(ox,oy,x0,oy); domost(x1,cy1,ox,oy); } if (oy < cy0) { domost(ox,oy,x0,oy); domost(x1,cy1,ox,oy); }
else { domost(ox,oy,x0,cy0); domost(x1,oy,ox,oy); } else { domost(ox,oy,x0,cy0); domost(x1,oy,ox,oy); }