3718980c09
Only consider continuation tokens at end of line
2020-12-15 12:16:22 +01:00
8d8ba521e2
Check _MSC_VER for MSVC specific pragma directives.
...
This fixes build issues when compiled with compiles like Clang or GCC.
2020-12-02 02:05:14 +05:30
4590f06756
Merge branch 'master' into master
2020-11-25 16:57:49 +01:00
67abcb10ba
Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes.
2020-11-22 15:33:31 +10:00
8845d7eed3
Prevent to generate redundant morph targets for glTF2
2020-11-11 20:49:22 +01:00
8c91d1a3cd
closes https://github.com/assimp/assimp/issues/3198 : make aiMaterial::GetName const.
2020-11-10 12:50:17 +01:00
72bc41b50f
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-28 22:00:08 +01:00
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +01:00
cea54d1ac5
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 14:06:25 +08:00
8d7e5db98c
Fix typo.
2020-10-22 22:26:03 +02:00
b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-21 20:02:48 +02:00
080322b9e2
cleanup collada xml migration.
2020-10-19 19:06:11 +02:00
a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig
2020-10-19 10:16:02 +01:00
d48ac9d0a4
fix xcode compile bug
2020-10-18 10:54:04 +08:00
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-08 09:54:04 +01:00
d676e1a13f
closes https://github.com/assimp/assimp/issues/3379 : reproduce error of unresolved symbol with static lib
2020-10-05 21:37:18 +02:00
57756750f6
Limit the output
2020-10-02 15:20:50 +01:00
17702605cf
Limit the number of characters printed.
2020-10-02 14:41:36 +01:00
6b9c477763
The floar parsing routines are now DeadlyErrors.
2020-10-02 13:58:55 +01:00
ea741fd8bd
init readbuffer with 0-token.
2020-09-30 11:57:29 +02:00
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +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
2901f68668
Adapt code style.
2020-09-14 08:45:18 +02:00
d0932c405f
fix duplicated node parsing.
2020-09-11 15:46:46 +02:00
6ec07e4dc7
XGL: next steps.
2020-09-10 17:31:30 +02:00
be5089ae40
Collada: correct parsing of float data in xml nodes.
2020-09-02 22:38:19 +02:00
0c05398602
xml-parser: ensure that traverse-collectors are only collecting xmlnodes.
2020-09-02 21:48:58 +02:00
73fa2cbe88
Fix memory handling of xml-nodes in the parser.
2020-09-01 21:48:50 +02: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
b7e9595e54
fix loop of xml-files.
2020-08-28 00:09:51 +02: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
fa93ba76fe
Do need to export base class.
2020-08-20 15:01:24 +01:00
16c227e27c
Undo one other small change.
2020-08-20 14:53:00 +01:00
8f893e3653
Actually, just keep the old behaviour for now.
2020-08-20 14:32:15 +01: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
3ccf503d3e
Forward template arguments.
2020-08-19 11:31:32 +01: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
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
0ffcdf160e
Build formatting into DeadlyImportError
2020-08-18 16:32:34 +01:00
7e93ae4428
3MF: Migration.
2020-08-18 16:54:29 +02:00
4f1e904ec8
Fix typo.
2020-08-18 10:33:47 +01:00
b1ed751b83
Provide an API for accessing internal errors.
2020-08-18 10:33:42 +01:00
394651e640
x3d: migration of goups.
2020-08-10 22:13:45 +02:00
30d83d40c1
fix brackets for template in template
2020-08-07 19:15:28 +02: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
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
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
deddaf49df
finish migrate ogrexmlserializer.
2020-07-16 11:33:28 +02:00
e51e07982d
Remove generic lambda usage.
2020-07-15 15:05:42 +01:00
e1bab44e19
Exception safety
2020-07-15 15:02:27 +01:00
700d8e6614
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-14 21:19:07 -05:00
8cfd2a4cc1
Migrate OgreSerializer.
2020-07-14 09:00:06 +02:00
306e03d497
Merge branch 'master' into extras_property_callback
2020-07-11 22:46:19 +02:00
108b3a62e5
Update Exporter.hpp
...
revert merge issue
2020-07-11 22:45:45 +02:00
839986ca14
next step of AMF-Migration.
2020-07-04 09:04:06 +02: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
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
97085c1c05
update sync
2020-06-30 11:48:37 -07:00
36f899bf09
sync update
2020-06-30 11:45:11 -07: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
d75d59a4fd
Added operator== and operator!= to aiMetadata to allow for testing.
...
Updated utMetadata.copy_test to reflect that there's now 8 metadata types.
2020-06-26 15:07:42 +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
95e822a6ec
Merge branch 'master' into aiAssertHandler
2020-06-24 20:47:10 +02:00
170c00eee7
Useful comment.
2020-06-24 11:51:03 +01:00
edaa8e4a80
Need to use ASSIMP_BUILD_DEBUG.
2020-06-24 11:37:43 +01: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
6397bfbf90
replace NULL by nullptr on loadFile.
2020-06-21 12:03:38 +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
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
14692368d5
Same for LogDebug -> LogVerboseDebug
2020-05-18 11:55:14 +01:00
df2630d0e8
Change in comment.
2020-05-18 11:45:13 +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
6be0ce1ec9
Initial pass at adding logging
2020-05-15 17:21:45 +01:00
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02: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
6afb72216c
Compile constructor of aiMetadataType only for c++
2020-05-04 20:50:44 +02:00
3b4a9812e5
add init list for metadatatype.
2020-05-04 20:40:08 +02:00
5c9a08e375
closes https://github.com/assimp/assimp/issues/3190 : fix leak.
2020-05-04 15:36:54 +02:00
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
Martin
Biswapriyo Nath
Kim Kulling
Evangel
Inho Lee
Kim Kulling
John Mai
Malcolm Tyrrell
john
Malcolm Tyrrell
MeyerFabian
awr1
Yingying Wang
Hill Ma
Evangel
RichardTea
kkulling