Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add: Missing Cheering Animations #1030

Merged
merged 35 commits into from
Aug 13, 2023
Merged

Add: Missing Cheering Animations #1030

merged 35 commits into from
Aug 13, 2023

Conversation

commy2
Copy link
Collaborator

@commy2 commy2 commented Aug 29, 2022

previous: #1012
previous: #1013

@commy2 commy2 added Bug Something is not working right Minor Severity: Minor < Major < Critical < Blocker labels Aug 29, 2022
@commy2

This comment was marked as outdated.

@commy2 commy2 added the Experimental Wear safety goggles in lab label Aug 29, 2022
@xezon
Copy link
Collaborator

xezon commented Aug 29, 2022

x = has animation
(GOOD) = good transition
(OKAY) = okay transition
(bad) = bad transition

Original

Object Regular Cheer Injured Cheer
USA Ranger x x
USA Missile Defender
USA Pathfinder
USA Burton x x
China Red Guard x
China Tank Hunter
China Lotus x x
China Hacker x
GLA Rebel
GLA Tunnel Defender x x
GLA Terror x
GLA Hijacker x
GLA Saboteur x x
GLA Jarmen x x
GLA Mob x x

Patched

Object Regular Cheer Injured Cheer
USA Ranger x (bad) x (GOOD)
USA Missile Defender x (bad) x (bad)
USA Pathfinder x (GOOD) x (GOOD)
USA Burton x (bad) x (GOOD)
USA Pilot x (GOOD) x (GOOD)
China Red Guard x (GOOD) x (GOOD)
China Minigunner x (GOOD) x (GOOD)
China Tank Hunter x (GOOD) x (GOOD)
China Lotus x (bad) x (GOOD)
China Hacker x (bad) x (bad)
GLA Worker x (GOOD) x (GOOD)
GLA Rebel x (GOOD) x (GOOD)
GLA Tunnel Defender x (GOOD) x (GOOD)
GLA Terror x (bad) x (bad)
GLA Hijacker x (OKAY) x (OKAY)
GLA Saboteur x (GOOD) x (GOOD)
GLA Jarmen x (bad) x (GOOD)
GLA Mob x (bad) x (bad)
GLA Mob AK47 x (bad) x (bad)

@commy2
Copy link
Collaborator Author

commy2 commented Aug 29, 2022

USA Missile Defender Damaged - No animation

Interesting. Then I think this is bugged in NProject too. I figured it would not work with the setup they had, but didn't bother testing. No problem to fix though.

I don't think these have graceful transitions.

@ThePredatorBG
Copy link
Collaborator

The Missile Defender Animation works, but there is no graceful transition in and out of it. Same for Ranger.

USA Ranger - Works, but bad transition USA Ranger Damaged - Works, but bad transition USA Missile Defender (this) - Works, but bad transition USA Missile Defender Damaged - No animation USA Pathfinder - No animation USA Pathfinder Damaged - No Animation USA Burton - Works, looks acceptable USA Burton Damaged - Works, looks acceptable

USA Pathfinder has animation - "AIPFDR_CHA". Also, normal animations can be used for damaged states if damaged animations don't exist.

@commy2
Copy link
Collaborator Author

commy2 commented Aug 30, 2022

Should work for all USA units and all Rebels now.

@xezon
Copy link
Collaborator

xezon commented Aug 30, 2022

Tested most infantry units and updated table above. Pilot and Minigunner missing. "Transition Ok" means a very generous judgement whether or not the clipping looks alright. Ideally the animations would properly interpolate. All of them do not. Unclear to me if that can be fixed in INI.

Videos of current state with this branch

america_cheer.mp4
china_cheer.mp4
gla_cheer.mp4

@commy2 commy2 force-pushed the fix-missing-cheers branch 2 times, most recently from 4490ffb to aba7026 Compare August 30, 2022 20:40
@commy2
Copy link
Collaborator Author

commy2 commented Aug 30, 2022

Fixed the Stand -> StandInjured transition playing for Ranger and Burton after cheering when hurt. Also removed the freeze of MD during the cheer.

@commy2 commy2 force-pushed the fix-missing-cheers branch 3 times, most recently from 4281864 to a3304b7 Compare August 30, 2022 22:58
@commy2 commy2 removed the Experimental Wear safety goggles in lab label Aug 30, 2022
@commy2 commy2 removed their assignment Aug 30, 2022
@commy2
Copy link
Collaborator Author

