Changeset 98

Timestamp:

10/17/07 04:32:31 (1 year ago)

Author:

baxissimo

Message:

* Found bug in the OFF binary implementation (reader and writer)
* Added new ability to get writer to update Option flags, removing those it doesn't support. MeshIO.supported_writer_options(...).
* Changed add_face API slightly. Previously TriConnectivity? would triangulate polygons, but provided no way to get the list of face handles added. Now add_face takes an optional out parameter for returning the list. Also removed redundant add_face options. They were needed in C++ but in D the single VertexHandle?[] version is really all you need.

Files:

• trunk/OpenMeshD/OpenMesh/Apps/GLViewer/MeshDrawerT.d (modified) (2 diffs)
• trunk/OpenMeshD/OpenMesh/Apps/GLViewer/dsss.conf (modified) (1 diff)
• trunk/OpenMeshD/OpenMesh/Apps/MeshConvert/dsss.conf (modified) (1 diff)
• trunk/OpenMeshD/OpenMesh/Apps/MeshConvert/mconvert.d (modified) (2 diffs)
• trunk/OpenMeshD/OpenMesh/Apps/Subdivider/subdivider.d (modified) (5 diffs)
• trunk/OpenMeshD/OpenMesh/Core/IO/IOManager.d (modified) (2 diffs)
• trunk/OpenMeshD/OpenMesh/Core/IO/MeshIO.d (modified) (2 diffs)
• trunk/OpenMeshD/OpenMesh/Core/IO/Options.d (modified) (6 diffs)
• trunk/OpenMeshD/OpenMesh/Core/IO/importer/BaseImporter.d (modified) (1 diff)
• trunk/OpenMeshD/OpenMesh/Core/IO/importer/ImporterT.d (modified) (2 diffs)
• trunk/OpenMeshD/OpenMesh/Core/IO/reader/OFFReader.d (modified) (8 diffs)
• trunk/OpenMeshD/OpenMesh/Core/IO/writer/BaseWriter.d (modified) (1 diff)
• trunk/OpenMeshD/OpenMesh/Core/IO/writer/OBJWriter.d (modified) (1 diff)
• trunk/OpenMeshD/OpenMesh/Core/IO/writer/OFFWriter.d (modified) (11 diffs)
• trunk/OpenMeshD/OpenMesh/Core/IO/writer/PLYWriter.d (modified) (1 diff)
• trunk/OpenMeshD/OpenMesh/Core/IO/writer/STLWriter.d (modified) (1 diff)
• trunk/OpenMeshD/OpenMesh/Core/Mesh/PolyConnectivity.d (modified) (3 diffs)
• trunk/OpenMeshD/OpenMesh/Core/Mesh/TriConnectivity.d (modified) (3 diffs)

trunk/OpenMeshD/OpenMesh/Apps/GLViewer/MeshDrawerT.d

@@ -359 +359 @@
-    }
-
+    /// Get current two-sided lighting state.
+    /// Must be called when the GL context is active.
-    bool two_sided_lighting() {
-        GLboolean ion;
@@ -702 +704 @@
-        else if (_draw_mode == "Solid Flat") // -------------------------------------
-        {
+            bool docolor = mesh_.has_face_colors() && use_color_;
+            if (docolor) {
+                glEnable(GL_COLOR_MATERIAL);
+            }
-            glBegin(GL_TRIANGLES);
-            for (; fIt!=fEnd; ++fIt)
-            {
-                glNormal3fv( mesh_.normal_ptr(fIt.handle).ptr );
+                if (docolor)
+                    glColor3ubv( mesh_.color_ptr(fIt.handle).ptr );
-      
-
-
-
-
-
-
+
+
+
-            }
-            glEnd();
+            if (docolor) {
+                glDisable(GL_COLOR_MATERIAL);
+            }
-    
-        }

trunk/OpenMeshD/OpenMesh/Apps/GLViewer/dsss.conf

@@ -3 +3 @@
-buildflags += -I../../.. -I../../../Helix
-buildflags += -debug -g 
- -inline
+

trunk/OpenMeshD/OpenMesh/Apps/MeshConvert/dsss.conf

@@ -3 +3 @@
-buildflags += -I../../..
-buildflags += -debug -g 
+#buildflags += -release -O -inline

trunk/OpenMeshD/OpenMesh/Apps/MeshConvert/mconvert.d

@@ -342 +342 @@
-        bool rc;
-        timer.start();
-
+
+
+
+
-        timer.stop();
-       
@@ -356 +359 @@
-            dout.writefln("  Binary size: %s bytes", meshio.binary_size(mesh, ofname, opt));
-        }
+        else if ( wantopt.check(io_opt.Options.Binary) )
+        {
+            dout.writefln("  [binary output not supported]");
+        }
+
-        if ( opt.vertex_has_normal() )
-            dout.writefln("  with vertex normals");
+        else if ( wantopt.vertex_has_normal() )
+            dout.writefln("  [vertex normals not supported]");
+        
-        if ( opt.vertex_has_color() )
-            dout.writefln("  with vertex colors");
+        else if ( wantopt.vertex_has_color() )
+            dout.writefln("  [vertex colors not supported]");
+
-        if ( opt.vertex_has_texcoord() )
-            dout.writefln("  with vertex texcoord");
+        else if ( wantopt.vertex_has_texcoord() )
+            dout.writefln("  [vertex texcoord not supported]");
+
-        if ( opt.face_has_normal() )
-            dout.writefln("  with face normals");
+        else if ( wantopt.face_has_normal() )
+            dout.writefln("  [face normals not supported]");
+
-        if ( opt.face_has_color() )
-            dout.writefln("  with face colors");
+        else if ( wantopt.face_has_color() )
+            dout.writefln("  [face colors not supported]");
+
-        dout.writefln("  wrote in " , timer.as_string());
-        timer.reset();       

