Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,492 Commits 1 Branch 0 Tags
c875cac5831595d043b4a774ca936e9aac5e0710
Commit Graph

1492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jan Möbius
13904a1516 Simplify reader 2016-01-06 14:26:06 +01:00
Martin Schultz
781063a3c6 * added texCoord3d functions to objloader 
* added unittest for texcoords3d
* added texcoord3d support to baseimporter
 2016-01-05 14:21:46 +01:00
Hans-Christian Ebke
8ece0770a3 Added a couple of methods to enable more efficient adding of batches of vertices. 2015-12-20 23:07:54 +01:00
Janis Born
f4046e4d58 fix some uses of const begin and end iterators 2015-12-17 14:36:23 +01:00
Jan Möbius
011fdc9700 Missing changelog entry 
(cherry picked from commit 53fca645a14b71a856654f26f6913faa0482b3eb)
 2015-12-17 09:53:55 +01:00
Jan Möbius
b18551f46d Prepare OpenMesh-5.1 for release 
(cherry picked from commit 1e8f0db6fa239f5221bd3d0d95c74a69aeb2a442)
 2015-12-17 09:52:24 +01:00
Jan Möbius
f405eff0ee Merge branch 'compiler_error_fix' into 'master' 
Compiler error fix

Closes #18 

See merge request !42
 2015-12-16 13:15:47 +01:00
Jan Möbius
9e3f43a6bf Workaround for strange compiler error on VS2015 Update 1 2015-12-16 10:57:15 +01:00
Jan Möbius
0aced4c8c2 Fixed signed unsigned warning 2015-12-16 10:50:19 +01:00
Jan Möbius
a8af889092 Merge branch 'cdt_fix' into 'master' 
Cdt fix



See merge request !40
 2015-12-16 10:07:29 +01:00
Hans-Christian Ebke
b64f04693d Modifying CirculatorRange slightly so that Eclipse CDT can parse it. 2015-12-15 17:57:43 +01:00
Hans-Christian Ebke
4290b62f90 Removing unused next_cache_count_ member of PolyConnectivity. 2015-12-15 17:57:22 +01:00
Jan Möbius
451c8f827d Updated changelog in 6.0 2015-12-15 16:11:51 +01:00
Jan Möbius
1ece1c441a Updated changelog in 5.1 
(cherry picked from commit 55d0874818ec67e4624443e9b850a95bc49db0e1)
 2015-12-15 16:09:31 +01:00
Jan Möbius
0cf33e922a Merge branch 'Python-Decimater' into 'master' 
Python decimater



See merge request !38
 2015-12-15 13:55:28 +01:00
Jan Möbius
3454c68872 Merge branch 'OM6.0-with-python' into 'master' 
Om6.0 with python

Merge with some disabled python tests in ci


See merge request !36
 2015-12-15 11:19:48 +01:00
Jan Möbius
512bc07f83 Use icecc for gcc builds on linux 2015-12-15 11:00:30 +01:00
Jan Möbius
4cfbfbf21e Disabled another non working config (gcc c++98) of python 2015-12-15 10:57:48 +01:00
Jan Möbius
e7e18077c4 Really disable the tests here 2015-12-15 10:32:16 +01:00
Jan Möbius
3d77917eef Disable python unittests for c++98 on mac 
(cherry picked from commit 180a55e885bf7569a91f05e6c9f0117a7e98e77e)
 2015-12-15 08:18:54 +01:00
Jan Möbius
74f0f23661 Merge branch 'iterator_increment' into 'master' 
Iterator increment



See merge request !35
 2015-12-15 08:09:56 +01:00
Jan Möbius
257299defb Merge branch 'OMWriterCrashFix' into 'master' 
fix crash in OMWriter when writing an empty mesh with colors

Writer accessed VertexHandle(0) for meshes with colors even when they had no vertices.

See merge request !34
 2015-12-15 08:08:52 +01:00
Hans-Christian Ebke
df2ac9e79a Merge branch 'master' of roosevelt.informatik.rwth-aachen.de:/OpenMesh/OpenMesh 2015-12-14 17:32:34 +01:00
Hans-Christian Ebke
d584941675 Added += operator to mesh iterators. 2015-12-14 17:32:25 +01:00