dhewm/dhewm3-sdk
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3-sdk.git synced 2024-11-21 20:21:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename PVS vars to match their type

Browse source
This commit is contained in:
dhewg 2012-06-28 13:27:43 +02:00 committed by Daniel Gibson
parent 8dfc6df02a
commit 16657c0ce3
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
d3xp/Pvs.cpp
View file

@ -374,7 +374,7 @@ pvsStack_t *idPVS::FloodPassagePVS_r( pvsPortal_t *source, const pvsPortal_t *po
// use the portal PVS if it has been calculated // use the portal PVS if it has been calculated
if ( p->done ) { if ( p->done ) {
portalVis = reinterpret_cast<int *>(p->vis); portalVis = reinterpret_cast<int *>(p->vis);
for ( j = 0; j < portalVisLongs; j++ ) { for ( j = 0; j < portalVisInts; j++ ) {
// get new PVS which is decreased by going through this passage // get new PVS which is decreased by going through this passage
m = *prevMightSee++ & *passageVis++ & *portalVis++; m = *prevMightSee++ & *passageVis++ & *portalVis++;
// check if anything might be visible through this passage that wasn't yet visible // check if anything might be visible through this passage that wasn't yet visible
@ -385,7 +385,7 @@ pvsStack_t *idPVS::FloodPassagePVS_r( pvsPortal_t *source, const pvsPortal_t *po
} }
else { else {
// the p->mightSee is implicitely stored in the passageVis // the p->mightSee is implicitely stored in the passageVis
for ( j = 0; j < portalVisLongs; j++ ) { for ( j = 0; j < portalVisInts; j++ ) {
// get new PVS which is decreased by going through this passage // get new PVS which is decreased by going through this passage
m = *prevMightSee++ & *passageVis++; m = *prevMightSee++ & *passageVis++;
// check if anything might be visible through this passage that wasn't yet visible // check if anything might be visible through this passage that wasn't yet visible
@ -758,7 +758,7 @@ int idPVS::AreaPVSFromPortalPVS( void ) const {
for ( j = 1; j < area->numPortals; j++ ) { for ( j = 1; j < area->numPortals; j++ ) {
p1 = reinterpret_cast<int *>(area->portals[0]->vis); p1 = reinterpret_cast<int *>(area->portals[0]->vis);
p2 = reinterpret_cast<int *>(area->portals[j]->vis); p2 = reinterpret_cast<int *>(area->portals[j]->vis);
for ( k = 0; k < portalVisLongs; k++ ) { for ( k = 0; k < portalVisInts; k++ ) {
*p1++ |= *p2++; *p1++ |= *p2++;
} }
} }
@ -808,7 +808,7 @@ void idPVS::Init( void ) {
areaQueue = new int[numAreas]; areaQueue = new int[numAreas];
areaVisBytes = ( ((numAreas+31)&~31) >> 3); areaVisBytes = ( ((numAreas+31)&~31) >> 3);
areaVisLongs = areaVisBytes/sizeof(int); areaVisInts = areaVisBytes/sizeof(int);
areaPVS = new byte[numAreas * areaVisBytes]; areaPVS = new byte[numAreas * areaVisBytes];
memset( areaPVS, 0xFF, numAreas * areaVisBytes ); memset( areaPVS, 0xFF, numAreas * areaVisBytes );
@ -816,7 +816,7 @@ void idPVS::Init( void ) {
numPortals = GetPortalCount(); numPortals = GetPortalCount();
portalVisBytes = ( ((numPortals+31)&~31) >> 3); portalVisBytes = ( ((numPortals+31)&~31) >> 3);
portalVisLongs = portalVisBytes/sizeof(int); portalVisInts = portalVisBytes/sizeof(int);
for ( int i = 0; i < MAX_CURRENT_PVS; i++ ) { for ( int i = 0; i < MAX_CURRENT_PVS; i++ ) {
currentPVS[i].handle.i = -1; currentPVS[i].handle.i = -1;
@ -1037,7 +1037,7 @@ pvsHandle_t idPVS::SetupCurrentPVS( const int *sourceAreas, const int numSourceA
vis = reinterpret_cast<int *>(areaPVS + sourceAreas[i] * areaVisBytes); vis = reinterpret_cast<int *>(areaPVS + sourceAreas[i] * areaVisBytes);
pvs = reinterpret_cast<int *>(currentPVS[handle.i].pvs); pvs = reinterpret_cast<int *>(currentPVS[handle.i].pvs);
for ( j = 0; j < areaVisLongs; j++ ) { for ( j = 0; j < areaVisInts; j++ ) {
*pvs++ |= *vis++; *pvs++ |= *vis++;
} }
} }
@ -1089,7 +1089,7 @@ pvsHandle_t idPVS::MergeCurrentPVS( pvsHandle_t pvs1, pvsHandle_t pvs2 ) const {
pvs1Ptr = reinterpret_cast<int *>(currentPVS[pvs1.i].pvs); pvs1Ptr = reinterpret_cast<int *>(currentPVS[pvs1.i].pvs);
pvs2Ptr = reinterpret_cast<int *>(currentPVS[pvs2.i].pvs); pvs2Ptr = reinterpret_cast<int *>(currentPVS[pvs2.i].pvs);
for ( i = 0; i < areaVisLongs; i++ ) { for ( i = 0; i < areaVisInts; i++ ) {
*ptr++ = *pvs1Ptr++ | *pvs2Ptr++; *ptr++ = *pvs1Ptr++ | *pvs2Ptr++;
} }

4
d3xp/Pvs.h
View file

@ -111,9 +111,9 @@ private:
mutable pvsCurrent_t currentPVS[MAX_CURRENT_PVS]; mutable pvsCurrent_t currentPVS[MAX_CURRENT_PVS];
// used to create PVS // used to create PVS
int portalVisBytes; int portalVisBytes;
int portalVisLongs; // Note: these are really ints now.. int portalVisInts;
int areaVisBytes; int areaVisBytes;
int areaVisLongs; // Note: these are really ints now.. int areaVisInts;
struct pvsPortal_s *pvsPortals; struct pvsPortal_s *pvsPortals;
struct pvsArea_s * pvsAreas; struct pvsArea_s * pvsAreas;

14
game/Pvs.cpp
View file

@ -374,7 +374,7 @@ pvsStack_t *idPVS::FloodPassagePVS_r( pvsPortal_t *source, const pvsPortal_t *po
// use the portal PVS if it has been calculated // use the portal PVS if it has been calculated
if ( p->done ) { if ( p->done ) {
portalVis = reinterpret_cast<int *>(p->vis); portalVis = reinterpret_cast<int *>(p->vis);
for ( j = 0; j < portalVisLongs; j++ ) { for ( j = 0; j < portalVisInts; j++ ) {
// get new PVS which is decreased by going through this passage // get new PVS which is decreased by going through this passage
m = *prevMightSee++ & *passageVis++ & *portalVis++; m = *prevMightSee++ & *passageVis++ & *portalVis++;
// check if anything might be visible through this passage that wasn't yet visible // check if anything might be visible through this passage that wasn't yet visible
@ -385,7 +385,7 @@ pvsStack_t *idPVS::FloodPassagePVS_r( pvsPortal_t *source, const pvsPortal_t *po
} }
else { else {
// the p->mightSee is implicitely stored in the passageVis // the p->mightSee is implicitely stored in the passageVis
for ( j = 0; j < portalVisLongs; j++ ) { for ( j = 0; j < portalVisInts; j++ ) {
// get new PVS which is decreased by going through this passage // get new PVS which is decreased by going through this passage
m = *prevMightSee++ & *passageVis++; m = *prevMightSee++ & *passageVis++;
// check if anything might be visible through this passage that wasn't yet visible // check if anything might be visible through this passage that wasn't yet visible
@ -758,7 +758,7 @@ int idPVS::AreaPVSFromPortalPVS( void ) const {
for ( j = 1; j < area->numPortals; j++ ) { for ( j = 1; j < area->numPortals; j++ ) {
p1 = reinterpret_cast<int *>(area->portals[0]->vis); p1 = reinterpret_cast<int *>(area->portals[0]->vis);
p2 = reinterpret_cast<int *>(area->portals[j]->vis); p2 = reinterpret_cast<int *>(area->portals[j]->vis);
for ( k = 0; k < portalVisLongs; k++ ) { for ( k = 0; k < portalVisInts; k++ ) {
*p1++ |= *p2++; *p1++ |= *p2++;
} }
} }
@ -808,7 +808,7 @@ void idPVS::Init( void ) {
areaQueue = new int[numAreas]; areaQueue = new int[numAreas];
areaVisBytes = ( ((numAreas+31)&~31) >> 3); areaVisBytes = ( ((numAreas+31)&~31) >> 3);
areaVisLongs = areaVisBytes/sizeof(int); areaVisInts = areaVisBytes/sizeof(int);
areaPVS = new byte[numAreas * areaVisBytes]; areaPVS = new byte[numAreas * areaVisBytes];
memset( areaPVS, 0xFF, numAreas * areaVisBytes ); memset( areaPVS, 0xFF, numAreas * areaVisBytes );
@ -816,7 +816,7 @@ void idPVS::Init( void ) {
numPortals = GetPortalCount(); numPortals = GetPortalCount();
portalVisBytes = ( ((numPortals+31)&~31) >> 3); portalVisBytes = ( ((numPortals+31)&~31) >> 3);
portalVisLongs = portalVisBytes/sizeof(int); portalVisInts = portalVisBytes/sizeof(int);
for ( int i = 0; i < MAX_CURRENT_PVS; i++ ) { for ( int i = 0; i < MAX_CURRENT_PVS; i++ ) {
currentPVS[i].handle.i = -1; currentPVS[i].handle.i = -1;
@ -1037,7 +1037,7 @@ pvsHandle_t idPVS::SetupCurrentPVS( const int *sourceAreas, const int numSourceA
vis = reinterpret_cast<int *>(areaPVS + sourceAreas[i] * areaVisBytes); vis = reinterpret_cast<int *>(areaPVS + sourceAreas[i] * areaVisBytes);
pvs = reinterpret_cast<int *>(currentPVS[handle.i].pvs); pvs = reinterpret_cast<int *>(currentPVS[handle.i].pvs);
for ( j = 0; j < areaVisLongs; j++ ) { for ( j = 0; j < areaVisInts; j++ ) {
*pvs++ |= *vis++; *pvs++ |= *vis++;
} }
} }
@ -1089,7 +1089,7 @@ pvsHandle_t idPVS::MergeCurrentPVS( pvsHandle_t pvs1, pvsHandle_t pvs2 ) const {
pvs1Ptr = reinterpret_cast<int *>(currentPVS[pvs1.i].pvs); pvs1Ptr = reinterpret_cast<int *>(currentPVS[pvs1.i].pvs);
pvs2Ptr = reinterpret_cast<int *>(currentPVS[pvs2.i].pvs); pvs2Ptr = reinterpret_cast<int *>(currentPVS[pvs2.i].pvs);
for ( i = 0; i < areaVisLongs; i++ ) { for ( i = 0; i < areaVisInts; i++ ) {
*ptr++ = *pvs1Ptr++ | *pvs2Ptr++; *ptr++ = *pvs1Ptr++ | *pvs2Ptr++;
} }

4
game/Pvs.h
View file

@ -107,9 +107,9 @@ private:
mutable pvsCurrent_t currentPVS[MAX_CURRENT_PVS]; mutable pvsCurrent_t currentPVS[MAX_CURRENT_PVS];
// used to create PVS // used to create PVS
int portalVisBytes; int portalVisBytes;
int portalVisLongs; // Note: these are really ints now.. int portalVisInts;
int areaVisBytes; int areaVisBytes;
int areaVisLongs; // Note: these are really ints now.. int areaVisInts;
struct pvsPortal_s *pvsPortals; struct pvsPortal_s *pvsPortals;
struct pvsArea_s * pvsAreas; struct pvsArea_s * pvsAreas;