Commit Graph

1476 Commits

Author SHA1 Message Date
Jan Möbius
a8791d1116 Updated changelog for 5.0 release 2015-11-18 13:06:20 +01:00
Jan Möbius
5acdcd9698 Ignore .project file 2015-11-18 13:05:47 +01:00
Jan Möbius
a45c7f2508 Merge branch 'vectort-ctor-fix' into 'master'
fix generic VectorT ctor for non float-convertible scalar types



See merge request !22
2015-11-17 14:44:24 +01:00
Janis Born
11c9946934 fix generic VectorT ctor for non float-convertible scalar types 2015-11-17 11:37:23 +01:00
Jan Möbius
2ddafd43eb Merge branch 'fix-clang-warnings' into 'master'
C++11: Fixed clang warning about missing braces.

closes #8 

See merge request !21
2015-11-12 18:25:11 +01:00
Hans-Christian Ebke
706b065593 C++11: Fixed clang warning about missing braces. 2015-11-12 15:52:49 +01:00
Jan Möbius
89273cb1d6 Merge branch 'cpp11-tests-on-mac' into 'master'
Test Builds with c++11 on mac



See merge request !20
2015-11-11 15:40:04 +01:00
Jan Möbius
b8460a7a1c Test Builds with c++11 on mac 2015-11-11 15:12:19 +01:00
Jan Möbius
4f0f4a9c53 Merge branch 'warnings-fixed' into 'master'
Fixed warnings in unit tests due to unused variables

Fixed Warnings in Unittests

See merge request !19
2015-11-11 14:52:10 +01:00
Jan Möbius
146109f6b2 Merge branch 'gitlab-ci-mac' into 'master'
Gitlab ci mac



See merge request !18
2015-11-11 14:52:01 +01:00
Jan Möbius
f9a945e1f6 Wrong file syntax 2015-11-11 14:49:39 +01:00
Jan Möbius
1acaf2c829 Wrong file syntax 2015-11-11 14:48:36 +01:00
Jan Möbius
0650d3d711 Use right runners to run jobs 2015-11-11 14:46:24 +01:00
Jan Möbius
bbf51e4cc2 Fixed warnings in unit tests due to unused variables 2015-11-11 14:43:32 +01:00
Jan Möbius
74853ead74 Removed unnacessary line 2015-11-11 14:34:33 +01:00
Jan Möbius
e2ef88eed9 Restrict to right OS 2015-11-11 14:34:00 +01:00
Jan Möbius
0692bc49e9 always export path 2015-11-11 14:31:32 +01:00
Jan Möbius
6d6b02680c First version for mac gitlab-ci integration 2015-11-11 14:30:00 +01:00
Jan Möbius
87a4e1f672 Merge branch 'Gitlab-CI-tests' into 'master'
Gitlab ci tests

Enable gitlab ci on master

See merge request !17
2015-11-11 12:37:29 +01:00
Jan Möbius
d3cf43c2a9 Merge branch 'changelog' into 'master'
Switched Release version to 5.0 and updated changelog

Release Version switch
Updated Changelogs

See merge request !16
2015-11-11 12:36:52 +01:00
Jan Möbius
203d37a238 Made script executable 2015-11-11 10:11:40 +01:00
Jan Möbius
e64cc5cbfe First runner test 2015-11-11 10:02:42 +01:00
Jan Möbius
4b322f792c Switched Release version to 5.0 and updated changelog 2015-11-11 09:13:10 +01:00
Jan Möbius
7a2f97104b Merge branch 'cpp11' into 'master'
Cpp11



