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

7444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gordon MacPherson
fbb34b1de1 ScaleProcess overhauled to improve compatibility with animations and unit conversion. 
./assimp Added arguments --gs to assimp command line option to enable global scaling.

No scaling for mScale of 1.0.

Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
 2019-08-19 17:36:57 +01:00
Kim Kulling
23e1c0cbc9 Merge pull request #2577 from follower/patch-1 
Fix error when building assimp on older Mac OS X version.
 2019-08-18 14:39:46 +02:00
Kim Kulling
b25b83fb46 Merge branch 'master' into patch-1 2019-08-18 11:57:22 +02:00
Kim Kulling
7ee7946dc5 Update scene.h 
use #include <cstdlib> only if the compiler is used to compile c++ code.
 2019-08-18 09:40:13 +02:00
Kim Kulling
1cb23134b8 Merge pull request #2600 from RichardTea/issue-2599-multiconfig-debug-postfix 
Issue 2599 multiconfig debug postfix
 2019-08-17 16:36:27 +02:00
Kim Kulling
09a994f72c Merge branch 'master' into issue-2599-multiconfig-debug-postfix 2019-08-17 13:16:10 +02:00
Kim Kulling
effd324a21 Merge pull request #2601 from GBhutra/patch-1 
fix for div by zero reported by address sanitizer
 2019-08-17 13:15:45 +02:00
Ghanshyam Bhutra
f69bf5f7ed fix for div by zero reported by address sanitizer 2019-08-16 17:04:42 -07:00
RichardTea
0400e0bc7f Multi-Config generators should also set the debug suffix when enabled 
Issue #2599
 2019-08-16 11:10:30 +01:00
RichardTea
5fa1f20327 Merge remote-tracking branch 'upstream/master' 2019-08-16 10:09:29 +01:00
Kim Kulling
812397d681 Merge pull request #2597 from rogersachan/patch-1 
Add GitHub sponsors button to feature patreon
 2019-08-16 08:53:17 +02:00
Roger
25dcef2758 Create FUNDING.yml 2019-08-16 00:11:12 -04:00
Kim Kulling
a9b4909a2f Merge branch 'master' into patch-1 2019-08-14 21:21:18 +02:00
Kim Kulling
3309ea9a5c Merge pull request #2545 from RichardTea/collada_zae 
Add Collada zae import support
 2019-08-14 21:20:20 +02:00
Kim Kulling
a2ee19e86d Merge branch 'master' into collada_zae 2019-08-14 20:02:53 +02:00
Rich ard
578fccf522 Merge remote-tracking branch 'upstream/master' 2019-08-13 10:03:44 +01:00
Kim Kulling
172422460c Merge pull request #2568 from panquez/master 
Proposal for issue 2567
 2019-08-11 12:30:58 +02:00
Kim Kulling
02812f22af Merge branch 'master' into master 2019-08-10 10:08:15 +02:00
Kim Kulling
563ec1662c Merge pull request #2578 from petrmohelnik/glTF-2.0-Lights-import 
glTF 2.0 Lights import
 2019-08-10 10:07:20 +02:00
Kim Kulling
51923b5d3c Merge branch 'master' into glTF-2.0-Lights-import 2019-08-10 08:35:10 +02:00
Kim Kulling
4580c56504 Merge pull request #2590 from assimp/kimkulling-issue_2570 
Update config.h.in
 2019-08-10 07:36:34 +02:00
Kim Kulling
4c1e8fe9c3 Update config.h.in 
closes https://github.com/assimp/assimp/issues/2570: fix a typo.
 2019-08-09 20:30:12 +02:00
Kim Kulling
cc8e7dcc1b Merge branch 'master' into glTF-2.0-Lights-import 2019-08-09 20:03:51 +02:00
Kim Kulling
7d67eca52c Merge pull request #2574 from gongminmin/RemoveStdIterator 
Remove the usage of std::iterator
 2019-08-09 20:03:24 +02:00
