87ac6fbfd9
Update CMakeLists.txt
2017-10-31 02:05:01 +01:00
711050de8a
fix frame pointer arithmetic
2017-10-30 19:08:51 +01:00
4d09e61b13
Merge branch 'master' into master
2017-10-30 11:41:25 +01:00
99b9ba4c11
Merge branch 'master' into master
2017-10-30 16:33:47 +08:00
aca8f068d0
Update ColladaExporter.cpp
2017-10-30 16:29:57 +08:00
bbeb9dd640
Use correct lookup if scaling is enabled.
2017-10-29 23:18:37 +01:00
d6f5ad66b2
closes https://github.com/assimp/assimp/issues/1514 : add misisng flag to enable global scaling.
2017-10-29 20:32:44 +01:00
f49de6ecfe
closes https://github.com/assimp/assimp/issues/1514 : add postprocess step for scaling
2017-10-29 20:28:59 +01:00
c1c4a5ed2a
Add two unit tests for OBJ importer
2017-10-29 15:12:56 +01:00
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
a6688243a7
[ObjExporter] add a test for the "no mtl" version of the obj exporter
2017-10-27 10:14:53 +02:00
18cef9b391
[ObjExporter] add a "no mtl" version of the obj exporter
2017-10-27 10:14:38 +02:00
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
92046319be
Merge pull request #1503 from Matter-and-Form/gltf2-materials
...
glTF2 Material Improvements
2017-10-24 11:08:31 +02:00
bfa33b50ad
Merge branch 'master' into gltf2-materials
2017-10-24 10:40:20 +02:00
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
cc8374dd80
Return exception when obj file contains invalid face indice
2017-10-21 20:58:00 +02:00
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
90ba199ad4
Update ColladaExporter.cpp
2017-10-21 18:28:14 +08:00
cd4ef0a2e9
Update ColladaExporter.h
2017-10-21 18:15:46 +08:00
8cf61c3c89
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-20 15:22:49 +02:00
6e88838602
powf -> pow
...
Fix build errors on linux
2017-10-19 16:21:29 -04:00
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
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
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
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
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
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
130c25eadb
Merge pull request #1501 from assimp/kimkulling-traviscleanup
...
Update .travis.sh
2017-10-19 10:36:07 +02:00
832c1fcc7f
Update .travis.sh
...
Add license info
2017-10-19 09:55:15 +02:00
299c34f063
Update .travis.sh
...
Remove dead code.
2017-10-19 09:43:56 +02:00
4d30ae5436
Merge pull request #1500 from assimp/kimkulling-doc_path
...
Update Readme.md
2017-10-18 17:29:41 +02:00
c49d12cabb
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-18 17:03:43 +02:00
4354cce313
Update Readme.md
...
Fix typo.
2017-10-18 15:06:34 +02:00
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
00e13ccd77
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-18 13:41:09 +02:00
b0c435a66e
Merge branch 'master' into feature/jassimp-classloader-license
2017-10-18 09:58:37 +02:00
0b2d5de94f
Merge pull request #1496 from aavenel/unitTestObj
...
OBJ : add unit test to validate relative indices
2017-10-18 09:58:10 +02:00
85b1181486
Merge branch 'master' into unitTestObj
2017-10-18 09:39:04 +02:00
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
42e2c30b4b
Added helper getters for casting metadata payloads
2017-10-17 11:04:51 -05:00
1aa15c8069
Fix header and remove old debug code
2017-10-17 10:35:50 -05:00
100fa76a90
Merge remote-tracking branch 'upstream/master' into feature/collada-up_axis-api-improvements
2017-10-17 10:29:03 -05:00
ff758e4c15
OBJ : add unit test to validate relative indices
2017-10-16 20:35:02 +02:00
9d2bcb56c7
Merge remote-tracking branch 'upstream/master' into feature/jassimp-classloader-license
2017-10-16 12:43:35 -05:00
82debbf54a
Fixed copyright notice for IHMC jassimp improvements to BSD. Updated README
2017-10-16 12:41:50 -05:00
b2eb599176
Update ColladaExporter.cpp
...
Retrigger travis.
2017-10-16 18:51:25 +02:00
44ad80201c
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-14 21:47:21 +02:00
82b269c424
Merge pull request #1480 from turol/ubsan
...
Undefined Behavior sanitizer
2017-10-14 19:25:43 +03:00
f8c4002294
Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug
2017-10-14 18:46:19 +03:00
Andrea Baldacci, Ph.D
Lars Jørgen Solberg
thomas-lemaire
Victor NG
Kim Kulling
Alexandre Avenel
Kim Kulling
Daniel Hritzkiv
ndotl
Doug Stephen
Jesper Smith
turol
Jared Mulconry