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

7295 Commits (b463ddd399ef893e6f78e180483832cb091f5980)

Author SHA1 Message Date
kkulling b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. 2019-07-11 17:37:31 +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
Kim Kulling 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
Kim Kulling 3fcf3bd81f
Merge branch 'master' into topic/embedded_texture_name_fix 2019-06-30 12:43:40 +02:00
Kim Kulling 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
Rob Conde f5ece83f31 initial unnamed node uniqueness index outside of loop 2019-06-28 16:12:58 -04:00
Kim Kulling 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
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 07779a7ae1
Merge pull request #2517 from RichardTea/issue_2456_text_formats_precision 
Auto-detect text format export precision
 2019-06-27 14:01:38 +02:00
Kim Kulling af199c50aa
Merge branch 'master' into issue_2456_text_formats_precision 2019-06-26 17:31:11 +02:00
Kim Kulling b15311661c
Merge pull request #2516 from RichardTea/fix_issue_2507_collada_import 
Fix issue 2507 collada import
 2019-06-26 17:30:39 +02:00
Kim Kulling 853afdf42b
Merge branch 'master' into fix_issue_2507_collada_import 2019-06-25 20:19:42 +02:00
Kim Kulling ed0cd2f775
Merge pull request #2521 from assimp/kimkulling_dev 
Kimkulling dev
 2019-06-25 00:24:24 +02:00
Kim Kulling d7e442f78a Add missing file. 2019-06-24 21:48:52 +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
RichardTea fb8ee5e301
Merge pull request #13 from assimp/master 
fast forward to upstream
 2019-06-20 15:54:17 +01:00
Kim Kulling 6b3d6c3b8f JT: next steps. 2019-06-18 20:35:02 +02:00
Kim Kulling 3929ea0644
Merge pull request #2254 from assimp/kimkulling-patch-3 
Update XFileParser.cpp
 2019-06-15 20:39:37 +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
Kim Kulling 2d3c3379e5
Merge pull request #2488 from rbsheth/rbsheth_hunterize_assimp 
Use Hunter for pulling in dependencies
 2019-06-15 10:14:22 +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
Rahul Sheth 1db3e1e11f Allow CXX_STANDARD and other relevant compiler definitions to be set by Hunter user 2019-06-13 21:31:24 -07:00
Rahul Sheth dd9511aaef Add HunterGate URL/SHA1 2019-06-13 21:31:24 -07:00
Rahul Sheth 34fa64faf9 Add HunterGate 2019-06-13 21:31:24 -07:00
Kim Kulling b381467fc3
Merge pull request #2508 from pkoller/patch-1 
fixed MSVC toolset versions >140
 2019-06-13 15:40:49 +02:00
Kim Kulling ba29b8f1da
Merge branch 'master' into patch-1 2019-06-13 13:41:40 +02:00
Kim Kulling 43375eafb7
Merge pull request #2509 from pkoller/pkoller-patch-1 
additional changes in cmake template to find correct toolset version
 2019-06-13 13:41:03 +02:00