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

11252 Commits (422ed5279ad5f93b0593bab8adaec62ab55be183)

Author SHA1 Message Date
Kim Kulling 42adc82354
Merge pull request #4473 from xiaohunqupo/master 
Fix compile error: When enable macro ASSIMP_DOUBLE_PRECISION
 2022-03-31 18:35:07 +02:00
xiaohunqupo a050dee096 Fix compile error:When enable macro ASSIMP_DOUBLE_PRECISION 2022-03-31 16:08:39 +08:00
xiaohunqupo de6e90a657 Fix commit error 2022-03-31 15:36:57 +08:00
xiaohunqupo 2152aae2a3 Fix compile error due to namespace conflicts in VC140. 2022-03-31 15:34:49 +08:00
xiaohunqupo b08c04b87a Fix compile errro in VC140 2022-03-31 15:08:12 +08:00
xiaohunqupo cc515746f7 Fix v140 compile errror 2022-03-31 14:58:31 +08:00
Danny许 8e075ce713
Update ObjFileParser.cpp 2022-03-31 14:53:33 +08:00
Danny许 18c4ebaa13
Fix compile in VC140 2022-03-31 14:28:35 +08:00
Danny许 f985fe12cc
Fix compile error 
When enable macro ASSIMP_DOUBLE_PRECISION
 2022-03-31 11:20:18 +08:00
Danny许 422a45694a
Merge pull request #4 from assimp/master 
Merge
 2022-03-31 11:18:37 +08:00
Filip Lundgren 4175198d04
Detect Roughness factor exported by Blender 
Matches the logic used by Blender's own FBX exporter / importer.
 2022-03-26 22:33:10 +01:00
Carlos Martinez Perez 257927d7cf
Merge branch 'master' into Android-Script-Update 2022-03-24 18:59:16 +01:00
Kim Kulling ba6c67c328
Merge pull request #4464 from assimp/kimkulling/revert_static_runtime_Selection_for_all 
Use static runtime only on option is selected
 2022-03-24 08:01:49 +01:00
Kim Kulling 0a56065962
Use static runtime only on option is selected 2022-03-24 00:41:07 +01:00
Jan Krassnigg 537c46a42a Prevent nullptr access to normals-array in bitangent computation 2022-03-23 15:45:09 +01:00
Carlos Martinez Perez 90a24440db - Adapted bat file to new NDK and toolchain 
- Able to build x86, x86_64, armv8, armv7 for android
- Automatically detects latest ndk on your system
 2022-03-18 17:01:45 +01:00
Kim Kulling 19f2a624a9
Merge pull request #4451 from Promit/promit/gltf-attrib-bug-fix 
GLTF2 attribute name/parse bug fix
 2022-03-17 11:35:44 +01:00
Promit Roy 765b38cf04 Update glTF2Asset.inl 
Fixing mistakes in attribute names for GLTF. This causes attribute index to not be parsed out correctly (e.g. JOINTS_1) and fails the scene load.
 2022-03-16 16:49:45 -04:00
Kim Kulling a916a0eda5
Merge pull request #4448 from assimp/kimkulling/MDL-fix_stackoverflow-issue4447 
Fix stack-overflow in MDLLoader
 2022-03-16 14:14:46 +01:00
Kim Kulling c2b05acaa6
Fix stack-overflow in MDLLoader 
- Use correct len to copy filename.
- Closes https://github.com/assimp/assimp/issues/4447
 2022-03-16 13:59:21 +01:00
Kim Kulling a828114a1d
Merge pull request #4446 from assimp/kimkulling/mdlimporter_fix_nullptr_dereferencing 
Fix nullptr dereferencing
 2022-03-16 10:23:29 +01:00
Kim Kulling 552f3a308d
Fix nullptr dereferencing 
- Check if we have any texture coordinates before calculating them
- closes https://github.com/assimp/assimp/issues/4445
 2022-03-16 10:08:20 +01:00
Kim Kulling 784d9615f5
Merge pull request #4444 from EYHN/windows-crt 
Add USE_STATIC_CRT option
 2022-03-15 21:55:21 +01:00
