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

Pass get_face_light arg by &

Browse source
This commit is contained in:
Kp 2014-11-02 03:43:29 +00:00
parent 8c29419ac8
commit 805d7f2404
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
similar/main/terrain.cpp
View file

@ -383,22 +383,22 @@ void load_terrain(const char *filename)
} }
static void get_pnt(vms_vector *p,int i,int j) static void get_pnt(vms_vector &p,int i,int j)
{ {
// added on 02/20/99 by adb to prevent overflow // added on 02/20/99 by adb to prevent overflow
if (i >= grid_h) i = grid_h - 1; if (i >= grid_h) i = grid_h - 1;
if (i == grid_h - 1 && j >= grid_w) j = grid_w - 1; if (i == grid_h - 1 && j >= grid_w) j = grid_w - 1;
// end additions by adb // end additions by adb
p->x = GRID_SCALE*i; p.x = GRID_SCALE*i;
p->z = GRID_SCALE*j; p.z = GRID_SCALE*j;
p->y = HEIGHT(i,j)*HEIGHT_SCALE; p.y = HEIGHT(i,j)*HEIGHT_SCALE;
} }
static const vms_vector light{0x2e14,0xe8f5,0x5eb8}; static const vms_vector light{0x2e14,0xe8f5,0x5eb8};
static fix get_face_light(vms_vector *p0,vms_vector *p1,vms_vector *p2) static fix get_face_light(const vms_vector &p0,const vms_vector &p1,const vms_vector &p2)
{ {
const auto norm = vm_vec_normal(*p0,*p1,*p2); const auto norm = vm_vec_normal(p0,p1,p2);
return -vm_vec_dot(norm,light); return -vm_vec_dot(norm,light);
} }
@ -408,16 +408,16 @@ static fix get_avg_light(int i,int j)
fix sum; fix sum;
int f; int f;
get_pnt(&pp,i,j); get_pnt(pp,i,j);
get_pnt(&p[0],i-1,j); get_pnt(p[0],i-1,j);
get_pnt(&p[1],i,j-1); get_pnt(p[1],i,j-1);
get_pnt(&p[2],i+1,j-1); get_pnt(p[2],i+1,j-1);
get_pnt(&p[3],i+1,j); get_pnt(p[3],i+1,j);
get_pnt(&p[4],i,j+1); get_pnt(p[4],i,j+1);
get_pnt(&p[5],i-1,j+1); get_pnt(p[5],i-1,j+1);
for (f=0,sum=0;f<6;f++) for (f=0,sum=0;f<6;f++)
sum += get_face_light(&pp,&p[f],&p[(f+1)%5]); sum += get_face_light(pp,p[f],p[(f+1)%5]);
return sum/6; return sum/6;
} }