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

11444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evangel
6d413444b5 Merge branch 'master' of https://github.com/Evangel63/assimp 2021-06-12 11:46:20 +10:00
Evangel
36c8cdf3de Add scene metadata for glTF2 files as allowed by the glTF2 specification. 2021-06-12 11:44:28 +10:00
RichardTea
fbf75963dc Fix typo 
Thank you clang!
 2021-06-11 15:25:02 +01:00
RichardTea
230f367ef9 Fix glTFv2 texcoord/uv mapping 
Use the standard property to indicate the UV map index
 2021-06-11 15:17:25 +01:00
RichardTea
c86522e552 Add glTFv2 Clearcoat import/export tests 
Uses Clearcoat model from Khronos
 2021-06-11 14:34:42 +01:00
RichardTea
4b4d6b1326 Standardise Clearcoat, Sheen and Transmission 
Also cleanup glTFv2 defaults, don't import/export if disabled
 2021-06-11 13:44:52 +01:00
ihsinme
6dd9ab062c the expression does not throw an exception. 
maybe you just forgot this word.
 2021-06-11 10:56:45 +03:00
Kim Kulling
6db142ee51 Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration 2021-06-10 23:36:47 +02:00
Kim Kulling
ebb9b1b2af Next iteration 2021-06-10 23:36:07 +02:00
RichardTea
9f9d77f882 First pass at simplifying glTFv2 PBR 
Removed 'core' set of GLTF-specific properties
 2021-06-10 18:13:46 +01:00
Kim Kulling
391d3195df Merge branch 'master' into fbx-lights-export 2021-06-10 12:27:14 +02:00
Scott Baldric
1deacf32be Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing 2021-06-09 15:27:20 -05:00
Kim Kulling
199aa5dd66 Merge pull request #3911 from RichardTea/update_draco 
Update Draco to upstream e4103dc
 2021-06-09 16:34:53 +02:00
Kim Kulling
fc4ebefaa4 Merge branch 'master' into update_draco 2021-06-08 23:30:01 +02:00
Hill Ma
ef739c1703 glTF2: Make handling of embedded textures safer. 
Previous code does not check whether the embedded texture exists.
 2021-06-08 12:53:18 -07:00
Scott Baldric
ca1ab8b11b Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing 2021-06-08 08:18:15 -05:00
Kim Kulling
c58fe0c98f Merge pull request #3873 from krishty/improve-msvc-switches 
enable debug information in MSVC release build
 2021-06-08 15:09:28 +02:00
Hill Ma
121c0e7d0c Add GetEmbeddedTextureAndIndex() to aiScene. 
It allows the caller to get the index of the embedded texture that is always computed anyway.
 2021-06-07 21:53:28 -07:00
Kim Kulling
790203ee9d Merge branch 'master' into improve-msvc-switches 2021-06-07 21:21:20 +02:00
Kim Kulling
cdc1bf8e10 Merge pull request #3916 from jagoon/fix-fbx-exporter2 
Fix fbx exporter bug if root node contains meshes.
 2021-06-07 21:20:18 +02:00
Scott Baldric
8039351a67 Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing 2021-06-07 11:44:10 -05:00
Kim Kulling
a8ddc74426 Merge branch 'master' into fix-fbx-exporter2 2021-06-07 18:26:59 +02:00
Kim Kulling
1126fa5218 Merge pull request #3934 from assimp/fix_dxf_viewer 
fix viewer in case of unknown primitives.
 2021-06-07 18:24:52 +02:00
Kim Kulling
d33cf1dc0c Merge branch 'master' into x3d_pugi_migration 2021-06-06 16:06:08 +02:00
Scott Baldric
444fc9c373 Increasing length of mDataLength if rewriting the texture index increases magnitutde of index. 2021-06-04 16:32:46 -05:00
Kim Kulling
84db4d3a08 Update CMakeLists.txt 2021-06-03 23:56:52 +02:00
Kim Kulling
b0e7271449 Merge branch 'master' into stb-image-updated 2021-06-03 23:46:43 +02:00
Kim Kulling
e6b83feb9f Update CMakeLists.txt 2021-06-03 23:45:48 +02:00
Kim Kulling
1a493613c1 Merge branch 'master' into fix_dxf_viewer 2021-06-03 23:43:39 +02:00
Kim Kulling
a3b3ab1d44 Merge pull request #3941 from assimp/issue_3767 
update pugi_xml to 1.11
 2021-06-03 23:42:08 +02:00
Kim Kulling
742250c5fb Update CMakeLists.txt 2021-06-03 23:42:07 +02:00
Kim Kulling
a716f741d8 fix the include 2021-06-03 23:35:12 +02:00
Kim Kulling
bf0f8d4c1b Update pugiconfig.hpp 2021-06-03 23:29:53 +02:00
Kim Kulling
cc912f09f7 update pugi_xml to 1.11 2021-06-03 23:16:20 +02:00
Kim Kulling
22b49efbd0 Merge branch 'master' into stb-image-updated 2021-06-03 23:07:48 +02:00
Kim Kulling
d2da600d08 Merge pull request #3940 from assimp/kimkulling-issue_3887 
Use correct attribute name
 2021-06-03 23:07:40 +02:00
Kim Kulling
e0d1a36523 Merge branch 'master' into stb-image-updated 2021-06-03 23:07:38 +02:00
Kim Kulling
b4fc41bc09 Use corret attribute name 
- closes https://github.com/assimp/assimp/issues/3887
 2021-06-03 22:52:10 +02:00
Kim Kulling
d600b45cd2 Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration 2021-06-03 22:21:10 +02:00
Kim Kulling
f28331b202 Merge pull request #3939 from assimp/kimkulling-issue_3872 
Update unity plugin to trilib2
 2021-06-03 20:58:21 +02:00
Kim Kulling
3a32612b71 Add skipping of unused nodes. 2021-06-03 20:55:31 +02:00
Kim Kulling
84a2e1fc92 Update unity plugin to trilib2 
- closes https://github.com/assimp/assimp/issues/3872
 2021-06-03 20:43:37 +02:00
Kim Kulling
c8510a1a82 Merge branch 'master' into fix-fbx-exporter2 2021-06-03 11:05:07 +02:00
Kim Kulling
d4199ee968 Merge pull request #3903 from ogjamesfranco/cached_output_directory_vars 
Change the Assimp output directory vars to cached vars
 2021-06-03 10:47:15 +02:00
Kim Kulling
dd3d03a4ae Merge branch 'master' into cached_output_directory_vars 2021-06-03 10:31:57 +02:00
Kim Kulling
35c506fcf8 Merge branch 'master' into fix_dxf_viewer 2021-05-30 21:56:15 +02:00
Kim Kulling
77ce4080b6 fix viewer in case of unknown primitives. 2021-05-30 21:54:04 +02:00
Garux
3b565444c3 Merge branch 'Q1MDLgroup' of https://github.com/Garux/assimp into Q1MDLgroup 2021-05-30 11:55:45 +03:00
Garux
c776924adf fix -Waddress-of-packed-member 2021-05-30 11:45:50 +03:00
Kim Kulling
c04759ccc4 Merge pull request #3922 from Evangel63/master 
Fix bug in aiMetadata constructor that overwrites an array of one of …
 2021-05-29 16:06:43 +02:00