From 846178e40312389d84fbff457a659ad3529231cd Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 5 Sep 2011 18:24:50 +0200 Subject: [PATCH] remove three debug prints --- radiant/texwindow.cpp | 47 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 4f6a308b..a070cbbc 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -117,17 +117,17 @@ void TextureGroups_addWad(TextureGroups& groups, const char* archive) } typedef ReferenceCaller1 TextureGroupsAddWadCaller; -#define cutAtDash 1 - namespace { + 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(cutAtDash) + if(softGroups()) { if(s ? (p >= s) : (p != NULL)) p[1] = 0; @@ -145,7 +145,6 @@ namespace } CopiedString cs(n); string_release(n, l); - globalErrorStream() << "texture " << tex << " is in " << cs.c_str() << "\n"; return cs; } CopiedString Texture_getCategoryDirectory(const char *cat) @@ -160,11 +159,10 @@ namespace if(cat[l-1] == '/') { string_release(n, l); - globalErrorStream() << "category " << cat << " is in " << cat << " (identity case)\n"; return cat; } CopiedString cs; - if(cutAtDash) + if(softGroups()) { char *p = strrchr(n, '/'); if(p) @@ -179,7 +177,6 @@ namespace cs = ""; string_release(n, l); } - globalErrorStream() << "category " << cat << " is in " << cs.c_str() << "\n"; return cs; } }; @@ -223,7 +220,7 @@ public: void TextureGroups_addDirectory(TextureGroups& groups, const char* directory) { - if(cutAtDash) + if(softGroups()) { // enumerate all files, find dashes StringOutputStream dirstring(64); @@ -311,6 +308,9 @@ typedef FreeCaller1 void TextureBrowser_showShadersExport(const BoolImportCallback& importer); typedef FreeCaller1 TextureBrowserShowShadersExport; +void TextureBrowser_softGroupsExport(const BoolImportCallback& importer); +typedef FreeCaller1 TextureBrowserSoftGroupsExport; + void TextureBrowser_showShaderlistOnly(const BoolImportCallback& importer); typedef FreeCaller1 TextureBrowserShowShaderlistOnlyExport; @@ -353,6 +353,7 @@ public: ToggleItem m_hideunused_item; ToggleItem m_showshaders_item; ToggleItem m_showshaderlistonly_item; + ToggleItem m_softgroups_item; ToggleItem m_fixedsize_item; ToggleItem m_filternotex_item; @@ -371,6 +372,7 @@ public: 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 @@ -424,6 +426,7 @@ public: 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), @@ -443,6 +446,14 @@ public: { } }; +namespace +{ + bool softGroups() + { + return GlobalTextureBrowser().m_softGroups; + } +}; + void(*TextureBrowser_textureSelected)(const char* shader); @@ -987,6 +998,12 @@ void TextureBrowser_showShadersExport(const BoolImportCallback& importer) } typedef FreeCaller1 TextureBrowserShowShadersExport; +void TextureBrowser_softGroupsExport(const BoolImportCallback& importer) +{ + importer(GlobalTextureBrowser().m_softGroups); +} +typedef FreeCaller1 TextureBrowserSoftGroupsExport; + void TextureBrowser_showShaderlistOnly(const BoolImportCallback& importer) { importer(g_TextureBrowser_shaderlistOnly); @@ -1829,6 +1846,8 @@ GtkMenuItem* TextureBrowser_constructViewMenu(GtkMenu* menu) 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"))) @@ -2613,6 +2632,16 @@ void TextureBrowser_ToggleShowShaders() 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_ToggleShowShaderListOnly() { g_TextureBrowser_shaderlistOnly ^= 1; @@ -2791,6 +2820,7 @@ void TextureBrowser_Construct() 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)); @@ -2826,3 +2856,4 @@ void TextureBrowser_Destroy() Textures_setModeChangedNotify(Callback()); } + -- 2.39.2