Alexander Dielen
1d043197b1
fixed dangling pointer
2016-01-13 13:58:48 +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
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
Janis Born
f4046e4d58
fix some uses of const begin and end iterators
2015-12-17 14:36:23 +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
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
0cf33e922a
Merge branch 'Python-Decimater' into 'master'
...
Python decimater
See merge request !38
2015-12-15 13:55:28 +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
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
Max Lyon
d0033f9966
fix crash in OMWriter when writing an empty mesh with colors
2015-12-14 11:55:28 +01:00
Jan Möbius
8fba53c0f1
Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh
2015-11-30 13:22:03 +01:00
Jan Möbius
db78a51f41
Updated master version to 6.0
2015-11-30 13:21:56 +01:00
Jan Möbius
688973ebb8
Missing memory include in python bindings
...
(cherry picked from commit d4a361aa61d014c97ff540c1145a709c158f6c25)
2015-11-30 13:14:33 +01:00
Jan Möbius
585298cff2
2 missing includes of cstring
2015-11-30 12:20:59 +01:00
Martin
e6967dfe8b
reduced includes by means of static code analysis
2015-11-30 09:48:42 +01:00
Jan Möbius
fbf2469143
Merge branch 'staticc-eh' into 'master'
...
Added static versions of ArrayKernel::edge_handle and ...::halfedge_handle.
See merge request !30
2015-11-26 13:11:54 +01:00
Hans-Christian Ebke
3fe3657bc8
Added static versions of ArrayKernel::edge_handle and ...::halfedge_handle.
2015-11-26 13:01:53 +01:00
Janis Born
3b5364d3e4
take VectorT argument by reference for non-member vector scalar multiplication ( fixes #12 )
2015-11-26 12:46:08 +01:00
Jan Möbius
0a35e4d2b9
Merge branch 'vectort-python-compat'
2015-11-26 12:31:46 +01:00
Jan Möbius
d8d641b9f5
Missing destination
2015-11-26 12:21:50 +01:00
Jan Möbius
56e486a386
Missing dll when building debug and release package
2015-11-26 12:21:13 +01:00
Jan Möbius
b1d1676bde
Merge branch 'master' into vectort-python-compat
2015-11-25 16:16:19 +01:00
Janis Born
d5612f16a0
Python bindings: add C++11 compilation switch for cross product
2015-11-25 15:30:57 +01:00
Janis Born
4ef152ac2e
Python bindings: move definition of dot product to generic implementation
2015-11-25 15:16:41 +01:00
Jan Möbius
6b24398fbc
Merge branch 'VS2015_test' into 'master'
...
Try to get c++11 on visual studio 2015
See merge request !26
2015-11-25 15:03:51 +01:00
Janis Born
b8d304a453
use correct ifdefs for VS2015
2015-11-25 14:53:00 +01:00
Janis Born
4c609dc6e2
brace style
2015-11-25 14:53:00 +01:00
Janis Born
baf0efd646
implement member and non-member swap for VectorT
2015-11-25 14:53:00 +01:00
Janis Born
32d46c239a
fix linker error
2015-11-25 14:42:37 +01:00
Janis Born
265ff391e8
fix c++98 compatibility for Python bridge to VectorT
2015-11-25 14:17:06 +01:00
Jan Möbius
f907bd9bd5
Switch all checks for c++11 to support vs2015
2015-11-25 13:55:19 +01:00
Janis Born
e36051d571
brace style
2015-11-25 11:21:38 +01:00
Janis Born
d5e6d413f3
implement member and non-member swap for VectorT
2015-11-25 11:19:53 +01:00
Jan Möbius
1b3c350efb
Get changes from master for this branch to test cpp11 stuff
...
Merge branch 'master' into VS2015_test
2015-11-25 09:47:51 +01:00
Hans-Christian Ebke
ec8936bfa6
Introduce ArrayKernel::clean_keep_reservation().
2015-11-24 01:45:44 +01:00
Hans-Christian Ebke
201dee45fb
HeapT: New optimization should compile in C++98 as well...
2015-11-23 21:16:34 +01:00
Hans-Christian Ebke
422b3dc62e
Tweaks to HeapT.hh.
2015-11-23 20:50:48 +01:00
Jan Möbius
3723088081
Fixed template >> missing space
2015-11-23 17:00:06 +01:00
Jan Möbius
a1ccdd69f8
Merge branch 'vec2_issues' into 'master'
...
Vec2 issues
See merge request !25
2015-11-23 16:48:43 +01:00
Jan Möbius
509f62e118
Try to get c++11 on visual studio 2015
2015-11-23 15:54:22 +01:00
Janis Born
8488f4ac53
use C++98-compatible template brackets
2015-11-23 15:37:14 +01:00
Janis Born
4c9a6ba5a4
add VectorDimensionsT metaprogram to detect vector dimensions in C++98
2015-11-23 15:33:14 +01:00
Janis Born
b31589b15f
fall back to dummy implementation for calc_face_normal on meshes with non-3D points
2015-11-23 15:03:57 +01:00
Janis Born
de46a56b75
add .gitignore entries for junk files generated by running unit tests
2015-11-23 12:30:16 +01:00
Janis Born
cf54f40e3e
implement VectorT in-place arithmetic operators based on Scalar in-place arithmetic operators
2015-11-23 12:25:07 +01:00
Janis Born
4e9330a87d
add unit tests for basic vector arithmetic
2015-11-23 12:22:11 +01:00
