d48ac9d0a4
fix xcode compile bug
2020-10-18 10:54:04 +08:00
ad7f8910e9
Rollback the method to handle empty bones for GLTF2
...
A patch made the assimp to ignore empty bones.
However, some assets can have bones which don't have weights
but are connected to other bones.
2020-10-16 17:09:17 +02:00
9f880e2214
Fix glTF1 orthographic camera
2020-10-16 08:56:55 +02:00
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
3b5212067c
Fix CMake config generation
...
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
7660070aa4
Merge branch 'master' into master
2020-10-14 21:01:35 +02:00
857f62cde0
closes pParam.mReference = source;
2020-10-14 20:34:46 +02:00
6848a18999
Fix for issue #3445
...
Add const to avoid creating a temporary copy.
This should fix the cmake compilation error on XGLLoader.cpp shown in bug #3445
The fix is similar to commit bbe6f7f213
2020-10-13 21:56:43 +03:00
84ef3dc0fc
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-13 18:37:03 +02:00
f12e6eb6f4
Update Hunter for pugixml
2020-10-12 16:30:03 -04:00
636f28965f
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-11 18:13:43 +02:00
eb9928e029
fix for fbx files using stringray materials;
2020-10-09 07:28:15 +01:00
20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-08 09:54:04 +01:00
152343b186
Merge branch 'master' into master
2020-10-06 08:35:26 +05:30
52826a03f8
remove all hunter-dependencies for pugixml.
2020-10-05 18:53:42 +02:00
23f144a7b7
pugixml: use pugixml in headeronly mode.
2020-10-05 18:44:59 +02:00
4bdaf20b70
Add comment.
2020-10-05 14:23:42 +01:00
f2b3ec2e0c
strict-aliasing level 3 warnings fix
2020-10-05 15:29:09 +05:30
585fb89154
Make an assert a DeadlyImportError.
2020-10-02 15:25:16 +01:00
6b9c477763
The floar parsing routines are now DeadlyErrors.
2020-10-02 13:58:55 +01:00
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
d75fa2bb4b
fix invalid path.
2020-10-01 10:43:48 +02:00
c740f61f97
hunter integration: pugixml
2020-10-01 10:29:52 +02:00
c7f7ed8901
Update ColladaLoader.cpp
2020-09-30 20:51:54 +02:00
0191c661b5
fix division by zero.
2020-09-30 20:39:26 +02:00
177426185e
Fix invalid cast
2020-09-30 16:38:13 +02:00
50d21e08f3
fix memoy leak.
2020-09-30 12:05:32 +02:00
788099a223
Merge branch 'master' into pugi_xml
2020-09-29 21:29:37 +02:00
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
db49a541c3
remove unused attributes.
2020-09-28 20:35:30 +02:00
ef9a78b49d
remove unused attributes.
2020-09-28 20:34:44 +02:00
effccfe2e6
Remove dead code.
2020-09-28 15:23:26 +02:00
bf4ad2837f
Remove dead code.
2020-09-28 15:20:59 +02:00
69822fd5e6
remove pugixml from hunter
2020-09-28 10:23:25 +02:00
c598a12340
Remove unused variable.
2020-09-28 09:15:56 +02:00
89ac168014
ogre: fix warning: not inited variable.
2020-09-27 21:23:55 +02:00
1c85676a9c
collada: fix warning: not inited variable.
2020-09-27 21:19:23 +02:00
052cc2e070
collada: fix warning: not inited variable.
2020-09-27 21:16:51 +02:00
5038f21d06
collada: fix warning: not inited variable.
2020-09-27 21:14:21 +02:00
202907d471
collada: fix warning: unused variable.
2020-09-27 21:11:42 +02:00
3f97a1df2c
collada: fix warning: unused variable.
2020-09-27 21:09:06 +02:00
bdd3c96eee
amf: fix warning: unused variable.
2020-09-27 21:06:14 +02:00
5877f81419
amf: fix warning: unused variable.
2020-09-27 21:03:59 +02:00
5230b91611
amf: fix warning: unused variable.
2020-09-27 21:01:48 +02:00
8143ea5aec
amf: fix warning: unused variable.
2020-09-27 20:58:08 +02:00
9a19a4723b
amf: fix warning: unused variable.
2020-09-27 20:54:21 +02:00
5653a82a87
fix the unittests.
2020-09-27 20:20:44 +02:00
9234fee35e
Ogre: fix xml migration.
2020-09-27 09:36:38 +02:00
a3c8cfc0ff
Fix for build break due to warnings-as-errors when not building M3D exporter.
2020-09-26 23:21:23 -07:00
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
557273818d
collada: next iteration.
2020-09-23 21:23:12 +02:00
34351b3cb9
fix collada material parsing.
2020-09-23 00:20:06 +02:00
c0e58c1895
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-22 20:02:16 +02:00
71f20eaa8a
next fixes
2020-09-22 15:51:21 +02:00
dee8e5bee1
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
2020-09-22 15:20:35 +02:00
c4039d5cf0
fix collada data parsing.
2020-09-21 20:05:16 +02:00
8c88526da8
fix collada unittests.
2020-09-21 16:39:24 +02:00
c9fb21661f
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-18 08:01:24 +01:00
354e09e785
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-17 14:39:04 -04:00
338c0b753c
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-16 21:43:35 +02:00
9c1edaee96
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-16 10:08:47 +01:00
14d6141f69
Collada: fix scenenode parsing.
2020-09-14 21:35:36 +02:00
9e2c4e0cf4
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-14 09:00:11 +02:00
0e9621012c
Adapt code style - finally :-).
2020-09-14 08:43:31 +02:00
1ff9e2b522
Adapt code style.
2020-09-14 08:40:21 +02:00
23defc275a
Merge branch 'master' into makeInternalErrorsAccessible
2020-09-14 08:36:13 +02:00
d0932c405f
fix duplicated node parsing.
2020-09-11 15:46:46 +02:00
c1f50e116a
fix next unittests.
2020-09-11 00:46:29 +02:00
31f3812241
XGL: fix import of node values.
2020-09-10 21:03:02 +02:00
6ec07e4dc7
XGL: next steps.
2020-09-10 17:31:30 +02:00
cca9eddb1c
Fix material-base AMF-unittest.
2020-09-10 13:56:04 +02:00
615ffdf93f
What: Throw instead of assert when input file is invalid.
...
Why: Assimp shouldn't crash on invalid files. Asserts are disabled on Release builds.
2020-09-10 10:47:58 +01:00
d854f3b842
AMF: fix adding for child-nodes.
2020-09-10 00:05:53 +02:00
bd91033172
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-08 20:53:00 +02:00
0618db1f99
AMF: some smaller refactorings to improve readability.
2020-09-07 20:52:46 +02:00
f3b25b999b
Fix an unreferenced formal parameter warning on MSVC when no exporter is built
2020-09-05 23:20:31 +02:00
ef6b93a949
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-04 16:27:47 +02:00
689406fbda
Fix Colladat import.
2020-09-04 07:33:10 +02:00
78b30d1752
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-03 09:51:32 -04:00
be5089ae40
Collada: correct parsing of float data in xml nodes.
2020-09-02 22:38:19 +02:00
075540e15a
AMF: fixes.
2020-09-02 22:37:57 +02:00
0b8ed5c03a
fix crash when x3d is empty
2020-09-02 21:49:40 +02:00
34f343233e
3ml: fix xml parsing.
2020-09-02 21:49:20 +02:00
87d2580aad
fix 3mf rel-parsing
2020-09-02 17:45:37 +02:00
9053dfea05
add missing define to glTF importer
2020-09-02 16:28:12 +02:00
73fa2cbe88
Fix memory handling of xml-nodes in the parser.
2020-09-01 21:48:50 +02:00
638499a278
Replace unique_ptr and add custom deleter
2020-09-01 10:30:31 -06:00
3c2133a3b9
fix node collection for collada xml parsing
2020-09-01 07:51:17 +02:00
e62b4e5cce
next iteration.
2020-08-31 16:10:38 +02:00
6d5c388780
Introduce node iterator.
2020-08-30 21:10:04 +02:00
dcf9a7b2d8
Conform variable names to code standards
2020-08-29 23:58:31 -06:00
953e976de6
Close stream when finished
2020-08-29 23:56:50 -06:00
cc2613f264
Replace unique_ptr with raw pointer
2020-08-29 23:06:33 -06:00
c769f8d4ad
Replace unique_ptr with raw pointer to avoid destructing stream
2020-08-29 22:21:34 -06:00
30a4eae17f
simplify some ttributes access in loaded xml.
2020-08-28 16:25:22 +02:00
0730eebe6f
fix collada handling of xml nodes.
2020-08-28 16:17:56 +02:00
3c98197be0
set aiAnimation->mTicksPerSecond to 1000.0. this is analog to the behaviour of gltf2-importer
2020-08-28 16:09:15 +02:00
b7e9595e54
fix loop of xml-files.
2020-08-28 00:09:51 +02:00
59c8b4ed84
Move RapidJSON definitions to CMake
2020-08-27 16:51:06 -04:00
582a8b1887
Fix xml-migration bild.
2020-08-27 17:05:09 +02:00
c359b973bb
finish migration of collada.
2020-08-26 22:31:46 +02:00
904f17f29f
next collada-iteration
2020-08-24 07:44:54 +02:00
7adfe1f2d8
Xml: introduce helper for attribute parsing.
2020-08-21 06:45:30 +02:00
8f893e3653
Actually, just keep the old behaviour for now.
2020-08-20 14:32:15 +01:00
cb631517a7
next iteration.
2020-08-19 22:44:13 +02:00
9b5e758bdd
Even simpler DeadlyErrorBase
2020-08-19 17:59:13 +01:00
6f9c61e157
Use case which matches surrounding code.
2020-08-19 17:57:25 +01:00
6c2ceb55f8
Simplify some FBX error code.
2020-08-19 17:20:57 +01:00
d393f677ce
Collada: next methods migrated.
2020-08-19 17:10:30 +02:00
56381241c5
move hasAttribute to XmlParser scope.
2020-08-19 00:19:56 +02:00
554ed1bf91
next step.s
2020-08-18 20:44:06 +02:00
0f6127e90e
No need to build strings.
2020-08-18 18:21:20 +01:00
e1a0163e7e
Make all exceptions available.
2020-08-18 18:14:51 +01:00
b7c789da67
Stop concatenating std::strings. Use formatter.
2020-08-18 17:35:08 +01:00
6a8edb21f8
fix merge issues
2020-08-18 17:41:37 +02:00
0ffcdf160e
Build formatting into DeadlyImportError
2020-08-18 16:32:34 +01:00
7e93ae4428
3MF: Migration.
2020-08-18 16:54:29 +02:00
829ff1adf0
Maybe this will help.
2020-08-18 10:33:47 +01:00
b1ed751b83
Provide an API for accessing internal errors.
2020-08-18 10:33:42 +01:00
0d00ff7043
use ai_real instead of float
2020-08-15 14:57:49 +02:00
729882debb
Fix incorrect index
...
closes https://github.com/assimp/assimp/issues/3364
2020-08-11 19:57:36 +02:00
394651e640
x3d: migration of goups.
2020-08-10 22:13:45 +02:00
11daed69d3
Fixed overwriting of CMake global output directory variables.
2020-08-07 16:04:39 -04:00
13d7fad7f7
closes https://github.com/assimp/assimp/issues/2992 : add single or double precision + missing compilers.
2020-08-07 14:23:07 +02:00
58bf23be55
Merge branch 'master' into issue_3353
2020-08-05 18:03:26 +02:00
b94183376c
Fix possible overflow in new.
2020-08-05 17:56:44 +02:00
1f348c5fc0
Remove redundant float f
2020-08-04 20:55:29 +02:00
aabf12827b
fix typo
2020-08-04 17:52:43 +02:00
855b47452e
Export opacity is 3DS
...
closes https://github.com/assimp/assimp/issues/3291
2020-08-04 17:41:28 +02:00
e7ae576614
undo change
2020-08-03 15:54:19 +02:00
435bba30dd
Move functions into the correct preprocessor branch
2020-08-03 09:30:02 +02:00
008e551f8e
Merge branch 'master' into fbxVersionCheck
2020-07-31 14:33:21 +02:00
0282f358a4
Remove unneeded check.
2020-07-31 12:40:17 +01:00
301bae3967
Improve message
2020-07-30 16:37:41 +01:00
eaf0587dd8
FBX Version/Size Check
2020-07-30 14:56:01 +01:00
3170c3d15c
FBXExport: Fix crash if scene->mMetaData is null
2020-07-30 09:21:43 -04:00
58b81a2590
start migrating X3D.
2020-07-26 10:17:21 +02:00
ad18e365e5
Fixing more warnings
2020-07-24 16:33:36 -04:00
c7a9ef30cc
Merge branch 'master' into fix-mingw-priumax
2020-07-24 11:14:15 +02:00
0f442b1ff2
Merge branch 'master' into gltfIndexOutOfRangeFix
2020-07-23 11:27:34 +02:00
a33557be71
Merge branch 'master' into acloader_enums
2020-07-22 23:50:51 +02:00
76a6bb36f6
Merge branch 'master' into issue-3332_msvc2017
2020-07-20 22:04:35 +02:00
51e592123a
Fix two deletions.
2020-07-20 18:42:57 +02:00
a19e4e4112
Make clang with msvc abi work.
2020-07-20 18:28:50 +02:00
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
9cad10a995
Disable MSVC warnings on all MSVC
...
Fixes the build on MSVC 2017 (and probably MSVC 2015)
2020-07-17 14:58:51 +01:00
f2e3e43fbc
Merge branch 'master' into acloader_enums
2020-07-17 11:30:50 +01:00
17b9403b7a
ACLoader: Use enum for Surface flags
2020-07-17 11:23:50 +01:00
b2e53783de
Merge branch 'master' into fix-mingw-priumax
2020-07-17 12:07:46 +02:00
fa486240d5
Merge branch 'master' into rbsheth_update_hunter
2020-07-17 11:39:55 +02:00
719cc82a1f
Apply clangformat
2020-07-17 10:29:44 +01:00
516bdc2a4b
Merge branch 'master' into master
2020-07-16 22:48:02 +02:00
deddaf49df
finish migrate ogrexmlserializer.
2020-07-16 11:33:28 +02:00
df8792d24b
Merge branch 'master' into gltf1_gltf2_split
2020-07-16 10:45:55 +02:00
84e68eaf24
fix invalid pointer for bone animation
2020-07-16 15:26:02 +09:00
04df5f8b1e
Don't use make_unique
2020-07-15 15:47:25 +01:00
e1bab44e19
Exception safety
2020-07-15 15:02:27 +01:00
37e1fb9cd7
Fix message
2020-07-15 14:19:13 +01:00
f3170a96ba
Ensure data does not depend on faces we may not have created.
2020-07-15 12:36:48 +01:00
fff6396e3c
Rename to avoid overloading problems.
2020-07-15 12:22:28 +01:00
212903e935
Unit test for all indices out of range, and fix.
2020-07-15 12:19:00 +01:00
c0d978786e
Fix warning
2020-07-15 09:12:52 +01:00
a56134ba33
Drop faces when indices are out of range.
2020-07-15 09:05:09 +01:00
638369e995
Try to fix lexing issue with preproc w/r/t __has_warning
2020-07-14 21:58:36 -05:00
cc8cd88d7a
Preproc conditional should be &&, not ||
2020-07-14 21:50:22 -05:00
bad0df9a1a
Remove unnecessary inversion in preproc
2020-07-14 21:48:46 -05:00
b3f61f8759
Fix error where -Wunused-but-set-variable might not be available
2020-07-14 21:44:33 -05:00
3bf6963d20
Use a better divider for import error
2020-07-14 21:34:30 -05:00
93d567e3b1
Fix sprintf format string
2020-07-14 21:32:22 -05:00
700d8e6614
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-14 21:19:07 -05:00
abc6b9ce4c
ifdef fixes to fix MSVC warnings
2020-07-14 19:00:38 -04:00
209a61d0e7
Update hunter and utf8cpp inclusion
2020-07-14 19:00:23 -04:00
84e342acd7
DefaultIOStream: Remove assert on empty count
...
fwrite() is valid to call with a 0 count, and will simply return 0.
See:
https://en.cppreference.com/w/cpp/io/c/fwrite
http://www.cplusplus.com/reference/cstdio/fwrite/
There are code paths where StreamWriter will call Tell(), which calls
Flush(), which calls Write(buffer.data(), 1, buffer.size()). This can
happen when nothing has yet been written to the buffer, so size is 0.
2020-07-14 10:39:18 -04:00
b19ebf5d54
Fix merge conflicts.
2020-07-14 09:02:14 +02:00
8cfd2a4cc1
Migrate OgreSerializer.
2020-07-14 09:00:06 +02:00
f5d5d7c5ed
Merge branch 'master' into master
2020-07-13 20:35:24 +02:00
0c2f7a119c
FBXExporter: Forgot WritePropColor defaultValue
2020-07-13 13:56:06 -04:00
6619ec8253
FBXExporter: Use scene metadata for global settings
...
Models with non-standard axes and scale are not imported and exported
correctly if the input metadata is ignored.
2020-07-13 13:56:06 -04:00
78d0b81b6c
Merge branch 'master' into patch-1
2020-07-12 18:54:34 +02:00
eaac92830a
Merge branch 'master' of https://github.com/LoicFr/assimp into LoicFr-master
2020-07-12 12:05:34 +02:00
b1dd77fbbc
Merge branch 'master' into gltf2_sparseAccessor_export
2020-07-11 22:57:31 +02:00
306e03d497
Merge branch 'master' into extras_property_callback
2020-07-11 22:46:19 +02:00
21678df589
ogre + collada migration.
2020-07-10 22:25:38 +02:00
628394baec
check for invalid vertex
2020-07-07 23:29:54 -04:00
9aa468262f
closes https://github.com/assimp/assimp/issues/3252 : fix build.
2020-07-07 17:35:03 +02:00
6c29247180
add triangle strip support to AC file loader
2020-07-06 17:41:14 -04:00
fb11705dd0
Merge branch 'master' into gltf1_gltf2_split
2020-07-06 09:11:06 +01:00
abf43eaf74
* Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently.
...
* ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before
2020-07-05 19:22:31 +01:00
d04f8b3174
Merge branch 'master' into defsIncludeFix
2020-07-05 18:59:37 +02:00
77b705048b
fix merge issues.
2020-07-04 13:42:23 +02:00
839986ca14
next step of AMF-Migration.
2020-07-04 09:04:06 +02:00
3fb7747429
Improve ToBinary() for double precision.
...
The constant 0x80000000 is specific to 32 bit types. Make the bit mask
according to the size of types.
2020-07-03 18:14:45 -07:00
d74c10dcb7
Merge branch 'master' into pugi_xml
2020-07-03 17:29:38 +02:00
51150cb3df
Ensure asserts are defined where expected.
2020-07-02 14:53:29 +01:00
693da43095
closes https://github.com/assimp/assimp/issues/3305 : remove merge issue.
2020-07-02 15:22:06 +02:00
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
7fda533484
Merge branch 'master' into double
2020-06-30 21:12:02 +02:00
97085c1c05
update sync
2020-06-30 11:48:37 -07:00
36f899bf09
sync update
2020-06-30 11:45:11 -07:00
3f2e5518eb
update sync
2020-06-30 11:29:08 -07:00
03340787ec
Fixed variable in loop - HL1MDLLoader.cpp
...
Commit 7e5a0acc48
2020-06-29 07:50:51 -04:00
eeb4a981bd
Merge branch 'master' into patch-2
2020-06-29 09:55:55 +02:00
30f09e9fc0
Fix build when ASSIMP_DOUBLE_PRECISION is on.
...
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make
The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
2020-06-28 17:36:21 -07:00
fb20e15163
start to migrate colladat and amf
2020-06-27 15:57:06 +02:00
6d85280c8d
Added bool, removed unused debug parameter
2020-06-27 12:53:26 +10:00
f6b4370f6a
Added arbitrary recursive metadata to allow for glTF2's extensions to be properly represented.
...
Primary changes are to include/assimp/metadata.h, adding in the aiMetadata GetAiType function,
adding the operator= to allow an aiMetadata type to be assigned, adding a check for the
AI_AIMETADATA type flag as it can't be trivially memcpy'd.
operator= is implemented with a by-value argument as then the copy is made by the copy
constructor and we can just swap everything out and let the destructor handle the mess.
Implemented parsing of the "extensions" flag on all glTF2 Nodes. Doesn't use the ReadValue
helper function on numbers as it did not seem to fill out the Nullable structure properly.
2020-06-26 14:28:41 +10:00
b7b38c2282
Merge branch 'master' into patch-2
2020-06-25 16:52:40 +02:00
ba6af9ff98
Merge branch 'master' into FindInvalidData
2020-06-25 16:41:24 +02:00
95e822a6ec
Merge branch 'master' into aiAssertHandler
2020-06-24 20:47:10 +02:00
1466bbacf8
fix unittests.
2020-06-24 20:30:02 +02:00
ae05dbb252
define CheckValidFacesIndices also in release builds.
2020-06-23 21:11:18 +02:00
6205af4efb
replace NULL and avoid ai_assert with more than 2 tests.
2020-06-23 21:05:42 +02:00
9188f56839
Allow assert handling to be replaced.
2020-06-23 11:55:51 +01:00
5717ea466f
FindInvalidDataProcess: Mark removed meshes as "out"
...
There's a code path where an input scene only has a single mesh.
In this case, if ProcessMesh returns 2, we delete the mesh and move on
with the postprocessing. UpdateMeshReferences is not called and so the
deleted mesh is left dangling in nodes.
In a later step (SplitMesh in my testing), it then tries to deference a
null pointer and we explode.
With `out = true`, we can now hit the DeadlyImportError instead of a
segfault.
2020-06-22 17:24:16 -04:00
2006286528
Fix Maya PBR & stingray texture detection
2020-06-22 23:14:16 +02:00
ba09e1ef94
Fix Blender .fbx metalness detection
2020-06-21 23:56:11 +02:00
6397bfbf90
replace NULL by nullptr on loadFile.
2020-06-21 12:03:38 +02:00
6acaaee80f
Check invalid vertex id for bone weight
2020-06-20 15:27:28 +09:00
b3af5c5a14
closes https://github.com/assimp/assimp/issues/3253 : remove useless code
2020-06-17 20:37:39 +02:00
524e2e4728
fix warning, hopefully ...
2020-06-15 21:34:49 +02:00
31b8d4710f
Merge branch 'master' into issue_3165
2020-06-15 20:32:00 +02:00
15f11aec93
Merge branch 'master' into gltf2_targetNames_export
2020-06-14 09:43:09 +02:00
f938a6b744
fix leak: just ignore broken texture coordinates.
2020-06-12 14:52:02 +02:00
1e0c5f26b4
Merge branch 'migenius-migenius-fix-texcoord' of https://github.com/assimp/assimp into migenius-migenius-fix-texcoord
2020-06-12 12:30:11 +02:00
ad62e6e863
fix unittest check - cannot work, just crash shall not occurr any more.
2020-06-12 12:29:51 +02:00
f67c71d5c7
Merge branch 'master' into fbx_blendshape_channelName
2020-06-12 10:55:32 +02:00
e65434bf82
extra callback
2020-06-11 17:37:06 -07:00
f57e7221c0
temp
2020-06-10 13:23:29 -07:00
578a7ac502
add Callback API in ExporterProperties
2020-06-09 11:20:48 -07:00
ffaa634c48
Merge branch 'master' into issue_3165
2020-06-09 10:48:27 +02:00
88c1509d69
Remove dead code
2020-06-09 10:15:35 +02:00
620bebb999
diable warning only for gcc 8.0 or greater
2020-06-09 10:14:57 +02:00
42afc40d16
Disable warning only for gcc 8.0 or greater
2020-06-09 10:13:43 +02:00
35fb4c9370
Remove dead code
2020-06-09 10:07:25 +02:00
5c7bed01f1
remove dead code.
2020-06-09 10:06:50 +02:00
9e46f9751f
Check for invalid texture coordinate accessor. Fixes #3269 .
2020-06-09 15:49:38 +10:00
8fed101432
avoid all zero
2020-06-08 16:18:11 -07:00
f18f1a35f6
accommodate linux build
2020-06-08 14:49:50 -07:00
2065512470
remove comments
2020-06-08 14:41:53 -07:00
12dc736d94
Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export
2020-06-08 14:32:23 -07:00
26421aebc9
support channel name in blendshape name
2020-06-08 13:33:16 -07:00
b37d42f6b5
Perform sanity check only in debug
...
closes https://github.com/assimp/assimp/issues/3255
2020-06-07 18:03:47 +02:00
e6446e1e68
Merge branch 'master' into issue_3258
2020-06-07 08:23:04 +02:00
2c0df39ef3
Added rapidjson define to avoid warnings in c++17
2020-06-06 14:33:41 +02:00
62273b63e5
closes https://github.com/assimp/assimp/issues/3256 : Remove redundand code
2020-06-06 12:22:01 +02:00
4e34853ac7
gltf2 export target names for blendshapes
2020-06-05 12:17:27 -07:00
6d04e16c7e
Merge branch 'master' into issue_3165
2020-05-28 21:51:58 +02:00
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
87584eb007
glTF2: fix "file size doesn't match" issue when importing GLB in Blender
2020-05-28 11:05:38 +02:00
98767cbb08
pull master
2020-05-27 10:23:28 -07:00
2c9cfefe67
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-26 21:30:51 +02:00
e33ed9e7a1
File is duplicated
...
closes https://github.com/assimp/assimp/issues/3238
2020-05-25 20:30:18 +02:00
78c9ac2889
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-25 16:11:01 +02:00
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
a97e4c15b3
Merge branch 'master' into master
2020-05-21 21:15:50 +02:00
ecfca1d5c5
Merge branch 'master' into verboseLogging
2020-05-21 18:30:52 +02:00
50f0a86798
conditional export
2020-05-19 16:10:41 -07:00
c4055d04b4
Fix double free caused in FindInvalidDataProcess
...
In debug builds, there's no issues, but in release, an invalid mesh that
is deleted in FindInvalidDataProcess will be double free'd when the
parent scene is destroyed.
2020-05-19 14:38:10 -04:00
c10e409a5d
merge
2020-05-18 12:16:45 -07:00
193deb3441
cleanup
2020-05-18 12:01:09 -07:00
e39c632809
cleanup
2020-05-18 11:50:51 -07:00
0897c4c7be
merge
2020-05-18 11:31:44 -07:00
02cbd36271
pull master
2020-05-18 11:15:18 -07:00
e9a3cc2c8a
Fixed rotation order bug in BVH Loader
...
This bug has been present since after the 4.10 release.
It fixes the issue "play the bvh error" #2187
Almost all bvh files are affected, such as any of the CMU library.
The bug is caused by the introduction of channelMap in the BVHLoader.cpp - function void BVHLoader::CreateAnimation(aiScene *pScene). The channelMap loses the rotation order present oin the BVH file, and always applies the rotations in X,Y,Z order.
2020-05-18 16:07:46 +01:00
14692368d5
Same for LogDebug -> LogVerboseDebug
2020-05-18 11:55:14 +01:00
87a7662bee
More thinks using VERBOSE_DEBUG
2020-05-18 11:45:00 +01:00
2438e1b52e
Merge branch 'master' into gltf2_fix_skin_recursion
2020-05-18 09:05:28 +02:00
4b0a3305b1
Merge branch 'master' into master
2020-05-17 13:54:10 +02:00
4f24b3dac2
Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using
2020-05-17 11:48:24 +02:00
cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes
2020-05-16 20:50:34 +02:00
b8e39b58d1
clean up
2020-05-15 12:32:58 -07:00
f6720271cb
sparce accessor exporter
2020-05-15 12:20:31 -07:00
d70685d37f
Fix typo
2020-05-15 17:50:48 +01:00
90cdbd9d9a
Fix ups
2020-05-15 17:46:50 +01:00
434c5e3d37
More verbose logging
2020-05-15 17:29:49 +01:00
e11d78596f
Use verbose debug logging in certain places
2020-05-15 17:26:17 +01:00
5e0136d737
Add concept of verboseDebug
2020-05-15 17:23:07 +01:00
2ffd1cb8db
nits
2020-05-15 17:22:15 +01:00
bcca3a0d79
No need for bespoke macros
2020-05-15 17:22:02 +01:00
6be0ce1ec9
Initial pass at adding logging
2020-05-15 17:21:45 +01:00
7a16a7a7e4
Fix infinite recursion in gltf2 skin parsing
...
Previously parsing a node caused the skin that was attached to it
to be parsed, which caused the skins node joints to be parsed,
which could cause the skin to be re-parsed leading to infinite or
at the very least exponential recursion.
The fix is to just get a reference to a temporarily uninitialized
skin as they were being parsed after the scene graph just to be safe
anyway. This way we avoid the recursion problem and all the references
will be valid in the end.
2020-05-15 16:48:41 +03:00
464d4cf99a
Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master
2020-05-15 15:08:30 +02:00
246ec2b0dc
Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho
2020-05-15 13:37:03 +02:00
a6b5abd698
Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master
2020-05-15 08:51:46 +02:00
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
e9b67cdb89
gltf2 import sparse accessor
2020-05-11 14:34:35 -07:00
c3a21666da
Make gltf2 export normal normalization safe
...
This avoids introducing NaNs e.g. when the input mesh has 0-length normals
2020-05-11 12:02:38 -07:00
c5a9fbd47f
Gracefully handle NaNs and Infs in gltf2 accessor bound computation
2020-05-11 12:02:38 -07:00
aef4ecada5
Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated
...
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point. Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
2020-05-11 12:02:38 -07:00
3fdcd0861f
Fix fbx rotation ;
2020-05-11 10:28:05 +02:00
a1bcca2c99
remove step prototype: does not work this way.
2020-05-07 14:00:40 +02:00
89a865ce19
Merge branch 'master' into master
2020-05-06 22:07:39 +02:00
201347700f
fix incorrect header path on framework build
2020-05-06 16:15:23 +03:00
60e8146b9f
fix wrong target idx when importing
2020-05-05 12:51:40 -07:00
56a4e61533
Collada: Don't copy the scene when exporting
...
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
2020-05-05 10:16:13 +01:00
6e447b2c44
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
2020-05-05 09:52:08 +01:00
d1ae6ac77a
Fix typo in <visual_scene>
...
Swapped Id and Name
2020-05-05 09:51:41 +01:00
fa1d2f09db
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-05 09:33:48 +01:00
ddee1b1ddb
Merge branch 'master' into aaronfranke-file-formatting
2020-05-05 10:21:46 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
bf95d1da7c
fix conversion
2020-05-04 21:48:46 +02:00
8e73984a11
Collada Root Nodes aren't allowed to have meshes
...
Create a null parent node instead
2020-05-04 17:47:09 +01:00
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
ea917bd4ae
Move Collada into AssetLib folder
...
Should make the merge easier
2020-05-04 13:54:49 +01:00
91fa9a102b
closes https://github.com/assimp/assimp/issues/3181 : fix typo for light type.
2020-05-03 12:17:32 +02:00
3b06f57150
add missing inclde +
2020-05-02 21:11:47 +02:00
514593548d
add assert-test for nullptr.
2020-05-02 21:07:41 +02:00
3329e76263
closes https://github.com/assimp/assimp/issues/3178 : throw exception in case of invalid export stream.
2020-05-02 21:06:55 +02:00
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
a0aa067b5f
Moved Texture writing into its own function
2020-05-01 08:35:04 -07:00
1dabb1a094
Collada: Fix crash with AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES
...
Add unit test for this
2020-05-01 14:59:09 +01:00
3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-01 12:08:12 +01:00
5b9f207f1f
ColladaExporter cleanup
...
Namespace, NULL and includes
2020-05-01 11:54:34 +01:00
ee16d2c4c9
Fix camera, light and bone unique ids
...
Bones don't have a unit test yet
2020-05-01 11:13:38 +01:00
2c9d3bea64
Printing out unique textures
2020-04-30 14:01:09 -07:00
083ebdbc2e
Collada Export: More unique Ids
...
Nodes, Materials, Animations, Lights, Cameras, Bones
2020-04-30 18:28:06 +01:00
2d9d112015
fix warning
2020-04-29 21:35:42 +02:00
1c30b7bf8e
tryout: check if leak is coupled to type double.
2020-04-29 21:31:01 +02:00
e0bc0f7fad
try to fix double memleak.
2020-04-29 21:19:15 +02:00
da2bf5c7a4
fix wrong size
2020-04-29 21:13:46 +02:00
f808ed9fb5
fbxconverter: fix memoryleak.
2020-04-29 20:52:49 +02:00
c6131ce38a
scenecombiner: fix leak.
2020-04-29 20:43:23 +02:00
ff9f3b8608
Collada: Ensure <geometry> has unique id
...
Use the "id" for mesh names by default.
Set option AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES to use the mesh "name" instead
2020-04-29 17:17:46 +01:00
2c6ac23a4e
Apply Assimp clangformat to touched Collada files
2020-04-29 14:21:17 +01:00
6967a02fcb
Merge branch 'master' into added_check_before_using
2020-04-28 18:33:29 +00:00
4dfdbbf171
Check index before using
2020-04-28 20:31:59 +02:00
efa046366e
Retrigger build
2020-04-28 09:14:53 +02:00
4488e3e745
build on Linux with gcc and clang; warning as error only for 'assimp' target
2020-04-27 23:38:33 -07:00
81abd90ee1
Fix reading of orthographic camera data. Fixes #3028 .
2020-04-28 10:07:56 +10:00
b0c9711894
Small format finding
2020-04-27 15:16:57 +02:00
629320a3a0
Add timescale for collada
2020-04-27 11:52:04 +02:00
d98787f35b
CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt;
2020-04-26 12:50:42 -07:00
6c1e21d754
fix formatting.
2020-04-26 19:14:30 +02:00
bafb8e3189
closes https://github.com/assimp/assimp/issues/3165 : remove deprecated code whch causes compiler warning.
2020-04-26 08:59:52 +02:00
638df2ceac
Merge branch 'master' into master
2020-04-25 12:07:06 +02:00
3dc550a9b2
Got a working geometry prototype, sponza renders correctly when camera and light is added
2020-04-25 00:10:31 -07:00
07065e2235
Working first proof of concept. Renders ambient term in pbrt
2020-04-22 13:38:06 -07:00
9b1759dcc2
Merge branch 'master' into migenius-migenius-rsws53-mig-2
2020-04-22 19:59:53 +02:00
ca70b44e44
Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2
2020-04-22 19:58:41 +02:00
c36b028412
fix type error for template deduction.
2020-04-21 16:39:18 +02:00
c91d3764ca
Merge branch 'master' into optimized_bonelimits
2020-04-21 08:45:50 +02:00
cb88210c62
Completed scene wide rendering output
2020-04-20 12:23:22 -07:00
1045fb7798
Got 90 percent solution for exporting camera data
2020-04-20 11:55:46 -07:00
f71b332ed1
Update glTF2Asset.inl
...
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
e3563212d7
Merge branch 'master' into master
2020-04-19 21:13:12 +02:00
e0f6eb09e6
Merge branch 'master' into optimized_bonelimits
2020-04-17 20:37:28 +02:00
f9f2d617a2
Added a very basic camera. Still work to do
2020-04-17 10:42:13 -07:00
9c52fd7633
Update D3MFExporter.cpp
2020-04-17 12:58:41 +08:00
e9a72a5053
repair formate 3MF
2020-04-17 12:38:07 +08:00
3bbc8e76bd
Rgba2Hex to repair rgba(1,1,1,1)
2020-04-17 12:34:05 +08:00
c0dc26de8e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-16 11:29:37 +02:00
996abd3fbe
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-16 11:08:29 +02:00
d12e938a70
Merge branch 'master' into ifdef_export_defines
2020-04-16 10:24:23 +02:00
e341eadfd9
Fix typo
2020-04-16 10:23:50 +02:00
69f8d47941
glTF2 support targetNames
2020-04-15 09:39:46 +01:00
e4ceccb42d
Merge branch 'master' into master
2020-04-12 15:58:25 +01:00
a14b5fb06f
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-10 08:44:19 +01:00
485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-10 08:44:18 +01:00
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
3ad53ab630
Printing file metadata
2020-04-08 13:29:03 -07:00
755f3748f1
Merge branch 'master' into master
2020-04-07 11:46:14 +01:00
8c3b374486
Pbrt file exporter hello world
2020-04-06 12:12:37 -07:00
9a11d91cb8
code reformattings.
2020-04-06 13:33:03 +02:00
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
132ecae6f4
Merge branch 'master' into kimkulling_dev
2020-04-04 18:28:50 +02:00
956c57f18e
Merge branch 'master' into master
2020-04-03 13:42:59 +01:00
a07bf8b26f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-04-03 08:40:32 +01:00
d966f3394b
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-04-03 08:40:29 +01:00
c21a1ffffa
Remove comments to increase readability
2020-04-01 11:16:39 +02:00
a7208b02e0
Merge branch 'master' into assimp_gltf2_exporter
2020-04-01 08:42:48 +02:00
53990ffa42
Check for existed bone
2020-03-31 14:18:51 -07:00
87e2d3a54d
Added support for glTF2 sparse accessors.
...
Refactored Accessors, pulling out reusable bits between those
and sparse accessors' indices / values.
2020-03-31 11:28:26 +01:00
54419eb9a0
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-31 09:54:12 +01:00
806d81c919
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-31 09:54:01 +01:00
3ef46b0edd
Weights and bones count checks
2020-03-30 16:56:33 -07:00
5e93b9ea8b
Fixed bone splitting with excessive amount of bones with 0 weight
2020-03-30 12:42:32 -07:00
6973aea6da
fix compiler warnings.
2020-03-30 20:41:39 +02:00
4c177ad72e
fix possible warnings
2020-03-30 20:33:43 +02:00
d51b89f3ce
trigger build
2020-03-29 13:44:14 +02:00
b1165cff28
Merge branch 'master' into kimkulling_dev
2020-03-29 12:07:20 +02:00
222b145307
Merge branch 'master' into optimized_bonelimits
2020-03-29 12:54:07 +03:00
9b83d74830
apply code-conventions to unrealloader
2020-03-28 09:48:55 +01:00
27e1a20efe
Update 3DSConverter.cpp
...
Trigger build.
2020-03-27 20:46:32 +01:00
3a206a424d
Merge branch 'master' into kimkulling_dev
2020-03-27 18:25:13 +01:00
e543a58dfb
Update m3d.h
...
fix more alignment errors.
2020-03-27 18:23:22 +01:00
2cfdbe2d50
Update m3d.h
...
Fix alignment bug.
2020-03-27 16:27:07 +01:00
7a01061c3e
Update m3d.h
...
Try to fix build error.
2020-03-27 15:39:49 +01:00
60750161d5
Update m3d.h
...
replace assignment by memcpy.
2020-03-27 15:28:32 +01:00
855452831c
Merge branch 'master' into fbx_rotation_fix
2020-03-27 14:36:00 +02:00
32c59643f2
Update m3d.h
...
fix alignment issue.
2020-03-27 11:38:38 +01:00
80323b57bc
Update UnrealLoader.cpp
...
Fix static code analysis findings.
2020-03-27 11:30:40 +01:00
7a2bc5f8f3
Merge branch 'master' into optimized_bonelimits
2020-03-27 07:12:25 +02:00
69176ad425
Merge branch 'master' into optimized_bonelimits
2020-03-26 21:28:47 +02:00
7f521b4eb4
Merge branch 'master' into fbx_rotation_fix
2020-03-26 21:28:03 +02:00
609632c6a5
Added missing functionalities to C API.
...
The C API functions that have been added are the following:
Vector2:
- aiVector2AreEqual
- aiVector2AreEqualEpsilon
- aiVector2Add
- aiVector2Subtract
- aiVector2Scale
- aiVector2SymMul
- aiVector2DivideByScalar
- aiVector2DivideByVector
- aiVector2Length
- aiVector2SquareLength
- aiVector2Negate
- aiVector2DotProduct
- aiVector2Normalize
Vector3:
- aiVector3AreEqual
- aiVector3AreEqualEpsilon
- aiVector3LessThan
- aiVector3Add
- aiVector3Subtract
- aiVector3Scale
- aiVector3SymMul
- aiVector3DivideByScalar
- aiVector3DivideByVector
- aiVector3Length
- aiVector3SquareLength
- aiVector3Negate
- aiVector3DotProduct
- aiVector3CrossProduct
- aiVector3Normalize
- aiVector3NormalizeSafe
- aiVector3RotateByQuaternion
Matrix3x3:
- aiMatrix3FromMatrix4
- aiMatrix3FromQuaternion
- aiMatrix3AreEqual
- aiMatrix3AreEqualEpsilon
- aiMatrix3Inverse
- aiMatrix3Determinant
- aiMatrix3RotationZ
- aiMatrix3FromRotationAroundAxis
- aiMatrix3Translation
- aiMatrix3FromTo
Matrix4x4:
- aiMatrix4FromMatrix3
- aiMatrix4FromScalingQuaternionPosition
- aiMatrix4Add
- aiMatrix4AreEqual
- aiMatrix4AreEqualEpsilon
- aiMatrix4Inverse
- aiMatrix4Determinant
- aiMatrix4IsIdentity
- aiMatrix4DecomposeIntoScalingEulerAnglesPosition
- aiMatrix4DecomposeIntoScalingAxisAnglePosition
- aiMatrix4DecomposeNoScaling
- aiMatrix4FromEulerAngles
- aiMatrix4RotationX
- aiMatrix4RotationY
- aiMatrix4RotationZ
- aiMatrix4FromRotationAroundAxis
- aiMatrix4Translation
- aiMatrix4Scaling
- aiMatrix4FromTo
Quaternion:
- aiQuaternionFromEulerAngles
- aiQuaternionFromAxisAngle
- aiQuaternionFromNormalizedQuaternion
- aiQuaternionAreEqual
- aiQuaternionAreEqualEpsilon
- aiQuaternionNormalize
- aiQuaternionConjugate
- aiQuaternionMultiply
- aiQuaternionInterpolate
In addition, a const qualifier has been added to aiQuaterniont::Rotate to allow call to this method via a const aiQuaterniont pointer.
2020-03-26 13:08:40 -04:00
96c7c567e6
Merge branch 'master' into kimkulling_dev
2020-03-26 11:56:45 +01:00
3c9751ce0c
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-26 10:16:58 +00:00
ccd13436da
fix memory leak during export
2020-03-25 16:37:43 +01:00
14b8d1242b
Added pre and post rotation handling to FBXConverter::GenerateSimpleNodeAnim. Fixed quaternion interpolation flip. Cleaned code.
2020-03-25 08:20:31 +02:00
b962af93fc
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-24 21:35:22 +02:00
ec17aff6d6
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-24 11:56:44 +00:00
ef20cdc430
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-24 11:56:42 +00:00
2820edee54
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-24 11:56:38 +00:00
891b1d4b3f
Merge branch 'master' into fix_FBX_no_preservePivots_bug
2020-03-24 14:38:23 +08:00
046f50880f
{cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
...
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)
It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
bb4bcb442a
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-23 10:35:06 +02:00
2006eeed85
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-23 08:07:25 +00:00
94da6d61a4
Merge branch 'master' into GLTF2_invalid_buffer_fix
2020-03-23 08:03:29 +00:00
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
973e38ad97
Merge branch 'master' into GLTF2_guarantee_rootnode_fix
2020-03-23 07:57:38 +00:00
f0243cc7f3
Changed AI_LMW_MAX_WEIGHTS*2 to 8 which is same thing.
2020-03-22 15:58:12 +02:00
c0ae9b6040
fix invalid check
2020-03-22 14:21:24 +01:00
68a9fa2df3
reformat unittests.
2020-03-22 12:13:09 +01:00
d5d30c898b
Optimized LimitBoneWeightsProcess. Added SmallVector to reduce heap allocations. Simplified algorithm and removed unnecessary copying.
2020-03-22 12:47:42 +02:00
4283e61189
fix clang-compiler warning: wrong move constructor.
2020-03-21 18:25:49 +01:00
089ab0693a
fix static-code-analysis check.
2020-03-21 18:03:35 +01:00
7d624e7f60
obj: add missing init.
2020-03-21 09:00:29 +01:00
9f7d9becb2
fix the linux build.
2020-03-21 08:56:49 +01:00
1529f9518f
Make file formatting comply with POSIX and Unix standards
...
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
b40769c395
try to fix linux build.2
2020-03-20 13:18:49 +01:00
7c3fd351d3
fix no preservePivots bug
2020-03-20 17:19:27 +08:00
ac3f08a4d8
fix 3rdparty warnings.
2020-03-20 09:49:36 +01:00
2ee948eb84
fix missing parthesis.
2020-03-19 17:07:21 +01:00
5b8e6832c3
add mssing move constructor.
2020-03-19 16:53:05 +01:00
de06c860ea
add missing constructor.
2020-03-19 16:20:55 +01:00
9ba014739a
fix compiler warning.
2020-03-19 15:25:34 +01:00
4d917c97bd
fix warnings detected in vs2017.
2020-03-19 12:58:41 +01:00
68f7f545a9
fix typo.
2020-03-19 11:09:20 +01:00
9aa5e3e04f
fix new vs2013 warnings.
2020-03-18 21:32:17 +01:00
097d2faeea
fix vs2013 specific warnings.
2020-03-18 19:31:30 +01:00
d1afd97ec2
fix 2 more warnings for vs2013.
2020-03-18 16:48:32 +01:00
017b3238ba
Update IFCReaderGen_2x3.h
...
Fix a typo
2020-03-18 16:20:38 +01:00
959446e416
Update IFCReaderGen_2x3.h
...
Disable warning
2020-03-18 15:52:16 +01:00
f17b04168f
Merge branch 'master' into GLTF2_recursive_references_fix
2020-03-18 13:58:35 +01:00
f68c60c7c6
Update StepReaderGen.h
...
disable warning
2020-03-17 20:32:23 +01:00
a2fa19aa78
Merge branch 'master' into enable_vs_warning_all
2020-03-17 19:19:29 +01:00
a9e8f65941
fix the build - add misisng forward declaration for aiVector3t.
2020-03-16 10:50:07 +01:00
27c125ef4d
Add 2013-spcific compiler warning disabling statements.
2020-03-15 18:22:49 +01:00
856ca9f2dd
Fix static-code findings,
2020-03-15 12:16:17 +01:00
976091a6f6
ix compiler warning for pragma statements.
2020-03-15 11:47:05 +01:00
9e91a33d76
fix review findings.
2020-03-15 10:28:37 +01:00
8b6f95ec30
Obj: apply clang format.
2020-03-15 10:21:08 +01:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
0357333c81
fix all unittests.
2020-03-15 10:17:54 +01:00
255758e6ff
fix read for precision-depending data.
2020-03-14 11:16:44 +01:00
dc04759492
fix unittests part 2.
2020-03-13 17:00:14 +01:00
3c97447c9c
Merge branch 'master' into gltf2_blendshape_export
2020-03-13 13:26:08 +01:00
733e5343c8
export blendshape positions/normals in gltf2/glb2
2020-03-12 12:14:17 -07:00
b295fda22c
fix unittests part 1.
2020-03-12 17:38:42 +01:00
19b40397a9
fix misor findings.
2020-03-11 17:42:10 +01:00
3f75ef68ae
Assimp guarantees in its docs that mRootNode is never NULL.
...
glTF2Importer::ImportNodes therefore must always create a root node, or throw an exception.
A GLTF2 file is invalid without a scene, so the importer should throw in that case. For GLTF2 files with a scene without nodes, it should create an empty root node.
2020-03-11 15:47:05 +00:00
1bc7c710d6
Added a check to detect and prevent recursive references in GLTF2 files
2020-03-11 09:54:24 +00:00
84e060a816
Change: ExtractData throws exception instead of returning false if data is invalid.
...
Explanation: The return value of ExtractData is never checked anywhere in code. However if it returns false, outData remains uninitialized. All code using ExtractData assumes outData is initialized and proceeds to using it. I haven't encountered a real-life case where this goes wrong - but the simple fact that it can go wrong is a red flag. Instead of relying on every bit of code checking the return value and handling this properly, I think it makes much more sense to have ExtractData throw an exception. It obviously is an exceptional situation, and throwing makes sure that no code that doesn't explicitly handle such a scenario continues running and potentially causing harm.
2020-03-11 09:40:42 +00:00
69551e81ed
Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all
2020-03-11 10:15:25 +01:00
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
7e7555a91b
fix compiler warnings in tools and test-
2020-03-11 00:43:44 +01:00
02e5698a38
fix linker issues.
2020-03-09 22:49:32 +01:00
f3b6b78d4d
small refactorings.
2020-03-09 10:55:32 +01:00
e8d2b84017
clean all warnings for vs-2019
2020-03-08 21:24:01 +01:00
8b9abc58e7
ifdef the exporters as specifying harsher linker flags than what's in default CMake causes linking issues.
2020-03-04 17:15:09 -08:00
bb62249f0c
fix gltf2 exporter memory crash
2020-03-04 14:52:26 -08:00
0b227219b7
Merge branch 'master' into gltf2_broken_bones_count
2020-03-03 11:33:56 +01:00
920535165d
next fixed warnings
2020-03-01 13:15:45 +01:00
710dbba52d
Trimmed trailing whitespaces
2020-02-28 19:19:10 -08:00
496fcd35c1
Trimmed trailing whitespaces
2020-02-28 19:17:53 -08:00
5f35d62d61
Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0
2020-02-28 18:43:47 -08:00
22311883ce
Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop
2020-02-28 18:42:22 -08:00
03182c21b8
xml-migration amf - next steps.
2020-02-26 22:19:42 +01:00
919ae489fc
Merge branch 'master' into master
2020-02-25 23:32:31 +02:00
ae50c4ebdf
Add support for orthographic camera information and use in glTF2 importer. Fixes #3030 .
2020-02-25 14:45:00 +11:00
fb5b01958a
Fix to read orthographic camera data. Manual merge for this branch. Fixes #3028
2020-02-25 11:03:07 +11:00
e4b2fd246d
Merge branch 'master' into remove-else-endif-constructs-cmake-files
2020-02-24 20:08:17 +01:00
28f4b95ff5
Merge branch 'master' into master
2020-02-24 21:05:51 +02:00
edfaaed56f
Removed uneeded expression in else() and endif() constructs.
...
The following changes were tested against building with a master copy.
For a more detailed report, please read the followings below:
The flags that were checked were the ones checked by default + the following:
ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES
The list of compilable projects in Visual Studio were the following:
- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic
The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.
UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004 .
2020-02-23 07:09:35 -05:00
f28b087d16
small improvements in the CMakeLists.txt file
...
If ASSIMP_NO_EXPORT is not defined:
- don't add the macro for the exporters
- don't include the files for all the exporter
- don't display any messages about what exporters are enabled or not
2020-02-21 20:17:38 +02:00
3f5136b7b2
Merge branch 'master' into master
2020-02-19 21:52:57 +01:00
4de0237167
small fix
2020-02-18 21:55:35 +02:00
a5524ffcd9
more changes
2020-02-18 19:02:14 +02:00
ad52c5c5f6
.clear in destructor is redundant
2020-02-18 18:56:09 +02:00
bf85fc1386
small changes
2020-02-18 18:50:48 +02:00
016c0a8665
small changes
2020-02-18 18:42:59 +02:00
d0922230a9
fixed the = default on the destructor
2020-02-18 18:24:52 +02:00
a65bac27e9
fixed the make_unique
2020-02-18 18:01:53 +02:00
6e13381bdb
next warnings.
2020-02-18 14:41:19 +01:00
22118dff1d
Merge branch 'master' into enable_vs_warning_all
2020-02-16 15:37:48 +01:00
c2bfbdacf4
fix more warnings.
2020-02-16 15:37:20 +01:00
ec3a5620d0
Update AssxmlExporter.cpp
...
Fix the build.
2020-02-16 15:04:18 +01:00
ada4f51d5b
Merge branch 'master' into kimkulling_dev
2020-02-16 13:10:41 +01:00
024b5e60bc
Merge remote-tracking branch 'origin/master'
2020-02-15 23:29:26 +02:00
5c99d6a864
very small changes
...
- FIND_PACKAGE(DirectX) is already used in the samples and assimp tool cmake files - so is not needed in the main cmake fil
- other small changes
2020-02-15 23:29:04 +02:00
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
d04df3e7c5
A bug when importing multiple gltf files
...
meshOffsets are not cleared when importing multiple gltf files
2020-02-14 08:41:55 +01: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
979153522c
xml-migration: migration of XGLImporter.
2020-02-05 22:51:39 +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
1a8d5667b6
xml-migration: migrate shared code from irr-loader.
2020-02-04 20:47:20 +01:00
bd2ffc8d58
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
2020-02-03 21:19:30 +01:00
c1fcee9c5a
XMl-Migration: Migration of IrrMesh.
2020-02-03 21:19:03 +01: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
02df65d541
Merge branch 'master' into pugi_xml
2020-01-28 13:13:47 +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
00ad892a49
xml: last changes.
2020-01-27 23:54:59 +01:00
0cb236bae3
next steps.
2020-01-27 22:18:48 +01:00
8ef106e185
xml-migration: introduce xmlnode.
2020-01-27 22:11:27 +01:00
6a471b4390
xml-migration: next steps.
2020-01-27 22:10:42 +01: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
02acb3f8c2
Merge branch 'master' into pugi_xml
2020-01-23 21:26:04 +01:00
11f49f85c4
try to migrate AMF
2020-01-23 21:25:25 +01:00
a905303764
IrrXml: replaced irrXml by pugixml.
2020-01-23 21:16:10 +01: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
c4d98ced49
Merge branch 'master' into kimkulling_dev
2020-01-18 14:05:51 +01: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
40d882af4f
fix irrreader leak.
2020-01-16 20:25:47 +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
d1abe68b93
Testcoverage improvements.
2020-01-14 21:44:45 +01: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
17aabc34cc
MSVC workarounds
2019-12-10 06:30:41 +01:00
986b67801d
Add Copyright common metadata to glTF importer/exporter
...
Technically this only exists in glTF v2 but may as well include in both
2019-12-09 14:30:12 +00:00
f498a395e4
Add common metadata to Collada
...
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
2019-12-09 14:05:41 +00:00
4a8b7800ff
Update M3D ASCII exporter ident and extension
...
Changed to match existing Assimp style.
Set extension as per:
https://gitlab.com/bztsrc/model3d/blob/master/docs/a3d_format.md
2019-12-09 11:23:57 +00:00
9cabeddf4f
Odd Negative Scale: PretransformVertices
...
PretransformVertices postprocessing now reverses face order when transform is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.
(Odd count of negative scale components, negative determinant)
2019-12-09 11:07:13 +00:00
193b02cdac
Odd negative scale: OptimizeGraph
...
OptimizeGraph postprocessing now reverses face order when
node scale is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.
(Odd count of negative scale components, negative determinant)
2019-12-09 10:42:50 +00:00
463573c771
Apply clangformat
2019-12-09 09:56:01 +00:00
e3da92f7d3
closes https://github.com/assimp/assimp/issues/2809 : fix crash for special ifc file.
2019-12-08 10:12:14 +01:00
747e12465b
Merge branch 'master' into partial-cleanup-m3d
2019-12-07 19:43:05 +01:00
9f3c26dbd8
Update Importer.cpp
...
fix typo
2019-12-07 09:18:45 +01:00
7648c438ca
Update Importer.cpp
...
fix more typos.
2019-12-07 09:08:15 +01:00
26f6e5ad30
Update Importer.cpp
...
fix typo
2019-12-07 08:58:47 +01:00
ef13fb2ddd
Update Importer.cpp
...
Fix minor review findings.
2019-12-06 21:38:07 +01:00
b2ab3fa35e
Merge branch 'master' into ModellerMetaData
2019-12-06 21:19:29 +01:00
8956e567b2
Better comment.
2019-12-05 14:09:36 +00:00
81984002d3
Fix and test for GLTF.
2019-12-05 13:52:34 +00:00
fabfcf3cb0
More checking
2019-12-05 12:33:00 +00:00
894b8e3519
Initial version
2019-12-05 12:32:22 +00:00
505769935e
Merge branch 'master' into remove-cout-2797
2019-12-04 22:38:50 +00:00
a29e407853
Update B3DImporter.cpp
...
some minor format changes: add brackets for one-liner if statement.
2019-12-04 21:25:17 +01:00
fadf4a3ee2
Update M3DWrapper.h
...
Add missing include.
Odd that MSVC2013-2017, GCC and Clang were ok with this.
2019-12-04 14:05:46 +00:00
d8608156d3
Merge branch 'master' into partial-cleanup-m3d
2019-12-04 14:00:33 +00:00
bdb89413bc
Merge branch 'master' into fix_gltf_accessor_overflow
2019-12-03 22:20:19 +00:00
4a29cc7fcb
Merge branch 'master' into partial-cleanup-m3d
2019-12-03 14:16:11 +00:00
45a96af9ac
Fix typo in M3DWrapper.cpp
...
Don't use std::mutex if not supported.
Allow override to force it to be used if does in fact exist
Thank you CI
2019-12-03 14:15:50 +00:00
e5b065da3e
Formatter is a stringstream
...
Used wrong API. Sorry about that.
2019-12-03 13:35:53 +00:00
3a977d009d
Merge branch 'master' into remove-cout-2797
2019-12-03 13:24:03 +00:00
ee537b70ad
Correct M3DWrapper ifdef guards
...
M3DWrapper should also compile if M3D Importer is enabled
2019-12-03 13:18:59 +00:00
e668eead19
Some cleanup of M3D support
...
Wrap the m3d.h header
Note: C++11 support required to use in a threaded environment
Fix export memory leak (although exporter apopears to be unused)
Apply clangformat.
2019-12-03 12:56:21 +00:00
e5edd8a28a
Merge branch 'master' into preserve_error_string
2019-12-03 11:29:35 +01:00
903ce59ffe
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
2019-12-02 19:07:44 +01:00
496382982a
Remove cout calls from FBX, LWO and B3D
...
Fixes #2797
2019-12-02 11:56:55 +00:00
631da3a3d1
Merge branch 'master' into preserve_error_string
2019-12-02 10:35:29 +00:00
7c0f84f484
Merge branch 'master' into fix_gltf_accessor_overflow
2019-12-01 19:31:44 -06:00
4071fcd398
Update Exporter.cpp
...
Fix format.
2019-12-01 22:46:48 +01:00
54720e36cb
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-12-01 22:46:18 +01:00
7967deb06a
Update glTF2Asset.inl
...
some minor review finding: use brackets and add a newline.
2019-12-01 12:34:45 +01:00
ef4bf35f69
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-30 17:11:07 +00:00
97b71dd03b
Add reading of extensionsRequired and explicit check to throw an error if Draco compression is required. Fixes issue #2791 .
2019-11-28 09:01:01 +10:00
30851b796f
Update glTF2Importer.cpp
...
Make them const
2019-11-27 17:18:12 +01:00
e4f1b8e609
Correctly change the coordinate system of the glTF UV transforms to match those used internally inside Assimp. This should now hopefully result in a complete implementation for issue #2119
2019-11-27 11:05:31 +11:00
f52df5d242
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-26 18:42:07 +00:00
fdd76a6d0b
Merge branch 'migenius-fix-doubleexport' of github.com:migenius/assimp into migenius-fix-doubleexport
2019-11-26 18:17:55 +11:00
b4f778f53b
Fix aiGetMaterialUVTransform which assumed the data was 4 floats when in fact it is 5 floats. Fixes and issue seen in #2119 .
2019-11-26 18:17:35 +11:00
184caea952
Merge branch 'master' into migenius-fix-doubleexport
2019-11-25 21:24:35 +01:00
7230f32c14
Fix issue with y UV translation. Fixes #2119 .
2019-11-25 20:58:21 +11:00
8f2123379d
Merge branch 'master' into master
2019-11-25 05:23:18 +01:00
9ddeb4edad
MinGW support, profiling and signed error code
2019-11-25 05:03:10 +01:00
929d83398d
Remove duplicate call to exporter. Fixes issue #2718 .
2019-11-25 13:51:33 +11:00
5cfb0fd633
Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags
2019-11-22 18:27:34 +01:00
136996e1f6
Use std::numeric_limits for double max
2019-11-22 10:56:31 -06:00
868aea8d94
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-11-22 08:19:50 +01:00
36ca37f9ac
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-22 00:14:11 -06:00
91e6d3abeb
Fix glTF Accessor min and max values
2019-11-21 23:46:14 -06:00
3cc4ec4eec
Merge branch 'master' into master
2019-11-21 22:10:28 +01:00
375ee17339
Merge branch 'fix_memory_leak_in_gltf2_on_exception' of https://github.com/muxanickms/assimp into fix_memory_leak_in_gltf2_on_exception
2019-11-19 17:44:05 +00:00
91af4b7476
fix the crash
2019-11-19 17:43:31 +00:00
5985bdfebf
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
2019-11-19 18:11:10 +01:00
12f184867e
Fix for memory leak in glTF2 Importer if an exception has been thrown
2019-11-19 17:05:24 +00:00
6f7cb6af06
revert memory leak fix
2019-11-19 16:58:48 +00:00
b93c360b87
memory leak fix
2019-11-19 16:10:34 +00:00
7c312f6f68
Merge branch 'master' into master
2019-11-19 01:28:11 +01:00
7e222f0730
fix invalid cast.
2019-11-18 18:43:28 +01:00
83e9c551f5
stbi functions prefixed for those who do not know how to use inlcude
2019-11-18 18:31:53 +01:00
80f5283b2f
Error string of Importer should contain a message in case of an exception
2019-11-18 16:57:01 +00:00
301748be6a
Make Clang happy
2019-11-18 15:22:15 +01:00
2b252bb9a5
My mistake, fixed
2019-11-18 06:23:41 +01:00
2bd92aeb88
Merge branch 'master' into master
2019-11-18 03:21:34 +01:00
41ae01a6b2
Upgraded to newest SDK and improved texture import
2019-11-18 03:04:52 +01:00
75204e20bd
fix invalid setup for texture enum.
2019-11-16 19:22:37 +01:00
17257cd2ae
just a try, i dunno have a clue ...
2019-11-16 15:51:26 +01:00
2eed8b1820
TextureTransform: set material transform only when the extension is provided.
2019-11-16 08:08:57 +01:00
a8182d86cb
fix initialization + some vs2019 compiler warnings.
2019-11-15 19:38:37 +01:00
17946e26ef
add missing setup of texture transform in aiMaterial.
2019-11-15 18:35:33 +01:00
04db5cd5ea
closes https://github.com/assimp/assimp/issues/2119 : initial version.
2019-11-14 21:11:53 +01:00
0c3c88270a
Merge branch 'master' into master
2019-11-11 10:19:22 +01:00
aa25c815bd
closes https://github.com/assimp/assimp/issues/1320 : make sure build works with all exporter disabled.
2019-11-10 09:47:50 +01:00
ddf7c0ad8f
avoid weighting vertex repeatedly when joining identical vertices
2019-11-05 17:34:32 -08:00
adec426b7c
Fix for exporting fbx bigger than 2GB
2019-11-05 17:11:56 +00:00
d29185ec7d
Merge branch 'master' into master
2019-11-03 21:22:01 +01:00
dda46f5f4d
Merge branch 'master' into master
2019-11-02 01:14:04 +01:00
7201ebdccc
Make Clang happy
2019-11-01 21:52:11 +01:00
7d9e9aadbb
Asked modifications and unit test
2019-11-01 17:21:24 +01:00
536fea1c8d
operator less for old compilers
2019-11-01 14:50:30 +00:00
55c2a3edb9
FBX orphant embedded textures
2019-11-01 12:29:54 +00:00
8ebd48442e
Made the M3D SDK C++ wrapper optional
2019-11-01 03:39:36 +01:00
805bc2e766
Update ColladaParser.cpp
...
Add missing brackets.
2019-10-31 20:18:39 +01:00
3bf81375da
Fixed clang's problem with register keyword
2019-10-30 03:06:24 +01:00
37cc29c020
Fixed clang's problem with register keyword
2019-10-30 03:04:33 +01:00
0ff3e40157
Fixed clang's casting issue and MSVC's buffer allocation problem
2019-10-30 02:35:51 +01:00
60e9157699
Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this
2019-10-30 01:37:28 +01:00
5a79287041
More reduced scope fix, what's wrong with reusing i as a loop variable?
2019-10-30 01:21:15 +01:00
7ed621b53f
More reduced scope fix by wasting more memory...
2019-10-30 01:14:20 +01:00
1c23d2e8de
More reduced scope fix by wasting more memory...
2019-10-30 01:11:34 +01:00
5b18baf883
Fixed issues with MSVC
2019-10-30 00:55:54 +01:00
02a63f8b10
Fixed template being used in file
2019-10-29 20:21:16 +00:00
be09110aa8
Merge branch 'master' into feature/easy-armature-lookup
2019-10-29 21:09:50 +01:00
a622e109a0
Fixed PR Quality Review Issues
2019-10-29 18:42:10 +01:00
0baec5f0bd
Added M3D format support
2019-10-29 14:14:00 +01:00
459d8105a7
Merge branch 'master' into fix-3ds-material-names
2019-10-29 13:18:23 +01:00
18555abed0
Merge branch 'master' into migenius-fix-pbrsg
2019-10-28 20:08:47 +01:00
571d64e3c1
Merge branch 'master' into migenius-fix-doublefree
2019-10-28 07:51:19 +01:00
61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710
2019-10-27 18:24:16 +01:00
a9a0d4d29b
Tidying order of function calls and fixed debug statements
2019-10-27 14:16:39 +00:00
212bcfe75c
Test disable cache
2019-10-27 14:16:39 +00:00
9c8d835704
Explicitly use nullptr
2019-10-27 14:16:39 +00:00
5d0c63391b
Explicitly set the size of the parent node if we have no children
2019-10-27 14:16:39 +00:00
a30936954e
Best to check the number of children before checking the actual array
2019-10-27 14:16:39 +00:00
514257f587
Added unit tests for ArmaturePopulate when used (added huestos model to tests)
...
Added clear documentation for this too to explain, you need to enable it to make it available
Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
46cdd81d75
Added ArmaturePopulate scale process for all formats
2019-10-27 14:16:39 +00:00
93efe4197a
Removed redundant rest matrix and fixed assert compile error
2019-10-27 14:16:39 +00:00
168ae22ad4
Implemented easy armature lookup
...
This lets you directly retrieve the node a bone links to and informs you of the armature directly
This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
2019-10-27 14:16:39 +00:00
120e97e55b
Merge branch 'master' into assimp_version_2693
2019-10-27 13:47:59 +01:00
93d87c775d
Merge branch 'master' into master
2019-10-27 09:00:47 +01:00
2d086fd236
ColladaParser: fix handling of empty XML-elements
2019-10-25 15:23:13 +02:00
5f58ef82b9
prevent accidental lower casing material names in ReplaceDefaultMaterial
2019-10-25 10:18:27 +03:00
cbd4e8bc22
Fix inconsistent indentation in previous commit.
2019-10-25 12:19:28 +11:00
822be33408
Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724 .
2019-10-25 12:17:43 +11:00
932acf4350
Merge branch 'master' into fix-gltf-importer-crash
2019-10-23 20:14:38 +02:00
df3e22d9ba
Merge branch 'master' into migenius-fix-vs2013-build
2019-10-21 20:57:29 +02:00
9bc2648615
Merge branch 'master' into fix-gltf-importer-crash
2019-10-21 15:29:18 +01:00
c350d4f487
Update ColladaExporter.cpp
...
Small review findings.
2019-10-19 12:08:57 +02:00
9aa9238e7e
Copy texture data before handing on to asset which then handles freeing of the memory. This prevents the memory being released twice which was throwing an error. Fixes issue #2714 .
2019-10-18 14:40:41 +11:00
075d05e604
Merge branch 'master' into fix_dae_export
2019-10-17 23:52:44 +02:00
51fc0f4ec4
Merge branch 'master' into assimp_version_2693
2019-10-16 10:00:50 +01:00
e6a051d953
Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678 .
2019-10-16 19:06:57 +11:00
198bc428fa
Fix some warnings in Collada import
2019-10-14 12:15:02 +01:00
6a6ccc0fb0
Rename ConvertPath() to UriDecodePath()
2019-10-14 11:27:34 +01:00
5e84889724
Merge branch 'master' into collada_zae_textures_2710
2019-10-14 10:56:53 +01:00
ce5c71d2e7
Collada ZAE import must convert manifest and image paths
...
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML
Added more EXPECTS to the Collada tests
2019-10-11 18:57:38 +01:00
059ee0e091
Update assimp legal and version
...
Will now report the major and minor versions specified in cmakelists
2019-10-11 16:28:14 +01:00
3f38011e86
Fix filter for vs for public headers.
2019-10-11 13:41:13 +02:00
33af183bb8
Cleanup the public headers.
2019-10-11 13:27:36 +02:00
3b3e34c36a
Fix one byte memory leak.
2019-10-08 15:15:16 +01:00
5a1276032e
Add bound checks.
2019-10-08 12:51:08 +01:00
32781a566d
Fix FBXConverter: use proper 64-bit constant
...
Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes:
code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch ]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2019-10-06 15:42:11 +02:00
78cfec41ec
Merge branch 'master' into issue_2693
2019-10-06 11:11:22 +02:00
afec2e2c49
Fix #2693 aiGetVersionMajor return wrong version
...
The 2 constants MinorVersion and MajorVersion are updated for 5.0
2019-10-05 19:23:02 +02:00
38153748ab
ColladaExporter: use actual mesh names when available
2019-10-02 19:18:48 +02:00
c08a78f7c6
ColladaExporter: improve name/id handling
2019-10-02 01:32:53 +02:00
6550b1df61
Merge branch 'master' into gltf_mesh_morph_animations
2019-10-01 08:04:46 +01:00
7a8b7ba88d
aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0
2019-09-29 10:09:53 +01:00
5018af995b
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-26 11:33:33 +01:00
2757297b4f
Merge branch 'master' into issue_2662
2019-09-26 09:55:16 +02:00
8ca39ade6a
Merge branch 'master' into gltf_mesh_morph_animations
2019-09-25 16:16:32 +01:00
6e75d7a839
Merge branch 'master' into fix-multi-uvset-coord
2019-09-25 16:57:24 +02:00
e0fee3d87b
gltf2.0 importer - Support for mesh morph animations added.
...
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
12a101124a
Merge branch 'master' into issue_2668
2019-09-24 19:29:40 +02:00
b8e53c967f
Merge branch 'master' into issue_2668
2019-09-24 02:21:59 +01:00
d3a79d0cc2
Merge branch 'master' into issue_2661
2019-09-24 02:21:19 +01:00
17f55aa67e
Merge branch 'master' into issue_2662
2019-09-24 02:20:47 +01:00
3b2e0ebfc7
Merge branch 'master' into issue_2661
2019-09-23 16:59:28 +02:00
aa47a028c8
Fix UV texture coords generation along Z Axis
2019-09-23 11:22:20 +02:00
61fa619f92
Fix: Mismatched new/free in gltf2 importer ( fixes #2668 )
2019-09-22 10:24:30 +01:00
720ac4846b
Fix: memory leak in gltf2 importer ( fixes #2661 )
2019-09-22 10:12:19 +01:00
0e6478c0d4
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports ( fixes #2662 )
2019-09-22 09:59:58 +01:00
94c488d7ea
fix compiler warnings.
2019-09-22 10:15:44 +02:00
ef54a00fc4
Use correct escape sequence for unsigned.
2019-09-22 09:12:37 +02:00
69087abc56
Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor.
2019-09-21 16:36:22 +02:00
a4092a3234
correct uvset index
2019-09-20 17:53:15 -07:00
d4101bbf06
fix regression
2019-09-19 08:07:55 +02:00
18bbfdac1a
init variable 'base' in initializer list
2019-09-19 08:01:47 +02:00
4b9cc1a484
Merge branch 'master' into fix-codacy-issues
2019-09-18 20:32:49 +02:00
dbf47f7769
fix issue #2551
2019-09-18 17:54:30 +02:00
1abf6d50fe
fixed regression #2
2019-09-18 08:31:33 +02:00
2194577429
fix regression
2019-09-18 08:25:24 +02:00
a5859dd3f4
Merge branch 'master' into fix-codacy-issues
2019-09-18 08:19:44 +02:00
c0ec5140ee
init variable in initializer list
2019-09-18 08:18:52 +02:00
6d4854f12c
init variable in initializer list
2019-09-18 08:15:50 +02:00
116dcce0ba
init member in itilializer list
2019-09-18 08:04:46 +02:00
f7da7d8f67
Merge branch 'master' into kimkullig_dev
2019-09-17 22:01:29 +02:00
2edcf82f5a
add missing include.
2019-09-17 21:58:46 +02:00
8b95479bb0
closes https://github.com/assimp/assimp/issues/2598 : introduce getEpsilon
2019-09-15 19:25:37 +02:00
7f7918957a
Issue 2603
...
Normal face indices added to end of already resized vector, so normal faces did not match position faces.
Use vector index rather than push.
2019-09-15 13:05:04 +01:00
2be0eba1ab
put one in comments because the file seems to be corrupt.
2019-09-14 19:32:47 +02:00
79056da4be
closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch.
2019-09-14 09:12:08 +02:00
a1254f067e
closes https://github.com/assimp/assimp/issues/2627 - fix typo
...
Remove code from ai_assert test, will be removed in release versions.
2019-09-13 12:05:29 +02:00
3bd63c006f
Merge branch 'gltf_add_ortho_cam' of https://github.com/assimp/assimp into gltf_add_ortho_cam
2019-09-12 20:27:53 +02:00
a25a1f0772
fix the build.
2019-09-12 20:27:35 +02:00
f10bd72100
Merge branch 'master' into gltf_add_ortho_cam
2019-09-12 00:30:06 +02:00
f9c6fed190
Add a camera unittest.
2019-09-11 22:34:53 +02:00
f67c18d41a
introduce inline helper.
2019-09-11 22:21:20 +02:00
7ff7a5d64e
glTF: Try to remove duplicate code.
2019-09-11 17:00:39 +02:00
0307327999
Merge branch 'master' into fix-codacy-issues
2019-09-11 10:06:16 +02:00
28d0300dbe
Merge branch 'master' into gltf_add_ortho_cam
2019-09-11 09:32:14 +02:00
d91eebf347
Add ortho camera.
2019-09-10 22:13:54 +02:00
b9cff2a019
prefer prefix ++/-- operators for non-primitive types
2019-09-10 07:54:07 +02:00
db55ba4908
possible inefficient checking for 'tlist' emptiness
2019-09-09 15:00:28 +02:00
ddc26e1c46
Added maya stingray support for textures
2019-09-08 19:15:27 +01:00
da97f1be79
Implemented basic PBR materials into assimp.
...
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS
This is the first small change required.
We only support maya right now.
2019-09-08 19:15:27 +01:00
ad2dd2dc18
Merge branch 'master' into fix-codacy-issues
2019-09-08 12:08:01 +02:00
5d8482dae6
Merge branch 'master' into master
2019-09-07 18:53:26 +02:00
f8bcd7cb40
Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 10:02:20 +02:00
336ae0e55a
Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 09:58:07 +02:00
3546403284
Merge branch 'master' into crash_in_ai_mesh_desctuctor
2019-09-06 20:45:16 +02:00
570b3838c9
Merge branch 'master' into fix-codacy-issues
2019-09-06 13:20:00 +02:00
91706a1f6e
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:29:52 +02:00
d177c722b1
prefer prefix ++/-- operators for non-primitive types
2019-09-06 11:28:38 +02:00
eb8479a95e
possible inefficient checking for 'tlist' emptiness
2019-09-06 11:19:27 +02:00
6661e7047a
Merge branch 'master' into unicode_fix
2019-09-06 08:59:21 +02:00
22bd047db5
Added VertexColors to FBX exporter (one channel)
...
Works properly with Blender (custom importer) and UnrealEngine (Official SDK)
2019-09-05 23:44:54 +02:00
b271091c64
fix division by zero
2019-09-05 11:44:02 +01:00
4029fe5e46
alloc-dealloc-mismatch
2019-09-05 11:44:02 +01:00
9adc4e87fa
alloc-dealloc-mismatch
2019-09-05 11:44:02 +01:00
873a358ce4
A crash in the aiMesh descructor
2019-09-05 11:44:02 +01:00
eb762e654e
Removed WindowsStore checks
2019-09-03 23:13:44 -04:00
a16906686f
Fixed type conversion warnings
2019-09-03 21:06:48 -04:00
50820e48b9
Merge branch 'master' into fix-codacy-issues
2019-09-03 21:54:59 +02:00
a8822a2b29
Cleaned up formatting in DefaultIOSystem.cpp
2019-09-03 11:18:01 -04:00
0685e415ad
removed extra null character in Utf8ToWide and WideToUtf8
2019-09-03 11:18:01 -04:00
6c65b5b549
Cleaned up unicode code and removed fixed-size buffers
2019-09-03 11:18:01 -04:00
727cf0c49f
Fixed unicode on windows
2019-09-03 11:18:01 -04:00
ceacad237f
prefer prefix ++/-- operators for non-primitive types
2019-09-03 08:00:12 +02:00
33e71ee8df
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:59:17 +02:00
75993ad653
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:57:58 +02:00
53d795c1c9
possible inefficient checking for 'tlist' emptiness
2019-09-03 07:57:08 +02:00
ec1930478c
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:56:37 +02:00
c1d4ed7873
prefer prefix ++/-- operators for non-primitive types
2019-09-03 07:55:27 +02:00
0f18ec9e2c
Merge branch 'master' into accessibleIsVerbose
2019-09-02 20:47:04 +02:00
b34f9839f1
Merge branch 'master' into fix-missing-scale-data
2019-08-31 12:42:40 +02:00
01d0f06d3a
Make IsVerbose accessible outside the exporter
2019-08-30 11:42:23 +01:00
de51122639
fix regression
2019-08-29 12:09:56 +02:00
2d0d2374c1
fix ColladaLoader::findMesh() declaration
2019-08-29 12:00:44 +02:00
89079ead12
prefer prefix ++/-- operators for non-primitive types
2019-08-29 11:44:41 +02:00
946d64282b
fix inefficient checking for 'url' emptiness
2019-08-29 10:58:01 +02:00
340611785a
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:57:23 +02:00
cb2beba073
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:56:58 +02:00
aec4726d21
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:56:21 +02:00
b3788039df
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:55:09 +02:00
3ef0860f30
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:54:21 +02:00
e8ae086b35
fix function definition
2019-08-29 10:48:51 +02:00
75fed8340d
fix function declaration
2019-08-29 10:46:50 +02:00
a044852938
fix inefficient checking for lists emptiness
2019-08-29 10:44:19 +02:00
ba3e4ae892
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:42:47 +02:00
2f53d42d45
fix inefficient checking for 'SceneNode_Child' emptiness
2019-08-29 10:42:09 +02:00
cca81e877a
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:41:34 +02:00
b363fa3883
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:41:00 +02:00
69fce64b9c
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:40:31 +02:00
44d7cb8177
possible inefficient checking for lists emptiness
2019-08-29 10:37:19 +02:00
02444be251
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:36:09 +02:00
65ba0c4b46
fix inefficient checking for lists emptiness
2019-08-29 10:30:50 +02:00
ebb061d89c
fix inefficient check for 'mNodeElement_List' emptiness
2019-08-29 10:29:24 +02:00
0d17315166
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:25:38 +02:00
f009c216b6
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:24:58 +02:00
eadbc89a1f
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:23:27 +02:00
438b070508
prefer prefix ++/-- operators for non-primitive types
2019-08-29 10:22:50 +02:00
805fda3df8
possible inefficient checking for 'NodeElement_List' emptiness
2019-08-29 09:05:15 +02:00
b1f8f6ae3b
prefer prefix ++/-- operators for non-primitive types
2019-08-29 09:04:27 +02:00
ffb30fbc85
prefer prefix ++ operator for non-primitive types
2019-08-29 09:02:19 +02:00
789e8abfe8
prefer prefix ++ operator for non-primitive types
2019-08-29 08:44:49 +02:00
f1e0c460ed
Prefer prefix ++ operator for non-primitive types
2019-08-29 08:43:56 +02:00
8e90bf8381
fix inefficient checking for lists emptiness
2019-08-29 08:43:09 +02:00
43865e6bc9
fix inefficient checking for 'url' emptiness
2019-08-29 08:34:18 +02:00
60f2535dcd
fix inefficient check for 'SceneNode_Mesh' emptiness
2019-08-29 08:30:24 +02:00
7d8a25993b
prefer prefix ++ operator for non-primitive types
2019-08-29 08:29:30 +02:00
765c0e71f6
prefer prefix ++ operator for non-primitive types
2019-08-29 08:25:19 +02:00
806bcf76b1
fix inefficient checking for lists emptiness
2019-08-29 08:23:09 +02:00
30eb3c56c3
prefer prefix ++ operator for non-primitive types
2019-08-29 08:12:22 +02:00
dbb498095d
function parameter 'meshid' should be passed by const reference
2019-08-29 08:05:45 +02:00
0dd1ae0196
prefer prefix ++ operator for non-primitive types
2019-08-29 08:02:51 +02:00
9ad7ce1129
prefer prefix ++ operator for non-primitive types
2019-08-29 08:02:08 +02:00
a9d902946d
fix inefficient check for 'Composition' emptiness
2019-08-29 08:01:00 +02:00
e20640c2c8
Merge branch 'master' into fix-segfault-fbx-import
2019-08-28 09:14:51 +02:00
43cb76653b
Removed depreciated FBX Unit and scaling code
2019-08-27 15:54:27 +01:00
abdd853ca5
FIX missing update call for scale to post process
2019-08-27 15:50:50 +01:00
ad971468ef
size_t cannot be less than 0
2019-08-27 15:15:40 +01:00
0729a6e20f
Merge branch 'master' into feature/bug-fbx-application-scale-wrong
2019-08-27 14:06:00 +02:00
7e12257ebc
Fix segfault #2614
2019-08-26 22:44:25 +01:00
c50a4d8ade
Fix segfault caused by FBX file with missing face #2614
2019-08-26 22:39:20 +01:00
d56198774e
Fix FBX units not being converted from CM to application scale
2019-08-26 22:03:56 +01:00
48f1f012eb
Merge branch 'master' into feature/fix-removal-of-bones
2019-08-25 09:34:20 +02:00
594d90a18e
Merge branch 'master' into feature/prototype-for-assimp-universal-scale
2019-08-24 10:22:08 +02:00
9a78f2c6f1
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-23 17:24:04 +02:00
john
Inho Lee
Malcolm Tyrrell
Silvio Traversaro
Kim Kulling
Kim Kulling
Jukka Maatta
Rahul Sheth
Sahin Serdar Kocdemir
Malcolm Tyrrell
Optimizer0
Isuru2000psn
Sherief Farouk
Max Vollmer (Microsoft Havok)
rahulshethsc
Fabian Schmidt
Max Vollmer
Denis Blank
kkulling
Gargaj
Joshua Hyatt
lsliegeo
Marc-Antoine Lortie
Ryan Styrczula
MeyerFabian
RichardTea
Kota Iguchi
awr1
Ryan Styrczula
Robert Reif
Hill Ma
Yingying Wang
Evangel
Filip Lundgren
Paul Arden
Alec
FRICOTEAUX
Kevin Shepherd
Matias Kangasjärvelä
Jeremy Cytryn
hoshiryu
Sercan Degirmenci
Trevor David Black
Rafał Mikrut
qarmin
luca
Hehongyuanlove
Timur Umayev
György Straub
György Straub
Alexey Medvedev
György Straub
Ville Ruusutie
Marc-Antoine Lortie
simon chen
Andy Maloney
Aaron Franke
chenmou.cm
Sebastian Matusik
Adrian Iusca
iamAdrianIusca
Hui.Du
Tomas Mariancik
Luke Lau
Marc-Antoine Lortie
Zoltan Baldaszti
bzt
Hanif Bin Ariffin
Loïc
Turo Lamminen
Matthias Moulin
Dunni
Felipeek
bill.shan
Mateusz Paluch
Mike Samsonov
Gordon MacPherson
Mike Samsonov
Cory Fabre
Raphael Dümig
Rem
TGE
Fabrice Fontaine
Engin Manap
Chris Weermann (TGE)
vcebollada
Theak
Alan
Jennifer Buehler
escherstair
Bruno
PascalGilbraith
RumbleballTheReal
Ryan McCampbell
Gordon MacPherson