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

12783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ywang
2bffdc7e08 Merge branch 'fix_export_custom_bindpose_error' of https://github.com/thomasbiang/assimp into fix_export_custom_bindpose_error 2019-07-15 15:50:36 -07:00
thomasbiang
36130f9b86 use ExportProperties to customize bind pose epsilon 2019-07-15 15:49:55 -07:00
thomasbiang
add4d6028b clean up 2019-07-15 15:49:55 -07:00
thomasbiang
f2731a1b99 customize error rate for bind pose 2019-07-15 15:49:55 -07:00
Kim Kulling
b344beb00b Merge pull request #2546 from Frooxius/master 
Some FBX multi-material mesh fixes
 2019-07-14 13:10:03 +02:00
Frooxius
bcdb173e09 - Fixed anim meshes generated from blendshapes not being copied to output for multi-material meshes 
- Fixed first vertex of each blendshape on a multi-material mesh having all unmapped vertice offsets being added to it
- Fixed blendshapes not importing for multi-material FBX meshes with no bones
 2019-07-13 22:20:47 +02:00
Madrich
5fb77f8523 Merge pull request #15 from assimp/master 
Update Fork
 2019-07-13 06:49:58 +02:00
Kim Kulling
4a2df57241 Merge pull request #2541 from assimp/kimkulling_dev 
Kimkulling dev
 2019-07-12 20:43:19 +02:00
RichardTea
07d3a7d5b0 Fix some warnings 
Hopefully the sorts out the MSVC2013 compiler
 2019-07-12 16:02:51 +01:00
RichardTea
678dd32da3 Add missing header 2019-07-12 15:37:10 +01:00
kimkulling
8f74508e40 Fix missing doc in config.h 2019-07-12 16:28:36 +02:00
Kim Kulling
e786483c64 Merge branch 'master' into fix_export_custom_bindpose_error 2019-07-12 16:27:13 +02:00
kimkulling
53c0f91305 Add unittest for json. 2019-07-12 16:08:51 +02:00
RichardTea
0c718a9c95 Add Collada ZAE unit test 2019-07-12 14:56:29 +01:00
RichardTea
2a72c9b616 Read embedded textures from Collada ZAE 2019-07-12 14:46:48 +01:00
RichardTea
ddd1e770b9 First pass of Collada ZAE support 
Reads the manifest and loads the DAE
Does not yet load embedded textures
 2019-07-12 11:36:46 +01:00
RichardTea
8636d5607c Add ZipArchiveIOSystem to CMake 2019-07-12 11:35:43 +01:00
RichardTea
d64e1bde13 First pass of Collada ZAE support 
Reads the manifest and loads the DAE
Does not yet load embedded textures
 2019-07-12 11:29:35 +01:00
RichardTea
2c7f607e7c Create ZipArchiveIOSystem 
Moved IOSystem Unzip functionality out of D3MF Importer into include/assimp
Cleaned up and more efficient:
Don't map the archive until the caller opens a file or requests the contents list
Don't extract any files until they are opened
Store the location of the data within the ZIP and extract it later if the file is opened.
 2019-07-12 11:22:17 +01:00
thomasbiang
259a9bd2af use ExportProperties to customize bind pose epsilon 2019-07-11 17:00:47 -07:00
Kim Kulling
3b3a965d2b Delete JTImporter.h 2019-07-11 22:31:40 +02:00
Kim Kulling
b1d8398243 Delete JTImporter.cpp 
Remove JTImorter.cpp from pull request
 2019-07-11 22:31:24 +02:00
Kim Kulling
8bf1b9ac5e Update CMakeLists.txt 
remove jtimporter
 2019-07-11 22:29:30 +02:00
Kim Kulling
82e7775d6d Update JTImporter.cpp 
disable unused method,.
 2019-07-11 19:23:00 +02:00
Kim Kulling
da33262bcc Update FBXConverter.cpp 
Fix merge conflicts
 2019-07-11 19:17:41 +02:00
