Jan Möbius
44c1de1bdc
Merge branch 'checked-iterators-fix' into 'master'
...
attempt to quench 'Checked Iterator' warnings in VS2015
See merge request !107
2016-11-08 14:45:31 +01:00
Jan Möbius
f846b75202
Typo
2016-11-08 12:27:32 +01:00
Janis Born
12ad76fccf
attempt to quench 'Checked Iterator' warnings in VS2015
2016-11-08 11:27:18 +01:00
Jan Möbius
22554e000a
Merge branch 'warnings_ok' into 'master'
...
Warnings ok
See merge request !105
2016-11-08 08:24:11 +01:00
Jan
8e81de4045
Fixed error with VS2013
2016-11-07 20:31:30 +01:00
Jan Möbius
dd91155f2c
Another cast
2016-11-07 15:33:20 +01:00
Jan Möbius
c1ad9f418c
Some casts
2016-11-07 15:23:49 +01:00
Jan Möbius
7175cd8c6d
Several warnings
2016-11-07 15:10:23 +01:00
Jan Möbius
79ce71f2d3
Another fix
2016-11-07 15:07:19 +01:00
Jan Möbius
aec2fa2442
Merge branch 'warnings' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh into warnings
2016-11-07 15:02:15 +01:00
Jan Möbius
74ada2eac0
Warning
2016-11-07 15:02:07 +01:00
Jan Möbius
d966d44a3f
More fixes including Unit tests
2016-11-07 14:52:07 +01:00
Jan Möbius
7bcc3ec1a9
Fixed typo
2016-11-07 14:31:54 +01:00
Jan Möbius
e75a70774d
Next bunch of warning fixes
2016-11-07 14:30:14 +01:00
Jan Möbius
85e183ae05
Fixed VS2015 warnings
2016-11-07 14:12:29 +01:00
Jan Möbius
bb75d7029f
Merge branch 'warn3' into 'master'
...
Warn3
See merge request !102
2016-10-28 15:01:14 +02:00
Jan Möbius
066272a58e
Warnings
2016-10-28 14:19:20 +02:00
Jan Möbius
01ab3eeff5
Warning
2016-10-28 14:07:08 +02:00
Jan Möbius
4fefc30f8c
Merge branch 'warn3' into 'master'
...
More warnings fixed
See merge request !101
2016-10-28 14:06:00 +02:00
Jan Möbius
4377803708
More warnings fixed
2016-10-28 10:44:04 +02:00
Jan Möbius
4dd321bbdd
Merge branch 'warn2' into 'master'
...
More warning fixes
See merge request !100
2016-10-28 10:31:21 +02:00
Jan Möbius
08160c1584
More warning fixes
2016-10-28 08:59:36 +02:00
Jan Möbius
00090fc282
Merge branch 'warn' into 'master'
...
Warn
See merge request !99
2016-10-28 08:49:47 +02:00
Jan Möbius
7a1cad003d
Typo
2016-10-28 08:08:09 +02:00
Jan Möbius
b05912ae04
Fixed ugly init
2016-10-27 14:46:57 +02:00
Jan Möbius
d767759862
Warning in subdivider fixed
2016-10-27 14:43:29 +02:00
Jan Möbius
f377c86a43
Merge branch 'fixOBJWriterMissingTexcoords' into 'master'
...
added code to write faceTexCoords to obj writer.
fixes #25
* Added accessor functions for HalfEdgeHandles and faceTexCoords to base exporter and exporter template.
* Added functionality to store FaceTexCoords to objwriter
* Added unittest to write and read faceTexcoords with a test obj file
See merge request !73
2016-10-27 14:31:59 +02:00
Jan Möbius
6f9589dc6f
Merge branch 'warnings' into 'master'
...
Warning fixed
See merge request !98
2016-10-24 17:59:56 +02:00
Jan Möbius
3183ac5364
Warning fixed
2016-10-24 16:34:05 +02:00
Jan Möbius
1430552372
Merge branch 'warnings' into 'master'
...
Fixed some warnings
See merge request !97
2016-10-24 15:08:53 +02:00
Jan Möbius
b7aabbd912
Fixed some warnings
2016-10-24 14:01:06 +02:00
Jan Möbius
0132a367b2
Disable caching for now
2016-10-21 14:42:52 +02:00
Jan Möbius
b2fa409f96
Merge branch 'invalid_handles' into 'master'
...
make all negative handles invalid, not just -1
Since opposite_halfedge_handle for a handle with idx -1 produces a handle with idx -2, it can be helpful to detect handles with -2 as index as invalid as well.
See merge request !96
2016-10-21 10:37:39 +02:00
Max Lyon
523e3e10f4
make all negative handles invalid, not just -1
2016-10-21 09:21:18 +02:00
Jan Möbius
2502b58649
Merge branch 'gilab_windows_ci' into 'master'
...
Gilab windows ci
Windows Ci via gitlab
See merge request !95
2016-10-19 13:44:24 +02:00
Jan Möbius
40eee2c850
Fixed missing commid id in name of build file
2016-10-19 12:50:18 +02:00
Jan Möbius
e9988fd62c
caching for windows builds
2016-10-19 12:39:23 +02:00
Jan Möbius
2f35b00a5e
Syntax error
2016-10-19 12:27:54 +02:00
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