trunk/OpenMeshD/OpenMesh/Apps/Subdivider/subdivider.d

@@ -86 +86 @@
-    scope         t = new Timer;
-    scope subdivide = new Subdivider;
-
+
-    dout.writefln("Subdivide %s times with '%s'" , _n, subdivide.name);
-    
@@ -145 +145 @@
-    // -------------------- write mesh
-
-()
-()
-()
+
+
+
-
-    if ( _ofname )
-    {
-
-
-
-
+
+
+
+
+
+
+
-        {
-            dout.writefln( "OK").flush;
@@ -191 +194 @@
-
-    void get_iters() {
-        writefln("Optarg is ", optarg);
-        n = std.conv.toInt(optarg);
-    }
@@ -218 +220 @@
-            break;
-        }
- usage(); return 0;
-
+
+ usage(); return 0;
-        default:  usage(); return 1;
-        }
@@ -229 +231 @@
-
-    // input file
-
+.dup
-
-    // output file, if provided
-
-
-
+ {
+.dup
+
-
-    // --------------------

trunk/OpenMeshD/OpenMesh/Core/IO/IOManager.d

@@ -152 +152 @@
-
-   
+    /** Ask the writer that will be used to update the options passed in.
+     *  Since writers fail if asked to write files in a format they aren't
+     *  capable of it is necessary to get the closest set of options that
+     *  the writer supports.  This will only turn off options in _opt, not
+     *  enable new ones (unless the format is incapable of writing without
+     *  that particular feature for some reason.)
+     *
+     *  Returns false if there's no writer that can handle a file of the given type.
+     */
+    bool supported_writer_options(string _filename, ref Options _opt) {
+        if (!writer_modules_) 
+        {
+            derr.writefln("[OpenMesh.IO._IOManager_] No writing modules available!");
+            return false;
+        }
+
+        // Try all registered modules
+        foreach(it,_; writer_modules_) 
+        {
+            if (it.can_u_write(_filename))
+            {
+                it.update_options(_filename, _opt);
+                return true;
+            }
+        }
+  
+        // All modules failed to recognize the filename.
+        return false;
+    }
+
+    /** Get an option set containing all options supported by the writer.
+     *  The writer checked is the same as the one used by write() 
+     *  given the same filename.
+     */
+    Options supported_writer_options(string _filename) {
+        auto opt = Options(Options.All);
+        supported_writer_options(_filename, opt);
+        return opt;
+    }
-
-    /// Returns true if the format is supported by one of the reader modules.
@@ -188 +227 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-

trunk/OpenMeshD/OpenMesh/Core/IO/MeshIO.d

@@ -111 +111 @@
-
-
-
-
+
+
+
+
-bool write_mesh(Mesh)(/*const*/ Mesh _mesh, /*const*/ string _filename,
-                      Options _opt = Options(Options.Default))
@@ -118 +120 @@
-    scope exporter = new ExporterT!(Mesh)(_mesh);
-    return IOManager().write(_filename, exporter, _opt);
+}
+
+
+/** Ask the IOManager to update _opt by removing options that the target writer
+ *  does not support.
+ *
+ *  Just calls the method of the same name in the IOManager class.
+ */
+bool supported_writer_options(string _filename, ref Options _opt) {
+    return IOManager().supported_writer_options(_filename, _opt);
+}
+
+/** Ask the IOManager for the full set of options supported by the target writer.
+ *
+ *  Just calls the method of the same name in the IOManager class.
+ */
+Options supported_writer_options(string _filename) {
+    return IOManager().supported_writer_options(_filename);
-}
-