Kim Kulling
f1f409d538 Merge branch 'master' into RemoveStdIterator 2019-08-09 17:43:30 +02:00
Kim Kulling
2d7505b244 Merge branch 'master' into glTF-2.0-Lights-import 2019-08-08 21:57:32 +02:00
Kim Kulling
1097f47ff5 Merge pull request #2585 from RevoluPowered/feature/fix-armature-and-root-node 
FBX importer armature fixes and root bone fixes - animations should now work for more models.
 2019-08-08 21:56:08 +02:00
Gordon MacPherson
74d2eb842b Fixed armature being marked as 'limbnode' 
This also fixes issue with root bone overwritten - which should not happen as it is a hack.

Before the behaviour would create an additional bone which would end up breaking animations completely on import.

Additionally this fixes required bones being removed.

Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
 2019-08-08 01:02:30 +01:00
Kim Kulling
090e896ebf Merge branch 'master' into collada_zae 2019-08-06 21:22:02 +02:00
Kim Kulling
42f07c8bbc Merge pull request #2536 from thomasbiang/fix_export_group_as_bone 
Fix Issue: group node in fbx being exported as bone node
 2019-08-06 21:21:35 +02:00
Kim Kulling
9f5b047f7c Merge branch 'master' into fix_export_group_as_bone 2019-08-06 19:27:37 +02:00
petrmohelnik
9330cca1cd glTF 2.0 Lights import 
Importing of lights according to glTF 2.0 extension KHR_lights_punctual https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual

Since glTF lights are based on PBR they use different attenuation model than conventional lights supported by assimp. It is possible to use attenuation factors in assimp to describe inverse square law fallof. But the light structure does not provide means to save range property. Therefore I resorted to use of metadata. When range parameter is present, I put it into 'PBR_LightRange' metadata of light's node. Please, see comment in glTF2Importer file.
 2019-08-03 20:51:00 +02:00
Kim Kulling
83d2ec7f74 Merge branch 'master' into RemoveStdIterator 2019-08-02 10:35:59 +02:00
follower
1e6eac9e65 Fix error when building assimp on older Mac OS X version. 
Prevents this error when building with Mac OS X 10.9 SDK:

    error: no member named 'atoi' in namespace 'std'; did you mean simply 'atoi'?
 2019-08-02 04:44:21 +12:00
Kim Kulling
1c3e934ae9 Merge pull request #2563 from mosra/stl-white-ambient 
Fix white ambient in STL loader
 2019-07-30 14:16:09 +02:00
Minmin Gong
cfbe368d72 Remove the usage of std::iterator 2019-07-29 22:34:24 -07:00
Kim Kulling
deee43f946 Merge branch 'master' into stl-white-ambient 2019-07-29 19:31:33 +02:00
RichardTea
7b67b00a79 Merge pull request #17 from assimp/master 
Update to upstream
 2019-07-29 12:27:05 +01:00
Kim Kulling
1d565b0aab Merge pull request #2566 from RichardTea/test_exporter_ids 
Test Exporter Descriptions and IDs
 2019-07-29 10:09:28 +02:00
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
69265273c2 Merge pull request #2572 from thomasbiang/fix-multiUV-export 
Fix issue # 2571: extra layer for multi uv sets
 2019-07-28 11:13:31 +02:00
Kim Kulling
7d74a3354d Merge branch 'master' into fix-multiUV-export 2019-07-28 09:37:00 +02:00
RichardTea
361609c60b Merge branch 'master' into test_exporter_ids 2019-07-26 22:21:16 +01: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
Kim Kulling
982914754e Merge pull request #2564 from RichardTea/test_gitignore_cleanup 
Add Export Unit Test output to gitignore
 2019-07-26 10:47:20 +02:00
RichardTea
72e18ed4aa Fix Travis CI sign-compare warning 
EXPECT_* triggers sign compare error with literal 0 and unsigned
Use 0u literal with size_t
 2019-07-26 09:10:09 +01:00
ywang
d8eaf0bc7f cleanup empty lines 2019-07-25 15:53:57 -07:00