Commit Graph

  • 940414104a Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-10-13 14:10:11 +02:00
  • b483be3069 Merge pull request #402 from jdduke/disable_bmesh Alexander Gessler 2014-10-10 22:46:25 -07:00
  • a1a1bf77a8 Temporarily disable Blender BMesh conversion Jared Duke 2014-10-10 14:16:42 -07:00
  • 487c9449d2 bugfix: search for token checks for the given tokenlist against the lowercased info coming from the asset file. So we also have to used a lowercased token. Thanks to Robinson for the report. Kim Kulling 2014-10-10 15:59:42 +02:00
  • dad152e726 Merge pull request #399 from filipwasil/Android_JNI_Asset_extraction_support Kim Kulling 2014-10-08 13:17:23 +02:00
  • 88f6e8213b Android JNI asset extraction support (API 9+) Filip Wasil 2014-10-07 17:05:14 +02:00
  • 7224476ee1 Android JNI asset extraction support (API 9+) Filip Wasil 2014-10-07 16:23:56 +02:00
  • c967cf7af5 Merge pull request #396 from OgreTransporter/master Alexander Gessler 2014-09-27 20:06:22 -07:00
  • 9b3a88b2a5 New boost versions OgreTransporter 2014-09-27 21:04:57 +02:00
  • c2d13fbd76 Merge pull request #395 from Gargaj/patch-1 Kim Kulling 2014-09-26 19:30:47 +02:00
  • 397989e169 Null-terminate string Gargaj 2014-09-26 01:29:23 +02:00
  • a5afbcf29c refactoring: remove duplicate code. Kim Kulling 2014-09-23 23:34:05 +02:00
  • d228dbeab7 Merge pull request #394 from abma/master Alexander Gessler 2014-09-22 16:12:36 -07:00
  • 775b26e614 use std:: namespace for most cmath functions: abma 2014-09-23 00:42:32 +02:00
  • b359deb7fd update: - add assert test in obj-import - fix material token in Obj. Kim Kulling 2014-09-21 20:37:36 +02:00
  • e6eeab8c84 Merge pull request #388 from jdduke/rebase_blend_regression_db Alexander Gessler 2014-09-20 23:27:18 -07:00
  • f44968669f Merge pull request #391 from jdduke/fix_blend_bmesh_uvloop Alexander Gessler 2014-09-20 23:26:35 -07:00
  • 4dcd316430 Use strict inequality when validating BMesh uvloop access Jared Duke 2014-09-20 10:23:21 -07:00
  • 5e114c04d2 Use Linux/GCC build for DB generation Jared Duke 2014-09-17 08:49:28 -07:00
  • 083d5630ef Use VC11 build for DB generation Jared Duke 2014-09-17 07:30:55 -07:00
  • c8661ab055 Rebase BLEND regression db entries Jared Duke 2014-09-16 17:47:55 -07:00
  • 6a8f69ad5d Merge pull request #386 from jdduke/rebase_fbx_fov Alexander Gessler 2014-09-16 09:37:37 -07:00
  • 1add165319 Merge pull request #1 from assimp/master Denis 2014-09-16 12:30:43 +04:00
  • aac40dd5b8 Merge pull request #385 from jdduke/fix_blend_and_rebase_regression_tests Alexander Gessler 2014-09-16 01:10:53 -07:00
  • f7f906ec70 Merge pull request #387 from Kvalme/master Alexander Gessler 2014-09-16 01:09:55 -07:00
  • 046b7e5f47 Rebase FBX regression db entries Jared Duke 2014-09-15 18:14:38 -07:00
  • c482458cae Fix non-BMesh containing .blend import Jared Duke 2014-09-14 17:19:42 -07:00
  • ab6b5a7b21 Fix gcc warnings. (initialization order) Denis Biryukov 2014-09-15 23:35:03 +04:00
  • f2d26222fc Merge pull request #383 from jdduke/blender_fix_uv_conversion Alexander Gessler 2014-09-13 14:47:51 -07:00
  • 35c9a33718 Fix crash for Blender poly to face conversion without UVs Jared Duke 2014-09-13 09:34:07 -07:00
  • 875e65a86a Merge pull request #381 from jdduke/fix_bsp_null_check Alexander Gessler 2014-09-12 23:08:56 -07:00
  • 485aa8b39d Fix null check in Q3BSPFileImporter Jared Duke 2014-09-12 19:37:10 -07:00
  • db582ee024 bugfix: replace nullptr with NULL: Kim Kulling 2014-09-12 18:12:18 +02:00
  • 49c9786b0a update: avoid mesh generation on heap, when the mesh will be empty ( obj-loader ). Kim Kulling 2014-09-12 15:40:50 +02:00
  • 7dff0c6d52 refactoring: remove not use iosystem. Kim Kulling 2014-09-12 12:05:42 +02:00
  • 75d3c8e9f2 update: metric parsing ongoing. Kim Kulling 2014-09-12 12:00:03 +02:00
  • 2aba4a8d1d Merge pull request #378 from MGinshe/patch-1 Kim Kulling 2014-09-11 18:30:25 +02:00
  • af4c30bc77 small typo fix Ryan Cole 2014-09-12 01:48:41 +12:00
  • 0008f845b0 Merge pull request #376 from jdduke/make_fast_atof_test_cpp03 Jared Duke 2014-09-09 16:46:58 -07:00
  • 43c82b0b38 Remove std::isnan and std::isinf usage from utFastAtofTest Jared Duke 2014-09-09 16:34:10 -07:00
  • e0ea8169e3 Merge pull request #374 from jdduke/test_atof Kim Kulling 2014-09-09 10:04:41 +02:00
  • 0e28416104 Add tests for fast_atof Jared Duke 2014-09-08 17:30:21 -07:00
  • 302aec6be4 Merge pull request #372 from jdduke/gtest_pr_final Kim Kulling 2014-09-08 08:50:07 +02:00
  • 66e608a393 Replace cppunit with the googletest framework Jared Duke 2014-09-07 16:52:03 -07:00
  • a51a0b36f0 Merge pull request #361 from assimp/travis Alexander Gessler 2014-09-06 00:35:00 -07:00
  • c3b35f3933 update: add endline. Kim Kulling 2014-09-06 09:19:28 +02:00
  • 460566197b Travis: fix echo failing Alexander Gessler 2014-09-06 00:14:50 -07:00
  • 1249171bba Regression tests: output list of failures in Travis terminal output Alexander Gessler 2014-09-05 23:56:49 -07:00
  • 72eb2e0c4e Merge branch 'travis' of github.com:assimp/assimp into travis acgessler 2014-09-05 21:20:35 -07:00
  • 5a0c7058b5 regression tests: ignore pond.0.ply file due to overly long runtime. acgessler 2014-09-05 21:20:07 -07:00
  • fd84970596 Regression tests: run.py should not block on user input if used for CI. Alexander Gessler 2014-09-04 23:18:20 -07:00
  • 11dc89d455 Update .travis.yml Alexander Gessler 2014-09-04 23:06:47 -07:00
  • 19a50b9a9e Update .travis.yml Alexander Gessler 2014-09-04 22:56:08 -07:00
  • 9e24acb187 Try running regression tests from travis acgessler 2014-09-04 22:42:51 -07:00
  • 48b138d575 Add cmake install to travis build. acgessler 2014-09-04 22:42:00 -07:00
  • 1c27d3c565 Regression test suite: look for assimp_cmd binary in current folder first. acgessler 2014-09-04 21:04:39 -07:00
  • 185f01963f LWO: replace legacy reinterpret_cast based code by memcpy to solve Android SIGBUS problems due to unaligned accesses. Fixes #351 acgessler 2014-09-04 20:49:48 -07:00
  • 1a594b861a Collada: use a counter instead of clock() to generate unique names. Closes #357 acgessler 2014-09-04 18:50:37 -07:00
  • ed9a466c30 update: - add OpenGEX parser sceleton - add base datatypes for OpenGEX support. Kim Kulling 2014-09-04 19:41:14 +02:00
  • b1c80d8eb4 Merge pull request #359 from mikedh/master Kim Kulling 2014-09-04 11:29:04 +02:00
  • 8d27a27445 fixed docstrings Michael Dawson-Haggerty 2014-09-04 01:21:37 -04:00
  • 7fff52bf86 cleaned up error message autoreplacement Michael Dawson-Haggerty 2014-09-04 01:06:30 -04:00
  • 5ae65987c0 added the ability to load from file objects with pyassimp.load, as opposed to only being able to load from paths Michael Dawson-Haggerty 2014-09-04 01:04:00 -04:00
  • 7fdcb25516 Merge pull request #355 from VirusFree/master Alexander Gessler 2014-09-01 10:19:20 -07:00
  • 8bf26065de [FBX] parse upper cased Int/Enum properties George Papadopoulos 2014-09-01 19:06:59 +03:00
  • 55a8e59f0d Merge pull request #352 from apetrone/blender_uv_fix Kim Kulling 2014-08-30 10:49:14 +02:00
  • 625d2b7c4a Fix #325; Blender UV unwrap issue Adam Petrone 2014-08-30 00:39:03 -04:00
  • 201807f733 Merge pull request #350 from Gargaj/ambientlight Alexander Gessler 2014-08-28 09:20:04 -07:00
  • 258afb3e43 Merge pull request #349 from Gargaj/assxml-export Kim Kulling 2014-08-28 16:41:49 +02:00
  • ae7aba3647 + comment Gargaj 2014-08-28 16:34:39 +02:00
  • d333e08343 add ambient light type, allow collada to load it Gargaj 2014-08-28 16:27:29 +02:00
  • e2401c8b58 fix va_end call Gargaj 2014-08-28 15:51:01 +02:00
  • 6f828087f9 add stdarg.h Gargaj 2014-08-28 15:45:48 +02:00
  • 19de24a442 ...and some more assbin leftovers Gargaj 2014-08-28 15:42:22 +02:00
  • 8f0208e5a8 whoops, still some residue from ASSBIN Gargaj 2014-08-28 15:41:17 +02:00
  • c47dc2802e convert assxml exporter Gargaj 2014-08-28 15:38:57 +02:00
  • 2e9195819a start assxml exporter basics Gargaj 2014-08-28 15:17:53 +02:00
  • 7f45f5fc95 bugfix: fix license. Kim Kulling 2014-08-27 23:01:35 +02:00
  • 8126dce94d update: add sceleton for OpenGEX importer. Kim Kulling 2014-08-27 23:00:19 +02:00
  • dbf001b81c Merge pull request #347 from vloppin/master Alexander Gessler 2014-08-27 01:33:32 -07:00
  • 9d04a45088 Collada : Add missing parsing <image> into <effect><profile> markup unknown 2014-08-27 10:15:13 +02:00
  • 5a6bcf7882 Merge pull request #344 from assimp/collada_export_escape Alexander Gessler 2014-08-26 20:58:34 -07:00
  • e2d9512275 Merge remote-tracking branch 'official/collada_export_escape' into contrib Léo Terziman 2014-08-25 10:51:50 +02:00
  • 33ffb0003e Collada Export: escape user-defined strings in XML output. acgessler 2014-08-23 15:42:47 -07:00
  • fddae20cb7 Merge pull request #338 from jdduke/fast_atof_fix_final Alexander Gessler 2014-08-20 19:29:44 -07:00
  • ed124ccbab Gracefully handle NaN/inf values in fast_atoreal_move Jared Duke 2014-08-20 18:37:00 -07:00
  • 7ff7b783ee Merge pull request #335 from abma/master Alexander Gessler 2014-08-17 17:49:21 -07:00
  • 6c5f9ecb06 fix most warnings with -pendantic abma 2014-08-18 02:09:06 +02:00
  • 6636e596ab Merge pull request #334 from jdduke/fbx_binary_fix Alexander Gessler 2014-08-17 17:01:10 -07:00
  • 81cfaccedb Merge pull request #333 from abma/master Alexander Gessler 2014-08-17 16:01:55 -07:00
  • 48a772b20b fix compiler warnings: - defined but not used - deprecated conversion from string constant to ‘char*’ abma 2014-08-18 00:46:21 +02:00
  • d795491c48 fix unittests on linux / enable on travis-ci abma 2014-08-18 00:34:45 +02:00
  • 1e97b00cd2 Merge pull request #332 from abma/master Alexander Gessler 2014-08-17 14:59:56 -07:00
  • b2643a3835 fix SimpleOpenGL linking (missing libm) abma 2014-08-17 23:49:36 +02:00
  • c7ab8383bd fix warning: abma 2014-08-17 23:39:49 +02:00
  • 56ddb4f4af fix some compile warnings: - passing NULL to non-pointer - unused vars - unused function - order of init - parentheses abma 2014-08-17 23:28:00 +02:00
  • aafc8d5f3f CMake: changed cached bools into "option" abma 2014-08-17 23:10:06 +02:00
  • 69810a2a07 Avoid raw reinterpret_casts in the FBX parser Jared Duke 2014-08-17 08:41:45 -07:00
  • 0ede630b10 bugfix: - fix unhandled exception with sample SimpleTexturedOpenGL #308 - remove commented code, which made no sense any more. Kim Kulling 2014-08-16 13:34:35 +02:00
  • d2e4dda393 update: add testcase for empty color. Kim Kulling 2014-08-16 11:54:04 +02:00