Kim Kulling
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
Kim Kulling
2d985b92c9
Fix references in cmake file.
2019-06-09 18:43:56 +02:00
Kim Kulling
57c46db042
Reorg of code.
2019-06-06 14:45:43 +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
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
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
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