Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
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
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
Matias Lavik
fac392d6cb Added missing include and fixed a mistake 2019-04-06 23:44:14 +02:00
Matias Lavik
015e960d0e Merge branch 'master' into issue_1957 2019-04-06 22:22:05 +02:00
Matias Lavik
b3177a2a9a issue 1957: Added support for reading embedded content (textures) in ASCII FBX. In ASCII FBX embedded content is encoded in Base64 and is surrounded by double quotation marks. The decoding functions are based on those used in the glTF importer. 2019-04-06 19:31:56 +02:00
Kim Kulling
c321fb6a44 Update FBXConverter.cpp 
FBX: Add missind initializers.
 2019-04-06 08:59:30 +02:00
Matias Lavik
d0ad03d653 Merge branch 'master' into issue_2390 2019-04-05 13:16:29 +02:00
Matias Lavik
898e59d8ee Merge branch 'master' into issue_2043 2019-04-04 16:36:44 +02:00
Matias
20acce1c5e Suggested fix for issue : If available, use "Scaling" and "Translation" instead of "ModelUVScaling" and "ModelUVTranslation". This seems to be what 3DS Max and FBX SDK use. 2019-04-04 16:31:34 +02:00
Matias Lavik
3abb494dd6 Merge branch 'master' into issue_2390 2019-04-04 13:08:27 +02:00
Kim Kulling
010afeb1d8 Merge branch 'master' into issue_1650 2019-04-04 12:42:21 +02:00
Matias Lavik
e63b9d4cd8 Merge branch 'master' into issue_2390 2019-04-03 21:17:38 +02:00
Matias Lavik
6d1514dd10 replaced "typedef" with "using" (I didn't notice Kim Kulling's previous commit until now) 2019-04-03 20:19:44 +02:00
Kim Kulling
f10e759db6 Merge branch 'issue_2398' of https://github.com/assimp/assimp into issue_2398 2019-04-03 20:16:24 +02:00
Kim Kulling
42608c0260 Fix small review findings. 2019-04-03 20:15:55 +02:00
Kim Kulling
287924a7d6 Merge branch 'master' into issue_2398 2019-04-03 20:03:07 +02:00
Matias Lavik
0251633ea2 Merge branch 'master' into issue_2393 2019-04-03 12:46:11 +02:00
Matias
4884cf2172 issue_2393: Added TransparencyFactor material key 2019-04-03 12:35:09 +02:00