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

5114 Commits (9206d1b62bb0f23ca84987a764a70e569a2cfaac)

Author SHA1 Message Date
Kim Kulling 4879fe13ca Merge branch 'unittest_obj_importer' of https://github.com/aavenel/assimp 2017-11-04 16:58:35 +01:00
Kim Kulling c700c08fa5
Merge branch 'master' into master 2017-11-04 10:45:57 +01:00
Kim Kulling d5692ccf30
Merge pull request #1537 from assimp/Anatoscope-ObjExporter_nomtl 
Anatoscope obj exporter nomtl
 2017-11-04 10:34:29 +01:00
Kim Kulling b7bd006304
Merge branch 'master' into ObjExporter_nomtl 2017-11-04 09:32:50 +01:00
Kim Kulling eeee744e21
Merge pull request #1536 from assimp/Anatoscope-fix_trivial_warnings 
Anatoscope fix trivial warnings
 2017-11-04 09:31:43 +01:00
Kim Kulling 4dab6f9be3
Merge branch 'master' into Anatoscope-fix_trivial_warnings 2017-11-04 08:49:27 +01:00
Kim Kulling 4910af3814
Merge pull request #1535 from assimp/kimkulling-patch-1 
Update .travis.yml
 2017-11-04 08:49:02 +01:00
Kim Kulling 9a721d0ef4
Update .travis.yml 
Remove unused branch rule for travis.
 2017-11-04 08:24:36 +01:00
Kim Kulling 4587e63e2f
Merge branch 'master' into fix_trivial_warnings 2017-11-03 20:05:16 +01:00
Kim Kulling 56674de1d8
Merge pull request #1534 from Matter-and-Form/texturefile-int-name-fix 
[PLY] fix for TextureFile with number in file name
 2017-11-03 19:10:01 +01:00
Daniel Hritzkiv 2922753589
Return early when element is TextureFile 
In cases where the TextureFile name would start with an integer, `strtoul10` would parse that number and incorrectly set `numOccur` to that number. This caused PLY parsing to fail for vertex positions.

Since TextureFile is a single line, and does not have any follow-up lines, it’s okay to return early
 2017-11-03 11:50:28 -04:00
Kim Kulling c86c7b4518
Update .travis.sh 
Retrigger travis.
 2017-11-03 13:11:30 +01:00
Kim Kulling d279a3cc02
Merge branch 'master' into fix_trivial_warnings 2017-11-03 10:35:02 +01:00
Thomas Lemaire 5b76a31485 fix trivial warnings 
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
 2017-11-02 11:13:52 +01:00
thomas-lemaire 931542bf3c
Merge branch 'master' into ObjExporter_nomtl 2017-11-02 10:46:57 +01:00
Kim Kulling c666a05e16
Merge pull request #1524 from Matter-and-Form/invalid-texture-coordinates-cleaning-fix 
Invalid texture coordinates cleaning fix
 2017-11-02 10:46:44 +01:00
Kim Kulling ce7f379aa3
Merge branch 'master' into invalid-texture-coordinates-cleaning-fix 2017-11-01 10:53:43 +01:00
Kim Kulling 62e3ac9b4d
Merge pull request #1525 from daeyun/daeyun-lib-dirs 
[pyassimp] Search for libassimp.so in LD_LIBRARY_PATH if available.
 2017-11-01 10:49:05 +01:00
Daeyun Shin bf9d319489
Update helper.py 
Search for libassimp.so in LD_LIBRARY_PATH if available.
 2017-10-31 15:43:39 -07:00
Daniel Hritzkiv e52e44ea07
Formatting 2017-10-31 15:18:08 -04:00
Daniel Hritzkiv cc4531459f
Set mNumUVComponents to 0 when deleting texture coordinate sets 2017-10-31 15:14:21 -04:00
Kim Kulling 938c02a358
Merge pull request #1523 from assimp/issue_1490 
closes https://github.com/assimp/assimp/issues/1490 : fix invalid acc…
 2017-10-31 15:07:51 +01:00
Kim Kulling 8be196f77d closes https://github.com/assimp/assimp/issues/1490 : fix invalid access to mesh array when the array is empty. 2017-10-31 14:03:03 +01:00
Kim Kulling a502560da1
Merge pull request #1520 from assimp/issue_1514 
Issue 1514
 2017-10-31 13:37:23 +01:00
