mirror of
https://github.com/overte-org/overte.git
synced 2025-04-22 03:04:33 +02:00
Merge pull request #15806 from dooglifeSF/idles_talks_locomotion_improvements
Idles talks locomotion improvements
This commit is contained in:
commit
aa82c4e971
78 changed files with 306 additions and 181 deletions
interface
resources/avatar
animations
fly.fbxidle.fbxidle02.fbxidle03.fbxidle04.fbxidleWS.fbxidleWS_all.fbxidle_LFF_all.fbxidle_RFF_all.fbxidle_once_armstretch.fbxidle_once_bigstretch.fbxidle_once_checkwatch.fbxidle_once_fidget.fbxidle_once_headtilt.fbxidle_once_lookaround.fbxidle_once_lookleftright.fbxidle_once_neckstretch.fbxidle_once_shiftheelpivot.fbxidle_once_slownod.fbxjog_bwd.fbxjog_fwd.fbxjog_left.fbxjog_right.fbxjump_in_air.fbxjump_land.fbxjump_running_launch_land.fbxjump_running_launch_land_all.fbxjump_standing_apex.fbxjump_standing_apex_all.fbxjump_standing_land.fbxjump_standing_land_settle.fbxjump_standing_land_settle_all.fbxjump_standing_launch.fbxjump_standing_launch_all.fbxjump_standing_takeoff.fbxjump_takeoff.fbxrun_bwd.fbxrun_fast_fwd.fbxrun_fast_left.fbxrun_fast_right.fbxrun_fwd.fbxsettle_to_idle.fbxsettle_to_idle_small.fbxside_step_left.fbxside_step_left_fast.fbxside_step_left_fast02.fbxside_step_right.fbxside_step_short_left.fbxside_step_short_right.fbxside_strafe_left.fbxside_strafe_left02.fbxsitting.fbxsitting_idle.fbxtalk.fbxtalk02.fbxtalk03.fbxtalk04.fbxtalk_armsdown.fbxtalk_lefthand.fbxtalk_righthand.fbxteleport.fbxturn_left.fbxturn_right.fbxwalk_bwd.fbxwalk_bwd_fast.fbxwalk_fwd.fbxwalk_fwd_fast.fbxwalk_fwd_fast02.fbxwalk_fwd_fast_armout.fbxwalk_left.fbxwalk_left_fast.fbxwalk_right.fbxwalk_right_fast.fbxwalk_short_bwd.fbxwalk_short_fwd.fbx
avatar-animation.jsonsrc/ui
libraries/animation/src
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/idle02.fbx
Normal file
BIN
interface/resources/avatar/animations/idle02.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/idle03.fbx
Normal file
BIN
interface/resources/avatar/animations/idle03.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/idle_once_fidget.fbx
Normal file
BIN
interface/resources/avatar/animations/idle_once_fidget.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/jog_right.fbx
Normal file
BIN
interface/resources/avatar/animations/jog_right.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/jump_standing_apex_all.fbx
Normal file
BIN
interface/resources/avatar/animations/jump_standing_apex_all.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/run_fast_fwd.fbx
Normal file
BIN
interface/resources/avatar/animations/run_fast_fwd.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/run_fast_left.fbx
Normal file
BIN
interface/resources/avatar/animations/run_fast_left.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/run_fast_right.fbx
Normal file
BIN
interface/resources/avatar/animations/run_fast_right.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/settle_to_idle_small.fbx
Normal file
BIN
interface/resources/avatar/animations/settle_to_idle_small.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/talk02.fbx
Normal file
BIN
interface/resources/avatar/animations/talk02.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/talk03.fbx
Normal file
BIN
interface/resources/avatar/animations/talk03.fbx
Normal file
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/talk_armsdown.fbx
Normal file
BIN
interface/resources/avatar/animations/talk_armsdown.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/talk_lefthand.fbx
Normal file
BIN
interface/resources/avatar/animations/talk_lefthand.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/turn_right.fbx
Normal file
BIN
interface/resources/avatar/animations/turn_right.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
interface/resources/avatar/animations/walk_right.fbx
Normal file
BIN
interface/resources/avatar/animations/walk_right.fbx
Normal file
Binary file not shown.
BIN
interface/resources/avatar/animations/walk_right_fast.fbx
Normal file
BIN
interface/resources/avatar/animations/walk_right_fast.fbx
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
@ -132,7 +132,7 @@ void AnimStats::updateStats(bool force) {
|
|||
if (type == AnimNodeType::Clip) {
|
||||
|
||||
// figure out the grayScale color of this line.
|
||||
const float LIT_TIME = 2.0f;
|
||||
const float LIT_TIME = 20.0f;
|
||||
const float FADE_OUT_TIME = 1.0f;
|
||||
float grayScale = 0.0f;
|
||||
float secondsElapsed = (float)(now - _animAlphaValueChangedTimers[key]) / (float)USECS_PER_SECOND;
|
||||
|
@ -176,7 +176,7 @@ void AnimStats::updateStats(bool force) {
|
|||
}
|
||||
|
||||
// figure out the grayScale color of this line.
|
||||
const float LIT_TIME = 2.0f;
|
||||
const float LIT_TIME = 20.0f;
|
||||
const float FADE_OUT_TIME = 0.5f;
|
||||
float grayScale = 0.0f;
|
||||
float secondsElapsed = (float)(now - _animVarChangedTimers[key]) / (float)USECS_PER_SECOND;
|
||||
|
|
|
@ -159,15 +159,15 @@ std::map<QString, QString> AnimVariantMap::toDebugMap() const {
|
|||
arg(QString::number(value.y, 'f', 3)).
|
||||
arg(QString::number(value.z, 'f', 3)).
|
||||
arg(QString::number(value.w, 'f', 3));
|
||||
break;
|
||||
*/
|
||||
break;
|
||||
}
|
||||
case AnimVariant::Type::String:
|
||||
// To prevent filling up anim stats, don't show string values
|
||||
/*
|
||||
result[pair.first] = pair.second.getString();
|
||||
break;
|
||||
*/
|
||||
break;
|
||||
default:
|
||||
// invalid AnimVariant::Type
|
||||
assert(false);
|
||||
|
|
Loading…
Reference in a new issue