Commit Graph

638 Commits

Author SHA1 Message Date
Jan Möbius
986f98f0b9 Added Triangle 1 to 4 split 2017-04-26 16:58:38 +02:00
Jan Möbius
e95aeec855 Respect vector Traits in Quadric 2017-04-26 12:46:30 +02:00
Max Lyon
45f3b8187d enable more c++11 features for Visual Studio 2013 2017-04-25 16:03:19 +02:00
Max Lyon
57be7cad6d enable c++11 features of property manager for Visual Studio 2013 2017-04-25 15:50:30 +02:00
Martin Schultz
1f331456e5 fix wrong behaviour of HalfedgeLoopIterators by changing the template parameter 2017-02-20 15:40:08 +01:00
Janis Born
0f42d48cfb make Vector11T converting ctor only accept at least 2 arguments
(hence making all single-argument ctors explicit)
2017-02-10 15:55:29 +01:00
Jan Möbius
2f70e9a6ad Merge branch 'master' into ply_handle_extra_elements 2017-02-07 12:29:15 +01:00
Jan Möbius
fd5b60fcba Fixed explicit making cppcheck fail and some lineendings
(cherry picked from commit 25178d9dcb)
2017-02-06 09:22:25 +01:00
Michael Krämer
c23ed24aa0 return error when reaching EOF, skip reading extra elements after 'FACE' 2017-02-03 18:54:01 +01:00
Michael Krämer
1ae04a2284 adding support for additional elements 2017-01-20 17:39:09 +01:00
Janis Born
949e705082 more C++98 compatibility 2017-01-12 13:41:08 +01:00
Janis Born
3179316c82 add calc_edge_midpoint methods for meshes 2017-01-11 17:27:11 +01:00
Martin Schultz
e51fea542f Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh into fixMissingProperties 2017-01-08 23:10:36 +00:00
Martin Schultz
874cef141a use new assignment for polymesh trimesh conversion fixes #35 2017-01-08 23:05:16 +00:00
Martin Schultz
b3b992d2d2 implemented assign function that copies properties and initializes propertiehandles if desired 2017-01-08 23:04:08 +00:00
Jan Möbius
da1ec03c6e OM Writer: Added Mark to the format header to identify end of stream correctly (Thanks to Jamie Kydd for the patch) 2016-12-27 08:10:10 +01:00
Martin Heistermann
8033e2da23 QuadricT: implement Q+Q and Q*scalar operators for convenience. 2016-12-21 18:31:46 +01:00
Jan Möbius
6959e4ce10 Merge branch 'master' into featureMeshConversion 2016-12-21 08:44:39 +01:00
Jan Möbius
dc79c22a24 Fixed OMWriter when no faces are available (Thanks to Jamie Kydd for the patch) 2016-12-19 13:24:23 +01:00
Martin Schultz
2d4abf2d8b Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh into featureMeshConversion 2016-12-14 15:13:27 +01:00
Martin Schultz
49cc72e9d2 added explicit copy constructors for PolyMeshT and TrimeshT to enable static_casts of different mesh types 2016-12-08 18:18:59 +01:00
Martin Schultz
122293b2c0 added copy constructor to PolyMesh_ArrayKernelT and TriMesh_ArrayKernelT 2016-12-08 18:17:11 +01:00
Martin Schultz
74e4e72c63 Added function to copy all properties from one baseKernel to another 2016-12-08 18:15:17 +01:00
Jan Möbius
3b0ee9316d Use static casts 2016-12-08 09:49:41 +01:00
Max Lyon
5cd9448a4e size_t int warning 2016-12-07 17:33:14 +01:00
Jan Möbius
f846b75202 Typo 2016-11-08 12:27:32 +01:00
Janis Born
12ad76fccf attempt to quench 'Checked Iterator' warnings in VS2015 2016-11-08 11:27:18 +01:00
Jan Möbius
f377c86a43 Merge branch 'fixOBJWriterMissingTexcoords' into 'master'
added code to write faceTexCoords to obj writer.

fixes #25 
* Added accessor functions for HalfEdgeHandles and faceTexCoords to base exporter and exporter template.
* Added functionality to store FaceTexCoords to objwriter
* Added unittest to write and read faceTexcoords with a test obj file

