Merge commit '322b0c2ee485a5d787c60bfd34e5ed5567d98ec8' into garux-merge

diff --git a/radiant/csg.cpp b/radiant/csg.cpp
index 2b7d82be09393aa61933a59c37c0808761a19925..6ca051973c49ebdd731afefcdeb07842428cd5f3 100644 (file)
--- a/radiant/csg.cpp
+++ b/radiant/csg.cpp
@@ -61,6 +61,7 @@ void Face_extrude( Face& face, const Brush& brush, brush_vector_t& out, float of
 #include "preferences.h"
 #include "texwindow.h"
 
+typedef std::vector<DoubleVector3> doublevector_vector_t;
 
 enum eHollowType
 {
@@ -84,17 +85,28 @@ class CaulkFace
 DoubleVector3 ExclusionAxis;
 double &mindot;
 double &maxdot;
+doublevector_vector_t &exclude_vec;
 public:
 CaulkFace( DoubleVector3 ExclusionAxis,
                        double &mindot,
-                       double &maxdot ):
+                       double &maxdot,
+                       doublevector_vector_t &exclude_vec ):
                        ExclusionAxis( ExclusionAxis ),
                        mindot( mindot ),
-                       maxdot( maxdot ){}
+                       maxdot( maxdot ),
+                       exclude_vec( exclude_vec ){}
 void operator()( Face& face ) const {
        double dot = vector3_dot( face.getPlane().plane3().normal(), ExclusionAxis );
-       if( dot == 0 || ( dot > mindot + 0.005 && dot < maxdot - 0.005 ) )
+       if( dot == 0 || ( dot > mindot + 0.005 && dot < maxdot - 0.005 ) ){
+               if( !exclude_vec.empty() ){
+                       for ( doublevector_vector_t::const_iterator i = exclude_vec.begin(); i != exclude_vec.end(); ++i ){
+                               if( ( *i ) == face.getPlane().plane3().normal() ){
+                                       return;
+                               }
+                       }
+               }
                face.SetShader( getCaulkShader() );
+       }
 }
 };
 
@@ -107,6 +119,7 @@ eHollowType HollowType;
 DoubleVector3 ExclusionAxis;
 double &mindot;
 double &maxdot;
+doublevector_vector_t &exclude_vec;
 bool caulk;
 bool RemoveInner;
 public:
@@ -117,6 +130,7 @@ FaceMakeBrush( const Brush& brush,
                        DoubleVector3 ExclusionAxis,
                        double &mindot,
                        double &maxdot,
+                       doublevector_vector_t &exclude_vec,
                        bool caulk,
                        bool RemoveInner )
        : brush( brush ),
