X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fpatchdialog.cpp;h=830378327f9b951c78bfdb805add0af4d0c66f0a;hb=fea0d2e6575b21945c4800805d66e43a2247ded5;hp=c38469e347226d558e19fdc0f6c20872db303d30;hpb=e6ffa8c04f8bd4e501210652daf88b52a366a338;p=xonotic%2Fnetradiant.git diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index c38469e3..83037832 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -137,20 +137,11 @@ void Scene_PatchGetFixedSubdivisions( PatchFixedSubdivisions& subdivisions ){ #endif } -class PatchSetFixedSubdivisions -{ -const PatchFixedSubdivisions& m_subdivisions; -public: -PatchSetFixedSubdivisions( const PatchFixedSubdivisions& subdivisions ) : m_subdivisions( subdivisions ){ -} -void operator()( Patch& patch ) const { - Patch_setFixedSubdivisions( patch, m_subdivisions ); -} -}; - void Scene_PatchSetFixedSubdivisions( const PatchFixedSubdivisions& subdivisions ){ UndoableCommand command( "patchSetFixedSubdivisions" ); - Scene_forEachVisibleSelectedPatch( PatchSetFixedSubdivisions( subdivisions ) ); + Scene_forEachVisibleSelectedPatch([&](Patch &patch) { + Patch_setFixedSubdivisions(patch, subdivisions); + }); } @@ -185,7 +176,7 @@ void update(){ void cancel(){ update(); } -typedef MemberCaller CancelCaller; +typedef MemberCaller CancelCaller; void apply(){ Scene_PatchSetFixedSubdivisions( PatchFixedSubdivisions( @@ -195,8 +186,8 @@ void apply(){ ) ); } -typedef MemberCaller ApplyCaller; -static void applyGtk( GtkToggleButton* toggle, Subdivisions* self ){ +typedef MemberCaller ApplyCaller; +static void applyGtk( ui::ToggleButton toggle, Subdivisions* self ){ self->apply(); } }; @@ -239,7 +230,7 @@ bool m_bListenChanged; PatchInspector() : m_horizontalSubdivisionsEntry( Subdivisions::ApplyCaller( m_subdivisions ), Subdivisions::CancelCaller( m_subdivisions ) ), m_verticalSubdivisionsEntry( Subdivisions::ApplyCaller( m_subdivisions ), Subdivisions::CancelCaller( m_subdivisions ) ), - m_idleDraw( MemberCaller( *this ) ){ + m_idleDraw( MemberCaller( *this ) ){ m_fS = 0.0f; m_fT = 0.0f; m_fX = 0.0f; @@ -350,19 +341,10 @@ static void OnSelchangeComboColRow( ui::Widget widget, gpointer data ){ g_PatchInspector.importData(); } -class PatchSetTextureRepeat -{ -float m_s, m_t; -public: -PatchSetTextureRepeat( float s, float t ) : m_s( s ), m_t( t ){ -} -void operator()( Patch& patch ) const { - patch.SetTextureRepeat( m_s, m_t ); -} -}; - void Scene_PatchTileTexture_Selected( scene::Graph& graph, float s, float t ){ - Scene_forEachVisibleSelectedPatch( PatchSetTextureRepeat( s, t ) ); + Scene_forEachVisibleSelectedPatch([&](Patch &patch) { + patch.SetTextureRepeat(s, t); + }); SceneChangeNotify(); } @@ -390,32 +372,12 @@ static void OnBtnPatchFlipY( ui::Widget widget, gpointer data ){ Patch_FlipTextureY(); } -struct PatchRotateTexture -{ - float m_angle; -public: - PatchRotateTexture( float angle ) : m_angle( angle ){ - } - void operator()( Patch& patch ) const { - patch.RotateTexture( m_angle ); - } -}; - void Scene_PatchRotateTexture_Selected( scene::Graph& graph, float angle ){ - Scene_forEachVisibleSelectedPatch( PatchRotateTexture( angle ) ); + Scene_forEachVisibleSelectedPatch([&](Patch &patch) { + patch.RotateTexture(angle); + }); } -class PatchScaleTexture -{ -float m_s, m_t; -public: -PatchScaleTexture( float s, float t ) : m_s( s ), m_t( t ){ -} -void operator()( Patch& patch ) const { - patch.ScaleTexture( m_s, m_t ); -} -}; - float Patch_convertScale( float scale ){ if ( scale > 0 ) { return scale; @@ -427,23 +389,17 @@ float Patch_convertScale( float scale ){ } void Scene_PatchScaleTexture_Selected( scene::Graph& graph, float s, float t ){ - Scene_forEachVisibleSelectedPatch( PatchScaleTexture( Patch_convertScale( s ), Patch_convertScale( t ) ) ); + s = Patch_convertScale(s); + t = Patch_convertScale(t); + Scene_forEachVisibleSelectedPatch([&](Patch &patch) { + patch.ScaleTexture(s, t); + }); } -class PatchTranslateTexture -{ -float m_s, m_t; -public: -PatchTranslateTexture( float s, float t ) - : m_s( s ), m_t( t ){ -} -void operator()( Patch& patch ) const { - patch.TranslateTexture( m_s, m_t ); -} -}; - void Scene_PatchTranslateTexture_Selected( scene::Graph& graph, float s, float t ){ - Scene_forEachVisibleSelectedPatch( PatchTranslateTexture( s, t ) ); + Scene_forEachVisibleSelectedPatch([&](Patch &patch) { + patch.TranslateTexture(s, t); + }); } static void OnBtnPatchAutoCap( ui::Widget widget, gpointer data ){ @@ -609,7 +565,7 @@ ui::Window PatchInspector::BuildDialog(){ combo.show(); table.attach(combo, {0, 1, 1, 2}, {(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0)}, {0, 0}); - gtk_widget_set_size_request( combo , 60, -1 ); + combo.dimensions(60, -1); m_pRowCombo = combo; } @@ -620,7 +576,7 @@ ui::Window PatchInspector::BuildDialog(){ combo.show(); table.attach(combo, {1, 2, 1, 2}, {(GtkAttachOptions) (GTK_EXPAND | GTK_FILL), (GtkAttachOptions) (0)}, {0, 0}); - gtk_widget_set_size_request( combo , 60, -1 ); + combo.dimensions(60, -1); m_pColCombo = combo; } } @@ -806,7 +762,7 @@ ui::Window PatchInspector::BuildDialog(){ button.show(); table.attach(button, {3, 4, 2, 3}, {GTK_FILL, 0}); button.connect( "clicked", G_CALLBACK( OnBtnPatchFlipX ), 0 ); - gtk_widget_set_size_request( button , 60, -1 ); + button.dimensions(60, -1); } { auto label = ui::Label( "Vertical Stretch Step" ); @@ -819,7 +775,7 @@ ui::Window PatchInspector::BuildDialog(){ button.show(); table.attach(button, {3, 4, 3, 4}, {GTK_FILL, 0}); button.connect( "clicked", G_CALLBACK( OnBtnPatchFlipY ), 0 ); - gtk_widget_set_size_request( button , 60, -1 ); + button.dimensions(60, -1); } { auto label = ui::Label( "Rotate Step" ); @@ -831,7 +787,7 @@ ui::Window PatchInspector::BuildDialog(){ auto entry = ui::Entry(ui::New); entry.show(); table.attach(entry, {0, 1, 0, 1}, {GTK_FILL, 0}); - gtk_widget_set_size_request( entry , 50, -1 ); + entry.dimensions(50, -1); g_object_set_data( G_OBJECT( window ), "hshift_entry", (void *) entry ); // we fill in this data, if no patch is selected the widgets are unmodified when the inspector is raised // so we need to have at least one initialisation somewhere @@ -844,14 +800,14 @@ ui::Window PatchInspector::BuildDialog(){ auto spin = ui::SpinButton( adj, 1, 0 ); spin.show(); table.attach(spin, {1, 2, 0, 1}, {0, 0}); - gtk_widget_set_size_request( spin , 10, -1 ); + spin.dimensions(10, -1); gtk_widget_set_can_focus( spin, false ); } { auto entry = ui::Entry(ui::New); entry.show(); table.attach(entry, {0, 1, 1, 2}, {GTK_FILL, 0}); - gtk_widget_set_size_request( entry , 50, -1 ); + entry.dimensions(50, -1); entry_set_float( entry, g_pi_globals.shift[1] ); auto adj = ui::Adjustment( 0, -8192, 8192, 1, 1, 0 ); @@ -861,14 +817,14 @@ ui::Window PatchInspector::BuildDialog(){ auto spin = ui::SpinButton( adj, 1, 0 ); spin.show(); table.attach(spin, {1, 2, 1, 2}, {0, 0}); - gtk_widget_set_size_request( spin , 10, -1 ); + spin.dimensions(10, -1); gtk_widget_set_can_focus( spin, false ); } { auto entry = ui::Entry(ui::New); entry.show(); table.attach(entry, {0, 1, 2, 3}, {GTK_FILL, 0}); - gtk_widget_set_size_request( entry , 50, -1 ); + entry.dimensions(50, -1); entry_set_float( entry, g_pi_globals.scale[0] ); auto adj = ui::Adjustment( 0, -1000, 1000, 1, 1, 0 ); @@ -878,14 +834,14 @@ ui::Window PatchInspector::BuildDialog(){ auto spin = ui::SpinButton( adj, 1, 0 ); spin.show(); table.attach(spin, {1, 2, 2, 3}, {0, 0}); - gtk_widget_set_size_request( spin , 10, -1 ); + spin.dimensions(10, -1); gtk_widget_set_can_focus( spin, false ); } { auto entry = ui::Entry(ui::New); entry.show(); table.attach(entry, {0, 1, 3, 4}, {GTK_FILL, 0}); - gtk_widget_set_size_request( entry , 50, -1 ); + entry.dimensions(50, -1); entry_set_float( entry, g_pi_globals.scale[1] ); auto adj = ui::Adjustment( 0, -1000, 1000, 1, 1, 0 ); @@ -895,14 +851,14 @@ ui::Window PatchInspector::BuildDialog(){ auto spin = ui::SpinButton( adj, 1, 0 ); spin.show(); table.attach(spin, {1, 2, 3, 4}, {0, 0}); - gtk_widget_set_size_request( spin , 10, -1 ); + spin.dimensions(10, -1); gtk_widget_set_can_focus( spin, false ); } { auto entry = ui::Entry(ui::New); entry.show(); table.attach(entry, {0, 1, 4, 5}, {GTK_FILL, 0}); - gtk_widget_set_size_request( entry , 50, -1 ); + entry.dimensions(50, -1); entry_set_float( entry, g_pi_globals.rotate ); auto adj = ui::Adjustment( 0, -1000, 1000, 1, 1, 0 ); // NOTE: Arnout - this really should be 360 but can't change it anymore as it could break existing maps @@ -912,7 +868,7 @@ ui::Window PatchInspector::BuildDialog(){ auto spin = ui::SpinButton( adj, 1, 0 ); spin.show(); table.attach(spin, {1, 2, 4, 5}, {0, 0}); - gtk_widget_set_size_request( spin , 10, -1 ); + spin.dimensions(10, -1); gtk_widget_set_can_focus( spin, false ); } } @@ -924,35 +880,35 @@ ui::Window PatchInspector::BuildDialog(){ button.show(); hbox2.pack_end(button, TRUE, FALSE, 0); button.connect( "clicked", G_CALLBACK( OnBtnPatchAutoCap ), 0 ); - gtk_widget_set_size_request( button , 60, -1 ); + button.dimensions(60, -1); } { auto button = ui::Button( "CAP" ); button.show(); hbox2.pack_end(button, TRUE, FALSE, 0); button.connect( "clicked", G_CALLBACK( OnBtnPatchdetails ), 0 ); - gtk_widget_set_size_request( button , 60, -1 ); + button.dimensions(60, -1); } { auto button = ui::Button( "Set..." ); button.show(); hbox2.pack_end(button, TRUE, FALSE, 0); button.connect( "clicked", G_CALLBACK( OnBtnPatchreset ), 0 ); - gtk_widget_set_size_request( button , 60, -1 ); + button.dimensions(60, -1); } { auto button = ui::Button( "Natural" ); button.show(); hbox2.pack_end(button, TRUE, FALSE, 0); button.connect( "clicked", G_CALLBACK( OnBtnPatchnatural ), 0 ); - gtk_widget_set_size_request( button , 60, -1 ); + button.dimensions(60, -1); } { auto button = ui::Button( "Fit" ); button.show(); hbox2.pack_end(button, TRUE, FALSE, 0); button.connect( "clicked", G_CALLBACK( OnBtnPatchfit ), 0 ); - gtk_widget_set_size_request( button , 60, -1 ); + button.dimensions(60, -1); } } } @@ -1077,18 +1033,18 @@ void PatchInspector_SelectionChanged( const Selectable& selectable ){ void PatchInspector_Construct(){ - GlobalCommands_insert( "PatchInspector", FreeCaller(), Accelerator( 'S', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "PatchInspector", makeCallbackF(PatchInspector_toggleShown), Accelerator( 'S', (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalPreferenceSystem().registerPreference( "PatchWnd", WindowPositionTrackerImportStringCaller( g_PatchInspector.m_position_tracker ), WindowPositionTrackerExportStringCaller( g_PatchInspector.m_position_tracker ) ); - GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale1", FloatImportStringCaller( g_pi_globals.scale[0] ), FloatExportStringCaller( g_pi_globals.scale[0] ) ); - GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale2", FloatImportStringCaller( g_pi_globals.scale[1] ), FloatExportStringCaller( g_pi_globals.scale[1] ) ); - GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Shift1", FloatImportStringCaller( g_pi_globals.shift[0] ), FloatExportStringCaller( g_pi_globals.shift[0] ) ); - GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Shift2", FloatImportStringCaller( g_pi_globals.shift[1] ), FloatExportStringCaller( g_pi_globals.shift[1] ) ); - GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Rotate", FloatImportStringCaller( g_pi_globals.rotate ), FloatExportStringCaller( g_pi_globals.rotate ) ); + GlobalPreferenceSystem().registerPreference( "PatchWnd", make_property( g_PatchInspector.m_position_tracker ) ); + GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale1", make_property_string( g_pi_globals.scale[0] ) ); + GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale2", make_property_string( g_pi_globals.scale[1] ) ); + GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Shift1", make_property_string( g_pi_globals.shift[0] ) ); + GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Shift2", make_property_string( g_pi_globals.shift[1] ) ); + GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Rotate", make_property_string( g_pi_globals.rotate ) ); - typedef FreeCaller1 PatchInspectorSelectionChangedCaller; + typedef FreeCaller PatchInspectorSelectionChangedCaller; GlobalSelectionSystem().addSelectionChangeCallback( PatchInspectorSelectionChangedCaller() ); - typedef FreeCaller PatchInspectorQueueDrawCaller; + typedef FreeCaller PatchInspectorQueueDrawCaller; Patch_addTextureChangedCallback( PatchInspectorQueueDrawCaller() ); } void PatchInspector_Destroy(){