X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ftexwindow.cpp;h=8a5cefb9f020e818b692e7190c7a06299b5c8ee7;hb=057480298a2d8b73f1a49c6e8d8d162b09c276d4;hp=8e2ed430b0ce0c59460457d03b1e2d91a706ee67;hpb=51fa1a72ab2099fab13b429097300ed464c25a9d;p=xonotic%2Fnetradiant.git diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 8e2ed430..8a5cefb9 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -32,6 +32,7 @@ #include "debugging/debugging.h" #include "warnings.h" +#include "defaults.h" #include "ifilesystem.h" #include "iundo.h" #include "igl.h" @@ -86,9 +87,6 @@ #include "shaders.h" #include "commands.h" -#define NOTEX_BASENAME "notex" -#define SHADERNOTEX_BASENAME "shadernotex" - bool TextureBrowser_showWads(){ return !string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ); } @@ -103,15 +101,11 @@ typedef std::set TextureGroups; void TextureGroups_addWad( TextureGroups& groups, const char* archive ){ if ( extension_equal( path_get_extension( archive ), "wad" ) ) { -#if 1 groups.insert( archive ); -#else - CopiedString archiveBaseName( path_get_filename_start( archive ), path_get_filename_base_end( archive ) ); - groups.insert( archiveBaseName ); -#endif } } -typedef ReferenceCaller1 TextureGroupsAddWadCaller; + +typedef ReferenceCaller TextureGroupsAddWadCaller; namespace { @@ -124,7 +118,9 @@ bool g_TextureBrowser_enableAlpha = true; CopiedString g_notex; CopiedString g_shadernotex; + bool isMissing(const char* name); + bool isNotex(const char* name); bool isMissing(const char* name){ @@ -138,10 +134,10 @@ bool isMissing(const char* name){ } bool isNotex(const char* name){ - if ( string_equal_suffix( name, "/" NOTEX_BASENAME ) ) { + if ( string_equal_suffix( name, "/" DEFAULT_NOTEX_BASENAME ) ) { return true; } - if ( string_equal_suffix( name, "/" SHADERNOTEX_BASENAME ) ) { + if ( string_equal_suffix( name, "/" DEFAULT_SHADERNOTEX_BASENAME ) ) { return true; } return false; @@ -167,18 +163,21 @@ void TextureGroups_addShader( TextureGroups& groups, const char* shaderName ){ } } } -typedef ReferenceCaller1 TextureGroupsAddShaderCaller; + +typedef ReferenceCaller TextureGroupsAddShaderCaller; void TextureGroups_addDirectory( TextureGroups& groups, const char* directory ){ groups.insert( directory ); } -typedef ReferenceCaller1 TextureGroupsAddDirectoryCaller; +typedef ReferenceCaller TextureGroupsAddDirectoryCaller; class DeferredAdjustment { gdouble m_value; guint m_handler; + typedef void ( *ValueChangedFunction )( void* data, gdouble value ); + ValueChangedFunction m_function; void* m_data; @@ -191,31 +190,34 @@ static gboolean deferred_value_changed( gpointer data ){ reinterpret_cast( data )->m_value = 0; return FALSE; } + public: DeferredAdjustment( ValueChangedFunction function, void* data ) : m_value( 0 ), m_handler( 0 ), m_function( function ), m_data( data ){ } + void flush(){ if ( m_handler != 0 ) { g_source_remove( m_handler ); deferred_value_changed( this ); } } + void value_changed( gdouble value ){ m_value = value; if ( m_handler == 0 ) { m_handler = g_idle_add( deferred_value_changed, this ); } } -static void adjustment_value_changed( GtkAdjustment *adjustment, DeferredAdjustment* self ){ + +static void adjustment_value_changed(ui::Adjustment adjustment, DeferredAdjustment* self ){ self->value_changed( gtk_adjustment_get_value(adjustment) ); } }; - class TextureBrowser; -typedef ReferenceCaller TextureBrowserQueueDrawCaller; +typedef ReferenceCaller TextureBrowserQueueDrawCaller; void TextureBrowser_scrollChanged( void* data, gdouble value ); @@ -226,26 +228,33 @@ enum StartupShaders STARTUPSHADERS_COMMON, }; -void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserHideUnusedExport; +void TextureBrowser_hideUnusedExport( const Callback & importer ); + +typedef FreeCaller &), TextureBrowser_hideUnusedExport> TextureBrowserHideUnusedExport; + +void TextureBrowser_showShadersExport( const Callback & importer ); + +typedef FreeCaller &), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; -void TextureBrowser_showShadersExport( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserShowShadersExport; +void TextureBrowser_showShaderlistOnly( const Callback & importer ); -void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; +typedef FreeCaller &), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; -void TextureBrowser_fixedSize( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFixedSizeExport; +void TextureBrowser_fixedSize( const Callback & importer ); -void TextureBrowser_filterMissing( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFilterMissingExport; +typedef FreeCaller &), TextureBrowser_fixedSize> TextureBrowserFixedSizeExport; -void TextureBrowser_filterFallback( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserFilterFallbackExport; +void TextureBrowser_filterMissing( const Callback & importer ); -void TextureBrowser_enableAlpha( const BoolImportCallback& importer ); -typedef FreeCaller1 TextureBrowserEnableAlphaExport; +typedef FreeCaller &), TextureBrowser_filterMissing> TextureBrowserFilterMissingExport; + +void TextureBrowser_filterFallback( const Callback & importer ); + +typedef FreeCaller &), TextureBrowser_filterFallback> TextureBrowserFilterFallbackExport; + +void TextureBrowser_enableAlpha( const Callback & importer ); + +typedef FreeCaller &), TextureBrowser_enableAlpha> TextureBrowserEnableAlphaExport; class TextureBrowser { @@ -257,9 +266,17 @@ int m_nTotalHeight; CopiedString shader; ui::Window m_parent{ui::null}; +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET +ui::VBox m_vframe{ui::null}; +ui::VBox m_vfiller{ui::null}; +ui::HBox m_hframe{ui::null}; +ui::HBox m_hfiller{ui::null}; +#else // !WORKAROUND_MACOS_GTK2_GLWIDGET +ui::VBox m_frame{ui::null}; +#endif // !WORKAROUND_MACOS_GTK2_GLWIDGET ui::GLArea m_gl_widget{ui::null}; ui::Widget m_texture_scroll{ui::null}; -ui::TreeView m_treeViewTree{ui::null}; +ui::TreeView m_treeViewTree{ui::New}; ui::TreeView m_treeViewTags{ui::null}; ui::Frame m_tag_frame{ui::null}; ui::ListStore m_assigned_store{ui::null}; @@ -310,6 +327,7 @@ bool m_searchedTags; bool m_tags; // The uniform size (in pixels) that textures are resized to when m_resizeTextures is true. int m_uniformTextureSize; + // Return the display width of a texture in the texture browser int getTextureWidth( qtexture_t* tex ){ int width; @@ -328,6 +346,7 @@ int getTextureWidth( qtexture_t* tex ){ } return width; } + // Return the display height of a texture in the texture browser int getTextureHeight( qtexture_t* tex ){ int height; @@ -347,7 +366,7 @@ int getTextureHeight( qtexture_t* tex ){ } TextureBrowser() : - m_texture_scroll( 0 ), + m_texture_scroll( ui::null ), m_hideunused_item( TextureBrowserHideUnusedExport() ), m_hidenotex_item( TextureBrowserFilterFallbackExport() ), m_showshaders_item( TextureBrowserShowShadersExport() ), @@ -558,7 +577,15 @@ bool Texture_IsShown( IShader* shader, bool show_shaders, bool hideUnused ){ } } else { - if ( !shader_equal_prefix( shader_get_textureName( shader->getName() ), g_TextureBrowser_currentDirectory.c_str() ) ) { + if ( TextureBrowser_showWads() ) + { + if ( g_TextureBrowser_currentDirectory != "" + && !string_equal( shader->getWadName(), g_TextureBrowser_currentDirectory.c_str() ) ) + { + return false; + } + } + else if ( !shader_equal_prefix( shader_get_textureName( shader->getName() ), g_TextureBrowser_currentDirectory.c_str() ) ) { return false; } } @@ -648,8 +675,10 @@ void realise(){ m_realiseCallbacks(); TextureBrowser_constructTreeStore(); } + void unrealise(){ } + void insert( const SignalHandler& handler ){ m_realiseCallbacks.connectLast( handler ); } @@ -671,14 +700,19 @@ void TextureBrowser_activeShadersChanged( TextureBrowser& textureBrowser ){ g_activeShadersChangedCallbacks(); } -void TextureBrowser_importShowScrollbar( TextureBrowser& textureBrowser, bool value ){ - textureBrowser.m_showTextureScrollbar = value; - if ( textureBrowser.m_texture_scroll != 0 ) { - textureBrowser.m_texture_scroll.visible(textureBrowser.m_showTextureScrollbar); - TextureBrowser_updateScroll( textureBrowser ); +struct TextureBrowser_ShowScrollbar { + static void Export(const TextureBrowser &self, const Callback &returnz) { + returnz(self.m_showTextureScrollbar); } -} -typedef ReferenceCaller1 TextureBrowserImportShowScrollbarCaller; + + static void Import(TextureBrowser &self, bool value) { + self.m_showTextureScrollbar = value; + if (self.m_texture_scroll) { + self.m_texture_scroll.visible(self.m_showTextureScrollbar); + TextureBrowser_updateScroll(self); + } + } +}; /* @@ -716,14 +750,27 @@ bool texture_name_ignore( const char* name ){ endswith( strTemp.c_str(), ".diffuse" ) || endswith( strTemp.c_str(), ".blend" ) || endswith( strTemp.c_str(), ".alpha" ) || - endswith( strTemp.c_str(), "_norm" ) || + endswith( strTemp.c_str(), "_alpha" ) || + /* Quetoo */ + endswith( strTemp.c_str(), "_h" ) || + endswith( strTemp.c_str(), "_local" ) || + endswith( strTemp.c_str(), "_nm" ) || + endswith( strTemp.c_str(), "_s" ) || + /* DarkPlaces */ endswith( strTemp.c_str(), "_bump" ) || endswith( strTemp.c_str(), "_glow" ) || endswith( strTemp.c_str(), "_gloss" ) || + endswith( strTemp.c_str(), "_luma" ) || + endswith( strTemp.c_str(), "_norm" ) || endswith( strTemp.c_str(), "_pants" ) || endswith( strTemp.c_str(), "_shirt" ) || endswith( strTemp.c_str(), "_reflect" ) || - endswith( strTemp.c_str(), "_alpha" ) || + /* Unvanquished */ + endswith( strTemp.c_str(), "_d" ) || + endswith( strTemp.c_str(), "_n" ) || + endswith( strTemp.c_str(), "_p" ) || + endswith( strTemp.c_str(), "_g" ) || + endswith( strTemp.c_str(), "_a" ) || 0; } @@ -733,6 +780,7 @@ public: void visit( const char* name ){ IShader* shader = QERApp_Shader_ForName( CopiedString( StringRange( name, path_get_filename_base_end( name ) ) ).c_str() ); shader->DecRef(); + shader->setWadName( g_TextureBrowser_currentDirectory.c_str() ); } }; @@ -750,18 +798,18 @@ void TextureBrowser_updateTitle(){ } - class TextureCategoryLoadShader { const char* m_directory; std::size_t& m_count; public: -typedef const char* first_argument_type; +using func = void(const char *); TextureCategoryLoadShader( const char* directory, std::size_t& count ) : m_directory( directory ), m_count( count ){ m_count = 0; } + void operator()( const char* name ) const { if ( shader_equal_prefix( name, "textures/" ) && shader_equal_prefix( name + string_length( "textures/" ), m_directory ) ) { @@ -791,7 +839,8 @@ void TextureDirectory_loadTexture( const char* directory, const char* texture ){ IShader* shader = QERApp_Shader_ForName( name.c_str() ); shader->DecRef(); } -typedef ConstPointerCaller1 TextureDirectoryLoadTextureCaller; + +typedef ConstPointerCaller TextureDirectoryLoadTextureCaller; class LoadTexturesByTypeVisitor : public ImageModules::Visitor { @@ -800,6 +849,7 @@ public: LoadTexturesByTypeVisitor( const char* dirstring ) : m_dirstring( dirstring ){ } + void visit( const char* minor, const _QERPlugImageTable& table ) const { GlobalFileSystem().forEachFile( m_dirstring, minor, TextureDirectoryLoadTextureCaller( m_dirstring ) ); } @@ -807,10 +857,19 @@ void visit( const char* minor, const _QERPlugImageTable& table ) const { void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* directory ){ if ( TextureBrowser_showWads() ) { + g_TextureBrowser_currentDirectory = directory; + TextureBrowser_heightChanged( textureBrowser ); + Archive* archive = GlobalFileSystem().getArchive( directory ); - ASSERT_NOTNULL( archive ); - LoadShaderVisitor visitor; - archive->forEachFile( Archive::VisitorFunc( visitor, Archive::eFiles, 0 ), "textures/" ); + if ( archive != nullptr ) + { + LoadShaderVisitor visitor; + archive->forEachFile( Archive::VisitorFunc( visitor, Archive::eFiles, 0 ), "textures/" ); + } + else if ( extension_equal_i( path_get_extension( directory ), "wad" ) ) + { + globalErrorStream() << "Failed to load " << directory << "\n"; + } } else { @@ -818,7 +877,7 @@ void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* d TextureBrowser_heightChanged( textureBrowser ); std::size_t shaders_count; - GlobalShaderSystem().foreachShaderName( makeCallback1( TextureCategoryLoadShader( directory, shaders_count ) ) ); + GlobalShaderSystem().foreachShaderName(makeCallback( TextureCategoryLoadShader( directory, shaders_count ) ) ); globalOutputStream() << "Showing " << Unsigned( shaders_count ) << " shaders.\n"; if ( g_pGameDescription->mGameType != "doom3" ) { @@ -842,7 +901,7 @@ void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const c TextureBrowser_heightChanged( textureBrowser ); std::size_t shaders_count; - GlobalShaderSystem().foreachShaderName( makeCallback1( TextureCategoryLoadShader( directory, shaders_count ) ) ); + GlobalShaderSystem().foreachShaderName(makeCallback( TextureCategoryLoadShader( directory, shaders_count ) ) ); globalOutputStream() << "Showing " << Unsigned( shaders_count ) << " shaders.\n"; if ( g_pGameDescription->mGameType != "doom3" ) { @@ -863,40 +922,47 @@ void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const c bool TextureBrowser_hideUnused(); -void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ){ +void TextureBrowser_hideUnusedExport( const Callback & importer ){ importer( TextureBrowser_hideUnused() ); } -typedef FreeCaller1 TextureBrowserHideUnusedExport; -void TextureBrowser_showShadersExport( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_hideUnusedExport> TextureBrowserHideUnusedExport; + +void TextureBrowser_showShadersExport( const Callback & importer ){ importer( GlobalTextureBrowser().m_showShaders ); } -typedef FreeCaller1 TextureBrowserShowShadersExport; -void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_showShadersExport> TextureBrowserShowShadersExport; + +void TextureBrowser_showShaderlistOnly( const Callback & importer ){ importer( g_TextureBrowser_shaderlistOnly ); } -typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; -void TextureBrowser_fixedSize( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_showShaderlistOnly> TextureBrowserShowShaderlistOnlyExport; + +void TextureBrowser_fixedSize( const Callback & importer ){ importer( g_TextureBrowser_fixedSize ); } -typedef FreeCaller1 TextureBrowser_FixedSizeExport; -void TextureBrowser_filterMissing( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_fixedSize> TextureBrowser_FixedSizeExport; + +void TextureBrowser_filterMissing( const Callback & importer ){ importer( g_TextureBrowser_filterMissing ); } -typedef FreeCaller1 TextureBrowser_filterMissingExport; -void TextureBrowser_filterFallback( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_filterMissing> TextureBrowser_filterMissingExport; + +void TextureBrowser_filterFallback( const Callback & importer ){ importer( g_TextureBrowser_filterFallback ); } -typedef FreeCaller1 TextureBrowser_filterFallbackExport; -void TextureBrowser_enableAlpha( const BoolImportCallback& importer ){ +typedef FreeCaller &), TextureBrowser_filterFallback> TextureBrowser_filterFallbackExport; + +void TextureBrowser_enableAlpha( const Callback & importer ){ importer( g_TextureBrowser_enableAlpha ); } -typedef FreeCaller1 TextureBrowser_enableAlphaExport; + +typedef FreeCaller &), TextureBrowser_enableAlpha> TextureBrowser_enableAlphaExport; void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnused ){ if ( hideUnused ) { @@ -1085,6 +1151,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){ textureBrowser.color_textureback[1], textureBrowser.color_textureback[2], 0 ); + glViewport( 0, 0, textureBrowser.width, textureBrowser.height ); glMatrixMode( GL_PROJECTION ); glLoadIdentity(); @@ -1197,6 +1264,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){ glBegin( GL_QUADS ); int font_height = TextureBrowser_fontHeight( textureBrowser ); for ( int i = 0; i < nHeight; i += 8 ) + { for ( int j = 0; j < nWidth; j += 8 ) { unsigned char color = (i + j) / 8 % 2 ? 0x66 : 0x99; @@ -1210,6 +1278,7 @@ void Texture_Draw( TextureBrowser& textureBrowser ){ glVertex2i(x + left, y - nHeight - font_height + bottom); glVertex2i(x + right, y - nHeight - font_height + bottom); } + } glEnd(); glEnable( GL_TEXTURE_2D ); } @@ -1416,7 +1485,7 @@ void TextureBrowser_scrollChanged( void* data, gdouble value ){ TextureBrowser_setOriginY( *reinterpret_cast( data ), -(int)value ); } -static void TextureBrowser_verticalScroll( GtkAdjustment *adjustment, TextureBrowser* textureBrowser ){ +static void TextureBrowser_verticalScroll(ui::Adjustment adjustment, TextureBrowser* textureBrowser ){ textureBrowser->m_scrollAdjustment.value_changed( gtk_adjustment_get_value(adjustment) ); } @@ -1459,7 +1528,6 @@ gboolean TextureBrowser_expose( ui::Widget widget, GdkEventExpose* event, Textur return FALSE; } - TextureBrowser g_TextureBrowser; TextureBrowser& GlobalTextureBrowser(){ @@ -1480,6 +1548,17 @@ void TextureBrowser_ToggleHideUnused(){ } } +const char* TextureGroups_transformDirName( const char* dirName, StringOutputStream *archiveName ) +{ + if ( TextureBrowser_showWads() ) { + archiveName->clear(); + *archiveName << StringRange( path_get_filename_start( dirName ), path_get_filename_base_end( dirName ) ) \ + << "." << path_get_extension( dirName ); + return archiveName->c_str(); + } + return dirName; +} + void TextureGroups_constructTreeModel( TextureGroups groups, ui::TreeStore store ){ // put the information from the old textures menu into a treeview GtkTreeIter iter, child; @@ -1487,23 +1566,27 @@ void TextureGroups_constructTreeModel( TextureGroups groups, ui::TreeStore store TextureGroups::const_iterator i = groups.begin(); while ( i != groups.end() ) { - const char* dirName = ( *i ).c_str(); + StringOutputStream archiveName; + StringOutputStream nextArchiveName; + const char* dirName = TextureGroups_transformDirName( ( *i ).c_str(), &archiveName ); + const char* firstUnderscore = strchr( dirName, '_' ); StringRange dirRoot( dirName, ( firstUnderscore == 0 ) ? dirName : firstUnderscore + 1 ); TextureGroups::const_iterator next = i; ++next; + if ( firstUnderscore != 0 && next != groups.end() - && string_equal_start( ( *next ).c_str(), dirRoot ) ) { + && string_equal_start( TextureGroups_transformDirName( ( *next ).c_str(), &nextArchiveName ), dirRoot ) ) { gtk_tree_store_append( store, &iter, NULL ); gtk_tree_store_set( store, &iter, 0, CopiedString( StringRange( dirName, firstUnderscore ) ).c_str(), -1 ); // keep going... - while ( i != groups.end() && string_equal_start( ( *i ).c_str(), dirRoot ) ) + while ( i != groups.end() && string_equal_start( TextureGroups_transformDirName( ( *i ).c_str(), &nextArchiveName ), dirRoot ) ) { gtk_tree_store_append( store, &child, &iter ); - gtk_tree_store_set( store, &child, 0, ( *i ).c_str(), -1 ); + gtk_tree_store_set( store, &child, 0, TextureGroups_transformDirName( ( *i ).c_str(), &nextArchiveName ), -1 ); ++i; } } @@ -1537,7 +1620,7 @@ TextureGroups TextureGroups_constructTreeView(){ void TextureBrowser_constructTreeStore(){ TextureGroups groups = TextureGroups_constructTreeView(); - auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); + auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING )); TextureGroups_constructTreeModel( groups, store ); gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTree, store); @@ -1547,7 +1630,7 @@ void TextureBrowser_constructTreeStore(){ void TextureBrowser_constructTreeStoreTags(){ TextureGroups groups; - auto store = ui::TreeStore(gtk_tree_store_new( 1, G_TYPE_STRING )); + auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING )); auto model = g_TextureBrowser.m_all_tags_list; gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTags, model ); @@ -1555,7 +1638,7 @@ void TextureBrowser_constructTreeStoreTags(){ g_object_unref( G_OBJECT( store ) ); } -void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::TreeViewColumn col, gpointer userdata ){ +void TreeView_onRowActivated( ui::TreeView treeview, ui::TreePath path, ui::TreeViewColumn col, gpointer userdata ){ GtkTreeIter iter; auto model = gtk_tree_view_get_model(treeview ); @@ -1581,7 +1664,6 @@ void TreeView_onRowActivated( ui::TreeView treeview, GtkTreePath* path, ui::Tree } void TextureBrowser_createTreeViewTree(){ - g_TextureBrowser.m_treeViewTree = ui::TreeView(ui::New); gtk_tree_view_set_enable_search(g_TextureBrowser.m_treeViewTree, FALSE ); gtk_tree_view_set_headers_visible(g_TextureBrowser.m_treeViewTree, FALSE ); @@ -1594,7 +1676,9 @@ void TextureBrowser_createTreeViewTree(){ } void TextureBrowser_addTag(); + void TextureBrowser_renameTag(); + void TextureBrowser_deleteTag(); void TextureBrowser_createContextMenu( ui::Widget treeview, GdkEventButton *event ){ @@ -1670,7 +1754,7 @@ ui::MenuItem TextureBrowser_constructViewMenu( ui::Menu menu ){ create_menu_item_with_mnemonic( menu, "Show All", "ShowAllTextures" ); // we always want to show shaders but don't want a "Show Shaders" menu for doom3 and .wad file games - if ( g_pGameDescription->mGameType == "doom3" || !string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { + if ( g_pGameDescription->mGameType == "doom3" || TextureBrowser_showWads() ) { g_TextureBrowser.m_showShaders = true; } else @@ -1917,7 +2001,7 @@ void TextureBrowser_toggleSearchButton(){ } void TextureBrowser_constructTagNotebook(){ - g_TextureBrowser.m_tag_notebook = ui::Widget(gtk_notebook_new()); + g_TextureBrowser.m_tag_notebook = ui::Widget::from(gtk_notebook_new()); ui::Widget labelTags = ui::Label( "Tags" ); ui::Widget labelTextures = ui::Label( "Textures" ); @@ -1930,7 +2014,7 @@ void TextureBrowser_constructTagNotebook(){ } void TextureBrowser_constructSearchButton(){ - ui::Widget image = ui::Widget(gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR )); + auto image = ui::Widget::from(gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR )); g_TextureBrowser.m_search_button = ui::Button(ui::New); g_TextureBrowser.m_search_button.connect( "clicked", G_CALLBACK( TextureBrowser_searchTags ), NULL ); gtk_widget_set_tooltip_text(g_TextureBrowser.m_search_button, "Search with selected tags"); @@ -1976,13 +2060,44 @@ void TextureBrowser_checkTagFile(){ } void TextureBrowser_SetNotex(){ - StringOutputStream name( 256 ); - name << GlobalRadiant().getAppPath() << "bitmaps/" NOTEX_BASENAME ".png"; - g_notex = name.c_str(); + IShader* notex = QERApp_Shader_ForName( DEFAULT_NOTEX_NAME ); + IShader* shadernotex = QERApp_Shader_ForName( DEFAULT_SHADERNOTEX_NAME ); - name = StringOutputStream(256); - name << GlobalRadiant().getAppPath() << "bitmaps/" SHADERNOTEX_BASENAME " .png"; - g_shadernotex = name.c_str(); + g_notex = notex->getTexture()->name; + + g_shadernotex = shadernotex->getTexture()->name; + + notex->DecRef(); + shadernotex->DecRef(); +} + +static bool isGLWidgetConstructed = false; +static bool isWindowConstructed = false; + +void TextureBrowser_constructGLWidget(){ + g_TextureBrowser.m_gl_widget = glwidget_new( FALSE ); + g_object_ref( g_TextureBrowser.m_gl_widget._handle ); + + gtk_widget_set_events( g_TextureBrowser.m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); + gtk_widget_set_can_focus( g_TextureBrowser.m_gl_widget, true ); + + g_TextureBrowser.m_sizeHandler = g_TextureBrowser.m_gl_widget.connect( "size_allocate", G_CALLBACK( TextureBrowser_size_allocate ), &g_TextureBrowser ); + g_TextureBrowser.m_exposeHandler = g_TextureBrowser.m_gl_widget.on_render( G_CALLBACK( TextureBrowser_expose ), &g_TextureBrowser ); + + g_TextureBrowser.m_gl_widget.connect( "button_press_event", G_CALLBACK( TextureBrowser_button_press ), &g_TextureBrowser ); + g_TextureBrowser.m_gl_widget.connect( "button_release_event", G_CALLBACK( TextureBrowser_button_release ), &g_TextureBrowser ); + g_TextureBrowser.m_gl_widget.connect( "motion_notify_event", G_CALLBACK( TextureBrowser_motion ), &g_TextureBrowser ); + g_TextureBrowser.m_gl_widget.connect( "scroll_event", G_CALLBACK( TextureBrowser_scroll ), &g_TextureBrowser ); + +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET + g_TextureBrowser.m_hframe.pack_start( g_TextureBrowser.m_gl_widget, TRUE, TRUE, 0 ); +#else // !WORKAROUND_MACOS_GTK2_GLWIDGET + g_TextureBrowser.m_frame.pack_start( g_TextureBrowser.m_gl_widget, TRUE, TRUE, 0 ); +#endif // !WORKAROUND_MACOS_GTK2_GLWIDGET + + g_TextureBrowser.m_gl_widget.show(); + + isGLWidgetConstructed = true; } ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ @@ -1994,7 +2109,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ TextureBrowser_checkTagFile(); TextureBrowser_SetNotex(); - GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( g_TextureBrowser ) ); g_TextureBrowser.m_parent = toplevel; @@ -2006,7 +2121,7 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ ui::Widget menu_bar{ui::null}; { // menu bar - menu_bar = ui::Widget(gtk_menu_bar_new()); + menu_bar = ui::Widget::from(gtk_menu_bar_new()); auto menu_view = ui::Menu(ui::New); auto view_item = TextureBrowser_constructViewMenu( menu_view ); gtk_menu_item_set_submenu( GTK_MENU_ITEM( view_item ), menu_view ); @@ -2035,39 +2150,47 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ g_TextureBrowser.m_treeViewTree.show(); } { // gl_widget scrollbar - ui::Widget w = ui::Widget(gtk_vscrollbar_new( ui::Adjustment( 0,0,0,1,1,0 ) )); + auto w = ui::Widget::from(gtk_vscrollbar_new( ui::Adjustment( 0,0,0,1,1,0 ) )); table.attach(w, {2, 3, 1, 2}, {GTK_SHRINK, GTK_FILL}); w.show(); g_TextureBrowser.m_texture_scroll = w; - auto vadjustment = ui::Adjustment(gtk_range_get_adjustment( GTK_RANGE( g_TextureBrowser.m_texture_scroll ) )); + auto vadjustment = ui::Adjustment::from(gtk_range_get_adjustment( GTK_RANGE( g_TextureBrowser.m_texture_scroll ) )); vadjustment.connect( "value_changed", G_CALLBACK( TextureBrowser_verticalScroll ), &g_TextureBrowser ); g_TextureBrowser.m_texture_scroll.visible(g_TextureBrowser.m_showTextureScrollbar); } { // gl_widget - g_TextureBrowser.m_gl_widget = glwidget_new( FALSE ); - g_object_ref( g_TextureBrowser.m_gl_widget._handle ); +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET + g_TextureBrowser.m_vframe = ui::VBox( FALSE, 0 ); + table.attach(g_TextureBrowser.m_vframe, {1, 2, 1, 2}); + + g_TextureBrowser.m_vfiller = ui::VBox( FALSE, 0 ); + g_TextureBrowser.m_vframe.pack_start( g_TextureBrowser.m_vfiller, FALSE, FALSE, 0 ); - gtk_widget_set_events( g_TextureBrowser.m_gl_widget, GDK_DESTROY | GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK ); - gtk_widget_set_can_focus( g_TextureBrowser.m_gl_widget, true ); + g_TextureBrowser.m_hframe = ui::HBox( FALSE, 0 ); + g_TextureBrowser.m_vframe.pack_start( g_TextureBrowser.m_hframe, TRUE, TRUE, 0 ); - table.attach(g_TextureBrowser.m_gl_widget, {1, 2, 1, 2}); - g_TextureBrowser.m_gl_widget.show(); + g_TextureBrowser.m_hfiller = ui::HBox( FALSE, 0 ); + g_TextureBrowser.m_hframe.pack_start( g_TextureBrowser.m_hfiller, FALSE, FALSE, 0 ); - g_TextureBrowser.m_sizeHandler = g_TextureBrowser.m_gl_widget.connect( "size_allocate", G_CALLBACK( TextureBrowser_size_allocate ), &g_TextureBrowser ); - g_TextureBrowser.m_exposeHandler = g_TextureBrowser.m_gl_widget.on_render( G_CALLBACK( TextureBrowser_expose ), &g_TextureBrowser ); + g_TextureBrowser.m_vframe.show(); + g_TextureBrowser.m_vfiller.show(); + g_TextureBrowser.m_hframe.show(), + g_TextureBrowser.m_hfiller.show(); +#else // !WORKAROUND_MACOS_GTK2_GLWIDGET + g_TextureBrowser.m_frame = ui::VBox( FALSE, 0 ); + table.attach(g_TextureBrowser.m_frame, {1, 2, 1, 2}); + g_TextureBrowser.m_frame.show(); +#endif // !WORKAROUND_MACOS_GTK2_GLWIDGET - g_TextureBrowser.m_gl_widget.connect( "button_press_event", G_CALLBACK( TextureBrowser_button_press ), &g_TextureBrowser ); - g_TextureBrowser.m_gl_widget.connect( "button_release_event", G_CALLBACK( TextureBrowser_button_release ), &g_TextureBrowser ); - g_TextureBrowser.m_gl_widget.connect( "motion_notify_event", G_CALLBACK( TextureBrowser_motion ), &g_TextureBrowser ); - g_TextureBrowser.m_gl_widget.connect( "scroll_event", G_CALLBACK( TextureBrowser_scroll ), &g_TextureBrowser ); + TextureBrowser_constructGLWidget(); } // tag stuff if ( g_TextureBrowser.m_tags ) { { // fill tag GtkListStore - g_TextureBrowser.m_all_tags_list = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); + g_TextureBrowser.m_all_tags_list = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_all_tags_list ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); @@ -2121,14 +2244,14 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ gtk_container_set_border_width( GTK_CONTAINER( scrolled_win ), 0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); - g_TextureBrowser.m_assigned_store = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); + g_TextureBrowser.m_assigned_store = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_assigned_store ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); auto renderer = ui::CellRendererText(ui::New); - g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel(g_TextureBrowser.m_assigned_store )); + g_TextureBrowser.m_assigned_tree = ui::TreeView(ui::TreeModel::from(g_TextureBrowser.m_assigned_store._handle)); g_TextureBrowser.m_assigned_store.unref(); g_TextureBrowser.m_assigned_tree.connect( "row-activated", (GCallback) TextureBrowser_removeTags, NULL ); gtk_tree_view_set_headers_visible(g_TextureBrowser.m_assigned_tree, FALSE ); @@ -2150,13 +2273,13 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ gtk_container_set_border_width( GTK_CONTAINER( scrolled_win ), 0 ); gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); - g_TextureBrowser.m_available_store = ui::ListStore(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); + g_TextureBrowser.m_available_store = ui::ListStore::from(gtk_list_store_new( N_COLUMNS, G_TYPE_STRING )); auto sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_available_store ); gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); auto renderer = ui::CellRendererText(ui::New); - g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel(g_TextureBrowser.m_available_store )); + g_TextureBrowser.m_available_tree = ui::TreeView(ui::TreeModel::from(g_TextureBrowser.m_available_store._handle)); g_TextureBrowser.m_available_store.unref(); g_TextureBrowser.m_available_tree.connect( "row-activated", (GCallback) TextureBrowser_assignTags, NULL ); gtk_tree_view_set_headers_visible(g_TextureBrowser.m_available_tree, FALSE ); @@ -2176,8 +2299,8 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ { // tag arrow buttons auto m_btn_left = ui::Button(ui::New); auto m_btn_right = ui::Button(ui::New); - auto m_arrow_left = ui::Widget(gtk_arrow_new( GTK_ARROW_LEFT, GTK_SHADOW_OUT )); - auto m_arrow_right = ui::Widget(gtk_arrow_new( GTK_ARROW_RIGHT, GTK_SHADOW_OUT )); + auto m_arrow_left = ui::Widget::from(gtk_arrow_new( GTK_ARROW_LEFT, GTK_SHADOW_OUT )); + auto m_arrow_right = ui::Widget::from(gtk_arrow_new( GTK_ARROW_RIGHT, GTK_SHADOW_OUT )); m_btn_left.add(m_arrow_left); m_btn_right.add(m_arrow_right); @@ -2214,17 +2337,66 @@ ui::Widget TextureBrowser_constructWindow( ui::Window toplevel ){ // TODO do we need this? //gtk_container_set_focus_chain(GTK_CONTAINER(hbox_table), NULL); + isWindowConstructed = true; + return table; } +void TextureBrowser_destroyGLWidget(){ + if ( isGLWidgetConstructed ) + { + g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_sizeHandler ); + g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_exposeHandler ); + +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET + g_TextureBrowser.m_hframe.remove( g_TextureBrowser.m_gl_widget ); +#else // !WORKAROUND_MACOS_GTK2_GLWIDGET + g_TextureBrowser.m_frame.remove( g_TextureBrowser.m_gl_widget ); +#endif // !WORKAROUND_MACOS_GTK2_GLWIDGET + + g_TextureBrowser.m_gl_widget.unref(); + + isGLWidgetConstructed = false; + } +} + void TextureBrowser_destroyWindow(){ - GlobalShaderSystem().setActiveShadersChangedNotify( Callback() ); + GlobalShaderSystem().setActiveShadersChangedNotify( Callback() ); - g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_sizeHandler ); - g_signal_handler_disconnect( G_OBJECT( g_TextureBrowser.m_gl_widget ), g_TextureBrowser.m_exposeHandler ); + TextureBrowser_destroyGLWidget(); +} + +#ifdef WORKAROUND_MACOS_GTK2_GLWIDGET +/* workaround for gtkglext on gtk 2 issue: OpenGL texture viewport being drawn over the other pages */ +/* this is very ugly: force the resizing of the viewport to a single bottom line by forcing the + * resizing of the gl widget by expanding some empty boxes, so the widget area size is reduced + * while covered by another page, so the texture viewport is still rendered over the other page + * but does not annoy the user that much because it's just a line on the bottom that may even + * be printed over existing bottom frame or very close to it. */ +void TextureBrowser_showGLWidget(){ + if ( isWindowConstructed && isGLWidgetConstructed ) + { + GlobalTextureBrowser().m_vframe.set_child_packing( GlobalTextureBrowser().m_vfiller, FALSE, FALSE, 0, ui::Packing::START ); + GlobalTextureBrowser().m_vframe.set_child_packing( GlobalTextureBrowser().m_hframe, TRUE, TRUE, 0, ui::Packing::START ); + GlobalTextureBrowser().m_vframe.set_child_packing( GlobalTextureBrowser().m_hfiller, FALSE, FALSE, 0, ui::Packing::START ); + GlobalTextureBrowser().m_vframe.set_child_packing( GlobalTextureBrowser().m_gl_widget, TRUE, TRUE, 0, ui::Packing::START ); + GlobalTextureBrowser().m_gl_widget.show(); + } +} - g_TextureBrowser.m_gl_widget.unref(); +void TextureBrowser_hideGLWidget(){ + if ( isWindowConstructed && isGLWidgetConstructed ) + { + GlobalTextureBrowser().m_vframe.set_child_packing( GlobalTextureBrowser().m_vfiller, TRUE, TRUE, 0, ui::Packing::START); + GlobalTextureBrowser().m_vframe.set_child_packing( GlobalTextureBrowser().m_hframe, FALSE, FALSE, 0, ui::Packing::END ); + GlobalTextureBrowser().m_vframe.set_child_packing( GlobalTextureBrowser().m_hfiller, TRUE, TRUE, 0, ui::Packing::START); + GlobalTextureBrowser().m_vframe.set_child_packing( GlobalTextureBrowser().m_gl_widget, FALSE, FALSE, 0, ui::Packing::END ); + GdkEventExpose event = {}; + TextureBrowser_expose( GlobalTextureBrowser().m_gl_widget, &event, &GlobalTextureBrowser() ); + GlobalTextureBrowser().m_gl_widget.hide(); + } } +#endif // WORKAROUND_MACOS_GTK2_GLWIDGET const Vector3& TextureBrowser_getBackgroundColour( TextureBrowser& textureBrowser ){ return textureBrowser.color_textureback; @@ -2316,7 +2488,7 @@ void TextureBrowser_renameTag(){ } else { - g_TextureBrowser.m_parent.alert( "Select a single tag for renaming." ); + ui::alert( g_TextureBrowser.m_parent, "Select a single tag for renaming." ); } } @@ -2327,7 +2499,7 @@ void TextureBrowser_deleteTag(){ gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); if ( g_slist_length( selected ) == 1 ) { // we only delete a single tag - auto result = g_TextureBrowser.m_parent.alert( "Are you sure you want to delete the selected tag?", "Delete Tag", ui::alert_type::YESNO, ui::alert_icon::Question ); + auto result = ui::alert( g_TextureBrowser.m_parent, "Are you sure you want to delete the selected tag?", "Delete Tag", ui::alert_type::YESNO, ui::alert_icon::Question ); if ( result == ui::alert_response::YES ) { GtkTreeIter iterSelected; @@ -2356,7 +2528,7 @@ void TextureBrowser_deleteTag(){ } } else { - g_TextureBrowser.m_parent.alert( "Select a single tag for deletion." ); + ui::alert( g_TextureBrowser.m_parent, "Select a single tag for deletion." ); } } @@ -2448,7 +2620,7 @@ void TextureBrowser_showAll(){ } void TextureBrowser_showUntagged(){ - auto result = g_TextureBrowser.m_parent.alert( "WARNING! This function might need a lot of memory and time. Are you sure you want to use it?", "Show Untagged", ui::alert_type::YESNO, ui::alert_icon::Warning ); + auto result = ui::alert( g_TextureBrowser.m_parent, "WARNING! This function might need a lot of memory and time. Are you sure you want to use it?", "Show Untagged", ui::alert_type::YESNO, ui::alert_icon::Warning ); if ( result == ui::alert_response::YES ) { g_TextureBrowser.m_found_shaders.clear(); @@ -2500,7 +2672,7 @@ void TextureBrowser_EnableAlpha(){ TextureBrowser_activeShadersChanged( GlobalTextureBrowser() ); } -void TextureBrowser_exportTitle( const StringImportCallback& importer ){ +void TextureBrowser_exportTitle( const Callback & importer ){ StringOutputStream buffer( 64 ); buffer << "Textures: "; if ( !string_empty( g_TextureBrowser_currentDirectory.c_str() ) ) { @@ -2513,72 +2685,70 @@ void TextureBrowser_exportTitle( const StringImportCallback& importer ){ importer( buffer.c_str() ); } - -void TextureScaleImport( TextureBrowser& textureBrowser, int value ){ - switch ( value ) - { - case 0: - TextureBrowser_setScale( textureBrowser, 10 ); - break; - case 1: - TextureBrowser_setScale( textureBrowser, 25 ); - break; - case 2: - TextureBrowser_setScale( textureBrowser, 50 ); - break; - case 3: - TextureBrowser_setScale( textureBrowser, 100 ); - break; - case 4: - TextureBrowser_setScale( textureBrowser, 200 ); - break; - } -} -typedef ReferenceCaller1 TextureScaleImportCaller; - -void TextureScaleExport( TextureBrowser& textureBrowser, const IntImportCallback& importer ){ - switch ( textureBrowser.m_textureScale ) - { - case 10: - importer( 0 ); - break; - case 25: - importer( 1 ); - break; - case 50: - importer( 2 ); - break; - case 100: - importer( 3 ); - break; - case 200: - importer( 4 ); - break; +struct TextureScale { + static void Export(const TextureBrowser &self, const Callback &returnz) { + switch (self.m_textureScale) { + case 10: + returnz(0); + break; + case 25: + returnz(1); + break; + case 50: + returnz(2); + break; + case 100: + returnz(3); + break; + case 200: + returnz(4); + break; + } } -} -typedef ReferenceCaller1 TextureScaleExportCaller; + static void Import(TextureBrowser &self, int value) { + switch (value) { + case 0: + TextureBrowser_setScale(self, 10); + break; + case 1: + TextureBrowser_setScale(self, 25); + break; + case 2: + TextureBrowser_setScale(self, 50); + break; + case 3: + TextureBrowser_setScale(self, 100); + break; + case 4: + TextureBrowser_setScale(self, 200); + break; + } + } +}; -void UniformTextureSizeImport( TextureBrowser& textureBrowser, int value ){ +struct UniformTextureSize { + static void Export(const TextureBrowser &self, const Callback &returnz) { + returnz(g_TextureBrowser.m_uniformTextureSize); + } - if ( value > 16 ) - TextureBrowser_setUniformSize( textureBrowser, value ); -} -typedef ReferenceCaller1 UniformTextureSizeImportCaller; + static void Import(TextureBrowser &self, int value) { + if (value > 16) + TextureBrowser_setUniformSize(self, value); + } +}; void TextureBrowser_constructPreferences( PreferencesPage& page ){ page.appendCheckBox( "", "Texture scrollbar", - TextureBrowserImportShowScrollbarCaller( GlobalTextureBrowser() ), - BoolExportCaller( GlobalTextureBrowser().m_showTextureScrollbar ) + make_property(GlobalTextureBrowser()) ); { const char* texture_scale[] = { "10%", "25%", "50%", "100%", "200%" }; page.appendCombo( "Texture Thumbnail Scale", STRING_ARRAY_RANGE( texture_scale ), - IntImportCallback( TextureScaleImportCaller( GlobalTextureBrowser() ) ), - IntExportCallback( TextureScaleExportCaller( GlobalTextureBrowser() ) ) + make_property(GlobalTextureBrowser()) ); } page.appendSpinner( @@ -2597,62 +2767,52 @@ void TextureBrowser_constructPage( PreferenceGroup& group ){ PreferencesPage page( group.createPage( "Texture Browser", "Texture Browser Preferences" ) ); TextureBrowser_constructPreferences( page ); } + void TextureBrowser_registerPreferencesPage(){ - PreferencesDialog_addSettingsPage( FreeCaller1() ); + PreferencesDialog_addSettingsPage( makeCallbackF(TextureBrowser_constructPage) ); } #include "preferencesystem.h" #include "stringio.h" -typedef ReferenceCaller1 TextureBrowserSetScaleCaller; - - void TextureClipboard_textureSelected( const char* shader ); void TextureBrowser_Construct(){ - GlobalCommands_insert( "ShaderInfo", FreeCaller() ); - GlobalCommands_insert( "ShowUntagged", FreeCaller() ); - GlobalCommands_insert( "AddTag", FreeCaller() ); - GlobalCommands_insert( "RenameTag", FreeCaller() ); - GlobalCommands_insert( "DeleteTag", FreeCaller() ); - GlobalCommands_insert( "CopyTag", FreeCaller() ); - GlobalCommands_insert( "PasteTag", FreeCaller() ); - GlobalCommands_insert( "RefreshShaders", FreeCaller() ); - GlobalToggles_insert( "ShowInUse", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); - GlobalCommands_insert( "ShowAllTextures", FreeCaller(), Accelerator( 'A', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "ToggleTextures", FreeCaller(), Accelerator( 'T' ) ); - GlobalToggles_insert( "ToggleShowShaders", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaders_item ) ); - GlobalToggles_insert( "ToggleShowShaderlistOnly", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaderlistonly_item ) ); - GlobalToggles_insert( "FixedSize", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_fixedsize_item ) ); - GlobalToggles_insert( "FilterMissing", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_filternotex_item ) ); - GlobalToggles_insert( "FilterFallback", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hidenotex_item ) ); - GlobalToggles_insert( "EnableAlpha", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_enablealpha_item ) ); - - GlobalPreferenceSystem().registerPreference( "TextureScale", - makeSizeStringImportCallback( TextureBrowserSetScaleCaller( g_TextureBrowser ) ), - SizeExportStringCaller( g_TextureBrowser.m_textureScale ) - ); - GlobalPreferenceSystem().registerPreference( "UniformTextureSize", - makeIntStringImportCallback(UniformTextureSizeImportCaller(g_TextureBrowser)), - IntExportStringCaller(g_TextureBrowser.m_uniformTextureSize) ); - GlobalPreferenceSystem().registerPreference( "TextureScrollbar", - makeBoolStringImportCallback( TextureBrowserImportShowScrollbarCaller( g_TextureBrowser ) ), - BoolExportStringCaller( GlobalTextureBrowser().m_showTextureScrollbar ) - ); - GlobalPreferenceSystem().registerPreference( "ShowShaders", BoolImportStringCaller( GlobalTextureBrowser().m_showShaders ), BoolExportStringCaller( GlobalTextureBrowser().m_showShaders ) ); - GlobalPreferenceSystem().registerPreference( "ShowShaderlistOnly", BoolImportStringCaller( g_TextureBrowser_shaderlistOnly ), BoolExportStringCaller( g_TextureBrowser_shaderlistOnly ) ); - GlobalPreferenceSystem().registerPreference( "FixedSize", BoolImportStringCaller( g_TextureBrowser_fixedSize ), BoolExportStringCaller( g_TextureBrowser_fixedSize ) ); - GlobalPreferenceSystem().registerPreference( "FilterMissing", BoolImportStringCaller( g_TextureBrowser_filterMissing ), BoolExportStringCaller( g_TextureBrowser_filterMissing ) ); - GlobalPreferenceSystem().registerPreference( "EnableAlpha", BoolImportStringCaller( g_TextureBrowser_enableAlpha ), BoolExportStringCaller( g_TextureBrowser_enableAlpha ) ); - GlobalPreferenceSystem().registerPreference( "LoadShaders", IntImportStringCaller( reinterpret_cast( GlobalTextureBrowser().m_startupShaders ) ), IntExportStringCaller( reinterpret_cast( GlobalTextureBrowser().m_startupShaders ) ) ); - GlobalPreferenceSystem().registerPreference( "WheelMouseInc", SizeImportStringCaller( GlobalTextureBrowser().m_mouseWheelScrollIncrement ), SizeExportStringCaller( GlobalTextureBrowser().m_mouseWheelScrollIncrement ) ); - GlobalPreferenceSystem().registerPreference( "SI_Colors0", Vector3ImportStringCaller( GlobalTextureBrowser().color_textureback ), Vector3ExportStringCaller( GlobalTextureBrowser().color_textureback ) ); + GlobalCommands_insert( "ShaderInfo", makeCallbackF(TextureBrowser_shaderInfo) ); + GlobalCommands_insert( "ShowUntagged", makeCallbackF(TextureBrowser_showUntagged) ); + GlobalCommands_insert( "AddTag", makeCallbackF(TextureBrowser_addTag) ); + GlobalCommands_insert( "RenameTag", makeCallbackF(TextureBrowser_renameTag) ); + GlobalCommands_insert( "DeleteTag", makeCallbackF(TextureBrowser_deleteTag) ); + GlobalCommands_insert( "CopyTag", makeCallbackF(TextureBrowser_copyTag) ); + GlobalCommands_insert( "PasteTag", makeCallbackF(TextureBrowser_pasteTag) ); + GlobalCommands_insert( "RefreshShaders", makeCallbackF(VFS_Refresh) ); + GlobalToggles_insert( "ShowInUse", makeCallbackF(TextureBrowser_ToggleHideUnused), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); + GlobalCommands_insert( "ShowAllTextures", makeCallbackF(TextureBrowser_showAll), Accelerator( 'A', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "ToggleTextures", makeCallbackF(TextureBrowser_toggleShow), Accelerator( 'T' ) ); + GlobalToggles_insert( "ToggleShowShaders", makeCallbackF(TextureBrowser_ToggleShowShaders), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaders_item ) ); + GlobalToggles_insert( "ToggleShowShaderlistOnly", makeCallbackF(TextureBrowser_ToggleShowShaderListOnly), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaderlistonly_item ) ); + GlobalToggles_insert( "FixedSize", makeCallbackF(TextureBrowser_FixedSize), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_fixedsize_item ) ); + GlobalToggles_insert( "FilterMissing", makeCallbackF(TextureBrowser_FilterMissing), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_filternotex_item ) ); + GlobalToggles_insert( "FilterFallback", makeCallbackF(TextureBrowser_FilterFallback), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hidenotex_item ) ); + GlobalToggles_insert( "EnableAlpha", makeCallbackF(TextureBrowser_EnableAlpha), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_enablealpha_item ) ); + + GlobalPreferenceSystem().registerPreference( "TextureScale", make_property_string(g_TextureBrowser) ); + GlobalPreferenceSystem().registerPreference( "UniformTextureSize", make_property_string(g_TextureBrowser) ); + GlobalPreferenceSystem().registerPreference( "TextureScrollbar", make_property_string(GlobalTextureBrowser())); + GlobalPreferenceSystem().registerPreference( "ShowShaders", make_property_string( GlobalTextureBrowser().m_showShaders ) ); + GlobalPreferenceSystem().registerPreference( "ShowShaderlistOnly", make_property_string( g_TextureBrowser_shaderlistOnly ) ); + GlobalPreferenceSystem().registerPreference( "FixedSize", make_property_string( g_TextureBrowser_fixedSize ) ); + GlobalPreferenceSystem().registerPreference( "FilterMissing", make_property_string( g_TextureBrowser_filterMissing ) ); + GlobalPreferenceSystem().registerPreference( "EnableAlpha", make_property_string( g_TextureBrowser_enableAlpha ) ); + GlobalPreferenceSystem().registerPreference( "LoadShaders", make_property_string( reinterpret_cast( GlobalTextureBrowser().m_startupShaders ) ) ); + GlobalPreferenceSystem().registerPreference( "WheelMouseInc", make_property_string( GlobalTextureBrowser().m_mouseWheelScrollIncrement ) ); + GlobalPreferenceSystem().registerPreference( "SI_Colors0", make_property_string( GlobalTextureBrowser().color_textureback ) ); g_TextureBrowser.shader = texdef_name_default(); - Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); TextureBrowser_registerPreferencesPage(); @@ -2660,8 +2820,15 @@ void TextureBrowser_Construct(){ TextureBrowser_textureSelected = TextureClipboard_textureSelected; } + void TextureBrowser_Destroy(){ GlobalShaderSystem().detach( g_ShadersObserver ); - Textures_setModeChangedNotify( Callback() ); + Textures_setModeChangedNotify( Callback() ); +} + +#if WORKAROUND_WINDOWS_GTK2_GLWIDGET +ui::GLArea TextureBrowser_getGLWidget(){ + return GlobalTextureBrowser().m_gl_widget; } +#endif // WORKAROUND_WINDOWS_GTK2_GLWIDGET