@@ -126,12 +140,21 @@ FaceMakeBrush( const Brush& brush,
        ExclusionAxis( ExclusionAxis ),
        mindot( mindot ),
        maxdot( maxdot ),
+       exclude_vec( exclude_vec ),
        caulk( caulk ),
        RemoveInner( RemoveInner ){
 }
 void operator()( Face& face ) const {
        double dot = vector3_dot( face.getPlane().plane3().normal(), ExclusionAxis );
        if( dot == 0 || ( dot > mindot + 0.005 && dot < maxdot - 0.005 ) ){
+               if( !exclude_vec.empty() ){
+                       for ( doublevector_vector_t::const_iterator i = exclude_vec.begin(); i != exclude_vec.end(); ++i ){
+                               if( ( *i ) == face.getPlane().plane3().normal() ){
+                                       return;
+                               }
+                       }
+               }
+
                if( HollowType == pull ){
                        if ( face.contributes() ) {
                                face.getPlane().offset( offset );
@@ -141,7 +164,7 @@ void operator()( Face& face ) const {
                                face.planeChanged();
 
                                if( caulk ){
-                                       Brush_forEachFace( *out.back(), CaulkFace( ExclusionAxis, mindot, maxdot ) );
+                                       Brush_forEachFace( *out.back(), CaulkFace( ExclusionAxis, mindot, maxdot, exclude_vec ) );
                                }
                                Face* newFace = out.back()->addFace( face );
                                if ( newFace != 0 ) {
@@ -273,13 +296,21 @@ float offset;
 DoubleVector3 ExclusionAxis;
 double &mindot;
 double &maxdot;
+doublevector_vector_t &exclude_vec;
 public:
-FaceOffset( float offset, DoubleVector3 ExclusionAxis, double &mindot, double &maxdot )
-       : offset( offset ), ExclusionAxis( ExclusionAxis ), mindot( mindot ), maxdot( maxdot ){
+FaceOffset( float offset, DoubleVector3 ExclusionAxis, double &mindot, double &maxdot, doublevector_vector_t &exclude_vec )
+       : offset( offset ), ExclusionAxis( ExclusionAxis ), mindot( mindot ), maxdot( maxdot ), exclude_vec( exclude_vec ){
 }
 void operator()( Face& face ) const {
        double dot = vector3_dot( face.getPlane().plane3().normal(), ExclusionAxis );
        if( dot == 0 || ( dot > mindot + 0.005 && dot < maxdot - 0.005 ) ){
+               if( !exclude_vec.empty() ){
+                       for ( doublevector_vector_t::const_iterator i = exclude_vec.begin(); i != exclude_vec.end(); ++i ){
+                               if( ( *i ) == face.getPlane().plane3().normal() ){
+                                       return;
+                               }
+                       }
+               }
                face.undoSave();
                face.getPlane().offset( offset );
                face.planeChanged();
@@ -287,6 +318,19 @@ void operator()( Face& face ) const {
 }
 };
 
+class FaceExcludeSelected
+{
+doublevector_vector_t &outvec;
+public:
+FaceExcludeSelected( doublevector_vector_t &outvec ): outvec( outvec ){
+}
+void operator()( FaceInstance& face ) const {
+       if( face.isSelected() ){
+               outvec.push_back( face.getFace().getPlane().plane3().normal() );
+       }
+}
+};
+
 
 DoubleVector3 getExclusion();
 bool getCaulk();
@@ -307,38 +351,42 @@ bool pre( const scene::Path& path, scene::Instance& instance ) const {
                         && Instance_getSelectable( instance )->isSelected()
                         && path.size() > 1 ) {
                        brush_vector_t out;
+                       doublevector_vector_t exclude_vec;
                        double mindot = 0;
                        double maxdot = 0;
                        if( HollowType != room ){
                                Brush_forEachFace( *brush, FaceExclude( getExclusion(), mindot, maxdot ) );
+                               if( mindot == 0 && maxdot == 0 ){
+                                       Brush_ForEachFaceInstance( *Instance_getBrush( instance ), FaceExcludeSelected( exclude_vec ) );
+                               }
                        }
                        if( HollowType == room ){
                                Brush* tmpbrush = new Brush( *brush );
                                tmpbrush->removeEmptyFaces();
-                               Brush_forEachFace( *brush, FaceMakeBrush( *brush, out, offset, pull, DoubleVector3( 0, 0, 0 ), mindot, maxdot, true, true ) );
+                               Brush_forEachFace( *brush, FaceMakeBrush( *brush, out, offset, pull, DoubleVector3( 0, 0, 0 ), mindot, maxdot, exclude_vec, true, true ) );
                                delete tmpbrush;
                        }
                        else if( HollowType == pull ){
                                if( !getRemoveInner() && getCaulk() ){
-                                       Brush_forEachFace( *brush, CaulkFace( getExclusion(), mindot, maxdot ) );
+                                       Brush_forEachFace( *brush, CaulkFace( getExclusion(), mindot, maxdot, exclude_vec ) );
                                }
                                Brush* tmpbrush = new Brush( *brush );
                                tmpbrush->removeEmptyFaces();
-                               Brush_forEachFace( *tmpbrush, FaceMakeBrush( *tmpbrush, out, offset, HollowType, getExclusion(), mindot, maxdot, getCaulk(), getRemoveInner() ) );
+                               Brush_forEachFace( *tmpbrush, FaceMakeBrush( *tmpbrush, out, offset, HollowType, getExclusion(), mindot, maxdot, exclude_vec, getCaulk(), getRemoveInner() ) );
                                delete tmpbrush;
                        }
                        else if( HollowType == diag ){
                                Brush* tmpbrush = new Brush( *brush );
-                               Brush_forEachFace( *tmpbrush, FaceOffset( offset, getExclusion(), mindot, maxdot ) );
+                               Brush_forEachFace( *tmpbrush, FaceOffset( offset, getExclusion(), mindot, maxdot, exclude_vec ) );
                                tmpbrush->removeEmptyFaces();
-                               Brush_forEachFace( *tmpbrush, FaceMakeBrush( *brush, out, offset, HollowType, getExclusion(), mindot, maxdot, getCaulk(), getRemoveInner() ) );
+                               Brush_forEachFace( *tmpbrush, FaceMakeBrush( *brush, out, offset, HollowType, getExclusion(), mindot, maxdot, exclude_vec, getCaulk(), getRemoveInner() ) );
                                delete tmpbrush;
                                if( !getRemoveInner() && getCaulk() ){
-                                       Brush_forEachFace( *brush, CaulkFace( getExclusion(), mindot, maxdot ) );
+                                       Brush_forEachFace( *brush, CaulkFace( getExclusion(), mindot, maxdot, exclude_vec ) );
                                }
                        }
                        else{
-                               Brush_forEachFace( *brush, FaceMakeBrush( *brush, out, offset, HollowType, getExclusion(), mindot, maxdot, getCaulk(), getRemoveInner() ) );
+                               Brush_forEachFace( *brush, FaceMakeBrush( *brush, out, offset, HollowType, getExclusion(), mindot, maxdot, exclude_vec, getCaulk(), getRemoveInner() ) );
                        }
                        for ( brush_vector_t::const_iterator i = out.begin(); i != out.end(); ++i )
                        {
@@ -956,26 +1004,45 @@ void CSG_Merge( void ){
 #include "gtkutil/dialog.h"
 #include "gtkutil/button.h"
 #include "gtkutil/accelerator.h"
+#include "xywindow.h"
+#include "camwindow.h"
 
 struct CSGToolDialog
 {
        GtkSpinButton* spin;
        bool allocated{false};
        ui::Window window{ui::null};
-       GtkToggleButton *radXYZ, *radX, *radY, *radZ, *caulk, *removeInner;
+       GtkToggleButton *radFaces, *radProj, *radCam, *caulk, *removeInner;
 };
 
 CSGToolDialog g_csgtool_dialog;
 
 DoubleVector3 getExclusion(){
-       if( gtk_toggle_button_get_active( g_csgtool_dialog.radX ) ){
-               return DoubleVector3( 1, 0, 0 );
-       }
-       else if( gtk_toggle_button_get_active( g_csgtool_dialog.radY ) ){
-               return DoubleVector3( 0, 1, 0 );
+       if( gtk_toggle_button_get_active( g_csgtool_dialog.radProj ) ){
+               if( GlobalXYWnd_getCurrentViewType() == YZ ){
+                       return DoubleVector3( 1, 0, 0 );
+               }
+               else if( GlobalXYWnd_getCurrentViewType() == XZ ){
+                       return DoubleVector3( 0, 1, 0 );
+               }
+               else if( GlobalXYWnd_getCurrentViewType() == XY ){
+                       return DoubleVector3( 0, 0, 1 );
+               }
        }
-       else if( gtk_toggle_button_get_active( g_csgtool_dialog.radZ ) ){
-               return DoubleVector3( 0, 0, 1 );
+       if( gtk_toggle_button_get_active( g_csgtool_dialog.radCam ) ){
+               Vector3 angles( Camera_getAngles( *g_pParentWnd->GetCamWnd() ) );
+//             globalOutputStream() << angles << " angles\n";
+               DoubleVector3 radangles( degrees_to_radians( angles[0] ), degrees_to_radians( angles[1] ), degrees_to_radians( angles[2] ) );
+//             globalOutputStream() << radangles << " radangles\n";
+//             x = cos(yaw)*cos(pitch)
+//             y = sin(yaw)*cos(pitch)
+//             z = sin(pitch)
+               DoubleVector3 viewvector;
+               viewvector[0] = cos( radangles[1] ) * cos( radangles[0] );
+               viewvector[1] = sin( radangles[1] ) * cos( radangles[0] );
+               viewvector[2] = sin( radangles[0] );
+//             globalOutputStream() << viewvector << " viewvector\n";
+               return viewvector;
        }
        return DoubleVector3( 0, 0, 0 );
 }
@@ -1004,8 +1071,12 @@ BrushFaceOffset( float offset )
 void operator()( BrushInstance& brush ) const {
        double mindot = 0;
        double maxdot = 0;
+       doublevector_vector_t exclude_vec;
        Brush_forEachFace( brush, FaceExclude( getExclusion(), mindot, maxdot ) );
-       Brush_forEachFace( brush, FaceOffset( offset, getExclusion(), mindot, maxdot ) );
+       if( mindot == 0 && maxdot == 0 ){
+               Brush_ForEachFaceInstance( brush, FaceExcludeSelected( exclude_vec ) );
+       }
+       Brush_forEachFace( brush, FaceOffset( offset, getExclusion(), mindot, maxdot, exclude_vec ) );
 }
 };
 
@@ -1124,32 +1195,30 @@ void CSG_Tool(){
                                }
                                {
                                        //radio button group for choosing the exclude axis
-                                       GtkWidget* radXYZ = gtk_radio_button_new_with_label( NULL, "XYZ" );
-                                       GtkWidget* radX = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(radXYZ), "-X" );
-                                       GtkWidget* radY = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(radXYZ), "-Y" );
-                                       GtkWidget* radZ = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(radXYZ), "-Z" );
-                                       gtk_widget_show( radXYZ );
-                                       gtk_widget_show( radX );
-                                       gtk_widget_show( radY );
-                                       gtk_widget_show( radZ );
-
-                                       gtk_table_attach( table, radXYZ, 2, 3, 0, 1,
-                                                                       (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
-                                                                       (GtkAttachOptions) ( 0 ), 0, 0 );
-                                       gtk_table_attach( table, radX, 3, 4, 0, 1,
+                                       GtkWidget* radFaces = gtk_radio_button_new_with_label( NULL, "-faces" );
+                                       gtk_widget_set_tooltip_text( radFaces, "Exclude selected faces" );
+                                       GtkWidget* radProj = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(radFaces), "-proj" );
+                                       gtk_widget_set_tooltip_text( radProj, "Exclude faces, most orthogonal to active projection" );
+                                       GtkWidget* radCam = gtk_radio_button_new_with_label_from_widget( GTK_RADIO_BUTTON(radFaces), "-cam" );
+                                       gtk_widget_set_tooltip_text( radCam, "Exclude faces, most orthogonal to camera view" );
+
+                                       gtk_widget_show( radFaces );
+                                       gtk_widget_show( radProj );
+                                       gtk_widget_show( radCam );
+
+                                       gtk_table_attach( table, radFaces, 2, 3, 0, 1,
                                                                        (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                                                        (GtkAttachOptions) ( 0 ), 0, 0 );
-                                       gtk_table_attach( table, radY, 4, 5, 0, 1,
+                                       gtk_table_attach( table, radProj, 3, 4, 0, 1,
                                                                        (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                                                        (GtkAttachOptions) ( 0 ), 0, 0 );
-                                       gtk_table_attach( table, radZ, 5, 6, 0, 1,
+                                       gtk_table_attach( table, radCam, 4, 5, 0, 1,
                                                                        (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                                                        (GtkAttachOptions) ( 0 ), 0, 0 );
 
-                                       g_csgtool_dialog.radXYZ = GTK_TOGGLE_BUTTON( radXYZ );
-                                       g_csgtool_dialog.radX = GTK_TOGGLE_BUTTON( radX );
-                                       g_csgtool_dialog.radY = GTK_TOGGLE_BUTTON( radY );
-                                       g_csgtool_dialog.radZ = GTK_TOGGLE_BUTTON( radZ );
+                                       g_csgtool_dialog.radFaces = GTK_TOGGLE_BUTTON( radFaces );
+                                       g_csgtool_dialog.radProj = GTK_TOGGLE_BUTTON( radProj );
+                                       g_csgtool_dialog.radCam = GTK_TOGGLE_BUTTON( radCam );
                                }
                                {
                                        GtkWidget* button = gtk_toggle_button_new();

diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp
index 53d697f46aec0f24a75f6d10ab5716df9a0187bf..476e189f81af041ae8761d204d9b4e5bdb8b5540 100644 (file)
--- a/radiant/gtkdlgs.cpp
+++ b/radiant/gtkdlgs.cpp
@@ -757,9 +757,8 @@ static void editor_close( ui::Widget widget, gpointer data ){
 static void CreateGtkTextEditor(){
        auto dlg = ui::Window( ui::window_type::TOP );
 
-       dlg.connect( "delete_event",
-                                         G_CALLBACK( editor_delete ), 0 );
-       gtk_window_set_default_size( dlg, 400, 300 );
+       dlg.connect( "", G_CALLBACK( editor_delete ), 0 );
+       gtk_window_set_default_size( dlg, 400, 600 );
 
        auto vbox = ui::VBox( FALSE, 5 );
        vbox.show();

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index c2efdc3aa34452176c32071912c63f5273c03534..4dd87b719fdf4efdf184da7c8f383b94ba75293b 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -2217,6 +2217,9 @@ ui::MenuItem create_selection_menu(){
                create_menu_item_with_mnemonic( menu_in_menu, "Rotate X", "RotateSelectionX" );
                create_menu_item_with_mnemonic( menu_in_menu, "Rotate Y", "RotateSelectionY" );
                create_menu_item_with_mnemonic( menu_in_menu, "Rotate Z", "RotateSelectionZ" );
+               menu_separator( menu_in_menu );
+               create_menu_item_with_mnemonic( menu_in_menu, "Rotate Clockwise", "RotateSelectionClockwise" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Rotate Anticlockwise", "RotateSelectionAnticlockwise" );
        }
        {
                auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Flip" );
@@ -2226,6 +2229,9 @@ ui::MenuItem create_selection_menu(){
                create_menu_item_with_mnemonic( menu_in_menu, "Flip _X", "MirrorSelectionX" );
                create_menu_item_with_mnemonic( menu_in_menu, "Flip _Y", "MirrorSelectionY" );
                create_menu_item_with_mnemonic( menu_in_menu, "Flip _Z", "MirrorSelectionZ" );
+               menu_separator( menu_in_menu );
+               create_menu_item_with_mnemonic( menu_in_menu, "Flip Horizontally", "MirrorSelectionHorizontally" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Flip Vertically", "MirrorSelectionVertically" );
        }
        menu_separator( menu );
        create_menu_item_with_mnemonic( menu, "Arbitrary rotation...", "ArbitraryRotation" );
@@ -2471,12 +2477,17 @@ void UndoRedo_constructToolbar( ui::Toolbar toolbar ){
 }
 
 void RotateFlip_constructToolbar( ui::Toolbar toolbar ){
-       toolbar_append_button( toolbar, "x-axis Flip", "brush_flipx.png", "MirrorSelectionX" );
-       toolbar_append_button( toolbar, "x-axis Rotate", "brush_rotatex.png", "RotateSelectionX" );
-       toolbar_append_button( toolbar, "y-axis Flip", "brush_flipy.png", "MirrorSelectionY" );
-       toolbar_append_button( toolbar, "y-axis Rotate", "brush_rotatey.png", "RotateSelectionY" );
-       toolbar_append_button( toolbar, "z-axis Flip", "brush_flipz.png", "MirrorSelectionZ" );
-       toolbar_append_button( toolbar, "z-axis Rotate", "brush_rotatez.png", "RotateSelectionZ" );
+//     toolbar_append_button( toolbar, "x-axis Flip", "brush_flipx.png", "MirrorSelectionX" );
+//     toolbar_append_button( toolbar, "x-axis Rotate", "brush_rotatex.png", "RotateSelectionX" );
+//     toolbar_append_button( toolbar, "y-axis Flip", "brush_flipy.png", "MirrorSelectionY" );
+//     toolbar_append_button( toolbar, "y-axis Rotate", "brush_rotatey.png", "RotateSelectionY" );
+//     toolbar_append_button( toolbar, "z-axis Flip", "brush_flipz.png", "MirrorSelectionZ" );
+//     toolbar_append_button( toolbar, "z-axis Rotate", "brush_rotatez.png", "RotateSelectionZ" );
+       toolbar_append_button( toolbar, "Flip Horizontally", "brush_flip_hor.png", "MirrorSelectionHorizontally" );
+       toolbar_append_button( toolbar, "Flip Vertically", "brush_flip_vert.png", "MirrorSelectionVertically" );
+
+       toolbar_append_button( toolbar, "Rotate Clockwise", "brush_rotate_clock.png", "RotateSelectionClockwise" );
+       toolbar_append_button( toolbar, "Rotate Anticlockwise", "brush_rotate_anti.png", "RotateSelectionAnticlockwise" );
 }
 
 void Select_constructToolbar( ui::Toolbar toolbar ){
@@ -2552,7 +2563,7 @@ ui::Toolbar create_main_toolbar( MainFrame::EViewStyle style ){
 
        ComponentModes_constructToolbar( toolbar );
 
-       if ( style == MainFrame::eRegular || style == MainFrame::eRegularLeft ) {
+       if ( style != MainFrame::eSplit ) {
                space();
 
                XYWnd_constructToolbar( toolbar );
@@ -3562,18 +3573,14 @@ void MainFrame_Construct(){
 //     GlobalCommands_insert( "ShowHidden", FreeCaller<Select_ShowAllHidden>(), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) );
 //     GlobalCommands_insert( "HideSelected", FreeCaller<HideSelected>(), Accelerator( 'H' ) );
 
-       Hide_registerCommands();
+       Select_registerCommands();
 
        GlobalToggles_insert( "DragVertices", makeCallbackF(SelectVertexMode), ToggleItem::AddCallbackCaller( g_vertexMode_button ), Accelerator( 'V' ) );
        GlobalToggles_insert( "DragEdges", makeCallbackF(SelectEdgeMode), ToggleItem::AddCallbackCaller( g_edgeMode_button ), Accelerator( 'E' ) );
        GlobalToggles_insert( "DragFaces", makeCallbackF(SelectFaceMode), ToggleItem::AddCallbackCaller( g_faceMode_button ), Accelerator( 'F' ) );
 
-       GlobalCommands_insert( "MirrorSelectionX", makeCallbackF(Selection_Flipx) );
-       GlobalCommands_insert( "RotateSelectionX", makeCallbackF(Selection_Rotatex) );
-       GlobalCommands_insert( "MirrorSelectionY", makeCallbackF(Selection_Flipy) );
-       GlobalCommands_insert( "RotateSelectionY", makeCallbackF(Selection_Rotatey) );
-       GlobalCommands_insert( "MirrorSelectionZ", makeCallbackF(Selection_Flipz) );
-       GlobalCommands_insert( "RotateSelectionZ", makeCallbackF(Selection_Rotatez) );
+       GlobalCommands_insert( "ArbitraryRotation", makeCallbackF(DoRotateDlg), Accelerator( 'R', (GdkModifierType)GDK_SHIFT_MASK ) );
+       GlobalCommands_insert( "ArbitraryScale", makeCallbackF(DoScaleDlg), Accelerator( 'S', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 
        GlobalCommands_insert( "ArbitraryRotation", makeCallbackF(DoRotateDlg) );
        GlobalCommands_insert( "ArbitraryScale", makeCallbackF(DoScaleDlg) );

diff --git a/radiant/select.cpp b/radiant/select.cpp
index adae13d7931851ca7a2a4de36cb264bf4ae53dba..1c97e9ee0138a13b6a266eb7e97959099ac5c08e 100644 (file)
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -781,12 +781,6 @@ void Select_ShowAllHidden(){
        g_hidden_item.update();
 }
 
-void Hide_registerCommands(){
-       GlobalCommands_insert( "ShowHidden", makeCallbackF( Select_ShowAllHidden ), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) );
-       GlobalToggles_insert( "HideSelected", makeCallbackF( HideSelected ), ToggleItem::AddCallbackCaller( g_hidden_item ), Accelerator( 'H' ) );
-}
-
-
 
 void Selection_Flipx(){
        UndoableCommand undo( "mirrorSelected -axis x" );
@@ -817,7 +811,89 @@ void Selection_Rotatez(){
        UndoableCommand undo( "rotateSelected -axis z -angle -90" );
        Select_RotateAxis( 2,-90 );
 }
+#include "xywindow.h"
+void Selection_FlipHorizontally(){
+       VIEWTYPE viewtype = GlobalXYWnd_getCurrentViewType();
+       switch ( viewtype )
+       {
+       case XY:
+       case XZ:
+               Selection_Flipx();
+               break;
+       default:
+               Selection_Flipy();
+               break;
+       }
+}
 
+void Selection_FlipVertically(){
+       VIEWTYPE viewtype = GlobalXYWnd_getCurrentViewType();
+       switch ( viewtype )
+       {
+       case XZ:
+       case YZ:
+               Selection_Flipz();
+               break;
+       default:
+               Selection_Flipy();
+               break;
+       }
+}
+
+void Selection_RotateClockwise(){
+       UndoableCommand undo( "rotateSelected Clockwise 90" );
+       VIEWTYPE viewtype = GlobalXYWnd_getCurrentViewType();
+       switch ( viewtype )
+       {
+       case XY:
+               Select_RotateAxis( 2, -90 );
+               break;
+       case XZ:
+               Select_RotateAxis( 1, 90 );
+               break;
+       default:
+               Select_RotateAxis( 0, -90 );
+               break;
+       }
+}
+
+void Selection_RotateAnticlockwise(){
+       UndoableCommand undo( "rotateSelected Anticlockwise 90" );
+       VIEWTYPE viewtype = GlobalXYWnd_getCurrentViewType();
+       switch ( viewtype )
+       {
+       case XY:
+               Select_RotateAxis( 2, 90 );
+               break;
+       case XZ:
+               Select_RotateAxis( 1, -90 );
+               break;
+       default:
+               Select_RotateAxis( 0, 90 );
+               break;
+       }
+
+}
+
+
+
+void Select_registerCommands(){
+       GlobalCommands_insert( "ShowHidden", FreeCaller<Select_ShowAllHidden>(), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) );
+       GlobalToggles_insert( "HideSelected", FreeCaller<HideSelected>(), ToggleItem::AddCallbackCaller( g_hidden_item ), Accelerator( 'H' ) );
+
+       GlobalCommands_insert( "MirrorSelectionX", FreeCaller<Selection_Flipx>() );
+       GlobalCommands_insert( "RotateSelectionX", FreeCaller<Selection_Rotatex>() );
+       GlobalCommands_insert( "MirrorSelectionY", FreeCaller<Selection_Flipy>() );
+       GlobalCommands_insert( "RotateSelectionY", FreeCaller<Selection_Rotatey>() );
+       GlobalCommands_insert( "MirrorSelectionZ", FreeCaller<Selection_Flipz>() );
+       GlobalCommands_insert( "RotateSelectionZ", FreeCaller<Selection_Rotatez>() );
+
+       GlobalCommands_insert( "MirrorSelectionHorizontally", FreeCaller<Selection_FlipHorizontally>() );
+       GlobalCommands_insert( "MirrorSelectionVertically", FreeCaller<Selection_FlipVertically>() );
+
+       GlobalCommands_insert( "RotateSelectionClockwise", FreeCaller<Selection_RotateClockwise>() );
+       GlobalCommands_insert( "RotateSelectionAnticlockwise", FreeCaller<Selection_RotateAnticlockwise>() );
+}
 
 
 void Nudge( int nDim, float fNudge ){

diff --git a/radiant/select.h b/radiant/select.h
index 2a4a2289d7c6bc364cd6d35e7216db3fbeade138..5a602742fd766e007e412ccce49fa784f97706db 100644 (file)
--- a/radiant/select.h
+++ b/radiant/select.h
@@ -33,12 +33,12 @@ void Select_Inside();
 void Select_Touching();
 void Scene_ExpandSelectionToEntities();
 
-void Selection_Flipx();
-void Selection_Flipy();
-void Selection_Flipz();
-void Selection_Rotatex();
-void Selection_Rotatey();
-void Selection_Rotatez();
+//void Selection_Flipx();
+//void Selection_Flipy();
+//void Selection_Flipz();
+//void Selection_Rotatex();
+//void Selection_Rotatey();
+//void Selection_Rotatez();
 
 
 void Selection_MoveDown();
@@ -66,7 +66,7 @@ void FindReplaceTextures( const char* pFind, const char* pReplace, bool bSelecte
 
 void HideSelected();
 void Select_ShowAllHidden();
-void Hide_registerCommands();
+void Select_registerCommands();
 
 // updating workzone to a given brush (depends on current view)
 

diff --git a/setup/data/tools/bitmaps/brush_flip_hor.png b/setup/data/tools/bitmaps/brush_flip_hor.png
new file mode 100644 (file)
index 0000000..5d16a6f
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_flip_hor.png differ

diff --git a/setup/data/tools/bitmaps/brush_flip_vert.png b/setup/data/tools/bitmaps/brush_flip_vert.png
new file mode 100644 (file)
index 0000000..a6d039b
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_flip_vert.png differ

diff --git a/setup/data/tools/bitmaps/brush_rotate_anti.png b/setup/data/tools/bitmaps/brush_rotate_anti.png
new file mode 100644 (file)
index 0000000..4897620
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_rotate_anti.png differ

diff --git a/setup/data/tools/bitmaps/brush_rotate_clock.png b/setup/data/tools/bitmaps/brush_rotate_clock.png
new file mode 100644 (file)
index 0000000..7c6b0ba
Binary files /dev/null and b/setup/data/tools/bitmaps/brush_rotate_clock.png differ

diff --git a/setup/data/tools/bitmaps/f-hide.png b/setup/data/tools/bitmaps/f-hide.png
index c0add57cd630880de1e600e07028a16bb0b8ef14..f283417cd9414938e884113d7dfac29a3d0b0e48 100644 (file)
Binary files a/setup/data/tools/bitmaps/f-hide.png and b/setup/data/tools/bitmaps/f-hide.png differ

diff --git a/setup/data/tools/bitmaps/f-region.png b/setup/data/tools/bitmaps/f-region.png
index d15bebc4e15557af0b40a7fc79c9027ab408b9ec..a16c7acbd8a711eb1782b04a4abab8aa18253fcc 100644 (file)
Binary files a/setup/data/tools/bitmaps/f-region.png and b/setup/data/tools/bitmaps/f-region.png differ