Commit Graph

  • acca16c82f Merge pull request #196 from AIM360/UpdatedCodeComments Alexander Gessler 2013-11-26 06:04:54 -0800
  • 5983300422 Updated some code comments in DefaultIOStream.cpp henrikbuchholz 2013-11-26 14:52:53 +0100
  • a4e0f794e7 Merge 8ee54741e1 into d6a3df0acf henrikbuchholz 2013-11-26 00:44:11 -0800
  • d6a3df0acf Merge pull request #192 from AIM360/FaultToleranceFor3DSLoader Alexander Gessler 2013-11-25 09:46:00 -0800
  • f7e1502dd8 Merge pull request #189 from AIM360/FixForDegeneratedObjFiles Kim Kulling 2013-11-25 04:59:05 -0800
  • 8ee54741e1 DefaultIOStream::FileSize(): Replaced windows-based version to use mFile directly instead of fileStat henrikbuchholz 2013-08-14 16:08:09 +0200
  • 21670581a5 Incrased PATHLIMIT value for Windows platforms in order to support extended paths henrikbuchholz 2013-08-15 17:07:12 +0200
  • 82fb8c9ef2 Made open method work for UTF8 paths on windows henrikbuchholz 2013-08-15 15:40:09 +0200
  • 5ad3ab88e3 Added UTF8-support on windows for DefaultIOSystem::Exists() method henrikbuchholz 2013-08-14 15:56:21 +0200
  • 534f3e9bc0 ColladaLoader: Added unit conversion to meters henrikbuchholz 2013-08-14 15:54:21 +0200
  • 35fa7cb441 3DSLoader: Skipped chunks of size 0 henrikbuchholz 2013-08-14 15:53:33 +0200
  • bcc4373b50 Merge c6a3623d16 into cc3f8b82f9 henrikbuchholz 2013-11-25 02:38:52 -0800
  • c6a3623d16 Made open method work for UTF8 paths on windows henrikbuchholz 2013-08-15 15:40:09 +0200
  • a385629392 Added VC11 sln/projects + added some missing configs henrikbuchholz 2013-11-25 11:22:31 +0100
  • d7dbdd6c3b SortByPType Posprocessing crashed for crappy models with degenerated geometry henrikbuchholz 2013-08-15 16:38:28 +0200
  • cc3f8b82f9 Merge pull request #187 from assimp/blender-26-poly Alexander Gessler 2013-11-22 11:09:53 -0800
  • d080f92241 BlenderTesselator: Fix OffsetOf() macro acgessler 2013-11-22 19:54:47 +0100
  • 857e50ba40 BlenderTesselator: disable GLU tesselation code by default. acgessler 2013-11-22 13:58:40 +0100
  • fbb1a79248 Update CMakeLists acgessler 2013-11-22 13:57:50 +0100
  • 01a6ec9059 Adding tessellation support for new Blender 2.6 polygons Alice 2013-10-27 14:56:01 +0000
  • 896d1b3f7e Merge pull request #185 from adrianbroher/master Kim Kulling 2013-11-20 06:49:41 -0800
  • 6b5b3c64e6 Removed invalid extern keyword. Marcel Metz 2012-03-12 16:06:00 +0100
  • c4d797ef58 Replaced function parameters with correct literals. Marcel Metz 2012-03-12 16:04:56 +0100
  • 8d0b76a535 Added parenthesis for explicit operator evaluation priority. Marcel Metz 2012-03-12 16:04:08 +0100
  • 9e579324d0 Added conditions for compiler oder build mode dependend code. Marcel Metz 2012-03-12 15:53:28 +0100
  • c3852c4743 Removed noops and warnings on unused variables. Marcel Metz 2013-11-20 14:42:18 +0100
  • c6297ec333 Fixed variable assignment values. Marcel Metz 2012-03-12 15:50:49 +0100
  • 846a8959f8 Fixed class attribute initialization order. Marcel Metz 2012-03-12 15:49:11 +0100
  • c1b28ff1ce Removed unreferenced variables. Marcel Metz 2012-03-12 15:47:48 +0100
  • 07ab616644 Fixed building simple opengl texture example with mingw. Marcel Metz 2012-03-11 22:08:47 +0100
  • 93fd1133ff Fixed mingw cross compiler issues. Marcel Metz 2013-11-20 14:40:20 +0100
  • e7dbadf3dd Merge pull request #182 from mikedh/master Kim Kulling 2013-11-15 04:29:53 -0800
  • 156f7c1ded Merge pull request #183 from erich666/master Alexander Gessler 2013-11-14 10:24:32 -0800
  • f2997a562b typo fix: loose -> lose Eric Haines 2013-11-14 10:09:10 -0800
  • f1e43f560a added additional search paths for dll on windows Michael Dawson-Haggerty 2013-11-12 22:06:42 -0500
  • babc54478e Merge pull request #181 from inohiro/master Alexander Gessler 2013-11-12 17:30:33 -0800
  • 3a3ac4fea2 Fix to support FBX 2011 (7100) Hiroyuki Inoue 2013-11-12 23:25:40 +0900
  • 89fbda0957 bugfix : fix Issue #176 cmake variables are now using quotes. Kim Kulling 2013-11-09 21:17:12 +0100
  • 686ecf7d34 Merge pull request #175 from Eximius/master Alexander Gessler 2013-11-06 14:09:12 -0800
  • e0935c7ec5 PyAssimp optimize: load Armadillo: 33.8s -> 6.7s Eximius 2013-11-03 08:53:58 +0000
  • ca7542cf5d Merge pull request #172 from assimp/zip-cmake-fixes Alexander Gessler 2013-10-29 03:57:58 -0700
  • 639afc6f01 Apply patch from #168. Revert contrib/zlib/CMakeLists.txt hack from 561f3bc6ea, but leave all Zlib install stuff commented. Alexander Gessler 2013-10-28 23:15:48 +0100
  • 4167a68493 Merge pull request #171 from assimp/zip-cmake-fixes Alexander Gessler 2013-10-27 10:42:04 -0700
  • 561f3bc6ea Update CMakeLists.txt for zlib to build on MSVC again, closes #170. Alexander Gessler 2013-10-27 18:19:08 +0100
  • 1f01238426 Update Readme.md Alexander Gessler 2013-10-16 21:43:54 +0200
  • 1867a4a3a3 bugfix: add missing zconf file for cmake. Kim Kulling 2013-10-14 20:09:35 +0200
  • b96cd522fa bugfix : add cmakein file for zlib. Kim Kulling 2013-10-14 20:06:16 +0200
  • e88fcb27bf update: update zlib to version 1.2.8 ( see https://github.com/assimp/assimp/issues/134 ) Kim Kulling 2013-10-14 19:27:40 +0200
  • a5667ada9c add ifc sample file to assimp. acgessler 2013-10-12 20:10:38 +0200
  • 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 +0200
  • 87a0e77032 Merge pull request #146 from calvindhsu/blender-texture-type Alexander Gessler 2013-10-09 03:28:17 -0700
  • d5306458c2 Merge a9a881cde6 into 57c0671681 Calvin Hsu 2013-10-08 19:04:04 -0700
  • a9a881cde6 Blender: map texture influence to aiTextureType Calvin Hsu 2013-10-08 18:55:42 -0700
  • 57c0671681 Update Readme.md Alexander Gessler 2013-10-09 02:46:40 +0200
  • e3a5480811 bugfix: fix typo's in obj-doxygen documentation. Kim Kulling 2013-10-08 16:51:59 +0200
  • e4fca83237 refactoring : remove dead code. Kim Kulling 2013-10-08 16:30:17 +0200
  • a889c1575f Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2013-10-08 16:24:43 +0200
  • 9e78823efb refactoring : remove dead code. Kim Kulling 2013-10-08 16:21:47 +0200
  • 075bdb42d6 Merge pull request #145 from sherief/master Alexander Gessler 2013-10-07 16:47:33 -0700
  • bf00e2fefc Merge 5334020d17 into 7a4edbd126 sherief 2013-10-07 16:41:29 -0700
  • 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 -0400
  • 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 -0400
  • 7a4edbd126 Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-06 22:30:41 +0200
  • 56c4ee5525 Turn ASSIMP_BUILD_BOOST_WORKAROUND on by default, fixes #144 acgessler 2013-10-06 22:30:19 +0200
  • 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 +0200
  • 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 +0200
  • 3bee2818e4 Exporter: stop non intuitive automatic applying of "reverse" pp steps if user specifies no postprocessing steps. acgessler 2013-10-05 16:19:03 +0200
  • faaea5224f Exporter: update documentation. acgessler 2013-10-05 16:18:36 +0200
  • 7aa966e204 Obj: fix texture coordinate indexing bug, fixes #41 acgessler 2013-10-04 13:07:59 +0200
  • 45178dc3af Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-03 17:10:38 +0200
  • 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 +0200
  • de1cfd0c8b Merge pull request #142 from jdduke/simple_textured_ogl Alexander Gessler 2013-10-03 07:45:22 -0700
  • 62af34fb0c Merge 4328636d14 into 8581e2d98e Jared Duke 2013-10-02 18:13:05 -0700
  • 4328636d14 Allow commandline-supplied model path for the SimpledTexturedOGL sample Jared Duke 2013-10-02 17:54:30 -0700
  • 8581e2d98e Merge pull request #141 from calvindhsu/blender-light-camera Alexander Gessler 2013-10-02 17:22:07 -0700
  • 72242286a3 Merge 2fb07823f1 into c4ead93c34 Calvin Hsu 2013-10-02 16:44:45 -0700
  • 2fb07823f1 Add basic light and camera support Calvin Hsu 2013-10-01 13:21:26 -0700
  • c4ead93c34 Merge branch 'master' of github.com:assimp/assimp into blender-stackoverflow acgessler 2013-10-02 17:09:35 +0200
  • fcedc7e8a6 FBX: make clear that we do not support 6.n file format, closes #93. acgessler 2013-10-02 17:09:10 +0200
  • 7e16767229 Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-02 16:46:46 +0200
  • 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 +0200
  • 5de7c6a34b Merge pull request #140 from assimp/blender-stackoverflow Alexander Gessler 2013-10-02 05:21:21 -0700
  • 33fdd65da7 Merge 586753bc19 into 20204b49c5 Alexander Gessler 2013-10-02 05:17:02 -0700
  • 586753bc19 Merge branch 'master' of github.com:assimp/assimp into blender-stackoverflow acgessler 2013-10-02 14:16:51 +0200
  • 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 +0200
  • 00037e669c update genblenddna.py script to include workaround for reading blender Base list. acgessler 2013-10-02 14:15:14 +0200
  • 20204b49c5 Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-02 14:08:10 +0200
  • cf639edb44 ObjExporter: request smooth normals. acgessler 2013-10-02 14:07:02 +0200
  • 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 +0200
  • fdbfa572ab Merge branch 'master' of github.com:assimp/assimp acgessler 2013-10-01 17:56:12 +0200
  • 325ef632cf PlyExporter: fix export format for compatibility with Blender and MeshLab (and the PLY spec). Fixes #122 acgessler 2013-10-01 17:56:00 +0200
  • 2abdf05a62 Merge pull request #136 from marshallExocortex/obj_exporter__unique_vector_export Alexander Gessler 2013-10-01 08:48:14 -0700
  • 0949b93c2a Merge c592154006 into ffcd000003 Marshall 2013-10-01 08:21:41 -0700
  • c592154006 using a custom compare function instead of a global aiVector3t less than operator Marshall Hahn 2013-10-01 11:21:36 -0400
  • ffcd000003 Merge pull request #138 from calvindhsu/master Alexander Gessler 2013-09-30 15:46:55 -0700
  • 2480954a35 Merge 32a10ec0a0 into e8a23ccec9 Calvin Hsu 2013-09-30 15:27:00 -0700
  • 32a10ec0a0 obj: Add support for relative vertex indexing Calvin Hsu 2013-09-30 15:13:11 -0700
  • c29109d1a4 obj: Fix tabs causing vertices to be skipped Calvin Hsu 2013-09-30 15:12:56 -0700
  • b72b16c90b whitespace fix Marshall Hahn 2013-09-30 14:12:38 -0400
  • 66fd9bb8a2 fixed bad merge Marshall Hahn 2013-09-30 14:11:37 -0400