4a2df57241
Merge pull request #2541 from assimp/kimkulling_dev
...
Kimkulling dev
2019-07-12 20:43:19 +02:00
07d3a7d5b0
Fix some warnings
...
Hopefully the sorts out the MSVC2013 compiler
2019-07-12 16:02:51 +01:00
678dd32da3
Add missing header
2019-07-12 15:37:10 +01:00
8f74508e40
Fix missing doc in config.h
2019-07-12 16:28:36 +02:00
e786483c64
Merge branch 'master' into fix_export_custom_bindpose_error
2019-07-12 16:27:13 +02:00
53c0f91305
Add unittest for json.
2019-07-12 16:08:51 +02:00
0c718a9c95
Add Collada ZAE unit test
2019-07-12 14:56:29 +01:00
2a72c9b616
Read embedded textures from Collada ZAE
2019-07-12 14:46:48 +01:00
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
8636d5607c
Add ZipArchiveIOSystem to CMake
2019-07-12 11:35:43 +01:00
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
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
259a9bd2af
use ExportProperties to customize bind pose epsilon
2019-07-11 17:00:47 -07:00
3b3a965d2b
Delete JTImporter.h
2019-07-11 22:31:40 +02:00
b1d8398243
Delete JTImporter.cpp
...
Remove JTImorter.cpp from pull request
2019-07-11 22:31:24 +02:00
8bf1b9ac5e
Update CMakeLists.txt
...
remove jtimporter
2019-07-11 22:29:30 +02:00
82e7775d6d
Update JTImporter.cpp
...
disable unused method,.
2019-07-11 19:23:00 +02:00
da33262bcc
Update FBXConverter.cpp
...
Fix merge conflicts
2019-07-11 19:17:41 +02:00
eb5e829436
Assjson: add json export to list of exporters.
2019-07-11 17:43:03 +02:00
2e782f43e5
Merge branch 'master' into kimkulling_dev
2019-07-11 17:37:52 +02:00
b463ddd399
closes https://github.com/assimp/assimp/issues/340 : start integrating assimp2json.
2019-07-11 17:37:31 +02:00
f03f099fa8
clean up
2019-07-10 16:29:50 -07:00
f703a798f4
customize error rate for bind pose
2019-07-10 16:27:59 -07:00
d7773dcfba
set->unordered_set;unsigned int for iteration
2019-07-10 09:51:20 -07:00
47661034ae
Merge pull request #15 from assimp/master
...
From upstream
2019-07-10 17:46:04 +01:00
6b5e0a9914
fix group node being exported as bone node
2019-07-09 19:05:45 -07:00
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
39dc9801e0
Update ColladaLoader.cpp
...
- add header memory
- Fix format stuff
2019-07-09 20:35:57 +02:00
a01302dd4d
Merge branch 'master' into issue_2182
2019-07-09 19:45:40 +02:00
ed6dbf9533
closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception.
2019-07-09 19:44:56 +02:00
b87f4c03ba
Remove not needed init.
2019-07-09 11:49:59 +02:00
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
01070b4de7
closes https://github.com/assimp/assimp/issues/2439 : add null ptr test before calling hasAttr.
2019-07-04 22:34:11 +02:00
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
ae7b1f1a77
Merge branch 'master' into kimkulling_dev
2019-07-03 18:28:15 +02:00
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
0ec5eb752c
Update FBXConverter.cpp
...
Removing dead and unused code.
2019-07-03 12:50:01 +02:00
08eb6701c3
Merge branch 'master' into fbx_multimatmesh_with_blendshapes
2019-07-02 23:29:55 +02:00
fa827f9075
Merge pull request #2528 from marxin/fix-gcc-9-warning
...
Fix a GCC 9 warning:
2019-07-02 23:29:29 +02:00
1fc232effa
closes https://github.com/assimp/assimp/issues/2368 : just fix it
2019-07-02 21:46:52 +02:00
96f16c7aea
closes https://github.com/assimp/assimp/issues/2527 : use correct macro for Assimp-exporter.
2019-07-02 19:48:53 +02:00
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
500983074b
Merge pull request #14 from assimp/master
...
Update to upstream
2019-07-02 10:50:33 +01:00
ff662a6104
Merge pull request #2523 from muxanickms/topic/embedded_texture_name_fix
...
All textures use relative path except embedded textures, this is a fix for it
2019-06-30 20:30:17 +02:00
3fcf3bd81f
Merge branch 'master' into topic/embedded_texture_name_fix
2019-06-30 12:43:40 +02:00
01d144ce89
Merge pull request #2526 from rconde01/bugfix/issue_2525_lwo_node_name_repeats
...
initialize unnamed node uniqueness index outside of loop
2019-06-29 00:31:05 +02:00
f5ece83f31
initial unnamed node uniqueness index outside of loop
2019-06-28 16:12:58 -04:00
1ec01a870f
Merge pull request #2519 from RichardTea/issue_2518_active_importer_ident
...
API: Add active importer identification
2019-06-28 21:44:11 +02:00
6d07473550
all textures use relative path except embedded, this is fix for it
2019-06-27 17:59:55 +01:00
05f5b54f75
Merge branch 'master' into issue_2518_active_importer_ident
2019-06-27 14:02:01 +02:00
Kim Kulling
RichardTea
kimkulling
thomasbiang
kkulling
Martin Liska
Rob Conde
Mike Samsonov