7bc074857e
Missing material functions for aiUVTransform added
2014-01-17 11:51:43 +01:00
d080eb493e
Merge commit 'acca16c82fb9fa37c40475a423e979e9c7aa0d5a' into contrib
2014-01-17 11:49:30 +01:00
bac6b34504
Removing null characters from xml parser input to avoid parsing failures
2014-01-17 11:48:42 +01:00
e2676ec176
Implementing UTF8 to ISO-8859-1 conversion to improve chances of finding files in zip archives
2014-01-17 11:48:27 +01:00
0bf4aea9d5
Improved fast_atof (bis)
2014-01-17 11:47:37 +01:00
3e55dca943
Improved fast_atof
2014-01-17 11:46:44 +01:00
d28fc25c5c
Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib
...
Conflicts:
CMakeLists.txt
2014-01-17 11:45:57 +01:00
4e7b59be55
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
29c125e51d
Minor improvement of ParsingUtils
2014-01-17 11:42:51 +01:00
44f1a1fb5d
Huge optimization of Q3BSPZipArchive to reduce 3DXML importing time by a factor of 15~20. (However, the zip archive is now entirely decompressed in memory, so it takes twice as much memory)
2014-01-17 11:41:46 +01:00
203e896dbc
Updated .gitignore
2014-01-17 11:40:34 +01:00
cf817270fc
Reformating Q3BSPZipArchive
2014-01-17 11:39:51 +01:00
cafa3d5811
Merge commit '89fbda0957ddc842d27a3a610c10bf2fe840a64f' into contrib
2014-01-17 11:38:16 +01:00
bb9288fa26
Improved Q3BSPZipArchive + added material merging
2014-01-17 11:38:01 +01:00
51bf836db4
Fixed bugs in Q3BSPZipArchive & DefaultLogger
2014-01-17 11:36:47 +01:00
053df6907a
Removed precompiled header because of a bug when switching configuration in visual studio
2014-01-17 11:35:30 +01:00
ff5df971cb
Fixing compiler flags for mingw
2014-01-17 11:33:20 +01:00
2c4e55ac61
Fixed gcc /mingw building
2014-01-17 11:31:39 +01:00
f5e3382d58
Correct some warnings when building with mingw
2014-01-17 11:30:51 +01:00
2071b4fb2f
Merge commit 'ca7542cf5d11ccde33e18365889343088bad9582' into contrib
...
Conflicts:
CMakeLists.txt
contrib/zlib/CMakeLists.txt
contrib/zlib/zconf.h.included
2014-01-17 11:30:33 +01:00
bc40ebd730
Improved color comparison
2014-01-17 11:28:06 +01:00
647eab6ae9
Improving CMake to build the static version of assimp with the static version of zlib
2014-01-17 11:25:39 +01:00
e4867646ab
Small corrections for the upgrading of zlib
2014-01-17 11:25:22 +01:00
2cca861526
Merge commit '1f012384265e0dcc777e23369470391324d840e5' into contrib
2014-01-17 11:25:01 +01:00
bfd3a206ea
Improved CMakeLists.txt source groups
2014-01-17 11:24:16 +01:00
8ba5fa33af
Improving ColladaExporter to support scenes with only one node
2014-01-17 11:21:32 +01:00
365b3aa412
Improved math operation with epsilon support
2014-01-17 11:21:15 +01:00
6c0ebb679a
Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib
...
Conflicts:
code/ColladaExporter.cpp
2014-01-17 11:19:29 +01:00
a940102d70
Debugging ColladaExporter function for writing header information
2014-01-17 10:38:59 +01:00
3317f667e5
Improving ColladaExporter to add shading model, bump mapping, transparent & refraction properties
2014-01-17 10:38:42 +01:00
78389e2e86
Improved collada exporter
2014-01-17 10:38:17 +01:00
9120689f0d
Improving ColladaExporter to play nice with models imported from any format.
2014-01-17 10:36:18 +01:00
b4b39e026d
Improving ColladaExporter to allow non-destructive cycles of import/export
2014-01-17 10:36:01 +01:00
bbfd56046b
Fixed constructor of aiMesh for improved lisibility
2014-01-17 10:33:54 +01:00
30c6a74e1d
Improving constructors of aiNode & aiScene
2014-01-17 10:31:27 +01:00
6b471317d2
Adding support for matrix4x4 construction from position, rotation and scaling parameters
2014-01-17 10:27:11 +01:00
5e603d9ed8
Correcting a bug where the constructor & destructor of aiScene were not exported correctly in the assim library
2014-01-17 10:26:48 +01:00
df700b998f
Another small bug correction in Q3BSPZipArchive
2014-01-17 10:24:14 +01:00
2ef0f0f0e1
Correcting some bugs in Q3BSPZipArchive
2014-01-17 10:23:49 +01:00
c0871b35c0
Merge pull request #211 from VirusFree/master
...
Fix for FBX pivot transformation.
2013-12-29 11:26:34 -08:00
2d709dd638
Fix for FBX pivot transformation.
...
Parse and use the GeometricScaling,GeometricRotation and GeometricTranslation model properties in node transformation
2013-12-29 21:02:16 +02:00
3086569e36
Merge pull request #210 from VirusFree/master
...
fix for collada parser when importing empty arrays.
2013-12-20 05:04:14 -08:00
284abbe9e1
fix for collada parser when importing empty arrays.
...
Exiting function so early break the parsing procedure, misses node closing and causes improper initialization of element (cannot be referenced later on)
2013-12-20 11:36:35 +02:00
6d630bec50
Merge pull request #208 from NickNick/master
...
Add support for emissive and gloss-maps
2013-12-18 06:53:36 -08:00
5b076fe234
Fixes warnings in clang for unrecognized attribute 'gcc_struct'
2013-12-14 01:40:37 +01:00
f433746bfa
Add support for emissive and gloss-maps
...
Conflicts:
code/ObjFileMtlImporter.cpp
Someone added support for loading more bump maps, I added support for emmissive-maps. Easy merge.
2013-12-14 01:40:37 +01:00
9186911da0
Fix build exclude define in BlenderScene.cpp, fixes #205
2013-12-11 17:44:46 +01:00
b87a3b33dd
Update Readme.md
2013-12-05 22:53:14 +01:00
44773b8f9e
Merge pull request #204 from zhgw01/zhgw01/FixObjTextureUrl
...
Fix Issue #201 : When Obj texture map statement contains texture option, assimp will fail to import texture
2013-12-02 10:52:21 -08:00
0b88f72be2
refactor the code, also parse texture option explictly
2013-12-02 22:58:15 +08:00
Léo Terziman
Alexander Gessler
George Papadopoulos
Kim Kulling
Nick Overdijk
gongwei