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

6356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
324d89b76d Merge pull request #2108 from assimp/kimkulling-patch-2 
Update Readme.md
 2018-08-28 23:16:03 +02:00
Kim Kulling
992ca11c47 Merge pull request #2107 from assimp/kimkulling-md-doc 
Update Readme.md
 2018-08-28 19:56:25 +02:00
Kim Kulling
372c1e6175 Update Readme.md 
Add a link to the Model-database.
 2018-08-28 19:46:43 +02:00
Kim Kulling
079886330d Update Readme.md 
Add a link to the Model-database.
 2018-08-28 19:46:19 +02:00
Kim Kulling
5ea4935dc5 Merge pull request #2103 from vjf/pyassimp-update 
Pyassimp update
 2018-08-26 08:11:17 +02:00
Vincent Fazio
ecd24a736c Add missing metadata fields 2018-08-24 12:06:24 +10:00
Vincent Fazio
597628f43a Prevent 'AttributeError' when printing object attributes 2018-08-24 12:03:54 +10:00
Kim Kulling
8ceca4daaf Merge pull request #2100 from assimp/qt_viewer_new_imagelib 
Introduce header-only imagelib to make install of qt-viewer simpler.
 2018-08-20 18:44:11 +02:00
Kim Kulling
1d47d49a66 Merge branch 'master' into qt_viewer_new_imagelib 2018-08-19 23:26:01 +02:00
Kim Kulling
ce9186b3a4 Merge pull request #2099 from gstanlo/master 
Fixes crash when importing invalid glTF/2.0 files
 2018-08-19 23:25:32 +02:00
Kim Kulling
0ff4640dcd Remove qt4-support for viewer. 2018-08-19 21:27:08 +02:00
Kim Kulling
fe6be58b35 Some cleanups. 2018-08-19 16:51:47 +02:00
Kim Kulling
09cf839188 Merge branch 'master' into master 2018-08-19 13:17:27 +02:00
Kim Kulling
5390ec1cb9 Merge pull request #2095 from msfeldstein/master 
Use delete[] instead of delete to clear mMeshes
 2018-08-19 13:16:58 +02:00
Kim Kulling
7f227f8250 Merge branch 'master' into qt_viewer_new_imagelib 2018-08-18 12:01:05 +02:00
Kim Kulling
5a23810d82 Introduce header-only imagelib to make install of qt-viewer simpler. 2018-08-18 11:07:12 +02:00
gstanlo
74e8200a49 Merge branch 'master' into master 2018-08-17 14:12:15 -07:00
gstanlo
82f3d40d60 Fixes crash when importing invalid glTF/2.0 files 
Skips some glTF/2.0 uv processing if the count of uvs in the attribute stream doesn't match the vertex count.

This happens with some malformed glTF/2.0 files, and the change will allow them to be processed properly.
Without the change, an access violation will occur several lines below if uv count is less than the position count.
 2018-08-17 13:49:01 -07:00
Kim Kulling
a16fb1e54c Merge branch 'master' into master 2018-08-17 21:46:08 +02:00
Kim Kulling
92078bc47c Merge pull request #2089 from griffin2000/master 
Support out of order channels in BVH
 2018-08-17 11:28:14 +02:00
Mike Feldstein
0ba57202f7 Use array delete command vs object delete since mMeshes is allocated with new[] 2018-08-16 13:56:35 -07:00
Kim Kulling
f4e6d4bb9e Merge branch 'master' into master 2018-08-16 19:02:20 +02:00
Kim Kulling
1388e0b79f Merge pull request #2094 from JekaS178RUS/obj-point-cloud 
Add point cloud support for OBJ importer
 2018-08-16 18:04:38 +02:00
Jeka Vlasov
102486005d Fix memory leak on throw 2018-08-15 03:40:39 +03:00
Jeka Vlasov
2b15586e6b Replace memcpy_s with memcpy to fix build with gcc 4.8 2018-08-15 01:22:28 +03:00
Jeka Vlasov
d25083dba9 Add point cloud support for OBJ importer 2018-08-13 00:18:12 +03:00
Kim Kulling
dd8cf73415 Update BVHLoader.cpp 
Fix compiler warning: not handled enum in switch.
 2018-08-11 00:15:22 +02:00
Kim Kulling
58bbb6a3e1 Merge pull request #2091 from assimp/issue_2088 
closes https://github.com/assimp/assimp/issues/2088:
 2018-08-10 09:21:19 +02:00
Kim Kulling
b3132bd8c2 FBX: some refactorings. 2018-08-10 01:57:11 +02:00
Kim Kulling
442b258360 update gitignore 2018-08-09 22:27:21 +02:00
Kim Kulling
c3d043e761 FBX: some refactorings. 2018-08-09 21:51:53 +02:00
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
Gareth Morgan
8fba4ce7cf Support out of order channels 2018-08-08 15:22:10 -07: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