kkulling
eb5e829436 Assjson: add json export to list of exporters. 2019-07-11 17:43:03 +02:00
kkulling
2e782f43e5 Merge branch 'master' into kimkulling_dev 2019-07-11 17:37:52 +02:00
kkulling
b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. 2019-07-11 17:37:31 +02:00
thomasbiang
f03f099fa8 clean up 2019-07-10 16:29:50 -07:00
thomasbiang
f703a798f4 customize error rate for bind pose 2019-07-10 16:27:59 -07:00
thomasbiang
d7773dcfba set->unordered_set;unsigned int for iteration 2019-07-10 09:51:20 -07:00
RichardTea
47661034ae Merge pull request #15 from assimp/master 
From upstream
 2019-07-10 17:46:04 +01:00
thomasbiang
6b5e0a9914 fix group node being exported as bone node 2019-07-09 19:05:45 -07:00
Kim Kulling
bc8f85eeae Merge pull request #2535 from assimp/issue_2182 
closes code/Collada/ColladaLoader.cpp: fix possible memleak when thro…
 2019-07-09 21:41:05 +02:00
Kim Kulling
39dc9801e0 Update ColladaLoader.cpp 
- add header memory
- Fix format stuff
 2019-07-09 20:35:57 +02:00
Kim Kulling
a01302dd4d Merge branch 'master' into issue_2182 2019-07-09 19:45:40 +02:00
Kim Kulling
ed6dbf9533 closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception. 2019-07-09 19:44:56 +02:00
kkulling
b87f4c03ba Remove not needed init. 2019-07-09 11:49:59 +02:00
Kim Kulling
b688797766 Merge pull request #2533 from assimp/issue_2439 
closes https://github.com/assimp/assimp/issues/2439: add null ptr tes…
 2019-07-05 01:21:09 +02:00
Kim Kulling
01070b4de7 closes https://github.com/assimp/assimp/issues/2439: add null ptr test before calling hasAttr. 2019-07-04 22:34:11 +02:00
Kim Kulling
5a82e27885 Merge pull request #2532 from assimp/kimkulling_dev 
closes https://github.com/assimp/assimp/issues/2527: use correct macr…
 2019-07-04 20:29:53 +02:00
Kim Kulling
ae7b1f1a77 Merge branch 'master' into kimkulling_dev 2019-07-03 18:28:15 +02:00
Kim Kulling
6beed14e35 Merge pull request #2531 from assimp/fbx_multimatmesh_with_blendshapes 
closes https://github.com/assimp/assimp/issues/2368: just fix it
 2019-07-03 18:27:53 +02:00
Kim Kulling
0ec5eb752c Update FBXConverter.cpp 
Removing dead and unused code.
 2019-07-03 12:50:01 +02:00
Kim Kulling
08eb6701c3 Merge branch 'master' into fbx_multimatmesh_with_blendshapes 2019-07-02 23:29:55 +02:00
Kim Kulling
fa827f9075 Merge pull request #2528 from marxin/fix-gcc-9-warning 
Fix a GCC 9 warning:
 2019-07-02 23:29:29 +02:00
Kim Kulling
1fc232effa closes https://github.com/assimp/assimp/issues/2368: just fix it 2019-07-02 21:46:52 +02:00
Kim Kulling
96f16c7aea closes https://github.com/assimp/assimp/issues/2527: use correct macro for Assimp-exporter. 2019-07-02 19:48:53 +02:00
Martin Liska
ab55fb27c3 Fix a GCC 9 warning: 
assimp/include/assimp/material.inl: In member function 'aiReturn aiMaterial::Get(const char*, unsigned int, unsigned int, aiColor3D&) const':
assimp/include/assimp/material.inl:176:33: error: implicitly-declared 'aiColor3D& aiColor3D::operator=(const aiColor3D&)' is deprecated [-Werror=deprecated-copy]
176 |     pOut = aiColor3D(c.r,c.g,c.b);
 2019-07-02 13:38:04 +02:00
RichardTea
500983074b Merge pull request #14 from assimp/master 
Update to upstream
 2019-07-02 10:50:33 +01:00