cc3f8b82f9
Merge pull request #187 from assimp/blender-26-poly
...
Blender 2.6 poly format patch, by @kittencataclysm. This enables reading the new mesh format in Blender 2.6 and thus fixes a whole bunch of reports related to recent Blender versions.
2013-11-22 11:09:53 -08:00
d080f92241
BlenderTesselator: Fix OffsetOf() macro
2013-11-22 19:54:47 +01:00
857e50ba40
BlenderTesselator: disable GLU tesselation code by default.
2013-11-22 13:58:40 +01:00
fbb1a79248
Update CMakeLists
2013-11-22 13:57:50 +01:00
01a6ec9059
Adding tessellation support for new Blender 2.6 polygons
...
- Added BlenderBMesh.cpp/h which contains a class to convert a BMesh to an old style tri/quad mesh
- Added BlenderTessellator.cpp/h which contains a class to tessellate the poly loops contained within a BMesh
2013-11-22 13:17:21 +01:00
896d1b3f7e
Merge pull request #185 from adrianbroher/master
...
Fix various errors and warnings that prevented build assimp_view as linux to win32 cross compile.
2013-11-20 06:49:41 -08:00
6b5b3c64e6
Removed invalid extern keyword.
2013-11-20 14:42:23 +01:00
c4d797ef58
Replaced function parameters with correct literals.
2013-11-20 14:42:23 +01:00
8d0b76a535
Added parenthesis for explicit operator evaluation priority.
2013-11-20 14:42:23 +01:00
9e579324d0
Added conditions for compiler oder build mode dependend code.
2013-11-20 14:42:23 +01:00
c3852c4743
Removed noops and warnings on unused variables.
2013-11-20 14:42:18 +01:00
c6297ec333
Fixed variable assignment values.
2013-11-20 14:40:25 +01:00
846a8959f8
Fixed class attribute initialization order.
2013-11-20 14:40:25 +01:00
c1b28ff1ce
Removed unreferenced variables.
2013-11-20 14:40:25 +01:00
07ab616644
Fixed building simple opengl texture example with mingw.
2013-11-20 14:40:24 +01:00
93fd1133ff
Fixed mingw cross compiler issues.
2013-11-20 14:40:20 +01:00
e7dbadf3dd
Merge pull request #182 from mikedh/master
...
added additional search paths for dll on windows
2013-11-15 04:29:53 -08:00
156f7c1ded
Merge pull request #183 from erich666/master
...
typo fix: loose -> lose
2013-11-14 10:24:32 -08:00
f2997a562b
typo fix: loose -> lose
2013-11-14 10:09:10 -08:00
f1e43f560a
added additional search paths for dll on windows
2013-11-12 22:06:42 -05:00
babc54478e
Merge pull request #181 from inohiro/master
...
Enable support of FBX 2011 (7100)
2013-11-12 17:30:33 -08:00
3a3ac4fea2
Fix to support FBX 2011 (7100)
2013-11-12 23:25:40 +09:00
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
686ecf7d34
Merge pull request #175 from Eximius/master
...
PyAssimp optimize: load Armadillo: 33.8s -> 6.7s
2013-11-06 14:09:12 -08:00
e0935c7ec5
PyAssimp optimize: load Armadillo: 33.8s -> 6.7s
2013-11-03 08:53:58 +00:00
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
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
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
561f3bc6ea
Update CMakeLists.txt for zlib to build on MSVC again, closes #170 .
2013-10-27 18:19:08 +01:00
1f01238426
Update Readme.md
2013-10-16 21:43:54 +02:00
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
b96cd522fa
bugfix : add cmakein file for zlib.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-14 20:06:16 +02:00
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
a5667ada9c
add ifc sample file to assimp.
2013-10-12 20:10:38 +02:00
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
87a0e77032
Merge pull request #146 from calvindhsu/blender-texture-type
...
Blender: map texture influence to aiTextureType
2013-10-09 03:28:17 -07:00
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
57c0671681
Update Readme.md
2013-10-09 02:46:40 +02:00
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
e4fca83237
refactoring : remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-08 16:30:17 +02:00
a889c1575f
Merge branch 'master' of https://github.com/assimp/assimp
2013-10-08 16:24:43 +02:00
9e78823efb
refactoring : remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-08 16:21:47 +02:00
075bdb42d6
Merge pull request #145 from sherief/master
...
Fix for issue #114
2013-10-07 16:47:33 -07:00
5334020d17
Irrlicht shared code is now excluded only if both the Irrlicht and Irrlicht Mesh importers are excluded from the build.
2013-10-07 19:40:21 -04:00
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).
2013-10-07 19:32:46 -04:00
7a4edbd126
Merge branch 'master' of github.com:assimp/assimp
2013-10-06 22:30:41 +02:00
56c4ee5525
Turn ASSIMP_BUILD_BOOST_WORKAROUND on by default, fixes #144
2013-10-06 22:30:19 +02:00
ad0b214656
Exporter: do not make any assumptions on previously run PP steps if the scene is a copy.
2013-10-05 16:26:52 +02:00
9d4f7c32e4
Scene: keep an internal flag whether the scene was copied using aiCopyScene() (and potentially modified by the user afterwards)
2013-10-05 16:26:16 +02:00
3bee2818e4
Exporter: stop non intuitive automatic applying of "reverse" pp steps if user specifies no postprocessing steps.
2013-10-05 16:19:03 +02:00
Alexander Gessler
Alice
Kim Kulling
Marcel Metz
Eric Haines
Michael Dawson-Haggerty
Hiroyuki Inoue
Eximius
Calvin Hsu
Sherief Farouk