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

9865 Commits (7d68eab4a7183d701782a3e86e54be2938440918)

Author SHA1 Message Date
Kim Kulling 2cd1192bf1
Merge pull request #3300 from mahiuchun/strrchr 
Use strrchr() when finding the '.' that begins the file extension.
 2020-07-11 21:19:55 +02:00
Kim Kulling 9682ab0685
Merge branch 'master' into strrchr 2020-07-11 21:10:58 +02:00
Kim Kulling 21678df589 ogre + collada migration. 2020-07-10 22:25:38 +02:00
Kim Kulling 1379175f18
Merge pull request #3314 from assimp/issue_3252 
closes https://github.com/assimp/assimp/issues/3252: fix build.
 2020-07-09 09:50:32 +02:00
Robert Reif 628394baec check for invalid vertex 2020-07-07 23:29:54 -04:00
RichardTea d79a617e18 Rollup to 'upstream/master' 2020-07-07 20:03:10 +01:00
kimkulling 9aa468262f closes https://github.com/assimp/assimp/issues/3252: fix build. 2020-07-07 17:35:03 +02:00
Robert Reif 37c74f6fa3 add test to unit for acc file format loader 2020-07-06 20:16:22 -04:00
Robert Reif f753a6e7ad add acc file test using existing ac file converted to acc format 2020-07-06 20:14:03 -04:00
Robert Reif 6c29247180 add triangle strip support to AC file loader 2020-07-06 17:41:14 -04:00
Max Vollmer (Microsoft Havok) fb11705dd0
Merge branch 'master' into gltf1_gltf2_split 2020-07-06 09:11:06 +01:00
Max Vollmer abf43eaf74 * Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently. 
* ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before
 2020-07-05 19:22:31 +01:00
Kim Kulling a211aff522
Merge pull request #3307 from MalcolmTyrrell/defsIncludeFix 
Ensure asserts are defined where expected.
 2020-07-05 20:20:23 +02:00
Kim Kulling d04f8b3174
Merge branch 'master' into defsIncludeFix 2020-07-05 18:59:37 +02:00
Kim Kulling 95a23af16f
Merge pull request #3309 from mahiuchun/const 
Improve ToBinary() for double precision.
 2020-07-04 21:22:42 +02:00
Kim Kulling 77b705048b fix merge issues. 2020-07-04 13:42:23 +02:00
Kim Kulling 839986ca14 next step of AMF-Migration. 2020-07-04 09:04:06 +02:00
Hill Ma 3fb7747429 Improve ToBinary() for double precision. 
The constant 0x80000000 is specific to 32 bit types. Make the bit mask
according to the size of types.
 2020-07-03 18:14:45 -07:00
Kim Kulling d74c10dcb7 Merge branch 'master' into pugi_xml 2020-07-03 17:29:38 +02:00
Kim Kulling 10c709831f
Merge pull request #3306 from assimp/issue_3305 
closes https://github.com/assimp/assimp/issues/3305: remove merge issue.
 2020-07-02 17:46:53 +02:00
Malcolm Tyrrell 51150cb3df Ensure asserts are defined where expected. 2020-07-02 14:53:29 +01:00
Kim Kulling 693da43095 closes https://github.com/assimp/assimp/issues/3305: remove merge issue. 2020-07-02 15:22:06 +02:00
Kim Kulling b1369d0912 next steps. 2020-07-02 15:18:59 +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 fb20e15163 start to migrate colladat and amf 2020-06-27 15:57:06 +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