Commit Graph

204 Commits

Author SHA1 Message Date
Jan Möbius
da1ec03c6e OM Writer: Added Mark to the format header to identify end of stream correctly (Thanks to Jamie Kydd for the patch) 2016-12-27 08:10:10 +01:00
Jan Möbius
dc79c22a24 Fixed OMWriter when no faces are available (Thanks to Jamie Kydd for the patch) 2016-12-19 13:24:23 +01:00
Jan Möbius
3b0ee9316d Use static casts 2016-12-08 09:49:41 +01:00
Max Lyon
5cd9448a4e size_t int warning 2016-12-07 17:33:14 +01: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
b7aabbd912 Fixed some warnings 2016-10-24 14:01:06 +02:00
David Bommes
e11f553c92 added missing ifdef for debug 2016-10-17 17:43:48 +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
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
Max Limper
f53429fdeb Fixed broken indices for some cases of OBJ parsing by using two passes 2016-08-30 17:25:48 +02:00
Martin Schultz
2e6820a16b added binary stl file size check after ascii check 2016-08-16 15:06:19 +02:00
Martin Schultz
cc37345556 added include for cstring which should fix compile errors with c++11 and clang 2016-08-15 17:27:55 +02:00
Martin Schultz
fc04bac1a1 made the stl reader check for ascii file keyword instead of computing binary size 2016-08-15 17:14:25 +02:00
Martin Schultz
80192d945b added code to write faceTexCoords to obj writer.
fixes #25
2016-06-29 16:58:59 +02:00
Jan Möbius
984239ade2 Merge branch 'PLY_READER_handle_rn_newlines' into 'master'
Handle nr newlines



See merge request !71
2016-05-30 16:31:05 +02:00
Jan Möbius
1ab77e166b Merge branch 'Throw_error_when_no_readers_are_available' into 'master'
Throw error when no readers are available



See merge request !69
2016-05-30 16:27:53 +02:00
Jan Möbius
2822bb61a3 Add plain stl extension to stlwriter 2016-05-30 16:19:55 +02:00
Jan Möbius
b4cea6008d Handle nr newlines 2016-05-30 16:12:38 +02:00
Jan Möbius
5903657e6a Throw error when no readers are available 2016-05-30 14:07:11 +02:00
Jan Möbius
bca37d9653 Fixed binary reader errors in ply reader. (Thanks to Michael Kremer for the patch). 2016-05-17 13:15:29 +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
Martin Schultz
e7ed1ca1e0 fixes #17 by removing the swap of len in string serialization specification 2016-04-14 12:52:21 +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
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
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
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
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
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
Martin
f28aa26ab2 closes #1
refs !1
*changed the static variables to be common variables.
If one opens a lot of files, using thread local could be an alternative as long as the compiler supports it.
2015-09-14 13:26:19 +02:00
Martin Schultz
2dce1916c5 * made STLReader reuse stringstreams 2015-09-11 15:41:16 +02:00
Martin Schultz
ebd5180a8f * made OBJReader reuse stringstream objects.
Should speedup Reading on MS Windows especially with lots of materials.
2015-09-11 14:47:02 +02:00
Martin Schultz
c9180795bb * made Stringstreams in offReader static and reuse them to save performance 2015-09-11 14:34:01 +02:00
Matthias Möller
2ef38f79d8 remove unnecessary c headers
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1333 fdac6126-5c0c-442c-9429-916003d36597
2015-08-28 10:36:32 +00:00
Matthias Möller
000c8ff18e fix use OM double_t instead of c standard
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1332 fdac6126-5c0c-442c-9429-916003d36597
2015-08-28 09:57:43 +00:00
Matthias Möller
fe86a44c1d add custom property (with pod data type) support for binary ply files
closes #2496

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1331 fdac6126-5c0c-442c-9429-916003d36597
2015-08-28 09:20:26 +00:00
Matthias Möller
e9290b468d remove redundant code
refs #2525

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1330 fdac6126-5c0c-442c-9429-916003d36597
2015-08-21 12:44:24 +00:00
Matthias Möller
0741377b89 remove redundant code
refs #2525

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1328 fdac6126-5c0c-442c-9429-916003d36597
2015-08-21 12:31:54 +00:00
Matthias Möller
b6c10de490 loaded properties are presistant per default
refs #2504

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1325 fdac6126-5c0c-442c-9429-916003d36597
2015-08-03 13:06:58 +00:00
Matthias Möller
e663fb9bac fix crash when saving a mesh and a custom property was removed before
extend unittest for this case

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1323 fdac6126-5c0c-442c-9429-916003d36597
2015-07-28 18:16:16 +00:00
Jan Möbius
be465673e6 Fixed bad enum
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1318 fdac6126-5c0c-442c-9429-916003d36597
2015-07-26 20:22:28 +00:00
Matthias Möller
fbda5f8687 change type int8_t to signed char from type char
closes #2499

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1305 fdac6126-5c0c-442c-9429-916003d36597
2015-07-08 08:16:59 +00:00