quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* focus all 2D views on map load, selection by q3map2, NextLeakSpot, selection by brush/entity number

Browse Source
This commit is contained in:
Garux 2019-08-23 14:40:45 +03:00
parent 446e1148a5
commit 15cf9d0b55
2 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
radiant/map.cpp
View File

@ -489,8 +489,9 @@ void FocusViews( const Vector3& point, float angle ){
angles[CAMERA_YAW] = angle;
Camera_setAngles( camwnd, angles );
XYWnd* xywnd = g_pParentWnd->GetXYWnd();
xywnd->SetOrigin( point );
g_pParentWnd->forEachXYWnd( [&point]( XYWnd* xywnd ){
xywnd->SetOrigin( point );
} );
}
#include "stringio.h"
@ -2154,7 +2155,9 @@ void SelectBrush( int entitynum, int brushnum ){
Selectable* selectable = Instance_getSelectable( *instance );
ASSERT_MESSAGE( selectable != 0, "SelectBrush: path not selectable" );
selectable->setSelected( true );
g_pParentWnd->GetXYWnd()->SetOrigin( instance->worldAABB().origin );
g_pParentWnd->forEachXYWnd( [instance]( XYWnd* xywnd ){
xywnd->SetOrigin( instance->worldAABB().origin );
} );
}
}

43
radiant/points.cpp
View File

@ -179,6 +179,22 @@ void Pointfile_Delete( void ){
file_remove( name.c_str() );
}
void Pointfile_UpdateViews( CPointfile::const_iterator i ){
CamWnd& camwnd = *g_pParentWnd->GetCamWnd();
Camera_setOrigin( camwnd, *i );
g_pParentWnd->forEachXYWnd( [i]( XYWnd* xywnd ){
xywnd->SetOrigin( *i );
} );
{
Vector3 dir( vector3_normalised( vector3_subtracted( *( ++i ), Camera_getOrigin( camwnd ) ) ) );
Vector3 angles( Camera_getAngles( camwnd ) );
angles[CAMERA_YAW] = static_cast<float>( radians_to_degrees( atan2( dir[1], dir[0] ) ) );
angles[CAMERA_PITCH] = static_cast<float>( radians_to_degrees( asin( dir[2] ) ) );
Camera_setAngles( camwnd, angles );
}
}
// advance camera to next point
void Pointfile_Next( void ){
if ( !s_pointfile.shown() ) {
@ -190,19 +206,7 @@ void Pointfile_Next( void ){
return;
}
CPointfile::const_iterator i = ++s_check_point;
CamWnd& camwnd = *g_pParentWnd->GetCamWnd();
Camera_setOrigin( camwnd, *i );
g_pParentWnd->ActiveXY()->SetOrigin( *i );
{
Vector3 dir( vector3_normalised( vector3_subtracted( *( ++i ), Camera_getOrigin( camwnd ) ) ) );
Vector3 angles( Camera_getAngles( camwnd ) );
angles[CAMERA_YAW] = static_cast<float>( radians_to_degrees( atan2( dir[1], dir[0] ) ) );
angles[CAMERA_PITCH] = static_cast<float>( radians_to_degrees( asin( dir[2] ) ) );
Camera_setAngles( camwnd, angles );
}
Pointfile_UpdateViews( ++s_check_point );
}
// advance camera to previous point
@ -216,18 +220,7 @@ void Pointfile_Prev( void ){
return;
}
CPointfile::const_iterator i = --s_check_point;
CamWnd& camwnd = *g_pParentWnd->GetCamWnd();
Camera_setOrigin( camwnd, *i );
g_pParentWnd->ActiveXY()->SetOrigin( *i );
{
Vector3 dir( vector3_normalised( vector3_subtracted( *( ++i ), Camera_getOrigin( camwnd ) ) ) );
Vector3 angles( Camera_getAngles( camwnd ) );
angles[CAMERA_YAW] = static_cast<float>( radians_to_degrees( atan2( dir[1], dir[0] ) ) );
angles[CAMERA_PITCH] = static_cast<float>( radians_to_degrees( asin( dir[2] ) ) );
Camera_setAngles( camwnd, angles );
}
Pointfile_UpdateViews( --s_check_point );
}
int LoadFile( const char *filename, void **bufferptr ){