Commit Graph

  • b1410f8455 Merge pull request #1457 from jaredmulconry/issue_1330 Kim Kulling 2017-09-26 08:24:07 +02:00
  • 4360267cb2 Replaced flakey macros with specific functions to serve the purpose Jared Mulconry 2017-09-25 22:58:47 +10:00
  • f6fc5a7a11 Changed the FileSizeTest to not rely on tmpnam to eliminate warning on gcc. Jared Mulconry 2017-09-25 22:07:01 +10:00
  • 7e91ac3443 Suppressed warning on gcc caused by the 'visibility' attribute being ignored on types. Jared Mulconry 2017-09-25 20:22:06 +10:00
  • 79a5165106 Fixed unused variable warning by replacing them with descriptive comments Jared Mulconry 2017-09-24 21:46:15 +10:00
  • 8dabd76e03 Fixed a warning caused by aiVector3D appearing in a packed struct, causing it to fail to pack as requested. Jared Mulconry 2017-09-24 21:19:03 +10:00
  • 539410d033 Fixed an error when compiling samples under MSVC that was caused by assuming including windows.h would pull in shellapi.h Jared Mulconry 2017-09-24 19:31:04 +10:00
  • 059a32654e Addressed warnings generated on MSVC across x86 and x64. Jared Mulconry 2017-09-24 19:29:43 +10:00
  • b5ac248703 Merge pull request #1444 from turol/warnings Kim Kulling 2017-09-20 22:18:21 +02:00
  • 81b94a1dca Merge pull request #1445 from Matter-and-Form/gltf2-alphaMode-fix Kim Kulling 2017-09-19 15:40:53 +02:00
  • 5c44776532 Merge pull request #1447 from Matter-and-Form/gltf1-color-import-fix Kim Kulling 2017-09-19 15:40:00 +02:00
  • adec1b2175 Merge pull request #1446 from Matter-and-Form/feature/gltf2-primitives Kim Kulling 2017-09-19 15:39:11 +02:00
  • d27e667f1e Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-09-19 00:32:50 +02:00
  • af9596674d FBX: add missing inversion of postrotation matrix for fbx. Kim Kulling 2017-09-19 00:31:41 +02:00
  • 3e8955faf5 Don’t ignore rgba(1,1,1,1) color properties Daniel Hritzkiv 2017-09-18 18:16:48 -04:00
  • 798542d7bd Formatting Daniel Hritzkiv 2017-09-18 14:48:07 -04:00
  • de0bf2ea96 Fix alphaMode storage and reading Daniel Hritzkiv 2017-09-18 12:19:55 -04:00
  • 8743d28ec5 SImplify mesh merging code Daniel Hritzkiv 2017-09-18 12:16:30 -04:00
  • 2efd2cdef8 tweaks to primitive merging logic; comments + formatting Daniel Hritzkiv 2017-09-18 10:43:05 -04:00
  • 814e8b3f8e Formatting Daniel Hritzkiv 2017-09-18 10:20:02 -04:00
  • 28523232cf Merge multiple meshes in a node into one mesh with many primtives; write out only one mesh per node Daniel Hritzkiv 2017-09-17 17:00:57 -04:00
  • 5147acfe65 Revert "store node mesh vs. meshes" Daniel Hritzkiv 2017-09-17 15:11:01 -04:00
  • d473a49456 Merge pull request #1442 from jcowles/master Kim Kulling 2017-09-18 16:24:58 +02:00
  • 982430c3ce BlenderDNA: Silence warning about inline function which is declared but not defined Turo Lamminen 2017-09-18 15:21:51 +03:00
  • 40c308af44 glTF: Silence uninitialized variable warning Turo Lamminen 2017-09-18 15:18:45 +03:00
  • b74fc9495a PlyLoader: Fix operator precedence issue in header check Turo Lamminen 2017-09-18 15:13:19 +03:00
  • 4652be8f18 FIReader: Silence uninitialized variable warning Turo Lamminen 2017-09-18 14:59:55 +03:00
  • 41724ace2d Collada: Silence uninitialized variable warning Turo Lamminen 2017-09-18 14:10:58 +03:00
  • c207e74534 Fix glTF 2.0 multi-primitive support Jeremy Cowles 2017-09-17 10:06:57 -07:00
  • 702bc6358e Merge pull request #1441 from turol/travis Kim Kulling 2017-09-17 13:45:40 +02:00
  • 69f8dc9b31 Travis: Disable OS X build since it doesn't do anything currently Turo Lamminen 2017-09-16 17:59:47 +03:00
  • 62db02210a Merge pull request #1440 from turol/travis Kim Kulling 2017-09-16 16:30:07 +02:00
  • d34895bf2c Merge pull request #1435 from jaredmulconry/issue_1065 Kim Kulling 2017-09-16 16:28:51 +02:00
  • 484f73b179 Merge pull request #1437 from rmitton/sib-version Kim Kulling 2017-09-16 16:27:38 +02:00
  • cf8453a21a travis: Enable ccache Turo Lamminen 2017-09-16 15:53:02 +03:00
  • 798d2d063c travis: Only build with xcode 8.3 Turo Lamminen 2017-09-16 15:52:18 +03:00
  • 167fb7e250 travis: Correctly minimize build matrix Turo Lamminen 2017-09-16 15:34:32 +03:00
  • 5478d4d4c7 travis: Move os declarations earlier Turo Lamminen 2017-09-16 15:22:37 +03:00
  • a77cbcf096 Merge pull request #1436 from turol/warnings Kim Kulling 2017-09-16 09:13:43 +02:00
  • f602055da5 Added Silo 2.5 support Richard Mitton 2017-09-15 12:40:38 -07:00
  • 234ffc0ad6 Fixed truncated material names Richard Mitton 2017-09-15 12:39:58 -07:00
  • 2ab72816fb Merge pull request #1 from assimp/master Richard Mitton 2017-09-15 11:57:49 -07:00
  • 01c50394ce FBXParser: Silence uninitialized variable warnings Turo Lamminen 2017-09-15 12:31:52 +03:00
  • f1998d52dc Importer: Whitespace cleanup to fix GCC misleading indentation warning Turo Lamminen 2017-09-14 12:19:03 +03:00
  • 046c229e48 AssbinExporter: Fix strict aliasing violation Turo Lamminen 2017-09-15 12:41:40 +03:00
  • f4a0ab81b1 AssbinExporter: Add Write specialization for aiColor3D Turo Lamminen 2017-09-14 11:25:19 +03:00
  • b9efc234d0 DefaultLogger: Whitespace cleanup to fix GCC misleading indentation warning Turo Lamminen 2017-09-14 11:22:32 +03:00
  • 0b140db0a4 glTFExporter: Silence uninitialized variable warning Turo Lamminen 2017-09-14 11:18:02 +03:00
  • f2e2f74d73 Add CMake flag to treat warnings as errors Turo Lamminen 2017-09-14 10:54:02 +03:00
  • 94a6fc78f4 Addressed last remaining warning under MSVC caused by use of 'deprecated' fopen. Jared Mulconry 2017-09-15 18:27:59 +10:00
  • dce39fdf43 Merge pull request #1433 from vkovalev123/patch-1 Kim Kulling 2017-09-15 09:37:57 +02:00
  • 58213804ff Update 3DSLoader.cpp vkovalev123 2017-09-14 14:55:02 +03:00
  • b9cfff8fac Merge pull request #1431 from assimp/revert-1427-asan Kim Kulling 2017-09-13 23:42:21 +02:00
  • afd6c4d57d Revert "Asan" Kim Kulling 2017-09-13 21:40:44 +02:00
  • d139b4d180 Merge pull request #1423 from Matter-and-Form/feature/gltf2 Kim Kulling 2017-09-13 20:01:38 +02:00
  • d49f86f1e7 Merge pull request #1427 from turol/asan Kim Kulling 2017-09-13 19:38:44 +02:00
  • 2cc0a378ed Update glTF in list of importers and exporters Daniel Hritzkiv 2017-09-13 11:23:12 -04:00
  • b6f122ff2c Fix delete / delete[] mismatch in glTFAsset Turo Lamminen 2017-09-12 19:00:44 +03:00
  • 2938a259b8 Enable AddressSanitizer for Linux clang build Turo Lamminen 2017-09-12 19:09:22 +03:00
  • 6a3b030094 MDP: fix encoding issues. Kim Kulling 2017-09-12 21:16:59 +02:00
  • b5f770e456 Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2017-09-12 19:07:21 +02:00
  • e3163ec15e FBX: fix some minor findings. Kim Kulling 2017-09-12 19:07:17 +02:00
  • cbedc448c6 closes https://github.com/assimp/assimp/issues/1426: add Defines.h to include folder for install. Kim Kulling 2017-09-12 18:59:38 +02:00
  • 190f034e38 Add AddressSanitizer option to CMake Turo Lamminen 2017-09-12 18:57:44 +03:00
  • 933bbb4f1c Manually read alphaMode material property John Senneker 2017-09-12 11:55:52 -04:00
  • eca008d5ec Properly move string passed to JSON writer John Senneker 2017-09-12 11:55:22 -04:00
  • b0da0796c8 Fix Segfault caused by losing pointer to std::string Daniel Hritzkiv 2017-09-12 10:07:15 -04:00
  • 023cb27784 Revert "Remove simple gltf2 export unit test" Daniel Hritzkiv 2017-09-12 09:57:58 -04:00
  • 4b01ecaf10 Remove simple gltf2 export unit test Daniel Hritzkiv 2017-09-11 16:31:40 -04:00
  • 86a8a58d12 Exclude glTF2 Exporter test when ASSIMP_BUILD_NO_EXPORT Daniel Hritzkiv 2017-09-10 21:04:28 -04:00
  • cde29c937c Formatting Daniel Hritzkiv 2017-09-08 16:32:00 -04:00
  • b1a5ca4516 Use forceNumber argument of WriteAttrs to write correct attribute names, instead Daniel Hritzkiv 2017-09-08 15:58:09 -04:00
  • 990fe143a1 Fix mesh primitive’s attributes’ names Daniel Hritzkiv 2017-09-08 15:54:03 -04:00
  • 816e6909ca Remove KHR_binary_glTF code Daniel Hritzkiv 2017-09-07 17:32:41 -04:00
  • b4f5033d89 Remove compresssed file format flag Daniel Hritzkiv 2017-09-07 17:15:05 -04:00
  • ed2b699c4b Add gltf2 basic unit test Daniel Hritzkiv 2017-09-07 15:50:35 -04:00
  • d518289e72 more specific token search for Collada Loader Daniel Hritzkiv 2017-09-07 15:48:11 -04:00
  • 5cb13aa4b3 Load gltf .bin files from correct directory Daniel Hritzkiv 2017-09-07 14:55:44 -04:00
  • a438ece655 Remove premultipliedAlpha from gltf2 Daniel Hritzkiv 2017-09-06 23:43:43 -04:00
  • 140b903d7a Fix parsing of glTF version Handle version as int in gltf Fix format specifiers in glTF version parser John Senneker 2017-09-06 15:32:44 -04:00
  • 19876e9822 Add support for importing both glTF and glTF2 files John Senneker 2017-09-06 14:50:02 -04:00
  • 2ee7991558 Restrict search for OFF header to first 3 bytes John Senneker 2017-09-06 14:49:25 -04:00
  • a5e8e0b2bd Remove commented out code Daniel Hritzkiv 2017-09-06 14:17:37 -04:00
  • 0a8183531e Set alphaMode, baseColorFactor opacity when model’s opacity isn’t 1 Daniel Hritzkiv 2017-09-06 14:17:24 -04:00
  • 37582131f4 Set the metallicFactor to 0 if source file doesn’t have metallicFactor Daniel Hritzkiv 2017-09-06 14:16:52 -04:00
  • da6a252efb Fix METALLIC_FACTOR typo Daniel Hritzkiv 2017-09-05 18:06:59 -04:00
  • 3ba00ca421 Define gltf material property names as constants Daniel Hritzkiv 2017-09-05 18:04:09 -04:00
  • 54dd4804cd Fix indentation Daniel Hritzkiv 2017-09-05 16:39:34 -04:00
  • 44757af34a Implement pbrSpecularGlossiness property as Nullable Daniel Hritzkiv 2017-09-05 16:29:00 -04:00
  • 03cfa04ee4 Define default material values as static constants Daniel Hritzkiv 2017-09-05 15:45:32 -04:00
  • 1a5823700f Remove need for Has by returning an empty Ref in Get Daniel Hritzkiv 2017-09-05 14:40:27 -04:00
  • 21259e0835 Use different form of index accessor Daniel Hritzkiv 2017-09-05 14:39:52 -04:00
  • 37527849b7 Export material names properly Daniel Hritzkiv 2017-09-03 22:11:20 -04:00
  • a9c4fa84b5 Sampler improvements; Add new LazyDict method Daniel Hritzkiv 2017-09-03 22:09:48 -04:00
  • 7245cceead Set default values on Sampler Daniel Hritzkiv 2017-09-03 22:03:02 -04:00
  • 2abdbdb55e Fix unused CopyValue Daniel Hritzkiv 2017-09-01 18:29:30 -04:00
  • 63ef19d9ad Export extensions Daniel Hritzkiv 2017-09-01 17:56:30 -04:00
  • d277995a97 Formatting Daniel Hritzkiv 2017-09-01 17:56:48 -04:00
  • 7f01e3f48f Only export byteStride if not 0 Daniel Hritzkiv 2017-09-01 17:56:42 -04:00
  • a0d97505e5 store node mesh vs. meshes Daniel Hritzkiv 2017-09-01 17:56:13 -04:00