Commit Graph

2544 Commits (ad80f97930473c9664d083e1a1529e617e65e296)

Author SHA1 Message Date
Andy Maloney b64882f4c7 Fix spelling 2017-04-11 16:33:13 -04:00
Amit Cirt 9fc7f72b55 fix line breakes in obj files 2017-04-11 17:16:18 +03:00
Guillaume Bittoun 0e3956caf1 Compilation fix: Removing the vector4 headers from code/CMakeLists.txt 2017-04-08 23:25:39 +02:00
Kim Kulling 2825d2daf8 Merge branch 'master' of https://github.com/assimp/assimp 2017-04-07 17:50:20 +02:00
Kim Kulling 38fab5ae8e doc updatedoc update 2017-04-07 17:46:53 +02:00
Maarten Heremans 8f3aaa88f9 Fixed compiler error on clang 4.0 running on OSX
glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
      (aka 'aiVector3t<float> *') and 'int')
                if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
2017-04-03 11:07:43 +02:00
Andre Schulz 0f6782df27 Fix PDB file installation in RelWithDebInfo configuration 2017-04-01 16:03:01 +02:00
Kim Kulling 6d71e4d5d7 Config.h.in: fix typo. 2017-03-29 21:08:40 +02:00
Kim Kulling 1ab85f16ff Merge pull request #1217 from Kai-W/master
Added ComponentType Unsigned int and Error handling
2017-03-28 17:06:06 +02:00
Kim Kulling 8accf5b386 3MF: reformattings. 2017-03-28 00:35:56 +02:00
Kai Westerkamp 6c73cc8aff Added ComponentType Unsigned int and Error handling
Part of GLTF 2.0 changes
2017-03-27 17:22:49 +02:00
Kim Kulling 1c525a9365 Merge pull request #1208 from terziman/master
Added parameters to IFC importer to control tessellation
2017-03-22 20:08:21 +01:00
rmitton d1c7d905e8 Fixed infinite loop on non-manifold geometry
Geometry that had strange non-manifold faces could cause the normal
calculation to enter an infinite loop. Instead we now correctly detect
which faces to scan over.
2017-03-19 13:46:23 -07:00
rmitton 209e972762 Fixed faceted normals in SIB importer. 2017-03-18 14:52:48 -07:00
Leo Terziman bf2e2f7537 Extended support for tessellation parameter to more IFC shapes 2017-03-17 14:55:18 +01:00
Leo Terziman d4ead31c18 Merge remote-tracking branch 'github/master' into contrib 2017-03-17 12:13:52 +01:00
Leo Terziman 9ef234b842 Added parameter to control cylindrical shapes tessellation
+ renamed smoothing angle parameter for better user understanding
2017-03-17 11:58:50 +01:00
Leo Terziman fff0e886a1 Fixed bug in IFC openings when curmesh.vertcnt is empty 2017-03-17 11:53:36 +01:00
Kim Kulling 2cd6c3d755 Closes https://github.com/assimp/assimp/issues/1128: do not use non
verbose format flag for import.
2017-03-14 19:01:41 +01:00
Kim Kulling bb7f387bcf Merge branch 'master' of https://github.com/assimp/assimp 2017-03-11 22:13:48 +01:00
Kim Kulling 1c6145b39e Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api 2017-03-11 18:19:36 +01:00
Kim Kulling b47bfeb0d7 StringUtils: add the right missing header. 2017-03-11 17:25:34 +01:00
Kim Kulling 6179e22749 StringUtils: add missing include for VS2012 & 2013 2017-03-11 11:34:23 +01:00
Leo Terziman 8bc183182c Added new option to IFC importer to control tessellation angle
+ removed unused IFC option
2017-03-10 14:42:17 +01:00
Kim Kulling b725d7dbf5 Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes 2017-03-08 10:27:57 +01:00
Kim Kulling 3bd9efa82c Cleanup_includes: fix linux build. 2017-03-08 09:55:44 +01:00
Kim Kulling 8d27945619 Merge branch 'master' into cleanup_includes 2017-03-05 15:15:29 +01:00
Kim Kulling e6dcad384a Fix missing includes. 2017-03-05 15:05:40 +01:00
Shin-ya Murakami ffc95162ec fix for FreeBSD 2017-03-01 16:30:03 +09:00
Kim Kulling a38b2fb10f Merge pull request #1191 from Lugdunum3D/feature-importers-whitelist
Allow to enable importers in a whitelist manner
2017-03-01 00:34:10 +01:00
Kim Kulling 9a0a74ef1f Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip
Fix buildsystem minizip
2017-03-01 00:15:12 +01:00
Kim Kulling 574c192575 Merge pull request #1186 from astillich/ase_cface
Fixed parsing ASE MESH_CFACE
2017-03-01 00:12:12 +01:00
Kim Kulling f312d8709e More cleanup 2017-02-28 16:37:07 +01:00
Antoine Bolvy 5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ 2017-02-28 11:44:04 +09:00
Antoine Bolvy d77989088c Allow to enable importers in a whitelist manner 2017-02-28 11:42:53 +09:00
Antoine Bolvy 4495162f5f Fix new lines problem 2017-02-27 18:34:04 -05:00
Kim Kulling 7a47f1f8f7 Issue-1183: add stp to the list of supported extensions for step-files. 2017-02-27 20:11:59 +01:00
Alexander Stillich 0700dfe711 Fixed parsing ASE MESH_CFACE 2017-02-25 23:30:41 +01:00
Kim Kulling 5e2c846ca0 Remove unused header. 2017-02-22 17:22:23 +01:00
Kim Kulling ef540f46a3 Remove unused headers. 2017-02-22 17:20:26 +01:00
Kim Kulling a75fa44bde PLY: prepare bugfix by adding missing unittest. 2017-02-11 14:19:34 +01:00
Kim Kulling 615bdb27d9 Closes https://github.com/assimp/assimp/issues/1102: update Version.cpp 2017-02-11 13:49:48 +01:00
Kim Kulling 6ed1f7570e Merge branch 'master' of https://github.com/assimp/assimp 2017-02-05 19:30:11 +01:00
Kim Kulling 31bb9f7ba6 Obj: fix code review findings. 2017-02-04 18:32:04 +01:00
Kim Kulling 11e2ca173d Fix the build. 2017-02-04 18:15:50 +01:00
Kim Kulling 692fb216f7 closes https://github.com/assimp/assimp/issues/809: add vertex color
export support.
2017-02-04 14:51:23 +01:00
Kim Kulling f9fa95a7c2 Obj-Importer: fix crash when updating the current mat-index: use correct
index.
2017-02-01 20:11:12 +01:00
Kim Kulling bfb6eb317c Merge pull request #1160 from NolaDonato/materialindex
OBJParser: set material index when changing current material
2017-02-01 18:42:16 +01:00
nola.donato@samsung.com e28b5422e0 OBJ: check for null mesh before updating material index
Sometimes the current mesh is null, should check before updating the material index

Submitted by: Nola Donato nola.donato@samsung.com
2017-01-31 16:40:04 -08:00
nola.donato@samsung.com fc4243a08f OBJParser: set material index when changing current material
When a new material is parsed from the material library, the name of the current material is set but the old material index remains. This leaves an incorrect material index in the current mesh causing textures to not be associated with the right mesh. This patch updates the material index when changing the material name.

submitted by: Nola Donato nola.donato@samsung.com
2017-01-30 20:32:37 -08:00