Kim Kulling 6484dd6825
Merge branch 'master' into windows-crt 2022-03-15 21:29:21 +01:00
Kim Kulling d594e6eea4
Merge branch 'master' into obj-pbr-explicit 2022-03-15 14:30:24 +01:00
Kim Kulling bcee205542
Merge pull request #4437 from jaefunk/issue_4349 
add ifndef guard for resolve to fails to compile
 2022-03-15 14:28:43 +01:00
Kim Kulling 0904490150
Merge branch 'master' into issue_4349 2022-03-15 14:11:57 +01:00
Kim Kulling 7919461951
Merge pull request #4441 from assimp/kimkulling/fix_doxygen_version 
Update version in doxy-config
 2022-03-15 14:11:38 +01:00
Kim Kulling e4fb0e0960
Merge branch 'master' into kimkulling/fix_doxygen_version 2022-03-15 13:33:54 +01:00
Kim Kulling d87111983a
Merge pull request #4431 from TerenceRussell/master 
Added missing ObjMaterial.h to CMakeLists
 2022-03-15 13:33:13 +01:00
Kim Kulling b1dc8cfe56
Merge branch 'master' into master 2022-03-15 11:58:45 +01:00
Kim Kulling 7296ffc3f5
Merge pull request #4426 from sacereda/info-material-properties 
Add properties information on assimp info command line
 2022-03-15 11:57:58 +01:00
Kim Kulling b567497a17
Merge branch 'master' into info-material-properties 2022-03-15 10:57:14 +01:00
Kim Kulling e1dae1402e
Merge pull request #4425 from sacereda/metallic-roughness-split 
glTF2: Metallic roughness split
 2022-03-15 10:56:43 +01:00
Kim Kulling 68f3386c7b
Merge branch 'master' into metallic-roughness-split 2022-03-15 08:38:38 +01:00
Kim Kulling 9e0357a8b6
Merge pull request #4423 from youkeyao/parse_obj_anisotropy 
Fix getting anisotropy in obj
 2022-03-15 08:38:13 +01:00
Kim Kulling 72888c49f6
Merge branch 'master' into parse_obj_anisotropy 2022-03-15 08:13:35 +01:00
eyhn cd7df53a72 Add USE_STATIC_CRT option 2022-03-15 14:50:01 +08:00
jaefunk 4457d9300a
Merge branch 'master' into issue_4349 2022-03-14 15:41:20 +09:00
Kim Kulling 0ef830d2b1
Update version in doxy-config 2022-03-12 16:57:27 +01:00
Sergio Acereda 729ab8ae33 Trying to fix reorder error 2022-03-12 08:15:11 +01:00
Sergio Acereda 26bb601d8f Fix includes 2022-03-12 08:03:27 +01:00
Sergio Acereda 51e248909f Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file. 2022-03-11 22:29:59 +01:00
jaefunk e02d51ec24 add ifndef guard for resolve to fails to compile 2022-03-11 10:51:13 +09:00
Kim Kulling a305d14b8f
Merge pull request #4421 from RichardTea/update_ai_texture_type_max 
Update AI_TEXTURE_TYPE_MAX
 2022-03-10 13:54:55 +01:00
Kim Kulling 5e69517742
Merge branch 'master' into update_ai_texture_type_max 2022-03-10 11:37:46 +01:00
Kim Kulling 1b3ae63527
Merge pull request #4434 from karjonas/always_true 
Fix 'i >= 0' always true bug
 2022-03-10 11:37:03 +01:00
Kim Kulling 47f004517f
Add missing cast. 2022-03-10 10:33:29 +01:00
Jonas Karlsson c14eccefaf Fix 'i >= 0' always true bug 
If 'disk_filename' does not contain a dot (.) then 'i' would overflow.
Making 'i' an int makes sure the for loop works as intended.
 2022-03-09 23:05:47 +01:00
Terence Russell efe92e9ec1
Merge branch 'assimp:master' into master 2022-03-09 10:15:41 -07:00