commy2 commented Aug 30, 2022

Should be done now.

@xezon
Copy link
Collaborator

xezon commented Aug 31, 2022

I will make cheering test map and test this.

@xezon xezon self-assigned this Aug 31, 2022
@xezon xezon self-requested a review August 31, 2022 04:51
@commy2
Copy link
Collaborator Author

commy2 commented Aug 31, 2022

You can add the CIA Agent, Biohazard Tech, and USA and China Officer. I check, it should work for them correctly already.

@commy2 commy2 self-assigned this Oct 30, 2022
@commy2
Copy link
Collaborator Author

commy2 commented Jul 17, 2023

Could you check again? Should be complete.

Don't forget the Worker.

@xezon
Copy link
Collaborator

xezon commented Jul 18, 2023

Last time I checked what I did not like about the cheering is that the animations have no proper transitions. They just jump from one state to another. Not clear to me if this can be improved.

There is a case to make that if the animation jumps cannot be solved, then perhaps there should be no cheering animation.

@commy2
Copy link
Collaborator Author

commy2 commented Jul 18, 2023

Last time I checked what I did not like about the cheering is that the animations have no proper transitions. They just jump from one state to another. Not clear to me if this can be improved.

I wouldn't know how. It's like when they start moving or die. It's all instantly. I don't think there even are any transitions for these. Some naturally end up at the standing position though.

There is a case to make that if the animation jumps cannot be solved, then perhaps there should be no cheering animation.

The sound plays anyway. No animation is weird. You could have a group of units without any animations.

@commy2 commy2 self-assigned this Aug 9, 2023
@commy2
Copy link
Collaborator Author

commy2 commented Aug 9, 2023

Implemented some ideas, USA only for now. Please check.

There're two types of cheering animations

  1. those that loop
  2. those that begin and end in a standing pose

It's possible to make smooth transitions for (2), but not (1). Some units have 2 cheering animations - healthy and injured, some units have only 1 cheering animation, especially those that don't have an injured walk/standing animation to begin with.

MD only has 1 animation of type (1)
Pathfinder only has 1 and of type (2)
Ranger and Burton have two animations, where the healthy one is type (1), the injured one is type (2)
etc.

I added the smooth transitions were possible.

Another idea I have is adding randomization to these animations, so large homogenous groups of units don't look so synchronized when cheering. Idk if that is overkill though.

Will need to go through civs too eventually, especially the recently added armed civs.

@xezon
Copy link
Collaborator

xezon commented Aug 10, 2023

I tested the 5 usa infantry.

Pilot and Pathfinder look very good.

@commy2
Copy link
Collaborator Author

commy2 commented Aug 10, 2023

China batch.

@commy2
Copy link
Collaborator Author

commy2 commented Aug 10, 2023

GLA Batch. It's getting quite big. I propose merge this if all good and move on to civilians separately. They likely need more tweaks anyway.

@xezon
Copy link
Collaborator

xezon commented Aug 11, 2023

Good effort.

I have updated table in second post.

14 cheer transitions look bad.
2 cheer transitions look ok.
22 cheer transitions look good.

I think this is as good as can be without touching w3d animations.

@xezon
Copy link
Collaborator

xezon commented Aug 11, 2023

Could get rid of 4 bad transitions by removing cheer animations from Angry Mob. They are cheering all the time anyway. It looks as if their idle animations are identical or similar to the cheering anyway.

Copy link
Collaborator

@xezon xezon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Debug needs to be removed. Documentation needs to be added. Perhaps remove obsolete cheering from Angry Mobs.

@commy2
Copy link
Collaborator Author

commy2 commented Aug 12, 2023

They are cheering all the time anyway.

Same animation files, but idle "cheering" is played slower than cheering cheering.

@commy2 commy2 merged commit 9d4e58b into main Aug 13, 2023
@commy2 commy2 deleted the fix-missing-cheers branch August 13, 2023 12:41
@xezon
Copy link
Collaborator

xezon commented Aug 13, 2023

Now you submitted this with all the extra debug. And without documentation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something is not working right Minor Severity: Minor < Major < Critical < Blocker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants