Kim Kulling
f5af791633
Merge branch 'master' into FBXMeshGeometry_checksizes_fix
2020-02-12 17:58:00 +01:00
Kim Kulling
58990d4e3f
Update FBXParser.cpp
...
add missing brackets.
2020-02-10 23:59:52 +01:00
Kim Kulling
af9705e3d1
Merge branch 'master' into FBXParser_check_inputlength_fix
2020-02-07 11:52:00 +01:00
Max Vollmer
8af0229e0d
In "ByVertice" case tempData.size() needs to be mapping_offsets.size(), not vertex_count
2020-02-05 14:40:35 +00:00
Max Vollmer
cb55e2658d
Removed unnecessary checks that may result in false positives rejecting valid models
2020-02-05 11:07:39 +00:00
Max Vollmer
9e46fca9a9
Added missing checks for tempData and uvIndices sizes in all cases
2020-01-29 15:06:48 +00:00
Max Vollmer
0d672efa90
Check input token length before copy
2020-01-29 15:04:26 +00: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
Matthias Moulin
cc40963e1a
Removed name of unreferenced local variable in catch block
2020-01-17 16:07:50 +01:00
Mike Samsonov
08c5fa37bf
Add a support for 3DSMax Physically Based Materials for FBX format
2019-12-10 12:04:35 +00:00
Kim Kulling
b2ab3fa35e
Merge branch 'master' into ModellerMetaData
2019-12-06 21:19:29 +01:00
Malcolm Tyrrell
8956e567b2
Better comment.
2019-12-05 14:09:36 +00:00
Malcolm Tyrrell
fabfcf3cb0
More checking
2019-12-05 12:33:00 +00:00
Malcolm Tyrrell
894b8e3519
Initial version
2019-12-05 12:32:22 +00:00
RichardTea
e5b065da3e
Formatter is a stringstream
...
Used wrong API. Sorry about that.
2019-12-03 13:35:53 +00:00
RichardTea
3a977d009d
Merge branch 'master' into remove-cout-2797
2019-12-03 13:24:03 +00:00
RichardTea
496382982a
Remove cout calls from FBX, LWO and B3D
...
Fixes #2797
2019-12-02 11:56:55 +00:00
Yingying Wang
ddf7c0ad8f
avoid weighting vertex repeatedly when joining identical vertices
2019-11-05 17:34:32 -08:00
Mike Samsonov
adec426b7c
Fix for exporting fbx bigger than 2GB
2019-11-05 17:11:56 +00:00
Mike Samsonov
536fea1c8d
operator less for old compilers
2019-11-01 14:50:30 +00:00
Mike Samsonov
55c2a3edb9
FBX orphant embedded textures
2019-11-01 12:29:54 +00:00
RevoluPowered
9c8d835704
Explicitly use nullptr
2019-10-27 14:16:39 +00:00
RevoluPowered
5d0c63391b
Explicitly set the size of the parent node if we have no children
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
RevoluPowered
93efe4197a
Removed redundant rest matrix and fixed assert compile error
2019-10-27 14:16:39 +00:00
RevoluPowered
168ae22ad4
Implemented easy armature lookup
...
This lets you directly retrieve the node a bone links to and informs you of the armature directly
This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
2019-10-27 14:16:39 +00:00
Fabrice Fontaine
32781a566d
Fix FBXConverter: use proper 64-bit constant
...
Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes:
code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type
code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch ]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2019-10-06 15:42:11 +02:00
Kim Kulling
6e75d7a839
Merge branch 'master' into fix-multi-uvset-coord
2019-09-25 16:57:24 +02:00
ywang
a4092a3234
correct uvset index
2019-09-20 17:53:15 -07:00
Kim Kulling
4b9cc1a484
Merge branch 'master' into fix-codacy-issues
2019-09-18 20:32:49 +02:00
escherstair
6d4854f12c
init variable in initializer list
2019-09-18 08:15:50 +02:00
Kim Kulling
2edcf82f5a
add missing include.
2019-09-17 21:58:46 +02:00
Kim Kulling
8b95479bb0
closes https://github.com/assimp/assimp/issues/2598 : introduce getEpsilon
2019-09-15 19:25:37 +02:00
RevoluPowered
ddc26e1c46
Added maya stingray support for textures
2019-09-08 19:15:27 +01:00
RevoluPowered
da97f1be79
Implemented basic PBR materials into assimp.
...
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS
This is the first small change required.
We only support maya right now.
2019-09-08 19:15:27 +01:00
Kim Kulling
5d8482dae6
Merge branch 'master' into master
2019-09-07 18:53:26 +02:00
Kim Kulling
f8bcd7cb40
Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 10:02:20 +02:00
RumbleballTheReal
22bd047db5
Added VertexColors to FBX exporter (one channel)
...
Works properly with Blender (custom importer) and UnrealEngine (Official SDK)
2019-09-05 23:44:54 +02:00
Kim Kulling
b34f9839f1
Merge branch 'master' into fix-missing-scale-data
2019-08-31 12:42:40 +02:00
escherstair
e8ae086b35
fix function definition
2019-08-29 10:48:51 +02:00
escherstair
75fed8340d
fix function declaration
2019-08-29 10:46:50 +02:00
Kim Kulling
e20640c2c8
Merge branch 'master' into fix-segfault-fbx-import
2019-08-28 09:14:51 +02:00
Gordon MacPherson
43cb76653b
Removed depreciated FBX Unit and scaling code
2019-08-27 15:54:27 +01:00
Gordon MacPherson
abdd853ca5
FIX missing update call for scale to post process
2019-08-27 15:50:50 +01:00
Gordon MacPherson
ad971468ef
size_t cannot be less than 0
2019-08-27 15:15:40 +01:00
Gordon MacPherson
7e12257ebc
Fix segfault #2614
2019-08-26 22:44:25 +01:00
Gordon MacPherson
c50a4d8ade
Fix segfault caused by FBX file with missing face #2614
2019-08-26 22:39:20 +01:00
Gordon MacPherson
d56198774e
Fix FBX units not being converted from CM to application scale
2019-08-26 22:03:56 +01:00
Kim Kulling
594d90a18e
Merge branch 'master' into feature/prototype-for-assimp-universal-scale
2019-08-24 10:22:08 +02:00
Gordon MacPherson
0d29203e24
Prototype unit system for assimp generic enough to be used across formats.
2019-08-21 21:41:41 +01:00