AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-17 19:45:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix corner case with slabs.

Browse Source
This commit is contained in:
UnknownShadow200 2015-01-25 14:41:11 +11:00
parent 359060889f
commit 272125c769
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Physics/Entity.Physics.cs
View File

@ -18,7 +18,7 @@ namespace ClassicalSharp {
bool GetBoundingBox( byte block, int x, int y, int z, out BoundingBox box ) { bool GetBoundingBox( byte block, int x, int y, int z, out BoundingBox box ) {
box = new BoundingBox( Vector3.Zero, Vector3.Zero ); box = new BoundingBox( Vector3.Zero, Vector3.Zero );
if( block == 0 || info.IsSprite( block ) || info.IsLiquid( block ) || block == (byte)Block.Snow ) return false; if( CanWalkThrough( block ) ) return false;
Vector3 min = new Vector3( x, y, z ); Vector3 min = new Vector3( x, y, z );
Vector3 max = new Vector3( x + 1, y + info.BlockHeight( block ), z + 1 ); Vector3 max = new Vector3( x + 1, y + info.BlockHeight( block ), z + 1 );
box = new BoundingBox( min, max ); box = new BoundingBox( min, max );
@ -37,13 +37,17 @@ namespace ClassicalSharp {
} }
} }
bool CanWalkThrough( byte block ) {
return block == 0 || info.IsSprite( block ) || info.IsLiquid( block ) || block == (byte)Block.Snow;
}
bool IsFreeYForStep( BoundingBox blockBB ) { bool IsFreeYForStep( BoundingBox blockBB ) {
// NOTE: if non whole blocks are added, use a proper AABB test. // NOTE: if non whole blocks are added, use a proper AABB test.
int x = (int)Utils.Floor( blockBB.Min.X ); int x = (int)Utils.Floor( blockBB.Min.X );
int y = (int)Utils.Floor( blockBB.Min.Y ); int y = (int)Utils.Floor( blockBB.Min.Y );
int z = (int)Utils.Floor( blockBB.Min.Z ); int z = (int)Utils.Floor( blockBB.Min.Z );
return !info.IsOpaque( GetPhysicsBlockId( x, y + 1, z ) ) && return CanWalkThrough( GetPhysicsBlockId( x, y + 1, z ) ) &&
!info.IsOpaque( GetPhysicsBlockId( x, y + 2, z ) ); CanWalkThrough( GetPhysicsBlockId( x, y + 2, z ) );
} }
// TODO: test for corner cases, and refactor this. // TODO: test for corner cases, and refactor this.