5fa750fda0
Fix code files encoding to make them all UTF-8
2019-05-22 10:19:32 +02:00
52d4564b7e
Merge branch 'master' into topic/fbx_file_more_than_4gb
2019-05-21 20:12:57 +02:00
627cb93b0b
Merge branch 'master' into topic/fragmented_embedded_textures
2019-05-19 20:16:49 +02:00
2f4cb93764
Merge branch 'master' into topic/exception_spam_fix_fbxmaterial
2019-05-17 19:43:54 +02:00
4b10c7e432
Merge branch 'master' into topic/degenerate_area_fix
2019-05-16 21:44:46 +02:00
81f8ebf2d4
Merge branch 'master' into kimkulling-2449
2019-05-16 17:04:09 +02:00
7cd021e704
Merge branch 'master' into pdb-install-fix
2019-05-16 14:49:29 +02:00
6c13ec8190
fix for clang runtime checks for overflow
2019-05-16 11:59:23 +01:00
c84ac7a135
Fragmented FBX ASCII emdedded resource
2019-05-16 11:59:23 +01:00
c58ed8da22
Support for FBX file sizes more than 4GB
2019-05-16 11:58:26 +01:00
4e03a2c00d
Exception spam fix for FBXMaterial
2019-05-16 11:58:07 +01:00
5bca43be74
Degenerate triangles with small area removing fix
2019-05-16 11:57:46 +01:00
77281b75b2
Merge branch 'master' into master
2019-05-16 11:13:48 +02:00
785ceaf58a
Merge branch 'master' into windows-external-zlib-fix
2019-05-14 22:07:56 +02:00
747a7c963b
Merge branch 'master' into assimpview_unicode
2019-05-13 23:49:06 +02:00
815730c92d
Update CMakeLists.txt
...
closes https://github.com/assimp/assimp/issues/2449 : fix uwp handling
2019-05-13 21:49:50 +02:00
adbdbf2be6
closes https://github.com/assimp/assimp/issues/2459 : fix duplicated fbx-type propertry.
2019-05-13 21:41:37 +02:00
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
cb0c47764a
Set directory and name properties for installing static lib PDB
2019-05-11 12:11:52 -10:00
4f7de109a1
Merge branch 'master' into assimpview_unicode
2019-05-10 18:52:32 +02:00
741be6f9db
Merge branch 'master' into fbxexport_crashfix
2019-05-10 15:32:18 +02:00
700954c115
Update FBXExporter.cpp
...
Just fixed some typos.
2019-05-10 09:09:47 +02:00
a443544986
Replaced binary literals with hex literals (since binary literals was introduced in C++14)
2019-05-09 15:28:00 +02:00
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
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
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
56b82e9cd5
Merge branch 'master' into gltf2-import-animation-name
2019-05-07 21:43:29 +02:00
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
390452bd06
Fix the build.
2019-05-07 20:32:45 +02:00
66a840d9e6
Merge branch 'master' into fbx_convert_to_unit
2019-05-07 15:26:52 +02:00
22b01ca3e8
Merge branch 'master' into master
2019-05-07 09:55:43 +02:00
e917b288a1
fix a typo.
2019-05-06 21:38:45 +02:00
4155f005be
Add implementation to convert from cm to m.
2019-05-06 21:21:58 +02:00
4a9cd08451
Prepaation for conversion.
2019-05-06 20:51:04 +02:00
df2a279895
Merge branch 'master' into issue_2054
2019-05-05 16:28:39 +02:00
9147fb8689
Merge branch 'issue_2054' of https://github.com/assimp/assimp into issue_2054
2019-05-05 16:24:05 +02:00
1324409c7b
fix build: fix wrong function prototype.
2019-05-05 16:23:42 +02:00
8c18c42afb
Merge branch 'master' into issue_2054
2019-05-05 16:16:45 +02:00
69ece762d1
fix the build: remove errorenous pragma statement.
2019-05-05 16:00:57 +02:00
fcff12b219
closes https://github.com/assimp/assimp/issues/2054 : make empty bone validation optional.
2019-05-05 13:39:10 +02:00
9b9f7b2876
Merge branch 'master' into bad-obj-file
2019-05-04 21:17:15 +02:00
34ede5608b
Merge branch 'master' into fix_assimp_export_consistency
2019-05-03 11:12:56 +01:00
6d5f8cbe26
Merge branch 'master' into obj_nan
2019-05-02 01:36:45 +02:00
e108b6f1d2
Merge branch 'master' into fix-mingw-debug-build
2019-05-01 17:04:45 +02:00
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
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
42202c2204
a test for bad OBJ file format and code fix that handles it
2019-04-26 22:13:29 +12:00
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
0b42d55f73
Fix inconsistency between animation and node name in glTF2 Importer
2019-04-24 16:58:35 +03:00
48e5b948e3
Update ColladaExporter.cpp
...
Some reformattings
2019-04-24 09:03:59 +02:00
Rémi Verschelde
Kim Kulling
Mike Samsonov
Kim Kulling
Jack Andersen
Matias
Hugo Pereira
b1skit
Vitaly Ovchinnikov
Martin Vorbrodt
Heorhii Shakula