eb8abfa02c
Update .clang-format
...
Disable tabs.
2020-02-16 12:37:46 +01:00
a0000e5be4
Merge pull request #3003 from iamAdrianIusca/master
...
minor code improvements for the obj code
2020-02-15 10:55:26 +01:00
00a104efde
Merge branch 'master' into master
2020-02-14 20:58:13 +01:00
82beb35b78
Merge pull request #3000 from malortie/search-invalid-textures-missing-texture-types
...
Added missing texture types when searching for invalid textures.
2020-02-14 20:05:58 +01:00
bdd5e52176
Merge branch 'master' into search-invalid-textures-missing-texture-types
2020-02-14 18:04:30 +01:00
1473c6616b
Merge branch 'master' into master
2020-02-14 12:56:14 +01:00
f7abd61cca
Merge pull request #2986 from bubba/gltf-camera-pos
...
Use the translation matrix in gltf2 cameras for aiCamera.mPosition
2020-02-14 12:55:36 +01:00
d662b25b17
Merge branch 'master' into master
2020-02-14 13:40:15 +02:00
523e6c9f73
Merge branch 'master' into gltf-camera-pos
2020-02-14 08:21:54 +01:00
d5b7ecd2ec
Merge pull request #2995 from runforu/master
...
Fix: GLTF animation works on RTS not matrix; fix matrix related bug; …
2020-02-14 08:21:29 +01:00
b62bd38c71
Fix: GLTF animation works on RTS not matrix; fix matrix related bug.
2020-02-14 02:11:12 +00:00
56a71f22e1
Merge branch 'master' into master
2020-02-14 01:04:46 +02:00
a4868a9530
Merge pull request #2985 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix
...
Fixed size check to use correct value
2020-02-13 21:40:55 +01:00
25feb77982
more minor changes
2020-02-13 00:38:56 +02:00
6f1870681b
reduced the scope of iStep variable
2020-02-13 00:27:30 +02:00
24cdb1f221
revert small change
2020-02-13 00:21:04 +02:00
6f53e8b43b
Merge branch 'master' into master
2020-02-13 00:14:20 +02:00
fc4dd6455a
minor code improvements for the obj code
...
- make use of range for loops
- make use of empty() method for the std::vector
- removed unnecessary std::string initialization
- use ' ' instead of " " for the find methods (should be "faster")
- simplified some function
- make use of emplace_back instead of push_back (should be "faster")
- other small changes
2020-02-13 00:10:07 +02:00
f5af791633
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-12 17:58:00 +01:00
58b9dcbdc7
Merge pull request #2973 from bztsrc/master
...
Additional checks on invalid input
2020-02-12 17:22:46 +01:00
47fc3f2627
Update M3DImporter.cpp
...
Fix a memoryleak.
2020-02-12 14:54:00 +01:00
1c13c793f0
Merge branch 'master' into master
2020-02-11 22:00:22 +01:00
aed762acd7
Merge pull request #2971 from ms-maxvollmer/FBXParser_check_inputlength_fix
...
Check input token length before copy
2020-02-11 21:57:38 +01:00
50334086cf
Added missing texture types when searching for invalid textures.
2020-02-11 11:42:13 -05:00
58990d4e3f
Update FBXParser.cpp
...
add missing brackets.
2020-02-10 23:59:52 +01:00
5e979d72c9
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-02-10 23:59:13 +01:00
c722061f18
Merge pull request #2969 from LoicFr/master
...
Import/export of embedded texture names for the glTF/glTF2 format
2020-02-10 23:58:40 +01:00
471f9b23c9
Merge branch 'master' into master
2020-02-10 21:37:01 +01:00
c6000db3be
Merge pull request #2994 from iamAdrianIusca/master
...
Small changes in the CMake file
2020-02-10 21:07:52 +01:00
d38e541e89
Merge branch 'master' into master
2020-02-09 20:43:12 +01:00
91633dc437
Merge pull request #2987 from Frooxius/master
...
Fixed population of bone armature and node fields for some meshes
2020-02-09 20:42:30 +01:00
ca08cbcb0c
- don't include HunterGate.cmake if you don't enable HUNTER package manager
...
- don't check for DirectX if you don't build the assimp tools or samples
2020-02-09 20:31:06 +02:00
8fd053315c
Update ArmaturePopulate.cpp
...
- Introduce tabs width of 4.
- Add missing brackets
- Use c++ comment blocks
2020-02-09 11:14:42 +01:00
407c550240
Merge branch 'master' into master
2020-02-09 11:05:35 +01:00
5a674bb464
Merge pull request #2989 from malortie/multiple-texture-type-to-string-definitions
...
Fixed TextureTypeToString defined multiple times.
2020-02-09 11:05:08 +01:00
95a7772b5a
Merge branch 'master' into multiple-texture-type-to-string-definitions
2020-02-07 17:37:10 -05:00
af9705e3d1
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-02-07 11:52:00 +01:00
97a6d80cb1
Merge pull request #2990 from assimp/kimkulling-sponoring-update-1
...
Update FUNDING.yml
2020-02-07 11:51:37 +01:00
d3a70c73c4
Update FUNDING.yml
...
Add paypal sponsoring
2020-02-07 10:58:56 +01:00
acf57bdb13
Merge branch 'master' into master
2020-02-06 22:58:19 +01:00
8c09cd2ef3
Fixed TextureTypeToString defined multiple times.
...
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
2020-02-06 13:19:01 -05:00
355131e261
Merge pull request #2942 from malortie/hl1-mdl-remove-texture-256-clamping-2
...
[MDL HL1] Removed texture dimensions limitation.
2020-02-06 17:24:01 +01:00
b33272b1c8
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-02-06 14:39:09 +01:00
29603128f4
Fixed invalid armature node population when there's mesh on a node with the same name as the bone
2020-02-06 10:28:38 +01:00
cb02e2fc65
Merge pull request #4 from assimp/master
...
Updating to the latest version from upstream
2020-02-06 08:26:57 +01:00
18c01a023c
Use the translation matrix in gltf2 cameras for aiCamera.mPosition
2020-02-05 21:24:54 +00:00
fa60ae2885
Merge pull request #2974 from malortie/rename-writedumb-to-writedump
...
Renamed WriteDumb.cpp to WriteDump.cpp
2020-02-05 17:42:55 +01:00
7047d05bf0
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-05 14:43:03 +00:00
8af0229e0d
In "ByVertice" case tempData.size() needs to be mapping_offsets.size(), not vertex_count
2020-02-05 14:40:35 +00:00
f00256d185
Merge branch 'master' into rename-writedumb-to-writedump
2020-02-05 13:58:09 +01:00
Kim Kulling
Adrian Iusca
Hui.Du
iamAdrianIusca
Marc-Antoine Lortie
Marc-Antoine Lortie
Tomas Mariancik
Luke Lau
Max Vollmer (Microsoft Havok)
Max Vollmer