Commit Graph

1805 Commits

Author SHA1 Message Date
Jan Möbius
417a50e67f First Windows build try 2016-10-19 12:23:34 +02:00
Jan Möbius
e2c078a866 Merge branch 'fixNdebug' into 'master'
added missing ifdef for debug



See merge request !94
2016-10-18 10:36:05 +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
Jan Möbius
0c6b4831d6 Updated release date 2016-10-06 10:15:12 +02:00
Jan Möbius
f3ffa2a27c Merge branch 'OBJ-loader-negative-indices' into 'master'
Fix for handling negative indices in OBJ loader

This fix resolves an issue that occurrs with the current code that uses two passes to parse the OBJ - see my previous merge request:
https://graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh/merge_requests/84

Sorry for the trouble! :-(

To verify that the negative indices were really not working any more, and to check that this fix resolves the issue, I used the Cornell Box example from the tiny OBJ loader project:
https://github.com/syoyo/tinyobjloader/blob/master/models/cornell_box.obj

See merge request !93
2016-10-02 13:53:00 +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
Jan Möbius
d606073a97 Merge branch 'OBJ-loader-fix-comment' into 'master'
Fixed comment in OBJ loader



See merge request !91
2016-10-02 09:21:09 +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
8b7be54eb6 Updated changelog for release 2016-10-01 08:52:09 +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
Jan Möbius
6b8587fc54 Updated changelog 2016-09-27 09:21:33 +02:00
Jan Möbius
03c35391ed Merge branch 'doc_update' into 'master'
Updated documentation of BaseKernel's property functions to hint at PropertyManager.



See merge request !90
2016-09-23 09:36:28 +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
Jan Möbius
90a75f0fb0 Merge branch 'BuildPythonWindows' into 'master'
Build python windows

Fixes a linker problem as well as issue #29.

See merge request !89
2016-09-16 13:18:39 +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
62efcd7688 Merge branch 'gcc_optimizer_bug' into 'master'
Added a little safeguard against GCC optimizer bug to CMakeLists.txt.



See merge request !88
2016-09-14 15:30:50 +02:00
Hans-Christian Ebke
2cb42c9d44 Added a little safeguard against GCC optimizer bug to CMakeLists.txt. 2016-09-14 12:11:21 +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
Jan Möbius
abed6fe99d Merge branch 'issue_32' into 'master'
Added unit test to trigger GCC alignment bug. See #32.

Merge this even if CI unit tests fail. Failed unit test expose a compiler bug.

See merge request !86
2016-09-13 18:46:00 +02:00
Hans-Christian Ebke
f38ce2ed5e Added unit test to trigger GCC alignment bug. See #32. 2016-09-13 17:59:30 +02:00
Jan Möbius
3a0726079d Merge branch 'propmgr' into 'master'
Propmgr

Added some more convenience to the PropertyManager class.

See merge request !85
2016-09-12 22:11:06 +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
Jan Möbius
ffba476751 Merge branch 'stlTypeCheck' into 'master'
Stl type check

implemented the suggested changes from #24 by checking stl files for the keyword solid instead of computing binary file size.
closes #24 

See merge request !83
2016-08-16 16:23:56 +02:00
Jan Möbius
9cdd56d90e Added changelog entry 2016-08-16 16:03:01 +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
Jan Möbius
b792b0c661 Merge branch 'changelog' into 'master'
Updated changelog for 6.3



See merge request !82
2016-08-15 11:32:19 +02:00
Jan Möbius
f6f78653a8 Updated changelog for 6.3 2016-08-15 11:10:10 +02:00
Jan Möbius
cbfc676c92 Merge branch 'warning' into 'master'
Fix undefined MSVC macro warning



See merge request !80
2016-08-15 10:59:35 +02:00
Jan Möbius
fc309bd690 Fixed changelog 2016-08-15 10:37:10 +02:00
Jan Möbius
b64ef6b56d Updated changelog 2016-08-15 10:34:52 +02:00
Alexander Dielen
c8c51626df Added link directories and log file. 2016-08-14 13:22:18 +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
Jan Möbius
1a96ae05f0 Merge branch 'circulator-gcc6-fix' into 'master'
fix CirculatorT type-pun warning on GCC6

fixes #28

See merge request !78
2016-08-11 12:12:47 +02:00
Janis Born
5ee25a5af0 fix CirculatorT type-pun warning on GCC6
(fixes #28)
2016-08-11 10:22:44 +02:00
Jan Möbius
cb5bc2b2b4 Merge branch 'fixhash' into 'master'
changed incorrect class into struct



See merge request !77
2016-08-03 12:57:36 +02:00