Commit Graph

  • c5d048a98a Fix crash when 3DS file contains faces but no vertices Turo Lamminen 2015-01-26 12:38:30 +02:00
  • f167fe1d4a Ignore unix editor backup files Turo Lamminen 2015-01-26 13:31:04 +02:00
  • 7d887204ac Merge pull request #449 from mikedh/master Kim Kulling 2015-01-28 09:07:15 +01:00
  • 25012f7b8a added list of supported formats, pulled from webpage and test/models Michael Dawson-Haggerty 2015-01-27 22:53:31 -05:00
  • 704e57db4e changed default postprocessing option to triangulate quad meshes Michael Dawson-Haggerty 2015-01-27 22:47:05 -05:00
  • a482bc59f4 Merge pull request #448 from assimp/revert-447-master Alexander Gessler 2015-01-26 19:54:18 +01:00
  • 8b55d276e9 Revert "Fix warnings under Visual Studio 12" Alexander Gessler 2015-01-26 19:54:02 +01:00
  • dee3a2c6d9 Merge pull request #447 from expipiplus1/master Alexander Gessler 2015-01-26 19:41:57 +01:00
  • 00d561982c Use size_t instead of int for number of points Joe Hermaszewski 2015-01-26 15:38:12 +00:00
  • 1cf81227c4 Simplify behavior of SweepContext::InitEdges Joe Hermaszewski 2015-01-26 15:35:38 +00:00
  • 1bdb31f8aa Fixed error of aiQuaterniont::Rotate() yeonseok-yi 2015-01-26 21:09:54 +09:00
  • a444bf48a1 Merge pull request #445 from turol/master Alexander Gessler 2015-01-25 21:46:26 +01:00
  • b97c26b1d2 Avoid division by zero in assimp_cmd info when scene loading succeeds but contains no meshes Turo Lamminen 2015-01-25 22:27:57 +02:00
  • cc346d3e12 Merge pull request #437 from CasperTech/master Alexander Gessler 2015-01-25 19:44:27 +01:00
  • f62d03bd03 Merge pull request #439 from expipiplus1/master Alexander Gessler 2015-01-25 19:41:46 +01:00
  • 707c65283d Merge pull request #444 from Einarin/master Alexander Gessler 2015-01-24 12:36:19 -08:00
  • 380021e7c4 Check that zlib initialized correctly in FBX parser Johnny Dickinson 2015-01-24 00:00:35 -05:00
  • a94e668486 Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX Ricardo Ortiz 2015-01-23 13:10:36 -05:00
  • e2a33e726d Add quotes to build type variable. Ricardo Ortiz 2015-01-23 10:10:51 -05:00
  • 1c60211a15 Merge pull request #436 from ricortiz/FixExportedLibraryNameVariable Alexander Gessler 2015-01-22 23:12:40 -08:00
  • 5f646f2097 Merge pull request #440 from expipiplus1/correct_include Alexander Gessler 2015-01-22 18:53:53 -08:00
  • 50dbb867ec Include stdint.h for uint64_t Joe Hermaszewski 2015-01-22 21:27:43 +00:00
  • 7494cb6e4b Use correct include file for INT_MAX Joe Hermaszewski 2015-01-22 20:19:34 +00:00
  • e8d4479344 Squash incorrect abs usage Joe Hermaszewski 2015-01-22 20:03:13 +00:00
  • a09de30d83 Add support for component controlled matrix transforms, i.e transform(0)(0) etc. Tom Mettam 2015-01-21 01:45:35 +00:00
  • 27f3771582 Set ASSIMP_LIBRARIES to the proper library name Ricardo Ortiz 2015-01-20 13:23:15 -05:00
  • 62225f61e4 Merge branch 'master' into opengex_support Kim Kulling 2015-01-13 20:21:17 +01:00
  • af48644e56 fix build. Kim Kulling 2015-01-03 01:09:33 +01:00
  • df4db6e6e2 using cmake 3.0 Kim Kulling 2015-01-02 20:34:37 +01:00
  • 6820f1a5c9 workaround for compiler bug with mingw ( too many sections ). Kim Kulling 2015-01-02 15:34:23 +01:00
  • 797c89c896 fix check for minimum version of cmake. Kim Kulling 2015-01-02 15:33:47 +01:00
  • 69dbf3713c fix typo Kim Kulling 2015-01-02 12:38:06 +01:00
  • 4ef88f82f0 Merge pull request #432 from madeso/master Alexander Gessler 2014-12-29 17:24:50 +01:00
  • 7c17c5f46b Also install zlibstatic Gustav 2014-12-29 16:30:44 +01:00
  • e6988f62f6 Fixed cmake 3x cmp0048 warning Gustav 2014-12-29 16:18:17 +01:00
  • 45988cd238 Merge pull request #1 from assimp/master Madrich 2014-12-29 16:01:18 +01:00
  • ce01b413b1 add build matrix to support win32-build via cross compiler for windows platform. Kim Kulling 2014-12-23 18:36:39 +01:00
  • b367d9b390 Fixed some warnings related to empty statement when using assert & building in release mode Léo Terziman 2014-12-18 11:01:16 +01:00
  • 469db95cd5 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-12-18 10:42:29 +01:00
  • 7a850a4131 Merge pull request #429 from abma/master Alexander Gessler 2014-12-17 01:02:35 +01:00
  • b1221ade64 fix some errors/warnings found by static code analyzer abma 2014-12-16 23:41:10 +01:00
  • 7694561121 remove dead code from main CMakeLists.txt. Kim Kulling 2014-12-16 22:34:24 +01:00
  • 3303f97f13 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-12-16 17:48:30 +01:00
  • b6cc8d6da9 Add link to AssimpPascal headers Alexander Gessler 2014-12-12 02:43:15 +01:00
  • 29c09b24e7 Merge pull request #421 from heandreas/master Alexander Gessler 2014-12-12 00:05:26 +01:00
  • ab7754ab2a Code style changes. Andreas Henne 2014-12-11 23:05:09 +01:00
  • 1e943d9fd4 Merge pull request #427 from sth519/patch-2 Alexander Gessler 2014-12-10 19:48:55 +01:00
  • da93f5eb78 Update README.md for the iOS port sth 2014-12-10 19:37:18 +01:00
  • 585e7c69fb Merge pull request #423 from enkore/master Alexander Gessler 2014-12-06 23:56:45 +01:00
  • fdf78fc13b README: Add a few lines on how to compile jassimp-native enkore 2014-12-06 15:53:56 +01:00
  • 6b4cbeea40 Fix outright compiler error in jassimp.cpp enkore 2014-12-06 15:52:44 +01:00
  • 6829af0dd6 Fix broken ant build enkore 2014-12-06 15:52:26 +01:00
  • 33f9745b62 Formatting changes. Andreas Henne 2014-12-05 19:40:09 +01:00
  • 4550279629 Added binary ply exporter. Andreas Henne 2014-12-05 17:25:18 +01:00
  • 06f80024cb Merge pull request #418 from xantares/patch-1 Kim Kulling 2014-12-04 17:20:38 +01:00
  • 6c7b623d1b add missing unittest, Kim Kulling 2014-12-03 21:23:27 +01:00
  • 96661ae4cd fix the build Kim Kulling 2014-12-02 08:51:20 +01:00
  • 15e0175007 fix compiler warning. Kim Kulling 2014-12-01 23:35:57 +01:00
  • 951431db94 add missing documentation. Kim Kulling 2014-12-01 21:27:48 +01:00
  • bc0fd00e96 Merge pull request #414 from l337r007/collada-tristrips Kim Kulling 2014-12-01 20:48:10 +01:00
  • 7a31a68cfc adapt c-api to get ImporterDesc for a given loader ( see https://github.com/assimp/assimp/issues/412 ). Kim Kulling 2014-12-01 20:34:15 +01:00
  • 926b7e98cc Tristripped version of cube.dae generated using openscenegraph. Wolfgang Herget 2014-12-01 18:08:21 +01:00
  • 1f13158b31 fix vs2013 compiler warnings and add missing doxygen tags. Kim Kulling 2014-11-29 12:12:32 +01:00
  • 098ddd3a95 make copy constructor and a assignment operator private to avoid misuse of helper class scope guard Kim Kulling 2014-11-29 11:56:39 +01:00
  • 26ac1e2c72 update gitignore file. Kim Kulling 2014-11-29 11:35:48 +01:00
  • 9f80a2a2a9 update parser. Kim Kulling 2014-11-29 11:33:49 +01:00
  • 005ddf9733 Merge pull request #419 from sth519/patch-1 Kim Kulling 2014-11-29 11:27:35 +01:00
  • 4050f42ef1 Default to latest installed iOS SDK by default sth519 2014-11-27 14:37:46 +01:00
  • d13b51b467 Update build.sh xantares 2014-11-27 09:27:46 +01:00
  • 5c6921e2ea remove useless ASSIMP_BUILD_STATIC_LIB option xantares 2014-11-27 08:58:29 +01:00
  • e707a07ff9 Merge pull request #416 from olitheolix/python3_quicktest Alexander Gessler 2014-11-23 09:56:29 +01:00
  • 1e9f3a802d PEP8 and updated docu strings. Oliver Nagy 2014-11-23 15:31:35 +11:00
  • 3721b19a61 pyassimp/quicktest now runs without installing pyassimp first. Oliver Nagy 2014-11-23 15:24:17 +11:00
  • fc039ee0e2 pyassimp/quicktest is now Python 3 compatible. Oliver Nagy 2014-11-23 15:23:31 +11:00
  • b450ecbed2 Merge pull request #415 from olitheolix/master Alexander Gessler 2014-11-22 13:25:08 +01:00
  • f12a0a3b1c Replaced 'xrange' by 'range' to maintain Python 3.x compatibility. Oliver Nagy 2014-11-22 16:24:32 +11:00
  • c08a5581dd ColladaParser::CopyVertex: don't make a local copy of the vertex' indices. Wolfgang Herget 2014-11-20 17:53:06 +01:00
  • 8dead93504 ColladaParser: don't arbitrarily limit number of per-vertex attributes. Wolfgang Herget 2014-11-20 16:42:41 +01:00
  • ca3ce4703d Rename ColladaParser::CopyPrimitive to ::CopyVertex. Wolfgang Herget 2014-11-20 13:12:09 +01:00
  • 13a157ea66 For Polylists, manually compute the start offset outside CopyPrimitive. Wolfgang Herget 2014-11-20 13:10:15 +01:00
  • e568c2df9d ColladaParser::ReadIndexData: don't rely on the specified number of primitives. Johannes Ebersold 2014-11-19 14:38:03 +01:00
  • 72f67ea0cd Whitespace changes Johannes Ebersold 2014-11-19 14:32:01 +01:00
  • 593484829b Add Function ColladaParser::ReadPrimTriStrips. Johannes Ebersold 2014-11-19 14:30:18 +01:00
  • 0f40dcca7e Add calculation for nuber of Primitives for TriStrips Johannes Ebersold 2014-11-19 14:26:54 +01:00
  • 7c4bf383d7 Move vertex copy operation into switch statement. Johannes Ebersold 2014-11-19 14:16:10 +01:00
  • 4ef244f672 Extract function ColladaParser::CopyPrimitive Johannes Ebersold 2014-11-19 14:10:16 +01:00
  • 70d2c8571b ColladaParser::ReadPrimitives: get rid of "idx" iterator. Johannes Ebersold 2014-11-19 14:04:49 +01:00
  • 543bd5c0d0 ColladaParser::ReadPrimitives: rename "a" to currentPrimitive Johannes Ebersold 2014-11-19 13:51:22 +01:00
  • 7be4badd76 Merge pull request #413 from jdduke/fix_ns_obj_material Kim Kulling 2014-11-19 10:23:20 +01:00
  • c7b6b5ea2f Support lowercase 'ns' and 'ni' obj material tokens Jared Duke 2014-11-18 16:56:46 -08:00
  • dbf9536213 bugfix: add correct handling for metric line end for example file. Kim Kulling 2014-11-02 20:30:45 +01:00
  • 1a5695ff48 update: add parsing of metric nodes. Kim Kulling 2014-11-02 19:01:04 +01:00
  • 6843c42da1 update: - merge master into branch - fix metrix header parsing. Kim Kulling 2014-10-28 21:45:09 +01:00
  • f84589fec4 Merge branch 'master' into opengex_support Kim Kulling 2014-10-24 15:24:32 +02:00
  • 94f61300c2 bugfix: - remove and comment some gcc compiler warnings for not used vaiables. Kim Kulling 2014-10-23 21:02:43 +02:00
  • cee583db06 bugfix: fix compiler warning: converting double to float. Kim Kulling 2014-10-22 23:05:25 +02:00
  • 43dbd6d873 update: add some files to .gitignore. Kim Kulling 2014-10-22 21:37:25 +02:00
  • 2d7ce22569 Merge pull request #405 from TimothyGu/patch-1 Alexander Gessler 2014-10-15 00:52:55 -07:00
  • 8656a35134 assimp.pc.in: Add static libs to Libs.private Timothy Gu 2014-10-14 22:29:08 -07:00
  • 060f3c33d9 CMakeList: Support setting Libs.private Timothy Gu 2014-10-14 22:28:14 -07:00