Kim Kulling af4556d569 only scale the root node because this will rescale all children nodes as well. 2017-10-31 13:08:24 +01:00
Kim Kulling 64ee21024b Add missing file. 2017-10-31 13:07:07 +01:00
Kim Kulling ae020281e2 Add unittest 2017-10-31 12:24:32 +01:00
Lars Jørgen Solberg 711050de8a fix frame pointer arithmetic 2017-10-30 19:08:51 +01:00
thomas-lemaire 4d09e61b13
Merge branch 'master' into master 2017-10-30 11:41:25 +01:00
Victor NG 99b9ba4c11
Merge branch 'master' into master 2017-10-30 16:33:47 +08:00
Victor NG aca8f068d0
Update ColladaExporter.cpp 2017-10-30 16:29:57 +08:00
Kim Kulling bbeb9dd640 Use correct lookup if scaling is enabled. 2017-10-29 23:18:37 +01:00
Kim Kulling d6f5ad66b2 closes https://github.com/assimp/assimp/issues/1514: add misisng flag to enable global scaling. 2017-10-29 20:32:44 +01:00
Kim Kulling f49de6ecfe closes https://github.com/assimp/assimp/issues/1514: add postprocess step for scaling 2017-10-29 20:28:59 +01:00
Alexandre Avenel c1c4a5ed2a Add two unit tests for OBJ importer 2017-10-29 15:12:56 +01:00
Kim Kulling 89d198399c
Merge pull request #1516 from Matter-and-Form/gltf2-export-roughness-from-shininess-fix 
[gltf2 export] Fix shininess to roughness conversion
 2017-10-27 20:14:23 +02:00
Thomas Lemaire a6688243a7 [ObjExporter] add a test for the "no mtl" version of the obj exporter 2017-10-27 10:14:53 +02:00
Thomas 18cef9b391 [ObjExporter] add a "no mtl" version of the obj exporter 2017-10-27 10:14:38 +02:00
Daniel Hritzkiv 8b73ec7541
Fix shininess to roughness conversion; Add comments 
Was accidentally flipping to value (1 - x) twice, thus negating the effect.
 2017-10-26 11:33:33 -04:00
Kim Kulling 92046319be Merge pull request #1503 from Matter-and-Form/gltf2-materials 
glTF2 Material Improvements
 2017-10-24 11:08:31 +02:00
Kim Kulling bfa33b50ad Merge branch 'master' into gltf2-materials 2017-10-24 10:40:20 +02:00
Kim Kulling 6d98f82440 Merge pull request #1512 from aavenel/safe_atoi_OBJ 
Raise exception when obj file contains invalid face indice
 2017-10-22 09:44:06 +02:00
Alexandre Avenel cc8374dd80 Return exception when obj file contains invalid face indice 2017-10-21 20:58:00 +02:00
Kim Kulling aa733d6f77 Merge pull request #1486 from autodesk-forks/adsk-contrib-fix-std-stream-overflow 
Prevent failing stringstream to crash the export process
 2017-10-21 13:34:53 +02:00
Victor NG 90ba199ad4 Update ColladaExporter.cpp 2017-10-21 18:28:14 +08:00
Victor NG cd4ef0a2e9 Update ColladaExporter.h 2017-10-21 18:15:46 +08:00
ndotl 8cf61c3c89 Merge branch 'master' into adsk-contrib-fix-std-stream-overflow 2017-10-20 15:22:49 +02:00
Daniel Hritzkiv 6e88838602
powf -> pow 
Fix build errors on linux
 2017-10-19 16:21:29 -04:00
Daniel Hritzkiv 40147d253d
Prefer “BLEND” over “MASK” as an alphaMode default 
“BLEND” is a much nicer alphaMode value (if the hardware supports it – not a steep requirement) than “MASK” as mask is either fully opaque or fully transparent, depending on the alphaCutoff. This matches many other converters’ alphaMode default.
 2017-10-19 16:21:29 -04:00
Daniel Hritzkiv 89358458f0
Approximate specularity / glossiness in metallicRoughness materials 
Before, models (of traditional lighting models) with specularity/glossiness would be completely flat when exported to metallicRoughness. These changes approximate glossiness (as an inverse of roughness, with specular intensity as a multiplier) both reading from gltf2 and writing to gltf2.
 2017-10-19 16:21:29 -04:00