Kim Kulling
d83af91095
Update Exporter.cpp
...
Add exporter detail.
2019-07-29 09:03:29 +02:00
Kim Kulling
762e039d15
Merge branch 'master' into test_exporter_ids
2019-07-28 22:20:57 +02:00
Kim Kulling
7d74a3354d
Merge branch 'master' into fix-multiUV-export
2019-07-28 09:37:00 +02:00
RichardTea
7fc4cf1552
ASSIMP_BUILD_NO_*_EXPORTER
...
Full fix for #2557
These macros should be all-caps.
Correct the cmakelists
2019-07-26 22:17:24 +01:00
Kim Kulling
94328695d0
Merge branch 'master' into fix_export_group_as_bone
2019-07-26 11:00:04 +02:00
Kim Kulling
73914cd7e2
Update FBXExporter.cpp
...
small reformatting improvement
2019-07-26 10:55:28 +02:00
ywang
d8eaf0bc7f
cleanup empty lines
2019-07-25 15:53:57 -07:00
ywang
a6b06ad811
update
2019-07-25 15:49:41 -07:00
thomasbiang
aaaa0a02a3
use ExportProperties to customize bind pose epsilon
2019-07-25 15:49:38 -07:00
thomasbiang
0f0454c3b7
customize error rate for bind pose
2019-07-25 15:47:17 -07:00
thomasbiang
f9f408690e
use ExportProperties to customize bind pose epsilon
2019-07-25 15:45:50 -07:00
thomasbiang
2ddb00f4e0
clean up
2019-07-25 15:45:50 -07:00
thomasbiang
029338940c
customize error rate for bind pose
2019-07-25 15:45:47 -07:00
ywang
0ed9158908
update
2019-07-25 15:43:43 -07:00
thomasbiang
6e6765cae3
clean up
2019-07-25 15:43:43 -07:00
thomasbiang
c597e21b67
customize error rate for bind pose
2019-07-25 15:43:43 -07:00
thomasbiang
9b2aac8c96
use ExportProperties to customize bind pose epsilon
2019-07-25 15:43:43 -07:00
thomasbiang
079e522eae
clean up
2019-07-25 15:43:43 -07:00
thomasbiang
8fc899035c
customize error rate for bind pose
2019-07-25 15:43:43 -07:00
ywang
57a56b7b1d
extra layer for multi uv sets
2019-07-25 13:14:54 -07:00
RichardTea
7e8a3ec4cb
Add unit test of valid and unique Exporter IDs, rename assjson id
...
"json" is a very vague exporter ID, change to "assjson"
Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
2019-07-25 13:38:49 +01:00
RichardTea
e993cdc309
Merge branch 'master' into collada_zae
2019-07-25 12:42:08 +01:00
RichardTea
9b78060a4a
Add copyright headers to ZipArchiveIOSystem
2019-07-25 10:14:42 +01:00
RichardTea
3016f3a725
Convert Q3BSP Importer to use ZipArchiveIOSystem
...
Removes duplication, handles large files better
2019-07-25 10:13:53 +01:00
RichardTea
5c6ea5d7ba
Fix memory leak in Collada ZAE and 3MF ZipFile reading
...
Must close the file!
2019-07-25 09:54:39 +01:00
RichardTea
9e04df810e
ZipArchiveIOSystem should be sorted, fix ZipFile::Read()
...
Q3BSP relies on the sort order
Read() should return number of elements read, not count of bytes
Read() should clip to the file size and return elements actually read,
instead of aborting if try to read too much
2019-07-25 09:53:18 +01:00
VladimÃr VondruÅ¡
dadf5c0020
Fix white ambient in STL loader.
...
A problem that sneaked in from #1293 (f84851e893
)
due to insufficient code review, later reported in #2059 but not fixed
properly. Having a white ambient practically means all other color information
is ignored and the model stays bright white no matter how you set up your
lighting, so putting it back to how it was before the commit above.
2019-07-25 10:28:09 +02:00
RichardTea
c6620478ec
Fix GCC warnings reported by Travis
2019-07-24 16:12:06 +01:00
Pierre Anquez
17adc98eec
Fix issue #2557
2019-07-23 15:58:30 +02:00
Kim Kulling
e828dd1757
Merge branch 'master' into collada_zae
2019-07-21 14:37:12 +02:00
Kim Kulling
5895f04391
Merge branch 'master' into fix_export_custom_bindpose_error
2019-07-21 12:17:02 +02:00
Kim Kulling
41ea607739
Merge branch 'master' into collada_zae
2019-07-20 14:12:18 +02:00
Kim Kulling
ff7ec7e454
Merge branch 'master' into fix-obj-line-continuation
2019-07-20 12:07:49 +02:00
Kim Kulling
103048ff85
Update UnrealLoader.h
...
use memcpy instead of = operator for pos copy.
2019-07-20 10:10:17 +02:00
kkulling
a8019cf8d8
Unit: Fix new compiler warnings.
2019-07-19 10:38:44 +02:00
ywang
e1e9d92c01
update
2019-07-16 13:36:46 -07:00
thomasbiang
e3683e49e4
clean up
2019-07-16 13:36:45 -07:00
thomasbiang
5121a835b5
customize error rate for bind pose
2019-07-16 13:36:45 -07:00
thomasbiang
6299c58fae
use ExportProperties to customize bind pose epsilon
2019-07-16 13:34:00 -07:00
thomasbiang
6e0810d3c1
clean up
2019-07-16 13:34:00 -07:00
thomasbiang
cdf60d7423
customize error rate for bind pose
2019-07-16 13:33:59 -07:00
thomasbiang
c889699d58
set->unordered_set;unsigned int for iteration
2019-07-16 13:33:59 -07:00
thomasbiang
9210ff37f2
fix group node being exported as bone node
2019-07-16 13:33:59 -07:00
Merwan
2122dc231d
Fix line continuations in OBJ files
2019-07-16 20:37:41 +02:00
kimkulling
c1670b6a97
closes https://github.com/assimp/assimp/issues/2548 : check if weight are set or set the weight to 1.0f
2019-07-16 11:40:34 +02:00
Frooxius
bcdb173e09
- Fixed anim meshes generated from blendshapes not being copied to output for multi-material meshes
...
- Fixed first vertex of each blendshape on a multi-material mesh having all unmapped vertice offsets being added to it
- Fixed blendshapes not importing for multi-material FBX meshes with no bones
2019-07-13 22:20:47 +02:00
RichardTea
07d3a7d5b0
Fix some warnings
...
Hopefully the sorts out the MSVC2013 compiler
2019-07-12 16:02:51 +01:00
RichardTea
678dd32da3
Add missing header
2019-07-12 15:37:10 +01:00
kimkulling
53c0f91305
Add unittest for json.
2019-07-12 16:08:51 +02:00
RichardTea
2a72c9b616
Read embedded textures from Collada ZAE
2019-07-12 14:46:48 +01:00
RichardTea
ddd1e770b9
First pass of Collada ZAE support
...
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:36:46 +01:00
RichardTea
8636d5607c
Add ZipArchiveIOSystem to CMake
2019-07-12 11:35:43 +01:00
RichardTea
d64e1bde13
First pass of Collada ZAE support
...
Reads the manifest and loads the DAE
Does not yet load embedded textures
2019-07-12 11:29:35 +01:00
RichardTea
2c7f607e7c
Create ZipArchiveIOSystem
...
Moved IOSystem Unzip functionality out of D3MF Importer into include/assimp
Cleaned up and more efficient:
Don't map the archive until the caller opens a file or requests the contents list
Don't extract any files until they are opened
Store the location of the data within the ZIP and extract it later if the file is opened.
2019-07-12 11:22:17 +01:00
Kim Kulling
3b3a965d2b
Delete JTImporter.h
2019-07-11 22:31:40 +02:00
Kim Kulling
b1d8398243
Delete JTImporter.cpp
...
Remove JTImorter.cpp from pull request
2019-07-11 22:31:24 +02:00
Kim Kulling
8bf1b9ac5e
Update CMakeLists.txt
...
remove jtimporter
2019-07-11 22:29:30 +02:00
Kim Kulling
82e7775d6d
Update JTImporter.cpp
...
disable unused method,.
2019-07-11 19:23:00 +02:00
Kim Kulling
da33262bcc
Update FBXConverter.cpp
...
Fix merge conflicts
2019-07-11 19:17:41 +02:00
kkulling
eb5e829436
Assjson: add json export to list of exporters.
2019-07-11 17:43:03 +02:00
kkulling
2e782f43e5
Merge branch 'master' into kimkulling_dev
2019-07-11 17:37:52 +02:00
kkulling
b463ddd399
closes https://github.com/assimp/assimp/issues/340 : start integrating assimp2json.
2019-07-11 17:37:31 +02:00
thomasbiang
d7773dcfba
set->unordered_set;unsigned int for iteration
2019-07-10 09:51:20 -07:00
thomasbiang
6b5e0a9914
fix group node being exported as bone node
2019-07-09 19:05:45 -07:00
Kim Kulling
39dc9801e0
Update ColladaLoader.cpp
...
- add header memory
- Fix format stuff
2019-07-09 20:35:57 +02:00
Kim Kulling
a01302dd4d
Merge branch 'master' into issue_2182
2019-07-09 19:45:40 +02:00
Kim Kulling
ed6dbf9533
closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception.
2019-07-09 19:44:56 +02:00
kkulling
b87f4c03ba
Remove not needed init.
2019-07-09 11:49:59 +02:00
Kim Kulling
ae7b1f1a77
Merge branch 'master' into kimkulling_dev
2019-07-03 18:28:15 +02:00
Kim Kulling
0ec5eb752c
Update FBXConverter.cpp
...
Removing dead and unused code.
2019-07-03 12:50:01 +02:00
Kim Kulling
1fc232effa
closes https://github.com/assimp/assimp/issues/2368 : just fix it
2019-07-02 21:46:52 +02:00
Kim Kulling
96f16c7aea
closes https://github.com/assimp/assimp/issues/2527 : use correct macro for Assimp-exporter.
2019-07-02 19:48:53 +02:00
Kim Kulling
3fcf3bd81f
Merge branch 'master' into topic/embedded_texture_name_fix
2019-06-30 12:43:40 +02:00
Rob Conde
f5ece83f31
initial unnamed node uniqueness index outside of loop
2019-06-28 16:12:58 -04:00
Mike Samsonov
6d07473550
all textures use relative path except embedded, this is fix for it
2019-06-27 17:59:55 +01:00
Kim Kulling
05f5b54f75
Merge branch 'master' into issue_2518_active_importer_ident
2019-06-27 14:02:01 +02:00
Kim Kulling
af199c50aa
Merge branch 'master' into issue_2456_text_formats_precision
2019-06-26 17:31:11 +02:00
Kim Kulling
853afdf42b
Merge branch 'master' into fix_issue_2507_collada_import
2019-06-25 20:19:42 +02:00
Kim Kulling
1952144445
Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev
2019-06-24 21:46:05 +02:00
Kim Kulling
0f66a917e5
Add unittest.
2019-06-24 21:37:53 +02:00
RichardTea
8f43fb144a
Add "importerIndex" Importer property
...
This indicates the index of the Importer that was selected, or -1 if did not find one at all.
2019-06-24 14:55:48 +01:00
Kim Kulling
26bd54ae0b
PostProcesswing: add gen-aabb process to postprocessing.
2019-06-23 20:24:32 +02:00
Kim Kulling
418c07a9bb
closes https://github.com/assimp/assimp/issues/2368 : add missign anim mesh for multimaterial meshes in fbx,.
2019-06-21 18:00:53 +02:00
RichardTea
bf252c4452
Add configuration of text format precision
...
Define ASSIMP_AI_REAL_TEXT_PRECISION
8 when ai_real is float
16 when ai_real is double
2019-06-20 18:11:11 +01:00
RichardTea
59f732e10d
DAE Import: Don't use SkipElement() to skip empty Text
...
IrrXML doesn't recognise the construction: `<author></author>` as being an empty element, and so ColladaParser::TestTextContent advances the element stream into the `</author>` element.
Use TestClosing(const char*) instead of SkipElement() to skip an empty text element.
2019-06-20 16:30:52 +01:00
Kim Kulling
6b3d6c3b8f
JT: next steps.
2019-06-18 20:35:02 +02:00
Kim Kulling
ced080f9f3
X: fix out of bound access.
2019-06-15 19:17:15 +02:00
Kim Kulling
eb27fb753d
Merge branch 'master' into kimkulling-patch-3
2019-06-15 13:44:13 +02:00
Rahul Sheth
6c33374491
update install interface location
2019-06-13 22:08:34 -07:00
Rahul Sheth
d00f4f4b3a
Build Hunter-compatible config file
2019-06-13 21:34:47 -07:00
Rahul Sheth
5cda81e84b
code fixes for Hunter-based build
2019-06-13 21:32:37 -07:00
Rahul Sheth
dab8041bcd
rewrite include paths for Hunter packages
2019-06-13 21:32:36 -07:00
Rahul Sheth
a4587e8609
Use hunter to download dependencies if HUNTER_ENABLED is ON
2019-06-13 21:31:24 -07:00
Kim Kulling
ba29b8f1da
Merge branch 'master' into patch-1
2019-06-13 13:41:40 +02:00
Kim Kulling
0021c93892
closes https://github.com/assimp/assimp/issues/2431 : use irrXml directly for mingw compiler.
2019-06-12 22:12:38 +02:00
Kim Kulling
66f693a6a4
Update IRRLoader.cpp
...
fix case-sensitive typo.
2019-06-12 10:25:11 +02:00
Kim Kulling
e914b9531b
Update IRRLoader.h
...
fix case-sensity typo.
2019-06-12 00:55:06 +02:00
Kim Kulling
4dcb3c9235
Update ImporterRegistry.cpp
...
fix case-sensiive folder bug.
2019-06-11 21:55:21 +02:00
Kim Kulling
fc065d8ab4
Merge branch 'master' into reorg
2019-06-11 20:59:46 +02:00
Kim Kulling
a6e3fc3fd9
Fix case-sensitive folder name for unix platforms.
2019-06-11 20:54:01 +02:00
Kim Kulling
cc10967913
Fix the build.
2019-06-11 20:17:50 +02:00
PK
d448b49ae1
fixed MSVC toolset versions >140
...
according to https://cmake.org/cmake/help/latest/variable/MSVC14.html the use of the MSVC** flags is deprecated, this change uses the encouraged MSVC_VERSION variable.
2019-06-11 15:16:53 +02:00
Kim Kulling
f76d77955d
Merge branch 'master' into reorg
2019-06-11 00:22:50 +02:00
Kim Kulling
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
Kim Kulling
7e20356a20
Update XFileParser.cpp
...
Fix exception.
2019-06-10 20:32:56 +02:00
Kim Kulling
6fc42cb898
Merge branch 'master' into kimkulling-patch-3
2019-06-10 00:39:05 +02:00
Kim Kulling
a4bda3a205
Update XFileParser.cpp
...
Test
2019-06-09 21:25:25 +02:00
Kim Kulling
2d985b92c9
Fix references in cmake file.
2019-06-09 18:43:56 +02:00
petrmohelnik
83247e3fbd
Merge branch 'master' into glTF-importer---clean-all-member-arrays
2019-06-09 15:52:32 +02:00
Kim Kulling
cbd5c5b284
Merge branch 'master' into Ogre_with_skeleton_missing
2019-06-08 21:31:47 +02:00
Kim Kulling
4a46717a77
Merge branch 'master' into kimkulling-patch-3
2019-06-08 09:09:37 +02:00
Arkeon
5679dd435a
Prevent crash when Ogre skeleton file is missing
2019-06-07 09:49:24 +02:00
Kim Kulling
57c46db042
Reorg of code.
2019-06-06 14:45:43 +02:00
Kim Kulling
589a306c85
Merge branch 'master' into code-chmod-644
2019-06-06 09:16:07 +02:00
Kim Kulling
6ed4f5d936
JT: Inital commit.
2019-06-06 08:29:12 +02:00
petrmohelnik
1855bf44f9
glTF importer - clean all member arrays
...
When importing more than one scene using the same gtlf importer loading fails with error 'bad array new length'. This happens because 'meshOffsets' are not cleared and the importer continues to push_back values at the end. Adjacent values are then used to calculate the length of 'mMeshes' array. This calculation expects that each value is higher than the previous otherwise we get negative length. But when pushin at the end of uncleared array we get contents like this: 0,1,2,3,0,1,2. Then when calculating 0-3 we try to allocate array of length -3 and get this exception.
2019-06-05 18:51:49 +02:00
Kim Kulling
dcee3295cc
Merge branch 'master' into FindInstancesProcessOptim
2019-06-04 10:36:59 +02:00
Mike Samsonov
48ed2d2d3c
Double precision fix
2019-05-30 10:54:44 +01:00
Kim Kulling
5bc6787d57
Merge branch 'master' into FindInstancesProcessOptim
2019-05-29 12:21:48 +02:00
Kim Kulling
a6b51ef911
Merge branch 'master' into code-chmod-644
2019-05-29 08:59:47 +02:00
Kim Kulling
51527ba038
Merge branch 'master' into utf8
2019-05-28 19:53:14 +02:00
Kim Kulling
5c3662dc6d
Merge branch 'master' into set_stl_mesh_names
2019-05-24 21:49:35 +02:00
Kim Kulling
b03b3b9c03
Initial parsing for header and more.
2019-05-24 17:22:54 +02:00
Brian Naranjo
fdcae81b61
Merge branch 'master' into set_stl_mesh_names
2019-05-23 11:21:49 -07:00
Kim Kulling
e1ed975839
Merge branch 'master' into topic/fbx_node_naming_optimization
2019-05-22 20:13:36 +02:00
Alexandre Avenel
daef984ac6
Optim FindInstancesProcess
...
ComputePositionEpsilon() is a costly function which was called in the inner
loop although it only uses data from upper loop.
2019-05-22 20:00:33 +02:00
Rémi Verschelde
fc7575f5c5
Remove Unix executable bit on code files
2019-05-22 10:23:13 +02:00
Rémi Verschelde
5fa750fda0
Fix code files encoding to make them all UTF-8
2019-05-22 10:19:32 +02:00
Kim Kulling
52d4564b7e
Merge branch 'master' into topic/fbx_file_more_than_4gb
2019-05-21 20:12:57 +02:00
Mike Samsonov
0eec1c1d4a
One map to rule them all
2019-05-21 16:05:38 +01:00
Brian Naranjo
7ac831489c
Merge branch 'master' into set_stl_mesh_names
2019-05-20 08:52:20 -07:00
Kim Kulling
627cb93b0b
Merge branch 'master' into topic/fragmented_embedded_textures
2019-05-19 20:16:49 +02:00
Brian Naranjo
ff4ab7ff2e
Add mesh names to imported ASCII STL
2019-05-17 11:48:57 -07:00
Kim Kulling
2f4cb93764
Merge branch 'master' into topic/exception_spam_fix_fbxmaterial
2019-05-17 19:43:54 +02:00
Kim Kulling
4b10c7e432
Merge branch 'master' into topic/degenerate_area_fix
2019-05-16 21:44:46 +02:00
Kim Kulling
81f8ebf2d4
Merge branch 'master' into kimkulling-2449
2019-05-16 17:04:09 +02:00
Kim Kulling
7cd021e704
Merge branch 'master' into pdb-install-fix
2019-05-16 14:49:29 +02:00
Mike Samsonov
6c13ec8190
fix for clang runtime checks for overflow
2019-05-16 11:59:23 +01:00
Mike Samsonov
c84ac7a135
Fragmented FBX ASCII emdedded resource
2019-05-16 11:59:23 +01:00
Mike Samsonov
13bba4fb4c
even more efficient
2019-05-16 11:58:48 +01:00
Mike Samsonov
b957d44943
Node names optimization and fixing non-unique name
2019-05-16 11:58:48 +01:00
Mike Samsonov
c58ed8da22
Support for FBX file sizes more than 4GB
2019-05-16 11:58:26 +01:00
Mike Samsonov
4e03a2c00d
Exception spam fix for FBXMaterial
2019-05-16 11:58:07 +01:00
Mike Samsonov
5bca43be74
Degenerate triangles with small area removing fix
2019-05-16 11:57:46 +01:00
Kim Kulling
77281b75b2
Merge branch 'master' into master
2019-05-16 11:13:48 +02:00
Kim Kulling
785ceaf58a
Merge branch 'master' into windows-external-zlib-fix
2019-05-14 22:07:56 +02:00
Kim Kulling
747a7c963b
Merge branch 'master' into assimpview_unicode
2019-05-13 23:49:06 +02:00
Kim Kulling
815730c92d
Update CMakeLists.txt
...
closes https://github.com/assimp/assimp/issues/2449 : fix uwp handling
2019-05-13 21:49:50 +02:00
Kim Kulling
adbdbf2be6
closes https://github.com/assimp/assimp/issues/2459 : fix duplicated fbx-type propertry.
2019-05-13 21:41:37 +02:00
Jack Andersen
461e21f66d
Fix Windows build with external zlib
...
assimp.rc contains an include with a double-parent header search.
In a default build configuration, this is resolved via the
configuration header path generated for in-tree zlib.
When external zlib is used, this header search path is not provided
to the RC compiler, therefore fails to find revision.h.
This is solved by simply including "revision.h" since the root of
the binary directory is already used as a search path.
2019-05-12 10:56:59 -10:00
Jack Andersen
cb0c47764a
Set directory and name properties for installing static lib PDB
2019-05-11 12:11:52 -10:00
Kim Kulling
4f7de109a1
Merge branch 'master' into assimpview_unicode
2019-05-10 18:52:32 +02:00
Kim Kulling
741be6f9db
Merge branch 'master' into fbxexport_crashfix
2019-05-10 15:32:18 +02:00
Kim Kulling
700954c115
Update FBXExporter.cpp
...
Just fixed some typos.
2019-05-10 09:09:47 +02:00
Matias
a443544986
Replaced binary literals with hex literals (since binary literals was introduced in C++14)
2019-05-09 15:28:00 +02:00
Matias
9903504c42
Removed some code that I didn't mean to fix (I already submitted this in another PR: https://github.com/assimp/assimp/pull/2450 ).
2019-05-09 14:57:18 +02:00
Matias
575ef4d927
Added support for embedded textures to the FBXExporter (both binary and ASCII). Also made the FBX-namespaces more consistent (we had both Assimp::FBX:: and FBX::). Since we seem to support two types of embedded texture references (both asterisk+texture_id and filepath) I made the exporter use aiScene::GetEmbeddedTexture for looking up texture reference and integrated @loebl 's modification of the function to support the old ("*1") type of references ( https://github.com/loebl/assimp/commit/e217358 )
2019-05-09 14:50:22 +02:00
Matias
6736f3d24b
Don't call PutString with an empty string. Both DumpChildrenAscii and EndAscii can return without modifyting the string, so we need to check the string before calling PutString. This used to cause a crash.
2019-05-09 11:19:05 +02:00
Kim Kulling
56b82e9cd5
Merge branch 'master' into gltf2-import-animation-name
2019-05-07 21:43:29 +02:00
Kim Kulling
e1a0861556
Merge branch 'fbx_convert_to_unit' of https://github.com/assimp/assimp into fbx_convert_to_unit
2019-05-07 20:33:42 +02:00
Kim Kulling
390452bd06
Fix the build.
2019-05-07 20:32:45 +02:00
Kim Kulling
66a840d9e6
Merge branch 'master' into fbx_convert_to_unit
2019-05-07 15:26:52 +02:00
Kim Kulling
22b01ca3e8
Merge branch 'master' into master
2019-05-07 09:55:43 +02:00
Kim Kulling
e917b288a1
fix a typo.
2019-05-06 21:38:45 +02:00
Kim Kulling
4155f005be
Add implementation to convert from cm to m.
2019-05-06 21:21:58 +02:00
Kim Kulling
4a9cd08451
Prepaation for conversion.
2019-05-06 20:51:04 +02:00
Kim Kulling
df2a279895
Merge branch 'master' into issue_2054
2019-05-05 16:28:39 +02:00
Kim Kulling
9147fb8689
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
2019-05-05 16:24:05 +02:00
Kim Kulling
1324409c7b
fix build: fix wrong function prototype.
2019-05-05 16:23:42 +02:00
Kim Kulling
8c18c42afb
Merge branch 'master' into issue_2054
2019-05-05 16:16:45 +02:00
Kim Kulling
69ece762d1
fix the build: remove errorenous pragma statement.
2019-05-05 16:00:57 +02:00
Kim Kulling
fcff12b219
closes https://github.com/assimp/assimp/issues/2054 : make empty bone validation optional.
2019-05-05 13:39:10 +02:00
Kim Kulling
9b9f7b2876
Merge branch 'master' into bad-obj-file
2019-05-04 21:17:15 +02:00
Hugo Pereira
34ede5608b
Merge branch 'master' into fix_assimp_export_consistency
2019-05-03 11:12:56 +01:00
Kim Kulling
6d5f8cbe26
Merge branch 'master' into obj_nan
2019-05-02 01:36:45 +02:00
Kim Kulling
e108b6f1d2
Merge branch 'master' into fix-mingw-debug-build
2019-05-01 17:04:45 +02:00
b1skit
243b2618a9
Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected
2019-04-27 17:37:23 -07:00
b1skit
bc4e411284
Updated the FBXConverter to correctly set the material shading mode when a Phong shader is detected
2019-04-27 17:20:27 -07:00
Vitaly Ovchinnikov
42202c2204
a test for bad OBJ file format and code fix that handles it
2019-04-26 22:13:29 +12:00
Martin Vorbrodt
e83671f494
Generate attenuation constants if non are privded in the Blender file. Using: https://imdoingitwrong.wordpress.com/2011/01/31/light-attenuation/
2019-04-24 18:35:14 -04:00
Heorhii Shakula
0b42d55f73
Fix inconsistency between animation and node name in glTF2 Importer
2019-04-24 16:58:35 +03:00
Kim Kulling
48e5b948e3
Update ColladaExporter.cpp
...
Some reformattings
2019-04-24 09:03:59 +02:00
Hugo Pereira
5713be615c
[FBX export] fixed ordering of skin indices and weights, to be consistent between systems
2019-04-18 16:55:54 +01:00
RichardTea
c34327b355
use std::isfinite()
...
GCC is more standards compliant than MSVC
2019-04-17 14:30:40 +01:00
RichardTea
e8bcf162dd
OBJ coerce invalid nan or inf texture coords to 0
...
Some exporters (eg Vectorworks 2019) may export texture coordinate components as "nan".
While this is invalid, it's better to coerce these values to 0 rather than reject the entire file.
2019-04-17 13:55:08 +01:00
RichardTea
51be6236a7
Merge branch 'master' into assimpview_unicode
2019-04-17 12:10:14 +01:00
RichardTea
7b6cb57e3b
Merge branch 'collada_metadata'
2019-04-17 12:07:48 +01:00
RichardTea
00f1fd6f7c
Merge branch 'master' into assimpview_unicode
2019-04-17 10:48:37 +01:00
RichardTea
0b9da72ed8
Merge pull request #5 from assimp/master
...
Rollup FBX material fixes from upstream
2019-04-17 09:44:10 +01:00
RichardTea
836801d37e
CMake updates for VS2015/cmake 3.12 onwards
...
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
2019-04-17 09:32:24 +01:00
Kim Kulling
685a56266b
Merge branch 'master' into fix-fbx-face-material
2019-04-15 09:55:38 +02:00
Merwan Achibet
c92ae50e4f
Fix FBX face materials not being properly loaded if the face count mismatches the material count
2019-04-10 19:16:42 +02:00
Charlie Gettys
f7384dec95
Possible fix for #2406 . Shouldn't affect other compiled files, but have
...
not verified this. Also, if anyone tries to debug StepFileGen1.cpp on MinGW,
the debug info may not be there, but I think this is the best we can do.
2019-04-10 09:45:31 -04:00
Charlie Gettys
9aae110161
* Remove old non-maintained mingw makefile to prevent confusion
...
* Add notes on building with MinGW to Build.md
2019-04-10 09:29:21 -04:00
RichardTea
1f55bdd9a7
Save/Load Collada 1.4 Root Asset Metadata
...
Add Collada 1.4 <asset/> metadata to export and import.
Can store in the Scene or the Root Node for export, will be loaded into the Scene during Import
2019-04-09 16:28:15 +01:00
RichardTea
49459435df
Merge branch 'master' into collada_metadata
2019-04-09 12:38:29 +01:00
RichardTea
e3a397a98d
Merge pull request #3 from assimp/master
...
fast forward to master
2019-04-08 17:57:09 +01:00
RichardTea
d66166675a
first pass at collada metadata
2019-04-08 17:11:50 +01:00
kimkulling
cbd8b032e7
FBX: add test case
2019-04-08 17:37:40 +02:00
RichardTea
2a3626577f
Merge pull request #2 from assimp/master
...
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00