311f5b47ca
Fixed bug during compilation with mingw & improved git revision support for automatic up to date revision number.
2014-05-19 14:36:24 +02:00
d531945888
Merge branch 'master' of github.com:assimp/assimp
2014-05-16 14:58:01 +02:00
908b945f50
BoostWorkaround/shared_array and shared_ptr: fix checks for whether the boost originals are included already. Fixes #277
2014-05-16 14:57:33 +02:00
0f71d46c35
Merge pull request #276 from g-pechorin/master
...
lt operator for aiVector3
2014-05-14 21:35:48 +02:00
057a7ffe60
added a lt operator to the inline
...
added a lt operator to the inline, so that I can use aiVectors as stl keys and such
2014-05-14 14:16:53 +01:00
09fffac068
added a lt operator to the header
...
added a lt operator to the header, so that I can use aiVectors as stl keys and such
2014-05-14 14:16:49 +01:00
08bacc73a6
update: add ply example for ply importer.
2014-05-13 14:14:53 +02:00
36c08a0a7d
Merge branch 'master' of https://github.com/assimp/assimp
2014-05-12 20:00:59 +02:00
52f3cd0afb
update: add static build to CI.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-12 20:00:29 +02:00
c5ba04cabf
Merge pull request #274 from JamesLupiani/BinaryXFileFix
...
Fixes #158 via anonymous user
2014-05-12 19:57:50 +02:00
427eaad642
Fixes #158 via anonymous user
2014-05-12 12:04:19 -05:00
04f0075b63
Change default extension for binary STL exports from stlb to stl
2014-05-12 12:50:21 +02:00
fb1c9ab86d
bugfix: fix cexport API for c compilers.
2014-05-11 16:50:35 +02:00
9245469fb8
bugfix: fix invalid include path in find assimp macro for cmake.
2014-05-11 14:01:30 +02:00
22d026ac40
update: add asset importer lib cmake find macro.
2014-05-11 13:56:38 +02:00
f6925db3d8
update: add cmake_mimimum_required statement to each cmake file
...
for consistency
2014-05-10 10:31:42 +02:00
d5d9e59949
Merge pull request #270 from jonnenauha/redundant-material-fix
...
RemoveRedundantMaterials: Fix crash bug when unreferenced materials are removed.
2014-05-09 18:36:39 +02:00
eea8099b05
RemoveRedundantMaterials: Fix crash bug when unreferenced materials were destroyed. The logic only rebuilt the material list if there were redundant materials being removed. This is a clear bug as it left freed aiMaterial ptrs into the list and did not fix the scene->numMaterials to be correct, even when deleting materials. This crashed later on in the ComputeUVMappingsProcess that accessed the freed ptr.
2014-05-09 01:33:30 +03:00
a5e179edf5
Merge pull request #267 from terziman/master
...
Fixed compilation errors on OgreImporter with Visual Studio 2012
2014-05-05 13:49:36 +02:00
f8b79acb36
Fixed compilation errors on OgreImporter with Visual Studio 2012
2014-05-05 10:25:04 +02:00
1ec72cdddb
Release candidate 2 : 3.1
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 19:17:51 +02:00
392730be07
bugfix: export processes for unittests.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 16:02:52 +02:00
8c8c5329e9
bugfix:
...
- fix c-api: insert a missing typedef for the metadata api enum.
- gix c-api: move cpp-include to cpp-part of the api.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 15:24:12 +02:00
14457d2be4
Merge branch 'master' of https://github.com/assimp/assimp
2014-05-04 15:22:16 +02:00
84491f22e2
update: enable tests as default because so it is much easier to run the unit tests after each bugfix.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 15:20:26 +02:00
7b38eed767
Merge pull request #266 from jonnenauha/ogre-enhancements
...
Ogre importer cleanup, improvements and bug fixes
2014-05-03 09:21:24 +02:00
9ad74e461e
OgreImporter: Added brackets for all conditional etc. statements, even when there is a single line as requested by @kimkulling. I'm still not sure about the coding convention but looked for guidance in the obj importer code. Now newline before { if only one line and no else/else if after it, othewise a newline before it.
2014-05-03 00:20:17 +03:00
22a4215c06
OgreImporter: Remove unnecessary comments.
2014-05-02 01:54:42 +03:00
dcf6002bed
Try fix travis ci produced build errors on gcc and clang.
2014-05-02 01:38:13 +03:00
409c2cf332
OgreImporter: One more function cleanup.
2014-05-02 00:56:35 +03:00
283394d695
OgreImporter: Cleanup skeleton related code and code that populates the assimp scene. Tested skeleton/animation imports and it seems to work correctly now.
2014-05-02 00:28:14 +03:00
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.
2014-05-02 00:28:13 +03:00
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.
2014-05-02 00:28:12 +03:00
fcb97bb595
OgreImporter: Rename .hpp to .h. Shuffled parsing utils to a single file.
2014-05-02 00:28:12 +03:00
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.
2014-05-02 00:28:11 +03:00
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.
2014-05-02 00:28:10 +03:00
6c51fa2072
OgreImporter: Continue cleanup.
2014-05-02 00:28:09 +03:00
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.
2014-05-02 00:28:09 +03:00
825a61fbc0
update:
...
- update version info for 3.1
- aiGetVersionRevision will now return the git tag.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-01 11:32:15 +02:00
8255d67a95
Merge pull request #265 from jonnenauha/vc9-fix
...
Fix stdint.h include that broke the build for VC9 and below.
2014-04-30 09:17:43 +02:00
c329e81c94
Fix stdint.h include that broke the build for VC9 and below.
2014-04-30 05:58:19 +03:00
d1886daf5a
Merge branch 'master' of https://github.com/assimp/assimp
2014-04-29 00:06:14 +02:00
fbaf89492d
bugfix: Obj-importer is now able to deal with 3d-texture coordinates.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-04-29 00:04:54 +02:00
562dd01655
Merge pull request #261 from terziman/master
...
Improvement of collada exporter & bug fixes
2014-04-28 23:54:10 +02:00
2047cf6764
Merge remote-tracking branch 'official/master' into contrib
2014-04-28 09:11:40 +02:00
d49837819e
bugfix: remove WIN32-lookup for boost setup because these features are platform independent.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-04-26 09:59:27 +02:00
f63cf6b5c8
Merge pull request #260 from xantares/master
...
Configure assimp-config.cmake.in after Boost is discovered
2014-04-23 18:07:43 +02:00
d4f25c0096
Configure assimp-config.cmake.in after Boost is discovered as it requires the Boost version vars
2014-04-23 14:12:10 +02:00
b6bf29bdfa
Merge pull request #259 from YoheiKakiuchi/fix_build_shread_lib
...
fix typo, BUILD_SHARED_LIBS
2014-04-23 13:41:19 +02:00
bd1d33e8e8
fix typo, BUILD_SHARED_LIBS
2014-04-23 19:14:38 +09:00
Léo Terziman
Alexander Gessler
Kim Kulling
Peter LaValle
Kim Kulling
James Lupiani
Jonne Nauha
xantares
YoheiKakiuchi