Kim Kulling
|
636f28965f
|
Merge branch 'master' into fbxReportAssetIssuesProperly
|
2020-10-11 18:13:43 +02:00 |
Sahin Serdar Kocdemir
|
eb9928e029
|
fix for fbx files using stringray materials;
|
2020-10-09 07:28:15 +01:00 |
Malcolm Tyrrell
|
20733537d7
|
Merge branch 'master' into fbxReportAssetIssuesProperly
|
2020-10-08 09:54:04 +01:00 |
Optimizer0
|
152343b186
|
Merge branch 'master' into master
|
2020-10-06 08:35:26 +05:30 |
Malcolm Tyrrell
|
4bdaf20b70
|
Add comment.
|
2020-10-05 14:23:42 +01:00 |
Isuru2000psn
|
f2b3ec2e0c
|
strict-aliasing level 3 warnings fix
|
2020-10-05 15:29:09 +05:30 |
|
Malcolm Tyrrell
|
585fb89154
|
Make an assert a DeadlyImportError.
|
2020-10-02 15:25:16 +01:00 |
|
Malcolm Tyrrell
|
6b9c477763
|
The floar parsing routines are now DeadlyErrors.
|
2020-10-02 13:58:55 +01:00 |
|
Kim Kulling
|
c7f7ed8901
|
Update ColladaLoader.cpp
|
2020-09-30 20:51:54 +02:00 |
|
Kim Kulling
|
0191c661b5
|
fix division by zero.
|
2020-09-30 20:39:26 +02:00 |
|
Kim Kulling
|
177426185e
|
Fix invalid cast
|
2020-09-30 16:38:13 +02:00 |
|
Kim Kulling
|
50d21e08f3
|
fix memoy leak.
|
2020-09-30 12:05:32 +02:00 |
|
Kim Kulling
|
788099a223
|
Merge branch 'master' into pugi_xml
|
2020-09-29 21:29:37 +02:00 |
Kim Kulling
|
c591f7de2f
|
make xml parsing more verbose.
|
2020-09-29 21:01:10 +02:00 |
|
Kim Kulling
|
db49a541c3
|
remove unused attributes.
|
2020-09-28 20:35:30 +02:00 |
|
Kim Kulling
|
ef9a78b49d
|
remove unused attributes.
|
2020-09-28 20:34:44 +02:00 |
|
Kim Kulling
|
bf4ad2837f
|
Remove dead code.
|
2020-09-28 15:20:59 +02:00 |
|
Kim Kulling
|
c598a12340
|
Remove unused variable.
|
2020-09-28 09:15:56 +02:00 |
|
Kim Kulling
|
89ac168014
|
ogre: fix warning: not inited variable.
|
2020-09-27 21:23:55 +02:00 |
|
Kim Kulling
|
1c85676a9c
|
collada: fix warning: not inited variable.
|
2020-09-27 21:19:23 +02:00 |
|
Kim Kulling
|
052cc2e070
|
collada: fix warning: not inited variable.
|
2020-09-27 21:16:51 +02:00 |
|
Kim Kulling
|
5038f21d06
|
collada: fix warning: not inited variable.
|
2020-09-27 21:14:21 +02:00 |
|
Kim Kulling
|
202907d471
|
collada: fix warning: unused variable.
|
2020-09-27 21:11:42 +02:00 |
|
Kim Kulling
|
3f97a1df2c
|
collada: fix warning: unused variable.
|
2020-09-27 21:09:06 +02:00 |
|
Kim Kulling
|
bdd3c96eee
|
amf: fix warning: unused variable.
|
2020-09-27 21:06:14 +02:00 |
|
Kim Kulling
|
5877f81419
|
amf: fix warning: unused variable.
|
2020-09-27 21:03:59 +02:00 |
|
Kim Kulling
|
5230b91611
|
amf: fix warning: unused variable.
|
2020-09-27 21:01:48 +02:00 |
|
Kim Kulling
|
8143ea5aec
|
amf: fix warning: unused variable.
|
2020-09-27 20:58:08 +02:00 |
|
Kim Kulling
|
9a19a4723b
|
amf: fix warning: unused variable.
|
2020-09-27 20:54:21 +02:00 |
|
Kim Kulling
|
5653a82a87
|
fix the unittests.
|
2020-09-27 20:20:44 +02:00 |
|
Kim Kulling
|
9234fee35e
|
Ogre: fix xml migration.
|
2020-09-27 09:36:38 +02:00 |
Sherief Farouk
|
a3c8cfc0ff
|
Fix for build break due to warnings-as-errors when not building M3D exporter.
|
2020-09-26 23:21:23 -07:00 |
|
Kim Kulling
|
d6892b3f58
|
Merge branch 'master' into pugi_xml
|
2020-09-25 21:00:09 +02:00 |
|
Kim Kulling
|
557273818d
|
collada: next iteration.
|
2020-09-23 21:23:12 +02:00 |
|
Kim Kulling
|
34351b3cb9
|
fix collada material parsing.
|
2020-09-23 00:20:06 +02:00 |
|
Kim Kulling
|
c0e58c1895
|
Merge branch 'master' into gltfBufferViewSizeFix
|
2020-09-22 20:02:16 +02:00 |
|
kimkulling
|
71f20eaa8a
|
next fixes
|
2020-09-22 15:51:21 +02:00 |
|
kimkulling
|
dee8e5bee1
|
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
|
2020-09-22 15:20:35 +02:00 |
|
Kim Kulling
|
c4039d5cf0
|
fix collada data parsing.
|
2020-09-21 20:05:16 +02:00 |
|
kimkulling
|
8c88526da8
|
fix collada unittests.
|
2020-09-21 16:39:24 +02:00 |
Max Vollmer (Microsoft Havok)
|
c9fb21661f
|
Merge branch 'master' into gltfBufferViewSizeFix
|
2020-09-18 08:01:24 +01:00 |
rahulshethsc
|
354e09e785
|
Merge branch 'master' into rbsheth_hunter_rapidjson
|
2020-09-17 14:39:04 -04:00 |
Fabian Schmidt
|
338c0b753c
|
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
|
2020-09-16 21:43:35 +02:00 |
|
Max Vollmer (Microsoft Havok)
|
9c1edaee96
|
Merge branch 'master' into gltfBufferViewSizeFix
|
2020-09-16 10:08:47 +01:00 |
|
Kim Kulling
|
14d6141f69
|
Collada: fix scenenode parsing.
|
2020-09-14 21:35:36 +02:00 |
|
Kim Kulling
|
9e2c4e0cf4
|
Merge branch 'master' into rbsheth_hunter_rapidjson
|
2020-09-14 09:00:11 +02:00 |
|
Kim Kulling
|
23defc275a
|
Merge branch 'master' into makeInternalErrorsAccessible
|
2020-09-14 08:36:13 +02:00 |
|
kimkulling
|
d0932c405f
|
fix duplicated node parsing.
|
2020-09-11 15:46:46 +02:00 |
|
Kim Kulling
|
c1f50e116a
|
fix next unittests.
|
2020-09-11 00:46:29 +02:00 |
|
Kim Kulling
|
31f3812241
|
XGL: fix import of node values.
|
2020-09-10 21:03:02 +02:00 |
|
kimkulling
|
6ec07e4dc7
|
XGL: next steps.
|
2020-09-10 17:31:30 +02:00 |
|
kimkulling
|
cca9eddb1c
|
Fix material-base AMF-unittest.
|
2020-09-10 13:56:04 +02:00 |
Max Vollmer
|
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 |
|
Kim Kulling
|
d854f3b842
|
AMF: fix adding for child-nodes.
|
2020-09-10 00:05:53 +02:00 |
|
Kim Kulling
|
0618db1f99
|
AMF: some smaller refactorings to improve readability.
|
2020-09-07 20:52:46 +02:00 |
|
Kim Kulling
|
ef6b93a949
|
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
|
2020-09-04 16:27:47 +02:00 |
|
Kim Kulling
|
689406fbda
|
Fix Colladat import.
|
2020-09-04 07:33:10 +02:00 |
Rahul Sheth
|
78b30d1752
|
Merge branch 'master' into rbsheth_hunter_rapidjson
|
2020-09-03 09:51:32 -04:00 |
|
Kim Kulling
|
be5089ae40
|
Collada: correct parsing of float data in xml nodes.
|
2020-09-02 22:38:19 +02:00 |
|
Kim Kulling
|
075540e15a
|
AMF: fixes.
|
2020-09-02 22:37:57 +02:00 |
|
Kim Kulling
|
0b8ed5c03a
|
fix crash when x3d is empty
|
2020-09-02 21:49:40 +02:00 |
|
Kim Kulling
|
34f343233e
|
3ml: fix xml parsing.
|
2020-09-02 21:49:20 +02:00 |
kkulling
|
87d2580aad
|
fix 3mf rel-parsing
|
2020-09-02 17:45:37 +02:00 |
Gargaj
|
9053dfea05
|
add missing define to glTF importer
|
2020-09-02 16:28:12 +02:00 |
|
Kim Kulling
|
73fa2cbe88
|
Fix memory handling of xml-nodes in the parser.
|
2020-09-01 21:48:50 +02:00 |
Joshua Hyatt
|
638499a278
|
Replace unique_ptr and add custom deleter
|
2020-09-01 10:30:31 -06:00 |
|
Kim Kulling
|
3c2133a3b9
|
fix node collection for collada xml parsing
|
2020-09-01 07:51:17 +02:00 |
|
kimkulling
|
e62b4e5cce
|
next iteration.
|
2020-08-31 16:10:38 +02:00 |
|
Kim Kulling
|
6d5c388780
|
Introduce node iterator.
|
2020-08-30 21:10:04 +02:00 |
|
Joshua Hyatt
|
dcf9a7b2d8
|
Conform variable names to code standards
|
2020-08-29 23:58:31 -06:00 |
|
Joshua Hyatt
|
953e976de6
|
Close stream when finished
|
2020-08-29 23:56:50 -06:00 |
|
Joshua Hyatt
|
cc2613f264
|
Replace unique_ptr with raw pointer
|
2020-08-29 23:06:33 -06:00 |
|
Joshua Hyatt
|
c769f8d4ad
|
Replace unique_ptr with raw pointer to avoid destructing stream
|
2020-08-29 22:21:34 -06:00 |
|
kimkulling
|
30a4eae17f
|
simplify some ttributes access in loaded xml.
|
2020-08-28 16:25:22 +02:00 |
|
kimkulling
|
0730eebe6f
|
fix collada handling of xml nodes.
|
2020-08-28 16:17:56 +02:00 |
|
crocdialer
|
3c98197be0
|
set aiAnimation->mTicksPerSecond to 1000.0. this is analog to the behaviour of gltf2-importer
|
2020-08-28 16:09:15 +02:00 |
|
Kim Kulling
|
b7e9595e54
|
fix loop of xml-files.
|
2020-08-28 00:09:51 +02:00 |
|
Rahul Sheth
|
59c8b4ed84
|
Move RapidJSON definitions to CMake
|
2020-08-27 16:51:06 -04:00 |
|
kimkulling
|
582a8b1887
|
Fix xml-migration bild.
|
2020-08-27 17:05:09 +02:00 |
|
Kim Kulling
|
c359b973bb
|
finish migration of collada.
|
2020-08-26 22:31:46 +02:00 |
|
Kim Kulling
|
904f17f29f
|
next collada-iteration
|
2020-08-24 07:44:54 +02:00 |
|
Kim Kulling
|
7adfe1f2d8
|
Xml: introduce helper for attribute parsing.
|
2020-08-21 06:45:30 +02:00 |
|
Kim Kulling
|
cb631517a7
|
next iteration.
|
2020-08-19 22:44:13 +02:00 |
|
Malcolm Tyrrell
|
6c2ceb55f8
|
Simplify some FBX error code.
|
2020-08-19 17:20:57 +01:00 |
|
kimkulling
|
d393f677ce
|
Collada: next methods migrated.
|
2020-08-19 17:10:30 +02:00 |
|
Kim Kulling
|
56381241c5
|
move hasAttribute to XmlParser scope.
|
2020-08-19 00:19:56 +02:00 |
|
Kim Kulling
|
554ed1bf91
|
next step.s
|
2020-08-18 20:44:06 +02:00 |
|
Malcolm Tyrrell
|
0f6127e90e
|
No need to build strings.
|
2020-08-18 18:21:20 +01:00 |
|
Malcolm Tyrrell
|
b7c789da67
|
Stop concatenating std::strings. Use formatter.
|
2020-08-18 17:35:08 +01:00 |
|
kimkulling
|
6a8edb21f8
|
fix merge issues
|
2020-08-18 17:41:37 +02:00 |
|
Malcolm Tyrrell
|
0ffcdf160e
|
Build formatting into DeadlyImportError
|
2020-08-18 16:32:34 +01:00 |
|
kimkulling
|
7e93ae4428
|
3MF: Migration.
|
2020-08-18 16:54:29 +02:00 |
lsliegeo
|
0d00ff7043
|
use ai_real instead of float
|
2020-08-15 14:57:49 +02:00 |
|
Kim Kulling
|
394651e640
|
x3d: migration of goups.
|
2020-08-10 22:13:45 +02:00 |
|
Kim Kulling
|
1f348c5fc0
|
Remove redundant float f
|
2020-08-04 20:55:29 +02:00 |
|
Kim Kulling
|
aabf12827b
|
fix typo
|
2020-08-04 17:52:43 +02:00 |
|
Kim Kulling
|
855b47452e
|
Export opacity is 3DS
closes https://github.com/assimp/assimp/issues/3291
|
2020-08-04 17:41:28 +02:00 |
|
Kim Kulling
|
008e551f8e
|
Merge branch 'master' into fbxVersionCheck
|
2020-07-31 14:33:21 +02:00 |
|
Malcolm Tyrrell
|
0282f358a4
|
Remove unneeded check.
|
2020-07-31 12:40:17 +01:00 |
|
Malcolm Tyrrell
|
301bae3967
|
Improve message
|
2020-07-30 16:37:41 +01:00 |
|
Malcolm Tyrrell
|
eaf0587dd8
|
FBX Version/Size Check
|
2020-07-30 14:56:01 +01:00 |
Ryan Styrczula
|
3170c3d15c
|
FBXExport: Fix crash if scene->mMetaData is null
|
2020-07-30 09:21:43 -04:00 |
|
Kim Kulling
|
58b81a2590
|
start migrating X3D.
|
2020-07-26 10:17:21 +02:00 |
|
Rahul Sheth
|
ad18e365e5
|
Fixing more warnings
|
2020-07-24 16:33:36 -04:00 |
|
Kim Kulling
|
c7a9ef30cc
|
Merge branch 'master' into fix-mingw-priumax
|
2020-07-24 11:14:15 +02:00 |
|
Kim Kulling
|
0f442b1ff2
|
Merge branch 'master' into gltfIndexOutOfRangeFix
|
2020-07-23 11:27:34 +02:00 |
|
Kim Kulling
|
a33557be71
|
Merge branch 'master' into acloader_enums
|
2020-07-22 23:50:51 +02:00 |
|
Kim Kulling
|
76a6bb36f6
|
Merge branch 'master' into issue-3332_msvc2017
|
2020-07-20 22:04:35 +02:00 |
MeyerFabian
|
a19e4e4112
|
Make clang with msvc abi work.
|
2020-07-20 18:28:50 +02:00 |
|
MeyerFabian
|
13ee2306c3
|
build/clang-cl-windows
|
2020-07-20 17:04:11 +02:00 |
RichardTea
|
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 |
|
RichardTea
|
f2e3e43fbc
|
Merge branch 'master' into acloader_enums
|
2020-07-17 11:30:50 +01:00 |
|
RichardTea
|
17b9403b7a
|
ACLoader: Use enum for Surface flags
|
2020-07-17 11:23:50 +01:00 |
|
Kim Kulling
|
b2e53783de
|
Merge branch 'master' into fix-mingw-priumax
|
2020-07-17 12:07:46 +02:00 |
|
Kim Kulling
|
fa486240d5
|
Merge branch 'master' into rbsheth_update_hunter
|
2020-07-17 11:39:55 +02:00 |
|
RichardTea
|
719cc82a1f
|
Apply clangformat
|
2020-07-17 10:29:44 +01:00 |
|
Kim Kulling
|
deddaf49df
|
finish migrate ogrexmlserializer.
|
2020-07-16 11:33:28 +02:00 |
|
Kim Kulling
|
df8792d24b
|
Merge branch 'master' into gltf1_gltf2_split
|
2020-07-16 10:45:55 +02:00 |
|
Malcolm Tyrrell
|
04df5f8b1e
|
Don't use make_unique
|
2020-07-15 15:47:25 +01:00 |
|
Malcolm Tyrrell
|
e1bab44e19
|
Exception safety
|
2020-07-15 15:02:27 +01:00 |
|
Malcolm Tyrrell
|
37e1fb9cd7
|
Fix message
|
2020-07-15 14:19:13 +01:00 |
|
Malcolm Tyrrell
|
f3170a96ba
|
Ensure data does not depend on faces we may not have created.
|
2020-07-15 12:36:48 +01:00 |
|
Malcolm Tyrrell
|
fff6396e3c
|
Rename to avoid overloading problems.
|
2020-07-15 12:22:28 +01:00 |
|
Malcolm Tyrrell
|
212903e935
|
Unit test for all indices out of range, and fix.
|
2020-07-15 12:19:00 +01:00 |
|
Malcolm Tyrrell
|
c0d978786e
|
Fix warning
|
2020-07-15 09:12:52 +01:00 |
|
Malcolm Tyrrell
|
a56134ba33
|
Drop faces when indices are out of range.
|
2020-07-15 09:05:09 +01:00 |
awr1
|
638369e995
|
Try to fix lexing issue with preproc w/r/t __has_warning
|
2020-07-14 21:58:36 -05:00 |
|
awr1
|
cc8cd88d7a
|
Preproc conditional should be &&, not ||
|
2020-07-14 21:50:22 -05:00 |
|
awr1
|
bad0df9a1a
|
Remove unnecessary inversion in preproc
|
2020-07-14 21:48:46 -05:00 |
|
awr1
|
b3f61f8759
|
Fix error where -Wunused-but-set-variable might not be available
|
2020-07-14 21:44:33 -05:00 |
|
awr1
|
3bf6963d20
|
Use a better divider for import error
|
2020-07-14 21:34:30 -05:00 |
|
awr1
|
93d567e3b1
|
Fix sprintf format string
|
2020-07-14 21:32:22 -05:00 |
|
awr1
|
700d8e6614
|
Fix MinGW builds (issues related to pragmas and format strings)
|
2020-07-14 21:19:07 -05:00 |
|
Rahul Sheth
|
abc6b9ce4c
|
ifdef fixes to fix MSVC warnings
|
2020-07-14 19:00:38 -04:00 |
|
Rahul Sheth
|
209a61d0e7
|
Update hunter and utf8cpp inclusion
|
2020-07-14 19:00:23 -04:00 |
|
Kim Kulling
|
b19ebf5d54
|
Fix merge conflicts.
|
2020-07-14 09:02:14 +02:00 |
|
Kim Kulling
|
8cfd2a4cc1
|
Migrate OgreSerializer.
|
2020-07-14 09:00:06 +02:00 |
|
Kim Kulling
|
f5d5d7c5ed
|
Merge branch 'master' into master
|
2020-07-13 20:35:24 +02:00 |
Ryan Styrczula
|
0c2f7a119c
|
FBXExporter: Forgot WritePropColor defaultValue
|
2020-07-13 13:56:06 -04:00 |
|
Ryan Styrczula
|
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 |
|
Kim Kulling
|
78d0b81b6c
|
Merge branch 'master' into patch-1
|
2020-07-12 18:54:34 +02:00 |
|
Kim Kulling
|
eaac92830a
|
Merge branch 'master' of https://github.com/LoicFr/assimp into LoicFr-master
|
2020-07-12 12:05:34 +02:00 |
|
Kim Kulling
|
b1dd77fbbc
|
Merge branch 'master' into gltf2_sparseAccessor_export
|
2020-07-11 22:57:31 +02:00 |
|
Kim Kulling
|
306e03d497
|
Merge branch 'master' into extras_property_callback
|
2020-07-11 22:46:19 +02:00 |
|
Kim Kulling
|
21678df589
|
ogre + collada migration.
|
2020-07-10 22:25:38 +02:00 |
Robert Reif
|
628394baec
|
check for invalid vertex
|
2020-07-07 23:29:54 -04:00 |
|
kimkulling
|
9aa468262f
|
closes https://github.com/assimp/assimp/issues/3252: fix build.
|
2020-07-07 17:35:03 +02:00 |
|
Robert Reif
|
6c29247180
|
add triangle strip support to AC file loader
|
2020-07-06 17:41:14 -04:00 |
|
Max Vollmer
|
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 |
|
Kim Kulling
|
77b705048b
|
fix merge issues.
|
2020-07-04 13:42:23 +02:00 |