Changeset 172

Timestamp:

06/28/07 12:01:18 (1 year ago)

Author:

namespace

Message:

- Added material-support to brushexport-plugin (Shaderman)

Files:

• GtkRadiant/trunk/CHANGES (modified) (1 diff)
• GtkRadiant/trunk/contrib/brushexport/callbacks.cpp (modified) (3 diffs)
• GtkRadiant/trunk/contrib/brushexport/callbacks.h (modified) (1 diff)
• GtkRadiant/trunk/contrib/brushexport/export.cpp (modified) (12 diffs)
• GtkRadiant/trunk/contrib/brushexport/export.h (modified) (1 diff)
• GtkRadiant/trunk/contrib/brushexport/interface.cpp (modified) (7 diffs)

GtkRadiant/trunk/CHANGES

@@ -1 +1 @@
-This is the changelog for developers, != changelog for the end user 
-that we distribute with the binaries. (see changelog)
+
+28/06/2007
+- Added material-support to brushexport-plugin (Shaderman)
-
-26/04/2007

GtkRadiant/trunk/contrib/brushexport/callbacks.cpp

@@ -23 +23 @@
-        GtkWidget* window = lookup_widget(GTK_WIDGET(button), "w_plugplug2");
-        ASSERT_NOTNULL(window);
-
-
+c
+c
-                return;
-
+
+
+
-  // get ignore list from ui
-  std::set<std::string> ignore;
@@ -70 +72 @@
-        }
-  }
+
+  // export materials?
+  GtkWidget* toggle = lookup_widget(GTK_WIDGET(button), "t_exportmaterials");
+  ASSERT_NOTNULL(toggle);
+
+  bool exportmat = FALSE;
+
+  if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)))
+          exportmat = TRUE;
+
+  // limit material names?
+  toggle = lookup_widget(GTK_WIDGET(button), "t_limitmatnames");
+  ASSERT_NOTNULL(toggle);
+
+  bool limitMatNames = FALSE;
+
+  if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)) && exportmat)
+          limitMatNames = TRUE;
+
+  // create objects instead of groups?
+  toggle = lookup_widget(GTK_WIDGET(button), "t_objects");
+  ASSERT_NOTNULL(toggle);
+
+  bool objects = FALSE;
+
+  if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle))  && exportmat)
+          objects = TRUE;
-  
-  // export
-path
+exportmat, path, limitMatNames, objects
-}
-
@@ -102 +131 @@
-}
-
+void OnExportMatClicked(GtkButton* button, gpointer user_data)
+{
+        GtkWidget* toggleLimit = lookup_widget(GTK_WIDGET(button), "t_limitmatnames");
+        GtkWidget* toggleObject = lookup_widget(GTK_WIDGET(button), "t_objects");
+
+        if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
+        {
+                gtk_widget_set_sensitive(GTK_WIDGET(toggleLimit), TRUE);
+                gtk_widget_set_sensitive(GTK_WIDGET(toggleObject), TRUE);
+        } else {
+                gtk_widget_set_sensitive(GTK_WIDGET(toggleLimit), FALSE);
+                gtk_widget_set_sensitive(GTK_WIDGET(toggleObject), FALSE);
+        }
+}
+
-}// callbacks

GtkRadiant/trunk/contrib/brushexport/callbacks.h

@@ -8 +8 @@
-void OnAddMaterial(GtkButton*, gpointer);
-void OnRemoveMaterial(GtkButton*, gpointer);
+void OnExportMatClicked(GtkButton* button, gpointer);
-
-}// callbacks

GtkRadiant/trunk/contrib/brushexport/export.cpp

