Commit Graph

  • a5667ada9c add ifc sample file to assimp. acgessler 2013-10-12 20:10:38 +02:00
  • 685612b9f4 - refactoring : remove not used mesh index from private method in obj-importer. - refactoring : remove commented code. Kim Kulling 2013-10-11 15:29:17 +02:00
  • 87a0e77032 Merge pull request #146 from calvindhsu/blender-texture-type Alexander Gessler 2013-10-09 03:28:17 -07:00
  • a9a881cde6 Blender: map texture influence to aiTextureType Calvin Hsu 2013-10-08 18:55:42 -07:00
  • 57c0671681 Update Readme.md Alexander Gessler 2013-10-09 02:46:40 +02:00
  • e3a5480811 bugfix: fix typo's in obj-doxygen documentation. Kim Kulling 2013-10-08 16:51:59 +02:00
  • e4fca83237 refactoring : remove dead code. Kim Kulling 2013-10-08 16:30:17 +02:00
  • a889c1575f Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2013-10-08 16:24:43 +02:00
  • 9e78823efb refactoring : remove dead code. Kim Kulling 2013-10-08 16:21:47 +02:00
  • 075bdb42d6 Merge pull request #145 from sherief/master Alexander Gessler 2013-10-07 16:47:33 -07:00
  • 5334020d17 Irrlicht shared code is now excluded only if both the Irrlicht and Irrlicht Mesh importers are excluded from the build. Sherief Farouk 2013-10-07 19:40:21 -04:00
  • cb65a97347 Irrlicht mesh loader is now predicated on the proper preprocessor define (ASSIMP_BUILD_NO_IRRMESH_IMPORTER) as opposed to a similarly named but wrong define (ASSIMP_BUILD_NO_IRR_IMPORTER). Sherief Farouk 2013-10-07 19:32:46 -04:00
  • 7a4edbd126 Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-06 22:30:41 +02:00
  • 56c4ee5525 Turn ASSIMP_BUILD_BOOST_WORKAROUND on by default, fixes #144 acgessler 2013-10-06 22:30:19 +02:00
  • ad0b214656 Exporter: do not make any assumptions on previously run PP steps if the scene is a copy. acgessler 2013-10-05 16:26:52 +02:00
  • 9d4f7c32e4 Scene: keep an internal flag whether the scene was copied using aiCopyScene() (and potentially modified by the user afterwards) acgessler 2013-10-05 16:26:16 +02:00
  • 3bee2818e4 Exporter: stop non intuitive automatic applying of "reverse" pp steps if user specifies no postprocessing steps. acgessler 2013-10-05 16:19:03 +02:00
  • faaea5224f Exporter: update documentation. acgessler 2013-10-05 16:18:36 +02:00
  • 7aa966e204 Obj: fix texture coordinate indexing bug, fixes #41 acgessler 2013-10-04 13:07:59 +02:00
  • 45178dc3af Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-03 17:10:38 +02:00
  • 9c3a0727c6 Material API: fix regression caused by previous commit 69e9e7c403 . Lots of importers use explicit template syntax for AddProperty(), changing to overloads now called the fallback template version. This caused material properties to be often registered as BINARY (instead of FLOAT, INT). acgessler 2013-10-03 17:10:01 +02:00
  • de1cfd0c8b Merge pull request #142 from jdduke/simple_textured_ogl Alexander Gessler 2013-10-03 07:45:22 -07:00
  • 4328636d14 Allow commandline-supplied model path for the SimpledTexturedOGL sample Jared Duke 2013-10-02 17:54:30 -07:00
  • 8581e2d98e Merge pull request #141 from calvindhsu/blender-light-camera Alexander Gessler 2013-10-02 17:22:07 -07:00
  • 2fb07823f1 Add basic light and camera support Calvin Hsu 2013-10-01 13:21:26 -07:00
  • c4ead93c34 Merge branch 'master' of github.com:assimp/assimp into blender-stackoverflow acgessler 2013-10-02 17:09:35 +02:00
  • fcedc7e8a6 FBX: make clear that we do not support 6.n file format, closes #93. acgessler 2013-10-02 17:09:10 +02:00
  • 7e16767229 Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-02 16:46:46 +02:00
  • c95697dd0e Exporter: if AI_SCENE_FLAGS_NON_VERBOSE_FORMAT is not set in input scenes, still check if the data is really in verbose format. This is a pure question of API usability and user surprise. acgessler 2013-10-02 16:46:31 +02:00
  • 5de7c6a34b Merge pull request #140 from assimp/blender-stackoverflow Alexander Gessler 2013-10-02 05:21:21 -07:00
  • 586753bc19 Merge branch 'master' of github.com:assimp/assimp into blender-stackoverflow acgessler 2013-10-02 14:16:51 +02:00
  • b70650e9a4 Blender: new DNA loading code generated by genblenddna.py script, now machine-generates the previously hand-written fix. acgessler 2013-10-02 14:16:09 +02:00
  • 00037e669c update genblenddna.py script to include workaround for reading blender Base list. acgessler 2013-10-02 14:15:14 +02:00
  • 20204b49c5 Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-02 14:08:10 +02:00
  • cf639edb44 ObjExporter: request smooth normals. acgessler 2013-10-02 14:07:02 +02:00
  • 3408a0a838 Blender: iterative loading code for the linked list of scene objects, fixes #28 but is preliminary as it touches code that is normally machine-generated. acgessler 2013-10-02 01:39:59 +02:00
  • fdbfa572ab Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-01 17:56:12 +02:00
  • 325ef632cf PlyExporter: fix export format for compatibility with Blender and MeshLab (and the PLY spec). Fixes #122 acgessler 2013-10-01 17:56:00 +02:00
  • 2abdf05a62 Merge pull request #136 from marshallExocortex/obj_exporter__unique_vector_export Alexander Gessler 2013-10-01 08:48:14 -07:00
  • c592154006 using a custom compare function instead of a global aiVector3t less than operator Marshall Hahn 2013-10-01 11:21:36 -04:00
  • ffcd000003 Merge pull request #138 from calvindhsu/master Alexander Gessler 2013-09-30 15:46:55 -07:00
  • 32a10ec0a0 obj: Add support for relative vertex indexing Calvin Hsu 2013-09-30 15:13:11 -07:00
  • c29109d1a4 obj: Fix tabs causing vertices to be skipped Calvin Hsu 2013-09-30 15:12:56 -07:00
  • b72b16c90b whitespace fix Marshall Hahn 2013-09-30 14:12:38 -04:00
  • 66fd9bb8a2 fixed bad merge Marshall Hahn 2013-09-30 14:11:37 -04:00
  • 8f34c24ae0 remove duplicate vectors when export obj format Marshall Hahn 2013-09-30 14:07:53 -04:00
  • e8a23ccec9 Merge branch 'master' of github.com:assimp/assimp acgessler 2013-09-29 21:56:52 +02:00
  • 5a0b40db92 ColladaExporter: fix assertion in ::isalnum() when a special character > 0x7f is present in material names. acgessler 2013-09-29 21:56:32 +02:00
  • d4ce9571b7 Merge pull request #106 from jdduke/stl_ascii_check Alexander Gessler 2013-09-26 07:07:48 -07:00
  • 6f4632e4d9 Allow spaces before the ascii STL header keyword Jared Duke 2013-09-25 13:25:02 -07:00
  • deeeaf5c05 Merge pull request #95 from jdduke/mac_viewer_fix Alexander Gessler 2013-09-21 12:42:20 -07:00
  • 90179ec6e3 Enable SimpleAssimpViewX compilation on OSX Jared Duke 2013-09-21 10:59:13 -07:00
  • 6d8ccd5882 Merge branch 'master' of github.com:assimp/assimp into fixes Alexander Gessler 2013-09-18 19:34:28 +02:00
  • e80886f12c Obj: support line continuations with \ (fixes #91) Alexander Gessler 2013-09-18 19:34:03 +02:00
  • 0f5272cb50 Obj: set aiMesh::mPrimitiveTypes Alexander Gessler 2013-09-18 18:35:41 +02:00
  • 1b7ba63953 Merge pull request #90 from assimp/material-overloads Alexander Gessler 2013-09-18 06:57:45 -07:00
  • 69e9e7c403 aiMaterial: use overloads instead of template specializations. This fixes multiple instances of int material properties being accidentally registered as BINARY because the given type was unsigned int. Alexander Gessler 2013-09-18 15:17:04 +02:00
  • 69acdabdef CMake: make assimp_view/assimp_cmd's file copying DEPEND on assimp. Alexander Gessler 2013-09-18 14:42:42 +02:00
  • de03173e6d CMake: simplify. Alexander Gessler 2013-09-18 14:37:49 +02:00
  • 2580d279e8 Merge branch 'master' of github.com:assimp/assimp into fixes Alexander Gessler 2013-09-18 14:28:40 +02:00
  • d56ff34616 Merge pull request #89 from assimp/cmake-fixes Alexander Gessler 2013-09-18 05:28:23 -07:00
  • ab2e81d004 LWO: take last CLIP with the requested index (CLIPs ordered by ordinal string) Alexander Gessler 2013-09-18 14:27:56 +02:00
  • e9ffabbfee LWO: ignore chunks of length zero. Alexander Gessler 2013-09-18 14:27:24 +02:00
  • f8f7e2468c CMake: use copy_if_different instead of copy and only run PRE_BUILD on Windows as it is not required on *nix anyway. Alexander Gessler 2013-09-18 14:10:26 +02:00
  • 995978b163 CMake for assimp_cmd: also copy over assimp output binary as PRE_BUILD event. Alexander Gessler 2013-09-18 13:55:02 +02:00
  • d45689a2c1 CMake for assimp_view: copy dlls from assimp build over to output folder. Alexander Gessler 2013-09-18 13:52:49 +02:00
  • 45572e8079 Merge branch 'master' of github.com:assimp/assimp Alexander Gessler 2013-09-04 21:52:17 +02:00
  • fd0b3490d1 Clarify exporter doc: how to get a modifiable copy of a previously imported scene. Alexander Gessler 2013-09-02 21:33:43 +02:00
  • 0edb78d940 Add aiFreeScene() API for symmetry with aiCopyScene. Alexander Gessler 2013-09-02 21:32:20 +02:00
  • 0cef55263e Merge pull request #83 from abma/master Alexander Gessler 2013-08-28 22:43:19 -07:00
  • 169e5b9f35 fix error "Chunk is too large" with gcc >=4.7.0 / mingw64 abma 2013-08-29 06:31:10 +02:00
  • 27727f692b add missing <sstream> header to lexical_cast replacement Alexander C. Gessler 2013-08-27 20:17:30 +00:00
  • f25b84c9a5 Update Readme.md Alexander Gessler 2013-08-21 12:23:52 +02:00
  • 8dc1043169 Merge pull request #81 from jdduke/android_fix Alexander Gessler 2013-08-21 03:12:12 -07:00
  • 9f2336e5d4 Fix Android compilation with STLport Jared Duke 2013-08-20 20:02:07 -07:00
  • 7496e5ce55 Merge pull request #79 from jdduke/stl_binary_check Kim Kulling 2013-08-17 00:33:41 -07:00
  • 7db5dcb357 Improve STL representation detection Jared Duke 2013-08-16 18:10:19 -07:00
  • 6eaff77a7c bugfix : fix pedantic vs2012 warnings. Kim Kulling 2013-08-15 20:57:54 +02:00
  • 85db7d234e Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2013-08-15 20:52:04 +02:00
  • d62c929b7a bugfix : fix compiler warning. Kim Kulling 2013-08-15 20:51:34 +02:00
  • 9fc1a96494 Merge pull request #78 from sherief/master Kim Kulling 2013-08-15 00:59:43 -07:00
  • c59a67ba28 Merge branch 'master' of https://github.com/assimp/assimp Sherief Farouk 2013-08-15 00:21:44 -04:00
  • d23430c4bd Collada mesh name is copied from id only if there was no name attribute in the <geometry> node. Sherief Farouk 2013-08-15 00:21:00 -04:00
  • 57e34cc90a Added loading of mesh name from Collada mesh to aiMesh struct. Sherief Farouk 2013-08-15 00:14:19 -04:00
  • a540c6255c Added parsing of Collada mesh names. Sherief Farouk 2013-08-15 00:12:58 -04:00
  • a6ddce7758 Added name member to Collada::Mesh. Sherief Farouk 2013-08-15 00:11:23 -04:00
  • 1c7cad00ce update : add initial code convention file. Kim Kulling 2013-08-13 23:37:08 +02:00
  • 36a899abcf Merge pull request #70 from YoheiKakiuchi/master Alexander Gessler 2013-08-12 16:40:27 -07:00
  • 9e4776abf7 Merge pull request #76 from assimp/fixes Alexander Gessler 2013-08-12 16:36:14 -07:00
  • 48b47464fd Merge branch 'master' of github.com:assimp/assimp Alexander Gessler 2013-08-12 23:43:01 +02:00
  • fe248c89ec Exporter.hpp: predeclare IOSystem Alexander Gessler 2013-08-12 23:42:46 +02:00
  • a2fb2dfb28 Exporter: if the scene data was converted to verbose format to meet the requirements of a preprocessing step, we should un-verbosify it again before the actual exporter is run. Alexander Gessler 2013-08-12 23:42:30 +02:00
  • 9b591fadb8 Fixes for uninitialized variable warnings. Sherief Farouk 2013-08-09 19:52:15 -04:00
  • a90e208e6d Fixed parameter type mismatch in StreamReader. Sherief Farouk 2013-08-09 19:10:56 -04:00
  • 60a65aaaeb add AI_SWAP4 for big endian architecture YoheiKakiuchi 2013-08-09 17:54:28 +09:00
  • c8428fa67a Added value range assertions to prevent static analysis false-positives on Clang. Sherief Farouk 2013-08-07 18:43:29 -04:00
  • e9b1754306 Merge pull request #73 from paroj/master Kim Kulling 2013-08-07 09:17:04 -07:00
  • 8d80f56396 fix include/ define in PostStepRegistry Pavel Rojtberg 2013-08-07 14:59:16 +02:00
  • bebe13e103 Merge pull request #72 from paroj/master Alexander Gessler 2013-08-07 05:44:28 -07:00
  • 6920c433fd add missing include to fast_atof.h Pavel Rojtberg 2013-08-07 14:29:17 +02:00