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

6342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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