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

6206 Commits (0b98e6c9227a4937ae7120c07e5fd1f19ac20e49)

Author SHA1 Message Date
Kim Kulling 7bd50f3141
Merge pull request #1959 from assimp/kimkulling-contribute-doc 
Create CONTRIBUTING.md
 2018-05-12 12:28:08 +02:00
Kim Kulling a571d01310
Create CONTRIBUTING.md 2018-05-12 12:01:52 +02:00
Kim Kulling 0b20f1f0a2
Merge pull request #1958 from assimp/issue_1780 
Issue 1780
 2018-05-12 09:53:10 +02:00
Kim Kulling e3548fe850
Update glTF2Exporter.h 
Fix typo.
 2018-05-12 08:50:17 +02:00
Kim Kulling 950496c351 some minor refactorings. 2018-05-12 08:39:22 +02:00
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 1c9406b2f5 add linetest files to gitignore. 2018-05-12 08:09:07 +02:00
Kim Kulling c591fb6dfe
Merge pull request #1956 from assimp/issue_1952 
closes https://github.com/assimp/assimp/issues/1952:
 2018-05-10 14:53:36 +02:00
Kim Kulling f7d0e05018 closes https://github.com/assimp/assimp/issues/1952: check for postprocessing parameter before try to parse -f 2018-05-10 14:21:43 +02:00
Kim Kulling 890ce3e44f
Merge pull request #1955 from assimp/issue_919 
closes https://github.com/assimp/assimp/issues/919: add missing cast …
 2018-05-10 10:31:49 +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
Kim Kulling a5a4da8900 Appveyor: adapt install script. 2018-05-10 09:19:53 +02:00
Kim Kulling d441dcd523 addmissing file. 2018-05-09 19:15:42 +02:00
Kim Kulling 24a5c123fe
Merge pull request #1951 from DCubix/master 
_stat64 doesn't seem to exist. use __stat64!
 2018-05-09 09:56:35 +02:00
kimkulling 60d803f490 Some minor fixes of typos and formatting issues. 2018-05-09 09:51:05 +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 8da12c616f
Merge pull request #1949 from JLouis-B/fix-assimp-viewer-build 
Fix Assimp viewer build with MinGW
 2018-05-08 15:49:02 +02:00
Kim Kulling 3a93a2aa19
Merge branch 'master' into fix-assimp-viewer-build 2018-05-08 15:14:25 +02:00
Kim Kulling 49be538bab
Merge pull request #1948 from Breush/patch-1 
Fixes DXF loader false positive on FBX file
 2018-05-08 14:04:17 +02:00
Jean-Louis Boudrand d86d56224b
Merge branch 'master' into fix-assimp-viewer-build 2018-05-08 11:45:46 +02:00
Kim Kulling f92d4edced
Merge branch 'master' into patch-1 2018-05-08 10:22:14 +02:00
Kim Kulling a537c1ec1f
Merge pull request #1941 from Starnick/master 
Silencing compile warnings during build
 2018-05-08 10:20:26 +02:00
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 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
Kim Kulling 5c5226a98c
Merge branch 'master' into issue-1923 2018-05-01 21:10:52 +02:00