zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-05-08 14:51:00 +00:00
parent 1e6bd15130
commit f8e54e2202
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
source/platform/pbranch.cpp
View file

@ -39,7 +39,6 @@ void CNpcBranchPlatform::postInit()
CNpcPlatform::postInit(); CNpcPlatform::postInit();
m_angularVelocity = 0; m_angularVelocity = 0;
m_platformWidth <<= 1;
} }
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

15
source/platform/platform.cpp
View file

@ -665,18 +665,21 @@ void CNpcPlatform::calculateBoundingBoxSize()
angle=getCollisionAngle(); angle=getCollisionAngle();
centre=getCollisionCentre(); centre=getCollisionCentre();
halfLength=m_platformWidth/2;
/*x1=-halfLength*mcos(angle&4095)>>12; //halfLength=m_platformWidth/2;
sBBox boundingBox = m_modelGfx->GetBBox();
halfLength = ( boundingBox.XMax - boundingBox.XMin ) >> 1;
x1=-halfLength*mcos(angle&4095)>>12;
y1=-halfLength*msin(angle&4095)>>12; y1=-halfLength*msin(angle&4095)>>12;
x2=+halfLength*mcos(angle&4095)>>12; x2=+halfLength*mcos(angle&4095)>>12;
y2=+halfLength*msin(angle&4095)>>12; y2=+halfLength*msin(angle&4095)>>12;
setCollisionSize(abs(x2-x1),abs(y2-y1)+PLATFORMCOLLISIONHEIGHT);*/ setCollisionSize(abs(x2-x1),abs(y2-y1)+PLATFORMCOLLISIONHEIGHT);
sBBox boundingBox = m_modelGfx->GetBBox(); //sBBox boundingBox = m_modelGfx->GetBBox();
setCollisionSize( ( boundingBox.XMax - boundingBox.XMin ), ( boundingBox.YMax - boundingBox.YMin ) ); //setCollisionSize( ( boundingBox.XMax - boundingBox.XMin ), ( boundingBox.YMax - boundingBox.YMin ) );
setCollisionCentreOffset( ( boundingBox.XMax + boundingBox.XMin ) >> 1, ( boundingBox.YMax + boundingBox.YMin ) >> 1 ); //setCollisionCentreOffset( ( boundingBox.XMax + boundingBox.XMin ) >> 1, ( boundingBox.YMax + boundingBox.YMin ) >> 1 );
} }

2
source/platform/platform.h
View file

@ -205,8 +205,6 @@ protected:
CModelGfx *m_modelGfx; CModelGfx *m_modelGfx;
u8 m_isShuttingDown; u8 m_isShuttingDown;
u8 m_platformWidth;
int m_graphicNum; int m_graphicNum;
virtual void collidedWith(CThing *_thisThing); virtual void collidedWith(CThing *_thisThing);