Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Sorry, SVN doesn't seem to be picking up modifications today.

Browse Source 
This was SVN commit r2093.
This commit is contained in:
MarkT 2005-03-30 18:32:16 +00:00
parent 414960a654
commit 701fd17595
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/ps/Hotkey.cpp
View File

@ -122,7 +122,7 @@ static SHotkeyInfo hotkeyInfo[] =
{ HOTKEY_CONTEXTORDER_NEXT, "contextorder.next", SDLK_RIGHTBRACKET, 0 },
{ HOTKEY_CONTEXTORDER_PREVIOUS, "contextorder.previous", SDLK_LEFTBRACKET, 0 },
{ HOTKEY_HIGHLIGHTALL, "highlightall", SDLK_o, 0 },
{ HOTKEY_PROFILE_TOGGLE, "profile.toggle", SDLK_F11, 0 },
{ HOTKEY_PLAYMUSIC, "playmusic", SDLK_p, 0 }
};

2
source/ps/Hotkey.h
View File

@ -92,6 +92,8 @@ enum
HOTKEY_CONTEXTORDER_PREVIOUS,
HOTKEY_HIGHLIGHTALL,
HOTKEY_PROFILE_TOGGLE,
HOTKEY_PLAYMUSIC,
HOTKEY_LAST,

6
source/ps/ProfileViewer.cpp
View File

@ -97,19 +97,19 @@ void RenderProfile()
glTranslatef( 0.0f, 20.0f, 0.0f );
float unlogged = currentNode->GetFrameTime();
float unlogged = (float)currentNode->GetFrameTime();
int currentNodeid = 1;
for( it = currentNode->GetChildren()->begin(); it != currentNode->GetChildren()->end(); it++, currentNodeid++ )
{
unlogged -= (*it)->GetFrameTime();
unlogged -= (float)(*it)->GetFrameTime();
RenderProfileNode( *it, currentNodeid );
}
glColor3f( 1.0f, 0.5f, 0.5f );
for( it = currentNode->GetScriptChildren()->begin(); it != currentNode->GetScriptChildren()->end(); it++, currentNodeid++ )
{
unlogged -= (*it)->GetFrameTime();
unlogged -= (float)(*it)->GetFrameTime();
RenderProfileNode( *it, currentNodeid );
}
glColor3f( 1.0f, 1.0f, 1.0f );