Jason C
c08ad2e5c2
Merge branch 'master' into jc3-cctype-fixes
2021-05-05 19:04:47 -04:00
Kim Kulling
992f10e7bf
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-05 21:54:31 +02:00
Jason C
7ae8a52d9f
Merge branch 'master' into jc3-spam-killa
2021-05-05 10:33:29 -04:00
Kim Kulling
b82d9f4bc7
Merge branch 'master' into new-file-detection
2021-05-05 15:59:25 +02:00
kkulling
2a6b84c8ea
- closes https://github.com/assimp/assimp/issues/3830
...
- Fix rgba2hex
- Add tests
2021-05-05 14:43:51 +02:00
kkulling
f15dcfa981
- Fix model parsing
2021-05-05 13:10:52 +02:00
Jason C
6e65115253
[assimp/xml] Improved XML parse error message.
...
Fixed typo, added detail.
2021-05-05 00:33:57 -04:00
Jason C
a9fb1e56ae
Add ai_str_toprintable; fixed garbage messages in HMP, MDL, Q3D loaders.
...
- ai_str_toprintable: See docs in StringUtils.h.
- HMP, MDL, Q3D: In particular, newlines in binary data were complicating logging.
2021-05-04 20:33:16 -04:00
Krishty
b79b84d34e
Merge branch 'master' into new-file-detection
2021-05-05 00:09:42 +02:00
Krishty
0f3e6e2941
replaced std::size() with AI_COUNT_OF for pre-C++20 compilers
2021-05-05 00:08:54 +02:00
Jason C
2925592c64
[assimp] Make sure ctype calls use unsigned char.
...
Cast to unsigned char as required by C++ (see C++ **[cctype.cyn]** -> ISO C99 section 7.4, [see also](https://en.cppreference.com/w/cpp/string/byte/isspace )).
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:13 -04:00
Kim Kulling
9c44c0ab2b
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-04 13:02:00 +02:00
Tom spot Callaway
f91b439f79
preserve UV Stream names in FBX files
2021-05-03 13:40:31 -04:00
Tom spot Callaway
e7211790fb
PBR material support
2021-05-03 13:27:52 -04:00
Garux
eab1c9c3c0
add `AI_CONFIG_IMPORT_MD3_LOAD_SHADERS` bool option
...
the purpose is use of this loader with idtech3 FS
this requires full original material name, which euqals to Q3 shader path
result of deduction is not usable inside Q3 FS at all
option in general is "do not tinker with the path"
2021-05-01 08:14:44 +03:00
Kim Kulling
0b92abe9b4
Merge branch 'master' into empty-string-style
2021-04-30 00:54:57 +02:00
Jason C
708d124745
Update aiProcess_PreTransformVertices docs to match behavior.
...
Addresses #3820 , the easy way.
2021-04-26 19:42:22 -04:00
Krishty
5c64a4dc1e
devirtualized a function that is called once and never overridden
2021-04-24 18:33:57 +02:00
Krishty
e6a47d93c2
removed dead code from 0d29203e24
2021-04-24 13:29:15 +02:00
Krishty
b00de10eb3
Simplified importer search and fixed a few bugs
...
The search for a matching importer had a few issues, see #3791 . There were two different mechanisms to determine whether an importer accepts a specific file extension:
1. `aiImporterDesc::mFileExtensions`, which was forwarded to the UI via `BaseImporter::GetExtensionList()`.
2. `BaseImporter::CanRead()` when called with `checkSig == false`, which determines whether to actually use that importer.
Both were redundant and got out of sync repeatedly. I removed 2. completely and replaced it with 1., thereby syncing UI/import and shortening all `BaseImporter::CanRead()` implementations.
Further bugfixes:
- fixed glTF2 importer throwing exceptions when checking whether it can load a file
- removed `BaseImporter::SimpleExtensionCheck()` because it is no longer used and had a bug with case sensitivity
Since the `checkSig` parameter in `BaseImporter::CanRead()` is now useless, it can be removed completely. I’m not sure if this would break ABI compatiblity, so I’ll submit it with a later pull request.
2021-04-24 00:17:50 +02:00
Krishty
f761dc72f4
style fix - initializing and assigning empty std::string properly
...
std::string s(""); s = ""; calls the copy constructor, which in turn calls strlen(), … assigning a default-constructed string generates fewer instructions and is therefore preferred.
With C++11 uniform initialization, you’d simply write s = { } instead.
2021-04-16 23:43:56 +02:00
Kim Kulling
a6e4672df1
Fix a typo.
2021-04-12 23:19:00 +02:00
Kim Kulling
d1eeb80e1a
Not resize empty vectors.
...
closes https://github.com/assimp/assimp/issues/3754
2021-04-12 21:05:46 +02:00
Clement JACOB
e66232d8c3
Merge branch 'master' into feature/gltf_fb_ngon_encoding
2021-04-07 13:54:31 +02:00
Scott Baldric
31e8042071
Renaming PI to aiPi.
2021-04-05 09:59:22 -05:00
Kim Kulling
cdb6a62cdb
Merge branch 'master' into issue_3678
2021-04-03 10:27:07 +02:00
Kim Kulling
da0543972b
Fix parsing for AMF-Files.
2021-04-03 10:25:03 +02:00
Clement JACOB
5d09105a49
Update mesh.h
...
Fixing ngon encoding flag value
2021-03-30 20:24:03 +02:00
Clement Jacob
596001c89c
Refactoring the extension
2021-03-30 09:10:50 +02:00
Kim Kulling
84cd1d95c7
Merge branch 'master' into FixClangCL
2021-03-12 15:26:49 +01:00
Kim Kulling
806b12dc8b
Merge branch 'master' into issue_3678
2021-03-10 19:51:04 +01:00
Kim Kulling
520f64eeec
Fix missing trimming
2021-03-10 19:40:35 +01:00
Kim Kulling
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
Minmin Gong
c6c0f141f1
Fix compiling issues in clang-cl
2021-03-03 22:30:36 -08:00
contriteobserver
fc955a5f8a
applied extern "C" guards to importerdesc.h
...
addresses #3685
2021-03-03 12:23:26 -08:00
contriteobserver
6ab2e8d558
simplified the getRealAttribute implementation
2021-02-28 15:13:01 -08:00
contriteobserver
111752cff0
workaround for ASSIMP_DOUBLE_PRECISION compile errors
...
changed float types to ai_real types as needed
addresses issue #3682
2021-02-28 14:45:39 -08:00
Kim Kulling
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
Kim Kulling
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
Kim Kulling
dac7243b94
Update BundledAssetIOSystem.h
2021-02-15 13:43:39 +01:00
Kim Kulling
5f1f2a65ce
Merge branch 'master' into BundledAndroid
2021-02-15 13:43:20 +01:00
Kim Kulling
52c66406fa
Update defs.h
2021-02-12 20:59:45 +01:00
contriteobserver
800d5c23c3
implements a DefaultIOSystem that provides access to files bundled with Android Applications
...
addresses issue #3633
2021-02-01 23:33:55 -08:00
Kim Kulling
79a442f95d
Fixes a mem leak in aiMetadata::Set
2021-01-29 20:25:02 +01:00
Kim Kulling
706d636c63
Merge branch 'master' into master
2021-01-28 18:25:39 +01:00
Ville Voutilainen
6ebae5e67c
GCC 11 build fixes
2021-01-24 11:04:46 +02:00
RichardTea
8f4eff8d95
Increase ASSIMP_AI_REAL_TEXT_PRECISION
...
9 for float, 17 for double
2021-01-20 17:13:31 +00:00
Kim Kulling
11ee9d3673
Update types.h
2021-01-18 19:46:32 +01:00
Kim Kulling
5a764fff04
Fix overflow in aiString
2021-01-18 19:44:10 +01:00
Kim Kulling
658fec3e61
Fix cast
2021-01-17 20:41:44 +01:00
Kim Kulling
0969bf3500
Fix Divide-by-zero in vector3
...
Fix for https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=29655
2021-01-17 20:39:19 +01:00
Kim Kulling
8125e06f49
Merge branch 'master' into master
2021-01-14 19:03:16 +01:00
Kim Kulling
484ac21ef5
Remove dependency to posix-extension function
2021-01-14 11:53:25 +01:00
Kirill Gavrilov
0c2772e8bf
aiMaterial::GetTexture() - fix misleading description of path argument.
...
Mention aiScene::GetEmbeddedTexture() as a proper way to check if returned path
points to a file or to embedded texture.
2021-01-12 01:00:45 +03:00
Kim Kulling
cf78781fa8
Merge branch 'master' into 3mf-improvements
2021-01-02 13:14:13 +01:00
Kim Kulling
48b138ce13
Merge branch 'master' into dev/gltf-KHR_materials
2021-01-02 10:02:07 +01:00
Kim Kulling
fa24e4199c
Merge branch 'master' into develop3
2021-01-02 00:13:47 +01:00
Jean-Louis
629147043e
XmlParser: Fixed an error message when the file was correctly parsed
2020-12-27 18:13:49 +01:00
Danny Kabrane
2b097c1e73
Add KHR_materials_transmission during import
2020-12-23 10:43:01 +01:00
Danny Kabrane
f8c63d874b
support KHR_materials_clearcoat during import
2020-12-23 08:12:09 +01:00
Danny Kabrane
0fdda99ea1
add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN)
2020-12-21 14:33:35 +01:00
Danny Kabrane
63b0a97369
import KHR_materials_sheen
2020-12-20 07:59:12 +01:00
cywang
15cff94926
add operator* in aiQuaterniont
2020-12-17 17:08:06 +08:00
cywang
b6f8448b78
add operator* in aiQuaterniont
2020-12-17 16:13:35 +08:00
cywang
f6dd11ca1a
add operator* in aiQuaterniont
2020-12-17 15:07:03 +08:00
Martin
8003a016c2
Add some spaces to format code consistently
2020-12-15 12:36:00 +01:00
Martin
3718980c09
Only consider continuation tokens at end of line
2020-12-15 12:16:22 +01:00
Biswapriyo Nath
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
Kim Kulling
4590f06756
Merge branch 'master' into master
2020-11-25 16:57:49 +01:00
Evangel
67abcb10ba
Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes.
2020-11-22 15:33:31 +10:00
Inho Lee
8845d7eed3
Prevent to generate redundant morph targets for glTF2
2020-11-11 20:49:22 +01:00
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
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
John Mai
cea54d1ac5
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 14:06:25 +08:00
Kim Kulling
8d7e5db98c
Fix typo.
2020-10-22 22:26:03 +02:00
Kim Kulling
b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-21 20:02:48 +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
Malcolm Tyrrell
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
Malcolm Tyrrell
20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-08 09:54:04 +01:00
Kim Kulling
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
Malcolm Tyrrell
57756750f6
Limit the output
2020-10-02 15:20:50 +01:00
Malcolm Tyrrell
17702605cf
Limit the number of characters printed.
2020-10-02 14:41:36 +01:00
Malcolm Tyrrell
6b9c477763
The floar parsing routines are now DeadlyErrors.
2020-10-02 13:58:55 +01:00
Kim Kulling
ea741fd8bd
init readbuffer with 0-token.
2020-09-30 11:57:29 +02:00
Kim Kulling
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
Kim Kulling
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +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
Kim Kulling
2901f68668
Adapt code style.
2020-09-14 08:45:18 +02:00
kimkulling
d0932c405f
fix duplicated node parsing.
2020-09-11 15:46:46 +02:00
kimkulling
6ec07e4dc7
XGL: next steps.
2020-09-10 17:31:30 +02:00
Kim Kulling
be5089ae40
Collada: correct parsing of float data in xml nodes.
2020-09-02 22:38:19 +02:00
Kim Kulling
0c05398602
xml-parser: ensure that traverse-collectors are only collecting xmlnodes.
2020-09-02 21:48:58 +02:00
Kim Kulling
73fa2cbe88
Fix memory handling of xml-nodes in the parser.
2020-09-01 21:48:50 +02: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
Kim Kulling
b7e9595e54
fix loop of xml-files.
2020-08-28 00:09:51 +02: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
fa93ba76fe
Do need to export base class.
2020-08-20 15:01:24 +01:00
Malcolm Tyrrell
16c227e27c
Undo one other small change.
2020-08-20 14:53:00 +01:00
Malcolm Tyrrell
8f893e3653
Actually, just keep the old behaviour for now.
2020-08-20 14:32:15 +01: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
3ccf503d3e
Forward template arguments.
2020-08-19 11:31:32 +01: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
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
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
4f1e904ec8
Fix typo.
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
Kim Kulling
394651e640
x3d: migration of goups.
2020-08-10 22:13:45 +02:00
Kim Kulling
30d83d40c1
fix brackets for template in template
2020-08-07 19:15:28 +02:00
kimkulling
13d7fad7f7
closes https://github.com/assimp/assimp/issues/2992 : add single or double precision + missing compilers.
2020-08-07 14:23:07 +02: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
MeyerFabian
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
Kim Kulling
deddaf49df
finish migrate ogrexmlserializer.
2020-07-16 11:33:28 +02:00
Malcolm Tyrrell
e51e07982d
Remove generic lambda usage.
2020-07-15 15:05:42 +01:00
Malcolm Tyrrell
e1bab44e19
Exception safety
2020-07-15 15:02:27 +01:00
awr1
700d8e6614
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-14 21:19:07 -05:00
Kim Kulling
8cfd2a4cc1
Migrate OgreSerializer.
2020-07-14 09:00:06 +02:00
Kim Kulling
306e03d497
Merge branch 'master' into extras_property_callback
2020-07-11 22:46:19 +02:00
Kim Kulling
108b3a62e5
Update Exporter.hpp
...
revert merge issue
2020-07-11 22:45:45 +02:00
Kim Kulling
839986ca14
next step of AMF-Migration.
2020-07-04 09:04:06 +02:00
Kim Kulling
d74c10dcb7
Merge branch 'master' into pugi_xml
2020-07-03 17:29:38 +02:00
Malcolm Tyrrell
51150cb3df
Ensure asserts are defined where expected.
2020-07-02 14:53:29 +01:00
Kim Kulling
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
Yingying Wang
97085c1c05
update sync
2020-06-30 11:48:37 -07:00
Yingying Wang
36f899bf09
sync update
2020-06-30 11:45:11 -07:00
Hill Ma
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
Kim Kulling
fb20e15163
start to migrate colladat and amf
2020-06-27 15:57:06 +02:00
Evangel
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
Evangel
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
Kim Kulling
95e822a6ec
Merge branch 'master' into aiAssertHandler
2020-06-24 20:47:10 +02:00
Malcolm Tyrrell
170c00eee7
Useful comment.
2020-06-24 11:51:03 +01:00
Malcolm Tyrrell
edaa8e4a80
Need to use ASSIMP_BUILD_DEBUG.
2020-06-24 11:37:43 +01:00
Kim Kulling
6205af4efb
replace NULL and avoid ai_assert with more than 2 tests.
2020-06-23 21:05:42 +02:00
Malcolm Tyrrell
9188f56839
Allow assert handling to be replaced.
2020-06-23 11:55:51 +01:00
Kim Kulling
6397bfbf90
replace NULL by nullptr on loadFile.
2020-06-21 12:03:38 +02:00
ywang
e65434bf82
extra callback
2020-06-11 17:37:06 -07:00
ywang
f57e7221c0
temp
2020-06-10 13:23:29 -07:00
Yingying Wang
578a7ac502
add Callback API in ExporterProperties
2020-06-09 11:20:48 -07:00
Kim Kulling
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
Malcolm Tyrrell
14692368d5
Same for LogDebug -> LogVerboseDebug
2020-05-18 11:55:14 +01:00
Malcolm Tyrrell
df2630d0e8
Change in comment.
2020-05-18 11:45:13 +01:00
Malcolm Tyrrell
e11d78596f
Use verbose debug logging in certain places
2020-05-15 17:26:17 +01:00
Malcolm Tyrrell
5e0136d737
Add concept of verboseDebug
2020-05-15 17:23:07 +01:00
Malcolm Tyrrell
6be0ce1ec9
Initial pass at adding logging
2020-05-15 17:21:45 +01:00
Kim Kulling
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
RichardTea
fa1d2f09db
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-05 09:33:48 +01:00
Kim Kulling
ddee1b1ddb
Merge branch 'master' into aaronfranke-file-formatting
2020-05-05 10:21:46 +02:00
kkulling
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
Kim Kulling
6afb72216c
Compile constructor of aiMetadataType only for c++
2020-05-04 20:50:44 +02:00
Kim Kulling
3b4a9812e5
add init list for metadatatype.
2020-05-04 20:40:08 +02:00
kimkulling
5c9a08e375
closes https://github.com/assimp/assimp/issues/3190 : fix leak.
2020-05-04 15:36:54 +02:00
RichardTea
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
Kim Kulling
3b06f57150
add missing inclde +
2020-05-02 21:11:47 +02:00
RichardTea
3e2dd186d1
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-01 12:08:12 +01:00
RichardTea
5b9f207f1f
ColladaExporter cleanup
...
Namespace, NULL and includes
2020-05-01 11:54:34 +01:00
Kim Kulling
52122a9900
Merge branch 'master' into kimkulling_dev
2020-05-01 10:49:03 +02:00
Kim Kulling
da2bf5c7a4
fix wrong size
2020-04-29 21:13:46 +02:00
Kim Kulling
c6131ce38a
scenecombiner: fix leak.
2020-04-29 20:43:23 +02:00
Kim Kulling
fd555a1349
review findings.
2020-04-29 20:33:37 +02:00
RichardTea
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
Kim Kulling
bafb8e3189
closes https://github.com/assimp/assimp/issues/3165 : remove deprecated code whch causes compiler warning.
2020-04-26 08:59:52 +02:00
Kim Kulling
9b1759dcc2
Merge branch 'master' into migenius-migenius-rsws53-mig-2
2020-04-22 19:59:53 +02:00
Kim Kulling
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
Kim Kulling
232761be02
Fix another typo
2020-04-21 16:09:11 +02:00
Kim Kulling
843ca6e386
Fix typo
2020-04-21 15:50:17 +02:00
Kim Kulling
428b91154a
Adapt smallvector
...
- Add doc ( public header )
- Fix type error
2020-04-21 08:59:40 +02:00
Kim Kulling
788f2f244e
Adapt code
...
- Reformatting based on clang-format rules
- Add usage of size_t instead of unsigned int for sizes
- Fix typo in naming
2020-04-21 08:50:51 +02:00
Kim Kulling
e0f6eb09e6
Merge branch 'master' into optimized_bonelimits
2020-04-17 20:37:28 +02:00
Kim Kulling
e299f71cfe
Adapt the formatting
2020-04-17 16:16:28 +02:00
Hehongyuanlove
f80bdc5b71
Update StringUtils.h
2020-04-17 12:57:33 +08:00
Hehongyuanlove
59e32a5ad9
Update StringUtils.h
2020-04-17 12:51:18 +08:00
Hehongyuanlove
cc3760aff1
Update StringUtils.h
2020-04-17 12:50:49 +08:00
Hehongyuanlove
3154cec79c
Rgba2Hex add
2020-04-17 12:31:07 +08:00
Kim Kulling
b2a547b817
Add doc
2020-04-14 19:07:41 +02:00
Marc-Antoine Lortie
ac16a857ff
Merge remote-tracking branch 'upstream/master' into add-tests-to-c-api-2
2020-04-13 09:08:45 -04:00
Kim Kulling
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
Kim Kulling
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
Kim Kulling
4c177ad72e
fix possible warnings
2020-03-30 20:33:43 +02:00
Marc-Antoine Lortie
f9a7d2abf1
Added C API tests.
2020-03-27 07:59:10 -04:00
Ville Ruusutie
7a2bc5f8f3
Merge branch 'master' into optimized_bonelimits
2020-03-27 07:12:25 +02:00
Marc-Antoine Lortie
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
napina
bb4bcb442a
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-23 10:35:06 +02:00
napina
d5d30c898b
Optimized LimitBoneWeightsProcess. Added SmallVector to reduce heap allocations. Simplified algorithm and removed unnecessary copying.
2020-03-22 12:47:42 +02:00
Kim Kulling
9f7d9becb2
fix the linux build.
2020-03-21 08:56:49 +01:00
Aaron Franke
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
kimkulling
5b8e6832c3
add mssing move constructor.
2020-03-19 16:53:05 +01:00
kimkulling
4de4c34fb2
ry to fix 2013-specific warnings in mesh.h
2020-03-19 15:10:46 +01:00
kimkulling
4d917c97bd
fix warnings detected in vs2017.
2020-03-19 12:58:41 +01:00
Kim Kulling
9aa5e3e04f
fix new vs2013 warnings.
2020-03-18 21:32:17 +01:00
kimkulling
d1afd97ec2
fix 2 more warnings for vs2013.
2020-03-18 16:48:32 +01:00
kimkulling
2eb8ff7136
disable 2 more warnings for vs2013.
2020-03-18 16:37:02 +01:00
kimkulling
a9e8f65941
fix the build - add misisng forward declaration for aiVector3t.
2020-03-16 10:50:07 +01:00
Kim Kulling
856ca9f2dd
Fix static-code findings,
2020-03-15 12:16:17 +01:00
Kim Kulling
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
kimkulling
255758e6ff
fix read for precision-depending data.
2020-03-14 11:16:44 +01:00
kimkulling
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
kkulling
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
Kim Kulling
7e7555a91b
fix compiler warnings in tools and test-
2020-03-11 00:43:44 +01:00
kimkulling
f3b6b78d4d
small refactorings.
2020-03-09 10:55:32 +01:00
Kim Kulling
e8d2b84017
clean all warnings for vs-2019
2020-03-08 21:24:01 +01:00
Marc-Antoine Lortie
424f5e939f
Fixed wrong matrix type used in comparaison operators.
2020-03-08 12:18:09 -04:00
Kim Kulling
920535165d
next fixed warnings
2020-03-01 13:15:45 +01:00
Paul Arden
e56def7585
Fix indentation.
2020-02-25 14:52:59 +11:00
Paul Arden
ae50c4ebdf
Add support for orthographic camera information and use in glTF2 importer. Fixes #3030 .
2020-02-25 14:45:00 +11:00
iamAdrianIusca
016c0a8665
small changes
2020-02-18 18:42:59 +02:00
Marc-Antoine Lortie
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
Kim Kulling
979153522c
xml-migration: migration of XGLImporter.
2020-02-05 22:51:39 +01:00
Kim Kulling
bd2ffc8d58
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
2020-02-03 21:19:30 +01:00
Kim Kulling
c1fcee9c5a
XMl-Migration: Migration of IrrMesh.
2020-02-03 21:19:03 +01:00
Kim Kulling
02df65d541
Merge branch 'master' into pugi_xml
2020-01-28 13:13:47 +01:00
Kim Kulling
8ef106e185
xml-migration: introduce xmlnode.
2020-01-27 22:11:27 +01:00
Marc-Antoine Lortie
770c822621
Updated places to achFormatHint referencing array size.
2020-01-23 15:26:49 -05:00
Kim Kulling
02acb3f8c2
Merge branch 'master' into pugi_xml
2020-01-23 21:26:04 +01:00
Kim Kulling
a905303764
IrrXml: replaced irrXml by pugixml.
2020-01-23 21:16:10 +01:00
Marc-Antoine Lortie
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
RichardTea
ae7a0aa6ef
Merge branch 'master' into collada_modeller_metadata
2020-01-02 13:25:04 +00:00
Marc-Antoine Lortie
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
RichardTea
f498a395e4
Add common metadata to Collada
...
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
2019-12-09 14:05:41 +00:00
Kim Kulling
c1706d9bf8
Update metadata.h
...
Fix possible crashes.
2019-12-06 21:24:04 +01:00
Kim Kulling
b2ab3fa35e
Merge branch 'master' into ModellerMetaData
2019-12-06 21:19:29 +01:00
Malcolm Tyrrell
a2f8c84c6c
Fix deletion issue in aiMetadata::Add.
2019-12-05 17:06:28 +00:00
Malcolm Tyrrell
24f0a400b7
Extra comments.
2019-12-05 15:11:46 +00:00
Malcolm Tyrrell
894b8e3519
Initial version
2019-12-05 12:32:22 +00:00
Gordon MacPherson
505769935e
Merge branch 'master' into remove-cout-2797
2019-12-04 22:38:50 +00:00
RichardTea
e5b065da3e
Formatter is a stringstream
...
Used wrong API. Sorry about that.
2019-12-03 13:35:53 +00:00
RichardTea
496382982a
Remove cout calls from FBX, LWO and B3D
...
Fixes #2797
2019-12-02 11:56:55 +00:00
Mike Samsonov
631da3a3d1
Merge branch 'master' into preserve_error_string
2019-12-02 10:35:29 +00:00
Loïc
5cfb0fd633
Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags
2019-11-22 18:27:34 +01:00
Mike Samsonov
80f5283b2f
Error string of Importer should contain a message in case of an exception
2019-11-18 16:57:01 +00:00
Justin Carpentier
28a9fb31fd
Merge branch 'master' into topic/c++11
2019-11-10 13:20:05 +01:00
Kim Kulling
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
Justin Carpentier
031d3b648e
defs: use noexcept only for C++11 and more
2019-11-10 08:23:17 +01:00
RevoluPowered
5155efe888
Fixed bitmask issue
...
We are approaching the limit for the number of post processes
2019-10-27 14:16:39 +00:00
RevoluPowered
9c8d835704
Explicitly use nullptr
2019-10-27 14:16:39 +00:00
RevoluPowered
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
RevoluPowered
46cdd81d75
Added ArmaturePopulate scale process for all formats
2019-10-27 14:16:39 +00:00