mirror of
https://github.com/wolfpld/tracy
synced 2025-05-03 06:03:51 +00:00
Properly setup View, when using command line parameters.
This commit is contained in:
parent
9e8b68b43d
commit
1ddd395aad
@ -131,40 +131,6 @@ static ImGuiTextFilter addrFilter, portFilter, progFilter;
|
|||||||
|
|
||||||
int main( int argc, char** argv )
|
int main( int argc, char** argv )
|
||||||
{
|
{
|
||||||
if( argc == 2 )
|
|
||||||
{
|
|
||||||
auto f = std::unique_ptr<tracy::FileRead>( tracy::FileRead::Open( argv[1] ) );
|
|
||||||
if( f )
|
|
||||||
{
|
|
||||||
view = std::make_unique<tracy::View>( *f );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
while( argc >= 3 )
|
|
||||||
{
|
|
||||||
if( strcmp( argv[1], "-a" ) == 0 )
|
|
||||||
{
|
|
||||||
connectTo = argv[2];
|
|
||||||
}
|
|
||||||
else if( strcmp( argv[1], "-p" ) == 0 )
|
|
||||||
{
|
|
||||||
port = atoi( argv[2] );
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
fprintf( stderr, "Bad parameter: %s", argv[1] );
|
|
||||||
exit( 1 );
|
|
||||||
}
|
|
||||||
argc -= 2;
|
|
||||||
argv += 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if( connectTo )
|
|
||||||
{
|
|
||||||
view = std::make_unique<tracy::View>( connectTo, port );
|
|
||||||
}
|
|
||||||
|
|
||||||
sprintf( title, "Tracy Profiler %i.%i.%i", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch );
|
sprintf( title, "Tracy Profiler %i.%i.%i", tracy::Version::Major, tracy::Version::Minor, tracy::Version::Patch );
|
||||||
|
|
||||||
std::string winPosFile = tracy::GetSavePath( "window.position" );
|
std::string winPosFile = tracy::GetSavePath( "window.position" );
|
||||||
@ -320,6 +286,40 @@ int main( int argc, char** argv )
|
|||||||
style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.45f);
|
style.Colors[ImGuiCol_HeaderActive] = ImVec4(0.26f, 0.59f, 0.98f, 0.45f);
|
||||||
style.ScaleAllSizes( dpiScale );
|
style.ScaleAllSizes( dpiScale );
|
||||||
|
|
||||||
|
if( argc == 2 )
|
||||||
|
{
|
||||||
|
auto f = std::unique_ptr<tracy::FileRead>( tracy::FileRead::Open( argv[1] ) );
|
||||||
|
if( f )
|
||||||
|
{
|
||||||
|
view = std::make_unique<tracy::View>( *f, fixedWidth, smallFont, bigFont, SetWindowTitleCallback );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
while( argc >= 3 )
|
||||||
|
{
|
||||||
|
if( strcmp( argv[1], "-a" ) == 0 )
|
||||||
|
{
|
||||||
|
connectTo = argv[2];
|
||||||
|
}
|
||||||
|
else if( strcmp( argv[1], "-p" ) == 0 )
|
||||||
|
{
|
||||||
|
port = atoi( argv[2] );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fprintf( stderr, "Bad parameter: %s", argv[1] );
|
||||||
|
exit( 1 );
|
||||||
|
}
|
||||||
|
argc -= 2;
|
||||||
|
argv += 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if( connectTo )
|
||||||
|
{
|
||||||
|
view = std::make_unique<tracy::View>( connectTo, port, fixedWidth, smallFont, bigFont, SetWindowTitleCallback );
|
||||||
|
}
|
||||||
|
|
||||||
glfwShowWindow( window );
|
glfwShowWindow( window );
|
||||||
|
|
||||||
// Main loop
|
// Main loop
|
||||||
|
Loading…
x
Reference in New Issue
Block a user