Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,324 Commits 19 Branches 43 Tags
43be7abb70bef4e4e5cf09a5b397f21fca6d1c56
Commit Graph

6324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
43be7abb70 closes https://github.com/assimp/assimp/issues/2088: fix possible out-of-bound access in fbx-lerp operaation. 2018-08-09 20:48:25 +02:00
Kim Kulling
847573b9ed Merge pull request #2086 from assimp/2075 
closes https://github.com/assimp/assimp/issues/2075: Make inject of d…
 2018-08-08 00:03:02 +02:00
Kim Kulling
063ae05310 Merge branch 'master' into 2075 2018-08-07 21:30:01 +02:00
Kim Kulling
2d269ef83f Merge pull request #2083 from eddiejames/master 
Fix .obj displacement texture parsing
 2018-08-07 21:29:38 +02:00
Kim Kulling
11931b85fd closes https://github.com/assimp/assimp/issues/2075: Make inject of debug postfix an option, so you can swich it off. 2018-08-07 21:22:54 +02:00
Kim Kulling
77980bf07c Merge branch 'master' into master 2018-08-06 23:46:54 +02:00
Kim Kulling
cc1221240a Merge pull request #2081 from aavenel/Fix2077 
Fix #2077 - add a lot of unit-tests for gltf2 importer
 2018-08-05 11:27:42 +02:00
Kim Kulling
ea40ea2822 Update utglTF2ImportExport.cpp 
Fix clang compiler warnings, see https://stackoverflow.com/questions/31555584/why-is-clang-warning-suggest-braces-around-initialization-of-subobject-wmis for more detailed information.
 2018-08-05 00:49:29 +02:00
Eddie James
5321e1036d Fix .obj displacement texture parsing 
The string for an opacity texture is a substring of the displacement
texture string. Due to the nature of the string comparison in the
material texture parsing, any displacement textures will be incorrectly
assigned as opacity textures. Fix this by simply performing the check
for displacement texture before checking for opacity texture.
 2018-08-04 16:36:04 -05:00
Kim Kulling
824399c5c4 Merge branch 'master' into Fix2077 2018-08-04 17:00:19 +02:00
Kim Kulling
81181906db Merge pull request #2080 from jsfdez/master 
Pass parameter by reference
 2018-08-04 16:59:50 +02:00
Alexandre Avenel
3c37fbdc6b Remove try catch(...) on gltf2 importer 
Better to throw exception than hide it ?
 2018-08-04 12:47:37 +02:00
Alexandre Avenel
319cd64930 Add missing unit tests for gltf2 primitive mode 2018-08-04 12:47:37 +02:00
Alexandre Avenel
15c2a96d25 Add test for glTF2 points 2018-08-04 12:47:37 +02:00
Alexandre Avenel
29ebb126b8 Add test for glTF2 lines, line strip, lines loop 2018-08-04 12:47:37 +02:00
Alexandre Avenel
9dcf83fabd Add unit test for glTF primitive mode 2018-08-04 12:47:37 +02:00
Alexandre Avenel
ae0f82d5b7 Fix #2077 : GLTF segfault using triangle strip 2018-08-04 12:47:37 +02:00
Jesus Fernandez
c2c44a831c Pass parameter by reference 2018-08-03 14:51:01 +02:00
Kim Kulling
468549b752 Merge pull request #2071 from Maxqia/master 
Use a more accurate way of checking if the build is 64 bit
 2018-08-03 00:26:27 +02:00
Kim Kulling
63460d7f20 Merge branch 'master' into master 2018-08-02 21:06:19 +02:00
Kim Kulling
59db7f8bb8 Merge pull request #2076 from LoicFr/master 
Optimisation of FBX node name uniqueness
 2018-08-02 21:05:36 +02:00
Kim Kulling
a65a7b6c81 Merge branch 'master' into master 2018-08-02 20:26:48 +02:00
Kim Kulling
1e2f4c0187 Merge pull request #2073 from Nimer-88/bugfix/assimp_flipUVs_flag 
[BUGFIX] FlipUVsProcess should also process AnimMeshes (if any)
 2018-07-31 14:19:07 +02:00
