00a104efde
Merge branch 'master' into master
2020-02-14 20:58:13 +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
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
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
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
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
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
471f9b23c9
Merge branch 'master' into master
2020-02-10 21:37:01 +01: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
af9705e3d1
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-02-07 11:52:00 +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
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
18c01a023c
Use the translation matrix in gltf2 cameras for aiCamera.mPosition
2020-02-05 21:24:54 +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
eb1d25631b
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-05 11:12:57 +00:00
ec024085ab
Merge branch 'FBXMeshGeometry_checksizes_fix' of https://github.com/ms-maxvollmer/assimp into FBXMeshGeometry_checksizes_fix
2020-02-05 11:08:00 +00:00
cb55e2658d
Removed unnecessary checks that may result in false positives rejecting valid models
2020-02-05 11:07:39 +00:00
ad286a8ab1
Merge branch 'master' into fix_clang_warnings
2020-02-03 19:07:02 +01:00
8e009c3d0c
Update MDLLoader.cpp
...
fix a tab.
2020-02-03 19:06:36 +01:00
2d5c28ac46
Merge branch 'master' into scene-combiner-memory-leak
2020-02-02 20:43:52 +01:00
99175e3eaf
Merge branch 'master' into master
2020-02-01 19:26:52 +01:00
4862d11807
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-01 13:25:32 +01:00
d6567e606e
Fixed wrong changes applied during merge.
2020-01-31 18:14:26 -05:00
3386e9ea58
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-31 16:55:45 -05:00
ede860173e
Fixed mValues allocated twice.
...
mValues is already allocated in aiMetadata::Alloc().
2020-01-31 16:43:20 -05:00
9a971ffeac
Merge branch 'master' into master
2020-01-31 19:12:02 +01:00
0269000884
Update glTF2Exporter.cpp
...
Replacing tabs by spaces.
2020-01-31 19:11:36 +01:00
187b74355b
Update glTFImporter.cpp
...
Replace tabs by spaces.
2020-01-31 19:08:04 +01:00
0af44fb3e8
Update glTFExporter.cpp
...
Replacing tabs by spaces.
2020-01-31 19:06:56 +01:00
ca614a7419
Merge branch 'master' into master
2020-01-31 14:29:39 +01:00
e434c63c31
Fixed what kimkulling broke
2020-01-31 14:20:23 +01:00
bbe6f7f213
Fixed a bunch of clang warnings
...
1. Fix misleading indentation warnings.
2. Fix creating a temporary const copy when iterating over a map (thanks to range analysis warnings)
3. Fix creating a copy when iterating over a range without reference qualifier (also thanks to range analysis warnings)
2020-01-30 18:42:30 -05:00
2c1c1d846e
Renamed WriteDumb.cpp to WriteDump.cpp
...
This includes as well changes to places referencing WriteDumb.cpp.
2020-01-30 16:40:34 -05:00
53c394179c
Merge branch 'master' into refactor-assxml-and-xml-dump-writer
2020-01-30 16:33:24 +01:00
dc01f99fed
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-01-30 09:20:14 +00:00
Kim Kulling
Adrian Iusca
Hui.Du
iamAdrianIusca
Marc-Antoine Lortie
Tomas Mariancik
Luke Lau
Max Vollmer
Max Vollmer (Microsoft Havok)
Marc-Antoine Lortie
Zoltan Baldaszti
bzt
Hanif Bin Ariffin