Commit Graph

9151 Commits

Author SHA1 Message Date
Fabian Schmidt
338c0b753c Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-16 21:43:35 +02:00
Kim Kulling
3e5feb4320 Merge pull request #3375 from MalcolmTyrrell/makeInternalErrorsAccessible
Make internal errors accessible
2020-09-14 08:59:09 +02:00
Kim Kulling
2901f68668 Adapt code style. 2020-09-14 08:45:18 +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
Kim Kulling
bd91033172 Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162 2020-09-08 20:53:00 +02:00
Kim Kulling
4f30b2aa5c Merge pull request #3391 from Naios/unref_param
Fix an unreferenced formal parameter warning on MSVC when no exporter…
2020-09-08 20:35: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
9ce0671134 Merge pull request #3387 from Gargaj/patch-1
add missing define to glTF importer
2020-09-03 08:42:18 +02:00
Gargaj
9053dfea05 add missing define to glTF importer 2020-09-02 16:28:12 +02:00
Kim Kulling
3081e83f43 Merge pull request #3385 from jnhyatt/smart-ptr-fix
Fix Bad Ownership Acquisition
2020-09-02 16:24:25 +02:00
Kim Kulling
4dad3eab3f Merge branch 'master' into smart-ptr-fix 2020-09-02 16:14:45 +02:00
Kim Kulling
a7d3172dd8 Merge pull request #3386 from flowtsohg/master
Update Jassimp's AiTextureType.java
2020-09-02 16:14:08 +02:00
Chananya Freiman
542d784457 Update Jassimp's AiTextureType.java
The newer PBR enums are missing, making it impossible to import many models.
2020-09-02 02:52:56 +03:00
Joshua Hyatt
638499a278 Replace unique_ptr and add custom deleter 2020-09-01 10:30:31 -06: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
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
Malcolm Tyrrell
962fe7cd4d Oops. Fix string to match restored error text. 2020-08-20 15:10:11 +01: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
6c2ceb55f8 Simplify some FBX error code. 2020-08-19 17:20:57 +01:00
Malcolm Tyrrell
d7c65c36cd Add unit test for formatting. 2020-08-19 11:31:46 +01:00
Malcolm Tyrrell
3ccf503d3e Forward template arguments. 2020-08-19 11:31:32 +01: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
Malcolm Tyrrell
0ffcdf160e Build formatting into DeadlyImportError 2020-08-18 16:32:34 +01:00
Malcolm Tyrrell
974252bd8f Fix two warnings that annoy clang. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell
4f1e904ec8 Fix typo. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell
829ff1adf0 Maybe this will help. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell
a4110a59c5 Use runtime error. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell
19cdfd12df Unit test for internal failures. 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
48ec3ef458 Merge pull request #3374 from fuj1n/update_utf8cpp
Update utf8cpp to fix use of C++17 deprecated feature
2020-08-17 21:11:05 +02:00
Arthur (fuj1n) Uzulin
995ab805ff Update utf8cpp to fix use of C++17 deprecated feature 2020-08-17 17:54:48 +10:00
Kim Kulling
51a417ce6f Merge pull request #3372 from lsliegeo/nff_ai_real
NFF importer double precision support
2020-08-16 13:56:33 +02:00
lsliegeo
0d00ff7043 use ai_real instead of float 2020-08-15 14:57:49 +02:00
Kim Kulling
9fc00cbf74 Merge pull request #3369 from assimp/issue_3364
Fix incorrect index
2020-08-11 20:50:11 +02:00
Kim Kulling
1bbae19779 Fix leak 2020-08-11 20:28:12 +02:00
Kim Kulling
b1b9fa94cf Update utStandardShapes.cpp 2020-08-11 20:21:35 +02:00
Kim Kulling
9bad20e99e Add test to CMakeLists 2020-08-11 20:03:30 +02:00
Kim Kulling
45f76f36f3 Add test to CMakeLists 2020-08-11 20:03:23 +02:00