X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ffeedback.cpp;h=00b0023f7b81f94f25b56737d5007a599a2ad443;hb=eea3f4bae51f51279d899c8c0ad5b6342cbd8ae6;hp=978f8f6f9f4147d538f9de6ed8cfed1b8eacf9df;hpb=830125fad042fad35dc029b6eb57c8156ad7e176;p=xonotic%2Fnetradiant.git diff --git a/radiant/feedback.cpp b/radiant/feedback.cpp index 978f8f6f..00b0023f 100644 --- a/radiant/feedback.cpp +++ b/radiant/feedback.cpp @@ -1,5 +1,5 @@ /* - Copyright (C) 1999-2007 id Software, Inc. and contributors. + Copyright (C) 1999-2006 Id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. This file is part of GtkRadiant. @@ -25,318 +25,310 @@ // classes used for describing geometry information from q3map feedback // -#include "stdafx.h" - #include "feedback.h" -#include "glib.h" -#include + +#include + +#include "debugging/debugging.h" + +#include "igl.h" +#include "iselection.h" + +#include "map.h" +#include "dialog.h" +#include "mainframe.h" + CDbgDlg g_DbgDlg; -void CSelectMsg::saxStartElement( message_info_t *ctx, const xmlChar *name, const xmlChar **attrs ){ - if ( strcmp( (char *)name, "select" ) == 0 ) { - // read the message - ESelectState = SELECT_MESSAGE; - } - else - { - // read the brush - assert( strcmp( (char *)name, "brush" ) == 0 ); - assert( ESelectState == SELECT_MESSAGE ); - ESelectState = SELECT_BRUSH; - } +void Feedback_draw2D(VIEWTYPE viewType) +{ + g_DbgDlg.draw2D(viewType); } -void CSelectMsg::saxEndElement( message_info_t *ctx, const xmlChar *name ){ - if ( strcmp( (char *)name, "select" ) == 0 ) { - ctx->bGeometry = false; - } +void CSelectMsg::saxStartElement(message_info_t *ctx, const xmlChar *name, const xmlChar **attrs) +{ + if (string_equal(reinterpret_cast( name ), "select")) { + // read the message + ESelectState = SELECT_MESSAGE; + } else { + // read the brush + ASSERT_MESSAGE(string_equal(reinterpret_cast( name ), "brush"), "FEEDBACK PARSE ERROR"); + ASSERT_MESSAGE(ESelectState == SELECT_MESSAGE, "FEEDBACK PARSE ERROR"); + ESelectState = SELECT_BRUSH; + globalOutputStream() << message.c_str() << '\n'; + } } -void CSelectMsg::saxCharacters( message_info_t *ctx, const xmlChar *ch, int len ){ - if ( ESelectState == SELECT_MESSAGE ) { - message = g_string_sized_new( len + 1 ); - memcpy( message->str, ch, len ); - message->str[len] = '\0'; - Sys_Printf( "%s\n", message->str ); - } - else - { - assert( ESelectState == SELECT_BRUSH ); - sscanf( (char *)ch, "%i %i", &entitynum, &brushnum ); - } +void CSelectMsg::saxEndElement(message_info_t *ctx, const xmlChar *name) +{ + if (string_equal(reinterpret_cast( name ), "select")) { + } } -void CSelectMsg::Highlight(){ - Select_Deselect(); - SelectBrush( entitynum, brushnum ); +void CSelectMsg::saxCharacters(message_info_t *ctx, const xmlChar *ch, int len) +{ + if (ESelectState == SELECT_MESSAGE) { + message.write(reinterpret_cast( ch ), len); + } else { + brush.write(reinterpret_cast( ch ), len); + } } -void CPointMsg::saxStartElement( message_info_t *ctx, const xmlChar *name, const xmlChar **attrs ){ - if ( strcmp( (char *)name, "pointmsg" ) == 0 ) { - // read the message - EPointState = POINT_MESSAGE; - } - else - { - // read the brush - assert( strcmp( (char *)name, "point" ) == 0 ); - assert( EPointState == POINT_MESSAGE ); - EPointState = POINT_POINT; - } +IGL2DWindow *CSelectMsg::Highlight() +{ + GlobalSelectionSystem().setSelectedAll(false); + int entitynum, brushnum; + if (sscanf(reinterpret_cast( brush.c_str()), "%i %i", &entitynum, &brushnum) == 2) { + SelectBrush(entitynum, brushnum); + } + return 0; } -void CPointMsg::saxEndElement( message_info_t *ctx, const xmlChar *name ){ - if ( strcmp( (char *)name, "pointmsg" ) == 0 ) { - ctx->bGeometry = false; - } +void CPointMsg::saxStartElement(message_info_t *ctx, const xmlChar *name, const xmlChar **attrs) +{ + if (string_equal(reinterpret_cast( name ), "pointmsg")) { + // read the message + EPointState = POINT_MESSAGE; + } else { + // read the brush + ASSERT_MESSAGE(string_equal(reinterpret_cast( name ), "point"), "FEEDBACK PARSE ERROR"); + ASSERT_MESSAGE(EPointState == POINT_MESSAGE, "FEEDBACK PARSE ERROR"); + EPointState = POINT_POINT; + globalOutputStream() << message.c_str() << '\n'; + } } -void CPointMsg::saxCharacters( message_info_t *ctx, const xmlChar *ch, int len ){ - if ( EPointState == POINT_MESSAGE ) { - message = g_string_sized_new( len + 1 ); - memcpy( message->str, ch, len ); - message->str[len] = '\0'; - Sys_Printf( "%s\n", message->str ); - } - else - { - assert( EPointState == POINT_POINT ); - sscanf( (char *)ch, "%g %g %g", &( pt[0] ), &( pt[1] ), &( pt[2] ) ); - } +void CPointMsg::saxEndElement(message_info_t *ctx, const xmlChar *name) +{ + if (string_equal(reinterpret_cast( name ), "pointmsg")) { + } else if (string_equal(reinterpret_cast( name ), "point")) { + sscanf(point.c_str(), "%g %g %g", &(pt[0]), &(pt[1]), &(pt[2])); + point.clear(); + } } -void CPointMsg::Highlight(){ - // use the entity API to push a point - // the API requires a ref count, we do it manually for the current instance - if ( refCount == 0 ) { - refCount++; - QERApp_HookGL2DWindow( this ); - } +void CPointMsg::saxCharacters(message_info_t *ctx, const xmlChar *ch, int len) +{ + if (EPointState == POINT_MESSAGE) { + message.write(reinterpret_cast( ch ), len); + } else { + ASSERT_MESSAGE(EPointState == POINT_POINT, "FEEDBACK PARSE ERROR"); + point.write(reinterpret_cast( ch ), len); + } } -void CPointMsg::DropHighlight(){ - assert( refCount > 0 ); - QERApp_UnHookGL2DWindow( this ); - // do a refCount-- locally (see Highlight) - refCount--; +IGL2DWindow *CPointMsg::Highlight() +{ + return this; } -void CPointMsg::Draw2D( VIEWTYPE vt ){ - int nDim1 = ( vt == YZ ) ? 1 : 0; - int nDim2 = ( vt == XY ) ? 1 : 2; - qglPointSize( 4 ); - qglColor3f( 1.0f,0.0f,0.0f ); - qglBegin( GL_POINTS ); - qglVertex2f( pt[nDim1], pt[nDim2] ); - qglEnd(); - qglBegin( GL_LINE_LOOP ); - qglVertex2f( pt[nDim1] - 8, pt[nDim2] - 8 ); - qglVertex2f( pt[nDim1] + 8, pt[nDim2] - 8 ); - qglVertex2f( pt[nDim1] + 8, pt[nDim2] + 8 ); - qglVertex2f( pt[nDim1] - 8, pt[nDim2] + 8 ); - qglEnd(); +void CPointMsg::DropHighlight() +{ } -void CWindingMsg::saxStartElement( message_info_t *ctx, const xmlChar *name, const xmlChar **attrs ){ - if ( strcmp( (char *)name, "windingmsg" ) == 0 ) { - // read the message - EPointState = WINDING_MESSAGE; - } - else - { - // read the brush - assert( strcmp( (char *)name, "winding" ) == 0 ); - assert( EPointState == WINDING_MESSAGE ); - EPointState = WINDING_WINDING; - } +void CPointMsg::Draw2D(VIEWTYPE vt) +{ + int nDim1 = (vt == YZ) ? 1 : 0; + int nDim2 = (vt == XY) ? 1 : 2; + glPointSize(4); + glColor3f(1.0f, 0.0f, 0.0f); + glBegin(GL_POINTS); + glVertex2f(pt[nDim1], pt[nDim2]); + glEnd(); + glBegin(GL_LINE_LOOP); + glVertex2f(pt[nDim1] - 8, pt[nDim2] - 8); + glVertex2f(pt[nDim1] + 8, pt[nDim2] - 8); + glVertex2f(pt[nDim1] + 8, pt[nDim2] + 8); + glVertex2f(pt[nDim1] - 8, pt[nDim2] + 8); + glEnd(); } -void CWindingMsg::saxEndElement( message_info_t *ctx, const xmlChar *name ){ - if ( strcmp( (char *)name, "windingmsg" ) == 0 ) { - ctx->bGeometry = false; - } +void CWindingMsg::saxStartElement(message_info_t *ctx, const xmlChar *name, const xmlChar **attrs) +{ + if (string_equal(reinterpret_cast( name ), "windingmsg")) { + // read the message + EPointState = WINDING_MESSAGE; + } else { + // read the brush + ASSERT_MESSAGE(string_equal(reinterpret_cast( name ), "winding"), "FEEDBACK PARSE ERROR"); + ASSERT_MESSAGE(EPointState == WINDING_MESSAGE, "FEEDBACK PARSE ERROR"); + EPointState = WINDING_WINDING; + globalOutputStream() << message.c_str() << '\n'; + } } -void CWindingMsg::saxCharacters( message_info_t *ctx, const xmlChar *ch, int len ){ - if ( EPointState == WINDING_MESSAGE ) { - message = g_string_sized_new( len + 1 ); - memcpy( message->str, ch, len ); - message->str[len] = '\0'; - Sys_Printf( "%s\n", message->str ); - } - else - { - char* c; - int i; - - assert( EPointState == WINDING_WINDING ); - - - c = (char*)ch; - sscanf( c, "%i ", &numpoints ); - - for ( i = 0; i < numpoints; i++ ) - { - c = strchr( ++c, '(' ); - if ( c ) { // even if we are given the number of points when the cycle begins .. don't trust it too much - sscanf( c, "(%g %g %g)", &wt[i][0], &wt[i][1], &wt[i][2] ); - } - else{ - break; - } - } - numpoints = i; - } +void CWindingMsg::saxEndElement(message_info_t *ctx, const xmlChar *name) +{ + if (string_equal(reinterpret_cast( name ), "windingmsg")) { + } else if (string_equal(reinterpret_cast( name ), "winding")) { + const char *c = winding.c_str(); + sscanf(c, "%i ", &numpoints); + + int i = 0; + for (; i < numpoints; i++) { + c = strchr(c + 1, '('); + if (c) { // even if we are given the number of points when the cycle begins .. don't trust it too much + sscanf(c, "(%g %g %g)", &wt[i][0], &wt[i][1], &wt[i][2]); + } else { + break; + } + } + numpoints = i; + } } -void CWindingMsg::Highlight(){ - // use the entity API to push a point - // the API requires a ref count, we do it manually for the current instance - if ( refCount == 0 ) { - refCount++; - QERApp_HookGL2DWindow( this ); - } +void CWindingMsg::saxCharacters(message_info_t *ctx, const xmlChar *ch, int len) +{ + if (EPointState == WINDING_MESSAGE) { + message.write(reinterpret_cast( ch ), len); + } else { + ASSERT_MESSAGE(EPointState == WINDING_WINDING, "FEEDBACK PARSE ERROR"); + winding.write(reinterpret_cast( ch ), len); + } } -void CWindingMsg::DropHighlight(){ - assert( refCount > 0 ); - QERApp_UnHookGL2DWindow( this ); - // do a refCount-- locally (see Highlight) - refCount--; +IGL2DWindow *CWindingMsg::Highlight() +{ + return this; } -void CWindingMsg::Draw2D( VIEWTYPE vt ){ - int i; - - int nDim1 = ( vt == YZ ) ? 1 : 0; - int nDim2 = ( vt == XY ) ? 1 : 2; - qglColor3f( 1.0f,0.f,0.0f ); - - qglPointSize( 4 ); - qglBegin( GL_POINTS ); - for ( i = 0; i < numpoints; i++ ) - qglVertex2f( wt[i][nDim1], wt[i][nDim2] ); - qglEnd(); - qglPointSize( 1 ); - - qglEnable( GL_BLEND ); - qglPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); - qglBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); - qglColor4f( 0.133f,0.4f,1.0f,0.5f ); - qglBegin( GL_POLYGON ); - for ( i = 0; i < numpoints; i++ ) - qglVertex2f( wt[i][nDim1], wt[i][nDim2] ); - qglEnd(); - qglDisable( GL_BLEND ); +void CWindingMsg::DropHighlight() +{ } -// triggered when the user selects an entry in the feedback box -static void feedback_selection_changed( GtkTreeSelection* selection, gpointer data ){ - g_DbgDlg.DropHighlight(); - - GtkTreeModel* model; - GtkTreeIter selected; - if ( gtk_tree_selection_get_selected( selection, &model, &selected ) ) { - GtkTreePath* path = gtk_tree_model_get_path( model, &selected ); - g_DbgDlg.SetHighlight( gtk_tree_path_get_indices( path )[0] ); - gtk_tree_path_free( path ); - } +void CWindingMsg::Draw2D(VIEWTYPE vt) +{ + int i; + + int nDim1 = (vt == YZ) ? 1 : 0; + int nDim2 = (vt == XY) ? 1 : 2; + glColor3f(1.0f, 0.f, 0.0f); + + glPointSize(4); + glBegin(GL_POINTS); + for (i = 0; i < numpoints; i++) + glVertex2f(wt[i][nDim1], wt[i][nDim2]); + glEnd(); + glPointSize(1); + + glEnable(GL_BLEND); + glPolygonMode(GL_FRONT_AND_BACK, GL_FILL); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glColor4f(0.133f, 0.4f, 1.0f, 0.5f); + glBegin(GL_POLYGON); + for (i = 0; i < numpoints; i++) + glVertex2f(wt[i][nDim1], wt[i][nDim2]); + glEnd(); + glDisable(GL_BLEND); } -void CDbgDlg::DropHighlight(){ - if ( m_pHighlight ) { - m_pHighlight->DropHighlight(); - m_pHighlight = NULL; - } +// triggered when the user selects an entry in the feedback box +static void feedback_selection_changed(ui::TreeSelection selection, gpointer data) +{ + g_DbgDlg.DropHighlight(); + + GtkTreeModel *model; + GtkTreeIter selected; + if (gtk_tree_selection_get_selected(selection, &model, &selected)) { + auto path = gtk_tree_model_get_path(model, &selected); + g_DbgDlg.SetHighlight(gtk_tree_path_get_indices(path)[0]); + gtk_tree_path_free(path); + } } -void CDbgDlg::SetHighlight( gint row ){ - ISAXHandler *h = GetElement( row ); - if ( h != NULL ) { - h->Highlight(); - m_pHighlight = h; - } +void CDbgDlg::DropHighlight() +{ + if (m_pHighlight != 0) { + m_pHighlight->DropHighlight(); + m_pHighlight = 0; + m_pDraw2D = 0; + } } -ISAXHandler *CDbgDlg::GetElement( gint row ) { - return static_cast( g_ptr_array_index( m_pFeedbackElements, row ) ); +void CDbgDlg::SetHighlight(gint row) +{ + ISAXHandler *h = GetElement(row); + if (h != NULL) { + m_pDraw2D = h->Highlight(); + m_pHighlight = h; + } } -void CDbgDlg::ClearFeedbackArray() { - // free all the ISAXHandler*, clean it - while ( m_pFeedbackElements->len ) { - // some ISAXHandler are static and passed around but should never be deleted - ISAXHandler *handler = static_cast< ISAXHandler * >( g_ptr_array_index( m_pFeedbackElements, 0 ) ); - if ( handler->ShouldDelete() ) { - delete handler; - } - g_ptr_array_remove_index( m_pFeedbackElements, 0 ); - } +ISAXHandler *CDbgDlg::GetElement(std::size_t row) +{ + return static_cast(g_ptr_array_index(m_pFeedbackElements, gint( row )) ); } -void CDbgDlg::Init() { - DropHighlight(); +void CDbgDlg::Init() +{ + DropHighlight(); - ClearFeedbackArray(); + // free all the ISAXHandler*, clean it + while (m_pFeedbackElements->len) { + static_cast(g_ptr_array_index(m_pFeedbackElements, 0) )->Release(); + g_ptr_array_remove_index(m_pFeedbackElements, 0); + } - if ( m_clist != NULL ) { - gtk_list_store_clear( m_clist ); - } + if (m_clist) { + m_clist.clear(); + } } -void CDbgDlg::Push( ISAXHandler *pHandler ) { - // push in the list - g_ptr_array_add( m_pFeedbackElements, (void *)pHandler ); - - if ( m_pWidget == NULL ) { - Create(); - } - // put stuff in the list - gtk_list_store_clear( m_clist ); - unsigned int i; - for ( i = 0; i < m_pFeedbackElements->len; i++ ) { - GtkTreeIter iter; - gtk_list_store_append( m_clist, &iter ); - gtk_list_store_set( m_clist, &iter, 0, GetElement( i )->getName(), -1 ); - } - - ShowDlg(); +void CDbgDlg::Push(ISAXHandler *pHandler) +{ + // push in the list + g_ptr_array_add(m_pFeedbackElements, (void *) pHandler); + + if (!GetWidget()) { + Create(); + } + + // put stuff in the list + m_clist.clear(); + for (std::size_t i = 0; i < static_cast( m_pFeedbackElements->len ); ++i) { + m_clist.append(0, GetElement(i)->getName()); + } + + ShowDlg(); } -void CDbgDlg::BuildDialog(){ - gtk_window_set_title( GTK_WINDOW( m_pWidget ), "Q3Map debug window" ); +ui::Window CDbgDlg::BuildDialog() +{ + auto window = MainFrame_getWindow().create_floating_window("Q3Map debug window"); + + auto scr = ui::ScrolledWindow(ui::New); + scr.show(); + window.add(scr); + gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scr), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scr), GTK_SHADOW_IN); - GtkWidget* scr = gtk_scrolled_window_new( NULL, NULL ); - gtk_widget_show( scr ); - gtk_container_add( GTK_CONTAINER( m_pWidget ), GTK_WIDGET( scr ) ); - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scr ), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC ); - gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scr ), GTK_SHADOW_IN ); + { + ui::ListStore store = ui::ListStore::from(gtk_list_store_new(1, G_TYPE_STRING)); - { - GtkListStore* store = gtk_list_store_new( 1, G_TYPE_STRING ); + auto view = ui::TreeView(ui::TreeModel::from(store._handle)); + gtk_tree_view_set_headers_visible(view, FALSE); - GtkWidget* view = gtk_tree_view_new_with_model( GTK_TREE_MODEL( store ) ); - gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( view ), FALSE ); + { + auto renderer = ui::CellRendererText(ui::New); + auto column = ui::TreeViewColumn("", renderer, {{"text", 0}}); + gtk_tree_view_append_column(view, column); + } - { - GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); - GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes( "", renderer, "text", 0, NULL ); - gtk_tree_view_append_column( GTK_TREE_VIEW( view ), column ); - } + { + auto selection = ui::TreeSelection::from(gtk_tree_view_get_selection(view)); + gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE); + selection.connect("changed", G_CALLBACK(feedback_selection_changed), NULL); + } - { - GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( view ) ); - gtk_tree_selection_set_mode( selection, GTK_SELECTION_BROWSE ); - g_signal_connect( G_OBJECT( selection ), "changed", G_CALLBACK( feedback_selection_changed ), NULL ); - } + view.show(); - gtk_widget_show( view ); + scr.add(view); - gtk_container_add( GTK_CONTAINER( scr ), view ); + store.unref(); - g_object_unref( G_OBJECT( store ) ); + m_clist = store; + } - m_clist = store; - } + return window; }