Commit Graph

5272 Commits (45f2f31011918dea3e558729c8ea5f88c1a214d3)

Author SHA1 Message Date
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
Daniel Hritzkiv a898c1f2d1
SpecularFactor import and export improvements
The changes here (which only apply to reading from or writing to pbrSpecularGlossiness) will:

- store and read specular color on `AI_MATKEY_COLOR_SPECULAR ` rather than `AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_SPECULAR_FACTOR`
- store and read specular texture from `aiTextureType_SPECULAR` rather than `AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_SPECULARGLOSSINESS_TEXTURE`. Even though pbrSG’s specularGlossiness texture uses the alpha channel for glossiness, it will still work well enough with just the RGB channels of the image
2017-10-19 16:21:29 -04:00
Daniel Hritzkiv c71790c78d
Diffuse color and diffuse texture import and export improvements
These changes do a better of importing and exporting baseColor colors and textures, as well as diffuse colors and textures (in the case of pbrSpecularGlossiness)

- baseColorFactor will be stored on both `$clr.diffuse` and `$mat.gltf.pbrMetallicRoughness.baseColorFactor`, and will be extracted from `$mat.gltf.pbrMetallicRoughness.baseColorFactor` first, and falling back to `$clr.diffuse`. The behaviour for baseColorTexture is similar
- pbrSG’s diffuseFactor will now only be store on `$clr.diffuse` (overwriting any previous assignments to `$clr.diffuse`, e.g. from metallicRoughness’ baseColorFactor, as diffuseFactor is more analogous to diffuse color than baseColor), and will only extract from `$clr.diffuse`
2017-10-19 16:21:16 -04:00
Kim Kulling dbae8e497d Merge pull request #1502 from Matter-and-Form/bugfix/gltf1-version
Fix output of glTF 1 version string
2017-10-19 21:58:33 +02:00
Daniel Hritzkiv 5eaf083fbd
Fix output of glTF 1 version string
Was writing out “\u0001” instead of “1.0” as the data types were incorrect
2017-10-19 12:43:52 -04:00
Kim Kulling 130c25eadb Merge pull request #1501 from assimp/kimkulling-traviscleanup
Update .travis.sh
2017-10-19 10:36:07 +02:00
Kim Kulling 832c1fcc7f Update .travis.sh
Add license info
2017-10-19 09:55:15 +02:00
Kim Kulling 299c34f063 Update .travis.sh
Remove dead code.
2017-10-19 09:43:56 +02:00
Kim Kulling 4d30ae5436 Merge pull request #1500 from assimp/kimkulling-doc_path
Update Readme.md
2017-10-18 17:29:41 +02:00
ndotl c49d12cabb Merge branch 'master' into adsk-contrib-fix-std-stream-overflow 2017-10-18 17:03:43 +02:00
Kim Kulling 4354cce313 Update Readme.md
Fix typo.
2017-10-18 15:06:34 +02:00
Kim Kulling 2f56560e3f Merge pull request #1497 from ihmcrobotics/feature/jassimp-classloader-license
Changed license header for IHMC contributions from Apache 2.0 to BSD
2017-10-18 13:54:14 +02:00
ndotl 00e13ccd77 Merge branch 'master' into adsk-contrib-fix-std-stream-overflow 2017-10-18 13:41:09 +02:00
Kim Kulling b0c435a66e Merge branch 'master' into feature/jassimp-classloader-license 2017-10-18 09:58:37 +02:00
Kim Kulling 0b2d5de94f Merge pull request #1496 from aavenel/unitTestObj
OBJ : add unit test to validate relative indices
2017-10-18 09:58:10 +02:00
Kim Kulling 85b1181486 Merge branch 'master' into unitTestObj 2017-10-18 09:39:04 +02:00
Kim Kulling d997ea961a Merge pull request #1499 from ihmcrobotics/feature/collada-up_axis-api-improvements
Add Node metadata to the Jassmip Java API
2017-10-17 20:26:00 +02:00
Doug Stephen 42e2c30b4b Added helper getters for casting metadata payloads 2017-10-17 11:04:51 -05:00
Doug Stephen 1aa15c8069 Fix header and remove old debug code 2017-10-17 10:35:50 -05:00
Doug Stephen 100fa76a90 Merge remote-tracking branch 'upstream/master' into feature/collada-up_axis-api-improvements 2017-10-17 10:29:03 -05:00
Alexandre Avenel ff758e4c15 OBJ : add unit test to validate relative indices 2017-10-16 20:35:02 +02:00
Jesper Smith 9d2bcb56c7 Merge remote-tracking branch 'upstream/master' into feature/jassimp-classloader-license 2017-10-16 12:43:35 -05:00
Jesper Smith 82debbf54a Fixed copyright notice for IHMC jassimp improvements to BSD. Updated README 2017-10-16 12:41:50 -05:00
Kim Kulling b2eb599176 Update ColladaExporter.cpp
Retrigger travis.
2017-10-16 18:51:25 +02:00
Kim Kulling 44ad80201c Merge branch 'master' into adsk-contrib-fix-std-stream-overflow 2017-10-14 21:47:21 +02:00
turol 82b269c424 Merge pull request #1480 from turol/ubsan
Undefined Behavior sanitizer
2017-10-14 19:25:43 +03:00
Jared Mulconry f8c4002294 Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug 2017-10-14 18:46:19 +03:00
Turo Lamminen 9a6b141568 FBX: Replace bad pointer casting with memcpy 2017-10-14 18:46:19 +03:00
Turo Lamminen 7cbb5f4d3b B3DImporter: Replace bad pointer casting with memcpy 2017-10-14 18:46:19 +03:00
Turo Lamminen 7b73fe8b02 Travis: Add Clang UBSan build configuration 2017-10-14 18:46:19 +03:00
Turo Lamminen 6efe4e2841 CMake: Add support for Undefined Behavior sanitizer 2017-10-14 18:46:19 +03:00
Kim Kulling 8e7f476490 Merge pull request #1494 from assimp/invalid_normals_in_unittest
UnitTest: use correct initialized normals in unittest.
2017-10-14 17:45:30 +02:00
Kim Kulling 1767663071 Merge branch 'master' into invalid_normals_in_unittest 2017-10-14 17:06:57 +02:00
Kim Kulling 5a15226a95 Merge pull request #1489 from ihmcrobotics/feature/jassimp-classloader
Feature/jassimp IO system
2017-10-14 17:04:26 +02:00
Kim Kulling f56e28ea3c UnitTest: use correct initialized normals in unittest. 2017-10-14 16:40:39 +02:00
Kim Kulling 5e739acfa1 Merge branch 'master' into feature/jassimp-classloader 2017-10-14 15:59:55 +02:00
Kim Kulling 01510dfe1b Merge pull request #1491 from assimp/fix_blender_overflow
Blender: fix short overflow.
2017-10-14 10:44:00 +02:00
Kim Kulling e662f2dc6f Blender: fix short overflow. 2017-10-13 22:41:38 +02:00
Doug Stephen 5e00d4d5cb Populate metadata on Java objects. 2017-10-11 11:07:49 -05:00
Jesper Smith a7c1dde56e Added return statement to Write 2017-10-11 11:04:52 -05:00
Jesper Smith 0229a3acf3 Added supported for custom IO Systems in Java. Implemented ClassLoader IO System 2017-10-11 11:04:52 -05:00
Doug Stephen 33a54f021e Fix small bug in getStaticField 2017-10-11 11:03:29 -05:00
Doug Stephen 00eb2e401a Added field and getter for metadata entries to AiNode.java. 2017-10-11 10:56:40 -05:00