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

9114 Commits (b15c111805526ce82f53f15571ef934326c964ff)

Author SHA1 Message Date
Kim Kulling 693da43095 closes https://github.com/assimp/assimp/issues/3305: remove merge issue. 2020-07-02 15:22:06 +02:00
RichardTea 9e27fb3b89 Rollup to upstream/master 2020-07-01 16:28:32 +01:00
Kim Kulling 7b7764afb9
Merge pull request #3301 from mahiuchun/double 
Fix build when ASSIMP_DOUBLE_PRECISION is on.
 2020-06-30 21:24:35 +02:00
Kim Kulling 7fda533484
Merge branch 'master' into double 2020-06-30 21:12:02 +02:00
Kim Kulling dea412c9a0
Merge pull request #3303 from malortie/fix-loop-variable-HL1MDLLoader 
Fixed variable in loop - HL1MDLLoader.cpp
 2020-06-30 21:11:32 +02:00
Yingying Wang 97085c1c05 update sync 2020-06-30 11:48:37 -07:00
Yingying Wang 36f899bf09 sync update 2020-06-30 11:45:11 -07:00
Yingying Wang 3f2e5518eb update sync 2020-06-30 11:29:08 -07:00
Marc-Antoine Lortie 03340787ec Fixed variable in loop - HL1MDLLoader.cpp 
Commit 7e5a0acc48 made changes to HL1MDLLoader.cpp. Several variables have been renamed. A loop variable 'i' was renamed to faceIdx, but one reference was left unchanged.
 2020-06-29 07:50:51 -04:00
Kim Kulling 4ff5a06ef4
Merge pull request #3302 from assimp/kimkulling-patch-6 
Move patreon to contribution
 2020-06-29 12:52:19 +02:00
Kim Kulling 1ab7a3a16b
Merge branch 'master' into kimkulling-patch-6 2020-06-29 10:36:09 +02:00
Kim Kulling 718f81ddcf
Merge pull request #3293 from ifiddynine/patch-2 
Fix Maya PBR & stingray texture detection
 2020-06-29 10:35:41 +02:00
Kim Kulling eeb4a981bd
Merge branch 'master' into patch-2 2020-06-29 09:55:55 +02:00
Kim Kulling 9a87338854
Update Readme.md 2020-06-29 09:55:29 +02:00
Kim Kulling 28b65c84b0
Create fileformats.md 
Optimize the readabilaty of the frontpage.
 2020-06-29 09:52:36 +02:00
Kim Kulling ba94bfd197
Move patreon to contribution 2020-06-29 09:51:00 +02:00
Hill Ma 30f09e9fc0 Fix build when ASSIMP_DOUBLE_PRECISION is on. 
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make

The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
 2020-06-28 17:36:21 -07:00
Hill Ma 0b18d27042 Use strrchr() when finding the '.' that begins the file extension. 
Sometimes we encounter file paths like ../foo/bar.obj; searching from the end of
the string would yield the correct result.
 2020-06-28 16:02:33 -07:00
Kim Kulling 879ff365fc
Merge pull request #3299 from assimp/rename_fuzz_target 
rename fuzzer target
 2020-06-28 19:27:26 +02:00
Kim Kulling b2f05a9a54 rename fuzzer target 2020-06-28 19:18:36 +02:00
Kim Kulling 45531df9aa
Merge pull request #3298 from Evangel63/recursive_metadata 
Added arbitrary recursive metadata to allow for glTF2's extensions to…
 2020-06-27 15:52:16 +02:00
Evangel 6d85280c8d Added bool, removed unused debug parameter 2020-06-27 12:53:26 +10:00
Evangel d75d59a4fd Added operator== and operator!= to aiMetadata to allow for testing. 
Updated utMetadata.copy_test to reflect that there's now 8 metadata types.
 2020-06-26 15:07:42 +10:00
Evangel f6b4370f6a Added arbitrary recursive metadata to allow for glTF2's extensions to be properly represented. 
Primary changes are to include/assimp/metadata.h, adding in the aiMetadata GetAiType function,
adding the operator= to allow an aiMetadata type to be assigned, adding a check for the
AI_AIMETADATA type flag as it can't be trivially memcpy'd.

operator= is implemented with a by-value argument as then the copy is made by the copy
constructor and we can just swap everything out and let the destructor handle the mess.

