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
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