@@ -7 +7 @@
-#include "stream/textfilestream.h"
-
+#include <map>
+
-// this is very evil, but right now there is no better way
-#include "../../radiant/brush.h"
@@ -18 +20 @@
-{
-public:
-
+, bool limNames, bool objs
-        virtual ~ExportData(void);
-        
@@ -25 +27 @@
-        virtual void EndBrush(void);
-        
-
+, collapsemode mode
-        
-protected:
@@ -49 +51 @@
-};
-
-
+, bool _limNames, bool _objs
-        :       mode(_mode),
-                ignorelist(_ignorelist)
@@ -102 +104 @@
-        GetShaderNameFromShaderPath(f.GetShader(), shadername);
-        
-faces mit materials auf der ignoreliste ignorieren
+ignore faces from ignore list
-        if(ignorelist.find(shadername) != ignorelist.end())
-                return;
@@ -146 +148 @@
-        else
-                name = tmp.substr(last_slash + 1, tmp.length() - last_slash);
-
-
+
+
+
+
-}
-
@@ -155 +159 @@
-class ExportDataAsWavefront : public ExportData
-{
+private:
+        bool expmat;
+        bool limNames;
+        bool objs;
+
-public:
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-};
-
-
-
-
+
+
+
+
+
+
+
+
-        
-        if(out.failed())
@@ -174 +191 @@
-        }
-                
-
+
+
+
+
+
+
+
+
-        
-        unsigned int vertex_count = 0;
@@ -181 +205 @@
-        for(std::list<ExportData::group>::const_iterator git(groups.begin()); git != gend; ++git)
-        {
+                typedef std::multimap<std::string, std::string> bm;
+                bm brushMaterials;
+                typedef std::pair<std::string, std::string> String_Pair;
+
-                const std::list<const Face*>::const_iterator end(git->faces.end());
-                
-                // submesh starts here
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                for(std::list<const Face*>::const_iterator it(git->faces.begin()); it != end; ++it)
-                {
@@ -192 +233 @@
-                        // vertices
-                        for(size_t i = 0; i < w.numpoints; ++i)
-                               out << "v " << FloatFormat(w[i].vertex.x(), 1, 6) << " " << FloatFormat(w[i].vertex.y(), 1, 6) << " " << FloatFormat(w[i].vertex.z
+                                       out << "v " << FloatFormat(w[i].vertex.x(), 1, 6) << " " << FloatFormat(w[i].vertex.z(), 1, 6) << " " << FloatFormat(w[i].vertex.y
-                }
-                out << "\n";    
@@ -210 +251 @@
-                        
-                        // faces
-
+
+
-                        for(size_t i = 0; i < w.numpoints; ++i, ++vertex_count)
-                        {
-out
+faceLine
-                        }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                out << "\n";
+        }
+
+        if(expmat)
+        {
+                TextFileOutputStream outMtl(mtlFile.c_str());
+                if(outMtl.failed())
+                {
+                        globalErrorStream() << "Unable to open material file\n";
+                        return false;
+                }
+
+                outMtl << "# Wavefront material file exported with GtkRadiants brushexport plugin.\n";
+                outMtl << "# Material Count: " << (const Unsigned)materials.size() << "\n\n";
+                for(std::set<std::string>::const_iterator it(materials.begin()); it != materials.end(); ++it)
+                {
+                        if(limNames && it->size() > 20)
+                        {
+                                outMtl << "newmtl " << it->substr(it->size() - 20, it->size()).c_str() << "\n";
+                        } else {
+                                outMtl << "newmtl " << it->c_str() << "\n";
+                        }
+                }
-        }
-        
@@ -264 +363 @@
-};
- 
-const std::string& path
-
-
+bool exmat, const std::string& path, bool limNames, bool objs
+
+, exmat, limNames, objs
-        
-        ForEachSelected vis(exporter);
-        GlobalSelectionSystem().foreachSelected(vis);
-        
-
-
+, m
+

GtkRadiant/trunk/contrib/brushexport/export.h

@@ -11 +11 @@
-};
-
-const std::string& path
+bool exmat, const std::string& path, bool limitMatNames, bool objects
-
-#endif 

GtkRadiant/trunk/contrib/brushexport/interface.cpp