Implemented parsing of the "extensions" flag on all glTF2 Nodes. Doesn't use the ReadValue
helper function on numbers as it did not seem to fill out the Nullable structure properly.
 2020-06-26 14:28:41 +10:00
Kim Kulling b7b38c2282
Merge branch 'master' into patch-2 2020-06-25 16:52:40 +02:00
Kim Kulling 8a57d5df40
Merge pull request #3294 from rmstyrczula/FindInvalidData 
FindInvalidDataProcess: Mark removed meshes as "out"
 2020-06-25 16:50:51 +02:00
Kim Kulling ba6af9ff98
Merge branch 'master' into FindInvalidData 2020-06-25 16:41:24 +02:00
Kim Kulling 50b55726d2
Merge pull request #3297 from MalcolmTyrrell/aiAssertHandler 
Allow users to customize the behavior of assert violations
 2020-06-25 14:15:32 +02:00
Kim Kulling 95e822a6ec
Merge branch 'master' into aiAssertHandler 2020-06-24 20:47:10 +02:00
Kim Kulling e845988c22
Merge pull request #3296 from assimp/replace_NULL 
Repo-Cleanup
 2020-06-24 20:45:50 +02:00
Kim Kulling 1466bbacf8 fix unittests. 2020-06-24 20:30:02 +02:00
Malcolm Tyrrell 170c00eee7 Useful comment. 2020-06-24 11:51:03 +01:00
Malcolm Tyrrell edaa8e4a80 Need to use ASSIMP_BUILD_DEBUG. 2020-06-24 11:37:43 +01:00
Kim Kulling ae05dbb252 define CheckValidFacesIndices also in release builds. 2020-06-23 21:11:18 +02:00
Kim Kulling 6205af4efb replace NULL and avoid ai_assert with more than 2 tests. 2020-06-23 21:05:42 +02:00
Malcolm Tyrrell 2977643352 Fix. 2020-06-23 12:08:06 +01:00
Malcolm Tyrrell 9188f56839 Allow assert handling to be replaced. 2020-06-23 11:55:51 +01:00
Ryan Styrczula 5717ea466f FindInvalidDataProcess: Mark removed meshes as "out" 
There's a code path where an input scene only has a single mesh.
In this case, if ProcessMesh returns 2, we delete the mesh and move on
with the postprocessing. UpdateMeshReferences is not called and so the
deleted mesh is left dangling in nodes.

In a later step (SplitMesh in my testing), it then tries to deference a
null pointer and we explode.

With `out = true`, we can now hit the DeadlyImportError instead of a
segfault.
 2020-06-22 17:24:16 -04:00
Filip Lundgren 2006286528
Fix Maya PBR & stingray texture detection 2020-06-22 23:14:16 +02:00
Filip Lundgren ba09e1ef94
Fix Blender .fbx metalness detection 2020-06-21 23:56:11 +02:00
Kim Kulling 6397bfbf90 replace NULL by nullptr on loadFile. 2020-06-21 12:03:38 +02:00
Kim Kulling c70d57be4f
Merge pull request #3288 from infosia/themachinery-issues-0001 
Check invalid vertex id for bone weight
 2020-06-20 21:40:18 +02:00
Kota Iguchi 6acaaee80f Check invalid vertex id for bone weight 2020-06-20 15:27:28 +09:00
Kim Kulling c2a732938e
Merge pull request #3287 from assimp/issue_3253 
closes https://github.com/assimp/assimp/issues/3253 : remove useless …
 2020-06-18 20:01:03 +02:00
Kim Kulling b3af5c5a14
closes https://github.com/assimp/assimp/issues/3253 : remove useless code 2020-06-17 20:37:39 +02:00
Kim Kulling 4cd7e48f19
Merge pull request #3284 from assimp/kimkulling-patch-6 
Update issue templates
 2020-06-17 09:04:24 +02:00
Kim Kulling bb613df543 Update issue templates 
To make our life easier
 2020-06-16 16:31:47 +02:00
Kim Kulling f776cc8008
Merge pull request #3248 from assimp/issue_3165 
closes https://github.com/assimp/assimp/issues/3165: fix gcc build.
 2020-06-15 21:44:22 +02:00
kimkulling 524e2e4728 fix warning, hopefully ... 2020-06-15 21:34:49 +02:00
kimkulling f0f6612b81 disable warning for radjson. 2020-06-15 20:52:11 +02:00