olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qbsp: misc const correctness improvements for windings 

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-02-22 21:04:38 +10:30
parent d9e73cf194
commit a86e38e5b1
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qbsp/qbsp.h
View File

@ -352,15 +352,15 @@ typedef struct {
vec3_t points[MAXEDGES]; // variable sized vec3_t points[MAXEDGES]; // variable sized
} winding_t; } winding_t;
winding_t *BaseWindingForPlane(plane_t *p); winding_t *BaseWindingForPlane(const plane_t *p);
void CheckWinding(winding_t *w); void CheckWinding(const winding_t *w);
winding_t *NewWinding(int points); winding_t *NewWinding(int points);
void FreeWinding(winding_t *w); void FreeWinding(winding_t *w);
winding_t *CopyWinding(winding_t *w); winding_t *CopyWinding(const winding_t *w);
winding_t *ClipWinding(winding_t *in, plane_t *split, bool keepon); winding_t *ClipWinding(winding_t *in, const plane_t *split, bool keepon);
void DivideWinding(winding_t *in, plane_t *split, winding_t **front, void DivideWinding(winding_t *in, const plane_t *split, winding_t **front,
winding_t **back); winding_t **back);
void MidpointWinding(winding_t *w, vec3_t v); void MidpointWinding(const winding_t *w, vec3_t v);
/* Helper function for ClipWinding and it's variants */ /* Helper function for ClipWinding and it's variants */
void CalcSides(const winding_t *in, const plane_t *split, int *sides, void CalcSides(const winding_t *in, const plane_t *split, int *sides,

23
qbsp/winding.c
View File

@ -30,7 +30,7 @@ BaseWindingForPlane
================= =================
*/ */
winding_t * winding_t *
BaseWindingForPlane(plane_t *p) BaseWindingForPlane(const plane_t *p)
{ {
int i, x; int i, x;
vec_t max, v; vec_t max, v;
@ -100,7 +100,7 @@ CopyWinding
================== ==================
*/ */
winding_t * winding_t *
CopyWinding(winding_t *w) CopyWinding(const winding_t *w)
{ {
int size; int size;
winding_t *c; winding_t *c;
@ -122,7 +122,7 @@ Check for possible errors
================== ==================
*/ */
void void
CheckWinding(winding_t *w) CheckWinding(const winding_t *w)
{ {
} }
@ -162,7 +162,7 @@ it will be clipped away.
================== ==================
*/ */
winding_t * winding_t *
ClipWinding(winding_t *in, plane_t *split, bool keepon) ClipWinding(winding_t *in, const plane_t *split, bool keepon)
{ {
vec_t dists[MAX_POINTS_ON_WINDING]; vec_t dists[MAX_POINTS_ON_WINDING];
int sides[MAX_POINTS_ON_WINDING]; int sides[MAX_POINTS_ON_WINDING];
@ -247,7 +247,7 @@ new windings will be created.
================== ==================
*/ */
void void
DivideWinding(winding_t *in, plane_t *split, winding_t **front, DivideWinding(winding_t *in, const plane_t *split, winding_t **front,
winding_t **back) winding_t **back)
{ {
vec_t dists[MAX_POINTS_ON_WINDING]; vec_t dists[MAX_POINTS_ON_WINDING];
@ -334,16 +334,13 @@ MidpointWinding
================== ==================
*/ */
void void
MidpointWinding(winding_t *w, vec3_t v) MidpointWinding(const winding_t *w, vec3_t v)
{ {
int i, j; int i;
VectorCopy(vec3_origin, v); VectorCopy(vec3_origin, v);
for (i = 0; i < w->numpoints; i++) for (i = 0; i < w->numpoints; i++)
for (j = 0; j < 3; j++) VectorAdd(v, w->points[i], v);
v[j] += w->points[i][j]; if (w->numpoints)
VectorScale(v, w->numpoints, v);
if (w->numpoints > 0)
for (j = 0; j < 3; j++)
v[j] /= w->numpoints;
} }