trunk/OpenMeshD/OpenMesh/Core/IO/Options.d

@@ -92 +92 @@
-        VertexTexCoord = 0x0040, ///< Has (r) / store (w) texture coordinates
-        FaceNormal     = 0x0100, ///< Has (r) / store (w) face normals
-
+
+
+
+
+
-    }
-
@@ -105 +109 @@
-    alias Flag.FaceNormal     FaceNormal;
-    alias Flag.FaceColor      FaceColor;
+    alias Flag.AllProperties  AllProperties;
+    alias Flag.All            All;
-
-public:
@@ -135 +141 @@
-public:
-
-    //@{
-    /// Unset options defined in _rhs.
-
@@ -141 +146 @@
-    { flags_ &= ~_rhs; /*return *this;*/ }
-
+    /// ditto
-    void unset( /*const*/ value_type _rhs)
-    { /*return*/ (*this -= _rhs); }
-
-
-
-
-
-
+
+
-    /// Set options defined in _rhs
-
@@ -154 +157 @@
-    { flags_ |= _rhs; /*return *this;*/ }
-
+    /// ditto
-    void set( /*const*/ value_type _rhs)
-    { /*return*/ (*this += _rhs); }
-
-    //@}
-
-public:
@@ -180 +183 @@
-    bool face_has_normal()     /*const*/ { return check(Flag.FaceNormal); }
-    bool face_has_color()      /*const*/ { return check(Flag.FaceColor); }
+
+    string toString() {
+        string ret = "Options(";
+        if (check(Binary)) ret ~= "Binary|";
+        if (check(MSB)) ret ~= "MSB|";
+        if (check(LSB)) ret ~= "LSB|";
+        if (check(Swap)) ret ~= "Swap|";
+        if (check(VertexNormal)) ret ~= "VertexNormal|";
+        if (check(VertexColor)) ret ~= "VertexColor|";
+        if (check(VertexTexCoord)) ret ~= "VertexTexCoord|";
+        if (check(FaceNormal)) ret ~= "FaceNormal|";
+        if (check(FaceColor)) ret ~= "FaceColor|";
+        if (ret[$-1]=='|') ret[$-1]=')';
+        else ret ~= ")";
+        return ret;
+    }
-
-private:

trunk/OpenMeshD/OpenMesh/Core/IO/importer/BaseImporter.d

@@ -69 +69 @@
-public:
-
-
+/
-    abstract VertexHandle add_vertex(/*const*/ ref Vec3f _point);
-   
-    // add a face with indices _indices refering to vertices
-    alias VertexHandle[] VHandles;
-    abstract FaceHandle add_face(/*const*/ VHandles _indices);
-
-
+
+
+
+
+
+
-    abstract void set_normal(VertexHandle _vh, /*const*/ ref Vec3f _normal);
-
-
+/
-    abstract void set_color(VertexHandle _vh, /*const*/ ref Vec3ub _color);
-
-
+/
-    abstract void set_texcoord(VertexHandle _vh, /*const*/ ref Vec2f _texcoord);
-
-
+/
-    abstract void set_normal(FaceHandle _fh, /*const*/ ref Vec3f _normal);
-
-
+/
-    abstract void set_color(FaceHandle _fh, /*const*/ ref Vec3ub _color);
-
-
+/
-    BaseKernel kernel() { return null; }
-

trunk/OpenMeshD/OpenMesh/Core/IO/importer/ImporterT.d

