v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,484 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

4128 Commits (0dd1ae0196c8f82848c07784b0a4f0ec6c0b9740)

Author SHA1 Message Date
thomasbiang 8fc899035c customize error rate for bind pose 2019-07-25 15:43:43 -07:00
ywang 57a56b7b1d extra layer for multi uv sets 2019-07-25 13:14:54 -07:00
RichardTea 7e8a3ec4cb Add unit test of valid and unique Exporter IDs, rename assjson id 
"json" is a very vague exporter ID, change to "assjson"

Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
 2019-07-25 13:38:49 +01:00
RichardTea e993cdc309 Merge branch 'master' into collada_zae 2019-07-25 12:42:08 +01:00
RichardTea 9b78060a4a Add copyright headers to ZipArchiveIOSystem 2019-07-25 10:14:42 +01:00
RichardTea 3016f3a725 Convert Q3BSP Importer to use ZipArchiveIOSystem 
Removes duplication, handles large files better
 2019-07-25 10:13:53 +01:00
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
Vladimír Vondruš dadf5c0020
Fix white ambient in STL loader. 
A problem that sneaked in from #1293 (f84851e893) 
due to insufficient code review, later reported in #2059 but not fixed 
properly. Having a white ambient practically means all other color information 
is ignored and the model stays bright white no matter how you set up your 
lighting, so putting it back to how it was before the commit above.
 2019-07-25 10:28:09 +02:00
RichardTea c6620478ec Fix GCC warnings reported by Travis 2019-07-24 16:12:06 +01:00
Pierre Anquez 17adc98eec
Fix issue #2557 2019-07-23 15:58:30 +02:00
Kim Kulling e828dd1757
Merge branch 'master' into collada_zae 2019-07-21 14:37:12 +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 ff7ec7e454
Merge branch 'master' into fix-obj-line-continuation 2019-07-20 12:07:49 +02:00
Kim Kulling 103048ff85
Update UnrealLoader.h 
use memcpy instead of = operator for pos copy.
 2019-07-20 10:10:17 +02:00
kkulling a8019cf8d8 Unit: Fix new compiler warnings. 2019-07-19 10:38:44 +02: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
Merwan 2122dc231d Fix line continuations in OBJ files 2019-07-16 20:37:41 +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
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
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 53c0f91305 Add unittest for json. 2019-07-12 16:08:51 +02: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
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 d7773dcfba set->unordered_set;unsigned int for iteration 2019-07-10 09:51:20 -07:00
thomasbiang 6b5e0a9914 fix group node being exported as bone node 2019-07-09 19:05:45 -07: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 ae7b1f1a77
Merge branch 'master' into kimkulling_dev 2019-07-03 18:28:15 +02:00
Kim Kulling 0ec5eb752c
Update FBXConverter.cpp 
Removing dead and unused code.
 2019-07-03 12:50:01 +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
Kim Kulling 3fcf3bd81f
Merge branch 'master' into topic/embedded_texture_name_fix 2019-06-30 12:43:40 +02:00
Rob Conde f5ece83f31 initial unnamed node uniqueness index outside of loop 2019-06-28 16:12:58 -04:00
Mike Samsonov 6d07473550 all textures use relative path except embedded, this is fix for it 2019-06-27 17:59:55 +01:00
Kim Kulling 05f5b54f75
Merge branch 'master' into issue_2518_active_importer_ident 2019-06-27 14:02:01 +02:00
Kim Kulling af199c50aa
Merge branch 'master' into issue_2456_text_formats_precision 2019-06-26 17:31:11 +02:00
Kim Kulling 853afdf42b
Merge branch 'master' into fix_issue_2507_collada_import 2019-06-25 20:19:42 +02:00
Kim Kulling 1952144445 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev 2019-06-24 21:46:05 +02:00
Kim Kulling 0f66a917e5 Add unittest. 2019-06-24 21:37:53 +02:00
RichardTea 8f43fb144a Add "importerIndex" Importer property 
This indicates the index of the Importer that was selected, or -1 if did not find one at all.
 2019-06-24 14:55:48 +01:00
Kim Kulling 26bd54ae0b PostProcesswing: add gen-aabb process to postprocessing. 2019-06-23 20:24:32 +02:00
Kim Kulling 418c07a9bb closes https://github.com/assimp/assimp/issues/2368: add missign anim mesh for multimaterial meshes in fbx,. 2019-06-21 18:00:53 +02:00
RichardTea bf252c4452 Add configuration of text format precision 
Define ASSIMP_AI_REAL_TEXT_PRECISION
8 when ai_real is float
16 when ai_real is double
 2019-06-20 18:11:11 +01:00
RichardTea 59f732e10d DAE Import: Don't use SkipElement() to skip empty Text 
IrrXML doesn't recognise the construction: `<author></author>` as being an empty element, and so ColladaParser::TestTextContent advances the element stream into the `</author>` element.

