Commit Graph

  • 8b73ec7541 Fix shininess to roughness conversion; Add comments Daniel Hritzkiv 2017-10-26 11:33:33 -04:00
  • 92046319be Merge pull request #1503 from Matter-and-Form/gltf2-materials Kim Kulling 2017-10-24 11:08:31 +02:00
  • bfa33b50ad Merge branch 'master' into gltf2-materials Kim Kulling 2017-10-24 10:40:20 +02:00
  • 6d98f82440 Merge pull request #1512 from aavenel/safe_atoi_OBJ Kim Kulling 2017-10-22 09:44:06 +02:00
  • cc8374dd80 Return exception when obj file contains invalid face indice Alexandre Avenel 2017-10-21 20:36:43 +02:00
  • aa733d6f77 Merge pull request #1486 from autodesk-forks/adsk-contrib-fix-std-stream-overflow Kim Kulling 2017-10-21 13:34:53 +02:00
  • 90ba199ad4 Update ColladaExporter.cpp Victor NG 2017-10-21 18:28:14 +08:00
  • cd4ef0a2e9 Update ColladaExporter.h Victor NG 2017-10-21 18:15:46 +08:00
  • 8cf61c3c89 Merge branch 'master' into adsk-contrib-fix-std-stream-overflow ndotl 2017-10-20 15:22:49 +02:00
  • 6e88838602 powf -> pow Daniel Hritzkiv 2017-10-19 13:40:03 -04:00
  • 40147d253d Prefer “BLEND” over “MASK” as an alphaMode default Daniel Hritzkiv 2017-10-19 12:32:55 -04:00
  • 89358458f0 Approximate specularity / glossiness in metallicRoughness materials Daniel Hritzkiv 2017-10-19 12:30:32 -04:00
  • a898c1f2d1 SpecularFactor import and export improvements Daniel Hritzkiv 2017-10-19 12:24:25 -04:00
  • c71790c78d Diffuse color and diffuse texture import and export improvements Daniel Hritzkiv 2017-10-19 12:01:40 -04:00
  • dbae8e497d Merge pull request #1502 from Matter-and-Form/bugfix/gltf1-version Kim Kulling 2017-10-19 21:58:33 +02:00
  • 5eaf083fbd Fix output of glTF 1 version string Daniel Hritzkiv 2017-10-19 12:38:11 -04:00
  • 130c25eadb Merge pull request #1501 from assimp/kimkulling-traviscleanup Kim Kulling 2017-10-19 10:36:07 +02:00
  • 832c1fcc7f Update .travis.sh Kim Kulling 2017-10-19 09:55:15 +02:00
  • 299c34f063 Update .travis.sh Kim Kulling 2017-10-19 09:43:56 +02:00
  • 4d30ae5436 Merge pull request #1500 from assimp/kimkulling-doc_path Kim Kulling 2017-10-18 17:29:41 +02:00
  • c49d12cabb Merge branch 'master' into adsk-contrib-fix-std-stream-overflow ndotl 2017-10-18 17:03:43 +02:00
  • 4354cce313 Update Readme.md Kim Kulling 2017-10-18 15:06:34 +02:00
  • 2f56560e3f Merge pull request #1497 from ihmcrobotics/feature/jassimp-classloader-license Kim Kulling 2017-10-18 13:54:14 +02:00
  • 00e13ccd77 Merge branch 'master' into adsk-contrib-fix-std-stream-overflow ndotl 2017-10-18 13:41:09 +02:00
  • b0c435a66e Merge branch 'master' into feature/jassimp-classloader-license Kim Kulling 2017-10-18 09:58:37 +02:00
  • 0b2d5de94f Merge pull request #1496 from aavenel/unitTestObj Kim Kulling 2017-10-18 09:58:10 +02:00
  • 85b1181486 Merge branch 'master' into unitTestObj Kim Kulling 2017-10-18 09:39:04 +02:00
  • d997ea961a Merge pull request #1499 from ihmcrobotics/feature/collada-up_axis-api-improvements Kim Kulling 2017-10-17 20:26:00 +02:00
  • 42e2c30b4b Added helper getters for casting metadata payloads Doug Stephen 2017-10-17 11:04:51 -05:00
  • 1aa15c8069 Fix header and remove old debug code Doug Stephen 2017-10-17 10:35:50 -05:00
  • 100fa76a90 Merge remote-tracking branch 'upstream/master' into feature/collada-up_axis-api-improvements Doug Stephen 2017-10-17 10:29:03 -05:00
  • ff758e4c15 OBJ : add unit test to validate relative indices Alexandre Avenel 2017-10-15 19:53:26 +02:00
  • 9d2bcb56c7 Merge remote-tracking branch 'upstream/master' into feature/jassimp-classloader-license Jesper Smith 2017-10-16 12:43:35 -05:00
  • 82debbf54a Fixed copyright notice for IHMC jassimp improvements to BSD. Updated README Jesper Smith 2017-10-16 12:41:50 -05:00
  • b2eb599176 Update ColladaExporter.cpp Kim Kulling 2017-10-16 18:51:25 +02:00
  • 44ad80201c Merge branch 'master' into adsk-contrib-fix-std-stream-overflow Kim Kulling 2017-10-14 21:47:21 +02:00
  • 82b269c424 Merge pull request #1480 from turol/ubsan turol 2017-10-14 19:25:43 +03:00
  • f8c4002294 Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug Jared Mulconry 2017-10-14 22:45:00 +11:00
  • 9a6b141568 FBX: Replace bad pointer casting with memcpy Turo Lamminen 2017-10-07 20:40:35 +03:00
  • 7cbb5f4d3b B3DImporter: Replace bad pointer casting with memcpy Turo Lamminen 2017-10-07 18:36:09 +03:00
  • 7b73fe8b02 Travis: Add Clang UBSan build configuration Turo Lamminen 2017-10-07 17:47:06 +03:00
  • 6efe4e2841 CMake: Add support for Undefined Behavior sanitizer Turo Lamminen 2017-10-07 17:13:08 +03:00
  • 8e7f476490 Merge pull request #1494 from assimp/invalid_normals_in_unittest Kim Kulling 2017-10-14 17:45:30 +02:00
  • 1767663071 Merge branch 'master' into invalid_normals_in_unittest Kim Kulling 2017-10-14 17:06:57 +02:00
  • 5a15226a95 Merge pull request #1489 from ihmcrobotics/feature/jassimp-classloader Kim Kulling 2017-10-14 17:04:26 +02:00
  • f56e28ea3c UnitTest: use correct initialized normals in unittest. Kim Kulling 2017-10-14 16:40:39 +02:00
  • 5e739acfa1 Merge branch 'master' into feature/jassimp-classloader Kim Kulling 2017-10-14 15:59:55 +02:00
  • 01510dfe1b Merge pull request #1491 from assimp/fix_blender_overflow Kim Kulling 2017-10-14 10:44:00 +02:00
  • e662f2dc6f Blender: fix short overflow. Kim Kulling 2017-10-13 22:41:38 +02:00
  • 5e00d4d5cb Populate metadata on Java objects. Doug Stephen 2017-10-11 11:07:49 -05:00
  • a7c1dde56e Added return statement to Write Jesper Smith 2017-07-28 15:08:59 -05:00
  • 0229a3acf3 Added supported for custom IO Systems in Java. Implemented ClassLoader IO System Jesper Smith 2017-07-27 17:42:01 -05:00
  • 33a54f021e Fix small bug in getStaticField Doug Stephen 2017-10-11 11:03:29 -05:00
  • 00eb2e401a Added field and getter for metadata entries to AiNode.java. Doug Stephen 2017-10-11 10:56:40 -05:00
  • 3ef1f37a80 Create AiMetadataEntry.java for jassimp port. Doug Stephen 2017-10-11 10:54:27 -05:00
  • e79848ff79 Merge branch 'master' into adsk-contrib-fix-std-stream-overflow Kim Kulling 2017-10-11 13:49:47 +02:00
  • 114c48bbcf Merge pull request #1479 from jaredmulconry/appveyor Kim Kulling 2017-10-11 10:58:17 +02:00
  • 3e7dbb5dfb Merge branch 'master' of github.com:assimp/assimp into appveyor Jared Mulconry 2017-10-11 19:06:29 +11:00
  • c3074a81ca Merge pull request #1464 from assimp/issue_1453 Kim Kulling 2017-10-10 19:51:20 +02:00
  • a1b79e23e6 Merge branch 'master' into adsk-contrib-fix-std-stream-overflow Kim Kulling 2017-10-10 19:33:07 +02:00
  • 8f141c1966 Update utObjImportExport.cpp Kim Kulling 2017-10-10 18:56:37 +02:00
  • c128e7e56c Merge branch 'master' into issue_1453 Kim Kulling 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. Jared Mulconry 2017-10-10 22:45:45 +11:00
  • 1497cc27b2 Cleaned up the whitespace again. Let's see how the cache does. Jared Mulconry 2017-10-10 22:08:13 +11:00
  • dce2be9e09 I think I've worked out where the obj's are located. We shall see if the cache picks them up. Jared Mulconry 2017-10-10 21:24:40 +11:00
  • 94e3f903e2 Merge branch 'master' into appveyor Jared Mulconry 2017-10-10 19:28:05 +10:00
  • bb173749c1 Attempting to fix the directories being cached. Jared Mulconry 2017-10-10 20:11:21 +11:00
  • eb46a40849 Merge branch 'master' into appveyor Jared Mulconry 2017-10-10 18:46:21 +10:00
  • b8ad03baa1 Because I have to change a file somewhere to properly test the cache on AppVeyor, I've made some whitespace a bit better. Jared Mulconry 2017-10-10 19:45:57 +11:00
  • 63338c0605 Merge branch 'master' of github.com:assimp/assimp into appveyor Jared Mulconry 2017-10-10 18:55:57 +11:00
  • ffaa42af79 Merge pull request #1482 from TransformAndLighting/master Kim Kulling 2017-10-09 19:38:16 +02:00
  • 7c8e8e04fa Merge branch 'master' into adsk-contrib-fix-std-stream-overflow ndotl 2017-10-09 16:00:46 +02:00
  • 7353d25c13 Prevent failing stringstream to crash the export process Haik Lorenz 2017-10-09 15:47:17 +02:00
  • 469c1a068f Merge branch 'master' of github.com:jaredmulconry/assimp into appveyor Jared Mulconry 2017-10-09 18:52:02 +11:00
  • d60fe38253 Merge branch 'master' into master Kim Kulling 2017-10-09 00:07:43 +02:00
  • 21add21ab1 Merge pull request #1484 from jaredmulconry/msvc2013_tempfile_fix Kim Kulling 2017-10-09 00:06:57 +02:00
  • b2716a9c3f Merge branch 'master' into msvc2013_tempfile_fix Kim Kulling 2017-10-08 19:53:53 +02:00
  • 55cfe298b0 Merge pull request #1483 from turol/warnings Kim Kulling 2017-10-08 19:45:59 +02:00
  • 4a915653f5 Fixed IOStream reporting a file size of 0 for files that have been written, but not yet been flushed to disk. Jared Mulconry 2017-10-08 23:42:28 +11:00
  • f90d874978 Open3DGC: Remove redundant const qualifiers from return types Turo Lamminen 2017-10-08 12:48:45 +03:00
  • cd64eae590 GenericProperty: Remove useless const qualifier from return value Turo Lamminen 2017-10-08 12:45:48 +03:00
  • 7e033c6cef FBX: Remove useless const qualifier from return value Turo Lamminen 2017-10-08 12:45:02 +03:00
  • 3b4ffbc1b6 Test failures are now getting properly reported. Turning off 'fast finish' to allow all tests to execute. Jared Mulconry 2017-10-08 19:16:03 +11:00
  • d8e3952b64 Merging the test_script with test reporting was a terrible idea in retrospect. on_finish should serve the purpose. Jared Mulconry 2017-10-08 18:57:35 +11:00
  • e60e396721 Attempting to address failures with chained batch and powershell commands. Jared Mulconry 2017-10-08 18:42:56 +11:00
  • 61836080c5 Quote escaping across nested batch and powershell hurts my brain. Jared Mulconry 2017-10-08 18:01:58 +11:00
  • 27b6cc22db No fun/multiline allowed. Jared Mulconry 2017-10-08 17:51:42 +11:00
  • 022a34e54c Fixing multiline batch command weirdness. Jared Mulconry 2017-10-08 17:50:11 +11:00
  • 54d2f25aa5 Attempting to get test results reporting even if an error occurrs. Jared Mulconry 2017-10-08 17:46:45 +11:00
  • 5e5b7f4f75 Refined the appveyor config so that test output is reported even if tests fail. Jared Mulconry 2017-10-08 17:06:23 +11:00
  • 5149149b07 The environment section doesn't do what I thought it would. Duplication is bad, but seems neccessary. Jared Mulconry 2017-10-08 16:31:46 +11:00
  • 58ac747634 Fixed some bad usage of environment variables. Jared Mulconry 2017-10-08 16:28:43 +11:00
  • 90c9884c5e The environment section uses different syntax for a list of vars. Jared Mulconry 2017-10-08 16:24:05 +11:00
  • 81d3010f73 Added the mtime_cache script to hopefully improve use of incremental building with appveyor. Reduced the verbosity of the appveyor config. Added use of mtime_cache. Fixed the output of an xml version of the test output for hooking into appveyor. Jared Mulconry 2017-10-08 16:21:32 +11:00
  • 52da099738 Updated test output to log to xml and to upload those results appropriately, so they show up in AppVeyor correctly as tests at the end. Jared Mulconry 2017-10-08 13:00:27 +11:00
  • 6a2dfb1efc Fixed up the path to the build artifacts to be cached. Jared Mulconry 2017-10-08 12:44:54 +11:00
  • 3e80aabde5 Attempting to get tests to run. Jared Mulconry 2017-10-08 12:32:14 +11:00
  • 26851880e4 Attempting to address issues with cloning the repo. shallow_copy seems to fail at times. I'll let it continue to clone the whole history. Jared Mulconry 2017-10-08 11:55:54 +11:00
  • b57011552b Merge branch 'master' into issue_1453 Kim Kulling 2017-10-07 19:08:52 +02:00
  • f925e2cf4e Reproduce issue and remove assertion when a nullptr makes more sence Kim Kulling 2017-10-07 19:08:20 +02:00