Diffusion 0 A.D. Public Repository rP7609

# Unit animation improvements.
rP7609
Actions

Tags

None

Subscribers

Description

Unit animation improvements.

Animate props much more sensibly.
Move ammo code out of CUnit.
Move animation logic out of CModel.
Launch projectiles from the correct location.
Use entity's speeds and sounds in actor viewer.
Add -nosound option to disable audio, and allow audio by default in Atlas.
Remove some obsolete options.

Details

Committed

Jun 5 2010, 2:49 AM

Parents

rP7608: Automated build.

Branches

Unknown

Tags

Unknown

Event Timeline

philip committed rP7609: # Unit animation improvements..Jun 5 2010, 2:49 AM

elexis mentioned this in rP21359: Fix units not being able to play sounds when walking and running.Feb 25 2018, 12:10 PM

Silier added a subscriber: Silier.Nov 11 2019, 2:53 PM

Silier added inline comments.

/ps/trunk/source/graphics/Model.cpp
344	So here are 2 mane cases we cannot set animation. 1st there are not bones 2nd animation is not valid I am not sure what will happen if we do not have bones and we do not have animation. In that case no one from these condition is true so animation is going to be set ? But I would expect as we do not have animation and bones, we cannot set animation eighter. Or am I missing anything here? That being said, these conditions can be merged into one if if (!m_BoneMatricess \|\| !anim->m_AnimDef)

Stan added a subscriber: Stan.Nov 11 2019, 3:00 PM

Stan added inline comments.

/ps/trunk/source/graphics/Model.cpp
344	Is it possible that those cases are handled beforehand when converting DAE TO PMD/PSA ?

Silier added inline comments.Nov 11 2019, 3:16 PM

/ps/trunk/source/graphics/Model.cpp
344	Did not find them (but maybe i did not look at right places). As far as I tracked code back, bone matrix is created only if bones are there and model is valid even without bones. Anyway it is better to catch that here mainly if that can reduce number of conditions :)

Stan added inline comments.Nov 11 2019, 4:19 PM

/ps/trunk/source/graphics/Model.cpp
344	Well eventually the goal is to use GLTF everywhere...

Silier mentioned this in D2416: Simplify conditions in SetAnimation.Nov 11 2019, 6:03 PM

Silier added inline comments.Dec 9 2019, 3:48 PM

/ps/trunk/source/graphics/Model.cpp
344	actually it was rP3653, sorry

vladislavbelov mentioned this in rP25498: Removes g_TriPathfind forgotten in rP7609..May 21 2021, 9:11 PM

Changes (27)

Path

Size

ps/

trunk/

binaries/

data/

mods/

_test.sim/

simulation/

templates/

unitobstruct.xml

tools/

atlas/

scripts/

section/

source/

graphics/

ObjectEntry.cpp

UnitAnimation.cpp

UnitAnimation.h

UnitManager.cpp

ps/

GameSetup/

renderer/

simulation2/

components/

CCmpProjectileManager.cpp

CCmpTemplateManager.cpp

CCmpUnitMotion.cpp

CCmpVisualActor.cpp

ICmpUnitMotion.h

sound/

tools/

atlas/

GameInterface/

ActorViewer.cpp

rP7609

ps/trunk/binaries/data/mods/_test.sim/simulation/templates/unit.xml

Loading...

ps/trunk/binaries/data/mods/_test.sim/simulation/templates/unitobstruct.xml

Loading...

ps/trunk/binaries/data/tools/atlas/scripts/section/object.js

Loading...

ps/trunk/source/graphics/Model.cpp

Loading...

ps/trunk/source/graphics/Model.h

Loading...

ps/trunk/source/graphics/ObjectBase.h

Loading...

ps/trunk/source/graphics/ObjectEntry.cpp

Loading...

ps/trunk/source/graphics/ObjectEntry.h

Loading...

ps/trunk/source/graphics/SkeletonAnim.h

Loading...

ps/trunk/source/graphics/Unit.cpp

Loading...

ps/trunk/source/graphics/Unit.h

Loading...

ps/trunk/source/graphics/UnitAnimation.cpp

Loading...

ps/trunk/source/graphics/UnitAnimation.h

Loading...

ps/trunk/source/graphics/UnitManager.cpp

Loading...

ps/trunk/source/graphics/UnitManager.h

Loading...

ps/trunk/source/ps/GameSetup/Config.cpp

Loading...

ps/trunk/source/ps/GameSetup/Config.h

Loading...

ps/trunk/source/ps/GameSetup/GameSetup.cpp

Loading...

ps/trunk/source/renderer/Scene.cpp

Loading...

ps/trunk/source/simulation2/components/CCmpProjectileManager.cpp

Loading...

ps/trunk/source/simulation2/components/CCmpTemplateManager.cpp

Loading...

ps/trunk/source/simulation2/components/CCmpUnitMotion.cpp

Loading...

ps/trunk/source/simulation2/components/CCmpVisualActor.cpp

Loading...

ps/trunk/source/simulation2/components/ICmpUnitMotion.h

Loading...

ps/trunk/source/simulation2/components/ICmpVisual.h

Loading...

ps/trunk/source/sound/SoundGroup.cpp

Loading...

ps/trunk/source/tools/atlas/GameInterface/ActorViewer.cpp

Loading...