@@ -36 +36 @@
-  GtkWidget *b_addmaterial;
-  GtkWidget *b_removematerial;
+  GtkWidget *t_exportmaterials;
+  GtkWidget *t_limitmatnames;
+  GtkWidget *t_objects;
+  GtkTooltips *tooltips;
+
+  tooltips = gtk_tooltips_new();
-
-  w_plugplug2 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_widget_set_name (w_plugplug2, "w_plugplug2");
-2
+3
-  gtk_window_set_position (GTK_WINDOW (w_plugplug2), GTK_WIN_POS_CENTER);
-  gtk_window_set_destroy_with_parent (GTK_WINDOW (w_plugplug2), TRUE);
@@ -62 +68 @@
-  r_collapse = gtk_radio_button_new_with_mnemonic (NULL, "Collapse mesh");
-  gtk_widget_set_name (r_collapse, "r_collapse");
+  gtk_tooltips_set_tip (GTK_TOOLTIPS(tooltips), r_collapse, "Collapse all brushes into a single group", "Collapse all brushes into a single group");
-  gtk_widget_show (r_collapse);
-  gtk_box_pack_start (GTK_BOX (vbox4), r_collapse, FALSE, FALSE, 0);
@@ -69 +76 @@
-  r_collapsebymaterial = gtk_radio_button_new_with_mnemonic (NULL, "Collapse by material");
-  gtk_widget_set_name (r_collapsebymaterial, "r_collapsebymaterial");
+  gtk_tooltips_set_tip (GTK_TOOLTIPS(tooltips), r_collapsebymaterial, "Collapse into groups by material", "Collapse into groups by material");
-  gtk_widget_show (r_collapsebymaterial);
-  gtk_box_pack_start (GTK_BOX (vbox4), r_collapsebymaterial, FALSE, FALSE, 0);
@@ -76 +84 @@
-  r_nocollapse = gtk_radio_button_new_with_mnemonic (NULL, "Don't collapse");
-  gtk_widget_set_name (r_nocollapse, "r_nocollapse");
+  gtk_tooltips_set_tip (GTK_TOOLTIPS(tooltips), r_nocollapse, "Every brush is stored in its own group", "Every brush is stored in its own group");
-  gtk_widget_show (r_nocollapse);
-  gtk_box_pack_start (GTK_BOX (vbox4), r_nocollapse, FALSE, FALSE, 0);
@@ -142 +151 @@
-  gtk_widget_show (b_removematerial);
-  gtk_box_pack_start (GTK_BOX (hbox1), b_removematerial, FALSE, FALSE, 0);
+
+  t_limitmatnames = gtk_check_button_new_with_mnemonic ("Use short material names (max. 20 chars)");
+  gtk_widget_set_name (t_limitmatnames, "t_limitmatnames");
+  gtk_widget_show (t_limitmatnames);
+  gtk_box_pack_end (GTK_BOX (vbox2), t_limitmatnames, FALSE, FALSE, 0);
+
+  t_objects = gtk_check_button_new_with_mnemonic ("Create (o)bjects instead of (g)roups");
+  gtk_widget_set_name (t_objects, "t_objects");
+  gtk_widget_show (t_objects);
+  gtk_box_pack_end (GTK_BOX (vbox2), t_objects, FALSE, FALSE, 0);
+
+  t_exportmaterials = gtk_check_button_new_with_mnemonic ("Create material information (.mtl file)");
+  gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(t_exportmaterials), true);
+  gtk_widget_set_name (t_exportmaterials, "t_exportmaterials");
+  gtk_widget_show (t_exportmaterials);
+  gtk_box_pack_end (GTK_BOX (vbox2), t_exportmaterials, FALSE, FALSE, 10);
-
-  using namespace callbacks;
@@ -150 +175 @@
-  g_signal_connect ((gpointer) b_addmaterial, "clicked", G_CALLBACK (OnAddMaterial), NULL);
-  g_signal_connect ((gpointer) b_removematerial, "clicked", G_CALLBACK (OnRemoveMaterial), NULL);
+  g_signal_connect ((gpointer) t_exportmaterials, "clicked", G_CALLBACK (OnExportMatClicked), NULL);
-
-  /* Store pointers to all widgets, for use by lookup_widget(). */
@@ -170 +196 @@
-  GLADE_HOOKUP_OBJECT (w_plugplug2, b_addmaterial, "b_addmaterial");
-  GLADE_HOOKUP_OBJECT (w_plugplug2, b_removematerial, "b_removematerial");
+  GLADE_HOOKUP_OBJECT (w_plugplug2, t_exportmaterials, "t_exportmaterials");
+  GLADE_HOOKUP_OBJECT (w_plugplug2, t_limitmatnames, "t_limitmatnames");
+  GLADE_HOOKUP_OBJECT (w_plugplug2, t_objects, "t_objects");
-
-  return w_plugplug2;