TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1 from GarageGames/development

Browse source 
development updates
This commit is contained in:
Anis 2016-02-13 20:25:22 +01:00
commit 7b8df19a33
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/T3D/player.cpp
View file

@ -4659,9 +4659,9 @@ Point3F Player::_move( const F32 travelTime, Collision *outCol )
} }
Point3F distance = end - start; Point3F distance = end - start;
if (mFabs(distance.x) < mObjBox.len_x() && if (mFabs(distance.x) < mScaledBox.len_x() &&
mFabs(distance.y) < mObjBox.len_y() && mFabs(distance.y) < mScaledBox.len_y() &&
mFabs(distance.z) < mObjBox.len_z()) mFabs(distance.z) < mScaledBox.len_z())
{ {
// We can potentially early out of this. If there are no polys in the clipped polylist at our // We can potentially early out of this. If there are no polys in the clipped polylist at our
// end position, then we can bail, and just set start = end; // end position, then we can bail, and just set start = end;

2
Engine/source/ts/tsShapeInstance.cpp
View file

@ -593,7 +593,7 @@ S32 TSShapeInstance::setDetailFromDistance( const SceneRenderState *state, F32 s
// 4:3 aspect ratio, we've changed the reference value // 4:3 aspect ratio, we've changed the reference value
// to 300 to be more compatible with legacy shapes. // to 300 to be more compatible with legacy shapes.
// //
const F32 pixelScale = state->getViewport().extent.y / 300.0f; const F32 pixelScale = (state->getViewport().extent.x / state->getViewport().extent.y);
// This is legacy DTS support for older "multires" based // This is legacy DTS support for older "multires" based
// meshes. The original crossbow weapon uses this. // meshes. The original crossbow weapon uses this.