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
9a6b141568
FBX: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
7cbb5f4d3b
B3DImporter: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
7b73fe8b02
Travis: Add Clang UBSan build configuration
2017-10-14 18:46:19 +03:00
6efe4e2841
CMake: Add support for Undefined Behavior sanitizer
2017-10-14 18:46:19 +03:00
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
1767663071
Merge branch 'master' into invalid_normals_in_unittest
2017-10-14 17:06:57 +02:00
5a15226a95
Merge pull request #1489 from ihmcrobotics/feature/jassimp-classloader
...
Feature/jassimp IO system
2017-10-14 17:04:26 +02:00
f56e28ea3c
UnitTest: use correct initialized normals in unittest.
2017-10-14 16:40:39 +02:00
5e739acfa1
Merge branch 'master' into feature/jassimp-classloader
2017-10-14 15:59:55 +02:00
01510dfe1b
Merge pull request #1491 from assimp/fix_blender_overflow
...
Blender: fix short overflow.
2017-10-14 10:44:00 +02:00
e662f2dc6f
Blender: fix short overflow.
2017-10-13 22:41:38 +02:00
5e00d4d5cb
Populate metadata on Java objects.
2017-10-11 11:07:49 -05:00
a7c1dde56e
Added return statement to Write
2017-10-11 11:04:52 -05:00
0229a3acf3
Added supported for custom IO Systems in Java. Implemented ClassLoader IO System
2017-10-11 11:04:52 -05:00
33a54f021e
Fix small bug in getStaticField
2017-10-11 11:03:29 -05:00
00eb2e401a
Added field and getter for metadata entries to AiNode.java.
2017-10-11 10:56:40 -05:00
3ef1f37a80
Create AiMetadataEntry.java for jassimp port.
2017-10-11 10:54:27 -05:00
e79848ff79
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-11 13:49:47 +02:00
114c48bbcf
Merge pull request #1479 from jaredmulconry/appveyor
...
AppVeyor cleanup and Addition of VS 2017 and running Tests
2017-10-11 10:58:17 +02:00
3e7dbb5dfb
Merge branch 'master' of github.com:assimp/assimp into appveyor
2017-10-11 19:06:29 +11:00
c3074a81ca
Merge pull request #1464 from assimp/issue_1453
...
Obj: prepare test to reproduce crash on linux.
2017-10-10 19:51:20 +02:00
a1b79e23e6
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-10 19:33:07 +02:00
8f141c1966
Update utObjImportExport.cpp
...
Remove unused header.
2017-10-10 18:56:37 +02:00
c128e7e56c
Merge branch 'master' into issue_1453
2017-10-10 18:20:22 +02:00
fa91a0f64c
Another minor source change, this time even more minor than the last. Let's see what the cache can do with this.
2017-10-10 22:45:45 +11:00
Daniel Hritzkiv
Kim Kulling
ndotl
Doug Stephen
Alexandre Avenel
Jesper Smith
turol
Jared Mulconry
Turo Lamminen
Kim Kulling