Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,124 Commits 19 Branches 43 Tags
461e21f66dd331f5d6d47b4abbf9f15525ddfaec
Commit Graph

3937 Commits

Author SHA1 Message Date
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
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
Heorhii Shakula
0b42d55f73 Fix inconsistency between animation and node name in glTF2 Importer 2019-04-24 16:58:35 +03: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
Kim Kulling
6dec1346ed Merge branch 'master' into issue_1957 2019-04-08 14:27:32 +02:00
Kim Kulling
f7d226768c Merge branch 'master' into issue_1650 2019-04-08 13:06:30 +02:00
Matias Lavik
ddfc140fc3 Added <stdint.h>-include 2019-04-07 00:02:22 +02:00