FRICOTEAUX
92490eea01 Optimisation of FBX node name uniqueness 2018-07-30 17:27:03 +02:00
Sebastian Matusik
b965e7a6dc FlipUVsProcess should also process AnimMeshes (if any) 2018-07-28 18:18:17 +01:00
Kim Kulling
d4db553353 Merge branch 'master' into master 2018-07-27 20:32:31 +02:00
Kim Kulling
28fd396db4 Merge pull request #2068 from JekaS178RUS/stl_format_issue_2064 
STLImporter binary and ASCII files imports differently
 2018-07-27 11:44:17 +02:00
Max Qian
a77887c874 Use a more accurate way of checking if the build is 64 bit 2018-07-26 08:08:07 -07:00
Evgeniy
cd061a0957 Merge branch 'master' into stl_format_issue_2064 2018-07-25 18:38:59 +03:00
Kim Kulling
4a60190c52 Merge pull request #2069 from assimp/issue_1724 
closes https://github.com/assimp/assimp/issues/1724: add default mate…
 2018-07-25 16:30:38 +02:00
kkulling
7e67553311 Fix memleak. 2018-07-25 15:40:19 +02:00
kimkulling
9a6b07e522 closes https://github.com/assimp/assimp/issues/1724: add default material access to the material API. 2018-07-25 15:11:24 +02:00
Власов Евгений
7d630e98da STLImporter::LoadBinaryFile add one child node to produce same scene structure as in STLImporter::LoadASCIIFile 2018-07-23 16:44:20 +03:00
Kim Kulling
c5514cda7d Merge pull request #2062 from LoicFr/master 
Add support of 32-bit indices for the glTF2 export
 2018-07-20 14:49:43 +02:00
FRICOTEAUX
a69e95bdc1 Add support of 32-bit indices for the glTF2 export 2018-07-19 11:29:04 +02:00
Kim Kulling
7c85929649 Merge pull request #2061 from assimp/issue_2056 
closes https://github.com/assimp/assimp/issues/2056: use correc excep…
 2018-07-18 21:01:18 +02:00
Kim Kulling
8a3daa1a24 closes https://github.com/assimp/assimp/issues/2056: use correc exception type in MMD-loader. 2018-07-18 20:29:05 +02:00
Kim Kulling
54f3043728 Merge pull request #2060 from assimp/fix-unique-names-fix-ci 
Fix unique names fix ci
 2018-07-18 12:51:05 +02:00
Kim Kulling
417fed1693 Merge branch 'master' into fbximport-fix-uniquename 2018-07-18 11:43:38 +02:00
Kim Kulling
fbc8b4c5d6 Merge pull request #2052 from Nimer-88/feature/join_vertices_processor_kill_unused_vertices 
Feature/join vertices processor kill unused vertices
 2018-07-17 08:34:19 +02:00
Sebastian Matusik
a5f95f993c Merge branch 'master' into feature/join_vertices_processor_kill_unused_vertices 2018-07-15 22:21:04 +02:00
Kim Kulling
bf1683ab7e Merge branch 'master' into fbximport-fix-uniquename 2018-07-15 19:19:33 +02:00
Kim Kulling
7cb467da11 Update FBXConverter.cpp 
Try to trigger travis.
 2018-07-15 14:55:52 +02:00
Kim Kulling
85ba6acfa5 Merge pull request #2049 from migenius/issue_2046 
Implement support for non-indexed meshes in glTF importers
 2018-07-14 22:29:53 +02:00
Kim Kulling
a4533770f4 Merge branch 'master' into issue_2046 2018-07-14 19:25:07 +02:00
Kim Kulling
89190dda97 Merge pull request #2050 from Nimer-88/feature/glTFv2_blendshapes_support 
glTF v2 importer morph target support
 2018-07-14 19:04:28 +02:00
Kim Kulling
b069e7d7d0 Merge branch 'master' into feature/glTFv2_blendshapes_support 2018-07-14 17:09:05 +02:00
Kim Kulling
72de09a562 Update FBXConverter.cpp 
Remove dead code.
 2018-07-14 17:08:04 +02:00
Kim Kulling
91b30e7e74 Update FBXConverter.cpp 
simple change to retrigger CI
 2018-07-14 12:10:59 +02:00
Kenneth Perry (thothonegan)
7967f0a33f FBXImporter: Fix GetUniqueName to return names properly 2018-07-13 15:25:04 -05:00