From bcd590e1b3e113832a5707d5dffdbacb91a57e79 Mon Sep 17 00:00:00 2001 From: Mike Kremer Date: Fri, 12 Jun 2009 12:46:12 +0000 Subject: [PATCH] PLY format now supports texture coordinates (actually written/read per vertex and not per face (halfedge)) git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@158 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Core/IO/reader/PLYReader.cc | 176 ++++++++++++++--------- src/OpenMesh/Core/IO/writer/PLYWriter.cc | 58 +++++--- 2 files changed, 148 insertions(+), 86 deletions(-) diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index 4137ef86..9050d410 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -113,16 +113,21 @@ bool _PLYReader_::read(std::fstream& _in, BaseImporter& _bi, Options& _opt) cons // build options to be returned _opt.clear(); - if (options_.vertex_has_normal() && userOptions_.vertex_has_normal()) + if (options_.vertex_has_normal() && userOptions_.vertex_has_normal()) { _opt += Options::VertexNormal; - if (options_.vertex_has_texcoord() && userOptions_.vertex_has_texcoord()) + } + if (options_.vertex_has_texcoord() && userOptions_.vertex_has_texcoord()) { _opt += Options::VertexTexCoord; - if (options_.vertex_has_color() && userOptions_.vertex_has_color()) + } + if (options_.vertex_has_color() && userOptions_.vertex_has_color()) { _opt += Options::VertexColor; - if (options_.face_has_color() && userOptions_.face_has_color()) + } + if (options_.face_has_color() && userOptions_.face_has_color()) { _opt += Options::FaceColor; - if (options_.is_binary()) + } + if (options_.is_binary()) { _opt += Options::Binary; + } // //force user-choice for the alpha value when reading binary // if ( options_.is_binary() && userOptions_.color_has_alpha() ) @@ -148,7 +153,7 @@ bool _PLYReader_::read_ascii(std::fstream& _in, BaseImporter& _bi) const { unsigned int nV; OpenMesh::Vec3f v; std::string trash; - // OpenMesh::Vec2f t; + OpenMesh::Vec2f t; OpenMesh::Vec4i c; float tmp; BaseImporter::VHandles vhandles; @@ -167,6 +172,9 @@ bool _PLYReader_::read_ascii(std::fstream& _in, BaseImporter& _bi) const { v[1] = 0.0; v[2] = 0.0; + t[0] = 0.0; + t[1] = 0.0; + c[0] = 0; c[1] = 0; c[2] = 0; @@ -183,6 +191,12 @@ bool _PLYReader_::read_ascii(std::fstream& _in, BaseImporter& _bi) const { case ZCOORD: _in >> v[2]; break; + case TEXX: + _in >> t[0]; + break; + case TEXY: + _in >> t[1]; + break; case COLORRED: if (vertexPropertyMap_[propertyIndex].second == ValueTypeFLOAT32) { _in >> tmp; @@ -218,6 +232,7 @@ bool _PLYReader_::read_ascii(std::fstream& _in, BaseImporter& _bi) const { } vh = _bi.add_vertex(v); + _bi.set_texcoord(vh, t); _bi.set_color(vh, Vec4uc(c)); } @@ -254,66 +269,6 @@ bool _PLYReader_::read_ascii(std::fstream& _in, BaseImporter& _bi) const { //----------------------------------------------------------------------------- -void _PLYReader_::readValue(ValueType _type, std::fstream& _in, float& _value) const { - - switch (_type) { - case ValueTypeFLOAT32: - case ValueTypeFLOAT: - float32_t tmp; - restore(_in, tmp, options_.check(Options::MSB)); - _value = tmp; - break; - default: - _value = 0.0; - std::cerr << "unsupported conversion type to float: " << _type << std::endl; - break; - } -} - -void _PLYReader_::readValue(ValueType _type, std::fstream& _in, unsigned int& _value) const { - - int32_t tmp_int32_t; - uint8_t tmp_uchar; - - switch (_type) { - case ValueTypeINT: - case ValueTypeINT32: - restore(_in, tmp_int32_t, options_.check(Options::MSB)); - _value = tmp_int32_t; - break; - case ValueTypeUCHAR: - restore(_in, tmp_uchar, options_.check(Options::MSB)); - _value = tmp_uchar; - break; - default: - _value = 0; - std::cerr << "unsupported conversion type to int: " << _type << std::endl; - break; - } -} - -void _PLYReader_::readValue(ValueType _type, std::fstream& _in, int& _value) const { - - int32_t tmp_int32_t; - uint8_t tmp_uchar; - - switch (_type) { - case ValueTypeINT: - case ValueTypeINT32: - restore(_in, tmp_int32_t, options_.check(Options::MSB)); - _value = tmp_int32_t; - break; - case ValueTypeUCHAR: - restore(_in, tmp_uchar, options_.check(Options::MSB)); - _value = tmp_uchar; - break; - default: - _value = 0; - std::cerr << "unsupported conversion type to int: " << _type << std::endl; - break; - } -} - bool _PLYReader_::read_binary(std::fstream& _in, BaseImporter& _bi, bool /*_swap*/) const { omlog() << "[PLYReader] : read binary file format\n"; @@ -326,10 +281,11 @@ bool _PLYReader_::read_binary(std::fstream& _in, BaseImporter& _bi, bool /*_swap unsigned int i, j, k, l, idx; unsigned int nV; - OpenMesh::Vec3f v; + OpenMesh::Vec3f v; // Vertex + OpenMesh::Vec2f t; // TexCoords BaseImporter::VHandles vhandles; VertexHandle vh; - OpenMesh::Vec4i c; + OpenMesh::Vec4i c; // Color float tmp; _bi.reserve(vertexCount_, 3* vertexCount_ , faceCount_); @@ -340,6 +296,9 @@ bool _PLYReader_::read_binary(std::fstream& _in, BaseImporter& _bi, bool /*_swap v[1] = 0.0; v[2] = 0.0; + t[0] = 0.0; + t[1] = 0.0; + c[0] = 0; c[1] = 0; c[2] = 0; @@ -356,6 +315,12 @@ bool _PLYReader_::read_binary(std::fstream& _in, BaseImporter& _bi, bool /*_swap case ZCOORD: readValue(vertexPropertyMap_[propertyIndex].second, _in, v[2]); break; + case TEXX: + readValue(vertexPropertyMap_[propertyIndex].second, _in, t[0]); + break; + case TEXY: + readValue(vertexPropertyMap_[propertyIndex].second, _in, t[1]); + break; case COLORRED: if (vertexPropertyMap_[propertyIndex].second == ValueTypeFLOAT32) { readValue(vertexPropertyMap_[propertyIndex].second, _in, tmp); @@ -392,6 +357,7 @@ bool _PLYReader_::read_binary(std::fstream& _in, BaseImporter& _bi, bool /*_swap } vh = _bi.add_vertex(v); + _bi.set_texcoord(vh, t); _bi.set_color(vh, Vec4uc(c)); } @@ -425,9 +391,75 @@ bool _PLYReader_::read_binary(std::fstream& _in, BaseImporter& _bi, bool /*_swap //----------------------------------------------------------------------------- +//----------------------------------------------------------------------------- + + +void _PLYReader_::readValue(ValueType _type, std::fstream& _in, float& _value) const { + + switch (_type) { + case ValueTypeFLOAT32: + case ValueTypeFLOAT: + float32_t tmp; + restore(_in, tmp, options_.check(Options::MSB)); + _value = tmp; + break; + default: + _value = 0.0; + std::cerr << "unsupported conversion type to float: " << _type << std::endl; + break; + } +} + +void _PLYReader_::readValue(ValueType _type, std::fstream& _in, unsigned int& _value) const { + + int32_t tmp_int32_t; + uint8_t tmp_uchar; + + switch (_type) { + case ValueTypeINT: + case ValueTypeINT32: + restore(_in, tmp_int32_t, options_.check(Options::MSB)); + _value = tmp_int32_t; + break; + case ValueTypeUCHAR: + restore(_in, tmp_uchar, options_.check(Options::MSB)); + _value = tmp_uchar; + break; + default: + _value = 0; + std::cerr << "unsupported conversion type to int: " << _type << std::endl; + break; + } +} + +void _PLYReader_::readValue(ValueType _type, std::fstream& _in, int& _value) const { + + int32_t tmp_int32_t; + uint8_t tmp_uchar; + + switch (_type) { + case ValueTypeINT: + case ValueTypeINT32: + restore(_in, tmp_int32_t, options_.check(Options::MSB)); + _value = tmp_int32_t; + break; + case ValueTypeUCHAR: + restore(_in, tmp_uchar, options_.check(Options::MSB)); + _value = tmp_uchar; + break; + default: + _value = 0; + std::cerr << "unsupported conversion type to int: " << _type << std::endl; + break; + } +} + +//------------------------------------------------------------------------------ + bool _PLYReader_::can_u_read(const std::string& _filename) const { // !!! Assuming BaseReader::can_u_parse( std::string& ) // does not call BaseReader::read_magic()!!! + if (BaseReader::can_u_read(_filename)) { std::ifstream ifs(_filename.c_str()); if (ifs.is_open() && can_u_read(ifs)) { @@ -595,6 +627,14 @@ bool _PLYReader_::can_u_read(std::istream& _is) const { std::pair entry(ZCOORD, valueType); vertexPropertyMap_[vertexPropertyCount_] = entry; vertexDimension_++; + } else if (propertyName == "u" || propertyName == "s") { + std::pair entry(TEXX, valueType); + vertexPropertyMap_[vertexPropertyCount_] = entry; + options_ += Options::VertexTexCoord; + } else if (propertyName == "v" || propertyName == "t") { + std::pair entry(TEXY, valueType); + vertexPropertyMap_[vertexPropertyCount_] = entry; + options_ += Options::VertexTexCoord; } else if (propertyName == "red") { std::pair entry(COLORRED, valueType); vertexPropertyMap_[vertexPropertyCount_] = entry; diff --git a/src/OpenMesh/Core/IO/writer/PLYWriter.cc b/src/OpenMesh/Core/IO/writer/PLYWriter.cc index 89d315c7..618c1223 100644 --- a/src/OpenMesh/Core/IO/writer/PLYWriter.cc +++ b/src/OpenMesh/Core/IO/writer/PLYWriter.cc @@ -4,10 +4,10 @@ * Copyright (C) 2001-2009 by Computer Graphics Group, RWTH Aachen * * www.openmesh.org * * * - *---------------------------------------------------------------------------* + *---------------------------------------------------------------------------* * This file is part of OpenMesh. * * * - * OpenMesh is free software: you can redistribute it and/or modify * + * OpenMesh is free software: you can redistribute it and/or modify * * it under the terms of the GNU Lesser General Public License as * * published by the Free Software Foundation, either version 3 of * * the License, or (at your option) any later version with the * @@ -30,10 +30,10 @@ * License along with OpenMesh. If not, * * see . * * * -\*===========================================================================*/ +\*===========================================================================*/ /*===========================================================================*\ - * * + * * * $Revision$ * * $Date$ * * * @@ -125,9 +125,9 @@ write_ascii(std::fstream& _out, BaseExporter& _be, Options _opt) const unsigned int i, j, nV, nF; Vec3f v, n; - Vec2f t; OpenMesh::Vec3f c; OpenMesh::Vec4f cA; + OpenMesh::Vec2f t; VertexHandle vh; std::vector vhandles; @@ -140,6 +140,11 @@ write_ascii(std::fstream& _out, BaseExporter& _be, Options _opt) const _out << "property float32 y" << std::endl; _out << "property float32 z" << std::endl; + if ( _opt.vertex_has_texcoord() ){ + _out << "property float32 u" << std::endl; + _out << "property float32 v" << std::endl; + } + if ( _opt.vertex_has_color() ){ _out << "property int32 red" << std::endl; _out << "property int32 green" << std::endl; @@ -162,6 +167,12 @@ write_ascii(std::fstream& _out, BaseExporter& _be, Options _opt) const //Vertex _out << v[0] << " " << v[1] << " " << v[2]; + // Vertex TexCoords + if ( _opt.vertex_has_texcoord() ) { + t = _be.texcoord(vh); + _out << " " << t[0] << " " << t[1]; + } + // VertexColor if ( _opt.vertex_has_color() ) { //with alpha @@ -177,16 +188,16 @@ write_ascii(std::fstream& _out, BaseExporter& _be, Options _opt) const _out << "\n"; } - + // faces (indices starting at 0) if (_be.is_triangle_mesh()) { for (i=0, nF=_be.n_faces(); i vhandles; - //writing header _out << "ply" << std::endl; _out << "format "; @@ -328,6 +338,11 @@ write_binary(std::fstream& _out, BaseExporter& _be, Options _opt) const _out << "property float32 y" << std::endl; _out << "property float32 z" << std::endl; + if ( _opt.vertex_has_texcoord() ){ + _out << "property float32 u" << std::endl; + _out << "property float32 v" << std::endl; + } + if ( _opt.vertex_has_color() ){ _out << "property int32 red" << std::endl; _out << "property int32 green" << std::endl; @@ -340,18 +355,25 @@ write_binary(std::fstream& _out, BaseExporter& _be, Options _opt) const _out << "element face " << _be.n_faces() << std::endl; _out << "property list uchar int32 vertex_indices" << std::endl; _out << "end_header" << std::endl; - + // vertex data (point, normals, texcoords) for (i=0, nV=_be.n_vertices(); i