b59db55b8c
Merge branch 'master' into less-string-bloat
2021-05-26 12:14:08 +02:00
aeaa22cbbd
Merge branch 'master' into UVStreamNames
2021-05-23 14:37:28 +02:00
ac54fe41e2
Merge branch 'master' into PBRsupport
2021-05-23 13:23:06 +02:00
4ec01cfdcd
Improve use of logging
2021-05-13 12:05:31 +01:00
ad6f300b1d
Other LogAux functions
2021-05-13 10:43:28 +01:00
7abfd134b6
LogAux warn
2021-05-13 10:33:16 +01:00
5cd3bdd5c2
No need to distinguish formatting log functions.
2021-05-13 10:25:27 +01:00
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
b57ce004f8
reduced FBX string bloat
...
The FBX importer used two std::strings where string literals would have been sufficient.
2021-05-04 22:01:01 +02:00
f91b439f79
preserve UV Stream names in FBX files
2021-05-03 13:40:31 -04:00
e7211790fb
PBR material support
2021-05-03 13:27:52 -04:00
9ae3e88f6c
Merge branch 'master' into fbxBlendshapes
2021-05-03 07:40:25 -07:00
64da2a4315
Merge remote-tracking branch 'upstream/master' into fbxBlendshapes
2021-04-26 13:51:22 -07:00
a5d0e99548
Fixed error in blendShapeChannel Weighting
2021-04-26 12:19:20 -07:00
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
4aa52b3af8
Flip the check on _MSC_VER for using TR1 containers.
2021-04-13 11:15:52 -07:00
cf4ef04a80
Merge branch 'master' into master
2021-04-07 20:58:40 +02:00
3fd865b4bf
Added Blendshape Support to FBX Export
2021-03-24 18:10:03 -07:00
c0c7e6a0de
trim uvIndices to fix import of Cheetah3D generated fbx files
2021-03-12 14:48:38 +01:00
cc7e229c3c
disable size check
2021-03-12 08:55:11 +01:00
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
1e38f84c3a
fix typo
2021-01-27 09:40:19 +01:00
ac0f1f2cab
Update FBXMaterial.cpp
2021-01-27 09:37:35 +01:00
c02ad323a5
Fix VS compiler warning: convertig int to char
2021-01-27 09:22:59 +01:00
4471c36c08
Fix compiler bug for VS2019
...
- Check https://developercommunity.visualstudio.com/content/problem/1223143/visual-studio-2019-c-program-crash-with-stdstring.html for more details
- closes https://github.com/assimp/assimp/issues/3572
2021-01-26 20:59:21 +01:00
77f9c2854a
Merge branch 'master' into fbx_tokenizer_fix
2020-12-25 21:44:26 +01:00
b8bf1eac04
FBXConverter : Fix timescales of FBX animations
...
FBX animations were recorded by framenumber, not by time.
This patch will change it as a base of milliseconds.
2020-12-16 15:02:46 +01:00
9d3c0081eb
Throw if property length is out of bounds
2020-12-14 16:49:04 +00:00
7dd0596010
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-11 14:31:00 +01:00
471d2acc92
Improvements & style
2020-12-03 11:17:45 +00:00
19af3f0d31
Swap the meaning using the out_mat property.
2020-12-02 16:59:29 +00:00
f7be3048de
New 3ds Max PBR Materials in FBX
2020-12-01 12:05:42 +00:00
88be8ec698
Merge branch 'master' into fbxExceptionSafety
2020-11-27 21:49:58 +01:00
149b8d1fd1
Don't need operator< either.
2020-11-27 14:26:51 +00:00
14f79caf41
textures_converted keys can just be pointers
2020-11-26 16:29:37 +00:00
885a196c74
Unsigned
2020-11-19 16:30:44 +00:00
7b59cc297e
FBXParser.cpp - handle buffer over-read cases correctly
2020-11-19 12:20:06 +00:00
c00153089a
Neater construction
2020-11-17 10:45:10 +00:00
213a9f9d55
First pass at PotentialNode
2020-11-17 10:39:03 +00:00
3221522f95
Prevent crash with malformed texture reference
2020-11-16 17:29:19 +00:00
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +01:00
aee2e9a87d
Merge branch 'master' into patch-1
2020-10-25 20:35:06 +01:00
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
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
a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig
2020-10-19 10:16:02 +01:00
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
636f28965f
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-11 18:13:43 +02:00
eb9928e029
fix for fbx files using stringray materials;
2020-10-09 07:28:15 +01:00
4bdaf20b70
Add comment.
2020-10-05 14:23:42 +01:00
Kim Kulling
Malcolm Tyrrell
Jason C
Krishty
Tom spot Callaway
vfxgordon
Hill Ma
Urs Hanselmann
Kim Kulling
Inho Lee
Max Vollmer
Neil Clifford
#Momo
Malcolm Tyrrell
Sahin Serdar Kocdemir