Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/slabua/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-09-22 02:04:52 +02:00
parent 791b64f74b 67720c6a6a
commit 67142f3080
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@@ -846,6 +846,17 @@ Found in Advanced->Rendering->Info Displays</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>0</integer>
</map> </map>
<key>SLBShowFPS</key>
<map>
<key>Comment</key>
<string>Show FPS</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LogShowHistoryLines</key> <key>LogShowHistoryLines</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

1
indra/newview/llviewermenu.cpp
View File

@@ -1204,6 +1204,7 @@ void init_debug_ui_menu(LLMenuGL* menu)
menu->addChild(new LLMenuItemCheckGL("Show Render Info", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderInfo")); menu->addChild(new LLMenuItemCheckGL("Show Render Info", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderInfo"));
menu->addChild(new LLMenuItemCheckGL("Show Matrices", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderMatrices")); menu->addChild(new LLMenuItemCheckGL("Show Matrices", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowRenderMatrices"));
menu->addChild(new LLMenuItemCheckGL("Show Color Under Cursor", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowColor")); menu->addChild(new LLMenuItemCheckGL("Show Color Under Cursor", menu_toggle_control, NULL, menu_check_control, (void*)"DebugShowColor"));
menu->addChild(new LLMenuItemCheckGL("Show FPS", menu_toggle_control, NULL, menu_check_control, (void*)"SLBShowFPS"));
menu->createJumpKeys(); menu->createJumpKeys();
} }

7
indra/newview/llviewerwindow.cpp
View File

@@ -309,6 +309,13 @@ public:
U32 ypos = 64; U32 ypos = 64;
const U32 y_inc = 20; const U32 y_inc = 20;
static const LLCachedControl<bool> slb_show_fps("SLBShowFPS");
if (slb_show_fps)
{
addText(xpos+280, ypos+5, llformat("FPS %3.1f", LLViewerStats::getInstance()->mFPSStat.getMeanPerSec()));
ypos += y_inc;
}
static const LLCachedControl<bool> debug_show_time("DebugShowTime"); static const LLCachedControl<bool> debug_show_time("DebugShowTime");
if (debug_show_time) if (debug_show_time)
{ {