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

* bindable commands TextureProjectAxial/Ortho/Cam, using default texdef, unlike surface inspector buttons

Browse Source
This commit is contained in:
Garux 2019-03-07 00:50:25 +03:00
parent b3154d301e
commit a1abcd8c83
2 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
radiant/mainframe.cpp
View File

@ -2445,6 +2445,9 @@ void SurfaceInspector_registerShortcuts(){
command_connect_accelerator( "FitTextureHeight" ); command_connect_accelerator( "FitTextureHeight" );
command_connect_accelerator( "FitTextureWidthOnly" ); command_connect_accelerator( "FitTextureWidthOnly" );
command_connect_accelerator( "FitTextureHeightOnly" ); command_connect_accelerator( "FitTextureHeightOnly" );
command_connect_accelerator( "TextureProjectAxial" );
command_connect_accelerator( "TextureProjectOrtho" );
command_connect_accelerator( "TextureProjectCam" );
} }
void TexBro_registerShortcuts(){ void TexBro_registerShortcuts(){

44
radiant/surfacedialog.cpp
View File

@ -457,15 +457,26 @@ enum EProjectTexture
eProjectCam = 2, eProjectCam = 2,
}; };
void SurfaceInspector_ProjectTexture( EProjectTexture type ){ void SurfaceInspector_ProjectTexture( GtkWidget* widget, EProjectTexture type ){
UndoableCommand undo( "textureProject" ); if ( g_bp_globals.m_texdefTypeId == TEXDEFTYPEID_QUAKE )
globalWarningStream() << "function doesn't work for *brushes*, having Axial Projection type\n"; //works for patches
texdef_t texdef; texdef_t texdef;
texdef.shift[0] = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_hshiftIncrement.m_spin ) ); if( widget ){ //gui buttons
texdef.shift[1] = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_vshiftIncrement.m_spin ) ); getSurfaceInspector().exportData();
texdef.scale[0] = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_hscaleIncrement.m_spin ) ); texdef.shift[0] = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_hshiftIncrement.m_spin ) );
texdef.scale[1] = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_vscaleIncrement.m_spin ) ); texdef.shift[1] = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_vshiftIncrement.m_spin ) );
texdef.rotate = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_rotateIncrement.m_spin ) ); texdef.scale[0] = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_hscaleIncrement.m_spin ) );
texdef.scale[1] = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_vscaleIncrement.m_spin ) );
texdef.rotate = static_cast<float>( gtk_spin_button_get_value_as_float( getSurfaceInspector().m_rotateIncrement.m_spin ) );
}
else{ //bind
texdef.scale[0] = texdef.scale[1] = Texdef_getDefaultTextureScale();
}
StringOutputStream str( 32 );
str << "textureProject" << ( type == eProjectAxial? "Axial" : type == eProjectOrtho? "Ortho" : "Cam" );
UndoableCommand undo( str.c_str() );
Vector3 direction; Vector3 direction;
@ -485,6 +496,16 @@ void SurfaceInspector_ProjectTexture( EProjectTexture type ){
Select_ProjectTexture( texdef, &direction ); Select_ProjectTexture( texdef, &direction );
} }
void SurfaceInspector_ProjectTexture_eProjectAxial(){
SurfaceInspector_ProjectTexture( 0, eProjectAxial );
}
void SurfaceInspector_ProjectTexture_eProjectOrtho(){
SurfaceInspector_ProjectTexture( 0, eProjectOrtho );
}
void SurfaceInspector_ProjectTexture_eProjectCam(){
SurfaceInspector_ProjectTexture( 0, eProjectCam );
}
void SurfaceInspector_ResetTexture(){ void SurfaceInspector_ResetTexture(){
UndoableCommand undo( "textureReset/Cap" ); UndoableCommand undo( "textureReset/Cap" );
TextureProjection projection; TextureProjection projection;
@ -533,11 +554,7 @@ static void OnBtnReset( GtkWidget *widget, gpointer data ){
} }
static void OnBtnProject( GtkWidget *widget, EProjectTexture type ){ static void OnBtnProject( GtkWidget *widget, EProjectTexture type ){
if ( g_bp_globals.m_texdefTypeId == TEXDEFTYPEID_QUAKE ) { SurfaceInspector_ProjectTexture( widget, type );
globalWarningStream() << "function doesn't work for *brushes*, having Axial Projection type\n"; //works for patches
}
getSurfaceInspector().exportData();
SurfaceInspector_ProjectTexture( type );
} }
@ -1823,6 +1840,9 @@ void SurfaceInspector_registerCommands(){
GlobalCommands_insert( "FitTextureHeight", FreeCaller<SurfaceInspector_FaceFitHeight>() ); GlobalCommands_insert( "FitTextureHeight", FreeCaller<SurfaceInspector_FaceFitHeight>() );
GlobalCommands_insert( "FitTextureWidthOnly", FreeCaller<SurfaceInspector_FaceFitWidthOnly>() ); GlobalCommands_insert( "FitTextureWidthOnly", FreeCaller<SurfaceInspector_FaceFitWidthOnly>() );
GlobalCommands_insert( "FitTextureHeightOnly", FreeCaller<SurfaceInspector_FaceFitHeightOnly>() ); GlobalCommands_insert( "FitTextureHeightOnly", FreeCaller<SurfaceInspector_FaceFitHeightOnly>() );
GlobalCommands_insert( "TextureProjectAxial", FreeCaller<SurfaceInspector_ProjectTexture_eProjectAxial>() );
GlobalCommands_insert( "TextureProjectOrtho", FreeCaller<SurfaceInspector_ProjectTexture_eProjectOrtho>() );
GlobalCommands_insert( "TextureProjectCam", FreeCaller<SurfaceInspector_ProjectTexture_eProjectCam>() );
GlobalCommands_insert( "SurfaceInspector", FreeCaller<SurfaceInspector_toggleShown>(), Accelerator( 'S' ) ); GlobalCommands_insert( "SurfaceInspector", FreeCaller<SurfaceInspector_toggleShown>(), Accelerator( 'S' ) );
// GlobalCommands_insert( "FaceCopyTexture", FreeCaller<SelectedFaces_copyTexture>() ); // GlobalCommands_insert( "FaceCopyTexture", FreeCaller<SelectedFaces_copyTexture>() );