See merge request !73
2016-10-27 14:31:59 +02:00
Jan Möbius
3183ac5364 Warning fixed 2016-10-24 16:34:05 +02:00
Jan Möbius
b7aabbd912 Fixed some warnings 2016-10-24 14:01:06 +02:00
Max Lyon
523e3e10f4 make all negative handles invalid, not just -1 2016-10-21 09:21:18 +02:00
David Bommes
e11f553c92 added missing ifdef for debug 2016-10-17 17:43:48 +02:00
Jan Möbius
c70cdc215d Bumped development version to 7.0 2016-10-06 12:44:35 +02:00
Max Limper
a6da330b41 resolved conflict 2016-10-02 11:55:23 +02:00
Jan Möbius
29ba85a7f0 Merge branch 'OBJ-loader-check-ranges' into 'master'
range check for vertex colors and normals in OBJ loader

This merge request adds explicit range checks and error reporting for the reading of colors and normals. The code is copied from texture coordinates, where a similar check already existed.

See merge request !92
2016-10-02 09:22:13 +02:00
Max Limper
782adb7b0a fixed handling of negative indices in OBJ loader 2016-10-01 20:31:16 +02:00
Max Limper
c577810d47 range check for vertex colors and normals in OBJ loader 2016-10-01 19:43:46 +02:00
Max Limper
d20d6a83e4 Fixed comment in OBJ loader 2016-10-01 18:21:18 +02:00
Jan Möbius
4c35d544f4 Merge branch 'obj-fix-wrong-indices' into 'master'
Fixed broken indices for some cases of OBJ parsing by using two passes

(Continuing fixing / discussion from https://graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh/merge_requests/51)

This merge request is fixing an issue that came up as a follow-up of the following merge request:
 https://graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh/merge_requests/51

The problem it fixes occurs for some kinds of OBJ data, where vertices and face data are stored interleaved and, at the same time, the mesh contains some non-manifold geometry.  As non-manifold geometry triggers the on-the-fly creation of new vertices during parsing, the indices from the OBJ file do not match any more and the result gets messed up.

The straightforward solution applied on this branch is to parse to whole OBJ file in two passes, first the vertices and then the material data and faces. This way, possible extra vertices will always be added to the back, not interfering with indices from the OBJ file

I tested the performance on a 1.1 GB OBJ file. The loading time on my machine increased from ~59 seconds to ~65 seconds, so I believe the performance overhead could probably be considered acceptable.

Looking forward to your feedback!


See merge request !84
2016-09-28 12:17:21 +02:00
Hans-Christian Ebke
dafbcf1480 Updated documentation of BaseKernel's property functions to hint at PropertyManager. 2016-09-22 10:14:30 +02:00
Max Limper
6433ed2ae3 gcc 4.7 compile fix 2016-09-13 18:52:39 +02:00
Hans-Christian Ebke
f08f96eb71 Fixed constness fail in PropertyManager::set_range(). 2016-09-12 17:06:56 +02:00
Hans-Christian Ebke
ab51547d92 PropertyManager: Add initializing createIfNotExists() versions. 2016-09-12 16:58:03 +02:00
Hans-Christian Ebke
a705d57bd0 PropertyManager: Add C++11 range-based set_range() version. 2016-09-12 16:57:33 +02:00
Max Limper
f53429fdeb Fixed broken indices for some cases of OBJ parsing by using two passes 2016-08-30 17:25:48 +02:00
Martin Schultz
2e6820a16b added binary stl file size check after ascii check 2016-08-16 15:06:19 +02:00
Martin Schultz
cc37345556 added include for cstring which should fix compile errors with c++11 and clang 2016-08-15 17:27:55 +02:00
Martin Schultz
fc04bac1a1 made the stl reader check for ascii file keyword instead of computing binary size 2016-08-15 17:14:25 +02:00
xan
6f811b5bd9 No Core/src include directory 2016-08-14 09:25:03 +02:00
xan
8445bad3c3 Fix undefined MSVC macro warning 2016-08-14 09:21:31 +02:00