From a3453011c1ae2b6363707862755a4fa0bd5cd4dd Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Tue, 15 May 2012 11:48:55 +0200 Subject: [PATCH] uncrustify this file for better merging --- radiant/texwindow.cpp | 4325 ++++++++++++++++++++--------------------- 1 file changed, 2062 insertions(+), 2263 deletions(-) diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 19bbc115..98f8ac27 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1,23 +1,23 @@ /* -Copyright (C) 1999-2006 Id Software, Inc. and contributors. -For a list of contributors, see the accompanying CONTRIBUTORS file. + 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. + This file is part of GtkRadiant. -GtkRadiant is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -GtkRadiant is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with GtkRadiant; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ // // Texture Window @@ -89,111 +89,108 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "shaders.h" #include "commands.h" -bool TextureBrowser_showWads() -{ - return !string_empty(g_pGameDescription->getKeyValue("show_wads")); +bool TextureBrowser_showWads(){ + return !string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ); } -void TextureBrowser_queueDraw(TextureBrowser& textureBrowser); +void TextureBrowser_queueDraw( TextureBrowser& textureBrowser ); -bool string_equal_start(const char* string, StringRange start) -{ - return string_equal_n(string, start.first, start.last - start.first); +bool string_equal_start( const char* string, StringRange start ){ + return string_equal_n( string, start.first, start.last - start.first ); } typedef std::set TextureGroups; -void TextureGroups_addWad(TextureGroups& groups, const char* archive) -{ - if(extension_equal(path_get_extension(archive), "wad")) - { +void TextureGroups_addWad( TextureGroups& groups, const char* archive ){ + if ( extension_equal( path_get_extension( archive ), "wad" ) ) { #if 1 - groups.insert(archive); + groups.insert( archive ); #else - CopiedString archiveBaseName(path_get_filename_start(archive), path_get_filename_base_end(archive)); - groups.insert(archiveBaseName); + CopiedString archiveBaseName( path_get_filename_start( archive ), path_get_filename_base_end( archive ) ); + groups.insert( archiveBaseName ); #endif - } + } } typedef ReferenceCaller1 TextureGroupsAddWadCaller; namespace { - bool softGroups(); +bool softGroups(); - CopiedString Texture_getCategoryByName(const char *tex) - { - char *n = string_clone(tex); - int l = string_length(n); - char *s = strrchr(n, '/'); - char *p = strchr(s ? (s+1) : n, '-'); - if(softGroups()) - { - if(s ? (p >= s) : (p != NULL)) - p[1] = 0; - else if(s) - s[1] = 0; - else - n[0] = 0; +CopiedString Texture_getCategoryByName( const char *tex ){ + char *n = string_clone( tex ); + int l = string_length( n ); + char *s = strrchr( n, '/' ); + char *p = strchr( s ? ( s + 1 ) : n, '-' ); + if ( softGroups() ) { + if ( s ? ( p >= s ) : ( p != NULL ) ) { + p[1] = 0; } - else - { - if(s) - s[0] = 0; - else - n[0] = 0; + else if ( s ) { + s[1] = 0; + } + else{ + n[0] = 0; } - CopiedString cs(n); - string_release(n, l); - return cs; } - CopiedString Texture_getCategoryDirectory(const char *cat) + else { - if(!softGroups()) - { - StringOutputStream o(64); - if(string_length(cat)) - o << cat << "/"; - return o.c_str(); - } - char *n = string_clone(cat); - int l = string_length(n); - if(l == 0) - { - string_release(n, l); - return ""; + if ( s ) { + s[0] = 0; + } + else{ + n[0] = 0; } - CopiedString cs; - char *p = strrchr(n, '/'); - if(p) - cs = StringRange(n, p+1); - else - cs = ""; - string_release(n, l); - return cs; } - bool Texture_matchCategory(const char *matchcat, const char *texcat) - { - int l = string_length(matchcat); - if(softGroups()) - { - if(l > 0 && matchcat[l-1] == '*') - return string_equal_n(texcat, matchcat, l-1); + CopiedString cs( n ); + string_release( n, l ); + return cs; +} +CopiedString Texture_getCategoryDirectory( const char *cat ){ + if ( !softGroups() ) { + StringOutputStream o( 64 ); + if ( string_length( cat ) ) { + o << cat << "/"; + } + return o.c_str(); + } + char *n = string_clone( cat ); + int l = string_length( n ); + if ( l == 0 ) { + string_release( n, l ); + return ""; + } + CopiedString cs; + char *p = strrchr( n, '/' ); + if ( p ) { + cs = StringRange( n, p + 1 ); + } + else{ + cs = ""; + } + string_release( n, l ); + return cs; +} +bool Texture_matchCategory( const char *matchcat, const char *texcat ){ + int l = string_length( matchcat ); + if ( softGroups() ) { + if ( l > 0 && matchcat[l - 1] == '*' ) { + return string_equal_n( texcat, matchcat, l - 1 ); } - return string_equal(texcat, matchcat); } + return string_equal( texcat, matchcat ); +} }; -void TextureGroups_addShader(TextureGroups& groups, const char* shaderName) -{ - const char* texture = path_make_relative(shaderName, "textures/"); +void TextureGroups_addShader( TextureGroups& groups, const char* shaderName ){ + const char* texture = path_make_relative( shaderName, "textures/" ); globalErrorStream() << texture << "\n"; - if(texture != shaderName) - { - CopiedString n = Texture_getCategoryByName(texture); - if(!string_empty(n.c_str())) - groups.insert(n); + if ( texture != shaderName ) { + CopiedString n = Texture_getCategoryByName( texture ); + if ( !string_empty( n.c_str() ) ) { + groups.insert( n ); + } } } typedef ReferenceCaller1 TextureGroupsAddShaderCaller; @@ -202,91 +199,79 @@ typedef ReferenceCaller1 Te class FindTexturesByTypeVisitor : public ImageModules::Visitor { - TextureGroups& m_groups; - const char* m_dirstring; - void visitFile(const char *name) const - { - StringOutputStream dirstring(64); - dirstring << m_dirstring << name; - TextureGroups_addShader(m_groups, dirstring.c_str()); - } - typedef ConstMemberCaller1 VisitFileMemberCaller; +TextureGroups& m_groups; +const char* m_dirstring; +void visitFile( const char *name ) const { + StringOutputStream dirstring( 64 ); + dirstring << m_dirstring << name; + TextureGroups_addShader( m_groups, dirstring.c_str() ); +} +typedef ConstMemberCaller1 VisitFileMemberCaller; public: - FindTexturesByTypeVisitor(TextureGroups& groups, const char* dirstring) - : m_groups(groups), m_dirstring(dirstring) - { - } - void visit(const char* minor, const _QERPlugImageTable& table) const - { - GlobalFileSystem().forEachFile(m_dirstring, minor, VisitFileMemberCaller(*this)); - } +FindTexturesByTypeVisitor( TextureGroups& groups, const char* dirstring ) + : m_groups( groups ), m_dirstring( dirstring ){ +} +void visit( const char* minor, const _QERPlugImageTable& table ) const { + GlobalFileSystem().forEachFile( m_dirstring, minor, VisitFileMemberCaller( *this ) ); +} }; -void TextureGroups_addDirectory(TextureGroups& groups, const char* directory) -{ - if(softGroups()) - { +void TextureGroups_addDirectory( TextureGroups& groups, const char* directory ){ + if ( softGroups() ) { // enumerate all files, find dashes - StringOutputStream dirstring(64); + StringOutputStream dirstring( 64 ); dirstring << "textures/" << directory << "/"; - Radiant_getImageModules().foreachModule(FindTexturesByTypeVisitor(groups, dirstring.c_str())); + Radiant_getImageModules().foreachModule( FindTexturesByTypeVisitor( groups, dirstring.c_str() ) ); } else { - groups.insert(directory); + groups.insert( directory ); } } typedef ReferenceCaller1 TextureGroupsAddDirectoryCaller; namespace { - bool g_TextureBrowser_shaderlistOnly = false; - bool g_TextureBrowser_fixedSize = false; - bool g_TextureBrowser_filterNotex = false; +bool g_TextureBrowser_shaderlistOnly = false; +bool g_TextureBrowser_fixedSize = false; +bool g_TextureBrowser_filterNotex = false; } class DeferredAdjustment { - gdouble m_value; - guint m_handler; - typedef void (*ValueChangedFunction)(void* data, gdouble value); - ValueChangedFunction m_function; - void* m_data; - - static gboolean deferred_value_changed(gpointer data) - { - reinterpret_cast(data)->m_function( - reinterpret_cast(data)->m_data, - reinterpret_cast(data)->m_value - ); - reinterpret_cast(data)->m_handler = 0; - reinterpret_cast(data)->m_value = 0; - return FALSE; - } +gdouble m_value; +guint m_handler; +typedef void ( *ValueChangedFunction )( void* data, gdouble value ); +ValueChangedFunction m_function; +void* m_data; + +static gboolean deferred_value_changed( gpointer data ){ + reinterpret_cast( data )->m_function( + reinterpret_cast( data )->m_data, + reinterpret_cast( data )->m_value + ); + reinterpret_cast( data )->m_handler = 0; + 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) - { - self->value_changed(adjustment->value); - } +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 ){ + self->value_changed( adjustment->value ); +} }; @@ -295,758 +280,702 @@ class TextureBrowser; typedef ReferenceCaller TextureBrowserQueueDrawCaller; -void TextureBrowser_scrollChanged(void* data, gdouble value); +void TextureBrowser_scrollChanged( void* data, gdouble value ); enum StartupShaders { - STARTUPSHADERS_NONE = 0, - STARTUPSHADERS_COMMON, + STARTUPSHADERS_NONE = 0, + STARTUPSHADERS_COMMON, }; -void TextureBrowser_hideUnusedExport(const BoolImportCallback& importer); +void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ); typedef FreeCaller1 TextureBrowserHideUnusedExport; -void TextureBrowser_showShadersExport(const BoolImportCallback& importer); +void TextureBrowser_showShadersExport( const BoolImportCallback& importer ); typedef FreeCaller1 TextureBrowserShowShadersExport; -void TextureBrowser_softGroupsExport(const BoolImportCallback& importer); +void TextureBrowser_softGroupsExport( const BoolImportCallback& importer ); typedef FreeCaller1 TextureBrowserSoftGroupsExport; -void TextureBrowser_showShaderlistOnly(const BoolImportCallback& importer); +void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ); typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; -void TextureBrowser_fixedSize(const BoolImportCallback& importer); +void TextureBrowser_fixedSize( const BoolImportCallback& importer ); typedef FreeCaller1 TextureBrowserFixedSizeExport; -void TextureBrowser_filterNotex(const BoolImportCallback& importer); +void TextureBrowser_filterNotex( const BoolImportCallback& importer ); typedef FreeCaller1 TextureBrowserFilterNotexExport; class TextureBrowser { public: - int width, height; - int originy; - int m_nTotalHeight; - - CopiedString shader; - - GtkWindow* m_parent; - GtkWidget* m_gl_widget; - GtkWidget* m_texture_scroll; - GtkWidget* m_treeViewTree; - GtkWidget* m_treeViewTags; - GtkWidget* m_tag_frame; - GtkListStore* m_assigned_store; - GtkListStore* m_available_store; - GtkWidget* m_assigned_tree; - GtkWidget* m_available_tree; - GtkWidget* m_scr_win_tree; - GtkWidget* m_scr_win_tags; - GtkWidget* m_tag_notebook; - GtkWidget* m_search_button; - GtkWidget* m_shader_info_item; - - std::set m_all_tags; - GtkListStore* m_all_tags_list; - std::vector m_copied_tags; - std::set m_found_shaders; - - ToggleItem m_hideunused_item; - ToggleItem m_showshaders_item; - ToggleItem m_showshaderlistonly_item; - ToggleItem m_softgroups_item; - ToggleItem m_fixedsize_item; - ToggleItem m_filternotex_item; - - guint m_sizeHandler; - guint m_exposeHandler; - - bool m_heightChanged; - bool m_originInvalid; - - DeferredAdjustment m_scrollAdjustment; - FreezePointer m_freezePointer; - - Vector3 color_textureback; - // the increment step we use against the wheel mouse - std::size_t m_mouseWheelScrollIncrement; - std::size_t m_textureScale; - // make the texture increments match the grid changes - bool m_showShaders; - bool m_softGroups; - bool m_showTextureScrollbar; - StartupShaders m_startupShaders; - // if true, the texture window will only display in-use shaders - // if false, all the shaders in memory are displayed - bool m_hideUnused; - bool m_rmbSelected; - 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; - if (!g_TextureBrowser_fixedSize) - { - // Don't use uniform size - width = (int)(tex->width * ((float)m_textureScale / 100)); - } else if - (tex->width >= tex->height) - { - // Texture is square, or wider than it is tall - width = m_uniformTextureSize; - } else { - // Otherwise, preserve the texture's aspect ratio - width = (int)(m_uniformTextureSize * ((float)tex->width / tex->height)); - } - return width; - } - // Return the display height of a texture in the texture browser - int getTextureHeight(qtexture_t* tex) - { - int height; - if (!g_TextureBrowser_fixedSize) - { - // Don't use uniform size - height = (int)(tex->height * ((float)m_textureScale / 100)); - } else if (tex->height >= tex->width) - { - // Texture is square, or taller than it is wide - height = m_uniformTextureSize; - } else { - // Otherwise, preserve the texture's aspect ratio - height = (int)(m_uniformTextureSize * ((float)tex->height / tex->width)); - } - return height; - } - - TextureBrowser() : - m_texture_scroll(0), - m_hideunused_item(TextureBrowserHideUnusedExport()), - m_showshaders_item(TextureBrowserShowShadersExport()), - m_showshaderlistonly_item(TextureBrowserShowShaderlistOnlyExport()), - m_softgroups_item(TextureBrowserSoftGroupsExport()), - m_fixedsize_item(TextureBrowserFixedSizeExport()), - m_filternotex_item(TextureBrowserFilterNotexExport()), - m_heightChanged(true), - m_originInvalid(true), - m_scrollAdjustment(TextureBrowser_scrollChanged, this), - color_textureback(0.25f, 0.25f, 0.25f), - m_mouseWheelScrollIncrement(64), - m_textureScale(50), - m_showShaders(true), - m_showTextureScrollbar(true), - m_startupShaders(STARTUPSHADERS_NONE), - m_hideUnused(false), - m_rmbSelected(false), - m_searchedTags(false), - m_tags(false), - m_uniformTextureSize(128) - { - } +int width, height; +int originy; +int m_nTotalHeight; + +CopiedString shader; + +GtkWindow* m_parent; +GtkWidget* m_gl_widget; +GtkWidget* m_texture_scroll; +GtkWidget* m_treeViewTree; +GtkWidget* m_treeViewTags; +GtkWidget* m_tag_frame; +GtkListStore* m_assigned_store; +GtkListStore* m_available_store; +GtkWidget* m_assigned_tree; +GtkWidget* m_available_tree; +GtkWidget* m_scr_win_tree; +GtkWidget* m_scr_win_tags; +GtkWidget* m_tag_notebook; +GtkWidget* m_search_button; +GtkWidget* m_shader_info_item; + +std::set m_all_tags; +GtkListStore* m_all_tags_list; +std::vector m_copied_tags; +std::set m_found_shaders; + +ToggleItem m_hideunused_item; +ToggleItem m_showshaders_item; +ToggleItem m_showshaderlistonly_item; +ToggleItem m_softgroups_item; +ToggleItem m_fixedsize_item; +ToggleItem m_filternotex_item; + +guint m_sizeHandler; +guint m_exposeHandler; + +bool m_heightChanged; +bool m_originInvalid; + +DeferredAdjustment m_scrollAdjustment; +FreezePointer m_freezePointer; + +Vector3 color_textureback; +// the increment step we use against the wheel mouse +std::size_t m_mouseWheelScrollIncrement; +std::size_t m_textureScale; +// make the texture increments match the grid changes +bool m_showShaders; +bool m_softGroups; +bool m_showTextureScrollbar; +StartupShaders m_startupShaders; +// if true, the texture window will only display in-use shaders +// if false, all the shaders in memory are displayed +bool m_hideUnused; +bool m_rmbSelected; +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; + if ( !g_TextureBrowser_fixedSize ) { + // Don't use uniform size + width = (int)( tex->width * ( (float)m_textureScale / 100 ) ); + } + else if + ( tex->width >= tex->height ) { + // Texture is square, or wider than it is tall + width = m_uniformTextureSize; + } + else { + // Otherwise, preserve the texture's aspect ratio + width = (int)( m_uniformTextureSize * ( (float)tex->width / tex->height ) ); + } + return width; +} +// Return the display height of a texture in the texture browser +int getTextureHeight( qtexture_t* tex ){ + int height; + if ( !g_TextureBrowser_fixedSize ) { + // Don't use uniform size + height = (int)( tex->height * ( (float)m_textureScale / 100 ) ); + } + else if ( tex->height >= tex->width ) { + // Texture is square, or taller than it is wide + height = m_uniformTextureSize; + } + else { + // Otherwise, preserve the texture's aspect ratio + height = (int)( m_uniformTextureSize * ( (float)tex->height / tex->width ) ); + } + return height; +} + +TextureBrowser() : + m_texture_scroll( 0 ), + m_hideunused_item( TextureBrowserHideUnusedExport() ), + m_showshaders_item( TextureBrowserShowShadersExport() ), + m_showshaderlistonly_item( TextureBrowserShowShaderlistOnlyExport() ), + m_softgroups_item( TextureBrowserSoftGroupsExport() ), + m_fixedsize_item( TextureBrowserFixedSizeExport() ), + m_filternotex_item( TextureBrowserFilterNotexExport() ), + m_heightChanged( true ), + m_originInvalid( true ), + m_scrollAdjustment( TextureBrowser_scrollChanged, this ), + color_textureback( 0.25f, 0.25f, 0.25f ), + m_mouseWheelScrollIncrement( 64 ), + m_textureScale( 50 ), + m_showShaders( true ), + m_showTextureScrollbar( true ), + m_startupShaders( STARTUPSHADERS_NONE ), + m_hideUnused( false ), + m_rmbSelected( false ), + m_searchedTags( false ), + m_tags( false ), + m_uniformTextureSize( 128 ){ +} }; namespace { - bool softGroups() - { - return GlobalTextureBrowser().m_softGroups; - } +bool softGroups(){ + return GlobalTextureBrowser().m_softGroups; +} }; -void(*TextureBrowser_textureSelected)(const char* shader); +void ( *TextureBrowser_textureSelected )( const char* shader ); -void TextureBrowser_updateScroll(TextureBrowser& textureBrowser); +void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ); -const char* TextureBrowser_getComonShadersName() -{ - const char* value = g_pGameDescription->getKeyValue("common_shaders_name"); - if(!string_empty(value)) - { - return value; - } - return "Common"; +const char* TextureBrowser_getComonShadersName(){ + const char* value = g_pGameDescription->getKeyValue( "common_shaders_name" ); + if ( !string_empty( value ) ) { + return value; + } + return "Common"; } -const char* TextureBrowser_getComonShadersDir() -{ - const char* value = g_pGameDescription->getKeyValue("common_shaders_dir"); - if(!string_empty(value)) - { - return value; - } - return "common/"; +const char* TextureBrowser_getComonShadersDir(){ + const char* value = g_pGameDescription->getKeyValue( "common_shaders_dir" ); + if ( !string_empty( value ) ) { + return value; + } + return "common/"; } -inline int TextureBrowser_fontHeight(TextureBrowser& textureBrowser) -{ - return GlobalOpenGL().m_font->getPixelHeight(); +inline int TextureBrowser_fontHeight( TextureBrowser& textureBrowser ){ + return GlobalOpenGL().m_font->getPixelHeight(); } -const char* TextureBrowser_GetSelectedShader(TextureBrowser& textureBrowser) -{ - return textureBrowser.shader.c_str(); +const char* TextureBrowser_GetSelectedShader( TextureBrowser& textureBrowser ){ + return textureBrowser.shader.c_str(); } -void TextureBrowser_SetStatus(TextureBrowser& textureBrowser, const char* name) -{ - IShader* shader = QERApp_Shader_ForName( name); - qtexture_t* q = shader->getTexture(); - StringOutputStream strTex(256); - strTex << name << " W: " << Unsigned(q->width) << " H: " << Unsigned(q->height); - shader->DecRef(); - g_pParentWnd->SetStatusText(g_pParentWnd->m_texture_status, strTex.c_str()); +void TextureBrowser_SetStatus( TextureBrowser& textureBrowser, const char* name ){ + IShader* shader = QERApp_Shader_ForName( name ); + qtexture_t* q = shader->getTexture(); + StringOutputStream strTex( 256 ); + strTex << name << " W: " << Unsigned( q->width ) << " H: " << Unsigned( q->height ); + shader->DecRef(); + g_pParentWnd->SetStatusText( g_pParentWnd->m_texture_status, strTex.c_str() ); } -void TextureBrowser_Focus(TextureBrowser& textureBrowser, const char* name); +void TextureBrowser_Focus( TextureBrowser& textureBrowser, const char* name ); -void TextureBrowser_SetSelectedShader(TextureBrowser& textureBrowser, const char* shader) -{ - textureBrowser.shader = shader; - TextureBrowser_SetStatus(textureBrowser, shader); - TextureBrowser_Focus(textureBrowser, shader); +void TextureBrowser_SetSelectedShader( TextureBrowser& textureBrowser, const char* shader ){ + textureBrowser.shader = shader; + TextureBrowser_SetStatus( textureBrowser, shader ); + TextureBrowser_Focus( textureBrowser, shader ); - if(FindTextureDialog_isOpen()) - { - FindTextureDialog_selectTexture(shader); - } + if ( FindTextureDialog_isOpen() ) { + FindTextureDialog_selectTexture( shader ); + } - // disable the menu item "shader info" if no shader was selected - IShader* ishader = QERApp_Shader_ForName(shader); - CopiedString filename = ishader->getShaderFileName(); + // disable the menu item "shader info" if no shader was selected + IShader* ishader = QERApp_Shader_ForName( shader ); + CopiedString filename = ishader->getShaderFileName(); - if(filename.empty()) - { - if(textureBrowser.m_shader_info_item != NULL) - { - gtk_widget_set_sensitive(textureBrowser.m_shader_info_item, FALSE); - } - } else { - gtk_widget_set_sensitive(textureBrowser.m_shader_info_item, TRUE); - } + if ( filename.empty() ) { + if ( textureBrowser.m_shader_info_item != NULL ) { + gtk_widget_set_sensitive( textureBrowser.m_shader_info_item, FALSE ); + } + } + else { + gtk_widget_set_sensitive( textureBrowser.m_shader_info_item, TRUE ); + } - ishader->DecRef(); + ishader->DecRef(); } CopiedString g_TextureBrowser_currentDirectory; /* -============================================================================ + ============================================================================ -TEXTURE LAYOUT + TEXTURE LAYOUT -TTimo: now based on a rundown through all the shaders -NOTE: we expect the Active shaders count doesn't change during a Texture_StartPos .. Texture_NextPos cycle - otherwise we may need to rely on a list instead of an array storage -============================================================================ -*/ + TTimo: now based on a rundown through all the shaders + NOTE: we expect the Active shaders count doesn't change during a Texture_StartPos .. Texture_NextPos cycle + otherwise we may need to rely on a list instead of an array storage + ============================================================================ + */ class TextureLayout { public: - // texture layout functions - // TTimo: now based on shaders - int current_x, current_y, current_row; +// texture layout functions +// TTimo: now based on shaders +int current_x, current_y, current_row; }; -void Texture_StartPos(TextureLayout& layout) -{ - layout.current_x = 8; - layout.current_y = -8; - layout.current_row = 0; +void Texture_StartPos( TextureLayout& layout ){ + layout.current_x = 8; + layout.current_y = -8; + layout.current_row = 0; } -void Texture_NextPos(TextureBrowser& textureBrowser, TextureLayout& layout, qtexture_t* current_texture, int *x, int *y) -{ - qtexture_t* q = current_texture; +void Texture_NextPos( TextureBrowser& textureBrowser, TextureLayout& layout, qtexture_t* current_texture, int *x, int *y ){ + qtexture_t* q = current_texture; - int nWidth = textureBrowser.getTextureWidth(q); - int nHeight = textureBrowser.getTextureHeight(q); - if (layout.current_x + nWidth > textureBrowser.width-8 && layout.current_row) - { // go to the next row unless the texture is the first on the row - layout.current_x = 8; - layout.current_y -= layout.current_row + TextureBrowser_fontHeight(textureBrowser) + 4; - layout.current_row = 0; - } + int nWidth = textureBrowser.getTextureWidth( q ); + int nHeight = textureBrowser.getTextureHeight( q ); + if ( layout.current_x + nWidth > textureBrowser.width - 8 && layout.current_row ) { // go to the next row unless the texture is the first on the row + layout.current_x = 8; + layout.current_y -= layout.current_row + TextureBrowser_fontHeight( textureBrowser ) + 4; + layout.current_row = 0; + } - *x = layout.current_x; - *y = layout.current_y; + *x = layout.current_x; + *y = layout.current_y; - // Is our texture larger than the row? If so, grow the - // row height to match it + // Is our texture larger than the row? If so, grow the + // row height to match it - if (layout.current_row < nHeight) - layout.current_row = nHeight; + if ( layout.current_row < nHeight ) { + layout.current_row = nHeight; + } - // never go less than 96, or the names get all crunched up - layout.current_x += nWidth < 96 ? 96 : nWidth; - layout.current_x += 8; + // never go less than 96, or the names get all crunched up + layout.current_x += nWidth < 96 ? 96 : nWidth; + layout.current_x += 8; } -bool TextureSearch_IsShown(const char* name) -{ - std::set::iterator iter; +bool TextureSearch_IsShown( const char* name ){ + std::set::iterator iter; - iter = GlobalTextureBrowser().m_found_shaders.find(name); + iter = GlobalTextureBrowser().m_found_shaders.find( name ); - if(iter == GlobalTextureBrowser().m_found_shaders.end()) - { - return false; - } else { - return true; - } + if ( iter == GlobalTextureBrowser().m_found_shaders.end() ) { + return false; + } + else { + return true; + } } CopiedString g_notex; CopiedString g_shadernotex; // if texture_showinuse jump over non in-use textures -bool Texture_IsShown(IShader* shader, bool show_shaders, bool hideUnused) -{ - // filter notex / shadernotex images - if(g_TextureBrowser_filterNotex && (string_equal(g_notex.c_str(), shader->getTexture()->name) || string_equal(g_shadernotex.c_str(), shader->getTexture()->name))) - { - return false; - } - - if(g_TextureBrowser_currentDirectory == "Untagged") - { - std::set::iterator iter; +bool Texture_IsShown( IShader* shader, bool show_shaders, bool hideUnused ){ + // filter notex / shadernotex images + if ( g_TextureBrowser_filterNotex && ( string_equal( g_notex.c_str(), shader->getTexture()->name ) || string_equal( g_shadernotex.c_str(), shader->getTexture()->name ) ) ) { + return false; + } - iter = GlobalTextureBrowser().m_found_shaders.find(shader->getName()); + if ( g_TextureBrowser_currentDirectory == "Untagged" ) { + std::set::iterator iter; - if(iter == GlobalTextureBrowser().m_found_shaders.end()) - { - return false; - } else { - return true; + iter = GlobalTextureBrowser().m_found_shaders.find( shader->getName() ); + + if ( iter == GlobalTextureBrowser().m_found_shaders.end() ) { + return false; + } + else { + return true; + } } - } - if(!shader_equal_prefix(shader->getName(), "textures/")) - return false; + if ( !shader_equal_prefix( shader->getName(), "textures/" ) ) { + return false; + } - if (!show_shaders && !shader->IsDefault()) - return false; + if ( !show_shaders && !shader->IsDefault() ) { + return false; + } - if(hideUnused && !shader->IsInUse()) - return false; + if ( hideUnused && !shader->IsInUse() ) { + return false; + } - if(GlobalTextureBrowser().m_searchedTags) - { - if(!TextureSearch_IsShown(shader->getName())) - { - return false; - } else { - return true; + if ( GlobalTextureBrowser().m_searchedTags ) { + if ( !TextureSearch_IsShown( shader->getName() ) ) { + return false; + } + else { + return true; + } + } + else { + if ( !Texture_matchCategory( g_TextureBrowser_currentDirectory.c_str(), Texture_getCategoryByName( shader_get_textureName( shader->getName() ) ).c_str() ) ) { + return false; + } } - } else { - if(!Texture_matchCategory(g_TextureBrowser_currentDirectory.c_str(), Texture_getCategoryByName(shader_get_textureName(shader->getName())).c_str())) - return false; - } - return true; + return true; } -void TextureBrowser_heightChanged(TextureBrowser& textureBrowser) -{ - textureBrowser.m_heightChanged = true; +void TextureBrowser_heightChanged( TextureBrowser& textureBrowser ){ + textureBrowser.m_heightChanged = true; - TextureBrowser_updateScroll(textureBrowser); - TextureBrowser_queueDraw(textureBrowser); + TextureBrowser_updateScroll( textureBrowser ); + TextureBrowser_queueDraw( textureBrowser ); } -void TextureBrowser_evaluateHeight(TextureBrowser& textureBrowser) -{ - if(textureBrowser.m_heightChanged) - { - textureBrowser.m_heightChanged = false; +void TextureBrowser_evaluateHeight( TextureBrowser& textureBrowser ){ + if ( textureBrowser.m_heightChanged ) { + textureBrowser.m_heightChanged = false; - textureBrowser.m_nTotalHeight = 0; + textureBrowser.m_nTotalHeight = 0; - TextureLayout layout; - Texture_StartPos(layout); - for(QERApp_ActiveShaders_IteratorBegin(); !QERApp_ActiveShaders_IteratorAtEnd(); QERApp_ActiveShaders_IteratorIncrement()) - { - IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); + TextureLayout layout; + Texture_StartPos( layout ); + for ( QERApp_ActiveShaders_IteratorBegin(); !QERApp_ActiveShaders_IteratorAtEnd(); QERApp_ActiveShaders_IteratorIncrement() ) + { + IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); - if(!Texture_IsShown(shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused)) - continue; + if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused ) ) { + continue; + } - int x, y; - Texture_NextPos(textureBrowser, layout, shader->getTexture(), &x, &y); - textureBrowser.m_nTotalHeight = std::max(textureBrowser.m_nTotalHeight, abs(layout.current_y) + TextureBrowser_fontHeight(textureBrowser) + textureBrowser.getTextureHeight(shader->getTexture()) + 4); - } - } + int x, y; + Texture_NextPos( textureBrowser, layout, shader->getTexture(), &x, &y ); + textureBrowser.m_nTotalHeight = std::max( textureBrowser.m_nTotalHeight, abs( layout.current_y ) + TextureBrowser_fontHeight( textureBrowser ) + textureBrowser.getTextureHeight( shader->getTexture() ) + 4 ); + } + } } -int TextureBrowser_TotalHeight(TextureBrowser& textureBrowser) -{ - TextureBrowser_evaluateHeight(textureBrowser); - return textureBrowser.m_nTotalHeight; +int TextureBrowser_TotalHeight( TextureBrowser& textureBrowser ){ + TextureBrowser_evaluateHeight( textureBrowser ); + return textureBrowser.m_nTotalHeight; } -inline const int& min_int(const int& left, const int& right) -{ - return std::min(left, right); +inline const int& min_int( const int& left, const int& right ){ + return std::min( left, right ); } -void TextureBrowser_clampOriginY(TextureBrowser& textureBrowser) -{ - if(textureBrowser.originy > 0) - { - textureBrowser.originy = 0; - } - int lower = min_int(textureBrowser.height - TextureBrowser_TotalHeight(textureBrowser), 0); - if(textureBrowser.originy < lower) - { - textureBrowser.originy = lower; - } -} - -int TextureBrowser_getOriginY(TextureBrowser& textureBrowser) -{ - if(textureBrowser.m_originInvalid) - { - textureBrowser.m_originInvalid = false; - TextureBrowser_clampOriginY(textureBrowser); - TextureBrowser_updateScroll(textureBrowser); - } - return textureBrowser.originy; +void TextureBrowser_clampOriginY( TextureBrowser& textureBrowser ){ + if ( textureBrowser.originy > 0 ) { + textureBrowser.originy = 0; + } + int lower = min_int( textureBrowser.height - TextureBrowser_TotalHeight( textureBrowser ), 0 ); + if ( textureBrowser.originy < lower ) { + textureBrowser.originy = lower; + } } -void TextureBrowser_setOriginY(TextureBrowser& textureBrowser, int originy) -{ - textureBrowser.originy = originy; - TextureBrowser_clampOriginY(textureBrowser); - TextureBrowser_updateScroll(textureBrowser); - TextureBrowser_queueDraw(textureBrowser); +int TextureBrowser_getOriginY( TextureBrowser& textureBrowser ){ + if ( textureBrowser.m_originInvalid ) { + textureBrowser.m_originInvalid = false; + TextureBrowser_clampOriginY( textureBrowser ); + TextureBrowser_updateScroll( textureBrowser ); + } + return textureBrowser.originy; +} + +void TextureBrowser_setOriginY( TextureBrowser& textureBrowser, int originy ){ + textureBrowser.originy = originy; + TextureBrowser_clampOriginY( textureBrowser ); + TextureBrowser_updateScroll( textureBrowser ); + TextureBrowser_queueDraw( textureBrowser ); } Signal0 g_activeShadersChangedCallbacks; -void TextureBrowser_addActiveShadersChangedCallback(const SignalHandler& handler) -{ - g_activeShadersChangedCallbacks.connectLast(handler); +void TextureBrowser_addActiveShadersChangedCallback( const SignalHandler& handler ){ + g_activeShadersChangedCallbacks.connectLast( handler ); } class ShadersObserver : public ModuleObserver { - Signal0 m_realiseCallbacks; +Signal0 m_realiseCallbacks; public: - void realise() - { - m_realiseCallbacks(); - } - void unrealise() - { - } - void insert(const SignalHandler& handler) - { - m_realiseCallbacks.connectLast(handler); - } +void realise(){ + m_realiseCallbacks(); +} +void unrealise(){ +} +void insert( const SignalHandler& handler ){ + m_realiseCallbacks.connectLast( handler ); +} }; namespace { - ShadersObserver g_ShadersObserver; +ShadersObserver g_ShadersObserver; } -void TextureBrowser_addShadersRealiseCallback(const SignalHandler& handler) -{ - g_ShadersObserver.insert(handler); +void TextureBrowser_addShadersRealiseCallback( const SignalHandler& handler ){ + g_ShadersObserver.insert( handler ); } -void TextureBrowser_activeShadersChanged(TextureBrowser& textureBrowser) -{ - TextureBrowser_heightChanged(textureBrowser); - textureBrowser.m_originInvalid = true; +void TextureBrowser_activeShadersChanged( TextureBrowser& textureBrowser ){ + TextureBrowser_heightChanged( textureBrowser ); + textureBrowser.m_originInvalid = true; - g_activeShadersChangedCallbacks(); + g_activeShadersChangedCallbacks(); } -void TextureBrowser_importShowScrollbar(TextureBrowser& textureBrowser, bool value) -{ - textureBrowser.m_showTextureScrollbar = value; - if(textureBrowser.m_texture_scroll != 0) - { - widget_set_visible(textureBrowser.m_texture_scroll, textureBrowser.m_showTextureScrollbar); - TextureBrowser_updateScroll(textureBrowser); - } +void TextureBrowser_importShowScrollbar( TextureBrowser& textureBrowser, bool value ){ + textureBrowser.m_showTextureScrollbar = value; + if ( textureBrowser.m_texture_scroll != 0 ) { + widget_set_visible( textureBrowser.m_texture_scroll, textureBrowser.m_showTextureScrollbar ); + TextureBrowser_updateScroll( textureBrowser ); + } } typedef ReferenceCaller1 TextureBrowserImportShowScrollbarCaller; /* -============== -TextureBrowser_ShowDirectory -relies on texture_directory global for the directory to use -1) Load the shaders for the given directory -2) Scan the remaining texture, load them and assign them a default shader (the "noshader" shader) -NOTE: when writing a texture plugin, or some texture extensions, this function may need to be overriden, and made - available through the IShaders interface -NOTE: for texture window layout: - all shaders are stored with alphabetical order after load - previously loaded and displayed stuff is hidden, only in-use and newly loaded is shown - ( the GL textures are not flushed though) -============== -*/ - -bool endswith(const char *haystack, const char *needle) -{ - size_t lh = strlen(haystack); - size_t ln = strlen(needle); - if(lh < ln) + ============== + TextureBrowser_ShowDirectory + relies on texture_directory global for the directory to use + 1) Load the shaders for the given directory + 2) Scan the remaining texture, load them and assign them a default shader (the "noshader" shader) + NOTE: when writing a texture plugin, or some texture extensions, this function may need to be overriden, and made + available through the IShaders interface + NOTE: for texture window layout: + all shaders are stored with alphabetical order after load + previously loaded and displayed stuff is hidden, only in-use and newly loaded is shown + ( the GL textures are not flushed though) + ============== + */ + +bool endswith( const char *haystack, const char *needle ){ + size_t lh = strlen( haystack ); + size_t ln = strlen( needle ); + if ( lh < ln ) { return false; - return !memcmp(haystack + (lh - ln), needle, ln); -} - -bool texture_name_ignore(const char* name) -{ - StringOutputStream strTemp(string_length(name)); - strTemp << LowerCase(name); - - return - endswith(strTemp.c_str(), ".specular") || - endswith(strTemp.c_str(), ".glow") || - endswith(strTemp.c_str(), ".bump") || - endswith(strTemp.c_str(), ".diffuse") || - endswith(strTemp.c_str(), ".blend") || - endswith(strTemp.c_str(), ".alpha") || - endswith(strTemp.c_str(), "_norm") || - endswith(strTemp.c_str(), "_bump") || - endswith(strTemp.c_str(), "_glow") || - endswith(strTemp.c_str(), "_gloss") || - endswith(strTemp.c_str(), "_pants") || - endswith(strTemp.c_str(), "_shirt") || - endswith(strTemp.c_str(), "_reflect") || - endswith(strTemp.c_str(), "_alpha") || - 0; + } + return !memcmp( haystack + ( lh - ln ), needle, ln ); +} + +bool texture_name_ignore( const char* name ){ + StringOutputStream strTemp( string_length( name ) ); + strTemp << LowerCase( name ); + + return + endswith( strTemp.c_str(), ".specular" ) || + endswith( strTemp.c_str(), ".glow" ) || + endswith( strTemp.c_str(), ".bump" ) || + endswith( strTemp.c_str(), ".diffuse" ) || + endswith( strTemp.c_str(), ".blend" ) || + endswith( strTemp.c_str(), ".alpha" ) || + endswith( strTemp.c_str(), "_norm" ) || + endswith( strTemp.c_str(), "_bump" ) || + endswith( strTemp.c_str(), "_glow" ) || + endswith( strTemp.c_str(), "_gloss" ) || + endswith( strTemp.c_str(), "_pants" ) || + endswith( strTemp.c_str(), "_shirt" ) || + endswith( strTemp.c_str(), "_reflect" ) || + endswith( strTemp.c_str(), "_alpha" ) || + 0; } class LoadShaderVisitor : public Archive::Visitor { public: - void visit(const char* name) - { - IShader* shader = QERApp_Shader_ForName(CopiedString(StringRange(name, path_get_filename_base_end(name))).c_str()); - shader->DecRef(); - } +void visit( const char* name ){ + IShader* shader = QERApp_Shader_ForName( CopiedString( StringRange( name, path_get_filename_base_end( name ) ) ).c_str() ); + shader->DecRef(); +} }; -void TextureBrowser_SetHideUnused(TextureBrowser& textureBrowser, bool hideUnused); +void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnused ); GtkWidget* g_page_textures; -void TextureBrowser_toggleShow() -{ - GroupDialog_showPage(g_page_textures); +void TextureBrowser_toggleShow(){ + GroupDialog_showPage( g_page_textures ); } -void TextureBrowser_updateTitle() -{ - GroupDialog_updatePageTitle(g_page_textures); +void TextureBrowser_updateTitle(){ + GroupDialog_updatePageTitle( g_page_textures ); } class TextureCategoryLoadShader { - const char* m_directory; - std::size_t& m_count; +const char* m_directory; +std::size_t& m_count; public: - typedef const char* first_argument_type; - - 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/")) - return; - if(!Texture_matchCategory(m_directory, Texture_getCategoryByName(name + string_length("textures/")).c_str())) - return; - - ++m_count; - // request the shader, this will load the texture if needed - // this Shader_ForName call is a kind of hack - IShader *pFoo = QERApp_Shader_ForName(name); - pFoo->DecRef(); - } +typedef const char* first_argument_type; + +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/" ) ) { + return; + } + if ( !Texture_matchCategory( m_directory, Texture_getCategoryByName( name + string_length( "textures/" ) ).c_str() ) ) { + return; + } + + ++m_count; + // request the shader, this will load the texture if needed + // this Shader_ForName call is a kind of hack + IShader *pFoo = QERApp_Shader_ForName( name ); + pFoo->DecRef(); +} }; -void TextureDirectory_loadTexture(const char* category, const char* texture) -{ - CopiedString directory = Texture_getCategoryDirectory(category); - StringOutputStream name(256); - name << "textures/" << directory.c_str() << StringRange(texture, path_get_filename_base_end(texture)); - - if(texture_name_ignore(name.c_str())) - { - return; - } - - if (!shader_valid(name.c_str())) - { - globalOutputStream() << "Skipping invalid texture name: [" << name.c_str() << "]\n"; - return; - } - - if(!shader_equal_prefix(name.c_str(), "textures/")) // can't happen - return; - if(!Texture_matchCategory(category, Texture_getCategoryByName(name.c_str() + string_length("textures/")).c_str())) - return; - - // if a texture is already in use to represent a shader, ignore it - IShader* shader = QERApp_Shader_ForName(name.c_str()); - shader->DecRef(); +void TextureDirectory_loadTexture( const char* category, const char* texture ){ + CopiedString directory = Texture_getCategoryDirectory( category ); + StringOutputStream name( 256 ); + name << "textures/" << directory.c_str() << StringRange( texture, path_get_filename_base_end( texture ) ); + + if ( texture_name_ignore( name.c_str() ) ) { + return; + } + + if ( !shader_valid( name.c_str() ) ) { + globalOutputStream() << "Skipping invalid texture name: [" << name.c_str() << "]\n"; + return; + } + + if ( !shader_equal_prefix( name.c_str(), "textures/" ) ) { // can't happen + return; + } + if ( !Texture_matchCategory( category, Texture_getCategoryByName( name.c_str() + string_length( "textures/" ) ).c_str() ) ) { + return; + } + + // if a texture is already in use to represent a shader, ignore it + IShader* shader = QERApp_Shader_ForName( name.c_str() ); + shader->DecRef(); } typedef ConstPointerCaller1 TextureDirectoryLoadTextureCaller; class LoadTexturesByTypeVisitor : public ImageModules::Visitor { - const char* m_catstring; +const char* m_catstring; public: - LoadTexturesByTypeVisitor(const char* catstring) - : m_catstring(catstring) - { - } - void visit(const char* minor, const _QERPlugImageTable& table) const - { - StringOutputStream dirstring(64); - dirstring << "textures/" << Texture_getCategoryDirectory(m_catstring).c_str(); - GlobalFileSystem().forEachFile(dirstring.c_str(), minor, TextureDirectoryLoadTextureCaller(m_catstring)); - } +LoadTexturesByTypeVisitor( const char* catstring ) + : m_catstring( catstring ){ +} +void visit( const char* minor, const _QERPlugImageTable& table ) const { + StringOutputStream dirstring( 64 ); + dirstring << "textures/" << Texture_getCategoryDirectory( m_catstring ).c_str(); + GlobalFileSystem().forEachFile( dirstring.c_str(), minor, TextureDirectoryLoadTextureCaller( m_catstring ) ); +} }; -void TextureBrowser_ShowDirectory(TextureBrowser& textureBrowser, const char* directory) -{ - if(TextureBrowser_showWads()) - { - Archive* archive = GlobalFileSystem().getArchive(directory); - ASSERT_NOTNULL(archive); - LoadShaderVisitor visitor; - archive->forEachFile(Archive::VisitorFunc(visitor, Archive::eFiles, 0), "textures/"); - } - else - { - g_TextureBrowser_currentDirectory = directory; - TextureBrowser_heightChanged(textureBrowser); - - std::size_t shaders_count; - GlobalShaderSystem().foreachShaderName(makeCallback1(TextureCategoryLoadShader(directory, shaders_count))); - globalOutputStream() << "Showing " << Unsigned(shaders_count) << " shaders.\n"; - - if(g_pGameDescription->mGameType != "doom3") - { - // load remaining texture files - Radiant_getImageModules().foreachModule(LoadTexturesByTypeVisitor(directory)); - } - } - - // we'll display the newly loaded textures + all the ones already in use - TextureBrowser_SetHideUnused(textureBrowser, false); - - TextureBrowser_updateTitle(); -} - -void TextureBrowser_ShowTagSearchResult(TextureBrowser& textureBrowser, const char* directory) -{ - g_TextureBrowser_currentDirectory = directory; - TextureBrowser_heightChanged(textureBrowser); +void TextureBrowser_ShowDirectory( TextureBrowser& textureBrowser, const char* directory ){ + if ( TextureBrowser_showWads() ) { + Archive* archive = GlobalFileSystem().getArchive( directory ); + ASSERT_NOTNULL( archive ); + LoadShaderVisitor visitor; + archive->forEachFile( Archive::VisitorFunc( visitor, Archive::eFiles, 0 ), "textures/" ); + } + else + { + g_TextureBrowser_currentDirectory = directory; + TextureBrowser_heightChanged( textureBrowser ); + + std::size_t shaders_count; + GlobalShaderSystem().foreachShaderName( makeCallback1( TextureCategoryLoadShader( directory, shaders_count ) ) ); + globalOutputStream() << "Showing " << Unsigned( shaders_count ) << " shaders.\n"; - std::size_t shaders_count; - GlobalShaderSystem().foreachShaderName(makeCallback1(TextureCategoryLoadShader(directory, shaders_count))); - globalOutputStream() << "Showing " << Unsigned(shaders_count) << " shaders.\n"; + if ( g_pGameDescription->mGameType != "doom3" ) { + // load remaining texture files + Radiant_getImageModules().foreachModule( LoadTexturesByTypeVisitor( directory ) ); + } + } + + // we'll display the newly loaded textures + all the ones already in use + TextureBrowser_SetHideUnused( textureBrowser, false ); + + TextureBrowser_updateTitle(); +} + +void TextureBrowser_ShowTagSearchResult( TextureBrowser& textureBrowser, const char* directory ){ + g_TextureBrowser_currentDirectory = directory; + TextureBrowser_heightChanged( textureBrowser ); + + std::size_t shaders_count; + GlobalShaderSystem().foreachShaderName( makeCallback1( TextureCategoryLoadShader( directory, shaders_count ) ) ); + globalOutputStream() << "Showing " << Unsigned( shaders_count ) << " shaders.\n"; - if(g_pGameDescription->mGameType != "doom3") - { - // load remaining texture files - StringOutputStream dirstring(64); - dirstring << "textures/" << directory; + if ( g_pGameDescription->mGameType != "doom3" ) { + // load remaining texture files + StringOutputStream dirstring( 64 ); + dirstring << "textures/" << directory; - { - LoadTexturesByTypeVisitor visitor(dirstring.c_str()); - Radiant_getImageModules().foreachModule(visitor); - } - } + { + LoadTexturesByTypeVisitor visitor( dirstring.c_str() ); + Radiant_getImageModules().foreachModule( visitor ); + } + } - // we'll display the newly loaded textures + all the ones already in use - TextureBrowser_SetHideUnused(textureBrowser, false); + // we'll display the newly loaded textures + all the ones already in use + TextureBrowser_SetHideUnused( textureBrowser, false ); } bool TextureBrowser_hideUnused(); -void TextureBrowser_hideUnusedExport(const BoolImportCallback& importer) -{ - importer(TextureBrowser_hideUnused()); +void TextureBrowser_hideUnusedExport( const BoolImportCallback& importer ){ + importer( TextureBrowser_hideUnused() ); } typedef FreeCaller1 TextureBrowserHideUnusedExport; -void TextureBrowser_showShadersExport(const BoolImportCallback& importer) -{ - importer(GlobalTextureBrowser().m_showShaders); +void TextureBrowser_showShadersExport( const BoolImportCallback& importer ){ + importer( GlobalTextureBrowser().m_showShaders ); } typedef FreeCaller1 TextureBrowserShowShadersExport; -void TextureBrowser_softGroupsExport(const BoolImportCallback& importer) -{ - importer(GlobalTextureBrowser().m_softGroups); +void TextureBrowser_softGroupsExport( const BoolImportCallback& importer ){ + importer( GlobalTextureBrowser().m_softGroups ); } typedef FreeCaller1 TextureBrowserSoftGroupsExport; -void TextureBrowser_showShaderlistOnly(const BoolImportCallback& importer) -{ - importer(g_TextureBrowser_shaderlistOnly); +void TextureBrowser_showShaderlistOnly( const BoolImportCallback& importer ){ + importer( g_TextureBrowser_shaderlistOnly ); } typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; -void TextureBrowser_fixedSize(const BoolImportCallback& importer) -{ - importer(g_TextureBrowser_fixedSize); +void TextureBrowser_fixedSize( const BoolImportCallback& importer ){ + importer( g_TextureBrowser_fixedSize ); } typedef FreeCaller1 TextureBrowser_FixedSizeExport; -void TextureBrowser_filterNotex(const BoolImportCallback& importer) -{ - importer(g_TextureBrowser_filterNotex); +void TextureBrowser_filterNotex( const BoolImportCallback& importer ){ + importer( g_TextureBrowser_filterNotex ); } typedef FreeCaller1 TextureBrowser_filterNotexExport; -void TextureBrowser_SetHideUnused(TextureBrowser& textureBrowser, bool hideUnused) -{ - if(hideUnused) - { - textureBrowser.m_hideUnused = true; - } - else - { - textureBrowser.m_hideUnused = false; - } +void TextureBrowser_SetHideUnused( TextureBrowser& textureBrowser, bool hideUnused ){ + if ( hideUnused ) { + textureBrowser.m_hideUnused = true; + } + else + { + textureBrowser.m_hideUnused = false; + } - textureBrowser.m_hideunused_item.update(); + textureBrowser.m_hideunused_item.update(); - TextureBrowser_heightChanged(textureBrowser); - textureBrowser.m_originInvalid = true; + TextureBrowser_heightChanged( textureBrowser ); + textureBrowser.m_originInvalid = true; } -void TextureBrowser_ShowStartupShaders(TextureBrowser& textureBrowser) -{ - if(textureBrowser.m_startupShaders == STARTUPSHADERS_COMMON) - { - TextureBrowser_ShowDirectory(textureBrowser, TextureBrowser_getComonShadersDir()); - } +void TextureBrowser_ShowStartupShaders( TextureBrowser& textureBrowser ){ + if ( textureBrowser.m_startupShaders == STARTUPSHADERS_COMMON ) { + TextureBrowser_ShowDirectory( textureBrowser, TextureBrowser_getComonShadersDir() ); + } } @@ -1054,1751 +983,1624 @@ void TextureBrowser_ShowStartupShaders(TextureBrowser& textureBrowser) // it might need to be split in parts or moved out .. dunno // scroll origin so the specified texture is completely on screen // if current texture is not displayed, nothing is changed -void TextureBrowser_Focus(TextureBrowser& textureBrowser, const char* name) -{ - TextureLayout layout; - // scroll origin so the texture is completely on screen - Texture_StartPos(layout); - - for(QERApp_ActiveShaders_IteratorBegin(); !QERApp_ActiveShaders_IteratorAtEnd(); QERApp_ActiveShaders_IteratorIncrement()) - { - IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); - - if(!Texture_IsShown(shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused)) - continue; - - int x, y; - Texture_NextPos(textureBrowser, layout, shader->getTexture(), &x, &y); - qtexture_t* q = shader->getTexture(); - if (!q) - break; - - // we have found when texdef->name and the shader name match - // NOTE: as everywhere else for our comparisons, we are not case sensitive - if (shader_equal(name, shader->getName())) - { - int textureHeight = (int)(q->height * ((float)textureBrowser.m_textureScale / 100)) - + 2 * TextureBrowser_fontHeight(textureBrowser); - - int originy = TextureBrowser_getOriginY(textureBrowser); - if (y > originy) - { - originy = y; - } - - if (y - textureHeight < originy - textureBrowser.height) - { - originy = (y - textureHeight) + textureBrowser.height; - } - - TextureBrowser_setOriginY(textureBrowser, originy); - return; - } - } -} - -IShader* Texture_At(TextureBrowser& textureBrowser, int mx, int my) -{ - my += TextureBrowser_getOriginY(textureBrowser) - textureBrowser.height; - - TextureLayout layout; - Texture_StartPos(layout); - for(QERApp_ActiveShaders_IteratorBegin(); !QERApp_ActiveShaders_IteratorAtEnd(); QERApp_ActiveShaders_IteratorIncrement()) - { - IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); - - if(!Texture_IsShown(shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused)) - continue; - - int x, y; - Texture_NextPos(textureBrowser, layout, shader->getTexture(), &x, &y); - qtexture_t *q = shader->getTexture(); - if (!q) - break; - - int nWidth = textureBrowser.getTextureWidth(q); - int nHeight = textureBrowser.getTextureHeight(q); - if (mx > x && mx - x < nWidth - && my < y && y - my < nHeight + TextureBrowser_fontHeight(textureBrowser)) - { - return shader; - } - } - - return 0; +void TextureBrowser_Focus( TextureBrowser& textureBrowser, const char* name ){ + TextureLayout layout; + // scroll origin so the texture is completely on screen + Texture_StartPos( layout ); + + for ( QERApp_ActiveShaders_IteratorBegin(); !QERApp_ActiveShaders_IteratorAtEnd(); QERApp_ActiveShaders_IteratorIncrement() ) + { + IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); + + if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused ) ) { + continue; + } + + int x, y; + Texture_NextPos( textureBrowser, layout, shader->getTexture(), &x, &y ); + qtexture_t* q = shader->getTexture(); + if ( !q ) { + break; + } + + // we have found when texdef->name and the shader name match + // NOTE: as everywhere else for our comparisons, we are not case sensitive + if ( shader_equal( name, shader->getName() ) ) { + int textureHeight = (int)( q->height * ( (float)textureBrowser.m_textureScale / 100 ) ) + + 2 * TextureBrowser_fontHeight( textureBrowser ); + + int originy = TextureBrowser_getOriginY( textureBrowser ); + if ( y > originy ) { + originy = y; + } + + if ( y - textureHeight < originy - textureBrowser.height ) { + originy = ( y - textureHeight ) + textureBrowser.height; + } + + TextureBrowser_setOriginY( textureBrowser, originy ); + return; + } + } +} + +IShader* Texture_At( TextureBrowser& textureBrowser, int mx, int my ){ + my += TextureBrowser_getOriginY( textureBrowser ) - textureBrowser.height; + + TextureLayout layout; + Texture_StartPos( layout ); + for ( QERApp_ActiveShaders_IteratorBegin(); !QERApp_ActiveShaders_IteratorAtEnd(); QERApp_ActiveShaders_IteratorIncrement() ) + { + IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); + + if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused ) ) { + continue; + } + + int x, y; + Texture_NextPos( textureBrowser, layout, shader->getTexture(), &x, &y ); + qtexture_t *q = shader->getTexture(); + if ( !q ) { + break; + } + + int nWidth = textureBrowser.getTextureWidth( q ); + int nHeight = textureBrowser.getTextureHeight( q ); + if ( mx > x && mx - x < nWidth + && my < y && y - my < nHeight + TextureBrowser_fontHeight( textureBrowser ) ) { + return shader; + } + } + + return 0; } /* -============== -SelectTexture + ============== + SelectTexture + + By mouse click + ============== + */ +void SelectTexture( TextureBrowser& textureBrowser, int mx, int my, bool bShift ){ + IShader* shader = Texture_At( textureBrowser, mx, my ); + if ( shader != 0 ) { + if ( bShift ) { + if ( shader->IsDefault() ) { + globalOutputStream() << "ERROR: " << shader->getName() << " is not a shader, it's a texture.\n"; + } + else{ + ViewShader( shader->getShaderFileName(), shader->getName() ); + } + } + else + { + TextureBrowser_SetSelectedShader( textureBrowser, shader->getName() ); + TextureBrowser_textureSelected( shader->getName() ); - By mouse click -============== -*/ -void SelectTexture(TextureBrowser& textureBrowser, int mx, int my, bool bShift) -{ - IShader* shader = Texture_At(textureBrowser, mx, my); - if(shader != 0) - { - if (bShift) - { - if (shader->IsDefault()) - globalOutputStream() << "ERROR: " << shader->getName() << " is not a shader, it's a texture.\n"; - else - ViewShader( shader->getShaderFileName(), shader->getName() ); - } - else - { - TextureBrowser_SetSelectedShader(textureBrowser, shader->getName()); - TextureBrowser_textureSelected(shader->getName()); - - if (!FindTextureDialog_isOpen() && !textureBrowser.m_rmbSelected) - { - UndoableCommand undo("textureNameSetSelected"); - Select_SetShader(shader->getName()); - } - } - } + if ( !FindTextureDialog_isOpen() && !textureBrowser.m_rmbSelected ) { + UndoableCommand undo( "textureNameSetSelected" ); + Select_SetShader( shader->getName() ); + } + } + } } /* -============================================================================ + ============================================================================ - MOUSE ACTIONS + MOUSE ACTIONS -============================================================================ -*/ + ============================================================================ + */ -void TextureBrowser_trackingDelta(int x, int y, unsigned int state, void* data) -{ - TextureBrowser& textureBrowser = *reinterpret_cast(data); - if(y != 0) - { - int scale = 1; +void TextureBrowser_trackingDelta( int x, int y, unsigned int state, void* data ){ + TextureBrowser& textureBrowser = *reinterpret_cast( data ); + if ( y != 0 ) { + int scale = 1; - if(state & GDK_SHIFT_MASK) - scale = 4; + if ( state & GDK_SHIFT_MASK ) { + scale = 4; + } - int originy = TextureBrowser_getOriginY(textureBrowser); - originy += y * scale; - TextureBrowser_setOriginY(textureBrowser, originy); - } + int originy = TextureBrowser_getOriginY( textureBrowser ); + originy += y * scale; + TextureBrowser_setOriginY( textureBrowser, originy ); + } } -void TextureBrowser_Tracking_MouseDown(TextureBrowser& textureBrowser) -{ - textureBrowser.m_freezePointer.freeze_pointer(textureBrowser.m_parent, TextureBrowser_trackingDelta, &textureBrowser); +void TextureBrowser_Tracking_MouseDown( TextureBrowser& textureBrowser ){ + textureBrowser.m_freezePointer.freeze_pointer( textureBrowser.m_parent, TextureBrowser_trackingDelta, &textureBrowser ); } -void TextureBrowser_Tracking_MouseUp(TextureBrowser& textureBrowser) -{ - textureBrowser.m_freezePointer.unfreeze_pointer(textureBrowser.m_parent); +void TextureBrowser_Tracking_MouseUp( TextureBrowser& textureBrowser ){ + textureBrowser.m_freezePointer.unfreeze_pointer( textureBrowser.m_parent ); } -void TextureBrowser_Selection_MouseDown(TextureBrowser& textureBrowser, guint32 flags, int pointx, int pointy) -{ - SelectTexture(textureBrowser, pointx, textureBrowser.height - 1 - pointy, (flags & GDK_SHIFT_MASK) != 0); +void TextureBrowser_Selection_MouseDown( TextureBrowser& textureBrowser, guint32 flags, int pointx, int pointy ){ + SelectTexture( textureBrowser, pointx, textureBrowser.height - 1 - pointy, ( flags & GDK_SHIFT_MASK ) != 0 ); } /* -============================================================================ + ============================================================================ -DRAWING + DRAWING -============================================================================ -*/ + ============================================================================ + */ /* -============ -Texture_Draw -TTimo: relying on the shaders list to display the textures -we must query all qtexture_t* to manage and display through the IShaders interface -this allows a plugin to completely override the texture system -============ -*/ -void Texture_Draw(TextureBrowser& textureBrowser) -{ - int originy = TextureBrowser_getOriginY(textureBrowser); - - glClearColor(textureBrowser.color_textureback[0], - textureBrowser.color_textureback[1], - textureBrowser.color_textureback[2], - 0); - glViewport(0, 0, textureBrowser.width, textureBrowser.height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - - glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - glDisable (GL_DEPTH_TEST); - glDisable(GL_BLEND); - glOrtho (0, textureBrowser.width, originy-textureBrowser.height, originy, -100, 100); - glEnable (GL_TEXTURE_2D); - - glPolygonMode (GL_FRONT_AND_BACK, GL_FILL); - - int last_y = 0, last_height = 0; - - TextureLayout layout; - Texture_StartPos(layout); - for(QERApp_ActiveShaders_IteratorBegin(); !QERApp_ActiveShaders_IteratorAtEnd(); QERApp_ActiveShaders_IteratorIncrement()) - { - IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); - - if(!Texture_IsShown(shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused)) - continue; - - int x, y; - Texture_NextPos(textureBrowser, layout, shader->getTexture(), &x, &y); - qtexture_t *q = shader->getTexture(); - if (!q) - break; - - int nWidth = textureBrowser.getTextureWidth(q); - int nHeight = textureBrowser.getTextureHeight(q); - - if (y != last_y) - { - last_y = y; - last_height = 0; - } - last_height = std::max (nHeight, last_height); - - // Is this texture visible? - if ((y-nHeight-TextureBrowser_fontHeight(textureBrowser) < originy) - && (y > originy - textureBrowser.height)) - { - // borders rules: - // if it's the current texture, draw a thick red line, else: - // shaders have a white border, simple textures don't - // if !texture_showinuse: (some textures displayed may not be in use) - // draw an additional square around with 0.5 1 0.5 color - if (shader_equal(TextureBrowser_GetSelectedShader(textureBrowser), shader->getName())) - { - glLineWidth (3); - if(textureBrowser.m_rmbSelected) - { - glColor3f (0,0,1); - } else { - glColor3f (1,0,0); - } - glDisable (GL_TEXTURE_2D); - - glBegin (GL_LINE_LOOP); - glVertex2i (x-4,y-TextureBrowser_fontHeight(textureBrowser)+4); - glVertex2i (x-4,y-TextureBrowser_fontHeight(textureBrowser)-nHeight-4); - glVertex2i (x+4+nWidth,y-TextureBrowser_fontHeight(textureBrowser)-nHeight-4); - glVertex2i (x+4+nWidth,y-TextureBrowser_fontHeight(textureBrowser)+4); - glEnd(); - - glEnable (GL_TEXTURE_2D); - glLineWidth (1); - } - else - { - glLineWidth (1); - // shader border: - if (!shader->IsDefault()) - { - glColor3f (1,1,1); - glDisable (GL_TEXTURE_2D); - - glBegin (GL_LINE_LOOP); - glVertex2i (x-1,y+1-TextureBrowser_fontHeight(textureBrowser)); - glVertex2i (x-1,y-nHeight-1-TextureBrowser_fontHeight(textureBrowser)); - glVertex2i (x+1+nWidth,y-nHeight-1-TextureBrowser_fontHeight(textureBrowser)); - glVertex2i (x+1+nWidth,y+1-TextureBrowser_fontHeight(textureBrowser)); - glEnd(); - glEnable (GL_TEXTURE_2D); - } - - // highlight in-use textures - if (!textureBrowser.m_hideUnused && shader->IsInUse()) - { - glColor3f (0.5,1,0.5); - glDisable (GL_TEXTURE_2D); - glBegin (GL_LINE_LOOP); - glVertex2i (x-3,y+3-TextureBrowser_fontHeight(textureBrowser)); - glVertex2i (x-3,y-nHeight-3-TextureBrowser_fontHeight(textureBrowser)); - glVertex2i (x+3+nWidth,y-nHeight-3-TextureBrowser_fontHeight(textureBrowser)); - glVertex2i (x+3+nWidth,y+3-TextureBrowser_fontHeight(textureBrowser)); - glEnd(); - glEnable (GL_TEXTURE_2D); - } - } - - // Draw the texture - glBindTexture (GL_TEXTURE_2D, q->texture_number); - GlobalOpenGL_debugAssertNoErrors(); - glColor3f (1,1,1); - glBegin (GL_QUADS); - glTexCoord2i (0,0); - glVertex2i (x,y-TextureBrowser_fontHeight(textureBrowser)); - glTexCoord2i (1,0); - glVertex2i (x+nWidth,y-TextureBrowser_fontHeight(textureBrowser)); - glTexCoord2i (1,1); - glVertex2i (x+nWidth,y-TextureBrowser_fontHeight(textureBrowser)-nHeight); - glTexCoord2i (0,1); - glVertex2i (x,y-TextureBrowser_fontHeight(textureBrowser)-nHeight); - glEnd(); - - // draw the texture name - glDisable (GL_TEXTURE_2D); - glColor3f (1,1,1); - - glRasterPos2i (x, y-TextureBrowser_fontHeight(textureBrowser)+5); - - // don't draw the directory name - const char* name = shader->getName(); - name += strlen(name); - while(name != shader->getName() && *(name-1) != '/' && *(name-1) != '\\') - name--; - - GlobalOpenGL().drawString(name); - glEnable (GL_TEXTURE_2D); - } - - //int totalHeight = abs(y) + last_height + TextureBrowser_fontHeight(textureBrowser) + 4; - } - - - // reset the current texture - glBindTexture(GL_TEXTURE_2D, 0); - //qglFinish(); -} - -void TextureBrowser_queueDraw(TextureBrowser& textureBrowser) -{ - if(textureBrowser.m_gl_widget != 0) - { - gtk_widget_queue_draw(textureBrowser.m_gl_widget); - } + ============ + Texture_Draw + TTimo: relying on the shaders list to display the textures + we must query all qtexture_t* to manage and display through the IShaders interface + this allows a plugin to completely override the texture system + ============ + */ +void Texture_Draw( TextureBrowser& textureBrowser ){ + int originy = TextureBrowser_getOriginY( textureBrowser ); + + glClearColor( textureBrowser.color_textureback[0], + textureBrowser.color_textureback[1], + textureBrowser.color_textureback[2], + 0 ); + glViewport( 0, 0, textureBrowser.width, textureBrowser.height ); + glMatrixMode( GL_PROJECTION ); + glLoadIdentity(); + + glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + glDisable( GL_DEPTH_TEST ); + glDisable( GL_BLEND ); + glOrtho( 0, textureBrowser.width, originy - textureBrowser.height, originy, -100, 100 ); + glEnable( GL_TEXTURE_2D ); + + glPolygonMode( GL_FRONT_AND_BACK, GL_FILL ); + + int last_y = 0, last_height = 0; + + TextureLayout layout; + Texture_StartPos( layout ); + for ( QERApp_ActiveShaders_IteratorBegin(); !QERApp_ActiveShaders_IteratorAtEnd(); QERApp_ActiveShaders_IteratorIncrement() ) + { + IShader* shader = QERApp_ActiveShaders_IteratorCurrent(); + + if ( !Texture_IsShown( shader, textureBrowser.m_showShaders, textureBrowser.m_hideUnused ) ) { + continue; + } + + int x, y; + Texture_NextPos( textureBrowser, layout, shader->getTexture(), &x, &y ); + qtexture_t *q = shader->getTexture(); + if ( !q ) { + break; + } + + int nWidth = textureBrowser.getTextureWidth( q ); + int nHeight = textureBrowser.getTextureHeight( q ); + + if ( y != last_y ) { + last_y = y; + last_height = 0; + } + last_height = std::max( nHeight, last_height ); + + // Is this texture visible? + if ( ( y - nHeight - TextureBrowser_fontHeight( textureBrowser ) < originy ) + && ( y > originy - textureBrowser.height ) ) { + // borders rules: + // if it's the current texture, draw a thick red line, else: + // shaders have a white border, simple textures don't + // if !texture_showinuse: (some textures displayed may not be in use) + // draw an additional square around with 0.5 1 0.5 color + if ( shader_equal( TextureBrowser_GetSelectedShader( textureBrowser ), shader->getName() ) ) { + glLineWidth( 3 ); + if ( textureBrowser.m_rmbSelected ) { + glColor3f( 0,0,1 ); + } + else { + glColor3f( 1,0,0 ); + } + glDisable( GL_TEXTURE_2D ); + + glBegin( GL_LINE_LOOP ); + glVertex2i( x - 4,y - TextureBrowser_fontHeight( textureBrowser ) + 4 ); + glVertex2i( x - 4,y - TextureBrowser_fontHeight( textureBrowser ) - nHeight - 4 ); + glVertex2i( x + 4 + nWidth,y - TextureBrowser_fontHeight( textureBrowser ) - nHeight - 4 ); + glVertex2i( x + 4 + nWidth,y - TextureBrowser_fontHeight( textureBrowser ) + 4 ); + glEnd(); + + glEnable( GL_TEXTURE_2D ); + glLineWidth( 1 ); + } + else + { + glLineWidth( 1 ); + // shader border: + if ( !shader->IsDefault() ) { + glColor3f( 1,1,1 ); + glDisable( GL_TEXTURE_2D ); + + glBegin( GL_LINE_LOOP ); + glVertex2i( x - 1,y + 1 - TextureBrowser_fontHeight( textureBrowser ) ); + glVertex2i( x - 1,y - nHeight - 1 - TextureBrowser_fontHeight( textureBrowser ) ); + glVertex2i( x + 1 + nWidth,y - nHeight - 1 - TextureBrowser_fontHeight( textureBrowser ) ); + glVertex2i( x + 1 + nWidth,y + 1 - TextureBrowser_fontHeight( textureBrowser ) ); + glEnd(); + glEnable( GL_TEXTURE_2D ); + } + + // highlight in-use textures + if ( !textureBrowser.m_hideUnused && shader->IsInUse() ) { + glColor3f( 0.5,1,0.5 ); + glDisable( GL_TEXTURE_2D ); + glBegin( GL_LINE_LOOP ); + glVertex2i( x - 3,y + 3 - TextureBrowser_fontHeight( textureBrowser ) ); + glVertex2i( x - 3,y - nHeight - 3 - TextureBrowser_fontHeight( textureBrowser ) ); + glVertex2i( x + 3 + nWidth,y - nHeight - 3 - TextureBrowser_fontHeight( textureBrowser ) ); + glVertex2i( x + 3 + nWidth,y + 3 - TextureBrowser_fontHeight( textureBrowser ) ); + glEnd(); + glEnable( GL_TEXTURE_2D ); + } + } + + // Draw the texture + glBindTexture( GL_TEXTURE_2D, q->texture_number ); + GlobalOpenGL_debugAssertNoErrors(); + glColor3f( 1,1,1 ); + glBegin( GL_QUADS ); + glTexCoord2i( 0,0 ); + glVertex2i( x,y - TextureBrowser_fontHeight( textureBrowser ) ); + glTexCoord2i( 1,0 ); + glVertex2i( x + nWidth,y - TextureBrowser_fontHeight( textureBrowser ) ); + glTexCoord2i( 1,1 ); + glVertex2i( x + nWidth,y - TextureBrowser_fontHeight( textureBrowser ) - nHeight ); + glTexCoord2i( 0,1 ); + glVertex2i( x,y - TextureBrowser_fontHeight( textureBrowser ) - nHeight ); + glEnd(); + + // draw the texture name + glDisable( GL_TEXTURE_2D ); + glColor3f( 1,1,1 ); + + glRasterPos2i( x, y - TextureBrowser_fontHeight( textureBrowser ) + 5 ); + + // don't draw the directory name + const char* name = shader->getName(); + name += strlen( name ); + while ( name != shader->getName() && *( name - 1 ) != '/' && *( name - 1 ) != '\\' ) + name--; + + GlobalOpenGL().drawString( name ); + glEnable( GL_TEXTURE_2D ); + } + + //int totalHeight = abs(y) + last_height + TextureBrowser_fontHeight(textureBrowser) + 4; + } + + + // reset the current texture + glBindTexture( GL_TEXTURE_2D, 0 ); + //qglFinish(); +} + +void TextureBrowser_queueDraw( TextureBrowser& textureBrowser ){ + if ( textureBrowser.m_gl_widget != 0 ) { + gtk_widget_queue_draw( textureBrowser.m_gl_widget ); + } } -void TextureBrowser_setScale(TextureBrowser& textureBrowser, std::size_t scale) -{ - textureBrowser.m_textureScale = scale; +void TextureBrowser_setScale( TextureBrowser& textureBrowser, std::size_t scale ){ + textureBrowser.m_textureScale = scale; - TextureBrowser_queueDraw(textureBrowser); + TextureBrowser_queueDraw( textureBrowser ); } -void TextureBrowser_MouseWheel(TextureBrowser& textureBrowser, bool bUp) -{ - int originy = TextureBrowser_getOriginY(textureBrowser); +void TextureBrowser_MouseWheel( TextureBrowser& textureBrowser, bool bUp ){ + int originy = TextureBrowser_getOriginY( textureBrowser ); - if (bUp) - { - originy += int(textureBrowser.m_mouseWheelScrollIncrement); - } - else - { - originy -= int(textureBrowser.m_mouseWheelScrollIncrement); - } + if ( bUp ) { + originy += int(textureBrowser.m_mouseWheelScrollIncrement); + } + else + { + originy -= int(textureBrowser.m_mouseWheelScrollIncrement); + } - TextureBrowser_setOriginY(textureBrowser, originy); + TextureBrowser_setOriginY( textureBrowser, originy ); } XmlTagBuilder TagBuilder; enum { - TAG_COLUMN, - N_COLUMNS + TAG_COLUMN, + N_COLUMNS }; -void BuildStoreAssignedTags(GtkListStore* store, const char* shader, TextureBrowser* textureBrowser) -{ - GtkTreeIter iter; +void BuildStoreAssignedTags( GtkListStore* store, const char* shader, TextureBrowser* textureBrowser ){ + GtkTreeIter iter; - gtk_list_store_clear(store); + gtk_list_store_clear( store ); - std::vector assigned_tags; - TagBuilder.GetShaderTags(shader, assigned_tags); + std::vector assigned_tags; + TagBuilder.GetShaderTags( shader, assigned_tags ); - for (size_t i = 0; i < assigned_tags.size(); i++) - { - gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, TAG_COLUMN, assigned_tags[i].c_str(), -1); - } + for ( size_t i = 0; i < assigned_tags.size(); i++ ) + { + gtk_list_store_append( store, &iter ); + gtk_list_store_set( store, &iter, TAG_COLUMN, assigned_tags[i].c_str(), -1 ); + } } -void BuildStoreAvailableTags( GtkListStore* storeAvailable, - GtkListStore* storeAssigned, - const std::set& allTags, - TextureBrowser* textureBrowser) -{ - GtkTreeIter iterAssigned; - GtkTreeIter iterAvailable; - std::set::const_iterator iterAll; - gchar* tag_assigned; - - gtk_list_store_clear(storeAvailable); +void BuildStoreAvailableTags( GtkListStore* storeAvailable, + GtkListStore* storeAssigned, + const std::set& allTags, + TextureBrowser* textureBrowser ){ + GtkTreeIter iterAssigned; + GtkTreeIter iterAvailable; + std::set::const_iterator iterAll; + gchar* tag_assigned; - bool row = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(storeAssigned), &iterAssigned) != 0; + gtk_list_store_clear( storeAvailable ); - if(!row) // does the shader have tags assigned? - { - for (iterAll = allTags.begin(); iterAll != allTags.end(); ++iterAll) - { - gtk_list_store_append (storeAvailable, &iterAvailable); - gtk_list_store_set (storeAvailable, &iterAvailable, TAG_COLUMN, (*iterAll).c_str(), -1); - } - } - else - { - while(row) // available tags = all tags - assigned tags - { - gtk_tree_model_get(GTK_TREE_MODEL(storeAssigned), &iterAssigned, TAG_COLUMN, &tag_assigned, -1); + bool row = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( storeAssigned ), &iterAssigned ) != 0; - for (iterAll = allTags.begin(); iterAll != allTags.end(); ++iterAll) - { - if(strcmp((char*)tag_assigned, (*iterAll).c_str()) != 0) + if ( !row ) { // does the shader have tags assigned? + for ( iterAll = allTags.begin(); iterAll != allTags.end(); ++iterAll ) { - gtk_list_store_append (storeAvailable, &iterAvailable); - gtk_list_store_set (storeAvailable, &iterAvailable, TAG_COLUMN, (*iterAll).c_str(), -1); + gtk_list_store_append( storeAvailable, &iterAvailable ); + gtk_list_store_set( storeAvailable, &iterAvailable, TAG_COLUMN, ( *iterAll ).c_str(), -1 ); } - else + } + else + { + while ( row ) // available tags = all tags - assigned tags { - row = gtk_tree_model_iter_next(GTK_TREE_MODEL(storeAssigned), &iterAssigned) != 0; - - if(row) - { - gtk_tree_model_get(GTK_TREE_MODEL(storeAssigned), &iterAssigned, TAG_COLUMN, &tag_assigned, -1); - } + gtk_tree_model_get( GTK_TREE_MODEL( storeAssigned ), &iterAssigned, TAG_COLUMN, &tag_assigned, -1 ); + + for ( iterAll = allTags.begin(); iterAll != allTags.end(); ++iterAll ) + { + if ( strcmp( (char*)tag_assigned, ( *iterAll ).c_str() ) != 0 ) { + gtk_list_store_append( storeAvailable, &iterAvailable ); + gtk_list_store_set( storeAvailable, &iterAvailable, TAG_COLUMN, ( *iterAll ).c_str(), -1 ); + } + else + { + row = gtk_tree_model_iter_next( GTK_TREE_MODEL( storeAssigned ), &iterAssigned ) != 0; + + if ( row ) { + gtk_tree_model_get( GTK_TREE_MODEL( storeAssigned ), &iterAssigned, TAG_COLUMN, &tag_assigned, -1 ); + } + } + } } - } } - } } -gboolean TextureBrowser_button_press(GtkWidget* widget, GdkEventButton* event, TextureBrowser* textureBrowser) -{ - if(event->type == GDK_BUTTON_PRESS) - { - if(event->button == 3) - { - if(GlobalTextureBrowser().m_tags) - { - textureBrowser->m_rmbSelected = true; - TextureBrowser_Selection_MouseDown (*textureBrowser, event->state, static_cast(event->x), static_cast(event->y)); - - BuildStoreAssignedTags(textureBrowser->m_assigned_store, textureBrowser->shader.c_str(), textureBrowser); - BuildStoreAvailableTags(textureBrowser->m_available_store, textureBrowser->m_assigned_store, textureBrowser->m_all_tags, textureBrowser); - textureBrowser->m_heightChanged = true; - gtk_widget_show(textureBrowser->m_tag_frame); - - process_gui(); - - TextureBrowser_Focus(*textureBrowser, textureBrowser->shader.c_str()); - } - else - { - TextureBrowser_Tracking_MouseDown(*textureBrowser); - } - } - else if(event->button == 1) - { - TextureBrowser_Selection_MouseDown(*textureBrowser, event->state, static_cast(event->x), static_cast(event->y)); - - if(GlobalTextureBrowser().m_tags) - { - textureBrowser->m_rmbSelected = false; - gtk_widget_hide(textureBrowser->m_tag_frame); - } - } - } - return FALSE; -} - -gboolean TextureBrowser_button_release(GtkWidget* widget, GdkEventButton* event, TextureBrowser* textureBrowser) -{ - if(event->type == GDK_BUTTON_RELEASE) - { - if(event->button == 3) - { - if(!GlobalTextureBrowser().m_tags) - { - TextureBrowser_Tracking_MouseUp(*textureBrowser); - } - } - } - return FALSE; -} - -gboolean TextureBrowser_motion(GtkWidget *widget, GdkEventMotion *event, TextureBrowser* textureBrowser) -{ - return FALSE; -} +gboolean TextureBrowser_button_press( GtkWidget* widget, GdkEventButton* event, TextureBrowser* textureBrowser ){ + if ( event->type == GDK_BUTTON_PRESS ) { + if ( event->button == 3 ) { + if ( GlobalTextureBrowser().m_tags ) { + textureBrowser->m_rmbSelected = true; + TextureBrowser_Selection_MouseDown( *textureBrowser, event->state, static_cast( event->x ), static_cast( event->y ) ); -gboolean TextureBrowser_scroll(GtkWidget* widget, GdkEventScroll* event, TextureBrowser* textureBrowser) -{ - if(event->direction == GDK_SCROLL_UP) - { - TextureBrowser_MouseWheel(*textureBrowser, true); - } - else if(event->direction == GDK_SCROLL_DOWN) - { - TextureBrowser_MouseWheel(*textureBrowser, false); - } - return FALSE; -} - -void TextureBrowser_scrollChanged(void* data, gdouble value) -{ - //globalOutputStream() << "vertical scroll\n"; - TextureBrowser_setOriginY(*reinterpret_cast(data), -(int)value); + BuildStoreAssignedTags( textureBrowser->m_assigned_store, textureBrowser->shader.c_str(), textureBrowser ); + BuildStoreAvailableTags( textureBrowser->m_available_store, textureBrowser->m_assigned_store, textureBrowser->m_all_tags, textureBrowser ); + textureBrowser->m_heightChanged = true; + gtk_widget_show( textureBrowser->m_tag_frame ); + + process_gui(); + + TextureBrowser_Focus( *textureBrowser, textureBrowser->shader.c_str() ); + } + else + { + TextureBrowser_Tracking_MouseDown( *textureBrowser ); + } + } + else if ( event->button == 1 ) { + TextureBrowser_Selection_MouseDown( *textureBrowser, event->state, static_cast( event->x ), static_cast( event->y ) ); + + if ( GlobalTextureBrowser().m_tags ) { + textureBrowser->m_rmbSelected = false; + gtk_widget_hide( textureBrowser->m_tag_frame ); + } + } + } + return FALSE; } -static void TextureBrowser_verticalScroll(GtkAdjustment *adjustment, TextureBrowser* textureBrowser) -{ - textureBrowser->m_scrollAdjustment.value_changed(adjustment->value); +gboolean TextureBrowser_button_release( GtkWidget* widget, GdkEventButton* event, TextureBrowser* textureBrowser ){ + if ( event->type == GDK_BUTTON_RELEASE ) { + if ( event->button == 3 ) { + if ( !GlobalTextureBrowser().m_tags ) { + TextureBrowser_Tracking_MouseUp( *textureBrowser ); + } + } + } + return FALSE; } -void TextureBrowser_updateScroll(TextureBrowser& textureBrowser) -{ - if(textureBrowser.m_showTextureScrollbar) - { - int totalHeight = TextureBrowser_TotalHeight(textureBrowser); +gboolean TextureBrowser_motion( GtkWidget *widget, GdkEventMotion *event, TextureBrowser* textureBrowser ){ + return FALSE; +} - totalHeight = std::max(totalHeight, textureBrowser.height); +gboolean TextureBrowser_scroll( GtkWidget* widget, GdkEventScroll* event, TextureBrowser* textureBrowser ){ + if ( event->direction == GDK_SCROLL_UP ) { + TextureBrowser_MouseWheel( *textureBrowser, true ); + } + else if ( event->direction == GDK_SCROLL_DOWN ) { + TextureBrowser_MouseWheel( *textureBrowser, false ); + } + return FALSE; +} + +void TextureBrowser_scrollChanged( void* data, gdouble value ){ + //globalOutputStream() << "vertical scroll\n"; + TextureBrowser_setOriginY( *reinterpret_cast( data ), -(int)value ); +} + +static void TextureBrowser_verticalScroll( GtkAdjustment *adjustment, TextureBrowser* textureBrowser ){ + textureBrowser->m_scrollAdjustment.value_changed( adjustment->value ); +} - GtkAdjustment *vadjustment = gtk_range_get_adjustment(GTK_RANGE(textureBrowser.m_texture_scroll)); +void TextureBrowser_updateScroll( TextureBrowser& textureBrowser ){ + if ( textureBrowser.m_showTextureScrollbar ) { + int totalHeight = TextureBrowser_TotalHeight( textureBrowser ); - vadjustment->value = -TextureBrowser_getOriginY(textureBrowser); - vadjustment->page_size = textureBrowser.height; - vadjustment->page_increment = textureBrowser.height/2; - vadjustment->step_increment = 20; - vadjustment->lower = 0; - vadjustment->upper = totalHeight; + totalHeight = std::max( totalHeight, textureBrowser.height ); - g_signal_emit_by_name(G_OBJECT (vadjustment), "changed"); - } + GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( textureBrowser.m_texture_scroll ) ); + + vadjustment->value = -TextureBrowser_getOriginY( textureBrowser ); + vadjustment->page_size = textureBrowser.height; + vadjustment->page_increment = textureBrowser.height / 2; + vadjustment->step_increment = 20; + vadjustment->lower = 0; + vadjustment->upper = totalHeight; + + g_signal_emit_by_name( G_OBJECT( vadjustment ), "changed" ); + } } -gboolean TextureBrowser_size_allocate(GtkWidget* widget, GtkAllocation* allocation, TextureBrowser* textureBrowser) -{ - textureBrowser->width = allocation->width; - textureBrowser->height = allocation->height; - TextureBrowser_heightChanged(*textureBrowser); - textureBrowser->m_originInvalid = true; - TextureBrowser_queueDraw(*textureBrowser); - return FALSE; +gboolean TextureBrowser_size_allocate( GtkWidget* widget, GtkAllocation* allocation, TextureBrowser* textureBrowser ){ + textureBrowser->width = allocation->width; + textureBrowser->height = allocation->height; + TextureBrowser_heightChanged( *textureBrowser ); + textureBrowser->m_originInvalid = true; + TextureBrowser_queueDraw( *textureBrowser ); + return FALSE; } -gboolean TextureBrowser_expose(GtkWidget* widget, GdkEventExpose* event, TextureBrowser* textureBrowser) -{ - if(glwidget_make_current(textureBrowser->m_gl_widget) != FALSE) - { - GlobalOpenGL_debugAssertNoErrors(); - TextureBrowser_evaluateHeight(*textureBrowser); - Texture_Draw(*textureBrowser); - GlobalOpenGL_debugAssertNoErrors(); - glwidget_swap_buffers(textureBrowser->m_gl_widget); - } - return FALSE; +gboolean TextureBrowser_expose( GtkWidget* widget, GdkEventExpose* event, TextureBrowser* textureBrowser ){ + if ( glwidget_make_current( textureBrowser->m_gl_widget ) != FALSE ) { + GlobalOpenGL_debugAssertNoErrors(); + TextureBrowser_evaluateHeight( *textureBrowser ); + Texture_Draw( *textureBrowser ); + GlobalOpenGL_debugAssertNoErrors(); + glwidget_swap_buffers( textureBrowser->m_gl_widget ); + } + return FALSE; } TextureBrowser g_TextureBrowser; -TextureBrowser& GlobalTextureBrowser() -{ - return g_TextureBrowser; +TextureBrowser& GlobalTextureBrowser(){ + return g_TextureBrowser; } -bool TextureBrowser_hideUnused() -{ - return g_TextureBrowser.m_hideUnused; +bool TextureBrowser_hideUnused(){ + return g_TextureBrowser.m_hideUnused; } -void TextureBrowser_ToggleHideUnused() -{ - if(g_TextureBrowser.m_hideUnused) - { - TextureBrowser_SetHideUnused(g_TextureBrowser, false); - } - else - { - TextureBrowser_SetHideUnused(g_TextureBrowser, true); - } +void TextureBrowser_ToggleHideUnused(){ + if ( g_TextureBrowser.m_hideUnused ) { + TextureBrowser_SetHideUnused( g_TextureBrowser, false ); + } + else + { + TextureBrowser_SetHideUnused( g_TextureBrowser, true ); + } } -void TextureGroups_constructTreeModel(TextureGroups groups, GtkTreeStore* store) -{ - // put the information from the old textures menu into a treeview - GtkTreeIter iter, child; - - TextureGroups::const_iterator i = groups.begin(); - while (i != groups.end()) - { - const char* dirName = (*i).c_str(); - const char* firstUnderscore = strchr(dirName, '_'); - const char* firstSlash = strchr(dirName, '/'); - if(firstSlash && (!firstUnderscore || firstSlash < firstUnderscore)) - firstUnderscore = firstSlash; - 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)) - { - gtk_tree_store_append(store, &iter, NULL); - StringOutputStream ost(64); - ost << CopiedString(StringRange(dirName, firstUnderscore)).c_str(); - if(*firstUnderscore == '/') - ost << "/*"; - gtk_tree_store_set (store, &iter, 0, ost.c_str(), -1); - - // keep going... - while (i != groups.end() && string_equal_start((*i).c_str(), dirRoot)) - { - gtk_tree_store_append(store, &child, &iter); - gtk_tree_store_set (store, &child, 0, (*i).c_str(), -1); - ++i; - } - } - else - { - gtk_tree_store_append(store, &iter, NULL); - gtk_tree_store_set (store, &iter, 0, dirName, -1); - ++i; - } - } -} - -TextureGroups TextureGroups_constructTreeView() -{ - TextureGroups groups; +void TextureGroups_constructTreeModel( TextureGroups groups, GtkTreeStore* store ){ + // put the information from the old textures menu into a treeview + GtkTreeIter iter, child; + + TextureGroups::const_iterator i = groups.begin(); + while ( i != groups.end() ) + { + const char* dirName = ( *i ).c_str(); + const char* firstUnderscore = strchr( dirName, '_' ); + const char* firstSlash = strchr( dirName, '/' ); + if ( firstSlash && ( !firstUnderscore || firstSlash < firstUnderscore ) ) { + firstUnderscore = firstSlash; + } + 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 ) ) { + gtk_tree_store_append( store, &iter, NULL ); + StringOutputStream ost( 64 ); + ost << CopiedString( StringRange( dirName, firstUnderscore ) ).c_str(); + if ( *firstUnderscore == '/' ) { + ost << "/*"; + } + gtk_tree_store_set( store, &iter, 0, ost.c_str(), -1 ); + + // keep going... + while ( i != groups.end() && string_equal_start( ( *i ).c_str(), dirRoot ) ) + { + gtk_tree_store_append( store, &child, &iter ); + gtk_tree_store_set( store, &child, 0, ( *i ).c_str(), -1 ); + ++i; + } + } + else + { + gtk_tree_store_append( store, &iter, NULL ); + gtk_tree_store_set( store, &iter, 0, dirName, -1 ); + ++i; + } + } +} + +TextureGroups TextureGroups_constructTreeView(){ + TextureGroups groups; - if (TextureBrowser_showWads()) - { - GlobalFileSystem().forEachArchive (TextureGroupsAddWadCaller (groups)); - } - else - { - // scan texture dirs and pak files only if not restricting to shaderlist - if (g_pGameDescription->mGameType != "doom3" && !g_TextureBrowser_shaderlistOnly) - { - GlobalFileSystem().forEachDirectory ("textures/", TextureGroupsAddDirectoryCaller(groups)); - } + if ( TextureBrowser_showWads() ) { + GlobalFileSystem().forEachArchive( TextureGroupsAddWadCaller( groups ) ); + } + else + { + // scan texture dirs and pak files only if not restricting to shaderlist + if ( g_pGameDescription->mGameType != "doom3" && !g_TextureBrowser_shaderlistOnly ) { + GlobalFileSystem().forEachDirectory( "textures/", TextureGroupsAddDirectoryCaller( groups ) ); + } - GlobalShaderSystem().foreachShaderName(TextureGroupsAddShaderCaller(groups)); - } + GlobalShaderSystem().foreachShaderName( TextureGroupsAddShaderCaller( groups ) ); + } - return groups; + return groups; } -void TextureBrowser_constructTreeStore() -{ - TextureGroups groups = TextureGroups_constructTreeView(); - GtkTreeStore* store = gtk_tree_store_new(1, G_TYPE_STRING); - TextureGroups_constructTreeModel(groups, store); - std::set::iterator iter; +void TextureBrowser_constructTreeStore(){ + TextureGroups groups = TextureGroups_constructTreeView(); + GtkTreeStore* store = gtk_tree_store_new( 1, G_TYPE_STRING ); + TextureGroups_constructTreeModel( groups, store ); + std::set::iterator iter; - GtkTreeModel* model = GTK_TREE_MODEL(store); + GtkTreeModel* model = GTK_TREE_MODEL( store ); - gtk_tree_view_set_model(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTree), model); + gtk_tree_view_set_model( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), model ); - g_object_unref(G_OBJECT(store)); + g_object_unref( G_OBJECT( store ) ); } -void TextureBrowser_constructTreeStoreTags() -{ - TextureGroups groups; - GtkTreeStore* store = gtk_tree_store_new(1, G_TYPE_STRING); - GtkTreeModel* model = GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list); +void TextureBrowser_constructTreeStoreTags(){ + TextureGroups groups; + GtkTreeStore* store = gtk_tree_store_new( 1, G_TYPE_STRING ); + GtkTreeModel* model = GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ); - gtk_tree_view_set_model(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags), model); + gtk_tree_view_set_model( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), model ); - g_object_unref(G_OBJECT(store)); + g_object_unref( G_OBJECT( store ) ); } -void TreeView_onRowActivated(GtkTreeView* treeview, GtkTreePath* path, GtkTreeViewColumn* col, gpointer userdata) -{ - GtkTreeIter iter; +void TreeView_onRowActivated( GtkTreeView* treeview, GtkTreePath* path, GtkTreeViewColumn* col, gpointer userdata ){ + GtkTreeIter iter; - GtkTreeModel* model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); + GtkTreeModel* model = gtk_tree_view_get_model( GTK_TREE_VIEW( treeview ) ); - if (gtk_tree_model_get_iter (model, &iter, path)) - { - gchar dirName[1024]; - - gchar* buffer; - gtk_tree_model_get(model, &iter, 0, &buffer, -1); - strcpy(dirName, buffer); - g_free(buffer); + if ( gtk_tree_model_get_iter( model, &iter, path ) ) { + gchar dirName[1024]; - g_TextureBrowser.m_searchedTags = false; + gchar* buffer; + gtk_tree_model_get( model, &iter, 0, &buffer, -1 ); + strcpy( dirName, buffer ); + g_free( buffer ); - ScopeDisableScreenUpdates disableScreenUpdates(dirName, "Loading Textures"); - TextureBrowser_ShowDirectory(GlobalTextureBrowser (), dirName); - TextureBrowser_queueDraw(GlobalTextureBrowser ()); - } + g_TextureBrowser.m_searchedTags = false; + + ScopeDisableScreenUpdates disableScreenUpdates( dirName, "Loading Textures" ); + TextureBrowser_ShowDirectory( GlobalTextureBrowser(), dirName ); + TextureBrowser_queueDraw( GlobalTextureBrowser() ); + } } -void TextureBrowser_createTreeViewTree() -{ - GtkCellRenderer* renderer; - g_TextureBrowser.m_treeViewTree = GTK_WIDGET(gtk_tree_view_new()); - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTree), FALSE); +void TextureBrowser_createTreeViewTree(){ + GtkCellRenderer* renderer; + g_TextureBrowser.m_treeViewTree = GTK_WIDGET( gtk_tree_view_new() ); + gtk_tree_view_set_enable_search( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), FALSE ); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTree), FALSE); - g_signal_connect(g_TextureBrowser.m_treeViewTree, "row-activated", (GCallback) TreeView_onRowActivated, NULL); + gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), FALSE ); + g_signal_connect( g_TextureBrowser.m_treeViewTree, "row-activated", (GCallback) TreeView_onRowActivated, NULL ); - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTree), -1, "", renderer, "text", 0, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), -1, "", renderer, "text", 0, NULL ); - TextureBrowser_constructTreeStore(); + TextureBrowser_constructTreeStore(); } void TextureBrowser_addTag(); void TextureBrowser_renameTag(); void TextureBrowser_deleteTag(); -void TextureBrowser_createContextMenu(GtkWidget *treeview, GdkEventButton *event) -{ - GtkWidget* menu = gtk_menu_new(); +void TextureBrowser_createContextMenu( GtkWidget *treeview, GdkEventButton *event ){ + GtkWidget* menu = gtk_menu_new(); - GtkWidget* menuitem = gtk_menu_item_new_with_label("Add tag"); - g_signal_connect(menuitem, "activate", (GCallback)TextureBrowser_addTag, treeview); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + GtkWidget* menuitem = gtk_menu_item_new_with_label( "Add tag" ); + g_signal_connect( menuitem, "activate", (GCallback)TextureBrowser_addTag, treeview ); + gtk_menu_shell_append( GTK_MENU_SHELL( menu ), menuitem ); - menuitem = gtk_menu_item_new_with_label("Rename tag"); - g_signal_connect(menuitem, "activate", (GCallback)TextureBrowser_renameTag, treeview); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + menuitem = gtk_menu_item_new_with_label( "Rename tag" ); + g_signal_connect( menuitem, "activate", (GCallback)TextureBrowser_renameTag, treeview ); + gtk_menu_shell_append( GTK_MENU_SHELL( menu ), menuitem ); - menuitem = gtk_menu_item_new_with_label("Delete tag"); - g_signal_connect(menuitem, "activate", (GCallback)TextureBrowser_deleteTag, treeview); - gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem); + menuitem = gtk_menu_item_new_with_label( "Delete tag" ); + g_signal_connect( menuitem, "activate", (GCallback)TextureBrowser_deleteTag, treeview ); + gtk_menu_shell_append( GTK_MENU_SHELL( menu ), menuitem ); - gtk_widget_show_all(menu); + gtk_widget_show_all( menu ); - gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, - (event != NULL) ? event->button : 0, - gdk_event_get_time((GdkEvent*)event)); + gtk_menu_popup( GTK_MENU( menu ), NULL, NULL, NULL, NULL, + ( event != NULL ) ? event->button : 0, + gdk_event_get_time( (GdkEvent*)event ) ); } -gboolean TreeViewTags_onButtonPressed(GtkWidget *treeview, GdkEventButton *event) -{ - if (event->type == GDK_BUTTON_PRESS && event->button == 3) - { - GtkTreePath *path; - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)); +gboolean TreeViewTags_onButtonPressed( GtkWidget *treeview, GdkEventButton *event ){ + if ( event->type == GDK_BUTTON_PRESS && event->button == 3 ) { + GtkTreePath *path; + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( treeview ) ); - if(gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview), event->x, event->y, &path, NULL, NULL, NULL)) - { - gtk_tree_selection_unselect_all(selection); - gtk_tree_selection_select_path(selection, path); - gtk_tree_path_free(path); - } + if ( gtk_tree_view_get_path_at_pos( GTK_TREE_VIEW( treeview ), event->x, event->y, &path, NULL, NULL, NULL ) ) { + gtk_tree_selection_unselect_all( selection ); + gtk_tree_selection_select_path( selection, path ); + gtk_tree_path_free( path ); + } - TextureBrowser_createContextMenu(treeview, event); - return TRUE; - } - return FALSE; + TextureBrowser_createContextMenu( treeview, event ); + return TRUE; + } + return FALSE; } -void TextureBrowser_createTreeViewTags() -{ - GtkCellRenderer* renderer; - g_TextureBrowser.m_treeViewTags = GTK_WIDGET(gtk_tree_view_new()); - gtk_tree_view_set_enable_search(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags), FALSE); +void TextureBrowser_createTreeViewTags(){ + GtkCellRenderer* renderer; + g_TextureBrowser.m_treeViewTags = GTK_WIDGET( gtk_tree_view_new() ); + gtk_tree_view_set_enable_search( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), FALSE ); - g_signal_connect(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags), "button-press-event", (GCallback)TreeViewTags_onButtonPressed, NULL); + g_signal_connect( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), "button-press-event", (GCallback)TreeViewTags_onButtonPressed, NULL ); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags), FALSE); + gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), FALSE ); - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags), -1, "", renderer, "text", 0, NULL); + renderer = gtk_cell_renderer_text_new(); + gtk_tree_view_insert_column_with_attributes( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), -1, "", renderer, "text", 0, NULL ); - TextureBrowser_constructTreeStoreTags(); + TextureBrowser_constructTreeStoreTags(); } -GtkMenuItem* TextureBrowser_constructViewMenu(GtkMenu* menu) -{ - GtkMenuItem* textures_menu_item = new_sub_menu_item_with_mnemonic("_View"); - - if(g_Layout_enableDetachableMenus.m_value) - menu_tearoff (menu); - - create_check_menu_item_with_mnemonic(menu, "Hide _Unused", "ShowInUse"); - if(string_empty(g_pGameDescription->getKeyValue("show_wads"))) - { - create_check_menu_item_with_mnemonic(menu, "Hide Image Missing", "FilterNotex"); - } - menu_separator(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"))) - { - g_TextureBrowser.m_showShaders = true; - } - else - { - create_check_menu_item_with_mnemonic(menu, "Show shaders", "ToggleShowShaders"); - } - - if(g_pGameDescription->mGameType != "doom3" && string_empty(g_pGameDescription->getKeyValue("show_wads"))) - { - create_check_menu_item_with_mnemonic (menu, "Shaders Only", "ToggleShowShaderlistOnly"); - } - if(g_TextureBrowser.m_tags) - { - create_menu_item_with_mnemonic(menu, "Show Untagged", "ShowUntagged"); - } - - create_check_menu_item_with_mnemonic(menu, "Use soft groups", "ToggleSoftGroups"); - - create_check_menu_item_with_mnemonic(menu, "Fixed Size", "FixedSize"); - - if(string_empty(g_pGameDescription->getKeyValue("show_wads"))) - { - menu_separator(menu); - g_TextureBrowser.m_shader_info_item = GTK_WIDGET(create_menu_item_with_mnemonic(menu, "Shader Info", "ShaderInfo")); - gtk_widget_set_sensitive(g_TextureBrowser.m_shader_info_item, FALSE); - } - - return textures_menu_item; -} - -GtkMenuItem* TextureBrowser_constructToolsMenu(GtkMenu* menu) -{ - GtkMenuItem* textures_menu_item = new_sub_menu_item_with_mnemonic("_Tools"); +GtkMenuItem* TextureBrowser_constructViewMenu( GtkMenu* menu ){ + GtkMenuItem* textures_menu_item = new_sub_menu_item_with_mnemonic( "_View" ); - if (g_Layout_enableDetachableMenus.m_value) - menu_tearoff (menu); + if ( g_Layout_enableDetachableMenus.m_value ) { + menu_tearoff( menu ); + } - create_menu_item_with_mnemonic(menu, "Flush & Reload Shaders", "RefreshShaders"); - create_menu_item_with_mnemonic(menu, "Find / Replace...", "FindReplaceTextures"); + create_check_menu_item_with_mnemonic( menu, "Hide _Unused", "ShowInUse" ); + if ( string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { + create_check_menu_item_with_mnemonic( menu, "Hide Image Missing", "FilterNotex" ); + } + menu_separator( menu ); - return textures_menu_item; -} + create_menu_item_with_mnemonic( menu, "Show All", "ShowAllTextures" ); -GtkMenuItem* TextureBrowser_constructTagsMenu(GtkMenu* menu) -{ - GtkMenuItem* textures_menu_item = new_sub_menu_item_with_mnemonic("T_ags"); + // 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" ) ) ) { + g_TextureBrowser.m_showShaders = true; + } + else + { + create_check_menu_item_with_mnemonic( menu, "Show shaders", "ToggleShowShaders" ); + } + + if ( g_pGameDescription->mGameType != "doom3" && string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { + create_check_menu_item_with_mnemonic( menu, "Shaders Only", "ToggleShowShaderlistOnly" ); + } + if ( g_TextureBrowser.m_tags ) { + create_menu_item_with_mnemonic( menu, "Show Untagged", "ShowUntagged" ); + } - if (g_Layout_enableDetachableMenus.m_value) - menu_tearoff (menu); + create_check_menu_item_with_mnemonic( menu, "Use soft groups", "ToggleSoftGroups" ); - create_menu_item_with_mnemonic(menu, "Add tag", "AddTag"); - create_menu_item_with_mnemonic(menu, "Rename tag", "RenameTag"); - create_menu_item_with_mnemonic(menu, "Delete tag", "DeleteTag"); - menu_separator(menu); - create_menu_item_with_mnemonic(menu, "Copy tags from selected", "CopyTag"); - create_menu_item_with_mnemonic(menu, "Paste tags to selected", "PasteTag"); + create_check_menu_item_with_mnemonic( menu, "Fixed Size", "FixedSize" ); - return textures_menu_item; + if ( string_empty( g_pGameDescription->getKeyValue( "show_wads" ) ) ) { + menu_separator( menu ); + g_TextureBrowser.m_shader_info_item = GTK_WIDGET( create_menu_item_with_mnemonic( menu, "Shader Info", "ShaderInfo" ) ); + gtk_widget_set_sensitive( g_TextureBrowser.m_shader_info_item, FALSE ); + } + + return textures_menu_item; } -gboolean TextureBrowser_tagMoveHelper(GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, GSList** selected) -{ - g_assert(selected != NULL); - - GtkTreeRowReference* rowref = gtk_tree_row_reference_new (model, path); - *selected = g_slist_append(*selected, rowref); +GtkMenuItem* TextureBrowser_constructToolsMenu( GtkMenu* menu ){ + GtkMenuItem* textures_menu_item = new_sub_menu_item_with_mnemonic( "_Tools" ); + + if ( g_Layout_enableDetachableMenus.m_value ) { + menu_tearoff( menu ); + } - return FALSE; + create_menu_item_with_mnemonic( menu, "Flush & Reload Shaders", "RefreshShaders" ); + create_menu_item_with_mnemonic( menu, "Find / Replace...", "FindReplaceTextures" ); + + return textures_menu_item; } -void TextureBrowser_assignTags() -{ - GSList* selected = NULL; - GSList* node; - gchar* tag_assigned; - - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_available_tree)); - - gtk_tree_selection_selected_foreach(selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected); - - if(selected != NULL) - { - for (node = selected; node != NULL; node = node->next) - { - GtkTreePath* path = gtk_tree_row_reference_get_path((GtkTreeRowReference*)node->data); - - if(path) - { - GtkTreeIter iter; - - if (gtk_tree_model_get_iter(GTK_TREE_MODEL(g_TextureBrowser.m_available_store), &iter, path)) - { - gtk_tree_model_get(GTK_TREE_MODEL(g_TextureBrowser.m_available_store), &iter, TAG_COLUMN, &tag_assigned, -1); - if(!TagBuilder.CheckShaderTag(g_TextureBrowser.shader.c_str())) - { - // create a custom shader/texture entry - IShader* ishader = QERApp_Shader_ForName(g_TextureBrowser.shader.c_str()); - CopiedString filename = ishader->getShaderFileName(); - - if(filename.empty()) - { - // it's a texture - TagBuilder.AddShaderNode(g_TextureBrowser.shader.c_str(), CUSTOM, TEXTURE); - } else { - // it's a shader - TagBuilder.AddShaderNode(g_TextureBrowser.shader.c_str(), CUSTOM, SHADER); - } - ishader->DecRef(); - } - TagBuilder.AddShaderTag(g_TextureBrowser.shader.c_str(), (char*)tag_assigned, TAG); +GtkMenuItem* TextureBrowser_constructTagsMenu( GtkMenu* menu ){ + GtkMenuItem* textures_menu_item = new_sub_menu_item_with_mnemonic( "T_ags" ); - gtk_list_store_remove(g_TextureBrowser.m_available_store, &iter); - gtk_list_store_append (g_TextureBrowser.m_assigned_store, &iter); - gtk_list_store_set (g_TextureBrowser.m_assigned_store, &iter, TAG_COLUMN, (char*)tag_assigned, -1); - } - } + if ( g_Layout_enableDetachableMenus.m_value ) { + menu_tearoff( menu ); } - g_slist_foreach(selected, (GFunc)gtk_tree_row_reference_free, NULL); + create_menu_item_with_mnemonic( menu, "Add tag", "AddTag" ); + create_menu_item_with_mnemonic( menu, "Rename tag", "RenameTag" ); + create_menu_item_with_mnemonic( menu, "Delete tag", "DeleteTag" ); + menu_separator( menu ); + create_menu_item_with_mnemonic( menu, "Copy tags from selected", "CopyTag" ); + create_menu_item_with_mnemonic( menu, "Paste tags to selected", "PasteTag" ); - // Save changes - TagBuilder.SaveXmlDoc(); - } - g_slist_free(selected); + return textures_menu_item; } -void TextureBrowser_removeTags() -{ - GSList* selected = NULL; - GSList* node; - gchar* tag; +gboolean TextureBrowser_tagMoveHelper( GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, GSList** selected ){ + g_assert( selected != NULL ); + + GtkTreeRowReference* rowref = gtk_tree_row_reference_new( model, path ); + *selected = g_slist_append( *selected, rowref ); - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_assigned_tree)); + return FALSE; +} + +void TextureBrowser_assignTags(){ + GSList* selected = NULL; + GSList* node; + gchar* tag_assigned; - gtk_tree_selection_selected_foreach(selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected); + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); - if(selected != NULL) - { - for (node = selected; node != NULL; node = node->next) - { - GtkTreePath* path = gtk_tree_row_reference_get_path((GtkTreeRowReference*)node->data); + gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); - if (path) - { - GtkTreeIter iter; - - if (gtk_tree_model_get_iter(GTK_TREE_MODEL(g_TextureBrowser.m_assigned_store), &iter, path)) - { - gtk_tree_model_get(GTK_TREE_MODEL(g_TextureBrowser.m_assigned_store), &iter, TAG_COLUMN, &tag, -1); - TagBuilder.DeleteShaderTag(g_TextureBrowser.shader.c_str(), tag); - gtk_list_store_remove(g_TextureBrowser.m_assigned_store, &iter); - } - } + if ( selected != NULL ) { + for ( node = selected; node != NULL; node = node->next ) + { + GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + + if ( path ) { + GtkTreeIter iter; + + if ( gtk_tree_model_get_iter( GTK_TREE_MODEL( g_TextureBrowser.m_available_store ), &iter, path ) ) { + gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_available_store ), &iter, TAG_COLUMN, &tag_assigned, -1 ); + if ( !TagBuilder.CheckShaderTag( g_TextureBrowser.shader.c_str() ) ) { + // create a custom shader/texture entry + IShader* ishader = QERApp_Shader_ForName( g_TextureBrowser.shader.c_str() ); + CopiedString filename = ishader->getShaderFileName(); + + if ( filename.empty() ) { + // it's a texture + TagBuilder.AddShaderNode( g_TextureBrowser.shader.c_str(), CUSTOM, TEXTURE ); + } + else { + // it's a shader + TagBuilder.AddShaderNode( g_TextureBrowser.shader.c_str(), CUSTOM, SHADER ); + } + ishader->DecRef(); + } + TagBuilder.AddShaderTag( g_TextureBrowser.shader.c_str(), (char*)tag_assigned, TAG ); + + gtk_list_store_remove( g_TextureBrowser.m_available_store, &iter ); + gtk_list_store_append( g_TextureBrowser.m_assigned_store, &iter ); + gtk_list_store_set( g_TextureBrowser.m_assigned_store, &iter, TAG_COLUMN, (char*)tag_assigned, -1 ); + } + } + } + + g_slist_foreach( selected, (GFunc)gtk_tree_row_reference_free, NULL ); + + // Save changes + TagBuilder.SaveXmlDoc(); } + g_slist_free( selected ); +} + +void TextureBrowser_removeTags(){ + GSList* selected = NULL; + GSList* node; + gchar* tag; + + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ) ); - g_slist_foreach(selected, (GFunc)gtk_tree_row_reference_free, NULL); + gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); - // Update the "available tags list" - BuildStoreAvailableTags(g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser); + if ( selected != NULL ) { + for ( node = selected; node != NULL; node = node->next ) + { + GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + + if ( path ) { + GtkTreeIter iter; + + if ( gtk_tree_model_get_iter( GTK_TREE_MODEL( g_TextureBrowser.m_assigned_store ), &iter, path ) ) { + gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_assigned_store ), &iter, TAG_COLUMN, &tag, -1 ); + TagBuilder.DeleteShaderTag( g_TextureBrowser.shader.c_str(), tag ); + gtk_list_store_remove( g_TextureBrowser.m_assigned_store, &iter ); + } + } + } - // Save changes - TagBuilder.SaveXmlDoc(); - } - g_slist_free(selected); + g_slist_foreach( selected, (GFunc)gtk_tree_row_reference_free, NULL ); + + // Update the "available tags list" + BuildStoreAvailableTags( g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser ); + + // Save changes + TagBuilder.SaveXmlDoc(); + } + g_slist_free( selected ); } -void TextureBrowser_buildTagList() -{ - GtkTreeIter treeIter; - gtk_list_store_clear(g_TextureBrowser.m_all_tags_list); +void TextureBrowser_buildTagList(){ + GtkTreeIter treeIter; + gtk_list_store_clear( g_TextureBrowser.m_all_tags_list ); - std::set::iterator iter; + std::set::iterator iter; - for (iter = g_TextureBrowser.m_all_tags.begin(); iter != g_TextureBrowser.m_all_tags.end(); ++iter) - { - gtk_list_store_append(g_TextureBrowser.m_all_tags_list, &treeIter); - gtk_list_store_set(g_TextureBrowser.m_all_tags_list, &treeIter, TAG_COLUMN, (*iter).c_str(), -1); - } + for ( iter = g_TextureBrowser.m_all_tags.begin(); iter != g_TextureBrowser.m_all_tags.end(); ++iter ) + { + gtk_list_store_append( g_TextureBrowser.m_all_tags_list, &treeIter ); + gtk_list_store_set( g_TextureBrowser.m_all_tags_list, &treeIter, TAG_COLUMN, ( *iter ).c_str(), -1 ); + } } -void TextureBrowser_searchTags() -{ - GSList* selected = NULL; - GSList* node; - gchar* tag; - char buffer[256]; - char tags_searched[256]; - - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags)); - - gtk_tree_selection_selected_foreach(selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected); - - if(selected != NULL) - { - strcpy(buffer, "/root/*/*[tag='"); - strcpy(tags_searched, "[TAGS] "); - - for (node = selected; node != NULL; node = node->next) - { - GtkTreePath* path = gtk_tree_row_reference_get_path((GtkTreeRowReference*)node->data); - - if (path) - { - GtkTreeIter iter; - - if (gtk_tree_model_get_iter(GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list), &iter, path)) - { - gtk_tree_model_get(GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list), &iter, TAG_COLUMN, &tag, -1); - - strcat(buffer, tag); - strcat(tags_searched, tag); - if(node != g_slist_last(node)) - { - strcat(buffer, "' and tag='"); - strcat(tags_searched, ", "); - } - } - } - } - - strcat(buffer, "']"); - - g_slist_foreach(selected, (GFunc)gtk_tree_row_reference_free, NULL); - - g_TextureBrowser.m_found_shaders.clear(); // delete old list - TagBuilder.TagSearch(buffer, g_TextureBrowser.m_found_shaders); - - if(!g_TextureBrowser.m_found_shaders.empty()) // found something - { - size_t shaders_found = g_TextureBrowser.m_found_shaders.size(); - - globalOutputStream() << "Found " << (unsigned int)shaders_found << " textures and shaders with " << tags_searched << "\n"; - ScopeDisableScreenUpdates disableScreenUpdates("Searching...", "Loading Textures"); - - std::set::iterator iter; - - for(iter = g_TextureBrowser.m_found_shaders.begin(); iter != g_TextureBrowser.m_found_shaders.end(); iter++) - { - std::string path = (*iter).c_str(); - size_t pos = path.find_last_of("/", path.size()); - std::string name = path.substr(pos + 1, path.size()); - path = path.substr(0, pos + 1); - TextureDirectory_loadTexture(path.c_str(), name.c_str()); - } - } - g_TextureBrowser.m_searchedTags = true; - g_TextureBrowser_currentDirectory = tags_searched; - - g_TextureBrowser.m_nTotalHeight = 0; - TextureBrowser_setOriginY(g_TextureBrowser, 0); - TextureBrowser_heightChanged(g_TextureBrowser); - TextureBrowser_updateTitle(); - } - g_slist_free(selected); +void TextureBrowser_searchTags(){ + GSList* selected = NULL; + GSList* node; + gchar* tag; + char buffer[256]; + char tags_searched[256]; + + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + + gtk_tree_selection_selected_foreach( selection, (GtkTreeSelectionForeachFunc)TextureBrowser_tagMoveHelper, &selected ); + + if ( selected != NULL ) { + strcpy( buffer, "/root/*/*[tag='" ); + strcpy( tags_searched, "[TAGS] " ); + + for ( node = selected; node != NULL; node = node->next ) + { + GtkTreePath* path = gtk_tree_row_reference_get_path( (GtkTreeRowReference*)node->data ); + + if ( path ) { + GtkTreeIter iter; + + if ( gtk_tree_model_get_iter( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iter, path ) ) { + gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iter, TAG_COLUMN, &tag, -1 ); + + strcat( buffer, tag ); + strcat( tags_searched, tag ); + if ( node != g_slist_last( node ) ) { + strcat( buffer, "' and tag='" ); + strcat( tags_searched, ", " ); + } + } + } + } + + strcat( buffer, "']" ); + + g_slist_foreach( selected, (GFunc)gtk_tree_row_reference_free, NULL ); + + g_TextureBrowser.m_found_shaders.clear(); // delete old list + TagBuilder.TagSearch( buffer, g_TextureBrowser.m_found_shaders ); + + if ( !g_TextureBrowser.m_found_shaders.empty() ) { // found something + size_t shaders_found = g_TextureBrowser.m_found_shaders.size(); + + globalOutputStream() << "Found " << (unsigned int)shaders_found << " textures and shaders with " << tags_searched << "\n"; + ScopeDisableScreenUpdates disableScreenUpdates( "Searching...", "Loading Textures" ); + + std::set::iterator iter; + + for ( iter = g_TextureBrowser.m_found_shaders.begin(); iter != g_TextureBrowser.m_found_shaders.end(); iter++ ) + { + std::string path = ( *iter ).c_str(); + size_t pos = path.find_last_of( "/", path.size() ); + std::string name = path.substr( pos + 1, path.size() ); + path = path.substr( 0, pos + 1 ); + TextureDirectory_loadTexture( path.c_str(), name.c_str() ); + } + } + g_TextureBrowser.m_searchedTags = true; + g_TextureBrowser_currentDirectory = tags_searched; + + g_TextureBrowser.m_nTotalHeight = 0; + TextureBrowser_setOriginY( g_TextureBrowser, 0 ); + TextureBrowser_heightChanged( g_TextureBrowser ); + TextureBrowser_updateTitle(); + } + g_slist_free( selected ); } -void TextureBrowser_toggleSearchButton() -{ - gint page = gtk_notebook_get_current_page(GTK_NOTEBOOK(g_TextureBrowser.m_tag_notebook)); +void TextureBrowser_toggleSearchButton(){ + gint page = gtk_notebook_get_current_page( GTK_NOTEBOOK( g_TextureBrowser.m_tag_notebook ) ); - if(page == 0) // tag page - { - gtk_widget_show_all(g_TextureBrowser.m_search_button); - } else { - gtk_widget_hide_all(g_TextureBrowser.m_search_button); - } + if ( page == 0 ) { // tag page + gtk_widget_show_all( g_TextureBrowser.m_search_button ); + } + else { + gtk_widget_hide_all( g_TextureBrowser.m_search_button ); + } } -void TextureBrowser_constructTagNotebook() -{ - g_TextureBrowser.m_tag_notebook = gtk_notebook_new(); - GtkWidget* labelTags = gtk_label_new("Tags"); - GtkWidget* labelTextures = gtk_label_new("Textures"); +void TextureBrowser_constructTagNotebook(){ + g_TextureBrowser.m_tag_notebook = gtk_notebook_new(); + GtkWidget* labelTags = gtk_label_new( "Tags" ); + GtkWidget* labelTextures = gtk_label_new( "Textures" ); - gtk_notebook_append_page(GTK_NOTEBOOK(g_TextureBrowser.m_tag_notebook), g_TextureBrowser.m_scr_win_tree, labelTextures); - gtk_notebook_append_page(GTK_NOTEBOOK(g_TextureBrowser.m_tag_notebook), g_TextureBrowser.m_scr_win_tags, labelTags); + gtk_notebook_append_page( GTK_NOTEBOOK( g_TextureBrowser.m_tag_notebook ), g_TextureBrowser.m_scr_win_tree, labelTextures ); + gtk_notebook_append_page( GTK_NOTEBOOK( g_TextureBrowser.m_tag_notebook ), g_TextureBrowser.m_scr_win_tags, labelTags ); - g_signal_connect(G_OBJECT(g_TextureBrowser.m_tag_notebook), "switch-page", G_CALLBACK(TextureBrowser_toggleSearchButton), NULL); + g_signal_connect( G_OBJECT( g_TextureBrowser.m_tag_notebook ), "switch-page", G_CALLBACK( TextureBrowser_toggleSearchButton ), NULL ); - gtk_widget_show_all(g_TextureBrowser.m_tag_notebook); + gtk_widget_show_all( g_TextureBrowser.m_tag_notebook ); } -void TextureBrowser_constructSearchButton() -{ - GtkTooltips* tooltips = gtk_tooltips_new(); +void TextureBrowser_constructSearchButton(){ + GtkTooltips* tooltips = gtk_tooltips_new(); - GtkWidget* image = gtk_image_new_from_stock(GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR); - g_TextureBrowser.m_search_button = gtk_button_new(); - g_signal_connect(G_OBJECT(g_TextureBrowser.m_search_button), "clicked", G_CALLBACK(TextureBrowser_searchTags), NULL); - gtk_tooltips_set_tip(GTK_TOOLTIPS(tooltips), g_TextureBrowser.m_search_button, "Search with selected tags", "Search with selected tags"); - gtk_container_add(GTK_CONTAINER(g_TextureBrowser.m_search_button), image); + GtkWidget* image = gtk_image_new_from_stock( GTK_STOCK_FIND, GTK_ICON_SIZE_SMALL_TOOLBAR ); + g_TextureBrowser.m_search_button = gtk_button_new(); + g_signal_connect( G_OBJECT( g_TextureBrowser.m_search_button ), "clicked", G_CALLBACK( TextureBrowser_searchTags ), NULL ); + gtk_tooltips_set_tip( GTK_TOOLTIPS( tooltips ), g_TextureBrowser.m_search_button, "Search with selected tags", "Search with selected tags" ); + gtk_container_add( GTK_CONTAINER( g_TextureBrowser.m_search_button ), image ); } -void TextureBrowser_checkTagFile() -{ - const char SHADERTAG_FILE[] = "shadertags.xml"; - CopiedString default_filename, rc_filename; - StringOutputStream stream(256); - - stream << LocalRcPath_get(); - stream << SHADERTAG_FILE; - rc_filename = stream.c_str(); - - if(file_exists(rc_filename.c_str())) - { - g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc(rc_filename.c_str()); - - if(g_TextureBrowser.m_tags) - { - globalOutputStream() << "Loading tag file " << rc_filename.c_str() << ".\n"; - } - } - else - { - // load default tagfile - stream.clear(); - stream << g_pGameDescription->mGameToolsPath.c_str(); - stream << SHADERTAG_FILE; - default_filename = stream.c_str(); - - if(file_exists(default_filename.c_str())) - { - g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc(default_filename.c_str(), rc_filename.c_str()); - - if(g_TextureBrowser.m_tags) - { - globalOutputStream() << "Loading default tag file " << default_filename.c_str() << ".\n"; - } - } - else - { - globalErrorStream() << "Unable to find default tag file " << default_filename.c_str() << ". No tag support.\n"; - } - } -} - -void TextureBrowser_SetNotex() -{ - StringOutputStream name(256); - name << GlobalRadiant().getAppPath() << "bitmaps/notex.bmp"; - g_notex = name.c_str(); +void TextureBrowser_checkTagFile(){ + const char SHADERTAG_FILE[] = "shadertags.xml"; + CopiedString default_filename, rc_filename; + StringOutputStream stream( 256 ); + + stream << LocalRcPath_get(); + stream << SHADERTAG_FILE; + rc_filename = stream.c_str(); + + if ( file_exists( rc_filename.c_str() ) ) { + g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc( rc_filename.c_str() ); + + if ( g_TextureBrowser.m_tags ) { + globalOutputStream() << "Loading tag file " << rc_filename.c_str() << ".\n"; + } + } + else + { + // load default tagfile + stream.clear(); + stream << g_pGameDescription->mGameToolsPath.c_str(); + stream << SHADERTAG_FILE; + default_filename = stream.c_str(); + + if ( file_exists( default_filename.c_str() ) ) { + g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc( default_filename.c_str(), rc_filename.c_str() ); + + if ( g_TextureBrowser.m_tags ) { + globalOutputStream() << "Loading default tag file " << default_filename.c_str() << ".\n"; + } + } + else + { + globalErrorStream() << "Unable to find default tag file " << default_filename.c_str() << ". No tag support.\n"; + } + } +} + +void TextureBrowser_SetNotex(){ + StringOutputStream name( 256 ); + name << GlobalRadiant().getAppPath() << "bitmaps/notex.bmp"; + g_notex = name.c_str(); - name = NULL; - name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.bmp"; - g_shadernotex = name.c_str(); + name = NULL; + name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.bmp"; + g_shadernotex = name.c_str(); } -GtkWidget* TextureBrowser_constructWindow(GtkWindow* toplevel) -{ - // The gl_widget and the tag assignment frame should be packed into a GtkVPaned with the slider - // position stored in local.pref. gtk_paned_get_position() and gtk_paned_set_position() don't - // seem to work in gtk 2.4 and the arrow buttons don't handle GTK_FILL, so here's another thing - // for the "once-the-gtk-libs-are-updated-TODO-list" :x - - TextureBrowser_checkTagFile(); - TextureBrowser_SetNotex(); - - GlobalShaderSystem().setActiveShadersChangedNotify(ReferenceCaller(g_TextureBrowser)); - - g_TextureBrowser.m_parent = toplevel; - - GtkWidget* table = gtk_table_new(3, 3, FALSE); - GtkWidget* frame_table = NULL; - GtkWidget* vbox = gtk_vbox_new(FALSE, 0); - gtk_table_attach(GTK_TABLE(table), vbox, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0); - gtk_widget_show(vbox); - - GtkWidget* menu_bar; - - { // menu bar - menu_bar = gtk_menu_bar_new(); - GtkWidget* menu_view = gtk_menu_new(); - GtkWidget* view_item = (GtkWidget*)TextureBrowser_constructViewMenu(GTK_MENU(menu_view)); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(view_item), menu_view); - gtk_menu_bar_append(GTK_MENU_BAR(menu_bar), view_item); - - GtkWidget* menu_tools = gtk_menu_new(); - GtkWidget* tools_item = (GtkWidget*)TextureBrowser_constructToolsMenu(GTK_MENU(menu_tools)); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(tools_item), menu_tools); - gtk_menu_bar_append(GTK_MENU_BAR(menu_bar), tools_item); - - gtk_table_attach(GTK_TABLE (table), menu_bar, 0, 3, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0); - gtk_widget_show(menu_bar); - } - { // Texture TreeView - g_TextureBrowser.m_scr_win_tree = gtk_scrolled_window_new(NULL, NULL); - gtk_container_set_border_width(GTK_CONTAINER(g_TextureBrowser.m_scr_win_tree), 0); - - // vertical only scrolling for treeview - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(g_TextureBrowser.m_scr_win_tree), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - - gtk_widget_show(g_TextureBrowser.m_scr_win_tree); - - TextureBrowser_createTreeViewTree(); - - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(g_TextureBrowser.m_scr_win_tree), GTK_WIDGET(g_TextureBrowser.m_treeViewTree)); - gtk_widget_show(GTK_WIDGET(g_TextureBrowser.m_treeViewTree)); - } - { // gl_widget scrollbar - GtkWidget* w = gtk_vscrollbar_new(GTK_ADJUSTMENT(gtk_adjustment_new (0,0,0,1,1,0))); - gtk_table_attach(GTK_TABLE (table), w, 2, 3, 1, 2, GTK_SHRINK, GTK_FILL, 0, 0); - gtk_widget_show(w); - g_TextureBrowser.m_texture_scroll = w; - - GtkAdjustment *vadjustment = gtk_range_get_adjustment (GTK_RANGE (g_TextureBrowser.m_texture_scroll)); - g_signal_connect(G_OBJECT(vadjustment), "value_changed", G_CALLBACK(TextureBrowser_verticalScroll), &g_TextureBrowser); - - widget_set_visible(g_TextureBrowser.m_texture_scroll, g_TextureBrowser.m_showTextureScrollbar); - } - { // gl_widget - g_TextureBrowser.m_gl_widget = glwidget_new(FALSE); - gtk_widget_ref(g_TextureBrowser.m_gl_widget); - - 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_FLAGS(g_TextureBrowser.m_gl_widget, GTK_CAN_FOCUS); - - gtk_table_attach_defaults(GTK_TABLE(table), g_TextureBrowser.m_gl_widget, 1, 2, 1, 2); - gtk_widget_show(g_TextureBrowser.m_gl_widget); - - g_TextureBrowser.m_sizeHandler = g_signal_connect(G_OBJECT(g_TextureBrowser.m_gl_widget), "size_allocate", G_CALLBACK(TextureBrowser_size_allocate), &g_TextureBrowser); - g_TextureBrowser.m_exposeHandler = g_signal_connect(G_OBJECT(g_TextureBrowser.m_gl_widget), "expose_event", G_CALLBACK(TextureBrowser_expose), &g_TextureBrowser); - - g_signal_connect(G_OBJECT(g_TextureBrowser.m_gl_widget), "button_press_event", G_CALLBACK(TextureBrowser_button_press), &g_TextureBrowser); - g_signal_connect(G_OBJECT(g_TextureBrowser.m_gl_widget), "button_release_event", G_CALLBACK(TextureBrowser_button_release), &g_TextureBrowser); - g_signal_connect(G_OBJECT(g_TextureBrowser.m_gl_widget), "motion_notify_event", G_CALLBACK(TextureBrowser_motion), &g_TextureBrowser); - g_signal_connect(G_OBJECT(g_TextureBrowser.m_gl_widget), "scroll_event", G_CALLBACK(TextureBrowser_scroll), &g_TextureBrowser); - } - - // tag stuff - if(g_TextureBrowser.m_tags) - { - { // fill tag GtkListStore - g_TextureBrowser.m_all_tags_list = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE(g_TextureBrowser.m_all_tags_list); - gtk_tree_sortable_set_sort_column_id(sortable, TAG_COLUMN, GTK_SORT_ASCENDING); - - TagBuilder.GetAllTags(g_TextureBrowser.m_all_tags); - TextureBrowser_buildTagList(); - } - { // tag menu bar - GtkWidget* menu_tags = gtk_menu_new(); - GtkWidget* tags_item = (GtkWidget*)TextureBrowser_constructTagsMenu(GTK_MENU(menu_tags)); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(tags_item), menu_tags); - gtk_menu_bar_append(GTK_MENU_BAR(menu_bar), tags_item); - } - { // Tag TreeView - g_TextureBrowser.m_scr_win_tags = gtk_scrolled_window_new(NULL, NULL); - gtk_container_set_border_width(GTK_CONTAINER(g_TextureBrowser.m_scr_win_tags), 0); - - // vertical only scrolling for treeview - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(g_TextureBrowser.m_scr_win_tags), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - - TextureBrowser_createTreeViewTags(); - - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags)); - gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); - - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW (g_TextureBrowser.m_scr_win_tags), GTK_WIDGET (g_TextureBrowser.m_treeViewTags)); - gtk_widget_show(GTK_WIDGET(g_TextureBrowser.m_treeViewTags)); - } - { // Texture/Tag notebook - TextureBrowser_constructTagNotebook(); - gtk_box_pack_start(GTK_BOX(vbox), g_TextureBrowser.m_tag_notebook, TRUE, TRUE, 0); - } - { // Tag search button - TextureBrowser_constructSearchButton(); - gtk_box_pack_end(GTK_BOX(vbox), g_TextureBrowser.m_search_button, FALSE, FALSE, 0); - } - { // Tag frame - frame_table = gtk_table_new(3, 3, FALSE); - - g_TextureBrowser.m_tag_frame = gtk_frame_new("Tag assignment"); - gtk_frame_set_label_align(GTK_FRAME(g_TextureBrowser.m_tag_frame), 0.5, 0.5); - gtk_frame_set_shadow_type(GTK_FRAME(g_TextureBrowser.m_tag_frame), GTK_SHADOW_NONE); - - gtk_table_attach(GTK_TABLE(table), g_TextureBrowser.m_tag_frame, 1, 3, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0); - - gtk_widget_show(frame_table); - - gtk_container_add (GTK_CONTAINER(g_TextureBrowser.m_tag_frame), frame_table); - } - { // assigned tag list - GtkWidget* scrolled_win = gtk_scrolled_window_new(NULL, NULL); - 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); +GtkWidget* TextureBrowser_constructWindow( GtkWindow* toplevel ){ + // The gl_widget and the tag assignment frame should be packed into a GtkVPaned with the slider + // position stored in local.pref. gtk_paned_get_position() and gtk_paned_set_position() don't + // seem to work in gtk 2.4 and the arrow buttons don't handle GTK_FILL, so here's another thing + // for the "once-the-gtk-libs-are-updated-TODO-list" :x - g_TextureBrowser.m_assigned_store = gtk_list_store_new(N_COLUMNS, G_TYPE_STRING); + TextureBrowser_checkTagFile(); + TextureBrowser_SetNotex(); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE(g_TextureBrowser.m_assigned_store); - gtk_tree_sortable_set_sort_column_id(sortable, TAG_COLUMN, GTK_SORT_ASCENDING); + GlobalShaderSystem().setActiveShadersChangedNotify( ReferenceCaller( g_TextureBrowser ) ); - GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); + g_TextureBrowser.m_parent = toplevel; - g_TextureBrowser.m_assigned_tree = gtk_tree_view_new_with_model(GTK_TREE_MODEL (g_TextureBrowser.m_assigned_store)); - g_object_unref(G_OBJECT (g_TextureBrowser.m_assigned_store)); - g_signal_connect(g_TextureBrowser.m_assigned_tree, "row-activated", (GCallback) TextureBrowser_removeTags, NULL); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW (g_TextureBrowser.m_assigned_tree), FALSE); + GtkWidget* table = gtk_table_new( 3, 3, FALSE ); + GtkWidget* frame_table = NULL; + GtkWidget* vbox = gtk_vbox_new( FALSE, 0 ); + gtk_table_attach( GTK_TABLE( table ), vbox, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0 ); + gtk_widget_show( vbox ); - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_assigned_tree)); - gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE); + GtkWidget* menu_bar; - GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes("", renderer, "text", TAG_COLUMN, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW (g_TextureBrowser.m_assigned_tree), column); - gtk_widget_show(g_TextureBrowser.m_assigned_tree); + { // menu bar + menu_bar = gtk_menu_bar_new(); + GtkWidget* menu_view = gtk_menu_new(); + GtkWidget* view_item = (GtkWidget*)TextureBrowser_constructViewMenu( GTK_MENU( menu_view ) ); + gtk_menu_item_set_submenu( GTK_MENU_ITEM( view_item ), menu_view ); + gtk_menu_bar_append( GTK_MENU_BAR( menu_bar ), view_item ); - gtk_widget_show(scrolled_win); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW (scrolled_win), GTK_WIDGET (g_TextureBrowser.m_assigned_tree)); + GtkWidget* menu_tools = gtk_menu_new(); + GtkWidget* tools_item = (GtkWidget*)TextureBrowser_constructToolsMenu( GTK_MENU( menu_tools ) ); + gtk_menu_item_set_submenu( GTK_MENU_ITEM( tools_item ), menu_tools ); + gtk_menu_bar_append( GTK_MENU_BAR( menu_bar ), tools_item ); - gtk_table_attach(GTK_TABLE(frame_table), scrolled_win, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0); + gtk_table_attach( GTK_TABLE( table ), menu_bar, 0, 3, 0, 1, GTK_FILL, GTK_SHRINK, 0, 0 ); + gtk_widget_show( menu_bar ); } - { // available tag list - GtkWidget* scrolled_win = gtk_scrolled_window_new (NULL, NULL); - 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); + { // Texture TreeView + g_TextureBrowser.m_scr_win_tree = gtk_scrolled_window_new( NULL, NULL ); + gtk_container_set_border_width( GTK_CONTAINER( g_TextureBrowser.m_scr_win_tree ), 0 ); - g_TextureBrowser.m_available_store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING); - GtkTreeSortable* sortable = GTK_TREE_SORTABLE(g_TextureBrowser.m_available_store); - gtk_tree_sortable_set_sort_column_id(sortable, TAG_COLUMN, GTK_SORT_ASCENDING); + // vertical only scrolling for treeview + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tree ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); - GtkCellRenderer* renderer = gtk_cell_renderer_text_new (); + gtk_widget_show( g_TextureBrowser.m_scr_win_tree ); - g_TextureBrowser.m_available_tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (g_TextureBrowser.m_available_store)); - g_object_unref (G_OBJECT (g_TextureBrowser.m_available_store)); - g_signal_connect(g_TextureBrowser.m_available_tree, "row-activated", (GCallback) TextureBrowser_assignTags, NULL); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (g_TextureBrowser.m_available_tree), FALSE); + TextureBrowser_createTreeViewTree(); - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_available_tree)); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); - - GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", TAG_COLUMN, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW (g_TextureBrowser.m_available_tree), column); - gtk_widget_show (g_TextureBrowser.m_available_tree); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tree ), GTK_WIDGET( g_TextureBrowser.m_treeViewTree ) ); + gtk_widget_show( GTK_WIDGET( g_TextureBrowser.m_treeViewTree ) ); + } + { // gl_widget scrollbar + GtkWidget* w = gtk_vscrollbar_new( GTK_ADJUSTMENT( gtk_adjustment_new( 0,0,0,1,1,0 ) ) ); + gtk_table_attach( GTK_TABLE( table ), w, 2, 3, 1, 2, GTK_SHRINK, GTK_FILL, 0, 0 ); + gtk_widget_show( w ); + g_TextureBrowser.m_texture_scroll = w; - gtk_widget_show (scrolled_win); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_win), GTK_WIDGET (g_TextureBrowser.m_available_tree)); + GtkAdjustment *vadjustment = gtk_range_get_adjustment( GTK_RANGE( g_TextureBrowser.m_texture_scroll ) ); + g_signal_connect( G_OBJECT( vadjustment ), "value_changed", G_CALLBACK( TextureBrowser_verticalScroll ), &g_TextureBrowser ); - gtk_table_attach (GTK_TABLE (frame_table), scrolled_win, 2, 3, 1, 3, GTK_FILL, GTK_FILL, 0, 0); + widget_set_visible( g_TextureBrowser.m_texture_scroll, g_TextureBrowser.m_showTextureScrollbar ); } - { // tag arrow buttons - GtkWidget* m_btn_left = gtk_button_new(); - GtkWidget* m_btn_right = gtk_button_new(); - GtkWidget* m_arrow_left = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_OUT); - GtkWidget* m_arrow_right = gtk_arrow_new(GTK_ARROW_RIGHT, GTK_SHADOW_OUT); - gtk_container_add(GTK_CONTAINER(m_btn_left), m_arrow_left); - gtk_container_add(GTK_CONTAINER(m_btn_right), m_arrow_right); + { // gl_widget + g_TextureBrowser.m_gl_widget = glwidget_new( FALSE ); + gtk_widget_ref( g_TextureBrowser.m_gl_widget ); - // workaround. the size of the tag frame depends of the requested size of the arrow buttons. - gtk_widget_set_size_request(m_arrow_left, -1, 68); - gtk_widget_set_size_request(m_arrow_right, -1, 68); + 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_FLAGS( g_TextureBrowser.m_gl_widget, GTK_CAN_FOCUS ); - gtk_table_attach(GTK_TABLE(frame_table), m_btn_left, 1, 2, 1, 2, GTK_SHRINK, GTK_EXPAND, 0, 0); - gtk_table_attach(GTK_TABLE(frame_table), m_btn_right, 1, 2, 2, 3, GTK_SHRINK, GTK_EXPAND, 0, 0); + gtk_table_attach_defaults( GTK_TABLE( table ), g_TextureBrowser.m_gl_widget, 1, 2, 1, 2 ); + gtk_widget_show( g_TextureBrowser.m_gl_widget ); - g_signal_connect(G_OBJECT (m_btn_left), "clicked", G_CALLBACK(TextureBrowser_assignTags), NULL); - g_signal_connect(G_OBJECT (m_btn_right), "clicked", G_CALLBACK(TextureBrowser_removeTags), NULL); + g_TextureBrowser.m_sizeHandler = g_signal_connect( G_OBJECT( g_TextureBrowser.m_gl_widget ), "size_allocate", G_CALLBACK( TextureBrowser_size_allocate ), &g_TextureBrowser ); + g_TextureBrowser.m_exposeHandler = g_signal_connect( G_OBJECT( g_TextureBrowser.m_gl_widget ), "expose_event", G_CALLBACK( TextureBrowser_expose ), &g_TextureBrowser ); - gtk_widget_show(m_btn_left); - gtk_widget_show(m_btn_right); - gtk_widget_show(m_arrow_left); - gtk_widget_show(m_arrow_right); + g_signal_connect( G_OBJECT( g_TextureBrowser.m_gl_widget ), "button_press_event", G_CALLBACK( TextureBrowser_button_press ), &g_TextureBrowser ); + g_signal_connect( G_OBJECT( g_TextureBrowser.m_gl_widget ), "button_release_event", G_CALLBACK( TextureBrowser_button_release ), &g_TextureBrowser ); + g_signal_connect( G_OBJECT( g_TextureBrowser.m_gl_widget ), "motion_notify_event", G_CALLBACK( TextureBrowser_motion ), &g_TextureBrowser ); + g_signal_connect( G_OBJECT( g_TextureBrowser.m_gl_widget ), "scroll_event", G_CALLBACK( TextureBrowser_scroll ), &g_TextureBrowser ); } - { // tag fram labels - GtkWidget* m_lbl_assigned = gtk_label_new ("Assigned"); - GtkWidget* m_lbl_unassigned = gtk_label_new ("Available"); - gtk_table_attach (GTK_TABLE (frame_table), m_lbl_assigned, 0, 1, 0, 1, GTK_EXPAND, GTK_SHRINK, 0, 0); - gtk_table_attach (GTK_TABLE (frame_table), m_lbl_unassigned, 2, 3, 0, 1, GTK_EXPAND, GTK_SHRINK, 0, 0); + // tag stuff + if ( g_TextureBrowser.m_tags ) { + { // fill tag GtkListStore + g_TextureBrowser.m_all_tags_list = gtk_list_store_new( N_COLUMNS, G_TYPE_STRING ); + GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_all_tags_list ); + gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); + + TagBuilder.GetAllTags( g_TextureBrowser.m_all_tags ); + TextureBrowser_buildTagList(); + } + { // tag menu bar + GtkWidget* menu_tags = gtk_menu_new(); + GtkWidget* tags_item = (GtkWidget*)TextureBrowser_constructTagsMenu( GTK_MENU( menu_tags ) ); + gtk_menu_item_set_submenu( GTK_MENU_ITEM( tags_item ), menu_tags ); + gtk_menu_bar_append( GTK_MENU_BAR( menu_bar ), tags_item ); + } + { // Tag TreeView + g_TextureBrowser.m_scr_win_tags = gtk_scrolled_window_new( NULL, NULL ); + gtk_container_set_border_width( GTK_CONTAINER( g_TextureBrowser.m_scr_win_tags ), 0 ); + + // vertical only scrolling for treeview + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tags ), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS ); + + TextureBrowser_createTreeViewTags(); + + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); + + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( g_TextureBrowser.m_scr_win_tags ), GTK_WIDGET( g_TextureBrowser.m_treeViewTags ) ); + gtk_widget_show( GTK_WIDGET( g_TextureBrowser.m_treeViewTags ) ); + } + { // Texture/Tag notebook + TextureBrowser_constructTagNotebook(); + gtk_box_pack_start( GTK_BOX( vbox ), g_TextureBrowser.m_tag_notebook, TRUE, TRUE, 0 ); + } + { // Tag search button + TextureBrowser_constructSearchButton(); + gtk_box_pack_end( GTK_BOX( vbox ), g_TextureBrowser.m_search_button, FALSE, FALSE, 0 ); + } + { // Tag frame + frame_table = gtk_table_new( 3, 3, FALSE ); + + g_TextureBrowser.m_tag_frame = gtk_frame_new( "Tag assignment" ); + gtk_frame_set_label_align( GTK_FRAME( g_TextureBrowser.m_tag_frame ), 0.5, 0.5 ); + gtk_frame_set_shadow_type( GTK_FRAME( g_TextureBrowser.m_tag_frame ), GTK_SHADOW_NONE ); + + gtk_table_attach( GTK_TABLE( table ), g_TextureBrowser.m_tag_frame, 1, 3, 2, 3, GTK_FILL, GTK_SHRINK, 0, 0 ); + + gtk_widget_show( frame_table ); + + gtk_container_add( GTK_CONTAINER( g_TextureBrowser.m_tag_frame ), frame_table ); + } + { // assigned tag list + GtkWidget* scrolled_win = gtk_scrolled_window_new( NULL, NULL ); + 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 = gtk_list_store_new( N_COLUMNS, G_TYPE_STRING ); + + GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_assigned_store ); + gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); + + GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); + + g_TextureBrowser.m_assigned_tree = gtk_tree_view_new_with_model( GTK_TREE_MODEL( g_TextureBrowser.m_assigned_store ) ); + g_object_unref( G_OBJECT( g_TextureBrowser.m_assigned_store ) ); + g_signal_connect( g_TextureBrowser.m_assigned_tree, "row-activated", (GCallback) TextureBrowser_removeTags, NULL ); + gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ), FALSE ); + + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ) ); + gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); + + GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes( "", renderer, "text", TAG_COLUMN, NULL ); + gtk_tree_view_append_column( GTK_TREE_VIEW( g_TextureBrowser.m_assigned_tree ), column ); + gtk_widget_show( g_TextureBrowser.m_assigned_tree ); + + gtk_widget_show( scrolled_win ); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_WIDGET( g_TextureBrowser.m_assigned_tree ) ); + + gtk_table_attach( GTK_TABLE( frame_table ), scrolled_win, 0, 1, 1, 3, GTK_FILL, GTK_FILL, 0, 0 ); + } + { // available tag list + GtkWidget* scrolled_win = gtk_scrolled_window_new( NULL, NULL ); + 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 = gtk_list_store_new( N_COLUMNS, G_TYPE_STRING ); + GtkTreeSortable* sortable = GTK_TREE_SORTABLE( g_TextureBrowser.m_available_store ); + gtk_tree_sortable_set_sort_column_id( sortable, TAG_COLUMN, GTK_SORT_ASCENDING ); + + GtkCellRenderer* renderer = gtk_cell_renderer_text_new(); + + g_TextureBrowser.m_available_tree = gtk_tree_view_new_with_model( GTK_TREE_MODEL( g_TextureBrowser.m_available_store ) ); + g_object_unref( G_OBJECT( g_TextureBrowser.m_available_store ) ); + g_signal_connect( g_TextureBrowser.m_available_tree, "row-activated", (GCallback) TextureBrowser_assignTags, NULL ); + gtk_tree_view_set_headers_visible( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ), FALSE ); + + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); + gtk_tree_selection_set_mode( selection, GTK_SELECTION_MULTIPLE ); + + GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes( "", renderer, "text", TAG_COLUMN, NULL ); + gtk_tree_view_append_column( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ), column ); + gtk_widget_show( g_TextureBrowser.m_available_tree ); - gtk_widget_show (m_lbl_assigned); - gtk_widget_show (m_lbl_unassigned); + gtk_widget_show( scrolled_win ); + gtk_scrolled_window_add_with_viewport( GTK_SCROLLED_WINDOW( scrolled_win ), GTK_WIDGET( g_TextureBrowser.m_available_tree ) ); + + gtk_table_attach( GTK_TABLE( frame_table ), scrolled_win, 2, 3, 1, 3, GTK_FILL, GTK_FILL, 0, 0 ); + } + { // tag arrow buttons + GtkWidget* m_btn_left = gtk_button_new(); + GtkWidget* m_btn_right = gtk_button_new(); + GtkWidget* m_arrow_left = gtk_arrow_new( GTK_ARROW_LEFT, GTK_SHADOW_OUT ); + GtkWidget* m_arrow_right = gtk_arrow_new( GTK_ARROW_RIGHT, GTK_SHADOW_OUT ); + gtk_container_add( GTK_CONTAINER( m_btn_left ), m_arrow_left ); + gtk_container_add( GTK_CONTAINER( m_btn_right ), m_arrow_right ); + + // workaround. the size of the tag frame depends of the requested size of the arrow buttons. + gtk_widget_set_size_request( m_arrow_left, -1, 68 ); + gtk_widget_set_size_request( m_arrow_right, -1, 68 ); + + gtk_table_attach( GTK_TABLE( frame_table ), m_btn_left, 1, 2, 1, 2, GTK_SHRINK, GTK_EXPAND, 0, 0 ); + gtk_table_attach( GTK_TABLE( frame_table ), m_btn_right, 1, 2, 2, 3, GTK_SHRINK, GTK_EXPAND, 0, 0 ); + + g_signal_connect( G_OBJECT( m_btn_left ), "clicked", G_CALLBACK( TextureBrowser_assignTags ), NULL ); + g_signal_connect( G_OBJECT( m_btn_right ), "clicked", G_CALLBACK( TextureBrowser_removeTags ), NULL ); + + gtk_widget_show( m_btn_left ); + gtk_widget_show( m_btn_right ); + gtk_widget_show( m_arrow_left ); + gtk_widget_show( m_arrow_right ); + } + { // tag fram labels + GtkWidget* m_lbl_assigned = gtk_label_new( "Assigned" ); + GtkWidget* m_lbl_unassigned = gtk_label_new( "Available" ); + + gtk_table_attach( GTK_TABLE( frame_table ), m_lbl_assigned, 0, 1, 0, 1, GTK_EXPAND, GTK_SHRINK, 0, 0 ); + gtk_table_attach( GTK_TABLE( frame_table ), m_lbl_unassigned, 2, 3, 0, 1, GTK_EXPAND, GTK_SHRINK, 0, 0 ); + + gtk_widget_show( m_lbl_assigned ); + gtk_widget_show( m_lbl_unassigned ); + } + } + else { // no tag support, show the texture tree only + gtk_box_pack_start( GTK_BOX( vbox ), g_TextureBrowser.m_scr_win_tree, TRUE, TRUE, 0 ); } - } else { // no tag support, show the texture tree only - gtk_box_pack_start(GTK_BOX(vbox), g_TextureBrowser.m_scr_win_tree, TRUE, TRUE, 0); - } - // TODO do we need this? - //gtk_container_set_focus_chain(GTK_CONTAINER(hbox_table), NULL); + // TODO do we need this? + //gtk_container_set_focus_chain(GTK_CONTAINER(hbox_table), NULL); - return table; + return table; } -void TextureBrowser_destroyWindow() -{ - GlobalShaderSystem().setActiveShadersChangedNotify(Callback()); +void TextureBrowser_destroyWindow(){ + 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); + 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 ); - gtk_widget_unref(g_TextureBrowser.m_gl_widget); + gtk_widget_unref( g_TextureBrowser.m_gl_widget ); } -const Vector3& TextureBrowser_getBackgroundColour(TextureBrowser& textureBrowser) -{ - return textureBrowser.color_textureback; +const Vector3& TextureBrowser_getBackgroundColour( TextureBrowser& textureBrowser ){ + return textureBrowser.color_textureback; } -void TextureBrowser_setBackgroundColour(TextureBrowser& textureBrowser, const Vector3& colour) -{ - textureBrowser.color_textureback = colour; - TextureBrowser_queueDraw(textureBrowser); +void TextureBrowser_setBackgroundColour( TextureBrowser& textureBrowser, const Vector3& colour ){ + textureBrowser.color_textureback = colour; + TextureBrowser_queueDraw( textureBrowser ); } -void TextureBrowser_selectionHelper(GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, GSList** selected) -{ - g_assert(selected != NULL); +void TextureBrowser_selectionHelper( GtkTreeModel* model, GtkTreePath* path, GtkTreeIter* iter, GSList** selected ){ + g_assert( selected != NULL ); - gchar* name; - gtk_tree_model_get(model, iter, TAG_COLUMN, &name, -1); - *selected = g_slist_append(*selected, name); + gchar* name; + gtk_tree_model_get( model, iter, TAG_COLUMN, &name, -1 ); + *selected = g_slist_append( *selected, name ); } -void TextureBrowser_shaderInfo() -{ - const char* name = TextureBrowser_GetSelectedShader(g_TextureBrowser); - IShader* shader = QERApp_Shader_ForName(name); +void TextureBrowser_shaderInfo(){ + const char* name = TextureBrowser_GetSelectedShader( g_TextureBrowser ); + IShader* shader = QERApp_Shader_ForName( name ); - DoShaderInfoDlg(name, shader->getShaderFileName(), "Shader Info"); + DoShaderInfoDlg( name, shader->getShaderFileName(), "Shader Info" ); - shader->DecRef(); + shader->DecRef(); } -void TextureBrowser_addTag() -{ - CopiedString tag; +void TextureBrowser_addTag(){ + CopiedString tag; - EMessageBoxReturn result = DoShaderTagDlg(&tag, "Add shader tag"); + EMessageBoxReturn result = DoShaderTagDlg( &tag, "Add shader tag" ); - if (result == eIDOK && !tag.empty()) - { - GtkTreeIter iter, iter2; - g_TextureBrowser.m_all_tags.insert(tag.c_str()); - gtk_list_store_append(g_TextureBrowser.m_available_store, &iter); - gtk_list_store_set(g_TextureBrowser.m_available_store, &iter, TAG_COLUMN, tag.c_str(), -1); + if ( result == eIDOK && !tag.empty() ) { + GtkTreeIter iter, iter2; + g_TextureBrowser.m_all_tags.insert( tag.c_str() ); + gtk_list_store_append( g_TextureBrowser.m_available_store, &iter ); + gtk_list_store_set( g_TextureBrowser.m_available_store, &iter, TAG_COLUMN, tag.c_str(), -1 ); - // Select the currently added tag in the available list - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_available_tree)); - gtk_tree_selection_select_iter(selection, &iter); + // Select the currently added tag in the available list + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_available_tree ) ); + gtk_tree_selection_select_iter( selection, &iter ); - gtk_list_store_append(g_TextureBrowser.m_all_tags_list, &iter2); - gtk_list_store_set(g_TextureBrowser.m_all_tags_list, &iter2, TAG_COLUMN, tag.c_str(), -1); - } + gtk_list_store_append( g_TextureBrowser.m_all_tags_list, &iter2 ); + gtk_list_store_set( g_TextureBrowser.m_all_tags_list, &iter2, TAG_COLUMN, tag.c_str(), -1 ); + } } -void TextureBrowser_renameTag() -{ - /* WORKAROUND: The tag treeview is set to GTK_SELECTION_MULTIPLE. Because - gtk_tree_selection_get_selected() doesn't work with GTK_SELECTION_MULTIPLE, - we need to count the number of selected rows first and use - gtk_tree_selection_selected_foreach() then to go through the list of selected - rows (which always containins a single row). - */ - - GSList* selected = NULL; - - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags)); - gtk_tree_selection_selected_foreach(selection, GtkTreeSelectionForeachFunc(TextureBrowser_selectionHelper), &selected); - - if(g_slist_length(selected) == 1) // we only rename a single tag - { - CopiedString newTag; - EMessageBoxReturn result = DoShaderTagDlg(&newTag, "Rename shader tag"); - - if (result == eIDOK && !newTag.empty()) - { - GtkTreeIter iterList; - gchar* rowTag; - gchar* oldTag = (char*)selected->data; - - bool row = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list), &iterList) != 0; - - while(row) - { - gtk_tree_model_get(GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list), &iterList, TAG_COLUMN, &rowTag, -1); - - if(strcmp(rowTag, oldTag) == 0) - { - gtk_list_store_set(g_TextureBrowser.m_all_tags_list, &iterList, TAG_COLUMN, newTag.c_str(), -1); - } - row = gtk_tree_model_iter_next(GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list), &iterList) != 0; - } - - TagBuilder.RenameShaderTag(oldTag, newTag.c_str()); - - g_TextureBrowser.m_all_tags.erase((CopiedString)oldTag); - g_TextureBrowser.m_all_tags.insert(newTag); - - BuildStoreAssignedTags(g_TextureBrowser.m_assigned_store, g_TextureBrowser.shader.c_str(), &g_TextureBrowser); - BuildStoreAvailableTags(g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser); - } - } - else - { - gtk_MessageBox(GTK_WIDGET(g_TextureBrowser.m_parent), "Select a single tag for renaming."); - } -} - -void TextureBrowser_deleteTag() -{ - GSList* selected = NULL; - - GtkTreeSelection* selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(g_TextureBrowser.m_treeViewTags)); - gtk_tree_selection_selected_foreach(selection, GtkTreeSelectionForeachFunc(TextureBrowser_selectionHelper), &selected); - - if(g_slist_length(selected) == 1) // we only delete a single tag - { - EMessageBoxReturn result = gtk_MessageBox(GTK_WIDGET(g_TextureBrowser.m_parent), "Are you sure you want to delete the selected tag?", "Delete Tag", eMB_YESNO, eMB_ICONQUESTION); - - if(result == eIDYES) - { - GtkTreeIter iterSelected; - gchar *rowTag; - - gchar* tagSelected = (char*)selected->data; - - bool row = gtk_tree_model_get_iter_first(GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list), &iterSelected) != 0; - - while(row) - { - gtk_tree_model_get(GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list), &iterSelected, TAG_COLUMN, &rowTag, -1); - - if(strcmp(rowTag, tagSelected) == 0) - { - gtk_list_store_remove(g_TextureBrowser.m_all_tags_list, &iterSelected); - break; - } - row = gtk_tree_model_iter_next(GTK_TREE_MODEL(g_TextureBrowser.m_all_tags_list), &iterSelected) != 0; - } - - TagBuilder.DeleteTag(tagSelected); - g_TextureBrowser.m_all_tags.erase((CopiedString)tagSelected); - - BuildStoreAssignedTags(g_TextureBrowser.m_assigned_store, g_TextureBrowser.shader.c_str(), &g_TextureBrowser); - BuildStoreAvailableTags(g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser); - } - } else { - gtk_MessageBox(GTK_WIDGET(g_TextureBrowser.m_parent), "Select a single tag for deletion."); - } -} - -void TextureBrowser_copyTag() -{ - g_TextureBrowser.m_copied_tags.clear(); - TagBuilder.GetShaderTags(g_TextureBrowser.shader.c_str(), g_TextureBrowser.m_copied_tags); +void TextureBrowser_renameTag(){ + /* WORKAROUND: The tag treeview is set to GTK_SELECTION_MULTIPLE. Because + gtk_tree_selection_get_selected() doesn't work with GTK_SELECTION_MULTIPLE, + we need to count the number of selected rows first and use + gtk_tree_selection_selected_foreach() then to go through the list of selected + rows (which always containins a single row). + */ + + GSList* selected = NULL; + + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); + + if ( g_slist_length( selected ) == 1 ) { // we only rename a single tag + CopiedString newTag; + EMessageBoxReturn result = DoShaderTagDlg( &newTag, "Rename shader tag" ); + + if ( result == eIDOK && !newTag.empty() ) { + GtkTreeIter iterList; + gchar* rowTag; + gchar* oldTag = (char*)selected->data; + + bool row = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterList ) != 0; + + while ( row ) + { + gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterList, TAG_COLUMN, &rowTag, -1 ); + + if ( strcmp( rowTag, oldTag ) == 0 ) { + gtk_list_store_set( g_TextureBrowser.m_all_tags_list, &iterList, TAG_COLUMN, newTag.c_str(), -1 ); + } + row = gtk_tree_model_iter_next( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterList ) != 0; + } + + TagBuilder.RenameShaderTag( oldTag, newTag.c_str() ); + + g_TextureBrowser.m_all_tags.erase( (CopiedString)oldTag ); + g_TextureBrowser.m_all_tags.insert( newTag ); + + BuildStoreAssignedTags( g_TextureBrowser.m_assigned_store, g_TextureBrowser.shader.c_str(), &g_TextureBrowser ); + BuildStoreAvailableTags( g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser ); + } + } + else + { + gtk_MessageBox( GTK_WIDGET( g_TextureBrowser.m_parent ), "Select a single tag for renaming." ); + } } -void TextureBrowser_pasteTag() -{ - IShader* ishader = QERApp_Shader_ForName(g_TextureBrowser.shader.c_str()); - CopiedString shader = g_TextureBrowser.shader.c_str(); - - if(!TagBuilder.CheckShaderTag(shader.c_str())) - { - CopiedString shaderFile = ishader->getShaderFileName(); - if(shaderFile.empty()) - { - // it's a texture - TagBuilder.AddShaderNode(shader.c_str(), CUSTOM, TEXTURE); - } - else - { - // it's a shader - TagBuilder.AddShaderNode(shader.c_str(), CUSTOM, SHADER); - } - - for(size_t i = 0; i < g_TextureBrowser.m_copied_tags.size(); ++i) - { - TagBuilder.AddShaderTag(shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str(), TAG); - } - } - else - { - for(size_t i = 0; i < g_TextureBrowser.m_copied_tags.size(); ++i) - { - if(!TagBuilder.CheckShaderTag(shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str())) - { - // the tag doesn't exist - let's add it - TagBuilder.AddShaderTag(shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str(), TAG); - } - } - } - - ishader->DecRef(); - - TagBuilder.SaveXmlDoc(); - BuildStoreAssignedTags(g_TextureBrowser.m_assigned_store, shader.c_str(), &g_TextureBrowser); - BuildStoreAvailableTags (g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser); -} - -void RefreshShaders() -{ - ScopeDisableScreenUpdates disableScreenUpdates("Processing...", "Loading Shaders"); - GlobalShaderSystem().refresh(); - UpdateAllWindows(); +void TextureBrowser_deleteTag(){ + GSList* selected = NULL; + + GtkTreeSelection* selection = gtk_tree_view_get_selection( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ) ); + gtk_tree_selection_selected_foreach( selection, GtkTreeSelectionForeachFunc( TextureBrowser_selectionHelper ), &selected ); + + if ( g_slist_length( selected ) == 1 ) { // we only delete a single tag + EMessageBoxReturn result = gtk_MessageBox( GTK_WIDGET( g_TextureBrowser.m_parent ), "Are you sure you want to delete the selected tag?", "Delete Tag", eMB_YESNO, eMB_ICONQUESTION ); + + if ( result == eIDYES ) { + GtkTreeIter iterSelected; + gchar *rowTag; + + gchar* tagSelected = (char*)selected->data; + + bool row = gtk_tree_model_get_iter_first( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterSelected ) != 0; + + while ( row ) + { + gtk_tree_model_get( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterSelected, TAG_COLUMN, &rowTag, -1 ); + + if ( strcmp( rowTag, tagSelected ) == 0 ) { + gtk_list_store_remove( g_TextureBrowser.m_all_tags_list, &iterSelected ); + break; + } + row = gtk_tree_model_iter_next( GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list ), &iterSelected ) != 0; + } + + TagBuilder.DeleteTag( tagSelected ); + g_TextureBrowser.m_all_tags.erase( (CopiedString)tagSelected ); + + BuildStoreAssignedTags( g_TextureBrowser.m_assigned_store, g_TextureBrowser.shader.c_str(), &g_TextureBrowser ); + BuildStoreAvailableTags( g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser ); + } + } + else { + gtk_MessageBox( GTK_WIDGET( g_TextureBrowser.m_parent ), "Select a single tag for deletion." ); + } } -void TextureBrowser_ToggleShowShaders() -{ - g_TextureBrowser.m_showShaders ^= 1; - g_TextureBrowser.m_showshaders_item.update(); - TextureBrowser_queueDraw(g_TextureBrowser); +void TextureBrowser_copyTag(){ + g_TextureBrowser.m_copied_tags.clear(); + TagBuilder.GetShaderTags( g_TextureBrowser.shader.c_str(), g_TextureBrowser.m_copied_tags ); +} + +void TextureBrowser_pasteTag(){ + IShader* ishader = QERApp_Shader_ForName( g_TextureBrowser.shader.c_str() ); + CopiedString shader = g_TextureBrowser.shader.c_str(); + + if ( !TagBuilder.CheckShaderTag( shader.c_str() ) ) { + CopiedString shaderFile = ishader->getShaderFileName(); + if ( shaderFile.empty() ) { + // it's a texture + TagBuilder.AddShaderNode( shader.c_str(), CUSTOM, TEXTURE ); + } + else + { + // it's a shader + TagBuilder.AddShaderNode( shader.c_str(), CUSTOM, SHADER ); + } + + for ( size_t i = 0; i < g_TextureBrowser.m_copied_tags.size(); ++i ) + { + TagBuilder.AddShaderTag( shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str(), TAG ); + } + } + else + { + for ( size_t i = 0; i < g_TextureBrowser.m_copied_tags.size(); ++i ) + { + if ( !TagBuilder.CheckShaderTag( shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str() ) ) { + // the tag doesn't exist - let's add it + TagBuilder.AddShaderTag( shader.c_str(), g_TextureBrowser.m_copied_tags[i].c_str(), TAG ); + } + } + } + + ishader->DecRef(); + + TagBuilder.SaveXmlDoc(); + BuildStoreAssignedTags( g_TextureBrowser.m_assigned_store, shader.c_str(), &g_TextureBrowser ); + BuildStoreAvailableTags( g_TextureBrowser.m_available_store, g_TextureBrowser.m_assigned_store, g_TextureBrowser.m_all_tags, &g_TextureBrowser ); +} + +void RefreshShaders(){ + ScopeDisableScreenUpdates disableScreenUpdates( "Processing...", "Loading Shaders" ); + GlobalShaderSystem().refresh(); + UpdateAllWindows(); +} + +void TextureBrowser_ToggleShowShaders(){ + g_TextureBrowser.m_showShaders ^= 1; + g_TextureBrowser.m_showshaders_item.update(); + TextureBrowser_queueDraw( g_TextureBrowser ); } void TextureBrowser_constructTreeStore(); -void TextureBrowser_ToggleSoftGroups() -{ - g_TextureBrowser.m_softGroups ^= 1; - g_TextureBrowser.m_softgroups_item.update(); - TextureBrowser_constructTreeStore(); - GlobalShaderSystem().refresh(); - UpdateAllWindows(); +void TextureBrowser_ToggleSoftGroups(){ + g_TextureBrowser.m_softGroups ^= 1; + g_TextureBrowser.m_softgroups_item.update(); + TextureBrowser_constructTreeStore(); + GlobalShaderSystem().refresh(); + UpdateAllWindows(); } -void TextureBrowser_ToggleShowShaderListOnly() -{ - g_TextureBrowser_shaderlistOnly ^= 1; - g_TextureBrowser.m_showshaderlistonly_item.update(); +void TextureBrowser_ToggleShowShaderListOnly(){ + g_TextureBrowser_shaderlistOnly ^= 1; + g_TextureBrowser.m_showshaderlistonly_item.update(); - TextureBrowser_constructTreeStore(); + TextureBrowser_constructTreeStore(); } -void TextureBrowser_showAll() -{ - g_TextureBrowser_currentDirectory = ""; - g_TextureBrowser.m_searchedTags = false; - TextureBrowser_heightChanged(g_TextureBrowser); - TextureBrowser_updateTitle(); +void TextureBrowser_showAll(){ + g_TextureBrowser_currentDirectory = ""; + g_TextureBrowser.m_searchedTags = false; + TextureBrowser_heightChanged( g_TextureBrowser ); + TextureBrowser_updateTitle(); } -void TextureBrowser_showUntagged() -{ - EMessageBoxReturn result = gtk_MessageBox(GTK_WIDGET(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", eMB_YESNO, eMB_ICONWARNING); - - if(result == eIDYES) - { - g_TextureBrowser.m_found_shaders.clear(); - TagBuilder.GetUntagged(g_TextureBrowser.m_found_shaders); - std::set::iterator iter; - - ScopeDisableScreenUpdates disableScreenUpdates("Searching untagged textures...", "Loading Textures"); - - for(iter = g_TextureBrowser.m_found_shaders.begin(); iter != g_TextureBrowser.m_found_shaders.end(); iter++) - { - std::string path = (*iter).c_str(); - size_t pos = path.find_last_of("/", path.size()); - std::string name = path.substr(pos + 1, path.size()); - path = path.substr(0, pos + 1); - TextureDirectory_loadTexture(path.c_str(), name.c_str()); - globalErrorStream() << path.c_str() << name.c_str() << "\n"; - } - - g_TextureBrowser_currentDirectory = "Untagged"; - TextureBrowser_queueDraw(GlobalTextureBrowser()); - TextureBrowser_heightChanged(g_TextureBrowser); - TextureBrowser_updateTitle(); - } -} - -void TextureBrowser_FixedSize() -{ - g_TextureBrowser_fixedSize ^= 1; - GlobalTextureBrowser().m_fixedsize_item.update(); - TextureBrowser_activeShadersChanged(GlobalTextureBrowser()); +void TextureBrowser_showUntagged(){ + EMessageBoxReturn result = gtk_MessageBox( GTK_WIDGET( 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", eMB_YESNO, eMB_ICONWARNING ); + + if ( result == eIDYES ) { + g_TextureBrowser.m_found_shaders.clear(); + TagBuilder.GetUntagged( g_TextureBrowser.m_found_shaders ); + std::set::iterator iter; + + ScopeDisableScreenUpdates disableScreenUpdates( "Searching untagged textures...", "Loading Textures" ); + + for ( iter = g_TextureBrowser.m_found_shaders.begin(); iter != g_TextureBrowser.m_found_shaders.end(); iter++ ) + { + std::string path = ( *iter ).c_str(); + size_t pos = path.find_last_of( "/", path.size() ); + std::string name = path.substr( pos + 1, path.size() ); + path = path.substr( 0, pos + 1 ); + TextureDirectory_loadTexture( path.c_str(), name.c_str() ); + globalErrorStream() << path.c_str() << name.c_str() << "\n"; + } + + g_TextureBrowser_currentDirectory = "Untagged"; + TextureBrowser_queueDraw( GlobalTextureBrowser() ); + TextureBrowser_heightChanged( g_TextureBrowser ); + TextureBrowser_updateTitle(); + } } -void TextureBrowser_FilterNotex() -{ - g_TextureBrowser_filterNotex ^= 1; - GlobalTextureBrowser().m_filternotex_item.update(); - TextureBrowser_activeShadersChanged(GlobalTextureBrowser()); +void TextureBrowser_FixedSize(){ + g_TextureBrowser_fixedSize ^= 1; + GlobalTextureBrowser().m_fixedsize_item.update(); + TextureBrowser_activeShadersChanged( GlobalTextureBrowser() ); } -void TextureBrowser_exportTitle(const StringImportCallback& importer) -{ - StringOutputStream buffer(64); - buffer << "Textures: "; - if(!string_empty(g_TextureBrowser_currentDirectory.c_str())) - { - buffer << g_TextureBrowser_currentDirectory.c_str(); - } - else - { - buffer << "all"; - } - importer(buffer.c_str()); +void TextureBrowser_FilterNotex(){ + g_TextureBrowser_filterNotex ^= 1; + GlobalTextureBrowser().m_filternotex_item.update(); + TextureBrowser_activeShadersChanged( GlobalTextureBrowser() ); } +void TextureBrowser_exportTitle( const StringImportCallback& importer ){ + StringOutputStream buffer( 64 ); + buffer << "Textures: "; + if ( !string_empty( g_TextureBrowser_currentDirectory.c_str() ) ) { + buffer << g_TextureBrowser_currentDirectory.c_str(); + } + else + { + buffer << "all"; + } + 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; - } + +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; - } +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; + } } typedef ReferenceCaller1 TextureScaleExportCaller; -void TextureBrowser_constructPreferences(PreferencesPage& page) -{ - page.appendCheckBox( - "", "Texture scrollbar", - TextureBrowserImportShowScrollbarCaller(GlobalTextureBrowser()), - BoolExportCaller(GlobalTextureBrowser().m_showTextureScrollbar) - ); - { - 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())) - ); - } - page.appendEntry("Mousewheel Increment", GlobalTextureBrowser().m_mouseWheelScrollIncrement); - { - const char* startup_shaders[] = { "None", TextureBrowser_getComonShadersName() }; - page.appendCombo("Load Shaders at Startup", reinterpret_cast(GlobalTextureBrowser().m_startupShaders), STRING_ARRAY_RANGE(startup_shaders)); - } -} -void TextureBrowser_constructPage(PreferenceGroup& group) -{ - PreferencesPage page(group.createPage("Texture Browser", "Texture Browser Preferences")); - TextureBrowser_constructPreferences(page); +void TextureBrowser_constructPreferences( PreferencesPage& page ){ + page.appendCheckBox( + "", "Texture scrollbar", + TextureBrowserImportShowScrollbarCaller( GlobalTextureBrowser() ), + BoolExportCaller( GlobalTextureBrowser().m_showTextureScrollbar ) + ); + { + 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() ) ) + ); + } + page.appendEntry( "Mousewheel Increment", GlobalTextureBrowser().m_mouseWheelScrollIncrement ); + { + const char* startup_shaders[] = { "None", TextureBrowser_getComonShadersName() }; + page.appendCombo( "Load Shaders at Startup", reinterpret_cast( GlobalTextureBrowser().m_startupShaders ), STRING_ARRAY_RANGE( startup_shaders ) ); + } } -void TextureBrowser_registerPreferencesPage() -{ - PreferencesDialog_addSettingsPage(FreeCaller1()); +void TextureBrowser_constructPage( PreferenceGroup& group ){ + PreferencesPage page( group.createPage( "Texture Browser", "Texture Browser Preferences" ) ); + TextureBrowser_constructPreferences( page ); +} +void TextureBrowser_registerPreferencesPage(){ + PreferencesDialog_addSettingsPage( FreeCaller1() ); } @@ -2809,58 +2611,55 @@ typedef ReferenceCaller1 T -void TextureClipboard_textureSelected(const char* shader); +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("ToggleSoftGroups", FreeCaller(), ToggleItem::AddCallbackCaller(g_TextureBrowser.m_softgroups_item)); - GlobalToggles_insert("FixedSize", FreeCaller(), ToggleItem::AddCallbackCaller(g_TextureBrowser.m_fixedsize_item)); - GlobalToggles_insert("FilterNotex", FreeCaller(), ToggleItem::AddCallbackCaller(g_TextureBrowser.m_filternotex_item)); - - GlobalPreferenceSystem().registerPreference("TextureScale", - makeSizeStringImportCallback(TextureBrowserSetScaleCaller(g_TextureBrowser)), - SizeExportStringCaller(g_TextureBrowser.m_textureScale) - ); - 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("SoftGroups", BoolImportStringCaller(GlobalTextureBrowser().m_softGroups), BoolExportStringCaller(GlobalTextureBrowser().m_softGroups)); - GlobalPreferenceSystem().registerPreference("FixedSize", BoolImportStringCaller(g_TextureBrowser_fixedSize), BoolExportStringCaller(g_TextureBrowser_fixedSize)); - GlobalPreferenceSystem().registerPreference("FilterNotex", BoolImportStringCaller(g_TextureBrowser_filterNotex), BoolExportStringCaller(g_TextureBrowser_filterNotex)); - 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)); - - g_TextureBrowser.shader = texdef_name_default(); - - Textures_setModeChangedNotify(ReferenceCaller(g_TextureBrowser)); - - TextureBrowser_registerPreferencesPage(); - - GlobalShaderSystem().attach(g_ShadersObserver); - - TextureBrowser_textureSelected = TextureClipboard_textureSelected; -} -void TextureBrowser_Destroy() -{ - GlobalShaderSystem().detach(g_ShadersObserver); +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( "ToggleSoftGroups", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_softgroups_item ) ); + GlobalToggles_insert( "FixedSize", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_fixedsize_item ) ); + GlobalToggles_insert( "FilterNotex", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_filternotex_item ) ); + + GlobalPreferenceSystem().registerPreference( "TextureScale", + makeSizeStringImportCallback( TextureBrowserSetScaleCaller( g_TextureBrowser ) ), + SizeExportStringCaller( g_TextureBrowser.m_textureScale ) + ); + 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( "SoftGroups", BoolImportStringCaller( GlobalTextureBrowser().m_softGroups ), BoolExportStringCaller( GlobalTextureBrowser().m_softGroups ) ); + GlobalPreferenceSystem().registerPreference( "FixedSize", BoolImportStringCaller( g_TextureBrowser_fixedSize ), BoolExportStringCaller( g_TextureBrowser_fixedSize ) ); + GlobalPreferenceSystem().registerPreference( "FilterNotex", BoolImportStringCaller( g_TextureBrowser_filterNotex ), BoolExportStringCaller( g_TextureBrowser_filterNotex ) ); + 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 ) ); + + g_TextureBrowser.shader = texdef_name_default(); - Textures_setModeChangedNotify(Callback()); + Textures_setModeChangedNotify( ReferenceCaller( g_TextureBrowser ) ); + + TextureBrowser_registerPreferencesPage(); + + GlobalShaderSystem().attach( g_ShadersObserver ); + + TextureBrowser_textureSelected = TextureClipboard_textureSelected; } +void TextureBrowser_Destroy(){ + GlobalShaderSystem().detach( g_ShadersObserver ); + Textures_setModeChangedNotify( Callback() ); +} -- 2.39.2