v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,699 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

6699 Commits (f73dd52956ff35cf6af54f668eab5400b540c2ca)

Author SHA1 Message Date
Kim Kulling 8d42b31e20
Update metadata.h 
Replace type pronning by a simple memcpy operation.
 2018-05-08 09:46:32 +02:00
Jean-Louis 5a5db25df6 Fix AssimpView build 
- Use std::min/max instead of min/max macro in windef.h
- Use mmsytem.h instead of timeapi.h with MinGW
 2018-05-08 00:28:53 +02:00
Kim Kulling a9dcbedefb Make: save environment during make. 2018-05-07 22:07:19 +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 ce11aa51f5 add win32-based make script. 2018-05-07 00:07:41 +02:00
Kim Kulling 327a43c26f
Merge branch 'master' into fix_gltf2_export_componentType_error 2018-05-06 19:39:37 +02:00
Kim Kulling cce5647338
Merge pull request #1938 from LoicFr/master 
Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the expor…
 2018-05-06 19:38:37 +02:00
Kim Kulling be0203229b
Merge branch 'master' into master 2018-05-06 16:41:12 +02:00
Kim Kulling dd2b71dab5
Merge pull request #1943 from Z-EMB/master 
1740 Issue - Enabling and Disabling importers
 2018-05-06 16:38:21 +02:00
Kim Kulling 36c6ce7431
Merge branch 'master' into master 2018-05-06 12:29:21 +02:00
Kim Kulling 12f22142db
Merge pull request #1921 from Nimer-88/fix/blendshapes_join_identical_vertices_optimization_flag_v2 
Fix for blendshapes import when using the JoinIdenticalVertices optimization flag
 2018-05-06 10:03:19 +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
Kim Kulling 5eb7928ce8
Merge pull request #1940 from wanadev/gltf2-mesh-names 
[glTF2] Added name to nodes
 2018-05-03 20:32:45 +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
Kim Kulling 292e454d86
Merge pull request #1939 from assimp/issue_1934 
closes code/SortByPTypeProcess.cpp: fix memory leak.
 2018-05-02 17:25:04 +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
Kim Kulling 6ef9e8848d
Merge pull request #1922 from kwuerl/issue-1167 
Fix ply exporter to be conformant to spec respecting vertex colors.
 2018-05-02 16:33:43 +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 18ad80fd20
Merge pull request #1929 from Trylz/fix_fbx_empty_names 
Fix empty fbx mesh names
 2018-05-02 15:44:00 +02:00
Kim Kulling 7bb2d6271b
Merge branch 'master' into fix_fbx_empty_names 2018-05-02 14:57:08 +02:00
Kim Kulling 9385f83ea3
Merge pull request #1931 from kwuerl/issue-1923 
Fix Issue #1923: OBJ Exporter can't correctly export vertex colors
 2018-05-02 14:45:04 +02:00
wuxq 27d41442c9
Merge branch 'master' into fix_gltf2_export_componentType_error 2018-05-02 15:28:57 +08:00
Kim Kulling 5c5226a98c
Merge branch 'master' into issue-1923 2018-05-01 21:10:52 +02:00
Kim Kulling 66f77e93ba
Merge pull request #1935 from assimp/issue_842 
Issue 842: Solving for ascii stl point cloud export
 2018-05-01 17:11:33 +02:00
Kim Kulling 1679c8b08e STL: reenable unittest. 2018-05-01 16:03:56 +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
Korbinian Würl 2247513064 Fix for TravisCI 2018-05-01 11:23:38 +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
Korbinian Würl 9cfdb8d365 Fixed test .obj file: OBJ Vertex Colors are expected to be floats 0-1 
See https://github.com/cnr-isti-vclab/vcglib/blob/master/wrap/io_trimesh/import_obj.h#L326
 2018-04-30 16:29:10 +02:00
Korbinian Würl 9e484daa65 Unit test for Issue #1923: OBJ Exporter can't correctly export vertex colors 2018-04-30 16:29:02 +02:00
Trylz 6fb9ebe3c8 Apply fix 2018-04-28 23:34:07 -04:00
wuxq 7a7a706ebd
Merge branch 'master' into fix_gltf2_export_componentType_error 2018-04-29 11:29:43 +08:00
wuxq 814b56e5e2
multi joint has bug with ReplaceData 
multi joint has  a bug  in ReplaceData_joint with "bin" change
 2018-04-28 15:05:21 +08: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 410e9d4b3f
Merge pull request #1918 from assimp/use_log_macros 
Use log macros
 2018-04-26 22:47:24 +02: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
Sebastian Matusik 78d04c137d Fix for blendshapes import when using the JoinIdenticalVertices optimization flag 2018-04-26 17:34:27 +01:00
kimkulling 6a311210e7 fix another bug of misusage of the log macros. 2018-04-26 17:01:22 +02:00