*** empty log message ***
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@869 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
+21
-21
@@ -8,7 +8,7 @@ float rdist[NUMRAYS];
|
||||
bool ocull = true;
|
||||
float odist = 256;
|
||||
|
||||
void toggleocull() { ocull = !ocull; };
|
||||
void toggleocull() { ocull = !ocull; }
|
||||
|
||||
COMMAND(toggleocull, ARG_NONE);
|
||||
|
||||
@@ -41,7 +41,7 @@ void computeraytable(float vx, float vy)
|
||||
if(ray>1 && ray<3) { dx = -(ray-2); dy = 1; }
|
||||
else if(ray>=3 && ray<5) { dx = -1; dy = -(ray-4); }
|
||||
else if(ray>=5 && ray<7) { dx = ray-6; dy = -1; }
|
||||
else { dx = 1; dy = ray>4 ? ray-8 : ray; };
|
||||
else { dx = 1; dy = ray>4 ? ray-8 : ray; }
|
||||
float sx = vx;
|
||||
float sy = vy;
|
||||
for(;;)
|
||||
@@ -52,21 +52,21 @@ void computeraytable(float vx, float vy)
|
||||
{
|
||||
rdist[i] = (float)(fabs(sx-vx)+fabs(sy-vy));
|
||||
break;
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
rdist[i] = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// test occlusion for a cube... one of the most computationally expensive functions in the engine
|
||||
// as its done for every cube and entity, but its effect is more than worth it!
|
||||
|
||||
inline float ca(float x, float y) { return x>y ? y/x : 2-x/y; };
|
||||
inline float ma(float x, float y) { return x==0 ? (y>0 ? 2 : -2) : y/x; };
|
||||
inline float ca(float x, float y) { return x>y ? y/x : 2-x/y; }
|
||||
inline float ma(float x, float y) { return x==0 ? (y>0 ? 2 : -2) : y/x; }
|
||||
|
||||
int isoccluded(float vx, float vy, float cx, float cy, float csize) // v = viewer, c = cube to test
|
||||
{
|
||||
@@ -98,30 +98,30 @@ int isoccluded(float vx, float vy, float cx, float cy, float csize) // v = v
|
||||
{
|
||||
if(cy<=vy) // AD
|
||||
{
|
||||
if(cy+csize<vy) { h = ca(-(cx-vx), -(cy+csize-vy))+4; l = ca(-(cx+csize-vx), -(cy-vy))+4; } // A
|
||||
else { h = ma(-(cx+csize-vx), -(cy+csize-vy))+4; l = ma(-(cx+csize-vx), -(cy-vy))+4; } // D
|
||||
if(cy+csize<vy) { h = ca(-(cx-vx), -(cy+csize-vy))+4; l = ca(-(cx+csize-vx), -(cy-vy))+4; } // A
|
||||
else { h = ma(-(cx+csize-vx), -(cy+csize-vy))+4; l = ma(-(cx+csize-vx), -(cy-vy))+4; } // D
|
||||
}
|
||||
else { h = ca(cy+csize-vy, -(cx+csize-vx))+2; l = ca(cy-vy, -(cx-vx))+2; }; // F
|
||||
else { h = ca(cy+csize-vy, -(cx+csize-vx))+2; l = ca(cy-vy, -(cx-vx))+2; } // F
|
||||
}
|
||||
else // BG
|
||||
{
|
||||
if(cy<=vy)
|
||||
{
|
||||
if(cy+csize<vy) { h = ma(-(cy+csize-vy), cx-vx)+6; l = ma(-(cy+csize-vy), cx+csize-vx)+6; } // B
|
||||
if(cy+csize<vy) { h = ma(-(cy+csize-vy), cx-vx)+6; l = ma(-(cy+csize-vy), cx+csize-vx)+6; } // B
|
||||
else return 0;
|
||||
}
|
||||
else { h = ma(cy-vy, -(cx+csize-vx))+2; l = ma(cy-vy, -(cx-vx))+2; }; // G
|
||||
};
|
||||
else { h = ma(cy-vy, -(cx+csize-vx))+2; l = ma(cy-vy, -(cx-vx))+2; } // G
|
||||
}
|
||||
}
|
||||
else // CEH
|
||||
{
|
||||
if(cy<=vy) // CE
|
||||
{
|
||||
if(cy+csize<vy) { h = ca(-(cy-vy), cx-vx)+6; l = ca(-(cy+csize-vy), cx+csize-vx)+6; } // C
|
||||
else { h = ma(cx-vx, cy-vy); l = ma(cx-vx, cy+csize-vy); }; // E
|
||||
if(cy+csize<vy) { h = ca(-(cy-vy), cx-vx)+6; l = ca(-(cy+csize-vy), cx+csize-vx)+6; } // C
|
||||
else { h = ma(cx-vx, cy-vy); l = ma(cx-vx, cy+csize-vy); } // E
|
||||
}
|
||||
else { h = ca(cx+csize-vx, cy-vy); l = ca(cx-vx, cy+csize-vy); }; // H
|
||||
};
|
||||
else { h = ca(cx+csize-vx, cy-vy); l = ca(cx-vx, cy+csize-vy); } // H
|
||||
}
|
||||
int si = int(h*(NUMRAYS/8))+NUMRAYS; // get indexes into occlusion map from angles
|
||||
int ei = int(l*(NUMRAYS/8))+NUMRAYS+1;
|
||||
if(ei<=si) ei += NUMRAYS;
|
||||
@@ -129,8 +129,8 @@ int isoccluded(float vx, float vy, float cx, float cy, float csize) // v = v
|
||||
for(int i = si; i<=ei; i++)
|
||||
{
|
||||
if(dist<rdist[i&(NUMRAYS-1)]) return 0; // if any value in this segment of the occlusion map is further away then cube is not occluded
|
||||
};
|
||||
}
|
||||
|
||||
return 1; // cube is entirely occluded
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user