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

113 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
b7aabbd912 Fixed some warnings 2016-10-24 14:01:06 +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
Jan Möbius
b4cea6008d Handle nr newlines 2016-05-30 16:12:38 +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
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
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
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
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
44800c3efc unify int8_t/signed char/char in ply reader and writer. 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1292 fdac6126-5c0c-442c-9429-916003d36597
 2015-06-18 13:17:51 +00:00
Matthias Möller
59b0cafecd - fix ply ascii reader with custom face properties which aren't declared as list 
- extend unittest for this case

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1284 fdac6126-5c0c-442c-9429-916003d36597
 2015-06-16 08:37:42 +00:00
Matthias Möller
324acba2f2 - load vertex color values as float in range of [0..1] instead of integers [0..255] 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1283 fdac6126-5c0c-442c-9429-916003d36597
 2015-06-11 14:20:16 +00:00
Matthias Möller
ed3155284c - move iostream from header to source files. 
- replace some iostreams to o/istreams only
- some minor include fixes

closes #2489

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1278 fdac6126-5c0c-442c-9429-916003d36597
 2015-06-09 08:58:41 +00:00
Matthias Möller
b74e1bd7d7 fix cppcheck 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1272 fdac6126-5c0c-442c-9429-916003d36597
 2015-06-01 13:23:45 +00:00
Matthias Möller
e1a72035c0 improve performance for small vectors/faces 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1269 fdac6126-5c0c-442c-9429-916003d36597
 2015-05-26 12:08:32 +00:00
Matthias Möller
d8d26b7c18 ply ascii reader: 
- add read support for custom list properties (vertices and faces)


closes #2370

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1268 fdac6126-5c0c-442c-9429-916003d36597
 2015-05-18 11:52:18 +00:00
Matthias Möller
beae0ffce3 extend "can_read" function. returns true, if no explicit filename is given, but just the extension. 
closes #2431

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1260 fdac6126-5c0c-442c-9429-916003d36597
 2015-05-06 14:08:32 +00:00
Jan Möbius
fd4bcb39ea Typo 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1258 fdac6126-5c0c-442c-9429-916003d36597
 2015-04-28 13:07:46 +00:00
Jan Möbius
07ad20793d Fixed bad typo in comment 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1257 fdac6126-5c0c-442c-9429-916003d36597
 2015-04-28 11:54:17 +00:00
Jan Möbius
0a4c1dc206 Get rid of the old ACGMakeFiles 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1253 fdac6126-5c0c-442c-9429-916003d36597
 2015-04-28 11:35:09 +00:00
Jan Möbius
83486e0b5f Relicense to BSD 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1252 fdac6126-5c0c-442c-9429-916003d36597
 2015-04-28 11:33:32 +00:00
Matthias Möller
53371f63e1 - fix crash, if obj file contains degenerated faces 
- added unittest for this case

closes #2382

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1236 fdac6126-5c0c-442c-9429-916003d36597
 2015-03-09 09:56:41 +00:00
Jan Möbius
8f9682f47e fix reading mtl files with texture only for obj files 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1222 fdac6126-5c0c-442c-9429-916003d36597
 2015-02-18 08:25:32 +00:00
Jan Möbius
b3778b230f Updated copyright headers 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1188 fdac6126-5c0c-442c-9429-916003d36597
 2015-01-05 15:34:10 +00:00
Matthias Möller
9680df9f63 add custom property support for PLY reader ASCII version 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1181 fdac6126-5c0c-442c-9429-916003d36597
 2014-10-24 08:52:07 +00:00
Jan Möbius
24bd7be273 Fixed several unused variables 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1150 fdac6126-5c0c-442c-9429-916003d36597
 2014-08-29 08:28:47 +00:00
Jan Möbius
5104bf5c42 Silence most readers/writers 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1053 fdac6126-5c0c-442c-9429-916003d36597
 2014-05-09 12:44:18 +00:00
Jan Möbius
48f18d6410 PLY Reader Fix: locking up when loading some binary files ( Thanks to Peter Newman for the patch) 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1042 fdac6126-5c0c-442c-9429-916003d36597
 2014-05-07 11:43:53 +00:00
Jan Möbius
68a3ff3136 The annual License Header Bump (Sorry for the rebuilds ;-) ) 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@990 fdac6126-5c0c-442c-9429-916003d36597
 2014-02-05 09:01:07 +00:00
Isaak Lim
733cb52240 fixed a bug in the STLReader where normals could be set for invalid face handles 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@963 fdac6126-5c0c-442c-9429-916003d36597
 2013-09-26 13:02:09 +00:00
Isaak Lim
b643b26f2d - the OpenMesh STLReader now also reads face normals if requested 
- added corresponding unittests
- removed duplicate code

closes #1719

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@962 fdac6126-5c0c-442c-9429-916003d36597
 2013-09-26 10:35:13 +00:00
Jan Möbius
5094916ff6 Bugfix : If bool property is written and conatins 0x20 in file, reader will fail (Thanks to Simon Flöry for the patch) 
Unittest: Added test case for this bug



git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@957 fdac6126-5c0c-442c-9429-916003d36597
 2013-09-17 13:09:19 +00:00