Commit Graph

83 Commits (324d89b76d4d4c8e165d2ca571ddf57135622dcd)

Author SHA1 Message Date
Evgeniy cd061a0957
Merge branch 'master' into stl_format_issue_2064 2018-07-25 18:38:59 +03:00
kimkulling 9a6b07e522 closes https://github.com/assimp/assimp/issues/1724: add default material access to the material API. 2018-07-25 15:11:24 +02:00
Власов Евгений 7d630e98da STLImporter::LoadBinaryFile add one child node to produce same scene structure as in STLImporter::LoadASCIIFile 2018-07-23 16:44:20 +03:00
CwTCwT 85b0026c92 issue_1973
added support for CustomData(Layer) to support multiple (texture) UV mappings
added unittest with sample model
2018-06-09 15:45:09 +02:00
Matthias Möller e761f13c80 does not access undefined memory area anymore.
This will fix some Debuggers, which throw an exception, when accessing out-of-bound memory
2018-05-24 12:07:05 +02:00
Alexandre Avenel 84739fda0a Fix #1970: stl with empty solid
Log warning instead of stopping whole import.
2018-05-19 23:19:36 +02:00
kimkulling 30c20eb5fc INtroduce new log macros. 2018-04-26 14:10:18 +02:00
JeffH-BMG cfd56a43a5
Fix compile error
Fixed bad cast.
2018-03-07 18:24:38 -05:00
JeffH-BMG 89a4cf9495
Respond to comments
Use memcpy() to read normals and vertices, to mitigate alignment issues, per comments.
2018-03-07 17:26:01 -05:00
JeffH-BMG 6fd64b95c3
Fix compile error
Add parens to use of 'sizeof' operator
2018-03-06 15:03:44 -05:00
JeffH-BMG 05cf8bfb2e
Fix import of binary STL files in double-precision builds
When ASSIMP_DOUBLE_PRECISION is used, the STL loader attempts to read 8-byte double vertex and normal values from the STL file. STL files are written using 4-byte floats, however, and the import will read past the end of the buffer, and possibly crash.
2018-03-06 13:48:11 -05:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Kim Kulling 81fbe2c7d3
Merge branch 'master' into issue_1660 2018-01-16 17:13:02 +01:00
Kim Kulling d230635ff6 STLLoader: closes https://github.com/assimp/assimp/issues/1660: use memcpy instead of a c-style dynamic cast to parse a aiVector3D 2018-01-16 16:31:15 +01:00
BuildTools 66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Kim Kulling 5822d1920e
Update STLLoader.cpp
Retrigger travis + appveyor.
2017-11-30 09:22:55 +01:00
Daniel Hritzkiv 67c236647d
Restore import of multi mesh binary STLs
Regression introduced in: 9a9f18bbed

This restores the behaviour for binary STLs with multiple bodies.

The code could be improved (to reuse code found at the end of LoadASCIIFile) but for now this is a quick fix
2017-11-29 11:20:09 -05:00
Alexandre Avenel eb452b28a2 Fix warning on MSVC14 2017-11-25 11:38:12 +01:00
Kim Kulling 30e06f7437 closes https://github.com/assimp/assimp/issues/216: check the area of a triangle to check if its degenerated or not. 2017-11-09 21:31:16 +01:00
Kim Kulling da7ce89ff2
Update STLLoader.cpp
add missing const.
2017-11-07 10:47:27 +01:00
Kim Kulling b87e7643d2
Update STLLoader.cpp
Fix memory-alignment bug.
2017-11-07 10:42:51 +01:00
Kim Kulling 9a9f18bbed closes https://github.com/assimp/assimp/issues/104: deal with more solids in one STL file. 2017-11-06 22:30:07 +01:00
Arkeon f84851e893 PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation
IFC :
 - update poly2tri to avoid crash on some IFC files

Collada :
 - manage missing texture reference in collada import
2017-06-02 13:48:57 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Kim Kulling ef540f46a3 Remove unused headers. 2017-02-22 17:20:26 +01:00
Jared Mulconry 58e0d8c261 Fixed build warnings on MSVC14 x64 in the STL format sources. 2016-11-27 13:32:44 +11:00
Giuseppe Barbieri b6fb1f3c05 Update STLLoader.cpp
If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning
2016-11-20 15:14:33 +01:00
Kim Kulling 02e038bbb6 Fix compiler warnings related to issue 957. 2016-11-03 18:37:02 +01:00
Chris Russ 05a6ee6473 Adding double precision import support for formats that can be exported 2016-07-16 18:23:33 +10:00
Kim Kulling 7207e5117c Use new include bracktes. 2016-06-06 22:04:29 +02:00
mensinda 5dacda0a08 replaced boost smart pointers with c++11 smart pointers 2016-04-05 23:23:53 +02:00
Eric Engestrom 87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Kim Kulling 6b1cac5743 Merge branch 'master' of https://github.com/assimp/assimp 2015-09-21 17:34:01 +02:00
Kim Kulling ca6296f609 STLLoader: mak functions local. 2015-09-21 17:33:41 +02:00
Kim Kulling 4afddf316f Merge pull request #632 from turol/afl-fixes
Random crash fixes
2015-08-14 16:13:54 +02:00
Andreas Henne ec43e08295 Fixed issue in STLLoader that lead to wrong node names. 2015-08-14 13:37:41 +02:00
Turo Lamminen e5ddb98dde STL: Fix another read past EOF 2015-08-14 11:53:13 +03:00
Andreas Henne 860360bd86 Fixed merge conflicts. 2015-08-13 11:06:22 +02:00
Turo Lamminen b39446b7bb Avoid reading past EOF when encountering a malformed STL file
Since IsSpaceOrNewLine returns true on '\0' we might try to read past
end of buffer on line 310. Add explicit check to avoid this.
2015-08-10 15:50:05 +03:00
Kim Kulling d8d64a8422 TLLoader: fix typo in comment. 2015-08-08 11:57:15 +02:00
Kim Kulling e794aaf017 STL-Loader: fix https://github.com/assimp/assimp/issues/103. 2015-08-08 10:55:10 +02:00
Andreas Henne 5030fe8c7e Formatting changes. 2015-08-06 13:37:16 +02:00
Andreas Henne 3fc56de33c Fixed merge conflicts. 2015-08-06 12:04:05 +02:00
Richard c69e047dfc Fixed: Initialize all members in STLImporter 2015-07-02 20:51:46 -06:00
Richard 83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Richard 4c1a0507fe Refactor: Line endings are LF, not CRLF 2015-06-28 15:59:33 -06:00
Kim Kulling 2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
abma bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00