livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-17639: Show animation priority in animation explorer

meow-7.2.2
Ansariel 2016-01-11 19:53:40 +01:00
parent f9b9bd45e8
commit f6c3f9acb5
6 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
indra/newview/animationexplorer.cpp
View File

@ -255,9 +255,9 @@ void AnimationExplorer::draw()
}
// update tiems and "Still playing" status in the list once every few seconds
static F64 last_update = 0.0f;
static F64 last_update = 0.0;
F64 time = LLTimer::getElapsedSeconds();
if (time-last_update > 5.0f)
if (time - last_update > 5.0)
{
last_update = time;
updateList(time);
@ -277,6 +277,7 @@ void AnimationExplorer::updateList(F64 current_timestamp)
{
S32 played_column = mAnimationScrollList->getColumn("played")->mIndex;
S32 timestamp_column = mAnimationScrollList->getColumn("timestamp")->mIndex;
S32 priority_column = mAnimationScrollList->getColumn("priority")->mIndex;
S32 object_id_column = mAnimationScrollList->getColumn("object_id")->mIndex;
S32 anim_id_column = mAnimationScrollList->getColumn("animation_id")->mIndex;
@ -287,11 +288,13 @@ void AnimationExplorer::updateList(F64 current_timestamp)
LLScrollListItem* item = *list_iter;
// get a pointer to the "Played" column text
LLScrollListText* played_text = (LLScrollListText*)item->getColumn(played_column);
LLScrollListText* played_text = dynamic_cast<LLScrollListText*>(item->getColumn(played_column));
// get the object ID from the list
LLUUID object_id = item->getColumn(object_id_column)->getValue().asUUID();
LLUUID anim_id = item->getColumn(anim_id_column)->getValue().asUUID();
// assume this animation is not running first
bool is_running = false;
@ -300,19 +303,13 @@ void AnimationExplorer::updateList(F64 current_timestamp)
for (LLVOAvatar::AnimSourceIterator anim_iter = gAgentAvatarp->mAnimationSources.begin();
anim_iter != gAgentAvatarp->mAnimationSources.end(); ++anim_iter)
{
// object found
if (anim_iter->first == object_id)
// object and animation found
if (anim_iter->first == object_id && anim_iter->second == anim_id)
{
LLUUID anim_id = item->getColumn(anim_id_column)->getValue().asUUID();
// animation found
if (anim_iter->second == anim_id)
{
// set text to "Still playing" and break out of this loop
played_text->setText(LLTrans::getString("animation_explorer_still_playing"));
is_running = true;
break;
}
// set text to "Still playing" and break out of this loop
played_text->setText(LLTrans::getString("animation_explorer_still_playing"));
is_running = true;
break;
}
}
@ -328,6 +325,14 @@ void AnimationExplorer::updateList(F64 current_timestamp)
played_text->setText(LLTrans::getString("animation_explorer_seconds_ago", args));
}
std::string prio_text = LLTrans::getString("animation_explorer_unknown_priority");
LLKeyframeMotion* motion = dynamic_cast<LLKeyframeMotion*>(gAgentAvatarp->findMotion(anim_id));
if (motion)
{
prio_text = llformat("%d", (S32)motion->getPriority());
}
dynamic_cast<LLScrollListText*>(item->getColumn(priority_column))->setText(prio_text);
}
}
@ -402,12 +407,14 @@ void AnimationExplorer::addAnimation(const LLUUID& id, const LLUUID& played_by,
item["columns"][0]["value"] = playedByName;
item["columns"][1]["column"] = "played";
item["columns"][1]["value"] = LLTrans::getString("animation_explorer_still_playing");
item["columns"][2]["column"] = "timestamp";
item["columns"][2]["value"] = time;
item["columns"][3]["column"] = "animation_id";
item["columns"][3]["value"] = id;
item["columns"][4]["column"] = "object_id";
item["columns"][4]["value"] = played_by;
item["columns"][2]["column"] = "priority";
item["columns"][2]["value"] = LLTrans::getString("animation_explorer_unknown_priority");
item["columns"][3]["column"] = "timestamp";
item["columns"][3]["value"] = time;
item["columns"][4]["column"] = "animation_id";
item["columns"][4]["value"] = id;
item["columns"][5]["column"] = "object_id";
item["columns"][5]["value"] = played_by;
mAnimationScrollList->addElement(item, ADD_TOP);
}

4
indra/newview/llviewermessage.cpp
View File

@ -6493,9 +6493,9 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
{
avatarp->mAnimationSources.insert(LLVOAvatar::AnimationSourceMap::value_type(object_id, animation_id));
// <FS:Zi> Animation Explorer
if(avatarp==gAgentAvatarp)
if (avatarp == gAgentAvatarp)
{
RecentAnimationList::instance().addAnimation(animation_id,object_id);
RecentAnimationList::instance().addAnimation(animation_id, object_id);
}
// </FS:Zi>
}

1
indra/newview/skins/default/xui/de/floater_animation_explorer.xml
View File

@ -3,6 +3,7 @@
<scroll_list name="animation_list">
<scroll_list.column label="Abgespielt von" name="played_by" />
<scroll_list.column label="Abgespielt" name="played" />
<scroll_list.column label="Priorität" name="priority" />
<scroll_list.column label="Zeit" name="timestamp" />
<scroll_list.column label="Animation-ID" name="animation_id" />
<scroll_list.column label="Oktjekt-ID" name="object_id" />

3
indra/newview/skins/default/xui/de/strings.xml
View File

@ -6485,6 +6485,9 @@ Setzen Sie den Editorpfad in Anführungszeichen
<string name="animation_explorer_still_playing">
Wird abgespielt
</string>
<string name="animation_explorer_unknown_priority">
unbekannt
</string>
<string name="FriendOnlineNotification">
ist online.

8
indra/newview/skins/default/xui/en/floater_animation_explorer.xml
View File

@ -12,7 +12,7 @@
name="animation_explorer"
save_rect="true"
title="Animation Explorer"
width="524">
width="574">
<scroll_list
bottom="-4"
@ -22,13 +22,17 @@
left="4"
name="animation_list"
top="4"
width="256">
width="306">
<scroll_list.column
label="Played by"
name="played_by" />
<scroll_list.column
label="Played"
name="played" />
<scroll_list.column
label="Priority"
name="priority"
width="60"/>
<scroll_list.column
label="Timestamp"
name="timestamp"

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -2903,6 +2903,7 @@ Try enclosing path to the editor with double quotes.
<!-- Animation Explorer -->
<string name="animation_explorer_seconds_ago">[SECONDS] seconds ago</string>
<string name="animation_explorer_still_playing">Still playing</string>
<string name="animation_explorer_unknown_priority">unknown</string>
<string name="FriendOnlineNotification">is online.</string>
<string name="FriendOfflineNotification">is offline.</string>