Use TestClosing(const char*) instead of SkipElement() to skip an empty text element.
 2019-06-20 16:30:52 +01:00
Kim Kulling 6b3d6c3b8f JT: next steps. 2019-06-18 20:35:02 +02:00
Kim Kulling ced080f9f3 X: fix out of bound access. 2019-06-15 19:17:15 +02:00
Kim Kulling eb27fb753d Merge branch 'master' into kimkulling-patch-3 2019-06-15 13:44:13 +02:00
Rahul Sheth 6c33374491 update install interface location 2019-06-13 22:08:34 -07:00
Rahul Sheth d00f4f4b3a Build Hunter-compatible config file 2019-06-13 21:34:47 -07:00
Rahul Sheth 5cda81e84b code fixes for Hunter-based build 2019-06-13 21:32:37 -07:00
Rahul Sheth dab8041bcd rewrite include paths for Hunter packages 2019-06-13 21:32:36 -07:00
Rahul Sheth a4587e8609 Use hunter to download dependencies if HUNTER_ENABLED is ON 2019-06-13 21:31:24 -07:00
Kim Kulling ba29b8f1da
Merge branch 'master' into patch-1 2019-06-13 13:41:40 +02:00
Kim Kulling 0021c93892 closes https://github.com/assimp/assimp/issues/2431: use irrXml directly for mingw compiler. 2019-06-12 22:12:38 +02:00
Kim Kulling 66f693a6a4
Update IRRLoader.cpp 
fix case-sensitive typo.
 2019-06-12 10:25:11 +02:00
Kim Kulling e914b9531b
Update IRRLoader.h 
fix case-sensity typo.
 2019-06-12 00:55:06 +02:00
Kim Kulling 4dcb3c9235
Update ImporterRegistry.cpp 
fix case-sensiive folder bug.
 2019-06-11 21:55:21 +02:00
Kim Kulling fc065d8ab4 Merge branch 'master' into reorg 2019-06-11 20:59:46 +02:00
Kim Kulling a6e3fc3fd9 Fix case-sensitive folder name for unix platforms. 2019-06-11 20:54:01 +02:00
Kim Kulling cc10967913 Fix the build. 2019-06-11 20:17:50 +02:00
PK d448b49ae1
fixed MSVC toolset versions >140 
according to https://cmake.org/cmake/help/latest/variable/MSVC14.html the use of the MSVC** flags is deprecated, this change uses the encouraged MSVC_VERSION variable.
 2019-06-11 15:16:53 +02:00
Kim Kulling f76d77955d Merge branch 'master' into reorg 2019-06-11 00:22:50 +02:00
Kim Kulling 2da3a38d60 Fix the compile pass, still unresolved symbols. 2019-06-10 23:26:00 +02:00
Kim Kulling 7e20356a20
Update XFileParser.cpp 
Fix exception.
 2019-06-10 20:32:56 +02:00
Kim Kulling 6fc42cb898
Merge branch 'master' into kimkulling-patch-3 2019-06-10 00:39:05 +02:00
Kim Kulling a4bda3a205
Update XFileParser.cpp 
Test
 2019-06-09 21:25:25 +02:00
Kim Kulling 2d985b92c9 Fix references in cmake file. 2019-06-09 18:43:56 +02:00
petrmohelnik 83247e3fbd
Merge branch 'master' into glTF-importer---clean-all-member-arrays 2019-06-09 15:52:32 +02:00
Kim Kulling cbd5c5b284
Merge branch 'master' into Ogre_with_skeleton_missing 2019-06-08 21:31:47 +02:00
Kim Kulling 4a46717a77
Merge branch 'master' into kimkulling-patch-3 2019-06-08 09:09:37 +02:00
Arkeon 5679dd435a Prevent crash when Ogre skeleton file is missing 2019-06-07 09:49:24 +02:00
Kim Kulling 57c46db042 Reorg of code. 2019-06-06 14:45:43 +02:00
Kim Kulling 589a306c85
Merge branch 'master' into code-chmod-644 2019-06-06 09:16:07 +02:00
Kim Kulling 6ed4f5d936 JT: Inital commit. 2019-06-06 08:29:12 +02:00
petrmohelnik 1855bf44f9 glTF importer - clean all member arrays 
When importing more than one scene using the same gtlf importer loading fails with error 'bad array new length'. This happens because 'meshOffsets' are not cleared and the importer continues to push_back values at the end. Adjacent values are then used to calculate the length of 'mMeshes' array. This calculation expects that each value is higher than the previous otherwise we get negative length. But when pushin at the end of uncleared array we get contents like this: 0,1,2,3,0,1,2. Then when calculating 0-3 we try to allocate array of length -3 and get this exception.
 2019-06-05 18:51:49 +02:00
Kim Kulling dcee3295cc
Merge branch 'master' into FindInstancesProcessOptim 2019-06-04 10:36:59 +02:00
Mike Samsonov 48ed2d2d3c Double precision fix 2019-05-30 10:54:44 +01:00