Skip to content
Snippets Groups Projects
Commit c0410361 authored by jaeger_reg@tank-pc.ftrdhcpuser.net's avatar jaeger_reg@tank-pc.ftrdhcpuser.net
Browse files

Statistic floater update to improve displayed info.

parent d475a96e
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ c0410361
...@@ -1032,6 +1032,7 @@ Synystyr Texan ...@@ -1032,6 +1032,7 @@ Synystyr Texan
Takeda Terrawyng Takeda Terrawyng
TankMaster Finesmith TankMaster Finesmith
STORM-1100 STORM-1100
STORM-1258
Talamasca Talamasca
Tali Rosca Tali Rosca
Tayra Dagostino Tayra Dagostino
......
indra/newview/skins/default/xui/en/floater_stats.xml
+ 237
− 102
View file @ c0410361
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
save_rect="true" save_rect="true"
save_visibility="true" save_visibility="true"
title="STATISTICS" title="STATISTICS"
width="250"> width="260">
<scroll_container <scroll_container
follows="top|left|bottom|right" follows="top|left|bottom|right"
height="380" height="380"
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
name="statistics_scroll" name="statistics_scroll"
reserve_scroll_corner="true" reserve_scroll_corner="true"
top="20" top="20"
width="250"> width="260">
<container_view <container_view
follows="top|left|bottom|right" follows="top|left|bottom|right"
height="378" height="378"
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
left="2" left="2"
name="statistics_view" name="statistics_view"
top="20" top="20"
width="230" > width="245" >
<!--Basic Section-->
<stat_view <stat_view
name="basic" name="basic"
label="Basic" label="Basic"
...@@ -39,9 +40,9 @@ ...@@ -39,9 +40,9 @@
unit_label="fps" unit_label="fps"
stat="fpsstat" stat="fpsstat"
bar_min="0" bar_min="0"
bar_max="45" bar_max="60"
tick_spacing="7.5" tick_spacing="6"
label_spacing="15.0" label_spacing="12"
precision="1" precision="1"
show_bar="true" show_bar="true"
show_history="true"> show_history="true">
...@@ -52,9 +53,10 @@ ...@@ -52,9 +53,10 @@
unit_label="kbps" unit_label="kbps"
stat="kbitstat" stat="kbitstat"
bar_min="0" bar_min="0"
bar_max="900" bar_max="5000"
tick_spacing="100" tick_spacing="500"
label_spacing="300" label_spacing="1000"
precision="0"
show_bar="true" show_bar="true"
show_history="false"> show_history="false">
</stat_bar> </stat_bar>
...@@ -65,9 +67,9 @@ ...@@ -65,9 +67,9 @@
stat="packetslostpercentstat" stat="packetslostpercentstat"
bar_min="0" bar_min="0"
bar_max="5" bar_max="5"
tick_spacing="1" tick_spacing="0.5"
label_spacing="1" label_spacing="1"
precision="1" precision="3"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="true"> show_mean="true">
...@@ -78,14 +80,16 @@ ...@@ -78,14 +80,16 @@
unit_label="msec" unit_label="msec"
stat="simpingstat" stat="simpingstat"
bar_min="0" bar_min="0"
bar_max="1000" bar_max="5000"
tick_spacing="100" tick_spacing="500"
label_spacing="200" label_spacing="1000"
precision="0"
show_bar="false" show_bar="false"
show_per_sec="false" show_per_sec="false"
show_mean="false"> show_mean="false">
</stat_bar> </stat_bar>
</stat_view> </stat_view>
<!--Advanced Section-->
<stat_view <stat_view
name="advanced" name="advanced"
label="Advanced" label="Advanced"
...@@ -98,26 +102,28 @@ ...@@ -98,26 +102,28 @@
setting="OpenDebugStatRender"> setting="OpenDebugStatRender">
<stat_bar <stat_bar
name="ktrisframe" name="ktrisframe"
label="KTris Drawn" label="KTris Drawn per Frame"
unit_label="/fr" unit_label="/fr"
stat="trianglesdrawnstat" stat="trianglesdrawnstat"
bar_min="0" bar_min="0"
bar_max="500" bar_max="10000"
tick_spacing="100" tick_spacing="1000"
label_spacing="500" label_spacing="2000"
precision="1" precision="0"
show_per_sec="false"> show_per_sec="false"
show_bar="false">
</stat_bar> </stat_bar>
<stat_bar <stat_bar
name="ktrissec" name="ktrissec"
label="KTris Drawn" label="KTris Drawn per Sec"
unit_label="/sec" unit_label="/sec"
stat="trianglesdrawnstat" stat="trianglesdrawnstat"
bar_min="0" bar_min="0"
bar_max="3000" bar_max="200000"
tick_spacing="250" tick_spacing="25000"
label_spacing="1000" label_spacing="50000"
precision="1"> precision="0"
show_bar="false">
</stat_bar> </stat_bar>
<stat_bar <stat_bar
name="objs" name="objs"
...@@ -125,10 +131,10 @@ ...@@ -125,10 +131,10 @@
unit_label="" unit_label=""
stat="numobjectsstat" stat="numobjectsstat"
bar_min="0" bar_min="0"
bar_max="3000" bar_max="50000"
tick_spacing="250" tick_spacing="5000"
label_spacing="1000" label_spacing="10000"
precision="1" precision="0"
show_per_sec="false" show_per_sec="false"
show_bar="false"> show_bar="false">
</stat_bar> </stat_bar>
...@@ -138,13 +144,14 @@ ...@@ -138,13 +144,14 @@
unit_label="/sec" unit_label="/sec"
stat="numnewobjectsstat" stat="numnewobjectsstat"
bar_min="0" bar_min="0"
bar_max="1000" bar_max="2000"
tick_spacing="100" tick_spacing="200"
label_spacing="500" label_spacing="400"
show_per_sec="true" show_per_sec="true"
show_bar="false"> show_bar="false">
</stat_bar> </stat_bar>
</stat_view> </stat_view>
<!--Texture Stats-->
<stat_view <stat_view
name="texture" name="texture"
label="Texture" label="Texture"
...@@ -182,7 +189,8 @@ ...@@ -182,7 +189,8 @@
tick_spacing="100.f" tick_spacing="100.f"
label_spacing="200.f" label_spacing="200.f"
precision="1" precision="1"
show_per_sec="false" > show_per_sec="false"
show_bar="false">
</stat_bar> </stat_bar>
<stat_bar <stat_bar
...@@ -194,7 +202,8 @@ ...@@ -194,7 +202,8 @@
tick_spacing="100.f" tick_spacing="100.f"
label_spacing="200.f" label_spacing="200.f"
precision="1" precision="1"
show_per_sec="false" > show_per_sec="false"
show_bar="false">
</stat_bar> </stat_bar>
<stat_bar <stat_bar
...@@ -206,7 +215,8 @@ ...@@ -206,7 +215,8 @@
tick_spacing="100.f" tick_spacing="100.f"
label_spacing="200.f" label_spacing="200.f"
precision="1" precision="1"
show_per_sec="false" > show_per_sec="false"
show_bar="false">
</stat_bar> </stat_bar>
<stat_bar <stat_bar
...@@ -218,10 +228,11 @@ ...@@ -218,10 +228,11 @@
tick_spacing="100.f" tick_spacing="100.f"
label_spacing="200.f" label_spacing="200.f"
precision="1" precision="1"
show_per_sec="false" > show_per_sec="false"
show_bar="false">
</stat_bar> </stat_bar>
</stat_view> </stat_view>
<!--Network Stats-->
<stat_view <stat_view
name="network" name="network"
label="Network" label="Network"
...@@ -232,6 +243,11 @@ ...@@ -232,6 +243,11 @@
label="Packets In" label="Packets In"
stat="packetsinstat" stat="packetsinstat"
unit_label="/sec" unit_label="/sec"
bar_min="0.f"
bar_max="1024.f"
tick_spacing="128.f"
label_spacing="256.f"
precision="1"
show_bar="false"> show_bar="false">
</stat_bar> </stat_bar>
...@@ -240,6 +256,11 @@ ...@@ -240,6 +256,11 @@
label="Packets Out" label="Packets Out"
stat="packetsoutstat" stat="packetsoutstat"
unit_label="/sec" unit_label="/sec"
bar_min="0.f"
bar_max="1024.f"
tick_spacing="128.f"
label_spacing="256.f"
precision="1"
show_bar="false" > show_bar="false" >
</stat_bar> </stat_bar>
...@@ -248,6 +269,11 @@ ...@@ -248,6 +269,11 @@
label="Objects" label="Objects"
stat="objectkbitstat" stat="objectkbitstat"
unit_label="kbps" unit_label="kbps"
bar_min="0.f"
bar_max="1024.f"
tick_spacing="128.f"
label_spacing="256.f"
precision="1"
show_bar="false" > show_bar="false" >
</stat_bar> </stat_bar>
...@@ -256,6 +282,11 @@ ...@@ -256,6 +282,11 @@
label="Texture" label="Texture"
stat="texturekbitstat" stat="texturekbitstat"
unit_label="kbps" unit_label="kbps"
bar_min="0.f"
bar_max="1024.f"
tick_spacing="128.f"
label_spacing="256.f"
precision="1"
show_bar="false" > show_bar="false" >
</stat_bar> </stat_bar>
...@@ -264,6 +295,11 @@ ...@@ -264,6 +295,11 @@
label="Asset" label="Asset"
stat="assetkbitstat" stat="assetkbitstat"
unit_label="kbps" unit_label="kbps"
bar_min="0.f"
bar_max="1024.f"
tick_spacing="128.f"
label_spacing="256.f"
precision="1"
show_bar="false" > show_bar="false" >
</stat_bar> </stat_bar>
...@@ -272,6 +308,11 @@ ...@@ -272,6 +308,11 @@
label="Layers" label="Layers"
stat="layerskbitstat" stat="layerskbitstat"
unit_label="kbps" unit_label="kbps"
bar_min="0.f"
bar_max="1024.f"
tick_spacing="128.f"
label_spacing="256.f"
precision="1"
show_bar="false" > show_bar="false" >
</stat_bar> </stat_bar>
...@@ -284,7 +325,8 @@ ...@@ -284,7 +325,8 @@
bar_max="1024.f" bar_max="1024.f"
tick_spacing="128.f" tick_spacing="128.f"
label_spacing="256.f" label_spacing="256.f"
show_bar="true" precision="1"
show_bar="false"
show_history="false" > show_history="false" >
</stat_bar> </stat_bar>
...@@ -294,24 +336,25 @@ ...@@ -294,24 +336,25 @@
stat="actualoutkbitstat" stat="actualoutkbitstat"
unit_label="kbps" unit_label="kbps"
bar_min="0.f" bar_min="0.f"
bar_max="512.f" bar_max="1024.f"
tick_spacing="128.f" tick_spacing="128.f"
label_spacing="256.f" label_spacing="256.f"
show_bar="true" precision="1"
show_bar="false"
show_history="false"> show_history="false">
</stat_bar> </stat_bar>
<stat_bar <stat_bar
name="vfspendingoperations" name="vfspendingoperations"
label="VFS Pending Ops" label="VFS Pending Operations"
stat="vfspendingoperations" stat="vfspendingoperations"
unit_label=" " unit_label=" Ops."
show_per_sec="false" show_per_sec="false"
show_bar="false" > show_bar="false" >
</stat_bar> </stat_bar>
</stat_view> </stat_view>
</stat_view> </stat_view>
<!--Sim Stats-->
<stat_view <stat_view
name="sim" name="sim"
label="Simulator" label="Simulator"
...@@ -321,11 +364,11 @@ ...@@ -321,11 +364,11 @@
name="simtimedilation" name="simtimedilation"
label="Time Dilation" label="Time Dilation"
stat="simtimedilation" stat="simtimedilation"
precision="2" precision="3"
bar_min="0.f" bar_min="0.f"
bar_max="1.f" bar_max="1.f"
tick_spacing="0.25f" tick_spacing="0.16666f"
label_spacing="0.5f" label_spacing="0.33333f"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
...@@ -335,10 +378,11 @@ ...@@ -335,10 +378,11 @@
name="simfps" name="simfps"
label="Sim FPS" label="Sim FPS"
stat="simfps" stat="simfps"
precision="1"
bar_min="0.f" bar_min="0.f"
bar_max="200.f" bar_max="45.f"
tick_spacing="20.f" tick_spacing="7.5f"
label_spacing="100.f" label_spacing="15.f"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
...@@ -350,9 +394,9 @@ ...@@ -350,9 +394,9 @@
stat="simphysicsfps" stat="simphysicsfps"
precision="1" precision="1"
bar_min="0.f" bar_min="0.f"
bar_max="66.f" bar_max="45.f"
tick_spacing="33.f" tick_spacing="7.5.f"
label_spacing="33.f" label_spacing="15.f"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
...@@ -369,8 +413,8 @@ ...@@ -369,8 +413,8 @@
precision="0" precision="0"
bar_min="0.f" bar_min="0.f"
bar_max="500.f" bar_max="500.f"
tick_spacing="10.f" tick_spacing="50.f"
label_spacing="40.f" label_spacing="100.f"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
...@@ -383,8 +427,8 @@ ...@@ -383,8 +427,8 @@
precision="0" precision="0"
bar_min="0.f" bar_min="0.f"
bar_max="500.f" bar_max="500.f"
tick_spacing="10.f" tick_spacing="50.f"
label_spacing="40.f" label_spacing="100.f"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
...@@ -395,7 +439,7 @@ ...@@ -395,7 +439,7 @@
label="Memory Allocated" label="Memory Allocated"
stat="physicsmemoryallocated" stat="physicsmemoryallocated"
unit_label="MB" unit_label="MB"
precision="0" precision="1"
bar_min="0.f" bar_min="0.f"
bar_max="1024.f" bar_max="1024.f"
tick_spacing="128.f" tick_spacing="128.f"
...@@ -468,9 +512,9 @@ ...@@ -468,9 +512,9 @@
stat="simactiveobjects" stat="simactiveobjects"
precision="0" precision="0"
bar_min="0.f" bar_min="0.f"
bar_max="800.f" bar_max="5000.f"
tick_spacing="100.f" tick_spacing="750.f"
label_spacing="200.f" label_spacing="1250.f"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
...@@ -482,9 +526,9 @@ ...@@ -482,9 +526,9 @@
stat="simactivescripts" stat="simactivescripts"
precision="0" precision="0"
bar_min="0.f" bar_min="0.f"
bar_max="800.f" bar_max="15000.f"
tick_spacing="100.f" tick_spacing="1875.f"
label_spacing="200.f" label_spacing="3750.f"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
...@@ -497,9 +541,9 @@ ...@@ -497,9 +541,9 @@
unit_label="eps" unit_label="eps"
precision="0" precision="0"
bar_min="0.f" bar_min="0.f"
bar_max="20000.f" bar_max="5000.f"
tick_spacing="2500.f" tick_spacing="750.f"
label_spacing="5000.f" label_spacing="1250.f"
show_per_sec="false" show_per_sec="false"
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
...@@ -568,7 +612,7 @@ ...@@ -568,7 +612,7 @@
label="Total Unacked Bytes" label="Total Unacked Bytes"
stat="simtotalunackedbytes" stat="simtotalunackedbytes"
unit_label="kb" unit_label="kb"
precision="0" precision="1"
bar_min="0.f" bar_min="0.f"
bar_max="100000.f" bar_max="100000.f"
tick_spacing="25000.f" tick_spacing="25000.f"
...@@ -587,7 +631,7 @@ ...@@ -587,7 +631,7 @@
label="Total Frame Time" label="Total Frame Time"
stat="simframemsec" stat="simframemsec"
unit_label="ms" unit_label="ms"
precision="1" precision="3"
bar_min="0.f" bar_min="0.f"
bar_max="40.f" bar_max="40.f"
tick_spacing="10.f" tick_spacing="10.f"
...@@ -602,7 +646,7 @@ ...@@ -602,7 +646,7 @@
label="Net Time" label="Net Time"
stat="simnetmsec" stat="simnetmsec"
unit_label="ms" unit_label="ms"
precision="1" precision="3"
bar_min="0.f" bar_min="0.f"
bar_max="40.f" bar_max="40.f"
tick_spacing="10.f" tick_spacing="10.f"
...@@ -617,7 +661,7 @@ ...@@ -617,7 +661,7 @@
label="Physics Time" label="Physics Time"
stat="simsimphysicsmsec" stat="simsimphysicsmsec"
unit_label="ms" unit_label="ms"
precision="1" precision="3"
bar_min="0.f" bar_min="0.f"
bar_max="40.f" bar_max="40.f"
tick_spacing="10.f" tick_spacing="10.f"
...@@ -632,7 +676,7 @@ ...@@ -632,7 +676,7 @@
label="Simulation Time" label="Simulation Time"
stat="simsimothermsec" stat="simsimothermsec"
unit_label="ms" unit_label="ms"
precision="1" precision="3"
bar_min="0.f" bar_min="0.f"
bar_max="40.f" bar_max="40.f"
tick_spacing="10.f" tick_spacing="10.f"
...@@ -647,7 +691,7 @@ ...@@ -647,7 +691,7 @@
label="Agent Time" label="Agent Time"
stat="simagentmsec" stat="simagentmsec"
unit_label="ms" unit_label="ms"
precision="1" precision="3"
bar_min="0.f" bar_min="0.f"
bar_max="40.f" bar_max="40.f"
tick_spacing="10.f" tick_spacing="10.f"
...@@ -662,7 +706,7 @@ ...@@ -662,7 +706,7 @@
label="Images Time" label="Images Time"
stat="simimagesmsec" stat="simimagesmsec"
unit_label="ms" unit_label="ms"
precision="1" precision="3"
bar_min="0.f" bar_min="0.f"
bar_max="40.f" bar_max="40.f"
tick_spacing="10.f" tick_spacing="10.f"
...@@ -677,7 +721,83 @@ ...@@ -677,7 +721,83 @@
label="Script Time" label="Script Time"
stat="simscriptmsec" stat="simscriptmsec"
unit_label="ms" unit_label="ms"
precision="1" precision="3"
bar_min="0.f"
bar_max="40.f"
tick_spacing="10.f"
label_spacing="20.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simsparemsec"
label="Spare Time"
stat="simsparemsec"
unit_label="ms"
precision="3"
bar_min="0.f"
bar_max="40.f"
tick_spacing="10.f"
label_spacing="20.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<!--2nd level time blocks under 'Details' second-->
<stat_view
name="timedetails"
label="Time Details (ms)"
show_label="true">
<stat_bar
name="simsimphysicsstepmsec"
label=" Physics Step"
stat="simsimphysicsstepmsec"
unit_label="ms"
precision="3"
bar_min="0.f"
bar_max="40.f"
tick_spacing="10.f"
label_spacing="20.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simsimphysicsshapeupdatemsec"
label=" Update Phys Shapes"
stat="simsimphysicsshapeupdatemsec"
unit_label="ms"
precision="3"
bar_min="0.f"
bar_max="40.f"
tick_spacing="10.f"
label_spacing="20.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simsimphysicsothermsec"
label=" Physics Other"
stat="simsimphysicsothermsec"
unit_label="ms"
precision="3"
bar_min="0.f"
bar_max="40.f"
tick_spacing="10.f"
label_spacing="20.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
<stat_bar
name="simsleepmsec"
label=" Sleep Time"
stat="simsleepmsec"
unit_label="ms"
precision="3"
bar_min="0.f" bar_min="0.f"
bar_max="40.f" bar_max="40.f"
tick_spacing="10.f" tick_spacing="10.f"
...@@ -686,6 +806,21 @@ ...@@ -686,6 +806,21 @@
show_bar="false" show_bar="false"
show_mean="false" > show_mean="false" >
</stat_bar> </stat_bar>
<stat_bar
name="simpumpiomsec"
label=" Pump IO"
stat="simpumpiomsec"
unit_label="ms"
precision="3"
bar_min="0.f"
bar_max="40.f"
tick_spacing="10.f"
label_spacing="20.f"
show_per_sec="false"
show_bar="false"
show_mean="false" >
</stat_bar>
</stat_view>
</stat_view> </stat_view>
</stat_view> </stat_view>
</container_view> </container_view>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment