mse / RSOD (public) (License: CC0 and other licenses) (since 2025-03-01) (hash sha1)
Free software FPS engine
Clone URLs: https://rocketgit.com/user/mse/RSOD ssh://rocketgit@ssh.rocketgit.com/user/mse/RSOD git://git.rocketgit.com/user/mse/RSOD
master
List of commits:
Subject Hash Author Date (UTC)
Work on animation blending system eb5cfcf1387131b1ec8449e671d30efd787363b2 MSE 2024-09-20 06:40:35
Update stb_truetype 4948f1d29f33a33dc126d842d8d20f732f4cdef0 MSE 2024-09-18 17:38:06
Allow joystick to override mouse 6aba7a71ebe0dbd67717ae5a37e1729ebfe9895c MSE 2024-09-15 23:13:30
Add weapon switching via D-pad db14ce946f4c65ab6625875f00f82ee1b8052374 MSE 2024-09-15 20:10:20
Allow crouch to be turned off via playerCrouch flag 024d43d877ca16d21e0feeb50d70f82acd449335 MSE 2024-09-15 03:02:29
Add configurable third-person camera pitch constraints 9e2ebdd325515a5bc83cd49229cb099738fb9e0e MSE 2024-09-11 21:02:38
Add configurable thirdPersonCameraAutoRotateSpeed c3104421a4df91fbda573dadcce135f8016fa40e MSE 2024-09-11 19:27:17
Fix inventory display bug 8626c06403b025c6423ec249771598375791b6ca MSE 2024-09-02 23:38:01
Highlight agents and default MSAA to 2 f51dcb39a8abf3d2800d074dfc9606c1c8d486ec MSE 2024-08-27 03:46:04
Fix bad math e0ef61f3961a4d98608fb2c724cb631955ae1d82 MSE 2024-08-24 22:04:23
Smooth camera auto-rotation 0ddcd28b59e564e123a4984d26d2ec80a9f57ec7 MSE 2024-08-24 21:58:32
Allow free look in third-person a8b209cdd85ae914027ffd6c04990b75e9752578 MSE 2024-08-24 21:26:39
Auto-rotate third-person camera b9f034155274b8dc20b9f33d1fc39ce701017b0d MSE 2024-08-24 04:25:51
Use common math to rotate avatars 75e98c52899f17d8d511e733c1445f5eb69b738a MSE 2024-08-24 02:03:53
Correct minimap rotation in third-person 9bcf201c6b24b80b7eec2bb4b2ad296cd5d296ed MSE 2024-08-22 07:07:08
Rotate third-person agents independently of camera d4bcdb8ff8b47d6429117002a71881812c45a3dc MSE 2024-08-22 06:43:19
Remove browser launch from package-steam edb75b8fd4499e49f4a7893b0acf23bde9c8e5f9 MSE 2024-07-31 23:42:42
Work around a minimap regression acc3a99e8b96af34179824bcef7a11b0d539a499 MSE 2024-07-18 23:44:57
Check noautosave flag 185b4817614429cd43e8cdc1237fa5c9e635eff9 MSE 2024-07-12 01:04:06
Make MSAA a setting (default 0) e236f9370b87befa80f03118bd269ced22953868 MSE 2024-07-12 00:44:19
Commit eb5cfcf1387131b1ec8449e671d30efd787363b2 - Work on animation blending system
Author: MSE
Author date (UTC): 2024-09-20 06:40
Committer name: MSE
Committer date (UTC): 2024-09-20 06:40
Parent(s): 4948f1d29f33a33dc126d842d8d20f732f4cdef0
Signer:
Signing key:
Signing status: N
Tree: 5b6a3428e4610fe72deb6150ce44b3bb935685b6
File Lines added Lines deleted
include/avatar.h 30 12
File include/avatar.h changed (mode: 100644) (index 3e83692..07c9d7e)
... ... class Avatar {
68 68 double headFPS = 0.0; double headFPS = 0.0;
69 69 double bodyFrame = 0.0; double bodyFrame = 0.0;
70 70 double headFrame = 0.0; double headFrame = 0.0;
71 void blendTo( const std::string &animation );
71 72 void simulate( const std::string &animation, double d, bool loop = true ); void simulate( const std::string &animation, double d, bool loop = true );
72 73 void draw(linalg::mat<double,4,4> modelMat, linalg::mat<double,4,4> viewMat, linalg::mat<double,4,4> projMat, GLfloat drawDist = FLT_MAX, const std::string &weap = ""); void draw(linalg::mat<double,4,4> modelMat, linalg::mat<double,4,4> viewMat, linalg::mat<double,4,4> projMat, GLfloat drawDist = FLT_MAX, const std::string &weap = "");
73 74 std::string toString(); std::string toString();
 
... ... fgl::Texture *getCacheTexture( FILE *(*ModFopen)(const char*,const char*), const
383 384 } }
384 385 } }
385 386
387 // Override current animation and blend to the first frame of new animation.
388 void Avatar::blendTo( const std::string &animation ){
389 if( !smoothAnimation ) return;
390 if( bodyFrame >= 0.0 ){
391 bodyAnimations["_blend"] =
392 linalg::vec<int,2>(std::floor(bodyFrame), bodyAnimations[animation].x);
393 bodyFrame = -1.0;
394 }
395 if( headFrame >= 0.0 ){
396 headAnimations["_blend"] =
397 linalg::vec<int,2>(std::floor(headFrame), headAnimations[animation].x);
398 headFrame = -1.0;
399 }
400 }
401
386 402 void Avatar::simulate( const std::string &animation, double d, bool loop ){ void Avatar::simulate( const std::string &animation, double d, bool loop ){
387 auto bodyAnim = bodyAnimations[animation];
388 auto headAnim = headAnimations[animation];
403 bool blend = bodyFrame < 0.0 || headFrame < 0.0;
404 if( blend ) loop = false;
405 auto bodyAnim = bodyAnimations[blend ? "_blend" : animation];
406 auto headAnim = headAnimations[blend ? "_blend" : animation];
389 407 if( bodyFrame < bodyAnim.x || (loop && bodyFrame >= bodyAnim.y) ) if( bodyFrame < bodyAnim.x || (loop && bodyFrame >= bodyAnim.y) )
390 408 bodyFrame = bodyAnim.x; bodyFrame = bodyAnim.x;
391 409 if( (double)bodyAnim.y - bodyAnim.x > 0.0 ){ if( (double)bodyAnim.y - bodyAnim.x > 0.0 ){
 
... ... void Avatar::simulate( const std::string &animation, double d, bool loop ){
411 429 if( smoothAnimation ){ if( smoothAnimation ){
412 430 for( auto &prim : bodyPrims ){ for( auto &prim : bodyPrims ){
413 431 if( prim.meshes.size() == 0 ) continue; if( prim.meshes.size() == 0 ) continue;
414 float frameA =
415 std::fmod(bodyFrame - bodyAnim.x, bodyAnim.y) + bodyAnim.x;
416 float frameB =
417 std::fmod(frameA + 1.0 - bodyAnim.x, bodyAnim.y) + bodyAnim.x;
432 float frameA = blend ? bodyAnim.x
433 : std::fmod(bodyFrame - bodyAnim.x, bodyAnim.y) + bodyAnim.x;
434 float frameB = blend ? bodyAnim.y
435 : std::fmod(frameA + 1.0 - bodyAnim.x, bodyAnim.y) + bodyAnim.x;
418 436 lerpMeshes( lerpMeshes(
419 437 prim.streamingMesh, prim.streamingMesh,
420 438 *prim.meshes[std::fmod((size_t)frameA, prim.meshes.size())], *prim.meshes[std::fmod((size_t)frameA, prim.meshes.size())],
421 439 *prim.meshes[std::fmod((size_t)frameB, prim.meshes.size())], *prim.meshes[std::fmod((size_t)frameB, prim.meshes.size())],
422 bodyFrame - std::floor(bodyFrame)
440 bodyFrame + (blend ? 1.0 : -std::floor(bodyFrame))
423 441 ); );
424 442 } }
425 443 for( auto &prim : headPrims ){ for( auto &prim : headPrims ){
426 444 if( prim.meshes.size() == 0 ) continue; if( prim.meshes.size() == 0 ) continue;
427 float frameA =
428 std::fmod(headFrame - headAnim.x, headAnim.y) + headAnim.x;
429 float frameB =
430 std::fmod(frameA + 1.0 - headAnim.x, headAnim.y) + headAnim.x;
445 float frameA = blend ? headAnim.x
446 : std::fmod(headFrame - headAnim.x, headAnim.y) + headAnim.x;
447 float frameB = blend ? headAnim.y
448 : std::fmod(frameA + 1.0 - headAnim.x, headAnim.y) + headAnim.x;
431 449 lerpMeshes( lerpMeshes(
432 450 prim.streamingMesh, prim.streamingMesh,
433 451 *prim.meshes[std::fmod((size_t)frameA, prim.meshes.size())], *prim.meshes[std::fmod((size_t)frameA, prim.meshes.size())],
434 452 *prim.meshes[std::fmod((size_t)frameB, prim.meshes.size())], *prim.meshes[std::fmod((size_t)frameB, prim.meshes.size())],
435 headFrame - std::floor(headFrame)
453 headFrame + (blend ? 1.0 : -std::floor(headFrame))
436 454 ); );
437 455 } }
438 456 } }
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/RSOD

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/RSOD

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/RSOD

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main