Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,046 Commits 19 Branches 43 Tags
f93ee9daced8e77227bdeba50fffd5e596eabe99
Commit Graph

3479 Commits

Author SHA1 Message Date
Kim Kulling
f93ee9dace closes https://github.com/assimp/assimp/issues/1780: check against nullptr before accessing normal data in aiMesh instance. 2018-05-12 08:10:26 +02:00
Kim Kulling
ef605fecaa FBX: small optimization to avoind static computation in loop. 2018-05-12 08:09:27 +02:00
Kim Kulling
c08614bbff closes https://github.com/assimp/assimp/issues/919: add missing cast for vs2015. 2018-05-10 09:44:31 +02:00
Diego Lopes
700c85bbfb _stat64 doesn't seem to exist. use __stat64! 
Merely add an extra _ to the type name...
 2018-05-08 13:01:56 -04:00
Kim Kulling
f92d4edced Merge branch 'master' into patch-1 2018-05-08 10:22:14 +02:00
Kim Kulling
948cf4d3cc Merge branch 'master' into master 2018-05-07 21:32:13 +02:00
A. Breust
50c5f3cb58 Fixes DXF loader false positive on FBX file 
A binary FBX file can have an header section `FBXHeaderVersion` which starts around the 70th byte.
Therefore, the token check for DXF file was hitting true because the `SearchFileHeaderForToken` is case insensitive.
We limit the scope of the token search to the first 32 bytes.
 2018-05-07 15:16:32 +02:00
Kim Kulling
be0203229b Merge branch 'master' into master 2018-05-06 16:41:12 +02:00
Kim Kulling
36c6ce7431 Merge branch 'master' into master 2018-05-06 12:29:21 +02:00
Eugene Barnett
908ef3e44a 1740 Issue - Enabling and Disabling importers 
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)

-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
 2018-05-05 16:57:59 -04:00
Nicholas Woodfield
458a7ae801 Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool. 2018-05-03 15:03:14 -04:00
Kim Kulling
b759aa63a0 Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2 2018-05-03 20:33:50 +02:00
Alexis Breust
4aaf7ad547 Added name to nodes 2018-05-03 11:07:39 +02:00
LoicFr
a5791b66fe Merge branch 'master' into master 2018-05-02 17:47:32 +02:00
LoicFr
99139e9c9e Merge branch 'master' into master 2018-05-02 17:11:54 +02:00
kimkulling
a0bf664695 closes code/SortByPTypeProcess.cpp: fix memory leak. 2018-05-02 16:42:22 +02:00
Loïc Fricoteaux
ed86023016 Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the exporter so that it matches the importer and respect the standard specifications 2018-05-02 16:13:17 +02:00
Kim Kulling
2acb513732 Merge branch 'master' into issue-1167 2018-05-02 15:45:52 +02:00
Kim Kulling
7bb2d6271b Merge branch 'master' into fix_fbx_empty_names 2018-05-02 14:57:08 +02:00
Kim Kulling
5c5226a98c Merge branch 'master' into issue-1923 2018-05-01 21:10:52 +02:00
Kim Kulling
037a213bb4 STL-Exporter: fix division by zero in normalize method during update 2018-05-01 15:06:56 +02:00
Kim Kulling
eced86b949 some refactorings. 2018-05-01 13:41:39 +02:00
Kim Kulling
2c47717ca6 Introduce export with test for point clouds. 2018-05-01 13:28:53 +02:00
Kim Kulling
9f835ea843 closes https://github.com/assimp/assimp/issues/842: experimental suppor for ascii stl pointcloud export. 2018-05-01 09:06:22 +02:00
Korbinian Würl
4b7b692e5e Fix Issue #1923: OBJ Exporter can't correctly export vertex colors 
The indexMap for vertices now uses a combined vp + vc index
 2018-04-30 16:29:22 +02:00
Trylz
6fb9ebe3c8 Apply fix 2018-04-28 23:34:07 -04:00
Korbinian Würl
1533aec21c Fix ply exporter to be conformant to spec respecting vertex colors. 
Vertex colors should be defined as red, green, blue, alpha instead of r, g, b, a and should have the type 'uchar' instead of 'float'
 2018-04-27 22:11:36 +02:00
Sebastian Matusik
af8f9a97a9 Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2 2018-04-27 12:45:47 +01:00
Sebastian Matusik
1f9d6f1ec4 Fix for blendshapes import when using the JoinIdenticalVertices optimization flag 2018-04-27 11:52:31 +01:00
Kim Kulling
e2d0c07791 Merge branch 'master' into use_log_macros 2018-04-26 22:02:18 +02:00
Kim Kulling
b877b3e10e use correct log macro. 2018-04-26 22:01:41 +02:00
kimkulling
6a311210e7 fix another bug of misusage of the log macros. 2018-04-26 17:01:22 +02:00
kimkulling
8626b185fb Fix misused log macros + compiler warnings. 2018-04-26 16:38:42 +02:00
kimkulling
c299755721 DXF: fix macro issues. 2018-04-26 16:13:57 +02:00
kimkulling
a5e14db19b fix invaid macro usage. 2018-04-26 15:41:31 +02:00
kimkulling
68288782e4 Merge branch 'use_log_macros' of https://github.com/assimp/assimp into use_log_macros 2018-04-26 15:18:24 +02:00
kimkulling
75c7b15b55 Fix c++11 usage. 2018-04-26 15:05:49 +02:00
kimkulling
3d79472172 fix the build. 2018-04-26 14:36:59 +02:00
Kim Kulling
dd7d0943f6 Update glTF2Asset.inl 
Move creation of vars to avoid useless creation in case of an error.
 2018-04-26 14:24:00 +02:00
Kim Kulling
8f26b9d840 Merge branch 'master' into use_log_macros 2018-04-26 14:13:04 +02:00
kimkulling
30c20eb5fc INtroduce new log macros. 2018-04-26 14:10:18 +02:00
Kim Kulling
972fffe70b Merge branch 'master' into fix_gltf2_export_componentType_error 2018-04-26 13:40:49 +02:00
wuxiaoqian
f6af6ded1f fixed the bug of export gltf2, the JOINTS_0 componentType is Incorrect 2018-04-26 11:03:50 +08:00
wuxiaoqian
6b4caa0f12 fix export gltf2, The JOINTS_0 componentType is incorrect 2018-04-26 10:56:56 +08:00
Loïc Fricoteaux
a8077baed5 Add vertex color support to glTF2 export 2018-04-25 11:37:56 +02:00
Sergio Acereda
ce6a5e5d56 ImproveCacheLocality crashes if non triangular faces 2018-04-23 11:33:48 +02:00
kimkulling
0e15b25cd1 Next log call changes. 2018-04-20 16:23:24 +02:00
kimkulling
b6f29bf54f Add usage of log macros, next files. 2018-04-19 17:21:21 +02:00
kimkulling
066349f36b Add usage of log macros. 2018-04-19 16:48:43 +02:00
kimkulling
f2833539d7 closes https://github.com/assimp/assimp/issues/1784: change so.name to keep track of the minor version of the lib. 2018-04-19 08:52:21 +02:00