@@ -85 +85 @@
-   
-
-
+, FaceHandle[]* _fh_out = null
-    {
-        FaceHandle fh;
@@ -112 +112 @@
-
-            // try to add face
-
+, _fh_out
-            if (!fh.is_valid()) 
-            {

trunk/OpenMeshD/OpenMesh/Core/IO/reader/OFFReader.d

@@ -1 +1 @@
-//============================================================================
-
-
-
-
+
-//
-// Author:  William V. Baxter III
@@ -9 +6 @@
-// Written in the D Programming Language (http://www.digitalmars.com/d)
-//============================================================================
-
+
+
+
+
+
+
-module OpenMesh.Core.IO.reader.OFFReader;
-
@@ -37 +39 @@
- *                                                                           *
-\*===========================================================================*/
-
-
-//=============================================================================
-//
-//  Implements a reader module for OFF files
-//
-//=============================================================================
-
-
@@ -183 +178 @@
-                    read_ascii(_in, _bi));
-
+        // Can't tell if there were face colors or not till after you read it.
-        if (options_.face_has_color) _opt += Options.FaceColor;
-        return ret;
@@ -272 +268 @@
-        // faces
-        // #N <v1> <v2> .. <v(n-1)> [color spec]
-// So far color spec is unsupported!
+FaceHandle[] fh_list; fh_list.length = 10;
-        for (i=0; i<nF; ++i)
-        {
@@ -290 +286 @@
-            }
-    
-
+
+
-
-            if (parts.length-ipart>=3) {
-0,0,0
+255,255,255
-                // read face color
-                options_.face_has_color = true;
-
-
-
-
+
+
+
+
+
+
-            }
-            
@@ -410 +409 @@
-        // faces
-        // #N <v1> <v2> .. <v(n-1)> [color spec]
-// So far color spec is unsupported!
+FaceHandle[] fh_list; fh_list.length = 10;
-        for (i=0; i<nF; ++i)
-        {
@@ -428 +427 @@
-                    vhandles ~= VertexHandle(read_int(_in, _swap));
-            }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-

trunk/OpenMeshD/OpenMesh/Core/IO/writer/BaseWriter.d

@@ -102 +102 @@
-    size_t binary_size(BaseExporter, Options) /*const*/ { return 0; }
-
+    /// Turn off any options that are not supported.
+    /// For some formats there are options that depend on the filename
+    /// (namely ascii/binary specific names) so the filename is passed as well.
+    abstract void update_options(string _filename, ref Options opt);
-
-

trunk/OpenMeshD/OpenMesh/Core/IO/writer/OBJWriter.d

@@ -99 +99 @@
-    size_t binary_size(BaseExporter, Options) /*const*/ { return 0; }
-
+    void update_options(string _filename, ref Options _opt) {
+        _opt -= Options.Binary;
+        _opt -= Options.FaceNormal;
+        _opt -= Options.FaceColor;
+    }
+
-  private:
-

trunk/OpenMeshD/OpenMesh/Core/IO/writer/OFFWriter.d

@@ -1 +1 @@
-//============================================================================
- -
+
-//
-
-
-
-
+
-// Created: 05 Oct 2007
-// Written in the D Programming Language (http://www.digitalmars.com/d)
-//============================================================================
-
-
-
+
+
+
+
+
+
-module OpenMesh.Core.IO.writer.OFFWriter;
-
@@ -40 +40 @@
-
-
-//=============================================================================
-//
-//  Implements a writer module for OFF files
-//
-//=============================================================================
-
-
-//=== INCLUDES ================================================================
-
@@ -56 +49 @@
-
-import OpenMesh.Core.Geometry.VectorT;
+import OpenMesh.Core.Utils.color_cast;
-import OpenMesh.Core.Mesh.Handles;
-import OpenMesh.Core.IO.BinaryHelper;
@@ -83 +77 @@
-    string get_extensions() /*const*/  { return "off"; }
-
+    void update_options(string _filename, ref Options _opt) {
+        _opt -= Options.VertexColor;
+        _opt -= Options.FaceNormal;
+    }
+
-    bool write(/*const*/ string _filename, BaseExporter _be, Options _opt) /*const*/
-    {
@@ -92 +91 @@
-        // check writer features
-        if ( _opt.check(Options.VertexColor) || // not supported by module
-
-
+
-            return false;
-
@@ -204 +202 @@
-            for (i=0, nV=_be.n_vertices(); i<nV; ++i)
-            {
+
-                vh = VertexHandle(i);
-                v  = _be.point(vh);
@@ -245 +244 @@
-
-
-
-
-        // faces (indices starting at 0)
+        bool fcolor = _opt.check(Options.FaceColor) && _be.has_face_colors();
-        if (_be.is_triangle_mesh())
-        {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            for (i=0, nF=_be.n_faces(); i<nF; ++i)
-            {
@@ -266 +279 @@
-                fprintf(_out, "%d", nV);
-                for (j=0; j<vhandles.length; ++j)
-
+
+
+
+
+
+
-                fprintf(_out, "\n");
-            }
@@ -361 +379 @@
-
-        // faces (indices starting at 0)
+        bool fcolor = _opt.check(Options.FaceColor) && _be.has_face_colors();
-        if (_be.is_triangle_mesh())
-        {
@@ -370 +389 @@
-                write_int(vhandles[1].idx(), _out, swap);
-                write_int(vhandles[2].idx(), _out, swap);
+                // According to the spec linked above, the binary
+                // version must have a # of color components after 
+                // each face, for face colors.  0 of no face colors.
+                if (fcolor) {
+                    write_int(3, _out, swap);
+                    Vec3f color = color_cast!(Vec3f)(_be.color(FaceHandle(i)));
+                    write_float(color[0],_out, swap);
+                    write_float(color[1],_out, swap);
+                    write_float(color[2],_out, swap);
+                } else {
+                    write_int(0, _out, swap);
+                }
-            }
-        }
@@ -380 +411 @@
-                foreach(vhn; vhandles)
-                    write_int(vhn.idx, _out, swap);
+                if (fcolor) {
+                    write_int(3, _out, swap);
+                    Vec3f color = color_cast!(Vec3f)(_be.color(FaceHandle(i)));
+                    write_float(color[0],_out, swap);
+                    write_float(color[1],_out, swap);
+                    write_float(color[2],_out, swap);
+                } else {
+                    write_int(0, _out, swap);
+                }
+
-            }
-        }

trunk/OpenMeshD/OpenMesh/Core/IO/writer/PLYWriter.d

@@ -58 +58 @@
-    string get_extensions()  /*const*/  { return "ply"; }
-
+    void update_options(string _filename, ref Options _opt) {
+        // everything supported!
+    }
+
-    bool write(/*const*/ string _filename, BaseExporter _be, Options _opt) /*const*/
-    {

trunk/OpenMeshD/OpenMesh/Core/IO/writer/STLWriter.d

@@ -102 +102 @@
-    string get_extensions()  /*const*/ { return "stla stlb"; }
-  
+    void update_options(string _filename, ref Options _opt) {
+        _opt -= Options.VertexNormal;
+        _opt -= Options.VertexTexCoord;
+        _opt -= Options.FaceColor;
+    }
+
-    bool write(/*const*/ string _filename, BaseExporter _be, Options _opt) /*const*/
-    {

trunk/OpenMeshD/OpenMesh/Core/Mesh/PolyConnectivity.d

@@ -185 +185 @@
-    { return new_vertex(); }
-
-    /// Add and connect a new face
-    FaceHandle add_face(/*const*/ ref VertexHandle[] _vhandles)
-    { return add_face(&_vhandles[0], _vhandles.length); }
-  
-    FaceHandle add_face(VertexHandle _vh0, VertexHandle _vh1, VertexHandle _vh2)
-    { 
-        VertexHandle[3] vhs = [ _vh0, _vh1, _vh2 ];
-        return add_face(vhs.ptr, vhs.length);
-    }
-  
-    FaceHandle add_face(VertexHandle _vh0, VertexHandle _vh1, VertexHandle _vh2, VertexHandle _vh3)
-    { 
-        VertexHandle[4] vhs = [ _vh0, _vh1, _vh2, _vh3 ];
-        return add_face(vhs.ptr, vhs.length); 
-    }
-  
-    struct NextCacheEntryT(_Handle)
-    {
@@ -217 +201 @@
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        VertexHandle                   vh;
-        uint                           i, ii, n=(_vhs_size), id;
@@ -379 +380 @@
-                adjust_outgoing_halfedge(_vertex_handles[i]);
-
+        if (_faces_out) (*_faces_out) ~= fh;
-        return fh;
-

trunk/OpenMeshD/OpenMesh/Core/Mesh/TriConnectivity.d

@@ -62 +62 @@
-    }
-  
-    /** \name Addding items to a mesh
-     */
-    //@{
-    /** Override OpenMesh.Mesh.PolyMeshT.add_face(). Faces that aren't
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        // need at least 3 vertices
-        if (_vhs_size < 3) return InvalidFaceHandle;
-
+        FaceHandle fh;
-        /// face is triangle -> ok
-
-
+
+
+
-
-        /// face is not a triangle -> triangulate
@@ -88 +92 @@
-            vhandles[0] = _vertex_handles[0];
-
-            FaceHandle fh;
-            uint i = 1;
-            --_vhs_size;
-
+            // Simple fan triangulation from the first vertex;
-            while (i < _vhs_size)
-            {
-                vhandles[1] = _vertex_handles[i];
-                vhandles[2] = _vertex_handles[++i];
-.ptr, 3
+,_faces_out
-            }
-
@@ -103 +107 @@
-    }
-  
-    FaceHandle add_face(VertexHandle _vh0, VertexHandle _vh1, VertexHandle _vh2)
-    { 
-        VertexHandle vhs[3] = [ _vh0, _vh1, _vh2 ];
-        return super.add_face(vhs.ptr, 3); 
-    }
-  
-    //@}
-
-    /** Returns the opposite vertex to the halfedge _heh in the face