Léo Terziman
29c125e51d
Minor improvement of ParsingUtils
2014-01-17 11:42:51 +01:00
Léo Terziman
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
Léo Terziman
203e896dbc
Updated .gitignore
2014-01-17 11:40:34 +01:00
Léo Terziman
cf817270fc
Reformating Q3BSPZipArchive
2014-01-17 11:39:51 +01:00
Léo Terziman
cafa3d5811
Merge commit '89fbda0957ddc842d27a3a610c10bf2fe840a64f' into contrib
2014-01-17 11:38:16 +01:00
Léo Terziman
bb9288fa26
Improved Q3BSPZipArchive + added material merging
2014-01-17 11:38:01 +01:00
Léo Terziman
51bf836db4
Fixed bugs in Q3BSPZipArchive & DefaultLogger
2014-01-17 11:36:47 +01:00
Léo Terziman
053df6907a
Removed precompiled header because of a bug when switching configuration in visual studio
2014-01-17 11:35:30 +01:00
Léo Terziman
ff5df971cb
Fixing compiler flags for mingw
2014-01-17 11:33:20 +01:00
Léo Terziman
2c4e55ac61
Fixed gcc /mingw building
2014-01-17 11:31:39 +01:00
Léo Terziman
f5e3382d58
Correct some warnings when building with mingw
2014-01-17 11:30:51 +01:00
Léo Terziman
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
Léo Terziman
bc40ebd730
Improved color comparison
2014-01-17 11:28:06 +01:00
Léo Terziman
647eab6ae9
Improving CMake to build the static version of assimp with the static version of zlib
2014-01-17 11:25:39 +01:00
Léo Terziman
e4867646ab
Small corrections for the upgrading of zlib
2014-01-17 11:25:22 +01:00
Léo Terziman
2cca861526
Merge commit '1f012384265e0dcc777e23369470391324d840e5' into contrib
2014-01-17 11:25:01 +01:00
Léo Terziman
bfd3a206ea
Improved CMakeLists.txt source groups
2014-01-17 11:24:16 +01:00
Léo Terziman
8ba5fa33af
Improving ColladaExporter to support scenes with only one node
2014-01-17 11:21:32 +01:00
Léo Terziman
365b3aa412
Improved math operation with epsilon support
2014-01-17 11:21:15 +01:00
Léo Terziman
6c0ebb679a
Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib
...
Conflicts:
code/ColladaExporter.cpp
2014-01-17 11:19:29 +01:00
Léo Terziman
a940102d70
Debugging ColladaExporter function for writing header information
2014-01-17 10:38:59 +01:00
Léo Terziman
3317f667e5
Improving ColladaExporter to add shading model, bump mapping, transparent & refraction properties
2014-01-17 10:38:42 +01:00
Léo Terziman
78389e2e86
Improved collada exporter
2014-01-17 10:38:17 +01:00
Léo Terziman
9120689f0d
Improving ColladaExporter to play nice with models imported from any format.
2014-01-17 10:36:18 +01:00
Léo Terziman
b4b39e026d
Improving ColladaExporter to allow non-destructive cycles of import/export
2014-01-17 10:36:01 +01:00
Léo Terziman
bbfd56046b
Fixed constructor of aiMesh for improved lisibility
2014-01-17 10:33:54 +01:00
Léo Terziman
30c6a74e1d
Improving constructors of aiNode & aiScene
2014-01-17 10:31:27 +01:00
Léo Terziman
6b471317d2
Adding support for matrix4x4 construction from position, rotation and scaling parameters
2014-01-17 10:27:11 +01:00
Léo Terziman
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
Léo Terziman
df700b998f
Another small bug correction in Q3BSPZipArchive
2014-01-17 10:24:14 +01:00
Léo Terziman
2ef0f0f0e1
Correcting some bugs in Q3BSPZipArchive
2014-01-17 10:23:49 +01:00
Kim Kulling
89fbda0957
bugfix : fix Issue #176 cmake variables are now using quotes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-11-09 21:17:12 +01:00
Alexander Gessler
686ecf7d34
Merge pull request #175 from Eximius/master
...
PyAssimp optimize: load Armadillo: 33.8s -> 6.7s
2013-11-06 14:09:12 -08:00
Eximius
e0935c7ec5
PyAssimp optimize: load Armadillo: 33.8s -> 6.7s
2013-11-03 08:53:58 +00:00
Alexander Gessler
ca7542cf5d
Merge pull request #172 from assimp/zip-cmake-fixes
...
ZIP fixes from #168 , modified to keep the Windows build alive
2013-10-29 03:57:58 -07:00
Alexander Gessler
639afc6f01
Apply patch from #168 . Revert contrib/zlib/CMakeLists.txt hack from 561f3bc6ea
, but leave all Zlib install stuff commented.
2013-10-29 00:52:47 +01:00
Alexander Gessler
4167a68493
Merge pull request #171 from assimp/zip-cmake-fixes
...
Update CMakeLists.txt for zlib to build on MSVC again, closes #170 .
2013-10-27 10:42:04 -07:00
Alexander Gessler
561f3bc6ea
Update CMakeLists.txt for zlib to build on MSVC again, closes #170 .
2013-10-27 18:19:08 +01:00
Alexander Gessler
1f01238426
Update Readme.md
2013-10-16 21:43:54 +02:00
Kim Kulling
1867a4a3a3
bugfix: add missing zconf file for cmake.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 20:09:35 +02:00
Kim Kulling
b96cd522fa
bugfix : add cmakein file for zlib.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 20:06:16 +02:00
Kim Kulling
e88fcb27bf
update: update zlib to version 1.2.8 ( see https://github.com/assimp/assimp/issues/134 )
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 19:27:40 +02:00
acgessler
a5667ada9c
add ifc sample file to assimp.
2013-10-12 20:10:38 +02:00
Kim Kulling
685612b9f4
- refactoring : remove not used mesh index from private method in obj-importer.
...
- refactoring : remove commented code.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-11 15:29:17 +02:00
Alexander Gessler
87a0e77032
Merge pull request #146 from calvindhsu/blender-texture-type
...
Blender: map texture influence to aiTextureType
2013-10-09 03:28:17 -07:00
Calvin Hsu
a9a881cde6
Blender: map texture influence to aiTextureType
...
Previously assimp mapped all blender image textures as
aiTextureType_DIFFUSE. This change interprets the "mapto" property
which corresponds to the Blender "Influence" in the properties editor.
* Blender's Normal influence with "Normal Map" unchecked maps to
aiTextureType_HEIGHT.
* Blender's Normal influence with "Normal Map" checked maps to
aiTextureType_NORMAL.
* Influence scale is placed into AI_MATKEY_BUMPSCALING.
2013-10-08 19:01:02 -07:00
Alexander Gessler
57c0671681
Update Readme.md
2013-10-09 02:46:40 +02:00
Kim Kulling
e3a5480811
bugfix: fix typo's in obj-doxygen documentation.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-08 16:51:59 +02:00
Kim Kulling
e4fca83237
refactoring : remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-08 16:30:17 +02:00
Kim Kulling
a889c1575f
Merge branch 'master' of https://github.com/assimp/assimp
2013-10-08 16:24:43 +02:00