mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
Code Issues Releases Wiki Activity

StepSize moved back to 9

Browse source
This commit is contained in:
Jason Hooks 2012-06-17 12:57:59 -04:00
parent a1902b4121
commit ac6b455592
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/openengine/bullet/pmove.cpp
View file

@ -530,7 +530,7 @@ int PM_StepSlideMove( bool gravity )
delta = pm->ps.origin.z - start_o.z; delta = pm->ps.origin.z - start_o.z;
if ( delta > 2 ) if ( delta > 2 )
{ {
pm->ps.counter = 10; pm->ps.counter = 5;
/* /*
if (gravity) if (gravity)
@ -1167,8 +1167,7 @@ void PM_GroundTraceMissed()
//We should not have significant upwards velocity when in the air, unless we jumped. //We should not have significant upwards velocity when in the air, unless we jumped.
//This code protects against flying into the air when moving at high speeds. //This code protects against flying into the air when moving at high speeds.
//Z velocity is set to 50, instead of 0, to help move up certain steps. //Z velocity is set to 50, instead of 0, to help move up certain steps.
if(pm->ps.velocity.z > 50.0f)
pm->ps.velocity.z = 50.0f;
//std::cout << "Ground trace missed\n"; //std::cout << "Ground trace missed\n";
// we just transitioned into freefall // we just transitioned into freefall
//if ( pm->debugLevel ) //if ( pm->debugLevel )
@ -1431,12 +1430,15 @@ static void PM_GroundTrace( void )
// if the trace didn't hit anything, we are in free fall // if the trace didn't hit anything, we are in free fall
if ( trace.fraction == 1.0) if ( trace.fraction == 1.0)
{ {
if(pm->ps.velocity.z > 50.0f && pm->ps.bSnap)
pm->ps.velocity.z = 50.0f;
if(pm->ps.snappingImplemented){ if(pm->ps.snappingImplemented){
if(pm->ps.bSnap && pm->ps.counter <= 0) if(pm->ps.bSnap && pm->ps.counter <= 0)
PM_GroundTraceMissed(); PM_GroundTraceMissed();
} }
return; return;
} }
else else

6
libs/openengine/bullet/pmove.h
View file

@ -28,7 +28,7 @@ static const Ogre::Vector3 halfExtents(14.64f * 2, 14.24f * 2, 33.25f * 2);
#define MAX_CLIP_PLANES 5 #define MAX_CLIP_PLANES 5
#define OVERCLIP 1.001f #define OVERCLIP 1.001f
//#define STEPSIZE 18 // 18 is way too much //#define STEPSIZE 18 // 18 is way too much
#define STEPSIZE (13.5) #define STEPSIZE (9)
#ifndef M_PI #ifndef M_PI
#define M_PI 3.14159265358979323846f #define M_PI 3.14159265358979323846f
#endif #endif
@ -42,7 +42,7 @@ static const Ogre::Vector3 halfExtents(14.64f * 2, 14.24f * 2, 33.25f * 2);
#define ENTITYNUM_NONE (MAX_GENTITIES - 1) #define ENTITYNUM_NONE (MAX_GENTITIES - 1)
#define ENTITYNUM_WORLD (MAX_GENTITIES - 2) #define ENTITYNUM_WORLD (MAX_GENTITIES - 2)
#define MIN_WALK_NORMAL .7f // can't walk on very steep slopes #define MIN_WALK_NORMAL .7f // can't walk on very steep slopes
#define JUMP_VELOCITY (270) #define JUMP_VELOCITY (540)
#define PS_PMOVEFRAMECOUNTBITS 6 #define PS_PMOVEFRAMECOUNTBITS 6
#define MINS_Z -24 #define MINS_Z -24
#define DEFAULT_VIEWHEIGHT 26 #define DEFAULT_VIEWHEIGHT 26
@ -90,7 +90,7 @@ struct playerMove
{ {
struct playerStruct struct playerStruct
{ {
playerStruct() : gravity(800.0f), speed(480.0f), pmove_framecount(20), groundEntityNum(ENTITYNUM_NONE), commandTime(40), move_type(PM_NOCLIP), pm_time(0), snappingImplemented(true), bSnap(false), counter(-1) playerStruct() : gravity(800.0f), speed(2000.0f), pmove_framecount(20), groundEntityNum(ENTITYNUM_NONE), commandTime(40), move_type(PM_NOCLIP), pm_time(0), snappingImplemented(true), bSnap(false), counter(-1)
{ {
origin = Ogre::Vector3(733.164f,900.0f, 839.432f); origin = Ogre::Vector3(733.164f,900.0f, 839.432f);
velocity = Ogre::Vector3(0.0f, 0.0f, 0.0f); velocity = Ogre::Vector3(0.0f, 0.0f, 0.0f);