Commit Graph

986 Commits

Author SHA1 Message Date
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
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
8e81de4045 Fixed error with VS2013 2016-11-07 20:31:30 +01:00
Jan Möbius
dd91155f2c Another cast 2016-11-07 15:33:20 +01:00
Jan Möbius
c1ad9f418c Some casts 2016-11-07 15:23:49 +01:00
Jan Möbius
7175cd8c6d Several warnings 2016-11-07 15:10:23 +01:00
Jan Möbius
79ce71f2d3 Another fix 2016-11-07 15:07:19 +01:00
Jan Möbius
aec2fa2442 Merge branch 'warnings' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh into warnings 2016-11-07 15:02:15 +01:00
Jan Möbius
74ada2eac0 Warning 2016-11-07 15:02:07 +01:00
Jan Möbius
d966d44a3f More fixes including Unit tests 2016-11-07 14:52:07 +01:00
Jan Möbius
7bcc3ec1a9 Fixed typo 2016-11-07 14:31:54 +01:00
Jan Möbius
e75a70774d Next bunch of warning fixes 2016-11-07 14:30:14 +01:00
Jan Möbius
85e183ae05 Fixed VS2015 warnings 2016-11-07 14:12:29 +01:00
Jan Möbius
066272a58e Warnings 2016-10-28 14:19:20 +02:00
Jan Möbius
01ab3eeff5 Warning 2016-10-28 14:07:08 +02:00
Jan Möbius
4377803708 More warnings fixed 2016-10-28 10:44:04 +02:00
Jan Möbius
4dd321bbdd Merge branch 'warn2' into 'master'
More warning fixes

See merge request !100
2016-10-28 10:31:21 +02:00
Jan Möbius
08160c1584 More warning fixes 2016-10-28 08:59:36 +02:00
Jan Möbius
00090fc282 Merge branch 'warn' into 'master'
Warn

See merge request !99
2016-10-28 08:49:47 +02:00
Jan Möbius
7a1cad003d Typo 2016-10-28 08:08:09 +02:00
Jan Möbius
b05912ae04 Fixed ugly init 2016-10-27 14:46:57 +02:00
Jan Möbius
d767759862 Warning in subdivider fixed 2016-10-27 14:43:29 +02: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
Jan Möbius
17b91da501 Use stdint.h for unittest 2016-09-19 14:17:59 +02:00
Alexander Dielen
8dc194e8f1 Merge branch 'master' into 'BuildPythonWindows'
# Conflicts:
#   src/Python/Vector.hh
2016-09-16 12:54:51 +02:00
Jan Möbius
4f209d9f35 Missing ifdef 2016-09-16 09:50:44 +02:00
Jan Möbius
18e86a7f2b Missing header 2016-09-16 09:48:42 +02:00
Jan Möbius
bfc8506c20 Merge branch 'vector11-gcc-4-7-fix' into 'master'
g++ 4.7 compile fix in vector11

With g++ 4.7, the following error occurs when trying to compile code that uses Vector11:

```
../OpenMesh/Core/Geometry/Vector11T.hh: In function ‘decltype ((_v1 % _v2)) OpenMesh::cross(const OpenMesh::VectorT<LScalar, DIM>&, const OpenMesh::VectorT<RScalar, DIM>&) [with LScalar = float; RScalar = float; int DIM = 3; decltype ((_v1 % _v2)) = OpenMesh::VectorT<float, 3>]’:
../OpenMesh/Core/Geometry/Vector11T.hh:89:19: error: ‘OpenMesh::VectorT<float, 3>::container OpenMesh::VectorT<float, 3>::values_’ is private
```

It looks like this version of g++ would not be able to deal with the decltype statement used when overriding the "%" operator, where the "this->values_" part is not working properly. This issue should be fixed with this merge request.

See merge request !87
2016-09-14 10:15:55 +02:00
Max Limper
6433ed2ae3 gcc 4.7 compile fix 2016-09-13 18:52:39 +02:00
Hans-Christian Ebke
f38ce2ed5e Added unit test to trigger GCC alignment bug. See #32. 2016-09-13 17:59:30 +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
Alexander Dielen
f90c6da1b8 Made member function pointer types explicit. This gets rid of a preprocessor conditional and sidesteps a bug in msvc. 2016-08-23 21:56:15 +02:00