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

7366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RichardTea
5c6ea5d7ba Fix memory leak in Collada ZAE and 3MF ZipFile reading 
Must close the file!
 2019-07-25 09:54:39 +01:00
RichardTea
9e04df810e ZipArchiveIOSystem should be sorted, fix ZipFile::Read() 
Q3BSP relies on the sort order
Read() should return number of elements read, not count of bytes
Read() should clip to the file size and return elements actually read,
instead of aborting if try to read too much
 2019-07-25 09:53:18 +01:00
RichardTea
c6620478ec Fix GCC warnings reported by Travis 2019-07-24 16:12:06 +01:00
Kim Kulling
e828dd1757 Merge branch 'master' into collada_zae 2019-07-21 14:37:12 +02:00
Kim Kulling
46a8164af4 Merge pull request #2543 from thomasbiang/fix_export_custom_bindpose_error 
Fix export custom bindpose error
 2019-07-21 14:36:24 +02:00
Kim Kulling
78b283135e Update utIssues.cpp 
use correct test for floats.
 2019-07-21 13:32:31 +02:00
Kim Kulling
5895f04391 Merge branch 'master' into fix_export_custom_bindpose_error 2019-07-21 12:17:02 +02:00
Kim Kulling
41ea607739 Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
Kim Kulling
5b6fe80883 Merge pull request #2550 from merwaaan/fix-obj-line-continuation 
Fix line continuations in OBJ files
 2019-07-20 14:08:08 +02:00
Kim Kulling
ff7ec7e454 Merge branch 'master' into fix-obj-line-continuation 2019-07-20 12:07:49 +02:00
Kim Kulling
4bd8ae8211 Merge pull request #2552 from assimp/fix_new_compiler_warnings 
Unit: Fix new compiler warnings.
 2019-07-20 12:07:32 +02:00
Kim Kulling
103048ff85 Update UnrealLoader.h 
use memcpy instead of = operator for pos copy.
 2019-07-20 10:10:17 +02:00
Kim Kulling
f804036cf3 Update utBlenderWork.cpp 
Fix compiler warning signed against unsigned.
 2019-07-19 20:44:48 +02:00
kimkulling
b6616e7b79 Fix another signed unsigned comparison warning. 2019-07-19 13:28:00 +02:00
kimkulling
e84f961f78 change std::array<int, x > to std::array<unsigned int, x> to fix compiler warnings. 2019-07-19 13:03:08 +02:00
kimkulling
68520bff0c Fix another signed / unsigned comparison warning. 2019-07-19 11:55:12 +02:00
kimkulling
3416c04ad9 Unit: fix more compiler warnings. 2019-07-19 11:26:48 +02:00
kkulling
a8019cf8d8 Unit: Fix new compiler warnings. 2019-07-19 10:38:44 +02:00
Merwan
2f6a005fb8 Add unit test for OBJ line continuations 2019-07-17 20:17:49 +02:00
ywang
03b58e84c3 Merge branch 'fix_export_custom_bindpose_error' of https://github.com/thomasbiang/assimp into fix_export_custom_bindpose_error 2019-07-16 13:37:25 -07:00
ywang
e1e9d92c01 update 2019-07-16 13:36:46 -07:00
thomasbiang
e3683e49e4 clean up 2019-07-16 13:36:45 -07:00
thomasbiang
5121a835b5 customize error rate for bind pose 2019-07-16 13:36:45 -07:00
thomasbiang
6299c58fae use ExportProperties to customize bind pose epsilon 2019-07-16 13:34:00 -07:00
thomasbiang
6e0810d3c1 clean up 2019-07-16 13:34:00 -07:00
thomasbiang
cdf60d7423 customize error rate for bind pose 2019-07-16 13:33:59 -07:00
thomasbiang
c889699d58 set->unordered_set;unsigned int for iteration 2019-07-16 13:33:59 -07:00
thomasbiang
9210ff37f2 fix group node being exported as bone node 2019-07-16 13:33:59 -07:00
ywang
c979b4060d Merge branch 'fix_export_custom_bindpose_error' of https://github.com/thomasbiang/assimp into fix_export_custom_bindpose_error 2019-07-16 13:20:46 -07:00
ywang
4ff4938df4 Merge remote-tracking branch 'upstream/master' into fix_export_custom_bindpose_error 2019-07-16 13:17:04 -07:00
Merwan
2122dc231d Fix line continuations in OBJ files 2019-07-16 20:37:41 +02:00
Kim Kulling
0accbb58f1 Merge branch 'master' into fix_export_custom_bindpose_error 2019-07-16 16:03:09 +02:00
Kim Kulling
fed764d2a8 Merge pull request #2549 from assimp/issue_2548 
closes https://github.com/assimp/assimp/issues/2548: check if weight …
 2019-07-16 14:02:07 +02:00
kimkulling
c1670b6a97 closes https://github.com/assimp/assimp/issues/2548: check if weight are set or set the weight to 1.0f 2019-07-16 11:40:34 +02:00
ywang
f045170048 update 2019-07-15 15:52:45 -07:00
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
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