Kim Kulling
8c91d1a3cd
closes https://github.com/assimp/assimp/issues/3198 : make aiMaterial::GetName const.
2020-11-10 12:50:17 +01:00
Kim Kulling
a8381113eb
Update ObjFileMtlImporter.cpp
2020-11-10 10:23:28 +01:00
Kim Kulling
856d4c016e
closes https://github.com/assimp/assimp/issues/3448
...
Add transmission alpha value. if any.
2020-11-10 10:03:09 +01:00
Malcolm Tyrrell
0f246edb97
Prevent GetValue from corrupting memory
2020-11-06 13:43:16 +00:00
Malcolm Tyrrell
34e3e6293a
Style
2020-11-06 09:57:48 +00:00
Malcolm Tyrrell
0af05e7a60
Better message
2020-11-05 15:10:52 +00:00
Malcolm Tyrrell
01b2088dd3
A missing bufferview was causing a crash.
2020-11-05 15:02:41 +00:00
Kim Kulling
6873d79505
Delete AMFImporter_Postprocess.cpp
2020-11-03 13:00:28 +01:00
Malcolm Tyrrell
3deae8760c
Optimize FindDegenerates so it doesn't explode
2020-11-02 14:43:35 +00:00
Kim Kulling
206f28b8ad
Merge branch 'master' into fix/3365
2020-10-29 13:40:00 +01:00
Kim Kulling
72bc41b50f
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-28 22:00:08 +01:00
Kim Kulling
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +01:00
Kim Kulling
3fd95aff4e
Merge branch 'master' into fix/3365
2020-10-27 17:43:28 +01:00
Kim Kulling
df768bdd99
Merge branch 'master' into patch-1
2020-10-27 16:20:33 +01:00
Kim Kulling
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
Kim Kulling
aee2e9a87d
Merge branch 'master' into patch-1
2020-10-25 20:35:06 +01:00
Kim Kulling
57e691e28e
openddl: latest greatest.
2020-10-25 10:34:43 +01:00
Kim Kulling
55feb0cb78
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 22:06:49 +02:00
Max Vollmer
4006bb71f4
Fixes for crashes in GLTF2 Importer
2020-10-23 12:01:43 +01:00
John Mai
cea54d1ac5
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 14:06:25 +08:00
Kim Kulling
6ee5e248ee
Fix typo
2020-10-22 22:26:29 +02:00
#Momo
b168d8f441
replaced data with taking address of first element
...
oops, seems like `data()` returns `char*` only since C++17. Replaced with taking address of first string element
2020-10-21 23:41:33 +03:00
#Momo
7781fe5781
MSVC crash workaround
...
I do not know why, but the following line causes crash if assimp was compiled using MSVC with RelWithDebInfo configuration:
`std::transform(shading.begin(), shading.end(), shading.begin(), Assimp::ToLower<char>);`
replacing `shading.begin()` with `shading.data()` fixes this issue.
2020-10-21 23:21:50 +03:00
Kim Kulling
b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-21 20:02:48 +02:00
Kim Kulling
bbac168ced
Merge branch 'master' into collada_cleanup
2020-10-19 23:56:52 +02:00
Kim Kulling
69143ed149
fix unittests.
2020-10-19 23:53:27 +02:00
Kim Kulling
080322b9e2
cleanup collada xml migration.
2020-10-19 19:06:11 +02:00
Malcolm Tyrrell
a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig
2020-10-19 10:16:02 +01:00
john
d48ac9d0a4
fix xcode compile bug
2020-10-18 10:54:04 +08:00
Inho Lee
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
Inho Lee
9f880e2214
Fix glTF1 orthographic camera
2020-10-16 08:56:55 +02:00
Malcolm Tyrrell
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
Silvio Traversaro
3b5212067c
Fix CMake config generation
...
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
Kim Kulling
7660070aa4
Merge branch 'master' into master
2020-10-14 21:01:35 +02:00
Kim Kulling
857f62cde0
closes pParam.mReference = source;
2020-10-14 20:34:46 +02:00
Jukka Maatta
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
Kim Kulling
84ef3dc0fc
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-13 18:37:03 +02:00
Rahul Sheth
f12e6eb6f4
Update Hunter for pugixml
2020-10-12 16:30:03 -04:00
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
Kim Kulling
52826a03f8
remove all hunter-dependencies for pugixml.
2020-10-05 18:53:42 +02:00
Kim Kulling
23f144a7b7
pugixml: use pugixml in headeronly mode.
2020-10-05 18:44:59 +02:00
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
kimkulling
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
kimkulling
d75fa2bb4b
fix invalid path.
2020-10-01 10:43:48 +02:00
kimkulling
c740f61f97
hunter integration: pugixml
2020-10-01 10:29:52 +02: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
effccfe2e6
Remove dead code.
2020-09-28 15:23:26 +02:00
Kim Kulling
bf4ad2837f
Remove dead code.
2020-09-28 15:20:59 +02:00
Kim Kulling
69822fd5e6
remove pugixml from hunter
2020-09-28 10:23:25 +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
0e9621012c
Adapt code style - finally :-).
2020-09-14 08:43:31 +02:00
Kim Kulling
1ff9e2b522
Adapt code style.
2020-09-14 08:40:21 +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
bd91033172
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-08 20:53:00 +02:00
Kim Kulling
0618db1f99
AMF: some smaller refactorings to improve readability.
2020-09-07 20:52:46 +02:00
Denis Blank
f3b25b999b
Fix an unreferenced formal parameter warning on MSVC when no exporter is built
2020-09-05 23:20:31 +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
Malcolm Tyrrell
8f893e3653
Actually, just keep the old behaviour for now.
2020-08-20 14:32:15 +01:00
Kim Kulling
cb631517a7
next iteration.
2020-08-19 22:44:13 +02:00
Malcolm Tyrrell
9b5e758bdd
Even simpler DeadlyErrorBase
2020-08-19 17:59:13 +01:00
Malcolm Tyrrell
6f9c61e157
Use case which matches surrounding code.
2020-08-19 17:57:25 +01: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
e1a0163e7e
Make all exceptions available.
2020-08-18 18:14:51 +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
Malcolm Tyrrell
829ff1adf0
Maybe this will help.
2020-08-18 10:33:47 +01:00
Malcolm Tyrrell
b1ed751b83
Provide an API for accessing internal errors.
2020-08-18 10:33:42 +01:00
lsliegeo
0d00ff7043
use ai_real instead of float
2020-08-15 14:57:49 +02:00
Kim Kulling
729882debb
Fix incorrect index
...
closes https://github.com/assimp/assimp/issues/3364
2020-08-11 19:57:36 +02:00
Kim Kulling
394651e640
x3d: migration of goups.
2020-08-10 22:13:45 +02:00