Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,389 Commits 19 Branches 43 Tags
00a2cd20f9fc4e78b6cfcac81bd9ef2e2f3d150f
Commit Graph

223 Commits

Author SHA1 Message Date
Rahul Sheth
1b37b74f9e Hunter fixes for stb_image 2021-07-07 17:01:19 -04:00
Rahul Sheth
0a5e49252d Merge remote-tracking branch 'origin/master' into HEAD 2021-07-07 16:35:29 -04:00
RichardTea
4a66ec25d0 Standardise Clearcoat, Sheen and Transmission 
Also cleanup glTFv2 defaults, don't import/export if disabled
 2021-06-14 15:11:41 +01:00
Scott Baldric
444fc9c373 Increasing length of mDataLength if rewriting the texture index increases magnitutde of index. 2021-06-04 16:32:46 -05:00
Kim Kulling
a716f741d8 fix the include 2021-06-03 23:35:12 +02:00
Kim Kulling
e0d1a36523 Merge branch 'master' into stb-image-updated 2021-06-03 23:07:38 +02:00
Carsten Rudolph
0905252833 Merge branch 'master' into master 2021-05-27 09:45:17 +02:00
Kim Kulling
aa8d746dc3 Merge branch 'master' into patch-1 2021-05-27 08:35:29 +02:00
Kim Kulling
29e5f5fed1 Merge branch 'master' into master 2021-05-26 13:18:04 +02:00
Malcolm Tyrrell
084dc73b91 Fast path for unformatted calls. 2021-05-17 11:27:21 +01:00
Malcolm Tyrrell
fd5d1211f9 Recover comment which got dropped 2021-05-17 10:33:00 +01:00
Malcolm Tyrrell
6e4b9d267b Remove TODO. Typo fix. 2021-05-17 10:29:06 +01:00
Malcolm Tyrrell
4ec01cfdcd Improve use of logging 2021-05-13 12:05:31 +01:00
Malcolm Tyrrell
5cd3bdd5c2 No need to distinguish formatting log functions. 2021-05-13 10:25:27 +01:00
Malcolm Tyrrell
78145f1425 log verboseDebug 2021-05-13 10:08:59 +01:00
Malcolm Tyrrell
89584c167a Log debug 2021-05-13 09:56:42 +01:00
Malcolm Tyrrell
ca698c3e49 Log error 2021-05-13 09:36:42 +01:00
Malcolm Tyrrell
58bc4bcb63 log info 2021-05-12 12:55:21 +01:00
Malcolm Tyrrell
813d0aecdd Adjust warn 2021-05-12 12:43:24 +01:00
Carsten Rudolph
a54cd432cd Merge branch 'master' into master 2021-05-11 07:58:05 +02:00
Kim Kulling
433620350e Merge branch 'master' into stb-image-updated 2021-05-10 11:30:45 +02:00
Jason C
859b32c045 [Logger] Log a notification instead of silently dropping long log messages. 
Logs a notification instead of silently dropping long log messages, which can complicate debugging.

This way, if you don't see a message you expect to see, you'll immediately know why.

The *correct* approach would be to eliminate length filtering here entirely and use `snprintf` appropriately (also there's a tiny -- probably negligible -- performance hit here in calling `strlen` regardless of whether or not the verbosity level matches). Failing that, the second best option is to copy and truncate messages here. However, for now, this should be OK.
 2021-05-07 22:32:32 -04:00
Jason C
7b404788a6 Merge branch 'master' into jc3-cctype-fixes 2021-05-07 14:48:01 -04:00
Carsten Rudolph
8ff52c0f89 Pass base name from export properties to the IO system. 2021-05-07 17:31:30 +02:00
Jason C
c08ad2e5c2 Merge branch 'master' into jc3-cctype-fixes 2021-05-05 19:04:47 -04:00
Krishty
816da9b677 merge and update all copies of stb_image.h 2021-05-05 23:15:41 +02:00
Kim Kulling
992f10e7bf Merge branch 'master' into remove-useless-scaling-prototype 2021-05-05 21:54:31 +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
875acc5166 Merge branch 'master' into patch-4 2021-05-04 20:59:06 +02:00
Kim Kulling
9c44c0ab2b Merge branch 'master' into remove-useless-scaling-prototype 2021-05-04 13:02:00 +02:00
Kim Kulling
39522178aa Merge branch 'master' into fix-scale-msg 2021-05-04 08:13:12 +02:00
Kim Kulling
7843b24e03 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-05-01 09:16:06 +02:00
Jason C
07257f4c66 Merge branch 'master' into patch-4 2021-04-30 22:23:23 -04:00
Kim Kulling
0b92abe9b4 Merge branch 'master' into empty-string-style 2021-04-30 00:54:57 +02:00
Scott Baldric
f523b1e0d7 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-29 08:52:51 -05:00
Jason C
975de81ab6 Merge branch 'master' into patch-4 2021-04-28 22:23:17 -04:00
Jason C
cf498c979a ASSIMP_ENABLE_DEV_IMPORTERS env var to control registration of wip importers; applied to X3D 
- GetImporterInstanceList reads ASSIMP_ENABLE_DEV_IMPORTERS env var. Development importers are enabled if the env var is set and is not equal to the literal string "0".
- X3D importer will not be registered unless ASSIMP_ENABLE_DEV_IMPORTERS is set; addresses #3647.

TODO: If this change is incorporated, it should be documented.
NOTE: Effective git branch structure is a better solution. This is an alternate for #3825.
 2021-04-28 11:16:49 -04:00
Kim Kulling
6abdd0cd3e Fix crash when reading 0 bytes 
- This is a valid option so crash shall not happen
 2021-04-28 16:38:22 +02:00
Krishty
e6a47d93c2 removed dead code from 0d29203e24 2021-04-24 13:29:15 +02:00
Krishty
afe947d5db fixed malformatted message 2021-04-24 12:38:31 +02:00
Scott Baldric
aae3788247 Fix: Removing double delete of texture items. 
Textures were being double deleted after a merge scene because the
texture array wasn't being properly deleted at the end of merging.
Furthermore, the texture array was being sized to the number of
materials instead of the number of textures.
 2021-04-22 08:49:47 -05:00
Krishty
3fead344ad updated version string (if anyone cares) 2021-04-19 07:37:12 +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
da0543972b Fix parsing for AMF-Files. 2021-04-03 10:25:03 +02:00
Kim Kulling
6c89631581 closes https://github.com/assimp/assimp/issues/3678: ensure lowercase 2021-03-09 21:08:28 +01:00
Kim Kulling
9e8dbd0ca5 Update copyrights to 2021. 2021-02-28 12:17:54 +01:00
Ville Voutilainen
6ebae5e67c GCC 11 build fixes 2021-01-24 11:04:46 +02:00
Kim Kulling
11a17ebfe6 Merge branch 'master' into tdb/pbrt3_exporter 2021-01-20 20:03:30 +01:00
Kim Kulling
f8dd3a9aa6 Update DefaultIOSystem.cpp 2021-01-20 08:05:43 +01:00
Kim Kulling
ed3e745752 Update DefaultIOSystem.cpp 2021-01-19 21:58:04 +01:00