Jan Möbius
81928ddd07
Merge branch 'VS2015-fixes' into 'master'
...
Fix internal compiler error on VS2015
See merge request !56
2016-04-28 13:02:12 +02:00
Jan Möbius
254a4c9054
Initialize array of vectors on VS2015
2016-04-28 12:04:15 +02:00
Jan Möbius
78196aaaa2
Typo
2016-04-28 11:03:48 +02:00
Jan Möbius
909aa2b001
Updated cmake finders to work with flexible libs location on windows
2016-04-28 10:00:08 +02:00
Jan Möbius
3917bccea8
Split variables to seperate lines.
2016-04-28 09:39:31 +02:00
Jan Möbius
2cd4372420
Mark 5.2 release date
...
(cherry picked from commit dd91a7eaca8d080000306e2a0ea5801c619220a6)
2016-04-27 15:40:47 +02:00
Jan Möbius
00d533c24f
Merge branch 'ply_reader_omerr_fix' into 'master'
...
don't emit an error message for every face that could not be added (due to complex elements)
See merge request !55
2016-04-15 16:20:12 +02:00
Jan Möbius
1c85080a1e
- Updated changelog
...
- Always emit warning
2016-04-15 15:57:07 +02:00
Isaak Lim
6c6ce56c3c
don't emit an error message for every face that could not be added (due to complex elements)
2016-04-15 14:01:11 +02:00
Jan Möbius
17217c405d
Merge branch 'fixDoubleSwap' into 'master'
...
Fix double swap
See merge request !54
2016-04-14 15:42:24 +02:00
Jan Möbius
6c14c0fc5e
Updated changelog
2016-04-14 15:19:05 +02:00
Jan Möbius
9c91f3c987
Updated changelog
2016-04-14 15:13:49 +02:00
Jan Möbius
2496fa8363
Merge branch 'property-manager-factories' into 'master'
...
add factory functions for creating PropertyManagers without restating the mesh type in C++11
See merge request !53
2016-04-14 15:11:03 +02:00
Janis Born
4e2ae5be3e
create unit tests for C++11 PropertyManager features
2016-04-14 13:34:23 +02:00
Martin Schultz
0a0d7e1fad
fix c++98 compiler error on gcc
2016-04-14 13:06:17 +02:00
Martin Schultz
7e1d9e0c16
adds unittests for binary serialization of strings
2016-04-14 12:54:50 +02:00
Martin Schultz
e7ed1ca1e0
fixes #17 by removing the swap of len in string serialization specification
2016-04-14 12:52:21 +02:00
Jan Möbius
04a01c9e99
Merge branch 'fix-nonmanifold-no-collect' into 'master'
...
Not collecting failed faces but directly processing them
**Problem description:**
I encountered severe problems in my application because OpenMesh does not load attributes, such as face texture index, for failed faces (non-manifold geometry).
Instead of directly handling them, the Importer class defers the handling of failed faces to a post process - but at that point, the attribute information is not available any more, since it is read and applied in the reader, which only deals with the non-failed faces.
**Solution:**
My simple solution was to remove the list of failed faces and instead directly handle failed faces inside the "add_face" function of the Importer class.
**Discussion:**
I didn't see any drawback, compared to the previous code. It would be interesting to know why the list of failed faces was maintained - was this legacy code, or was there some idea to extend this concept, which was just never realized? The only functional point that has changed is that I removed the code that adds degenerate faces to the mesh (line 129), since, in my opinion, this makes things just more complicated for some applications, and the benefit of being able to import degenerate faces seems marginal. But that's a design decision, it will be very easy to encapsulate the code that adds a separate face (line 140) into a separate function and use it also for degenerate faces.
It would be great to receive your feedback on this issue, and to know if it is possible to include this change (or something similar).
See merge request !51
2016-04-14 10:56:45 +02:00
Jan Möbius
4918d2f353
Updated changelog
2016-04-14 10:36:10 +02:00
Janis Born
70d7ae8a79
add factory functions for creating PropertyManagers without restating the mesh type in C++11
2016-04-14 09:58:54 +02:00
Jan Möbius
eda7782a30
Merge branch 'property_iterator_test' into 'master'
...
Added check for property iterators
See merge request !52
2016-04-07 16:14:22 +02:00
Jan Möbius
697a205389
Added check for property iterators
2016-04-07 15:51:22 +02:00
Max Limper
532f64464a
Not collecting failed faces but directly processing them
2016-04-06 17:28:41 +02:00
Jan Möbius
6a045b5c5e
Obj writer: Fix OBJ writer bug file extension removal (Thanks to Katharina Breininger for the patch)
...
(cherry picked from commit 4cfe75788a5374978555322c596ecdea9909516a)
2016-04-05 15:44:34 +02:00
Jan Möbius
afc5101cc3
Decimater: Added missing preprocess collapse call in size_t DecimaterT<Mesh>::decimate(size_t _n_collapses) (Thanks to Andrej Ivanis for the hint)
...
(cherry picked from commit 0dee5a6199d278ff2fb4299cf2cef67ba16ded6e)
2016-04-05 15:04:09 +02:00
Jan Möbius
6fcad8806f
Merge branch 'performance_tuning' into 'master'
...
Added a couple of methods to enable more efficient adding of batches of vertices.
See merge request !44
2016-03-24 13:34:01 +01:00
Jan Möbius
2592f8322a
Updated Changelog
2016-03-24 13:10:28 +01:00
Hans-Christian Ebke
00101c13e0
Merge remote-tracking branch 'origin/master' into performance_tuning
2016-03-24 12:59:35 +01:00
Hans-Christian Ebke
3868b351ec
Added a whole bunch of doxygen documentation.
2016-03-24 12:58:43 +01:00
Jan Möbius
7fffd773c8
Correctly merge Docs for 5.2
2016-03-23 13:46:45 +01:00
Jan Möbius
434a0ed1c6
Merge branch 'obj_mat_file' into 'master'
...
Fix OBJ material files and face color (Thanks to Sven-Kristofer Pilz for the patch)
closes #20
See merge request !50
2016-03-23 13:45:56 +01:00
Jan Möbius
57c0ec08df
Updated 5.2 Docu
2016-03-23 13:42:06 +01:00
Jan Möbius
30d88d0694
Updated 5.2 changelog
...
(cherry picked from commit 732bb63748e5a4a6622d3a0826815e393ae081c2)
2016-03-23 13:09:10 +01:00
Jan Möbius
284826f886
Merge branch 'drop_vectordimensionst' into 'master'
...
drop VectorDimensionsT metaprogram in favor of vector_traits
(thanks to Marco Centin and Amodio Pesce)
See merge request !49
2016-03-21 08:11:17 +01:00
Janis Born
b1a7d43a83
drop VectorDimensionsT metaprogram in favor of vector_traits
...
(thanks to Marco Centin and Amodio Pesce)
2016-03-17 18:29:55 +01:00
Jan Möbius
1518f073b0
Updated 5.2 changelog
...
(cherry picked from commit 0093646b3692474d91c15c66d833a9280faa70f8)
2016-02-12 12:02:05 +01:00
Jan Möbius
7f7d751ef5
Merge branch 'PLYNewlineFix' into 'master'
...
Fixed CR LF newline handling for binary file headers.
The PLYReader did not handle CR LF newlines correctly, which caused it to read the vertex data 2 bytes too early.
See merge request !48
2016-02-12 12:00:04 +01:00
Jan Möbius
44cb2ebc4d
Fix OBJ material files and face color (Thanks to Sven-Kristofer Pilz for the patch)
2016-02-11 14:49:44 +01:00
Alexander Dielen
04fc8dac85
Fixed CR LF newline handling for binary file headers.
2016-02-11 14:04:52 +01:00
Jan Möbius
d43d7d2148
Updated changelog of 6.0 branch
2016-02-04 10:00:15 +01:00
Jan Möbius
ea1ee2fd69
Updated cmake finder to include possible OpenMesh-5.2
2016-02-04 10:00:01 +01:00
Jan Möbius
74bf0672c6
Updated changelog for 5.2
...
(cherry picked from commit 81e091decf29955afb8e118c496fb82e8f93989c)
2016-02-04 09:55:56 +01:00
Jan Möbius
cee7b56f5e
Fixed ugly typo in __decrement function of Basehandle. Seems to be unused in the rest of the code.
2016-02-04 09:40:23 +01:00
Jan Möbius
cd777c7b6b
Fixed order of smoother parameters in the documentation. (Thanks to Takashi Michikawa for the info).
...
(cherry picked from commit af50ec1e51b981f73efcd23c19b1c9ac762f646f)
2016-01-29 09:11:12 +01:00
Jan Möbius
c5cfef8742
Fixed Typo in cmake install for smoother (Thanks to Takashi Michikawa for the fix).
2016-01-29 08:50:21 +01:00
Jan Möbius
c486588e22
Merge branch 'PythonMemory' into 'master'
...
fixed dangling pointer
See merge request !46
2016-01-18 15:09:13 +01:00
Alexander Dielen
1d043197b1
fixed dangling pointer
2016-01-13 13:58:48 +01:00
Hans-Christian Ebke
63985edd59
Fixed allocation bug.
2016-01-08 00:49:04 +01:00
Jan Möbius
0908ea2a9e
Merge branch 'featureOBJReader3dTexcoords' into 'master'
...
texcoord3d support for obj loader
closes #19
unfortunately the other supported file formats dont seem to support 3d texture coords.
as for ply the naming of elements is not defined and therefore arbitrary
as for off and om these formats seem to only support 2d texcoords
stl seems to not support texcoords at all
See merge request !45
2016-01-06 14:51:32 +01:00
Jan Möbius
a083490336
Merge branch 'const-iterator-fixes' into 'master'
...
fix some uses of const begin and end iterators
See merge request !43
2016-01-06 14:27:34 +01:00