See merge request !15
2015-11-11 08:39:18 +01:00
Hans-Christian Ebke
0d619f33d3 C++11: Create version of homogenized() for C++11 branch (without macros). 2015-11-10 16:08:53 +01:00
Hans-Christian Ebke
dfcc98c845 C++11: Do CMake-less C++11 checking. 2015-11-10 15:00:19 +01:00
Hans-Christian Ebke
d147b6cf66 C++11: Enable c++11 support when building as part of OpenFlipper. 2015-11-09 23:06:47 +01:00
Hans-Christian Ebke
dda4b41cac C++11: Got rid of narrowing conversion warnings in legacy code.
Added explicit static_cast along with static SFINAE checks to VectorT
constructor.
2015-11-09 22:55:42 +01:00
Hans-Christian Ebke
26914cba92 C++11: Legacy incompatibility fixes for VectorT C++11 features. 2015-11-09 21:21:19 +01:00
Hans-Christian Ebke
c2c627ed4d C++11: Added _htmlColor literal operator.
Allows inline specification of colors in HTML syntax.
2015-11-09 18:51:00 +01:00
Hans-Christian Ebke
97ccb1d641 Modernized VectorT constructors in C++11 branch.
* Less redundancy.
* We can now make some of the VectorT constructors constexpr which is
useful for other features.
2015-11-09 18:46:39 +01:00
Hans-Christian Ebke
d85fe40f59 Added build support for C++11.
FindCXX11.cmake copied from OpenFlipper.
2015-11-09 18:04:43 +01:00
Alexander Dielen
016848f102 Exposed the progressive mesh module. 2015-11-05 18:20:02 +01:00
Jan Möbius
0cd8fcb358 Merge branch 'CalcFaceNormal' into 'master'
implement more robust algorithm for surface normal computation

improved algorithm with Newell's Method

proposal to fix issue #7 ?

See merge request !14
2015-11-04 15:03:37 +01:00
Christopher Tenter
2e709ae103 implement more robust algorithm for surface normal computation 2015-11-03 21:27:28 +01:00
Alexander Dielen
04662a96d5 Exposed parts of the decimater framework. 2015-11-03 14:09:21 +01:00
Jan Möbius
ea7d9ca510 Merge branch 'template_StatusT_bugfix' into 'master'
Changed order of typedefs



See merge request !13
2015-10-27 14:09:34 +01:00
Jan Möbius
fa57b1de63 Changed order of typedefs 2015-10-27 14:07:51 +01:00
Jan Möbius
bb740e72ff Merge branch 'changelog' into 'master'
Updated changelog



See merge request !12
2015-10-27 10:50:24 +01:00
Jan Möbius
f7ac0d937f Updated changelog 2015-10-27 10:49:46 +01:00
Jan Möbius
99e84eb749 Fixed strange mergwe conflict
Merge branch 'ReintroduceStatusSets'

Conflicts:
	src/OpenMesh/Core/Mesh/ArrayKernel.hh
2015-10-27 10:45:00 +01:00
Martin Marinov
acce6af3c0 Some minor changes to the StatusSet<> docs. 2015-10-23 17:45:29 +01:00
Martin Marinov
552598141c Fixed the most obvious issues with StatusSeT<> and its derivatives. Improved slightly the formatting and added a few lines documentation. 2015-10-23 17:19:06 +01:00
Jan Möbius
9634b917ec Merge branch 'Efficiency_opposite_halfedge_handle' into 'master'
Efficiency opposite halfedge handle



See merge request !10
2015-10-23 13:44:42 +02:00
Jan Möbius
6fc135e692 Removed from this branch
Revert "Revert "remove dead code" aka Reintroduce status set"

This reverts commit 6afadfbd4c.
2015-10-23 11:54:57 +02:00
Jan Möbius
f5d2560656 More efficient implementation of opposite_halfedge handle
Old code compiled to
   0x00000000004594a0 <+0>:    lea    -0x1(%rsi),%edx
   0x00000000004594a3 <+3>:    lea    0x1(%rsi),%eax
   0x00000000004594a6 <+6>:    and    $0x1,%esi
   0x00000000004594a9 <+9>:    cmovne %edx,%eax
   0x00000000004594ac <+12>:    retq

New code creates
   0x00000000004594a0 <+0>:    mov    %esi,%eax
   0x00000000004594a2 <+2>:    xor    $0x1,%eax
   0x00000000004594a5 <+5>:    retq

So no conditionals, jumps and fewer instructions

closes #5
2015-10-23 10:25:47 +02:00
Jan Möbius
6afadfbd4c Revert "remove dead code" aka Reintroduce status set
This reverts commit c5d03587cc.
2015-10-23 08:22:25 +02:00
Jan Möbius
71f5eab5dc Merge branch 'Changelog' into 'master'
Changelog



See merge request !8
2015-10-01 16:48:26 +02:00
Jan Möbius
0c4e7099c5 Merge branch 'bugVvrange' into 'master'
Bug vvrange

The bug is now fixed and checked by unittests.

See merge request !7
2015-10-01 16:47:37 +02:00
Jan Möbius
1f8cfdeb27 Updated changelog 2015-10-01 16:46:25 +02:00