diff options
| author | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
|---|---|---|
| committer | Narendra Umate <[email protected]> | 2013-12-08 01:27:41 -0800 |
| commit | 4fa56874ba1557274c10077bf8386ece4c61dbd6 (patch) | |
| tree | e2d336604e960b548e996d2e7dcfc5a1e1401b9e /sp/src/public/mathlib | |
| parent | Added DS_Store to .gitignore. (diff) | |
| parent | Make libSDL2.so/dylib into symlinks. (diff) | |
| download | source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.tar.xz source-sdk-2013-4fa56874ba1557274c10077bf8386ece4c61dbd6.zip | |
Merge remote-tracking branch 'upstream/master'
Reverted .gitattributes xcode_ccache_wrapper change. Fixed line endings
for .gitignore and .gitattributes.
Diffstat (limited to 'sp/src/public/mathlib')
| -rw-r--r-- | sp/src/public/mathlib/vector.h | 2 | ||||
| -rw-r--r-- | sp/src/public/mathlib/vmatrix.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sp/src/public/mathlib/vector.h b/sp/src/public/mathlib/vector.h index c19261d7..a797da25 100644 --- a/sp/src/public/mathlib/vector.h +++ b/sp/src/public/mathlib/vector.h @@ -1187,7 +1187,7 @@ inline Vector &AllocTempVector() } ThreadPause(); } - return s_vecTemp[nIndex & 0xffff]; + return s_vecTemp[nIndex]; } diff --git a/sp/src/public/mathlib/vmatrix.h b/sp/src/public/mathlib/vmatrix.h index 2c536672..c18e4822 100644 --- a/sp/src/public/mathlib/vmatrix.h +++ b/sp/src/public/mathlib/vmatrix.h @@ -200,6 +200,9 @@ public: // Setup a matrix for origin and angles. void SetupMatrixOrgAngles( const Vector &origin, const QAngle &vAngles ); + // Setup a matrix for angles and no translation. + void SetupMatrixAngles( const QAngle &vAngles ); + // General inverse. This may fail so check the return! bool InverseGeneral(VMatrix &vInverse) const; |