archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

rest of c comment translations render files

Browse Source
This commit is contained in:
Ton Roosendaal
2003-04-28 11:25:42 +00:00
parent 52f6a630ce
commit dfb34836bb
6 changed files with 162 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/render/intern/source/renderHelp.c
View File

@@ -75,7 +75,7 @@ void setPanoRot(int part)
/* extern float panovco, panovsi; */ /* extern float panovco, panovsi; */
static float alpha= 1.0; static float alpha= 1.0;
/* part==0 alles initialiseren */ /* part==0 init all */
if(part==0) { if(part==0) {
@@ -84,7 +84,7 @@ void setPanoRot(int part)
} }
/* we roteren alles om de y-as met phi graden */ /* rotate it all around the y-as with phi degrees */
panophi= -0.5*(R.r.xparts-1)*alpha + part*alpha; panophi= -0.5*(R.r.xparts-1)*alpha + part*alpha;
@@ -98,7 +98,7 @@ void setPanoRot(int part)
static int panotestclip(float *v) static int panotestclip(float *v)
{ {
/* gebruiken voor halo's en info's */ /* to be used for halos en infos */
float abs4; float abs4;
short c=0; short c=0;
@@ -106,7 +106,7 @@ static int panotestclip(float *v)
abs4= fabs(v[3]); abs4= fabs(v[3]);
if(v[2]< -abs4) c=16; /* hier stond vroeger " if(v[2]<0) ", zie clippz() */ if(v[2]< -abs4) c=16; /* this used to be " if(v[2]<0) ", see clippz() */
else if(v[2]> abs4) c+= 32; else if(v[2]> abs4) c+= 32;
if( v[1]>abs4) c+=4; if( v[1]>abs4) c+=4;
@@ -134,7 +134,7 @@ static int panotestclip(float *v)
/* move to renderer */ /* move to renderer */
void setzbufvlaggen( void (*projectfunc)(float *, float *) ) void setzbufvlaggen( void (*projectfunc)(float *, float *) )
/* ook homoco's */ /* homocos too */
{ {
VlakRen *vlr = NULL; VlakRen *vlr = NULL;
VertRen *ver = NULL; VertRen *ver = NULL;
@@ -189,12 +189,12 @@ void setzbufvlaggen( void (*projectfunc)(float *, float *) )
hoco[3]*= 2.0; hoco[3]*= 2.0;
if( panotestclip(hoco) ) { if( panotestclip(hoco) ) {
har->miny= har->maxy= -10000; /* de render clipt 'm weg */ har->miny= har->maxy= -10000; /* that way render clips it */
} }
else if(hoco[3]<0.0) { else if(hoco[3]<0.0) {
har->miny= har->maxy= -10000; /* de render clipt 'm weg */ har->miny= har->maxy= -10000; /* render clips it */
} }
else /* this seems to be strange code here...*/ else /* do the projection...*/
{ {
zn= hoco[3]/2.0; zn= hoco[3]/2.0;
har->xs= 0.5*R.rectx*(1.0+hoco[0]/zn); /* the 0.5 negates the previous 2...*/ har->xs= 0.5*R.rectx*(1.0+hoco[0]/zn); /* the 0.5 negates the previous 2...*/
@@ -210,7 +210,7 @@ void setzbufvlaggen( void (*projectfunc)(float *, float *) )
zn= hoco[3]; zn= hoco[3];
har->rad= fabs(har->xs- 0.5*R.rectx*(1.0+hoco[0]/zn)); har->rad= fabs(har->xs- 0.5*R.rectx*(1.0+hoco[0]/zn));
/* deze clip is eigenlijk niet OK */ /* this clip is not really OK, to prevent stars to become too large */
if(har->type & HA_ONLYSKY) { if(har->type & HA_ONLYSKY) {
if(har->rad>3.0) har->rad= 3.0; if(har->rad>3.0) har->rad= 3.0;
} }
@@ -220,9 +220,9 @@ void setzbufvlaggen( void (*projectfunc)(float *, float *) )
har->miny= har->ys - har->rad/R.ycor; har->miny= har->ys - har->rad/R.ycor;
har->maxy= har->ys + har->rad/R.ycor; har->maxy= har->ys + har->rad/R.ycor;
/* de Zd is bij pano nog steeds verkeerd: zie testfile in blenderbugs/halo+pano.blend */ /* the Zd value is still not really correct for pano */
vec[2]-= har->hasize; /* z is negatief, wordt anders geclipt */ vec[2]-= har->hasize; /* z negative, otherwise it's clipped */
projectfunc(vec, hoco); projectfunc(vec, hoco);
zn= hoco[3]; zn= hoco[3];
zn= fabs(har->zs - 0x7FFFFF*(1.0+hoco[2]/zn)); zn= fabs(har->zs - 0x7FFFFF*(1.0+hoco[2]/zn));
@@ -237,7 +237,7 @@ void setzbufvlaggen( void (*projectfunc)(float *, float *) )
} }
/* vlaggen op 0 zetten als eruit geclipt */ /* set flags at 0 if clipped away */
for(a=0; a<R.totvlak; a++) { for(a=0; a<R.totvlak; a++) {
if((a & 255)==0) vlr= R.blovl[a>>8]; if((a & 255)==0) vlr= R.blovl[a>>8];
else vlr++; else vlr++;
@@ -261,13 +261,13 @@ void set_normalflags(void)
float vec[3], xn, yn, zn; float vec[3], xn, yn, zn;
int a1; int a1;
/* KLAP NORMAAL EN SNIJ PROJECTIE */ /* switch normal 'snproj' values (define which axis is the optimal one for calculations) */
for(a1=0; a1<R.totvlak; a1++) { for(a1=0; a1<R.totvlak; a1++) {
if((a1 & 255)==0) vlr= R.blovl[a1>>8]; if((a1 & 255)==0) vlr= R.blovl[a1>>8];
else vlr++; else vlr++;
if(vlr->flag & R_NOPUNOFLIP) { if(vlr->flag & R_NOPUNOFLIP) {
/* render normaal flippen, wel niet zo netjes, maar anders dan moet de render() ook over... */ /* we flip render normal here, is not that neat, but otherwise render() needs rewrite... */
vlr->n[0]= -vlr->n[0]; vlr->n[0]= -vlr->n[0];
vlr->n[1]= -vlr->n[1]; vlr->n[1]= -vlr->n[1];
vlr->n[2]= -vlr->n[2]; vlr->n[2]= -vlr->n[2];

2
source/blender/render/intern/source/renderPreAndPost.c
View File

@@ -63,7 +63,7 @@ void prepareScene()
RE_local_get_renderdata(); RE_local_get_renderdata();
/* SCHADUWBUFFER */ /* SHADOW BUFFER */
for(a=0; a<R.totlamp; a++) { for(a=0; a<R.totlamp; a++) {
if(RE_local_test_break()) break; if(RE_local_test_break()) break;
/* Again, switch between old and new shadowing system. The /* Again, switch between old and new shadowing system. The

2
source/blender/render/intern/source/renderdatabase.c
View File

@@ -161,7 +161,7 @@ HaloRen *RE_inithalo(Material *ma,
VECCOPY(har->co, vec); VECCOPY(har->co, vec);
har->hasize= hasize; har->hasize= hasize;
/* projectvert wordt in zbufvlaggen gedaan ivm parts/border/pano */ /* projectvert is done function 'zbufvlaggen' because of parts/border/pano */
/* halovect */ /* halovect */
if(vec1) { if(vec1) {

132
source/blender/render/intern/source/shadbuf.c
View File

@@ -84,7 +84,7 @@ void initshadowbuf(LampRen *lar, float mat[][4])
/* if(la->spsi<16) return; */ /* if(la->spsi<16) return; */
/* geheugen reserveren */ /* memory reservation */
shb= (struct ShadBuf *)MEM_callocN( sizeof(struct ShadBuf),"initshadbuf"); shb= (struct ShadBuf *)MEM_callocN( sizeof(struct ShadBuf),"initshadbuf");
lar->shb= shb; lar->shb= shb;
@@ -92,7 +92,7 @@ void initshadowbuf(LampRen *lar, float mat[][4])
VECCOPY(shb->co, lar->co); VECCOPY(shb->co, lar->co);
/* percentage: min en max in de gaten houden */ /* percentage render: keep track of min and max */
shb->size= (lar->bufsize*R.r.size)/100; shb->size= (lar->bufsize*R.r.size)/100;
if(shb->size<512) shb->size= 512; if(shb->size<512) shb->size= 512;
else if(shb->size > lar->bufsize) shb->size= lar->bufsize; else if(shb->size > lar->bufsize) shb->size= lar->bufsize;
@@ -112,14 +112,14 @@ void initshadowbuf(LampRen *lar, float mat[][4])
} }
MTC_Mat4Ortho(mat); MTC_Mat4Ortho(mat);
MTC_Mat4Invert(shb->winmat, mat); /* winmat is hier temp */ MTC_Mat4Invert(shb->winmat, mat); /* winmat is temp */
/* matrix: combinatie van inverse view en lampmat */ /* matrix: combination of inverse view and lampmat */
/* opnieuw berekenen: de ortho-render heeft geen correcte viewinv */ /* calculate again: the ortho-render has no correct viewinv */
MTC_Mat4Invert(viewinv, R.viewmat); MTC_Mat4Invert(viewinv, R.viewmat);
MTC_Mat4MulMat4(shb->viewmat, viewinv, shb->winmat); MTC_Mat4MulMat4(shb->viewmat, viewinv, shb->winmat);
/* projektie */ /* projection */
hoek= saacos(lar->spotsi); hoek= saacos(lar->spotsi);
temp= 0.5*shb->size*cos(hoek)/sin(hoek); temp= 0.5*shb->size*cos(hoek)/sin(hoek);
shb->d= lar->clipsta; shb->d= lar->clipsta;
@@ -127,7 +127,8 @@ void initshadowbuf(LampRen *lar, float mat[][4])
shb->pixsize= (shb->d)/temp; shb->pixsize= (shb->d)/temp;
shb->far= lar->clipend; shb->far= lar->clipend;
/* bias is percentage, 2x groter gemaakt ivm invalshoek correctie */ /* bias is percentage, made 2x karger because of correction for angle of incidence */
/* when a ray is closer to parallel of a face, bias value is increased during render */
shb->bias= (0.02*lar->bias)*0x7FFFFFFF; shb->bias= (0.02*lar->bias)*0x7FFFFFFF;
shb->bias= shb->bias*(100/R.r.size); shb->bias= shb->bias*(100/R.r.size);
@@ -135,7 +136,7 @@ void initshadowbuf(LampRen *lar, float mat[][4])
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
void lrectreadRectz(int x1, int y1, int x2, int y2, char *r1) /* leest deel uit rectz in r1 */ void lrectreadRectz(int x1, int y1, int x2, int y2, char *r1) /* reads part from rectz in r1 */
{ {
unsigned int len4, *rz; unsigned int len4, *rz;
@@ -203,14 +204,14 @@ void makeshadowbuf(LampRen *lar)
panophi = getPanoPhi(); panophi = getPanoPhi();
/* viewvars onthouden */ /* store viewvars */
temprx= R.rectx; tempry= R.recty; temprx= R.rectx; tempry= R.recty;
R.rectx= R.recty= shb->size; R.rectx= R.recty= shb->size;
shb->jit= give_jitter_tab(shb->samp); shb->jit= give_jitter_tab(shb->samp);
/* matrices en window: in R.winmat komt transformatie /* matrices and window: in R.winmat the transformation is being put,
van obsview naar lampview, inclusief lampwinmat */ transforming from observer view to lamp view, including lamp window matrix */
wsize= shb->pixsize*(shb->size/2.0); wsize= shb->pixsize*(shb->size/2.0);
@@ -221,12 +222,12 @@ void makeshadowbuf(LampRen *lar)
/* temp, will be restored */ /* temp, will be restored */
MTC_Mat4SwapMat4(shb->persmat, R.winmat); MTC_Mat4SwapMat4(shb->persmat, R.winmat);
/* zbufferen */ /* zbuffering */
if(R.rectz) MEM_freeN(R.rectz); if(R.rectz) MEM_freeN(R.rectz);
R.rectz= (unsigned int *)MEM_mallocN(sizeof(int)*shb->size*shb->size,"makeshadbuf"); R.rectz= (unsigned int *)MEM_mallocN(sizeof(int)*shb->size*shb->size,"makeshadbuf");
rcline= MEM_mallocN(256*4+sizeof(int),"makeshadbuf2"); rcline= MEM_mallocN(256*4+sizeof(int),"makeshadbuf2");
/* onthouden: panorama rot */ /* store: panorama rot */
temp= panophi; temp= panophi;
panophi= 0.0; panophi= 0.0;
pushTempPanoPhi(0.0); pushTempPanoPhi(0.0);
@@ -239,23 +240,9 @@ void makeshadowbuf(LampRen *lar)
zbuffershad(lar); zbuffershad(lar);
/* alle pixels 1 x ingevuld verwijderen (oneven) */
/* probleem hierbij kan geven dat er abrupte overgangen van zacht gebied
* naar geen zacht gebied is: bijv als eronder een klein vlakje zit
* DAAROM ER WEER UIT
* ook vanwege shadowhalo!
*
a= shb->size*shb->size;
rz= R.rectz;
while(a--) {
if(*rz & 1) *rz= 0x7FFFFFFF;
rz++;
}
*/
square= lar->mode & LA_SQUARE; square= lar->mode & LA_SQUARE;
/* Z tiles aanmaken: dit systeem is 24 bits!!! */ /* create Z tiles (for compression): this system is 24 bits!!! */
ztile= shb->zbuf; ztile= shb->zbuf;
ctile= shb->cbuf; ctile= shb->cbuf;
@@ -265,7 +252,7 @@ void makeshadowbuf(LampRen *lar)
for(x=0; x<shb->size; x+=16) { for(x=0; x<shb->size; x+=16) {
/* ligt rechthoek binnen spotbundel? */ /* is tile within spotbundle? */
a= shb->size/2; a= shb->size/2;
if(x< a) minx= x+15-a; if(x< a) minx= x+15-a;
else minx= x-a; else minx= x-a;
@@ -286,13 +273,13 @@ void makeshadowbuf(LampRen *lar)
if( (*rz1 & 0xFFFFFF00) !=verg) break; if( (*rz1 & 0xFFFFFF00) !=verg) break;
} }
} }
if(a==256) { /* compleet leeg vakje */ if(a==256) { /* complete empty tile */
*ctile= 0; *ctile= 0;
*ztile= *(rz1-1); *ztile= *(rz1-1);
} }
else { else {
/* ACOMP enz. zijn defined L/B endian */ /* ACOMP etc. are defined to work L/B endian */
rc= rcline; rc= rcline;
rz1= (int *)rcline; rz1= (int *)rcline;
@@ -306,7 +293,7 @@ void makeshadowbuf(LampRen *lar)
if(byt1==0) break; if(byt1==0) break;
} }
if(byt1 && byt2) { /* alleen byte opslaan */ if(byt1 && byt2) { /* only store byte */
*ctile= 1; *ctile= 1;
*ztile= (unsigned long)MEM_mallocN(256+4, "tile1"); *ztile= (unsigned long)MEM_mallocN(256+4, "tile1");
rz= (int *)*ztile; rz= (int *)*ztile;
@@ -316,7 +303,7 @@ void makeshadowbuf(LampRen *lar)
rc= rcline; rc= rcline;
for(a=0; a<256; a++, zt++, rc+=4) *zt= rc[GCOMP]; for(a=0; a<256; a++, zt++, rc+=4) *zt= rc[GCOMP];
} }
else if(byt1) { /* short opslaan */ else if(byt1) { /* only store short */
*ctile= 2; *ctile= 2;
*ztile= (unsigned long)MEM_mallocN(2*256+4,"Tile2"); *ztile= (unsigned long)MEM_mallocN(2*256+4,"Tile2");
rz= (int *)*ztile; rz= (int *)*ztile;
@@ -329,7 +316,7 @@ void makeshadowbuf(LampRen *lar)
zt[1]= rc[GCOMP]; zt[1]= rc[GCOMP];
} }
} }
else { /* triple opslaan */ else { /* store triple */
*ctile= 3; *ctile= 3;
*ztile= (unsigned long)MEM_mallocN(3*256,"Tile3"); *ztile= (unsigned long)MEM_mallocN(3*256,"Tile3");
@@ -358,7 +345,7 @@ void makeshadowbuf(LampRen *lar)
int firstreadshadbuf(struct ShadBuf *shb, int xs, int ys, int nr) int firstreadshadbuf(struct ShadBuf *shb, int xs, int ys, int nr)
{ {
/* return 1 als volledig gecomprimeerde shadbuftile && z==const */ /* return a 1 if fully compressed shadbuf-tile && z==const */
static int *rz; static int *rz;
int ofs; int ofs;
char *ct; char *ct;
@@ -367,7 +354,7 @@ int firstreadshadbuf(struct ShadBuf *shb, int xs, int ys, int nr)
if(xs<0) xs= 0; else if(xs>=shb->size) xs= shb->size-1; if(xs<0) xs= 0; else if(xs>=shb->size) xs= shb->size-1;
if(ys<0) ys= 0; else if(ys>=shb->size) ys= shb->size-1; if(ys<0) ys= 0; else if(ys>=shb->size) ys= shb->size-1;
/* z berekenen */ /* calc z */
ofs= (ys>>4)*(shb->size>>4) + (xs>>4); ofs= (ys>>4)*(shb->size>>4) + (xs>>4);
ct= shb->cbuf+ofs; ct= shb->cbuf+ofs;
if(*ct==0) { if(*ct==0) {
@@ -383,7 +370,7 @@ int firstreadshadbuf(struct ShadBuf *shb, int xs, int ys, int nr)
return 0; return 0;
} }
float readshadowbuf(struct ShadBuf *shb, int xs, int ys, int zs) /* return 1.0 : volledig licht */ float readshadowbuf(struct ShadBuf *shb, int xs, int ys, int zs) /* return 1.0 : fully in light */
{ {
float temp; float temp;
int *rz, ofs; int *rz, ofs;
@@ -398,7 +385,7 @@ float readshadowbuf(struct ShadBuf *shb, int xs, int ys, int zs) /* return 1.0 :
if(xs<0) xs= 0; else if(xs>=shb->size) xs= shb->size-1; if(xs<0) xs= 0; else if(xs>=shb->size) xs= shb->size-1;
if(ys<0) ys= 0; else if(ys>=shb->size) ys= shb->size-1; if(ys<0) ys= 0; else if(ys>=shb->size) ys= shb->size-1;
/* z berekenen */ /* calc z */
ofs= (ys>>4)*(shb->size>>4) + (xs>>4); ofs= (ys>>4)*(shb->size>>4) + (xs>>4);
ct= shb->cbuf+ofs; ct= shb->cbuf+ofs;
rz= *( (int **)(shb->zbuf+ofs) ); rz= *( (int **)(shb->zbuf+ofs) );
@@ -429,16 +416,16 @@ float readshadowbuf(struct ShadBuf *shb, int xs, int ys, int zs) /* return 1.0 :
} }
else { else {
/* got warning on this from alpha .... */ /* got warning on this from DEC alpha (64 bits).... */
/* but it's working code! (ton) */ /* but it's working code! (ton) */
zsamp= (int) rz; zsamp= (int) rz;
} }
/* if(zsamp >= 0x7FFFFE00) return 1.0; */ /* geen schaduw als op oneindig wordt gesampeld*/ /* if(zsamp >= 0x7FFFFE00) return 1.0; */ /* no shaduw when sampling at eternal distance */
if(zsamp > zs) return 1.0; /* absoluut geen schaduw */ if(zsamp > zs) return 1.0; /* absolute no shadow */
else if( zsamp < zs-bias) return 0.0 ; /* absoluut wel schaduw */ else if( zsamp < zs-bias) return 0.0 ; /* absolute in shadow */
else { /* zacht gebied */ else { /* soft area */
temp= ( (float)(zs- zsamp) )/(float)bias; temp= ( (float)(zs- zsamp) )/(float)bias;
return 1.0 - temp*temp; return 1.0 - temp*temp;
@@ -447,7 +434,7 @@ float readshadowbuf(struct ShadBuf *shb, int xs, int ys, int zs) /* return 1.0 :
} }
float testshadowbuf(struct ShadBuf *shb, float inp) /* return 1.0: geen schaduw */ float testshadowbuf(struct ShadBuf *shb, float inp) /* return 1.0: no shadow at all */
{ {
float fac, co[4], dx[3], dy[3], aantal=0; float fac, co[4], dx[3], dy[3], aantal=0;
float xs1,ys1, siz, *j, xres, yres; float xs1,ys1, siz, *j, xres, yres;
@@ -460,12 +447,12 @@ float testshadowbuf(struct ShadBuf *shb, float inp) /* return 1.0: geen schadu
/* if(inp <= 0.0) return 1.0; */ /* if(inp <= 0.0) return 1.0; */
/* renderco en osaco roteren */ /* rotate renderco en osaco */
siz= 0.5*(float)shb->size; siz= 0.5*(float)shb->size;
VECCOPY(co, R.co); VECCOPY(co, R.co);
co[3]= 1.0; co[3]= 1.0;
MTC_Mat4MulVec4fl(shb->persmat, co); /* rationele hom co */ MTC_Mat4MulVec4fl(shb->persmat, co); /* rational hom co */
xs1= siz*(1.0+co[0]/co[3]); xs1= siz*(1.0+co[0]/co[3]);
ys1= siz*(1.0+co[1]/co[3]); ys1= siz*(1.0+co[1]/co[3]);
@@ -483,7 +470,7 @@ float testshadowbuf(struct ShadBuf *shb, float inp) /* return 1.0: geen schadu
zs= ((float)0x7FFFFFFF)*fac; zs= ((float)0x7FFFFFFF)*fac;
/* num*num samples nemen, gebied met fac vergroten */ /* take num*num samples, increase area with fac */
num= shb->samp*shb->samp; num= shb->samp*shb->samp;
fac= shb->soft; fac= shb->soft;
@@ -498,7 +485,7 @@ float testshadowbuf(struct ShadBuf *shb, float inp) /* return 1.0: geen schadu
co[1]= R.co[1]+O.dxco[1]; co[1]= R.co[1]+O.dxco[1];
co[2]= R.co[2]+O.dxco[2]; co[2]= R.co[2]+O.dxco[2];
co[3]= 1.0; co[3]= 1.0;
MTC_Mat4MulVec4fl(shb->persmat,co); /* rationele hom co */ MTC_Mat4MulVec4fl(shb->persmat,co); /* rational hom co */
dx[0]= xs1- siz*(1.0+co[0]/co[3]); dx[0]= xs1- siz*(1.0+co[0]/co[3]);
dx[1]= ys1- siz*(1.0+co[1]/co[3]); dx[1]= ys1- siz*(1.0+co[1]/co[3]);
@@ -506,7 +493,7 @@ float testshadowbuf(struct ShadBuf *shb, float inp) /* return 1.0: geen schadu
co[1]= R.co[1]+O.dyco[1]; co[1]= R.co[1]+O.dyco[1];
co[2]= R.co[2]+O.dyco[2]; co[2]= R.co[2]+O.dyco[2];
co[3]= 1.0; co[3]= 1.0;
MTC_Mat4MulVec4fl(shb->persmat,co); /* rationele hom co */ MTC_Mat4MulVec4fl(shb->persmat,co); /* rational hom co */
dy[0]= xs1- siz*(1.0+co[0]/co[3]); dy[0]= xs1- siz*(1.0+co[0]/co[3]);
dy[1]= ys1- siz*(1.0+co[1]/co[3]); dy[1]= ys1- siz*(1.0+co[1]/co[3]);
@@ -534,7 +521,7 @@ float testshadowbuf(struct ShadBuf *shb, float inp) /* return 1.0: geen schadu
} }
for(a=num;a>0;a--) { for(a=num;a>0;a--) {
/* i.p.v. jit ook met random geprobeerd: lelijk! */ /* instead of jit i tried random: ugly! */
xs= xs1 + xres*j[0]; xs= xs1 + xres*j[0];
ys= ys1 + yres*j[1]; ys= ys1 + yres*j[1];
j+=2; j+=2;
@@ -559,7 +546,7 @@ float readshadowbuf_halo(struct ShadBuf *shb, int xs, int ys, int zs)
if(xs<0 || ys<0) return 0.0; if(xs<0 || ys<0) return 0.0;
if(xs>=shb->size || ys>=shb->size) return 0.0; if(xs>=shb->size || ys>=shb->size) return 0.0;
/* z berekenen */ /* calc z */
ofs= (ys>>4)*(shb->size>>4) + (xs>>4); ofs= (ys>>4)*(shb->size>>4) + (xs>>4);
ct= shb->cbuf+ofs; ct= shb->cbuf+ofs;
rz= *( (int **)(shb->zbuf+ofs) ); rz= *( (int **)(shb->zbuf+ofs) );
@@ -596,21 +583,21 @@ float readshadowbuf_halo(struct ShadBuf *shb, int xs, int ys, int zs)
zsamp= (int) rz; zsamp= (int) rz;
} }
/* geen schaduw als op oneindig wordt gesampeld*/ /* NO schadow when sampled at 'eternal' distance */
if(zsamp >= 0x7FFFFE00) return 1.0; if(zsamp >= 0x7FFFFE00) return 1.0;
if(zsamp > zs) return 1.0; /* absoluut geen schaduw */ if(zsamp > zs) return 1.0; /* absolute no shadww */
else { else {
/* bias is negative, so the (zs-bias) can be beyond 0x7fffffff */ /* bias is negative, so the (zs-bias) can be beyond 0x7fffffff */
zbias= 0x7fffffff - zs; zbias= 0x7fffffff - zs;
if(zbias > -bias) { if(zbias > -bias) {
if( zsamp < zs-bias) return 0.0 ; /* absoluut wel schaduw */ if( zsamp < zs-bias) return 0.0 ; /* absolute in shadow */
} }
else return 0.0 ; /* absoluut wel schaduw */ else return 0.0 ; /* absolute shadow */
} }
/* zacht gebied */ /* soft area */
temp= ( (float)(zs- zsamp) )/(float)bias; temp= ( (float)(zs- zsamp) )/(float)bias;
return 1.0 - temp*temp; return 1.0 - temp*temp;
@@ -636,7 +623,7 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
co[1]= p1[1]; co[1]= p1[1];
co[2]= p1[2]/lar->sh_zfac; co[2]= p1[2]/lar->sh_zfac;
co[3]= 1.0; co[3]= 1.0;
MTC_Mat4MulVec4fl(shb->winmat, co); /* rationele hom co */ MTC_Mat4MulVec4fl(shb->winmat, co); /* rational hom co */
xf1= siz*(1.0+co[0]/co[3]); xf1= siz*(1.0+co[0]/co[3]);
yf1= siz*(1.0+co[1]/co[3]); yf1= siz*(1.0+co[1]/co[3]);
zf1= (co[2]/co[3]); zf1= (co[2]/co[3]);
@@ -646,12 +633,12 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
co[1]= p2[1]; co[1]= p2[1];
co[2]= p2[2]/lar->sh_zfac; co[2]= p2[2]/lar->sh_zfac;
co[3]= 1.0; co[3]= 1.0;
MTC_Mat4MulVec4fl(shb->winmat, co); /* rationele hom co */ MTC_Mat4MulVec4fl(shb->winmat, co); /* rational hom co */
xf2= siz*(1.0+co[0]/co[3]); xf2= siz*(1.0+co[0]/co[3]);
yf2= siz*(1.0+co[1]/co[3]); yf2= siz*(1.0+co[1]/co[3]);
zf2= (co[2]/co[3]); zf2= (co[2]/co[3]);
/* de 2dda */ /* the 2dda (a pixel line formula) */
xs1= (int)xf1; xs1= (int)xf1;
ys1= (int)yf1; ys1= (int)yf1;
@@ -741,33 +728,6 @@ float shadow_halo(LampRen *lar, float *p1, float *p2)
/* sampelen met filter
xstart= xs-1;
ystart= ys-1;
if(xstart<0) xstart= 0;
if(ystart<0) ystart= 0;
xend= xstart+2;
yend= ystart+2;
if(xend>=shb->size) { xstart= shb->size-3; xend= shb->size-1;}
if(yend>=shb->size) { ystart= shb->size-3; yend= shb->size-1;}
fid= filt3;
for(ys=ystart;ys<=yend;ys++) {
rz= shb->buf+ ys*shb->size+ xstart;
for(xs= xstart;xs<=xend;xs++,rz++) {
if( *rz+0x100000<zs) aantal+= *fid;
fid++;
}
}
return 1.0-((float)aantal)/16.0;
*/

16
source/blender/render/intern/source/vanillaRenderPipe.c
View File

@@ -1096,7 +1096,7 @@ void zBufferFillFace(float *v1, float *v2, float *v3)
else { minv=v3; midv=v2; maxv=v1;} else { minv=v3; midv=v2; maxv=v1;}
} }
if(minv[1] == maxv[1]) return; /* beveiliging 'nul' grote vlakken */ if(minv[1] == maxv[1]) return; /* security to remove 'zero' size faces */
my0 = ceil(minv[1]); my0 = ceil(minv[1]);
my2 = floor(maxv[1]); my2 = floor(maxv[1]);
@@ -1107,7 +1107,7 @@ void zBufferFillFace(float *v1, float *v2, float *v3)
if(my0<Aminy) my0= Aminy; if(my0<Aminy) my0= Aminy;
/* EDGES : DE LANGSTE */ /* EDGES : THE LONGEST */
xx1= maxv[1]-minv[1]; xx1= maxv[1]-minv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (maxv[0]-minv[0])/xx1; z0= (maxv[0]-minv[0])/xx1;
@@ -1122,7 +1122,7 @@ void zBufferFillFace(float *v1, float *v2, float *v3)
dx0= 0; dx0= 0;
xs0= 65536.0*(MIN2(minv[0],maxv[0])); xs0= 65536.0*(MIN2(minv[0],maxv[0]));
} }
/* EDGES : DE BOVENSTE */ /* EDGES : THE TOP ONE */
xx1= maxv[1]-midv[1]; xx1= maxv[1]-midv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (maxv[0]-midv[0])/xx1; z0= (maxv[0]-midv[0])/xx1;
@@ -1137,7 +1137,7 @@ void zBufferFillFace(float *v1, float *v2, float *v3)
dx1= 0; dx1= 0;
xs1= 65536.0*(MIN2(midv[0],maxv[0])); xs1= 65536.0*(MIN2(midv[0],maxv[0]));
} }
/* EDGES : DE ONDERSTE */ /* EDGES : THE BOTTOM ONE */
xx1= midv[1]-minv[1]; xx1= midv[1]-minv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (midv[0]-minv[0])/xx1; z0= (midv[0]-minv[0])/xx1;
@@ -1165,9 +1165,9 @@ void zBufferFillFace(float *v1, float *v2, float *v3)
if(vec0[2]==0.0) return; if(vec0[2]==0.0) return;
if(midv[1] == maxv[1]) omsl= my2; if(midv[1] == maxv[1]) omsl= my2;
if(omsl < Aminy) omsl= Aminy-1; /* dan neemt ie de eerste lus helemaal */ if(omsl < Aminy) omsl= Aminy-1; /* make sure it takes the first loop entirely */
while (my2 > Amaxy) { /* my2 kan groter zijn */ while (my2 > Amaxy) { /* my2 can be larger */
xs0+=dx0; xs0+=dx0;
if (my2<=omsl) { if (my2<=omsl) {
xs2+= dx2; xs2+= dx2;
@@ -1289,7 +1289,7 @@ void zBufferFillEdge(float *vec1, float *vec2)
if(fabs(dx) > fabs(dy)) { if(fabs(dx) > fabs(dy)) {
/* alle lijnen van links naar rechts */ /* all lines from left to right */
if(vec1[0]<vec2[0]) { if(vec1[0]<vec2[0]) {
VECCOPY(v1, vec1); VECCOPY(v1, vec1);
VECCOPY(v2, vec2); VECCOPY(v2, vec2);
@@ -1335,7 +1335,7 @@ void zBufferFillEdge(float *vec1, float *vec2)
} }
else { else {
/* alle lijnen van onder naar boven */ /* all lines from top to bottom */
if(vec1[1]<vec2[1]) { if(vec1[1]<vec2[1]) {
VECCOPY(v1, vec1); VECCOPY(v1, vec1);
VECCOPY(v2, vec2); VECCOPY(v2, vec2);

168
source/blender/render/intern/source/zbuf.c
View File

@@ -118,9 +118,9 @@ void fillrect(unsigned int *rect, int x, unsigned int y, unsigned int val)
} }
} }
/* ************* ACCU ZBUF ************ */ /* ************* ACCUMULATION ZBUF ************ */
/*-APixstr---------------------------------------------------*/ /*-APixstr---------------------(antialised pixel struct)------------------------------*/
APixstr *addpsmainA() APixstr *addpsmainA()
{ {
@@ -167,7 +167,7 @@ APixstr *addpsA(void)
{ {
static APixstr *prev; static APixstr *prev;
/* eerste PS maken */ /* make first PS */
if((apsmteller & 4095)==0) prev= addpsmainA(); if((apsmteller & 4095)==0) prev= addpsmainA();
else prev++; else prev++;
apsmteller++; apsmteller++;
@@ -175,7 +175,7 @@ APixstr *addpsA(void)
return prev; return prev;
} }
/* vult kleur in, met windowcoordinaat, van Aminy->Amaxy */ /* fills in color, with window coordinate, from Aminy->Amaxy */
void zbufinvulAc(float *v1, float *v2, float *v3) void zbufinvulAc(float *v1, float *v2, float *v3)
{ {
APixstr *ap, *apofs, *apn; APixstr *ap, *apofs, *apn;
@@ -210,7 +210,7 @@ void zbufinvulAc(float *v1, float *v2, float *v3)
} }
} }
if(minv[1] == maxv[1]) return; /* beveiliging 'nul' grote vlakken */ if(minv[1] == maxv[1]) return; /* prevent 'zero' size faces */
my0= ceil(minv[1]); my0= ceil(minv[1]);
my2= floor(maxv[1]); my2= floor(maxv[1]);
@@ -220,7 +220,7 @@ void zbufinvulAc(float *v1, float *v2, float *v3)
if(my0<Aminy) my0= Aminy; if(my0<Aminy) my0= Aminy;
/* EDGES : DE LANGSTE */ /* EDGES : LONGEST */
xx1= maxv[1]-minv[1]; xx1= maxv[1]-minv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (maxv[0]-minv[0])/xx1; z0= (maxv[0]-minv[0])/xx1;
@@ -235,7 +235,7 @@ void zbufinvulAc(float *v1, float *v2, float *v3)
dx0= 0; dx0= 0;
xs0= 65536.0*(MIN2(minv[0],maxv[0])); xs0= 65536.0*(MIN2(minv[0],maxv[0]));
} }
/* EDGES : DE BOVENSTE */ /* EDGES : THE TOP ONE */
xx1= maxv[1]-midv[1]; xx1= maxv[1]-midv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (maxv[0]-midv[0])/xx1; z0= (maxv[0]-midv[0])/xx1;
@@ -250,7 +250,7 @@ void zbufinvulAc(float *v1, float *v2, float *v3)
dx1= 0; dx1= 0;
xs1= 65536.0*(MIN2(midv[0],maxv[0])); xs1= 65536.0*(MIN2(midv[0],maxv[0]));
} }
/* EDGES : DE ONDERSTE */ /* EDGES : BOTTOM ONE */
xx1= midv[1]-minv[1]; xx1= midv[1]-minv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (midv[0]-minv[0])/xx1; z0= (midv[0]-minv[0])/xx1;
@@ -279,9 +279,9 @@ void zbufinvulAc(float *v1, float *v2, float *v3)
if(z0==0.0) return; if(z0==0.0) return;
if(midv[1]==maxv[1]) omsl= my2; if(midv[1]==maxv[1]) omsl= my2;
if(omsl<Aminy) omsl= Aminy-1; /* dan neemt ie de eerste lus helemaal */ if(omsl<Aminy) omsl= Aminy-1; /* to make sure it does the first loop completely */
while (my2 > Amaxy) { /* my2 kan groter zijn */ while (my2 > Amaxy) { /* my2 can be larger */
xs0+=dx0; xs0+=dx0;
if (my2<=omsl) { if (my2<=omsl) {
xs2+= dx2; xs2+= dx2;
@@ -299,7 +299,7 @@ void zbufinvulAc(float *v1, float *v2, float *v3)
zy0= my2*zyd+xx1; zy0= my2*zyd+xx1;
zd= (int)CLAMPIS(zxd, INT_MIN, INT_MAX); zd= (int)CLAMPIS(zxd, INT_MIN, INT_MAX);
/* start-ofset in rect */ /* start-offset in rect */
rectx= R.rectx; rectx= R.rectx;
rectzofs= (int *)(Arectz+rectx*(my2-Aminy)); rectzofs= (int *)(Arectz+rectx*(my2-Aminy));
apofs= (APixbuf+ rectx*(my2-Aminy)); apofs= (APixbuf+ rectx*(my2-Aminy));
@@ -436,7 +436,7 @@ void zbuflineAc(float *vec1, float *vec2)
if(fabs(dx) > fabs(dy)) { if(fabs(dx) > fabs(dy)) {
/* alle lijnen van links naar rechts */ /* all lines from left to right */
if(vec1[0]<vec2[0]) { if(vec1[0]<vec2[0]) {
VECCOPY(v1, vec1); VECCOPY(v1, vec1);
VECCOPY(v2, vec2); VECCOPY(v2, vec2);
@@ -500,7 +500,7 @@ void zbuflineAc(float *vec1, float *vec2)
} }
else { else {
/* alle lijnen van onder naar boven */ /* all lines from top to bottom */
if(vec1[1]<vec2[1]) { if(vec1[1]<vec2[1]) {
VECCOPY(v1, vec1); VECCOPY(v1, vec1);
VECCOPY(v2, vec2); VECCOPY(v2, vec2);
@@ -595,7 +595,7 @@ float *vec1, *vec2;
if(fabs(dx) > fabs(dy)) { if(fabs(dx) > fabs(dy)) {
/* alle lijnen van links naar rechts */ /* all lines from left to right */
if(vec1[0]<vec2[0]) { if(vec1[0]<vec2[0]) {
VECCOPY(v1, vec1); VECCOPY(v1, vec1);
VECCOPY(v2, vec2); VECCOPY(v2, vec2);
@@ -643,7 +643,7 @@ float *vec1, *vec2;
} }
} }
else { else {
/* alle lijnen van onder naar boven */ /* all lines from top to bottom */
if(vec1[1]<vec2[1]) { if(vec1[1]<vec2[1]) {
VECCOPY(v1, vec1); VECCOPY(v1, vec1);
VECCOPY(v2, vec2); VECCOPY(v2, vec2);
@@ -699,7 +699,7 @@ void zbufclipwire(VlakRen *vlr)
float *f1, *f2, *f3, *f4= 0, deler; float *f1, *f2, *f3, *f4= 0, deler;
int c1, c2, c3, c4, ec, and, or; int c1, c2, c3, c4, ec, and, or;
/* edgecode: 1= tekenen */ /* edgecode: 1= draw */
ec = vlr->ec; ec = vlr->ec;
if(ec==0) return; if(ec==0) return;
@@ -722,11 +722,11 @@ void zbufclipwire(VlakRen *vlr)
or= (c1 | c2 | c3); or= (c1 | c2 | c3);
} }
if(or) { /* niet in midden */ if(or) { /* not in the middle */
if(and) { /* helemaal eruit */ if(and) { /* out completely */
return; return;
} }
else { /* clippen */ else { /* clipping */
if(ec & ME_V1V2) { if(ec & ME_V1V2) {
QUATCOPY(vez, f1); QUATCOPY(vez, f1);
@@ -819,8 +819,8 @@ void zbufclipwire(VlakRen *vlr)
void zbufinvulGLinv(v1,v2,v3) void zbufinvulGLinv(v1,v2,v3)
float *v1,*v2,*v3; float *v1,*v2,*v3;
/* vult in R.rectot de waarde Zvlnr in met R.rectz */ /* fills in R.rectot the value of Zvlnr using R.rectz */
/* KEERT Z-VERGELIJKING OM: ALLES ACHTER IS ZICHTBAAR */ /* INVERSE Z COMPARISION: BACKSIDE GETS VISIBLE */
{ {
double x0,y0,z0,x1,y1,z1,x2,y2,z2,xx1; double x0,y0,z0,x1,y1,z1,x2,y2,z2,xx1;
double zxd,zyd,zy0,tmp; double zxd,zyd,zy0,tmp;
@@ -862,7 +862,7 @@ float *v1,*v2,*v3;
if(my0<0) my0=0; if(my0<0) my0=0;
/* EDGES : DE LANGSTE */ /* EDGES : LONGEST */
xx1= maxv[1]-minv[1]; xx1= maxv[1]-minv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (maxv[0]-minv[0])/xx1; z0= (maxv[0]-minv[0])/xx1;
@@ -877,7 +877,7 @@ float *v1,*v2,*v3;
dx0= 0; dx0= 0;
xs0= 65536.0*(MIN2(minv[0],maxv[0])); xs0= 65536.0*(MIN2(minv[0],maxv[0]));
} }
/* EDGES : DE BOVENSTE */ /* EDGES : THE TOP ONE */
xx1= maxv[1]-midv[1]; xx1= maxv[1]-midv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (maxv[0]-midv[0])/xx1; z0= (maxv[0]-midv[0])/xx1;
@@ -892,7 +892,7 @@ float *v1,*v2,*v3;
dx1= 0; dx1= 0;
xs1= 65536.0*(MIN2(midv[0],maxv[0])); xs1= 65536.0*(MIN2(midv[0],maxv[0]));
} }
/* EDGES : DE ONDERSTE */ /* EDGES : THE BOTTOM ONE */
xx1= midv[1]-minv[1]; xx1= midv[1]-minv[1];
if(xx1>2.0/65536.0) { if(xx1>2.0/65536.0) {
z0= (midv[0]-minv[0])/xx1; z0= (midv[0]-minv[0])/xx1;
@@ -922,9 +922,9 @@ float *v1,*v2,*v3;
if(z0==0.0) return; if(z0==0.0) return;
if(midv[1]==maxv[1]) omsl= my2; if(midv[1]==maxv[1]) omsl= my2;
if(omsl<0) omsl= -1; /* dan neemt ie de eerste lus helemaal */ if(omsl<0) omsl= -1; /* then it does the first loop entirely */
while (my2 >= R.recty) { /* my2 kan groter zijn */ while (my2 >= R.recty) { /* my2 can be larger */
xs0+=dx0; xs0+=dx0;
if (my2<=omsl) { if (my2<=omsl) {
xs2+= dx2; xs2+= dx2;
@@ -942,7 +942,7 @@ float *v1,*v2,*v3;
zy0= my2*zyd+xx1; zy0= my2*zyd+xx1;
zd= (int)CLAMPIS(zxd, INT_MIN, INT_MAX); zd= (int)CLAMPIS(zxd, INT_MIN, INT_MAX);
/* start-ofset in rect */ /* start-offset in rect */
rectx= R.rectx; rectx= R.rectx;
rectzofs= (int *)(R.rectz+rectx*my2); rectzofs= (int *)(R.rectz+rectx*my2);
rectpofs= (R.rectot+rectx*my2); rectpofs= (R.rectot+rectx*my2);
@@ -1037,7 +1037,7 @@ float *v1,*v2,*v3;
} }
} }
void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde Zvlnr in met R.rectz */ void zbufinvulGL(float *v1, float *v2, float *v3) /* fills in R.rectot the value Zvlnr using R.rectz */
{ {
double x0,y0,z0; double x0,y0,z0;
double x1,y1,z1,x2,y2,z2,xx1; double x1,y1,z1,x2,y2,z2,xx1;
@@ -1072,7 +1072,7 @@ void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde
} }
} }
if(minv[1] == maxv[1]) return; /* beveiliging 'nul' grote vlakken */ if(minv[1] == maxv[1]) return; /* no zero sized faces */
my0= ceil(minv[1]); my0= ceil(minv[1]);
my2= floor(maxv[1]); my2= floor(maxv[1]);
@@ -1082,7 +1082,7 @@ void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde
if(my0<0) my0= 0; if(my0<0) my0= 0;
/* EDGES : DE LANGSTE */ /* EDGES : THE LONGEST */
xx1= maxv[1]-minv[1]; xx1= maxv[1]-minv[1];
if(xx1!=0.0) { if(xx1!=0.0) {
z0= (maxv[0]-minv[0])/xx1; z0= (maxv[0]-minv[0])/xx1;
@@ -1097,7 +1097,7 @@ void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde
dx0= 0; dx0= 0;
xs0= 65536.0*(MIN2(minv[0],maxv[0])); xs0= 65536.0*(MIN2(minv[0],maxv[0]));
} }
/* EDGES : DE BOVENSTE */ /* EDGES : THE TOP ONE */
xx1= maxv[1]-midv[1]; xx1= maxv[1]-midv[1];
if(xx1!=0.0) { if(xx1!=0.0) {
z0= (maxv[0]-midv[0])/xx1; z0= (maxv[0]-midv[0])/xx1;
@@ -1112,7 +1112,7 @@ void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde
dx1= 0; dx1= 0;
xs1= 65536.0*(MIN2(midv[0],maxv[0])); xs1= 65536.0*(MIN2(midv[0],maxv[0]));
} }
/* EDGES : DE ONDERSTE */ /* EDGES : BOTTOM ONE */
xx1= midv[1]-minv[1]; xx1= midv[1]-minv[1];
if(xx1!=0.0) { if(xx1!=0.0) {
z0= (midv[0]-minv[0])/xx1; z0= (midv[0]-minv[0])/xx1;
@@ -1142,9 +1142,9 @@ void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde
if(z0==0.0) return; if(z0==0.0) return;
if(midv[1]==maxv[1]) omsl= my2; if(midv[1]==maxv[1]) omsl= my2;
if(omsl<0) omsl= -1; /* dan neemt ie de eerste lus helemaal */ if(omsl<0) omsl= -1; /* then it takes the first loop entirely */
while (my2 >= R.recty) { /* my2 kan groter zijn */ while (my2 >= R.recty) { /* my2 can be larger */
xs0+=dx0; xs0+=dx0;
if (my2<=omsl) { if (my2<=omsl) {
xs2+= dx2; xs2+= dx2;
@@ -1162,7 +1162,7 @@ void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde
zy0= my2*zyd+xx1; zy0= my2*zyd+xx1;
zd= (int)CLAMPIS(zxd, INT_MIN, INT_MAX); zd= (int)CLAMPIS(zxd, INT_MIN, INT_MAX);
/* start-ofset in rect */ /* start-offset in rect */
rectx= R.rectx; rectx= R.rectx;
rectzofs= (int *)(R.rectz+rectx*my2); rectzofs= (int *)(R.rectz+rectx*my2);
rectpofs= (R.rectot+rectx*my2); rectpofs= (R.rectot+rectx*my2);
@@ -1182,7 +1182,7 @@ void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde
for(y=my2;y>omsl;y--) { for(y=my2;y>omsl;y--) {
/* dit is ongevoelig voor endians */ /* endian insensitive */
sn1= xs0>>16; sn1= xs0>>16;
xs0+= dx0; xs0+= dx0;
@@ -1260,7 +1260,7 @@ void zbufinvulGL(float *v1, float *v2, float *v3) /* vult in R.rectot de waarde
} }
void zbufinvulGL_onlyZ(float *v1, float *v2, float *v3) /* vult alleen R.rectz. oneven z= 1x ingevuld */ void zbufinvulGL_onlyZ(float *v1, float *v2, float *v3) /* only fills in R.rectz */
{ {
double x0,y0,z0,x1,y1,z1,x2,y2,z2,xx1; double x0,y0,z0,x1,y1,z1,x2,y2,z2,xx1;
double zxd,zyd,zy0,tmp; double zxd,zyd,zy0,tmp;
@@ -1313,7 +1313,7 @@ void zbufinvulGL_onlyZ(float *v1, float *v2, float *v3) /* vult alleen R.rectz
if(my0<0) my0=0; if(my0<0) my0=0;
/* EDGES : DE LANGSTE */ /* EDGES : LONGEST */
xx1= maxv[1]-minv[1]; xx1= maxv[1]-minv[1];
if(xx1!=0.0) { if(xx1!=0.0) {
z0= (maxv[0]-minv[0])/xx1; z0= (maxv[0]-minv[0])/xx1;
@@ -1328,7 +1328,7 @@ void zbufinvulGL_onlyZ(float *v1, float *v2, float *v3) /* vult alleen R.rectz
dx0= 0; dx0= 0;
xs0= 65536.0*(MIN2(minv[0],maxv[0])); xs0= 65536.0*(MIN2(minv[0],maxv[0]));
} }
/* EDGES : DE BOVENSTE */ /* EDGES : TOP */
xx1= maxv[1]-midv[1]; xx1= maxv[1]-midv[1];
if(xx1!=0.0) { if(xx1!=0.0) {
z0= (maxv[0]-midv[0])/xx1; z0= (maxv[0]-midv[0])/xx1;
@@ -1343,7 +1343,7 @@ void zbufinvulGL_onlyZ(float *v1, float *v2, float *v3) /* vult alleen R.rectz
dx1= 0; dx1= 0;
xs1= 65536.0*(MIN2(midv[0],maxv[0])); xs1= 65536.0*(MIN2(midv[0],maxv[0]));
} }
/* EDGES : DE ONDERSTE */ /* EDGES : BOTTOM */
xx1= midv[1]-minv[1]; xx1= midv[1]-minv[1];
if(xx1!=0.0) { if(xx1!=0.0) {
z0= (midv[0]-minv[0])/xx1; z0= (midv[0]-minv[0])/xx1;
@@ -1373,9 +1373,9 @@ void zbufinvulGL_onlyZ(float *v1, float *v2, float *v3) /* vult alleen R.rectz
if(z0==0.0) return; if(z0==0.0) return;
if(midv[1]==maxv[1]) omsl= my2; if(midv[1]==maxv[1]) omsl= my2;
if(omsl<0) omsl= -1; /* dan neemt ie de eerste lus helemaal */ if(omsl<0) omsl= -1; /* then it takes first loop entirely */
while (my2 >= R.recty) { /* my2 kan groter zijn */ while (my2 >= R.recty) { /* my2 can be larger */
xs0+=dx0; xs0+=dx0;
if (my2<=omsl) { if (my2<=omsl) {
xs2+= dx2; xs2+= dx2;
@@ -1393,7 +1393,7 @@ void zbufinvulGL_onlyZ(float *v1, float *v2, float *v3) /* vult alleen R.rectz
zy0= my2*zyd+xx1; zy0= my2*zyd+xx1;
zd= (int)CLAMPIS(zxd, INT_MIN, INT_MAX); zd= (int)CLAMPIS(zxd, INT_MIN, INT_MAX);
/* start-ofset in rect */ /* start-offset in rect */
rectx= R.rectx; rectx= R.rectx;
rectzofs= (int *)(R.rectz+rectx*my2); rectzofs= (int *)(R.rectz+rectx*my2);
@@ -1515,12 +1515,12 @@ static short cliptestf(float p, float q, float *u1, float *u2)
int RE_testclip(float *v) int RE_testclip(float *v)
{ {
float abs4; /* LET OP: deze func moet zelfde doen als cliptestf, anders problemen in zbufclip()*/ float abs4; /* WATCH IT: this function should do the same as cliptestf, otherwise troubles in zbufclip()*/
short c=0; short c=0;
abs4= fabs(v[3]); abs4= fabs(v[3]);
if(v[2]< -abs4) c=16; /* hier stond vroeger " if(v[2]<0) ", zie clippz() */ if(v[2]< -abs4) c=16; /* this used to be " if(v[2]<0) ", see clippz() */
else if(v[2]> abs4) c+= 32; else if(v[2]> abs4) c+= 32;
if( v[0]>abs4) c+=2; if( v[0]>abs4) c+=2;
@@ -1543,10 +1543,11 @@ static void clipp(float *v1, float *v2, int b1, int *b2, int *b3, int a)
da= v2[a]-v1[a]; da= v2[a]-v1[a];
db= v2[3]-v1[3]; db= v2[3]-v1[3];
/* volgens het oorspronkelijke artikel van Liang&Barsky, wordt bij het clippen van /* according the original article by Liang&Barsky, for clipping of
* hoco's met het viewplane, het getal "0" gebruikt ipv "-w" . * homeginic coordinates with viewplane, the value of "0" is used instead of "-w" .
* Dit wijkt af van de andere clipping (links en onder) en vond ik ook niet erg * This differs from the other clipping cases (like left or top) and I considered
* 'homogeen'. Het is dus een fout, wie had dat gedacht van L&B! * it to be not so 'homogenic'. But later it has proven to be an error,
* who would have thought that of L&B!
*/ */
if(cliptestf(-da-db, v1[3]+v1[a], &u1,&u2)) { if(cliptestf(-da-db, v1[3]+v1[a], &u1,&u2)) {
@@ -1565,7 +1566,7 @@ static void clipp(float *v1, float *v2, int b1, int *b2, int *b3, int a)
} }
} }
static int clipline(float *v1, float *v2) /* return 0: niet tekenen */ static int clipline(float *v1, float *v2) /* return 0: do not draw */
{ {
float dz,dw, u1=0.0, u2=1.0; float dz,dw, u1=0.0, u2=1.0;
float dx, dy; float dx, dy;
@@ -1648,7 +1649,7 @@ static void maakvertpira(float *v1, float *v2, int *b1, int b2, int *clve)
void RE_projectverto(float *v1, float *adr) void RE_projectverto(float *v1, float *adr)
{ {
/* berekent homogene co van vertex v1 */ /* calcs homogenic coord of vertex v1 */
float x,y,z; float x,y,z;
x= v1[0]; x= v1[0];
@@ -1659,13 +1660,13 @@ void RE_projectverto(float *v1, float *adr)
adr[2]= z*R.winmat[2][2] + R.winmat[3][2]; adr[2]= z*R.winmat[2][2] + R.winmat[3][2];
adr[3]= z*R.winmat[2][3] + R.winmat[3][3]; adr[3]= z*R.winmat[2][3] + R.winmat[3][3];
} /* end of void RE_projectverto(float *v1, float *adr) */ }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
void projectvert(float *v1, float *adr) void projectvert(float *v1, float *adr)
{ {
/* berekent homogene co van vertex v1 */ /* calcs homogenic coord of vertex v1 */
float x,y,z; float x,y,z;
x= v1[0]; x= v1[0];
@@ -1682,10 +1683,10 @@ void zbufclip(float *f1, float *f2, float *f3, int c1, int c2, int c3)
{ {
float deler; float deler;
if(c1 | c2 | c3) { /* niet in midden */ if(c1 | c2 | c3) { /* not in middle */
if(c1 & c2 & c3) { /* helemaal eruit */ if(c1 & c2 & c3) { /* completely out */
return; return;
} else { /* clippen */ } else { /* clipping */
int arg, v, b, clipflag[3], b1, b2, b3, c4, clve=3, clvlo, clvl=1; int arg, v, b, clipflag[3], b1, b2, b3, c4, clve=3, clvlo, clvl=1;
vez[0]= f1[0]; vez[1]= f1[1]; vez[2]= f1[2]; vez[3]= f1[3]; vez[0]= f1[0]; vez[1]= f1[1]; vez[2]= f1[2]; vez[3]= f1[3];
@@ -1697,7 +1698,7 @@ void zbufclip(float *f1, float *f2, float *f3, int c1, int c2, int c3)
vlzp[0][2]= vez+8; vlzp[0][2]= vez+8;
clipflag[0]= ( (c1 & 48) | (c2 & 48) | (c3 & 48) ); clipflag[0]= ( (c1 & 48) | (c2 & 48) | (c3 & 48) );
if(clipflag[0]==0) { /* anders opnieuw berekend verderop, na de eerste (z) clip */ if(clipflag[0]==0) { /* othwerwise it needs to be calculated again, after the first (z) clip */
clipflag[1]= ( (c1 & 3) | (c2 & 3) | (c3 & 3) ); clipflag[1]= ( (c1 & 3) | (c2 & 3) | (c3 & 3) );
clipflag[2]= ( (c1 & 12) | (c2 & 12) | (c3 & 12) ); clipflag[2]= ( (c1 & 12) | (c2 & 12) | (c3 & 12) );
} }
@@ -1710,8 +1711,8 @@ void zbufclip(float *f1, float *f2, float *f3, int c1, int c2, int c3)
for(v=0; v<clvlo; v++) { for(v=0; v<clvlo; v++) {
if(vlzp[v][0]!=0) { /* vlak is er nog */ if(vlzp[v][0]!=0) { /* face is still there */
b2= b3 =0; /* clipvlaggen */ b2= b3 =0; /* clip flags */
if(b==0) arg= 2; if(b==0) arg= 2;
else if (b==1) arg= 0; else if (b==1) arg= 0;
@@ -1722,17 +1723,17 @@ void zbufclip(float *f1, float *f2, float *f3, int c1, int c2, int c3)
clipp(vlzp[v][2],vlzp[v][0],2,&b2,&b3, arg); clipp(vlzp[v][2],vlzp[v][0],2,&b2,&b3, arg);
if(b2==0 && b3==1) { if(b2==0 && b3==1) {
/* er helemaal in */; /* completely 'in' */;
} else if(b3==0) { } else if(b3==0) {
vlzp[v][0]=0; vlzp[v][0]=0;
/* er helemaal uit */; /* completely 'out' */;
} else { } else {
b1=0; b1=0;
maakvertpira(vlzp[v][0],vlzp[v][1],&b1,0,&clve); maakvertpira(vlzp[v][0],vlzp[v][1],&b1,0,&clve);
maakvertpira(vlzp[v][1],vlzp[v][2],&b1,1,&clve); maakvertpira(vlzp[v][1],vlzp[v][2],&b1,1,&clve);
maakvertpira(vlzp[v][2],vlzp[v][0],&b1,2,&clve); maakvertpira(vlzp[v][2],vlzp[v][0],&b1,2,&clve);
/* als frontclip is gedaan: nu pas clipvlaggen zetten */ /* after front clip done: now set clip flags */
if(b==0) { if(b==0) {
clipflag[1]= clipflag[2]= 0; clipflag[1]= clipflag[2]= 0;
f1= vez; f1= vez;
@@ -1759,9 +1760,10 @@ void zbufclip(float *f1, float *f2, float *f3, int c1, int c2, int c3)
} }
} }
/* persp deling */ /* warning, this should never happen! */
/* valt hier nog te optimaliseren door alleen te gebruiken vertices te doen? */
if(clve>38) printf("clip overflow: clve clvl %d %d\n",clve,clvl); if(clve>38) printf("clip overflow: clve clvl %d %d\n",clve,clvl);
/* perspective division */
f1=vez; f1=vez;
for(c1=0;c1<clve;c1++) { for(c1=0;c1<clve;c1++) {
deler= f1[3]; deler= f1[3];
@@ -1779,7 +1781,7 @@ void zbufclip(float *f1, float *f2, float *f3, int c1, int c2, int c3)
} }
} }
/* persp deling: HCS to ZCS */ /* perspective division: HCS to ZCS */
deler= f1[3]; deler= f1[3];
vez[0]= Zmulx*(1.0+f1[0]/deler)+ Zjitx; vez[0]= Zmulx*(1.0+f1[0]/deler)+ Zjitx;
@@ -1967,7 +1969,6 @@ void zbuffershad(LampRen *lar)
ok= 1; ok= 1;
if((ma->mode & MA_TRACEBLE)==0) ok= 0; if((ma->mode & MA_TRACEBLE)==0) ok= 0;
} }
/* traceble er weer in: automatische verwijdering niet geweldig */
if(ok && (vlr->flag & R_VISIBLE) && (vlr->lay & lay)) { if(ok && (vlr->flag & R_VISIBLE) && (vlr->lay & lay)) {
zbufclip(vlr->v1->ho, vlr->v2->ho, vlr->v3->ho, vlr->v1->clip, vlr->v2->clip, vlr->v3->clip); zbufclip(vlr->v1->ho, vlr->v2->ho, vlr->v3->ho, vlr->v1->clip, vlr->v2->clip, vlr->v3->clip);
@@ -1994,8 +1995,7 @@ void bgnaccumbuf(void)
apsmteller= 0; apsmteller= 0;
apsmfirst.next= 0; apsmfirst.next= 0;
apsmfirst.ps= 0; apsmfirst.ps= 0;
} /* End of void bgnaccumbuf(void) */ }
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
void endaccumbuf(void) void endaccumbuf(void)
@@ -2005,7 +2005,7 @@ void endaccumbuf(void)
MEM_freeN(Arectz); MEM_freeN(Arectz);
MEM_freeN(APixbuf); MEM_freeN(APixbuf);
freepsA(); freepsA();
} /* End of void endaccumbuf(void) */ }
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
@@ -2042,7 +2042,7 @@ void copyto_abufz(int sample)
rd++; rza++; rd++; rza++;
} }
} }
} /* end of void copyto_abufz(int sample) */ }
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
@@ -2057,7 +2057,7 @@ void zbuffer_abuf()
Zmulx= ((float)R.rectx)/2.0; Zmulx= ((float)R.rectx)/2.0;
Zmuly= ((float)R.recty)/2.0; Zmuly= ((float)R.recty)/2.0;
/* clear APixstructen */ /* clear APixstructs */
len= sizeof(APixstr)*R.rectx*ABUFPART; len= sizeof(APixstr)*R.rectx*ABUFPART;
memset(APixbuf, 0, len); memset(APixbuf, 0, len);
@@ -2073,8 +2073,6 @@ void zbuffer_abuf()
Zjity= -jit[Zsample][1]; Zjity= -jit[Zsample][1];
} }
/* printf("Start facetrace\n"); */
for(v=0; v<R.totvlak; v++) { for(v=0; v<R.totvlak; v++) {
if((v & 255)==0) { if((v & 255)==0) {
Zvlr= R.blovl[v>>8]; Zvlr= R.blovl[v>>8];
@@ -2083,29 +2081,22 @@ void zbuffer_abuf()
ma= Zvlr->mat; ma= Zvlr->mat;
/* printf("Face %d :%x at %f\n", v, ma, Zvlr->v1->ho[3]); */
if(ma->mode & (MA_ZTRA)) { if(ma->mode & (MA_ZTRA)) {
/* voordeeltje voor transp renderen */ /* a little advantage for transp rendering (a z offset) */
if( ma->zoffs != 0.0) { if( ma->zoffs != 0.0) {
mul= 0x7FFFFFFF; mul= 0x7FFFFFFF;
zval= mul*(1.0+Zvlr->v1->ho[2]/Zvlr->v1->ho[3]); zval= mul*(1.0+Zvlr->v1->ho[2]/Zvlr->v1->ho[3]);
VECCOPY(vec, Zvlr->v1->co); VECCOPY(vec, Zvlr->v1->co);
/* z is negatief, wordt anders geclipt */ /* z is negative, otherwise its being clipped */
vec[2]-= ma->zoffs; vec[2]-= ma->zoffs;
RE_projectverto(vec, hoco); RE_projectverto(vec, hoco);
fval= mul*(1.0+hoco[2]/hoco[3]); fval= mul*(1.0+hoco[2]/hoco[3]);
Azvoordeel= (int) fabs(zval - fval ); Azvoordeel= (int) fabs(zval - fval );
/* PATCH: als transp en niet transp dicht op elkaar liggen: Zbuf aliasing: eruit! */
/* Azvoordeel= 0xFFFF; */
} }
else Azvoordeel= 0; else Azvoordeel= 0;
/* else Azvoordeel= 0xFFFF; */
Zvlnr= v+1; Zvlnr= v+1;
@@ -2128,8 +2119,7 @@ void zbuffer_abuf()
if(RE_local_test_break()) break; if(RE_local_test_break()) break;
} }
} /* end of void zbuffer_abuf() */ }
int vergzvlak(const void *a1, const void *a2) int vergzvlak(const void *a1, const void *a2)
{ {
@@ -2177,7 +2167,7 @@ void abufsetrow(int y)
alpha[a]= a*x; alpha[a]= a*x;
} }
} }
/* moet pixbuf worden gemaakt? */ /* does a pixbuf has to be created? */
if(y<Aminy || y>Amaxy) { if(y<Aminy || y>Amaxy) {
part= (y/ABUFPART); part= (y/ABUFPART);
Aminy= part*ABUFPART; Aminy= part*ABUFPART;
@@ -2187,7 +2177,7 @@ void abufsetrow(int y)
zbuffer_abuf(); zbuffer_abuf();
} }
/* render rij */ /* render row */
col= Acolrow; col= Acolrow;
memset(col, 0, 2*4*R.rectx); memset(col, 0, 2*4*R.rectx);
ap= APixbuf+R.rectx*(y-Aminy); ap= APixbuf+R.rectx*(y-Aminy);
@@ -2197,7 +2187,7 @@ void abufsetrow(int y)
for(x=0; x<R.rectx; x++, col+=4, ap++) { for(x=0; x<R.rectx; x++, col+=4, ap++) {
if(ap->p[0]) { if(ap->p[0]) {
/* sorteer op z */ /* sort in z */
totvlak= 0; totvlak= 0;
apn= ap; apn= ap;
while(apn) { while(apn) {
@@ -2254,7 +2244,7 @@ void abufsetrow(int y)
qsort(zrow, totvlak, sizeof(int)*3, vergzvlak); qsort(zrow, totvlak, sizeof(int)*3, vergzvlak);
} }
/* samenvoegen als pixels aanvullen */ /* join when pixels are adjacent */
while(totvlak>0) { while(totvlak>0) {
totvlak--; totvlak--;
@@ -2275,7 +2265,7 @@ void abufsetrow(int y)
memset(sampcol, 0, 4*2*R.osa); memset(sampcol, 0, 4*2*R.osa);
sval= addtosampcol(sampcol, shortcol, zrow[totvlak][2]); sval= addtosampcol(sampcol, shortcol, zrow[totvlak][2]);
/* sval==0: aplha helemaal vol */ /* sval==0: alpha completely full */
while( (sval != 0) && (totvlak>0) ) { while( (sval != 0) && (totvlak>0) ) {
a= count_mask(zrow[totvlak-1][2]); a= count_mask(zrow[totvlak-1][2]);
if(a==R.osa) break; if(a==R.osa) break;