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
feeb875453
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-01-30 09:20:08 +00:00
a2ef0b5bd5
Update M3DImporter.cpp
...
Fix some review finding:
- Add missing brackets to make code more readable
- fix scope of variables
2020-01-30 10:00:43 +01:00
605336832f
Update M3DImporter.cpp
...
Add missing brackets
2020-01-30 09:47:39 +01:00
0273ffc367
Merge branch 'master' into master
2020-01-30 09:46:41 +01:00
cb623f8b74
Merge branch 'master' into master
2020-01-29 22:24:48 +01:00
398a8f757e
Additional checks on invalid input
2020-01-29 22:08:34 +01:00
ff168d7bc0
Refactored Assxml exporter and dump xml writer.
...
- Moved AssxmlExporter serialization code in a new file AssxmlFileWriter.cpp/h
- Added new files to CMakeLists.txt
- Replaced string format specifiers %i by %u to match argument type.
- Made a few changes in WriteDumb.cpp to call the new DumpSceneToAssxml function.
2020-01-29 13:44:51 -05:00
9e46fca9a9
Added missing checks for tempData and uvIndices sizes in all cases
2020-01-29 15:06:48 +00:00
0d672efa90
Check input token length before copy
2020-01-29 15:04:26 +00:00
6c95ee145c
Merge branch 'master' into kimkulling-patch-1
2020-01-29 14:37:32 +01:00
194d31002d
Import/export of embedded texture names for the glTF/glTF2 format
2020-01-29 14:04:41 +01:00
e40df80d0e
Merge branch 'master' into master
2020-01-29 10:57:06 +01:00
81bc7825d1
Potentially fixed strncpy warning by Coverity.
2020-01-28 14:02:09 -05:00
5f30d4c0f8
Added missing cmd writting.
2020-01-28 12:30:09 -05:00
20388d6a4f
Refactored Assbin exporter and assimp_cmd binary serialization functions.
...
- Renamed AssimpExport to AssimpFileWriter.
- Moved AssimpFileWriter to it's own file.
- Added a try catch in WriteBinaryDump to fix a case with memory leak.
- Replaced calls to WriteBinaryDump with AssimpFileWriter.
- Added new AssimpFileWriter files to CMakeLists.txt.
2020-01-28 09:55:05 -05:00
27449f17ca
Merge branch 'master' into master
2020-01-28 14:13:29 +01:00
21e4632b99
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-27 18:01:24 -05:00
16d71908d7
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-27 18:01:03 -05:00
4337c07e4b
Remove explicit setting of macos install_name
...
Use CMake default behaviour for libassimp
Fixes #2961
2020-01-27 17:08:56 +00:00
5d5a4faf47
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-25 13:35:14 -05:00
5ab67f6491
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-25 13:34:59 -05:00
48bb2978af
Added support to load HL1 MDL external texture files directly.
2020-01-24 13:14:37 -05:00
e093066a2c
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-24 07:22:59 -05:00
b9ae88f200
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-24 07:20:03 -05:00
57c735cdca
Merge branch 'master' into master
2020-01-24 11:30:59 +01:00
770c822621
Updated places to achFormatHint referencing array size.
2020-01-23 15:26:49 -05:00
e569831253
Update HL1MDLLoader.cpp
...
Fix possible x64 issue.
2020-01-23 16:20:34 +01:00
b74b96fca4
Merge branch 'master' into hl1-mdl-deletion-temp-nodes
2020-01-23 15:17:19 +01:00
5b09758f15
Update HL1MDLLoader.cpp
...
Fix compiler warning
2020-01-23 15:04:07 +01:00
259d670f54
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-23 11:14:05 +01:00
092883cf19
Merge branch 'master' into update-copyright-end-date
2020-01-22 18:03:43 +01:00
2081b71838
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2
2020-01-22 10:52:51 -05:00
11d98e7cf6
Merge branch 'master' into hl1-mdl-fix-texture-format
2020-01-22 10:47:34 -05:00
3e8a33aae3
Fixed wrong texture format used in HL1 MDL loader.
2020-01-22 10:02:38 -05:00
ff8a924ffb
[HL1 MDL] Removed downscale for textures with dimensions greater than 256.
2020-01-22 09:09:39 -05:00
2ebafe0693
Fix version revision formatting in glTF metadata
2020-01-22 12:40:57 +01:00
1edb52c0de
ScenePreprocessor: Assert some properties about animation channels
2020-01-22 12:22:52 +02:00
aee292e367
Whitespace
2020-01-22 12:22:52 +02:00
288a638a83
X: Only create animation key arrays if there are some keys
2020-01-22 12:22:52 +02:00
3cf7d955f3
Update HL1MDLLoader.cpp
...
Fix compiler warning
2020-01-22 10:06:40 +01:00
6a5ab0381d
Update HL1MDLLoader.cpp
...
Add missing const
2020-01-22 09:46:37 +01:00
e27b54f504
Update HL1MDLLoader.cpp
...
Fix review findings.
2020-01-21 19:39:29 +01:00
caf9e31181
Merge branch 'master' into hl1-mdl-deletion-temp-nodes
2020-01-21 11:57:49 -05:00
4e7e47bd43
Updated copyright dates.
...
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".
Changed copyright end year to 2020 in LICENCE.rtf.
Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
b7e51a38ef
Update HL1MDLLoader.cpp
...
Minor findings.
2020-01-19 20:16:13 +01:00
9deb8fb786
Fixed child nodes not deleted if the importer failed to add them to the scene root node.
2020-01-19 12:48:45 -05:00
41e594f7b1
Merge branch 'master' into master
2020-01-19 12:46:07 +01:00
b74562f8a0
Fixed delete operator.
2020-01-18 15:16:03 -05:00
247667233d
Fixed memory leak in MDLLoader.cpp
...
If one of the MDL importer implementations throw an exception, the memory allocated at mBuffer may never be freed. This fix should prevent further memory leaks.
2020-01-18 14:58:19 -05:00
cc40963e1a
Removed name of unreferenced local variable in catch block
2020-01-17 16:07:50 +01:00
6970e70dbb
[MDL] Updated header to use when checking file size. (Redone)
...
This is needed since it's possible to have an MDL sequence group file that has a size less than the Quake 1 MDL header.
2020-01-17 08:27:52 -05:00
bdbe111abd
Merge branch 'master' into master
2020-01-17 08:17:45 +01:00
986c18501a
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:31:44 +01:00
bdc10aa336
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:30:11 +01:00
784a05651b
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:29:30 +01:00
633a37512f
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:28:45 +01:00
91ecad5da8
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:28:04 +01:00
3ab21c926c
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:27:00 +01:00
fb5a30efd0
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:25:37 +01:00
e0e9ec720b
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:24:06 +01:00
715337aa0b
Suppressed MSVC++ warning C4244
...
'return': conversion from '__int64' to 'int', possible loss of data
2020-01-16 18:21:28 +01:00
bd3118f896
Merge branch 'master' into misc-fixes
2020-01-16 13:50:25 +01:00
89e622060b
Preserve more exceptions in Half-Life MDL loader
2020-01-16 14:02:04 +02:00
1cae51615f
Fix: gltf exporting memory leak
2020-01-16 12:09:31 +13:00
625357685c
Update EmbedTexturesProcess.cpp
...
closes https://github.com/assimp/assimp/issues/2874 : fix leaked texture buffer.
2020-01-09 22:04:46 +01:00
88bb0bad6a
Merge branch 'master' into kimkulling-patch-1
2020-01-08 10:31:44 +01:00
37210372a8
Update VertexTriangleAdjacency.cpp
...
closes https://github.com/assimp/assimp/issues/2806 : calculate corret number of vertices.
2020-01-07 21:26:37 +01:00
9b8f2970c8
Update glTF2Importer.cpp
...
- fix compiler error: invalid == operator
- Fix compiler warning: conversion from double to ai_real
2020-01-07 21:22:41 +01:00
f04573984a
Update glTF2Importer.cpp
...
Remove dead code
2020-01-07 20:41:37 +01:00
e3988cc066
Fix possible null pointer exception on scene metadata when exporting a glTF2 file
2020-01-07 16:20:33 +01:00
52a7be775d
Fix PlyExporter to support faces with 0 vertices
2020-01-06 14:57:59 +01:00
cce77345e5
Update ColladaHelper.h
...
Add missing include.
2020-01-04 11:57:26 +01:00
12ee1a6776
Merge branch 'master' into fix/collada-combining-animations
2020-01-03 12:13:52 +01:00
ae7a0aa6ef
Merge branch 'master' into collada_modeller_metadata
2020-01-02 13:25:04 +00:00
4e50b05b85
Fix off-by-one error
2020-01-02 13:24:50 +00:00
ab50b5e181
Fix typo, fix GCC build
2020-01-02 13:02:40 +00:00
d11af753f2
Fix Codacity warnings, test Exporter metadata
...
Pass std::string around instead as need to create one anyway.
Use CamelCase version to avoid caseSensiTivity issues
as will usually want the camelcase edition anyway.
Not UTF-8 but the standard XML tags are ASCII anyway
2020-01-02 12:35:00 +00:00
6bdda42cd0
Merge branch 'master' into fix/collada-combining-animations
2020-01-02 00:40:03 +01:00
1d8e854ba3
Merge branch 'master' into uv-coordinates-swapped-twice
2019-12-30 08:37:43 -05:00
6de5ff8f7d
Fixed UV coordinate swapped twice in big endian.
2019-12-30 08:30:34 -05:00
5ce373c312
Don't combine Collada animations when channels are shared
2019-12-29 16:05:33 -03:00
c9d9f2077d
Merge branch 'master' into gltf-import-bug-fix
2019-12-27 16:35:09 +01:00
d2ed36756c
fix bug:Using custom IO logic in Android platform, importing from 'assets' dir,there comes to be one more '/', which makes the '.bin' file loads failed.
2019-12-27 11:21:05 +08:00
2026d52df4
Improved comments in HL1MDLFile.h
2019-12-25 12:57:48 -05:00
1e29329a84
Merge branch 'master' into hl1-mdl-loader
2019-12-25 10:13:42 +01:00
97bc855e80
Merge branch 'master' into patch-1
2019-12-23 23:27:21 +01:00
ae92a34d91
Update SMDLoader.cpp
...
GCC compilation on windows was failing. Better to check for Visual c++ than Win32.
2019-12-22 09:57:02 +01:00
79aeb65ab4
Merge branch 'master' into master
2019-12-22 09:18:02 +01:00
4050f7601f
Merge branch 'master' into hl1-mdl-loader
2019-12-19 09:47:19 -05:00
3b7e2bc3fa
Fix typos
2019-12-18 16:13:23 +00:00
87de50e1f3
Added missing parentheses around assignment in while condition.
2019-12-18 07:51:45 -05:00
02c2bfa2b8
Added missing member initializations.
2019-12-18 07:35:30 -05:00
7c2cec2182
Fixed member initialization order.
...
anim_headers_ is declared before animbuffers_ in HL1MDLLoader.h.
2019-12-18 07:28:52 -05:00
69902c99c8
Restored PACK_STRUCT on AnimValue_HL1 union and removed PACK_STRUCT on inner struct.
...
My apologies, as this was a mistake. I misread the problem and removed the wrong PACK_STRUCT.
2019-12-17 18:22:22 -05:00
188ee6562e
Moved/Added several includes to file HL1MDLLoader.h.
...
GCC says there are several class types such as DefaultIOSystem, std::unique_ptr that are undeclared. I moved several includes to this header and also added <string> and <assimp/types> because there are strings and Assimp types defined further down.
2019-12-17 17:47:26 -05:00
fe2fdcf77c
Removed unwanted PACK_STRUCT on union.
2019-12-17 17:27:21 -05:00
330d9ca916
Replaced strncpy by individual character assigments.
2019-12-17 16:37:32 -05:00
e85776aaab
Added missing null terminator.
2019-12-17 16:16:18 -05:00
a45e13b183
Fixed compilation issue.
...
"insert_or_assign" was not defined in the Visual Studio 2013 toolset.
2019-12-17 15:12:19 -05:00
eed0bd3ef6
Added support to load Half-Life 1 MDL files.
...
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
2019-12-16 10:26:46 -05:00
8a800e7aa5
Removed functionality and minor material-mapping fix
2019-12-15 12:25:34 +01:00
7244f53f5f
Merge branch 'master' into partial-cleanup-m3d
2019-12-14 19:22:19 +01:00
a10b0d4de3
Requested modifications
2019-12-14 08:52:48 +01:00
0ff04b9769
Update ColladaParser.cpp
...
Fix the build and fix 2 possible nullptr dereferences.
2019-12-13 11:20:50 +01:00
512e6dff4f
Fixed ANSI C compiler issue
2019-12-13 09:16:41 +01:00
2fc72c8f72
Merge branch 'master' into master
2019-12-13 09:17:06 +01:00
453eeb65cd
Merge branch 'master' of https://github.com/bztsrc/assimp
2019-12-13 09:05:06 +01:00
f151a5d11d
MSVC2013 alternative to thread_local
2019-12-13 09:04:40 +01:00
53bf442beb
Update ColladaParser.cpp
...
Fix review findings.
2019-12-13 08:30:40 +01:00
9ef2d7fb7d
Merge branch 'master' into collada_modeller_metadata
2019-12-13 08:28:50 +01:00
71d7ff63f5
Update ColladaHelper.cpp
...
Add spaces instead of tabs.
2019-12-13 08:25:45 +01:00
8be1060ec4
Update m3d.h
...
Fix vs-defines for unused define as well.
2019-12-13 08:21:45 +01:00
32835873f0
Update m3d.h
...
Fix review warning.
2019-12-13 08:19:39 +01:00
6b2fe41a3b
Replaced mutex with thread-local variable
2019-12-13 07:30:59 +01:00
30634ff56e
Be more tolerant to invalid input
2019-12-13 06:38:49 +01:00
7a83e89b02
Merge branch 'master' into master
2019-12-13 04:49:57 +01:00
b6553b8a78
Merge branch 'master' into fixTexcoord
2019-12-12 12:19:02 +00:00
b70c05b4e0
Fix texcoords.
2019-12-12 09:38:50 +00:00
e17431b993
Added extra check for file size
2019-12-11 06:21:35 +01:00
fb95e49824
More MSVC workarounds
2019-12-11 05:47:59 +01:00
08c5fa37bf
Add a support for 3DSMax Physically Based Materials for FBX format
2019-12-10 12:04:35 +00:00
Kim Kulling
Tomas Mariancik
Marc-Antoine Lortie
Luke Lau
Max Vollmer
Max Vollmer (Microsoft Havok)
Marc-Antoine Lortie
Zoltan Baldaszti
bzt
Hanif Bin Ariffin
Loïc
RichardTea
Turo Lamminen
Matthias Moulin
Hui.Du
Dunni
Felipeek
bill.shan
Mateusz Paluch
Malcolm Tyrrell
Malcolm Tyrrell
Mike Samsonov