#include "prtview.h"
#include "portals.h"
-static void dialog_button_callback( GtkWidget *widget, gpointer data ){
- GtkWidget *parent;
- int *loop, *ret;
+static void dialog_button_callback(ui::Widget widget, gpointer data)
+{
+ int *loop, *ret;
- parent = gtk_widget_get_toplevel( widget );
- loop = (int*)g_object_get_data( G_OBJECT( parent ), "loop" );
- ret = (int*)g_object_get_data( G_OBJECT( parent ), "ret" );
+ auto parent = widget.window();
+ loop = (int *) g_object_get_data(G_OBJECT(parent), "loop");
+ ret = (int *) g_object_get_data(G_OBJECT(parent), "ret");
- *loop = 0;
- *ret = gpointer_to_int( data );
+ *loop = 0;
+ *ret = gpointer_to_int(data);
}
-static gint dialog_delete_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){
- int *loop;
-
- gtk_widget_hide( widget );
- loop = (int*)g_object_get_data( G_OBJECT( widget ), "loop" );
- *loop = 0;
-
- return TRUE;
+static gint dialog_delete_callback(ui::Widget widget, GdkEvent *event, gpointer data)
+{
+ widget.hide();
+ int *loop = (int *) g_object_get_data(G_OBJECT(widget), "loop");
+ *loop = 0;
+ return TRUE;
}
// =============================================================================
// Color selection dialog
-static int DoColor( PackedColour *c ){
- GtkWidget* dlg;
- GdkColor clr;
- int loop = 1, ret = IDCANCEL;
+static int DoColor(PackedColour *c)
+{
+ GdkColor clr;
+ int loop = 1, ret = IDCANCEL;
- clr.red = (guint16) (GetRValue(*c) * (65535 / 255));
- clr.blue = (guint16) (GetGValue(*c) * (65535 / 255));
- clr.green = (guint16) (GetBValue(*c) * (65535 / 255));
+ clr.red = (guint16) (GetRValue(*c) * (65535 / 255));
+ clr.blue = (guint16) (GetGValue(*c) * (65535 / 255));
+ clr.green = (guint16) (GetBValue(*c) * (65535 / 255));
- dlg = gtk_color_selection_dialog_new( "Choose Color" );
- gtk_color_selection_set_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dlg)) ), &clr );
- g_signal_connect( GTK_OBJECT( dlg ), "delete_event",
- G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( dlg ), "destroy",
- G_CALLBACK( gtk_widget_destroy ), NULL );
+ auto dlg = ui::Widget::from(gtk_color_selection_dialog_new("Choose Color"));
+ gtk_color_selection_set_current_color(
+ GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dlg))), &clr);
+ dlg.connect("delete_event", G_CALLBACK(dialog_delete_callback), NULL);
+ dlg.connect("destroy", G_CALLBACK(gtk_widget_destroy), NULL);
- GtkWidget *ok_button, *cancel_button;
- g_object_get(dlg, "ok-button", &ok_button, "cancel-button", &cancel_button, nullptr);
+ GtkWidget *ok_button, *cancel_button;
+ g_object_get(dlg, "ok-button", &ok_button, "cancel-button", &cancel_button, nullptr);
- g_signal_connect( GTK_OBJECT(ok_button), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
- g_signal_connect( GTK_OBJECT(cancel_button), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDCANCEL ) );
- g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
- g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
+ ui::Widget::from(ok_button).connect("clicked", G_CALLBACK(dialog_button_callback), GINT_TO_POINTER(IDOK));
+ ui::Widget::from(cancel_button).connect("clicked", G_CALLBACK(dialog_button_callback), GINT_TO_POINTER(IDCANCEL));
+ g_object_set_data(G_OBJECT(dlg), "loop", &loop);
+ g_object_set_data(G_OBJECT(dlg), "ret", &ret);
- gtk_widget_show( dlg );
- gtk_grab_add( dlg );
+ dlg.show();
+ gtk_grab_add(dlg);
- while ( loop )
- gtk_main_iteration();
+ while (loop) {
+ gtk_main_iteration();
+ }
- gtk_color_selection_get_current_color( GTK_COLOR_SELECTION( gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dlg)) ), &clr );
+ gtk_color_selection_get_current_color(
+ GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(GTK_COLOR_SELECTION_DIALOG(dlg))), &clr);
- gtk_grab_remove( dlg );
- gtk_widget_destroy( dlg );
+ gtk_grab_remove(dlg);
+ dlg.destroy();
- if ( ret == IDOK ) {
- *c = RGB( clr.red / (65535 / 255), clr.green / (65535 / 255), clr.blue / (65535 / 255));
- }
+ if (ret == IDOK) {
+ *c = RGB(clr.red / (65535 / 255), clr.green / (65535 / 255), clr.blue / (65535 / 255));
+ }
- return ret;
+ return ret;
}
-static void Set2DText( GtkWidget* label ){
- char s[40];
+static void Set2DText(ui::Widget label)
+{
+ char s[40];
- sprintf( s, "Line Width = %6.3f", portals.width_2d * 0.5f );
+ sprintf(s, "Line Width = %6.3f", portals.width_2d * 0.5f);
- gtk_label_set_text( GTK_LABEL( label ), s );
+ gtk_label_set_text(GTK_LABEL(label), s);
}
-static void Set3DText( GtkWidget* label ){
- char s[40];
+static void Set3DText(ui::Widget label)
+{
+ char s[40];
- sprintf( s, "Line Width = %6.3f", portals.width_3d * 0.5f );
+ sprintf(s, "Line Width = %6.3f", portals.width_3d * 0.5f);
- gtk_label_set_text( GTK_LABEL( label ), s );
+ gtk_label_set_text(GTK_LABEL(label), s);
}
-static void Set3DTransText( GtkWidget* label ){
- char s[40];
+static void Set3DTransText(ui::Widget label)
+{
+ char s[40];
- sprintf( s, "Polygon transparency = %d%%", (int)portals.trans_3d );
+ sprintf(s, "Polygon transparency = %d%%", (int) portals.trans_3d);
- gtk_label_set_text( GTK_LABEL( label ), s );
+ gtk_label_set_text(GTK_LABEL(label), s);
}
-static void SetClipText( GtkWidget* label ){
- char s[40];
+static void SetClipText(ui::Widget label)
+{
+ char s[40];
- sprintf( s, "Cubic clip range = %d", (int)portals.clip_range * 64 );
+ sprintf(s, "Cubic clip range = %d", (int) portals.clip_range * 64);
- gtk_label_set_text( GTK_LABEL( label ), s );
+ gtk_label_set_text(GTK_LABEL(label), s);
}
-static void OnScroll2d( GtkAdjustment *adj, gpointer data ){
- portals.width_2d = static_cast<float>( gtk_adjustment_get_value(adj) );
- Set2DText( GTK_WIDGET( data ) );
+static void OnScroll2d(ui::Adjustment adj, gpointer data)
+{
+ portals.width_2d = static_cast<float>( gtk_adjustment_get_value(adj));
+ Set2DText(ui::Widget::from(data));
- Portals_shadersChanged();
- SceneChangeNotify();
+ Portals_shadersChanged();
+ SceneChangeNotify();
}
-static void OnScroll3d( GtkAdjustment *adj, gpointer data ){
- portals.width_3d = static_cast<float>( gtk_adjustment_get_value(adj) );
- Set3DText( GTK_WIDGET( data ) );
+static void OnScroll3d(ui::Adjustment adj, gpointer data)
+{
+ portals.width_3d = static_cast<float>( gtk_adjustment_get_value(adj));
+ Set3DText(ui::Widget::from(data));
- SceneChangeNotify();
+ SceneChangeNotify();
}
-static void OnScrollTrans( GtkAdjustment *adj, gpointer data ){
- portals.trans_3d = static_cast<float>( gtk_adjustment_get_value(adj) );
- Set3DTransText( GTK_WIDGET( data ) );
+static void OnScrollTrans(ui::Adjustment adj, gpointer data)
+{
+ portals.trans_3d = static_cast<float>( gtk_adjustment_get_value(adj));
+ Set3DTransText(ui::Widget::from(data));
- SceneChangeNotify();
+ SceneChangeNotify();
}
-static void OnScrollClip( GtkAdjustment *adj, gpointer data ){
- portals.clip_range = static_cast<float>( gtk_adjustment_get_value(adj) );
- SetClipText( GTK_WIDGET( data ) );
+static void OnScrollClip(ui::Adjustment adj, gpointer data)
+{
+ portals.clip_range = static_cast<float>( gtk_adjustment_get_value(adj));
+ SetClipText(ui::Widget::from(data));
- SceneChangeNotify();
+ SceneChangeNotify();
}
-static void OnAntiAlias2d( GtkWidget *widget, gpointer data ){
- portals.aa_2d = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) ) ? true : false;
+static void OnAntiAlias2d(ui::Widget widget, gpointer data)
+{
+ portals.aa_2d = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ? true : false;
- Portals_shadersChanged();
+ Portals_shadersChanged();
- SceneChangeNotify();
+ SceneChangeNotify();
}
-static void OnConfig2d( GtkWidget *widget, gpointer data ){
- portals.show_2d = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) ) ? true : false;
+static void OnConfig2d(ui::Widget widget, gpointer data)
+{
+ portals.show_2d = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ? true : false;
- SceneChangeNotify();
+ SceneChangeNotify();
}
-static void OnColor2d( GtkWidget *widget, gpointer data ){
- if ( DoColor( &portals.color_2d ) == IDOK ) {
- Portals_shadersChanged();
+static void OnColor2d(ui::Widget widget, gpointer data)
+{
+ if (DoColor(&portals.color_2d) == IDOK) {
+ Portals_shadersChanged();
- SceneChangeNotify();
- }
+ SceneChangeNotify();
+ }
}
-static void OnConfig3d( GtkWidget *widget, gpointer data ){
- portals.show_3d = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) ) ? true : false;
+static void OnConfig3d(ui::Widget widget, gpointer data)
+{
+ portals.show_3d = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ? true : false;
- SceneChangeNotify();
+ SceneChangeNotify();
}
-static void OnAntiAlias3d( GtkWidget *widget, gpointer data ){
- portals.aa_3d = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) ) ? true : false;
+static void OnAntiAlias3d(ui::Widget widget, gpointer data)
+{
+ portals.aa_3d = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ? true : false;
- Portals_shadersChanged();
- SceneChangeNotify();
+ Portals_shadersChanged();
+ SceneChangeNotify();
}
-static void OnColor3d( GtkWidget *widget, gpointer data ){
- if ( DoColor( &portals.color_3d ) == IDOK ) {
- Portals_shadersChanged();
+static void OnColor3d(ui::Widget widget, gpointer data)
+{
+ if (DoColor(&portals.color_3d) == IDOK) {
+ Portals_shadersChanged();
- SceneChangeNotify();
- }
+ SceneChangeNotify();
+ }
}
-static void OnColorFog( GtkWidget *widget, gpointer data ){
- if ( DoColor( &portals.color_fog ) == IDOK ) {
- Portals_shadersChanged();
+static void OnColorFog(ui::Widget widget, gpointer data)
+{
+ if (DoColor(&portals.color_fog) == IDOK) {
+ Portals_shadersChanged();
- SceneChangeNotify();
- }
+ SceneChangeNotify();
+ }
}
-static void OnFog( GtkWidget *widget, gpointer data ){
- portals.fog = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) ) ? true : false;
+static void OnFog(ui::Widget widget, gpointer data)
+{
+ portals.fog = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ? true : false;
- Portals_shadersChanged();
- SceneChangeNotify();
+ Portals_shadersChanged();
+ SceneChangeNotify();
}
-static void OnSelchangeZbuffer( GtkWidget *widget, gpointer data ){
- portals.zbuffer = gpointer_to_int( data );
+static void OnSelchangeZbuffer(ui::Widget widget, gpointer data)
+{
+ portals.zbuffer = gpointer_to_int(data);
- Portals_shadersChanged();
- SceneChangeNotify();
+ Portals_shadersChanged();
+ SceneChangeNotify();
}
-static void OnPoly( GtkWidget *widget, gpointer data ){
- portals.polygons = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) );
+static void OnPoly(ui::Widget widget, gpointer data)
+{
+ portals.polygons = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- SceneChangeNotify();
+ SceneChangeNotify();
}
-static void OnLines( GtkWidget *widget, gpointer data ){
- portals.lines = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) );
+static void OnLines(ui::Widget widget, gpointer data)
+{
+ portals.lines = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
- SceneChangeNotify();
+ SceneChangeNotify();
}
-static void OnClip( GtkWidget *widget, gpointer data ){
- portals.clip = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( widget ) ) ? true : false;
+static void OnClip(ui::Widget widget, gpointer data)
+{
+ portals.clip = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)) ? true : false;
- SceneChangeNotify();
+ SceneChangeNotify();
}
-void DoConfigDialog(){
- GtkWidget *dlg, *hbox, *vbox, *vbox2, *button, *table, *frame;
- GtkWidget *lw3slider, *lw3label, *lw2slider, *lw2label, *item;
- GtkWidget *aa2check, *aa3check, *depthcheck, *linescheck, *polyscheck;
- GtkWidget *transslider, *translabel, *clipslider, *cliplabel;
- GtkWidget *show2check, *show3check, *portalcheck;
- int loop = 1, ret = IDCANCEL;
-
- dlg = ui::Window( ui::window_type::TOP );
- gtk_window_set_title( GTK_WINDOW( dlg ), "Portal Viewer Configuration" );
- g_signal_connect( GTK_OBJECT( dlg ), "delete_event",
- G_CALLBACK( dialog_delete_callback ), NULL );
- g_signal_connect( GTK_OBJECT( dlg ), "destroy",
- G_CALLBACK( gtk_widget_destroy ), NULL );
- g_object_set_data( G_OBJECT( dlg ), "loop", &loop );
- g_object_set_data( G_OBJECT( dlg ), "ret", &ret );
-
- vbox = ui::VBox( FALSE, 5 );
- gtk_widget_show( vbox );
- gtk_container_add( GTK_CONTAINER( dlg ), vbox );
- gtk_container_set_border_width( GTK_CONTAINER( vbox ), 5 );
-
- frame = ui::Frame( "3D View" );
- gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
-
- vbox2 = ui::VBox( FALSE, 5 );
- gtk_widget_show( vbox2 );
- gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
- gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
-
- hbox = ui::HBox( FALSE, 5 );
- gtk_widget_show( hbox );
- gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, TRUE, 0 );
-
- auto adj = ui::Adjustment( portals.width_3d, 2, 40, 1, 1, 0 );
- lw3slider = ui::HScale( adj );
- gtk_widget_show( lw3slider );
- gtk_box_pack_start( GTK_BOX( hbox ), lw3slider, TRUE, TRUE, 0 );
- gtk_scale_set_draw_value( GTK_SCALE( lw3slider ), FALSE );
-
- lw3label = ui::Label( "" );
- gtk_widget_show( lw3label );
- gtk_box_pack_start( GTK_BOX( hbox ), lw3label, FALSE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT(adj), "value_changed", G_CALLBACK( OnScroll3d ), lw3label );
-
- table = ui::Table( 2, 4, FALSE );
- gtk_widget_show( table );
- gtk_box_pack_start( GTK_BOX( vbox2 ), table, TRUE, TRUE, 0 );
- gtk_table_set_row_spacings( GTK_TABLE( table ), 5 );
- gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
-
- button = ui::Button( "Color" );
- gtk_widget_show( button );
- gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 0, 1,
- (GtkAttachOptions) ( GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- g_signal_connect( GTK_OBJECT( button ), "clicked", G_CALLBACK( OnColor3d ), NULL );
-
- button = ui::Button( "Depth Color" );
- gtk_widget_show( button );
- gtk_table_attach( GTK_TABLE( table ), button, 0, 1, 1, 2,
- (GtkAttachOptions) ( GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- g_signal_connect( GTK_OBJECT( button ), "clicked", G_CALLBACK( OnColorFog ), NULL );
-
- aa3check = ui::CheckButton( "Anti-Alias (May not work on some video cards)" );
- gtk_widget_show( aa3check );
- gtk_table_attach( GTK_TABLE( table ), aa3check, 1, 4, 0, 1,
- (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- g_signal_connect( GTK_OBJECT( aa3check ), "toggled", G_CALLBACK( OnAntiAlias3d ), NULL );
-
- depthcheck = ui::CheckButton( "Depth Cue" );
- gtk_widget_show( depthcheck );
- gtk_table_attach( GTK_TABLE( table ), depthcheck, 1, 2, 1, 2,
- (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- g_signal_connect( GTK_OBJECT( depthcheck ), "toggled", G_CALLBACK( OnFog ), NULL );
-
- linescheck = ui::CheckButton( "Lines" );
- gtk_widget_show( linescheck );
- gtk_table_attach( GTK_TABLE( table ), linescheck, 2, 3, 1, 2,
- (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- g_signal_connect( GTK_OBJECT( linescheck ), "toggled", G_CALLBACK( OnLines ), NULL );
-
- polyscheck = ui::CheckButton( "Polygons" );
- gtk_widget_show( polyscheck );
- gtk_table_attach( GTK_TABLE( table ), polyscheck, 3, 4, 1, 2,
- (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- g_signal_connect( GTK_OBJECT( polyscheck ), "toggled", G_CALLBACK( OnPoly ), NULL );
-
- auto zlist = ui::ComboBoxText();
- gtk_widget_show( zlist );
- gtk_box_pack_start( GTK_BOX( vbox2 ), zlist, TRUE, FALSE, 0 );
-
- gtk_combo_box_text_append_text(zlist, "Z-Buffer Test and Write (recommended for solid or no polygons)");
- gtk_combo_box_text_append_text(zlist, "Z-Buffer Test Only (recommended for transparent polygons)");
- gtk_combo_box_text_append_text(zlist, "Z-Buffer Off");
-
- g_signal_connect(G_OBJECT(zlist), "changed", G_CALLBACK(+[](GtkComboBox *self, void *) {
- OnSelchangeZbuffer(GTK_WIDGET(self), GINT_TO_POINTER(gtk_combo_box_get_active(self)));
- }), nullptr);
-
- table = ui::Table( 2, 2, FALSE );
- gtk_widget_show( table );
- gtk_box_pack_start( GTK_BOX( vbox2 ), table, TRUE, TRUE, 0 );
- gtk_table_set_row_spacings( GTK_TABLE( table ), 5 );
- gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
-
- adj = ui::Adjustment( portals.trans_3d, 0, 100, 1, 1, 0 );
- transslider = ui::HScale( adj );
- gtk_widget_show( transslider );
- gtk_table_attach( GTK_TABLE( table ), transslider, 0, 1, 0, 1,
- (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- gtk_scale_set_draw_value( GTK_SCALE( transslider ), FALSE );
-
- translabel = ui::Label( "" );
- gtk_widget_show( translabel );
- gtk_table_attach( GTK_TABLE( table ), translabel, 1, 2, 0, 1,
- (GtkAttachOptions) ( GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- gtk_misc_set_alignment( GTK_MISC( translabel ), 0.0, 0.0 );
- g_signal_connect( GTK_OBJECT(adj), "value_changed", G_CALLBACK( OnScrollTrans ), translabel );
-
- adj = ui::Adjustment( portals.clip_range, 1, 128, 1, 1, 0 );
- clipslider = ui::HScale( adj );
- gtk_widget_show( clipslider );
- gtk_table_attach( GTK_TABLE( table ), clipslider, 0, 1, 1, 2,
- (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- gtk_scale_set_draw_value( GTK_SCALE( clipslider ), FALSE );
-
- cliplabel = ui::Label( "" );
- gtk_widget_show( cliplabel );
- gtk_table_attach( GTK_TABLE( table ), cliplabel, 1, 2, 1, 2,
- (GtkAttachOptions) ( GTK_FILL ),
- (GtkAttachOptions) ( 0 ), 0, 0 );
- gtk_misc_set_alignment( GTK_MISC( cliplabel ), 0.0, 0.0 );
- g_signal_connect( GTK_OBJECT(adj), "value_changed", G_CALLBACK( OnScrollClip ), cliplabel );
-
- hbox = ui::HBox( TRUE, 5 );
- gtk_widget_show( hbox );
- gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, FALSE, 0 );
-
- show3check = ui::CheckButton( "Show" );
- gtk_widget_show( show3check );
- gtk_box_pack_start( GTK_BOX( hbox ), show3check, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( show3check ), "toggled", G_CALLBACK( OnConfig3d ), NULL );
-
- portalcheck = ui::CheckButton( "Portal cubic clipper" );
- gtk_widget_show( portalcheck );
- gtk_box_pack_start( GTK_BOX( hbox ), portalcheck, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( portalcheck ), "toggled", G_CALLBACK( OnClip ), NULL );
-
- frame = ui::Frame( "2D View" );
- gtk_widget_show( frame );
- gtk_box_pack_start( GTK_BOX( vbox ), frame, TRUE, TRUE, 0 );
-
- vbox2 = ui::VBox( FALSE, 5 );
- gtk_widget_show( vbox2 );
- gtk_container_add( GTK_CONTAINER( frame ), vbox2 );
- gtk_container_set_border_width( GTK_CONTAINER( vbox2 ), 5 );
-
- hbox = ui::HBox( FALSE, 5 );
- gtk_widget_show( hbox );
- gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, FALSE, 0 );
-
- adj = ui::Adjustment( portals.width_2d, 2, 40, 1, 1, 0 );
- lw2slider = ui::HScale( adj );
- gtk_widget_show( lw2slider );
- gtk_box_pack_start( GTK_BOX( hbox ), lw2slider, TRUE, TRUE, 0 );
- gtk_scale_set_draw_value( GTK_SCALE( lw2slider ), FALSE );
-
- lw2label = ui::Label( "" );
- gtk_widget_show( lw2label );
- gtk_box_pack_start( GTK_BOX( hbox ), lw2label, FALSE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT(adj), "value_changed", G_CALLBACK( OnScroll2d ), lw2label );
-
- hbox = ui::HBox( FALSE, 5 );
- gtk_widget_show( hbox );
- gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, FALSE, 0 );
-
- button = ui::Button( "Color" );
- gtk_widget_show( button );
- gtk_box_pack_start( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
- g_signal_connect( GTK_OBJECT( button ), "clicked", G_CALLBACK( OnColor2d ), NULL );
- gtk_widget_set_size_request( button, 60, -1 );
-
- aa2check = ui::CheckButton( "Anti-Alias (May not work on some video cards)" );
- gtk_widget_show( aa2check );
- gtk_box_pack_start( GTK_BOX( hbox ), aa2check, TRUE, TRUE, 0 );
- g_signal_connect( GTK_OBJECT( aa2check ), "toggled", G_CALLBACK( OnAntiAlias2d ), NULL );
-
- hbox = ui::HBox( FALSE, 5 );
- gtk_widget_show( hbox );
- gtk_box_pack_start( GTK_BOX( vbox2 ), hbox, TRUE, FALSE, 0 );
-
- show2check = ui::CheckButton( "Show" );
- gtk_widget_show( show2check );
- gtk_box_pack_start( GTK_BOX( hbox ), show2check, FALSE, FALSE, 0 );
- g_signal_connect( GTK_OBJECT( show2check ), "toggled", G_CALLBACK( OnConfig2d ), NULL );
-
- hbox = ui::HBox( FALSE, 5 );
- gtk_widget_show( hbox );
- gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 0 );
-
- button = ui::Button( "OK" );
- gtk_widget_show( button );
- gtk_box_pack_end( GTK_BOX( hbox ), button, FALSE, FALSE, 0 );
- g_signal_connect( GTK_OBJECT( button ), "clicked",
- G_CALLBACK( dialog_button_callback ), GINT_TO_POINTER( IDOK ) );
- gtk_widget_set_size_request( button, 60, -1 );
-
- // initialize dialog
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( show2check ), portals.show_2d );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( aa2check ), portals.aa_2d );
- Set2DText( lw2label );
-
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( show3check ), portals.show_3d );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( depthcheck ), portals.fog );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( polyscheck ), portals.polygons );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( linescheck ), portals.lines );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( aa3check ), portals.aa_3d );
- gtk_combo_box_set_active(zlist, portals.zbuffer);
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( portalcheck ), portals.clip );
-
- Set3DText( lw3label );
- Set3DTransText( translabel );
- SetClipText( cliplabel );
-
- gtk_grab_add( dlg );
- gtk_widget_show( dlg );
-
- while ( loop )
- gtk_main_iteration();
-
- gtk_grab_remove( dlg );
- gtk_widget_destroy( dlg );
+void DoConfigDialog()
+{
+ int loop = 1, ret = IDCANCEL;
+
+ auto dlg = ui::Window(ui::window_type::TOP);
+ gtk_window_set_title(dlg, "Portal Viewer Configuration");
+ dlg.connect("delete_event",
+ G_CALLBACK(dialog_delete_callback), NULL);
+ dlg.connect("destroy",
+ G_CALLBACK(gtk_widget_destroy), NULL);
+ g_object_set_data(G_OBJECT(dlg), "loop", &loop);
+ g_object_set_data(G_OBJECT(dlg), "ret", &ret);
+
+ auto vbox = ui::VBox(FALSE, 5);
+ vbox.show();
+ dlg.add(vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 5);
+
+ auto frame = ui::Frame("3D View");
+ frame.show();
+ vbox.pack_start(frame, TRUE, TRUE, 0);
+
+ auto vbox2 = ui::VBox(FALSE, 5);
+ vbox2.show();
+ frame.add(vbox2);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox2), 5);
+
+ auto hbox = ui::HBox(FALSE, 5);
+ hbox.show();
+ vbox2.pack_start(hbox, TRUE, TRUE, 0);
+
+ auto adj = ui::Adjustment(portals.width_3d, 2, 40, 1, 1, 0);
+ auto lw3slider = ui::HScale(adj);
+ lw3slider.show();
+ hbox.pack_start(lw3slider, TRUE, TRUE, 0);
+ gtk_scale_set_draw_value(GTK_SCALE(lw3slider), FALSE);
+
+ auto lw3label = ui::Label("");
+ lw3label.show();
+ hbox.pack_start(lw3label, FALSE, TRUE, 0);
+ adj.connect("value_changed", G_CALLBACK(OnScroll3d), lw3label);
+
+ auto table = ui::Table(2, 4, FALSE);
+ table.show();
+ vbox2.pack_start(table, TRUE, TRUE, 0);
+ gtk_table_set_row_spacings(table, 5);
+ gtk_table_set_col_spacings(table, 5);
+
+ auto button = ui::Button("Color");
+ button.show();
+ table.attach(button, {0, 1, 0, 1}, {GTK_FILL, 0});
+ button.connect("clicked", G_CALLBACK(OnColor3d), NULL);
+
+ button = ui::Button("Depth Color");
+ button.show();
+ table.attach(button, {0, 1, 1, 2}, {GTK_FILL, 0});
+ button.connect("clicked", G_CALLBACK(OnColorFog), NULL);
+
+ auto aa3check = ui::CheckButton("Anti-Alias (May not work on some video cards)");
+ aa3check.show();
+ table.attach(aa3check, {1, 4, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
+ aa3check.connect("toggled", G_CALLBACK(OnAntiAlias3d), NULL);
+
+ auto depthcheck = ui::CheckButton("Depth Cue");
+ depthcheck.show();
+ table.attach(depthcheck, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
+ depthcheck.connect("toggled", G_CALLBACK(OnFog), NULL);
+
+ auto linescheck = ui::CheckButton("Lines");
+ linescheck.show();
+ table.attach(linescheck, {2, 3, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
+ linescheck.connect("toggled", G_CALLBACK(OnLines), NULL);
+
+ auto polyscheck = ui::CheckButton("Polygons");
+ polyscheck.show();
+ table.attach(polyscheck, {3, 4, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
+ polyscheck.connect("toggled", G_CALLBACK(OnPoly), NULL);
+
+ auto zlist = ui::ComboBoxText(ui::New);
+ zlist.show();
+ vbox2.pack_start(zlist, TRUE, FALSE, 0);
+
+ gtk_combo_box_text_append_text(zlist, "Z-Buffer Test and Write (recommended for solid or no polygons)");
+ gtk_combo_box_text_append_text(zlist, "Z-Buffer Test Only (recommended for transparent polygons)");
+ gtk_combo_box_text_append_text(zlist, "Z-Buffer Off");
+
+ zlist.connect("changed", G_CALLBACK(+[](ui::ComboBox self, void *) {
+ OnSelchangeZbuffer(self, GINT_TO_POINTER(gtk_combo_box_get_active(self)));
+ }), nullptr);
+
+ table = ui::Table(2, 2, FALSE);
+ table.show();
+ vbox2.pack_start(table, TRUE, TRUE, 0);
+ gtk_table_set_row_spacings(table, 5);
+ gtk_table_set_col_spacings(table, 5);
+
+ adj = ui::Adjustment(portals.trans_3d, 0, 100, 1, 1, 0);
+ auto transslider = ui::HScale(adj);
+ transslider.show();
+ table.attach(transslider, {0, 1, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
+ gtk_scale_set_draw_value(GTK_SCALE(transslider), FALSE);
+
+ auto translabel = ui::Label("");
+ translabel.show();
+ table.attach(translabel, {1, 2, 0, 1}, {GTK_FILL, 0});
+ gtk_misc_set_alignment(GTK_MISC(translabel), 0.0, 0.0);
+ adj.connect("value_changed", G_CALLBACK(OnScrollTrans), translabel);
+
+ adj = ui::Adjustment(portals.clip_range, 1, 128, 1, 1, 0);
+ auto clipslider = ui::HScale(adj);
+ clipslider.show();
+ table.attach(clipslider, {0, 1, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
+ gtk_scale_set_draw_value(GTK_SCALE(clipslider), FALSE);
+
+ auto cliplabel = ui::Label("");
+ cliplabel.show();
+ table.attach(cliplabel, {1, 2, 1, 2}, {GTK_FILL, 0});
+ gtk_misc_set_alignment(GTK_MISC(cliplabel), 0.0, 0.0);
+ adj.connect("value_changed", G_CALLBACK(OnScrollClip), cliplabel);
+
+ hbox = ui::HBox(TRUE, 5);
+ hbox.show();
+ vbox2.pack_start(hbox, TRUE, FALSE, 0);
+
+ auto show3check = ui::CheckButton("Show");
+ show3check.show();
+ hbox.pack_start(show3check, TRUE, TRUE, 0);
+ show3check.connect("toggled", G_CALLBACK(OnConfig3d), NULL);
+
+ auto portalcheck = ui::CheckButton("Portal cubic clipper");
+ portalcheck.show();
+ hbox.pack_start(portalcheck, TRUE, TRUE, 0);
+ portalcheck.connect("toggled", G_CALLBACK(OnClip), NULL);
+
+ frame = ui::Frame("2D View");
+ frame.show();
+ vbox.pack_start(frame, TRUE, TRUE, 0);
+
+ vbox2 = ui::VBox(FALSE, 5);
+ vbox2.show();
+ frame.add(vbox2);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox2), 5);
+
+ hbox = ui::HBox(FALSE, 5);
+ hbox.show();
+ vbox2.pack_start(hbox, TRUE, FALSE, 0);
+
+ adj = ui::Adjustment(portals.width_2d, 2, 40, 1, 1, 0);
+ auto lw2slider = ui::HScale(adj);
+ lw2slider.show();
+ hbox.pack_start(lw2slider, TRUE, TRUE, 0);
+ gtk_scale_set_draw_value(GTK_SCALE(lw2slider), FALSE);
+
+ auto lw2label = ui::Label("");
+ lw2label.show();
+ hbox.pack_start(lw2label, FALSE, TRUE, 0);
+ adj.connect("value_changed", G_CALLBACK(OnScroll2d), lw2label);
+
+ hbox = ui::HBox(FALSE, 5);
+ hbox.show();
+ vbox2.pack_start(hbox, TRUE, FALSE, 0);
+
+ button = ui::Button("Color");
+ button.show();
+ hbox.pack_start(button, FALSE, FALSE, 0);
+ button.connect("clicked", G_CALLBACK(OnColor2d), NULL);
+ button.dimensions(60, -1);
+
+ auto aa2check = ui::CheckButton("Anti-Alias (May not work on some video cards)");
+ aa2check.show();
+ hbox.pack_start(aa2check, TRUE, TRUE, 0);
+ aa2check.connect("toggled", G_CALLBACK(OnAntiAlias2d), NULL);
+
+ hbox = ui::HBox(FALSE, 5);
+ hbox.show();
+ vbox2.pack_start(hbox, TRUE, FALSE, 0);
+
+ auto show2check = ui::CheckButton("Show");
+ show2check.show();
+ hbox.pack_start(show2check, FALSE, FALSE, 0);
+ show2check.connect("toggled", G_CALLBACK(OnConfig2d), NULL);
+
+ hbox = ui::HBox(FALSE, 5);
+ hbox.show();
+ vbox.pack_start(hbox, FALSE, FALSE, 0);
+
+ button = ui::Button("OK");
+ button.show();
+ hbox.pack_end(button, FALSE, FALSE, 0);
+ button.connect("clicked",
+ G_CALLBACK(dialog_button_callback), GINT_TO_POINTER(IDOK));
+ button.dimensions(60, -1);
+
+ // initialize dialog
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(show2check), portals.show_2d);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(aa2check), portals.aa_2d);
+ Set2DText(lw2label);
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(show3check), portals.show_3d);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(depthcheck), portals.fog);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(polyscheck), portals.polygons);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linescheck), portals.lines);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(aa3check), portals.aa_3d);
+ gtk_combo_box_set_active(zlist, portals.zbuffer);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(portalcheck), portals.clip);
+
+ Set3DText(lw3label);
+ Set3DTransText(translabel);
+ SetClipText(cliplabel);
+
+ gtk_grab_add(dlg);
+ dlg.show();
+
+ while (loop) {
+ gtk_main_iteration();
+ }
+
+ gtk_grab_remove(dlg);
+ dlg.destroy();
}
projects / xonotic / netradiant.git / blobdiff