YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-02-03 10:35:42 +00:00
Code Issues Projects Releases Wiki Activity

Ropes use less entities and delayed initialization so other entities have a better chance getting correctly attached. Barnacle tongue has a higher priority over rope to avoid undesired player teleporting between two if player touched by both

Browse Source
This commit is contained in:
Roman Chistokhodov 2019-10-16 01:13:59 +03:00
parent cd2eaae54d
commit b825d57c87
3 changed files with 230 additions and 348 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

512
dlls/gearbox/ropes.cpp
View File

File diff suppressed because it is too large Load Diff

50
dlls/gearbox/ropes.h
View File

@ -20,11 +20,8 @@ class CRopeSample;
struct RopeSampleData; struct RopeSampleData;
struct Spring;
#define MAX_SEGMENTS 63 #define MAX_SEGMENTS 63
#define MAX_SAMPLES 64 #define MAX_SAMPLES 64
#define MAX_TEMP_SAMPLES 5
/** /**
* A rope with a number of segments. * A rope with a number of segments.
@ -40,9 +37,8 @@ public:
virtual void Spawn(); virtual void Spawn();
void Think(); void EXPORT StartThink();
void EXPORT RopeThink();
void Touch( CBaseEntity* pOther );
virtual int Save( CSave &save ); virtual int Save( CSave &save );
virtual int Restore( CRestore &restore ); virtual int Restore( CRestore &restore );
@ -53,12 +49,6 @@ public:
*/ */
void InitializeRopeSim(); void InitializeRopeSim();
/**
* Initializes the springs.
* @param uiNumSprings Number of springs to create.
*/
void InitializeSprings( const size_t uiNumSprings );
/** /**
* Runs simulation on the samples. * Runs simulation on the samples.
*/ */
@ -88,7 +78,7 @@ public:
* @param second Second sample. * @param second Second sample.
* @param spring Spring. * @param spring Spring.
*/ */
void ComputeSpringForce( RopeSampleData& first, RopeSampleData& second, const Spring& spring ); void ComputeSpringForce(RopeSampleData& first, RopeSampleData& second);
/** /**
* Runs RK4 integration. * Runs RK4 integration.
@ -96,7 +86,7 @@ public:
* @param ppSampleSource Previous sample state. * @param ppSampleSource Previous sample state.
* @param ppSampleTarget Next sample state. * @param ppSampleTarget Next sample state.
*/ */
void RK4Integrate( const float flDeltaTime, CRopeSample** ppSampleSource, CRopeSample** ppSampleTarget ); void RK4Integrate(const float flDeltaTime);
/** /**
* Traces model positions and angles and corrects them. * Traces model positions and angles and corrects them.
@ -108,7 +98,7 @@ public:
/** /**
* Traces model positions and angles, makes visible segments visible and hidden segments hidden. * Traces model positions and angles, makes visible segments visible and hidden segments hidden.
*/ */
void SetRopeSegments( const size_t uiNumSegments, void SetRopeSegments( const int uiNumSegments,
CRopeSegment** ppPrimarySegs, CRopeSegment** ppHiddenSegs ); CRopeSegment** ppPrimarySegs, CRopeSegment** ppHiddenSegs );
/** /**
@ -141,7 +131,7 @@ public:
* @param vecForce Force. * @param vecForce Force.
* @param uiSegment Segment index. * @param uiSegment Segment index.
*/ */
void ApplyForceToSegment( const Vector& vecForce, const size_t uiSegment ); void ApplyForceToSegment( const Vector& vecForce, const int uiSegment );
/** /**
* Attached an object to the given segment. * Attached an object to the given segment.
@ -166,7 +156,7 @@ public:
/** /**
* @return The number of segments. * @return The number of segments.
*/ */
size_t GetNumSegments() const { return m_iSegments; } int GetNumSegments() const { return m_iSegments; }
/** /**
* @return The segments. * @return The segments.
@ -219,7 +209,7 @@ public:
/** /**
* @return Segment length for the given segment. * @return Segment length for the given segment.
*/ */
float GetSegmentLength( size_t uiSegmentIndex ) const; float GetSegmentLength( int uiSegmentIndex ) const;
/** /**
* @return Total rope length. * @return Total rope length.
@ -234,17 +224,17 @@ public:
/** /**
* @return Whether the given segment index is valid. * @return Whether the given segment index is valid.
*/ */
bool IsValidSegmentIndex( const size_t uiSegment ) const; bool IsValidSegmentIndex( const int uiSegment ) const;
/** /**
* @return The origin of the given segment. * @return The origin of the given segment.
*/ */
Vector GetSegmentOrigin( const size_t uiSegment ) const; Vector GetSegmentOrigin( const int uiSegment ) const;
/** /**
* @return The attachment point of the given segment. * @return The attachment point of the given segment.
*/ */
Vector GetSegmentAttachmentPoint( const size_t uiSegment ) const; Vector GetSegmentAttachmentPoint( const int uiSegment ) const;
/** /**
* @param pSegment Segment. * @param pSegment Segment.
@ -256,7 +246,7 @@ public:
* @param uiSegmentIndex Segment index. * @param uiSegmentIndex Segment index.
* @return The segment direction normal from its origin. * @return The segment direction normal from its origin.
*/ */
Vector GetSegmentDirFromOrigin( const size_t uiSegmentIndex ) const; Vector GetSegmentDirFromOrigin( const int uiSegmentIndex ) const;
/** /**
* @return The attached object position. * @return The attached object position.
@ -264,7 +254,7 @@ public:
Vector GetAttachedObjectsPosition() const; Vector GetAttachedObjectsPosition() const;
private: private:
size_t m_iSegments; int m_iSegments;
CRopeSegment* seg[ MAX_SEGMENTS ]; CRopeSegment* seg[ MAX_SEGMENTS ];
CRopeSegment* altseg[ MAX_SEGMENTS ]; CRopeSegment* altseg[ MAX_SEGMENTS ];
@ -277,18 +267,10 @@ private:
Vector m_LastEndPos; Vector m_LastEndPos;
Vector m_Gravity; Vector m_Gravity;
float m_HookConstant;
float m_SpringDampning;
CRopeSample* m_CurrentSys[ MAX_SAMPLES ]; CRopeSample* m_Samples[ MAX_SAMPLES ];
CRopeSample* m_TargetSys[ MAX_SAMPLES ];
RopeSampleData* m_TempSys[ MAX_TEMP_SAMPLES ];
size_t m_NumSamples; int m_NumSamples;
Spring* m_Spring;
size_t m_SpringCnt;
bool mSpringsInitialized; bool mSpringsInitialized;
@ -296,7 +278,7 @@ private:
bool mObjectAttached; bool mObjectAttached;
size_t mAttachedObjectsSegment; int mAttachedObjectsSegment;
float mAttachedObjectsOffset; float mAttachedObjectsOffset;
float detachTime; float detachTime;

16
dlls/player.cpp
View File

@ -4349,6 +4349,22 @@ void CBasePlayer::UpdateClientData( void )
BOOL CBasePlayer::FBecomeProne( void ) BOOL CBasePlayer::FBecomeProne( void )
{ {
m_afPhysicsFlags |= PFLAG_ONBARNACLE; m_afPhysicsFlags |= PFLAG_ONBARNACLE;
if( (m_afPhysicsFlags & PFLAG_ONROPE) )
{
pev->movetype = MOVETYPE_WALK;
pev->solid = SOLID_SLIDEBOX;
this->m_afPhysicsFlags &= ~PFLAG_ONROPE;
if (m_pRope)
{
m_pRope->DetachObject();
m_pRope = NULL;
}
m_bIsClimbing = false;
}
return TRUE; return TRUE;
} }