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)
Restructure Avatar::simulate 9519e901631ea04a1a93e24504d8f37c521164d1 MSE 2024-09-24 06:51:15
Blend avatar jump animations 8d26db0ecd4ef6a48546684e4bf2200bfea0f41b MSE 2024-09-20 08:19:20
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
Commit 9519e901631ea04a1a93e24504d8f37c521164d1 - Restructure Avatar::simulate
Author: MSE
Author date (UTC): 2024-09-24 06:51
Committer name: MSE
Committer date (UTC): 2024-09-24 06:51
Parent(s): 8d26db0ecd4ef6a48546684e4bf2200bfea0f41b
Signer:
Signing key:
Signing status: N
Tree: fd5f08b52cd98e7d4fbbb8168231bc441aef0e1b
File Lines added Lines deleted
include/avatar.h 15 16
File include/avatar.h changed (mode: 100644) (index c853a12..d54c764)
... ... fgl::Texture *getCacheTexture( FILE *(*ModFopen)(const char*,const char*), const
387 387 // Override current animation and blend to the first frame of new animation. // Override current animation and blend to the first frame of new animation.
388 388 void Avatar::blendTo( const std::string &animation ){ void Avatar::blendTo( const std::string &animation ){
389 389 if( !smoothAnimation ) return; if( !smoothAnimation ) return;
390 if( bodyFrame >= 0.0 ){
390 if( bodyFrame > 0.0 ){
391 391 bodyAnimations["_blend"] = bodyAnimations["_blend"] =
392 392 linalg::vec<int,2>(std::floor(bodyFrame), bodyAnimations[animation].x); linalg::vec<int,2>(std::floor(bodyFrame), bodyAnimations[animation].x);
393 393 bodyFrame = -1.0; bodyFrame = -1.0;
394 394 } }
395 if( headFrame >= 0.0 ){
395 if( headFrame > 0.0 ){
396 396 headAnimations["_blend"] = headAnimations["_blend"] =
397 397 linalg::vec<int,2>(std::floor(headFrame), headAnimations[animation].x); linalg::vec<int,2>(std::floor(headFrame), headAnimations[animation].x);
398 398 headFrame = -1.0; headFrame = -1.0;
 
... ... void Avatar::blendTo( const std::string &animation ){
400 400 } }
401 401
402 402 void Avatar::simulate( const std::string &animation, double d, bool loop ){ void Avatar::simulate( const std::string &animation, double d, bool loop ){
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];
407 if( (!blend && bodyFrame < bodyAnim.x) || (loop && bodyFrame >= bodyAnim.y) )
403 bool bodyBlend = bodyFrame < 0.0, headBlend = headFrame < 0.0;
404 auto bodyAnim = bodyAnimations[bodyBlend ? "_blend" : animation];
405 auto headAnim = headAnimations[headBlend ? "_blend" : animation];
406 if( (!bodyBlend && bodyFrame < bodyAnim.x) || (loop && bodyFrame >= bodyAnim.y) )
408 407 bodyFrame = bodyAnim.x; bodyFrame = bodyAnim.x;
409 408 if( (double)bodyAnim.y - bodyAnim.x > 0.0 ){ if( (double)bodyAnim.y - bodyAnim.x > 0.0 ){
410 409 // Play the appropriate body animation. // Play the appropriate body animation.
411 if( loop ){
410 if( loop && !bodyBlend ){
412 411 bodyFrame = bodyAnim.x bodyFrame = bodyAnim.x
413 412 + std::fmod(bodyFrame - bodyAnim.x + bodyFPS * d, (double)bodyAnim.y - bodyAnim.x); + std::fmod(bodyFrame - bodyAnim.x + bodyFPS * d, (double)bodyAnim.y - bodyAnim.x);
414 413 }else{ }else{
415 414 bodyFrame = std::min(bodyFrame + bodyFPS * d, (double)bodyAnim.y); bodyFrame = std::min(bodyFrame + bodyFPS * d, (double)bodyAnim.y);
416 415 } }
417 416 } }
418 if( (!blend && headFrame < headAnim.x) || (loop && headFrame >= headAnim.y) )
417 if( (!headBlend && headFrame < headAnim.x) || (loop && headFrame >= headAnim.y) )
419 418 headFrame = headAnim.x; headFrame = headAnim.x;
420 419 if( (double)headAnim.y - headAnim.x > 0.0 ){ if( (double)headAnim.y - headAnim.x > 0.0 ){
421 420 // Play the appropriate head animation. // Play the appropriate head animation.
422 if( loop ){
421 if( loop && !headBlend ){
423 422 headFrame = headAnim.x headFrame = headAnim.x
424 423 + std::fmod(headFrame - headAnim.x + headFPS * d, (double)headAnim.y - headAnim.x); + std::fmod(headFrame - headAnim.x + headFPS * d, (double)headAnim.y - headAnim.x);
425 424 }else{ }else{
 
... ... void Avatar::simulate( const std::string &animation, double d, bool loop ){
429 428 if( smoothAnimation ){ if( smoothAnimation ){
430 429 for( auto &prim : bodyPrims ){ for( auto &prim : bodyPrims ){
431 430 if( prim.meshes.size() == 0 ) continue; if( prim.meshes.size() == 0 ) continue;
432 float frameA = blend ? bodyAnim.x
431 float frameA = bodyBlend ? bodyAnim.x
433 432 : std::fmod(bodyFrame - bodyAnim.x, bodyAnim.y) + bodyAnim.x; : std::fmod(bodyFrame - bodyAnim.x, bodyAnim.y) + bodyAnim.x;
434 float frameB = blend ? bodyAnim.y
433 float frameB = bodyBlend ? bodyAnim.y
435 434 : std::fmod(frameA + 1.0 - bodyAnim.x, bodyAnim.y) + bodyAnim.x; : std::fmod(frameA + 1.0 - bodyAnim.x, bodyAnim.y) + bodyAnim.x;
436 435 lerpMeshes( lerpMeshes(
437 436 prim.streamingMesh, prim.streamingMesh,
438 437 *prim.meshes[std::fmod((size_t)frameA, prim.meshes.size())], *prim.meshes[std::fmod((size_t)frameA, prim.meshes.size())],
439 438 *prim.meshes[std::fmod((size_t)frameB, prim.meshes.size())], *prim.meshes[std::fmod((size_t)frameB, prim.meshes.size())],
440 bodyFrame + (blend ? 1.0 : -std::floor(bodyFrame))
439 bodyFrame + (bodyBlend ? 1.0 : -std::floor(bodyFrame))
441 440 ); );
442 441 } }
443 442 for( auto &prim : headPrims ){ for( auto &prim : headPrims ){
444 443 if( prim.meshes.size() == 0 ) continue; if( prim.meshes.size() == 0 ) continue;
445 float frameA = blend ? headAnim.x
444 float frameA = headBlend ? headAnim.x
446 445 : std::fmod(headFrame - headAnim.x, headAnim.y) + headAnim.x; : std::fmod(headFrame - headAnim.x, headAnim.y) + headAnim.x;
447 float frameB = blend ? headAnim.y
446 float frameB = headBlend ? headAnim.y
448 447 : std::fmod(frameA + 1.0 - headAnim.x, headAnim.y) + headAnim.x; : std::fmod(frameA + 1.0 - headAnim.x, headAnim.y) + headAnim.x;
449 448 lerpMeshes( lerpMeshes(
450 449 prim.streamingMesh, prim.streamingMesh,
451 450 *prim.meshes[std::fmod((size_t)frameA, prim.meshes.size())], *prim.meshes[std::fmod((size_t)frameA, prim.meshes.size())],
452 451 *prim.meshes[std::fmod((size_t)frameB, prim.meshes.size())], *prim.meshes[std::fmod((size_t)frameB, prim.meshes.size())],
453 headFrame + (blend ? 1.0 : -std::floor(headFrame))
452 headFrame + (headBlend ? 1.0 : -std::floor(headFrame))
454 453 ); );
455 454 } }
456 455 } }
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