Commit Graph

  • 22a4215c06 OgreImporter: Remove unnecessary comments. Jonne Nauha 2014-05-02 01:54:42 +0300
  • dcf6002bed Try fix travis ci produced build errors on gcc and clang. Jonne Nauha 2014-05-02 01:38:13 +0300
  • 409c2cf332 OgreImporter: One more function cleanup. Jonne Nauha 2014-05-02 00:56:35 +0300
  • 283394d695 OgreImporter: Cleanup skeleton related code and code that populates the assimp scene. Tested skeleton/animation imports and it seems to work correctly now. Jonne Nauha 2014-05-02 00:19:57 +0300
  • f5c7b283bc OgreImporter: Cleanup and bugfixes to OgreSkeleton.cpp. This was actually so badly broken that it did nothing if the mesh referenced a binary skeleton. Now logs a warning for this case and tries to read from .skeleton.xml like the original author intended it to work. The assimp skeleton is still broken, I will fix that later on when I (eventually) get to that part of the code. Jonne Nauha 2014-05-01 18:51:26 +0300
  • 45715df263 OgreImporter: Forgot to rebuild after filename changes so broke the build. Fix includes, add include guards and ASSIMP_BUILD_NO_OGRE_IMPORTER to missing places. Jonne Nauha 2014-05-01 17:19:03 +0300
  • fcb97bb595 OgreImporter: Rename .hpp to .h. Shuffled parsing utils to a single file. Jonne Nauha 2014-05-01 16:49:26 +0300
  • 6ea07f39e1 OgreImporter: Rewrote documentation for AI_CONFIG_IMPORT_OGRE_MATERIAL_FILE and AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME to reflect the current logic. And to be honest the earlier one was very confusing english and was not very clear what is happening with these config options. Jonne Nauha 2014-05-01 16:35:34 +0300
  • f98584cdea OgreImporter: Remove unnecessary m_currentX state. Improve and clean OgreMaterial: split tech/pass/texture_unit to their own functions. Document missing features and potential bugs. Improve the original authors 'detection from texture filename' logic (enabled with AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME). Add generic detection from texture unit name, which is commonly used in Ogre materials. Jonne Nauha 2014-05-01 16:33:15 +0300
  • 6c51fa2072 OgreImporter: Continue cleanup. Jonne Nauha 2014-04-30 05:52:59 +0300
  • 09517b342b OgreImporter: Started cleanup and refactoring. Aim is to get this into a shape that its easy to read and understand before I start making any new features. Jonne Nauha 2014-04-30 05:43:13 +0300
  • 825a61fbc0 update: - update version info for 3.1 - aiGetVersionRevision will now return the git tag. Kim Kulling 2014-05-01 11:32:15 +0200
  • 8255d67a95 Merge pull request #265 from jonnenauha/vc9-fix Kim Kulling 2014-04-30 09:17:43 +0200
  • c329e81c94 Fix stdint.h include that broke the build for VC9 and below. Jonne Nauha 2014-04-30 05:58:19 +0300
  • d1886daf5a Merge branch 'master' of https://github.com/assimp/assimp Kim Kulling 2014-04-29 00:06:14 +0200
  • fbaf89492d bugfix: Obj-importer is now able to deal with 3d-texture coordinates. Kim Kulling 2014-04-29 00:04:54 +0200
  • 562dd01655 Merge pull request #261 from terziman/master Kim Kulling 2014-04-28 23:54:10 +0200
  • 2047cf6764 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-04-28 09:11:40 +0200
  • d49837819e bugfix: remove WIN32-lookup for boost setup because these features are platform independent. Kim Kulling 2014-04-26 09:59:27 +0200
  • f63cf6b5c8 Merge pull request #260 from xantares/master Kim Kulling 2014-04-23 18:07:43 +0200
  • d4f25c0096 Configure assimp-config.cmake.in after Boost is discovered as it requires the Boost version vars xantares 2014-04-23 14:12:10 +0200
  • b6bf29bdfa Merge pull request #259 from YoheiKakiuchi/fix_build_shread_lib Kim Kulling 2014-04-23 13:41:19 +0200
  • bd1d33e8e8 fix typo, BUILD_SHARED_LIBS YoheiKakiuchi 2014-04-23 19:14:38 +0900
  • 7ec690adfa Merge pull request #258 from g-pechorin/patch-1 Alexander Gessler 2014-04-22 13:27:33 -0400
  • 4d2c7f116d XML filename tweaks Peter LaValle 2014-04-22 16:33:11 +0100
  • 7c3a039349 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-04-22 14:32:59 +0200
  • 129e4318e6 Merge pull request #255 from xantares/master Kim Kulling 2014-04-22 08:49:59 +0200
  • b5eb13dd58 Merge pull request #257 from tszirr/dev Alexander Gessler 2014-04-22 01:40:50 -0400
  • 736d53d83e Merge 51cb2c042c into aae01c47ad tszirr 2014-04-21 21:43:53 +0000
  • ed0c48075f Merge branch 'master' into dev tszirr 2014-04-21 23:37:32 +0200
  • 51cb2c042c fix: want to add if NOT qnan tszirr 2014-04-21 23:20:34 +0200
  • 25c2dd58de fix: smoothed normal qnan handling & more stable smoothed normals for imprecise geometry w/ long thin faces tszirr 2014-04-21 23:12:51 +0200
  • 0a01da7242 fix: optimize meshes when vertex & primitive format final tszirr 2014-04-21 22:52:50 +0200
  • 8699021f17 fix: OptimizeMeshes w/o SplitLargeMeshes was disabled due to obscure max_verts = 0 assignment tszirr 2014-04-21 22:40:48 +0200
  • f48c8eccce Fix for issue #177 with mingw xantares 2014-04-21 21:58:29 +0200
  • 0e62405406 use standard BUILD_SHARED_LIB option. Install dll to <prefix>/bin (mingw) xantares 2014-04-21 21:36:33 +0200
  • aae01c47ad bugfix: fix compiler warnings for gcc-4.8.1. Kim Kulling 2014-04-21 16:18:14 +0200
  • a0ba3a8ade Merge pull request #253 from g-pechorin/master Release3.1_RC1 Kim Kulling 2014-04-15 19:34:31 +0200
  • 73e6908c36 fixed "<Colors ...> ... </Color>" typo Peter LaValle 2014-04-15 15:10:48 +0100
  • 85b756ad4d Merge pull request #251 from jmas-ogawa/pr-work Kim Kulling 2014-04-15 11:42:29 +0200
  • da1c9e8434 Fixed half-width from the full-width double quotes. jmas-ogawa 2014-04-14 23:04:36 +0900
  • a6044e125e Merge pull request #249 from attila-barsi/master Kim Kulling 2014-04-01 16:02:16 +0200
  • 4f36e85bd8 Added required changes to doc and protection from nullptr. attila-barsi 2014-03-31 10:30:04 +0200
  • 38de6a658d bugfix: - fix redundant checks against nullptr ( see https://github.com/assimp/assimp/issues/241 ). Kim Kulling 2014-03-27 20:33:08 +0100
  • f9d5852ef9 bugfix: - add global namespace statement to sqrt. Kim Kulling 2014-03-27 19:19:25 +0100
  • e97787aa5c Merge pull request #246 from DoubleLee/master Kim Kulling 2014-03-27 16:12:47 +0100
  • 2e3b602c0b Aspect Ratio fix, and comment about field of view. DoubleLee 2014-03-26 16:44:49 -0500
  • ed9204ab1b Initial version for FBX layered textures. Fixed assert during parsing UDP3DSMAX. attila-barsi 2014-03-24 11:46:36 +0100
  • ed586a35ae Fixed compilation error when using swig Léo Terziman 2014-03-24 11:24:27 +0100
  • 1f3be52079 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-03-24 10:44:57 +0100
  • 2dd6726c02 Changed order of some post processing steps in order to switch coordinate system as early as possible because pretransform now accept external matrices for the root transformation & this matrice should imperatively be in the same system coordinates as the rest of assimp structures Léo Terziman 2014-03-24 10:43:07 +0100
  • 7fc15c3713 Merge pull request #242 from Seed-Of-Hate/master Kim Kulling 2014-03-21 15:13:33 +0100
  • 050b38a69f Readme and cosmetics shaded enmity 2014-03-20 17:25:35 -0700
  • aa8bdba920 Merge branch 'master' of https://github.com/Seed-Of-Hate/assimp shaded enmity 2014-03-20 17:15:38 -0700
  • 73c482a293 iOS Path Update shaded enmity 2014-03-20 17:15:09 -0700
  • 81cc2c5de3 Update README.md Seed-Of-Hate 2014-03-20 17:11:46 -0700
  • dd6a624f15 iOS Toolchain Readme shaded enmity 2014-03-20 16:27:49 -0700
  • 2dc5a46e99 Zombie Removal shaded enmity 2014-03-20 16:25:07 -0700
  • 9f4623bec7 iOS Toolchain Update shaded enmity 2014-03-20 16:21:28 -0700
  • 358819c1a0 Fixed error in GetProperty when accessed from external libraries using a different language (using swig for example) Léo Terziman 2014-03-20 15:32:12 +0100
  • 331158e410 Merge pull request #237 from frederikaalund/master Alexander Gessler 2014-03-20 02:23:07 -0400
  • e9fa779a65 Fixed error when compiling with mingw Léo Terziman 2014-03-19 15:45:12 +0100
  • 82cc038a83 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-03-19 10:18:47 +0100
  • 897fcc7328 Merge pull request #239 from judithhartmann/master Kim Kulling 2014-03-17 13:39:22 +0100
  • 7d1a704ed7 saves value in the 'Ke'-Attribute in ObjMtl Files in COLOR_EMISSIVE Judith Hartmann 2014-03-16 21:30:10 +0100
  • 595529ef8b Refactored the metadata for inner consistency. Frederik Aalund 2014-03-15 08:37:45 +0100
  • 9b78a180d9 Added a convenience overload for aiMetadata::Get using std::string as key. Frederik Aalund 2014-03-14 17:12:22 +0100
  • 56f37a0465 Deprecated some abstraction and fixed a memory leak. Frederik Aalund 2014-03-14 15:36:12 +0100
  • fc39fe9f40 Fixed a compile error involving unnecessary enum resolution qualification. Frederik Aalund 2014-03-14 15:01:36 +0100
  • a8401ba377 Added support for heterogenous metadata on the aiNodes. Frederik Aalund 2014-03-14 14:17:34 +0100
  • 9af1dfd48d Merge pull request #231 from frederikaalund/master Alexander Gessler 2014-03-11 00:07:50 -0400
  • 5adb6c6cda Merge pull request #232 from autosquid/master Alexander Gessler 2014-03-11 00:01:43 -0400
  • fd4f7f4572 for python binding to work on mac autosquid 2014-03-11 00:34:49 +0800
  • 8fad549649 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-03-10 17:21:26 +0100
  • 77263c631f Fixed unzip support to use IOSystem/IOStream abstraction Léo Terziman 2014-03-10 17:21:17 +0100
  • 29e3b82238 Fixed some header files in CMakeLists Léo Terziman 2014-03-10 17:20:14 +0100
  • f65e5d5487 Fixed a compile error due to a >> expression in a nested template statement. Frederik Aalund 2014-03-09 17:04:27 +0100
  • 9eb8677aba Added unparsed FBX properties to the aiNode's metadata. This allows the user to extract extra/custom/user attributes/properties from the scene graph. E.g., extracting attributes set under "extra attributes" in Maya. Frederik Aalund 2014-03-09 16:18:05 +0100
  • 84b66092d7 Merge pull request #217 from lousyphreak/master Kim Kulling 2014-03-06 00:07:33 +0100
  • 34882177a9 bugfix: install_name should be set to absolute path to installed library in macosx build #226 Kim Kulling 2014-03-06 00:06:19 +0100
  • ec2b8dd3fa bugfix: add handling for special cases for the uv-calculation: - When 3 vector have same UV, using default UV direction: - When 2 vector have same UV, recalculate tangent/bitangent according to normal and bitangent/tangent. Kim Kulling 2014-03-05 23:25:49 +0100
  • 796e072898 Fixed warnings when using swig Léo Terziman 2014-03-03 15:36:32 +0100
  • 172c917c37 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-03-03 12:47:45 +0100
  • 5c95848f51 Merge pull request #224 from VirusFree/master Alexander Gessler 2014-03-02 10:41:28 -0500
  • 49e9ad9fa5 Merge pull request #228 from YoheiKakiuchi/fix_ply_bug Kim Kulling 2014-03-01 14:24:18 +0100
  • 08324b8095 fix miss commit at 8e35ea59d5 YoheiKakiuchi 2014-03-01 20:34:57 +0900
  • f54c85d4e6 Added custom root transformation for pre-transform vertices post-process step Léo Terziman 2014-02-28 15:32:43 +0100
  • 843e56c252 Added matrix properties Léo Terziman 2014-02-28 15:21:10 +0100
  • b90718bd21 Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-02-26 18:06:46 +0100
  • fd4cd67edb Merge pull request #218 from YoheiKakiuchi/fix-ply-parse Kim Kulling 2014-02-26 16:42:18 +0100
  • 2db48ef532 [FBX] Do not rename nodes if they are marked as null in fbx. Preserve this information in node metadata. George Papadopoulos 2014-02-23 12:27:34 +0200
  • de914d375f Merge pull request #223 from VirusFree/master Alexander Gessler 2014-02-22 16:40:38 -0500
  • 5ef8c09dbb Use AiNode's metadata to keep per-node(and per-instance) FBX (3dsmax) UserDefinedProperties George Papadopoulos 2014-02-22 13:06:34 +0200
  • 99e4176576 fix using flag YoheiKakiuchi 2014-02-18 02:14:07 +0900
  • b188ed2977 Merge pull request #221 from lbt/master Alexander Gessler 2014-02-18 00:34:21 -0500
  • 660d5c4e84 docs: clarify the use of Importer properties in post processing steps David Greaves 2014-02-17 22:28:59 +0000
  • b75f27492a Merge remote-tracking branch 'official/master' into contrib Léo Terziman 2014-02-17 08:49:43 +0100
  • c158638d67 Merge pull request #220 from VirusFree/master Alexander Gessler 2014-02-14 22:40:58 -0500
  • 02c4344d1d detect FBX glossiness map (ShininessExponent) George Papadopoulos 2014-02-14 15:12:28 +0200
  • 9b25749536 Fixed bug in merging of materials Léo Terziman 2014-02-10 15:11:13 +0100