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
0860254a2b
Fix Obj texture parsing error: where obj texture map statement contains texture option, it will fail to parse the correct image url, as a result, the texture won't be shown. Besides, we also add clamp texture mode for obj
2013-12-02 22:55:51 +08:00
08cbc0974b
Add Blender 2.69 test files (first set - no UVs here or other fancy stuff)
2013-12-01 23:34:58 +01:00
ccd5b30a56
Merge pull request #199 from jdduke/obj_mg_parse
...
Properly parse 'mg' keyword in .obj files
2013-11-28 06:49:00 -08:00
e27d452770
Merge pull request #200 from jdduke/stl_gray_diffuse
...
Default to light gray diffuse for STL
2013-11-27 15:16:37 -08:00
84ecb4e2b4
Merge pull request #198 from hrehfeld/master
...
CMake Fixes
2013-11-27 06:24:45 -08:00
931f0489bd
Properly parse 'mg' keyword in .obj files
...
The 'mg' keyword is currently being interpreted as a material library keyword,
when it really refers to the merging group. Handle this case, in effect ignoring
the keyword as merging groups are currently unsupported.
2013-11-26 14:24:15 -08:00
00717b6474
Default to light gray diffuse for STL
...
For consistency, use a light gray default diffuse color for STL files.
This provides consistency with other geometric types, like PLY, that use a
light-gray default material.
2013-11-26 14:11:24 -08:00
268a07b950
Merge https://github.com/hrehfeld/assimp
2013-11-26 20:39:05 +01:00
68b897e353
fix: only add uninstall target if not previously defined
2013-11-26 19:43:17 +01:00
acca16c82f
Merge pull request #196 from AIM360/UpdatedCodeComments
...
Updated some code comments in DefaultIOStream.cpp
2013-11-26 06:04:54 -08:00
5983300422
Updated some code comments in DefaultIOStream.cpp
...
There was a misleading TODO comment that encouraged to use fseek/ftell instead of fstat. However, fstat has been used intionally because fseek/ftell is potentially unsafe.
So I replaced the TODO and added some explanation why fstat is being used instead.
2013-11-26 14:52:53 +01:00
d6a3df0acf
Merge pull request #192 from AIM360/FaultToleranceFor3DSLoader
...
3DSLoader: Skipped chunks of size 0
2013-11-25 09:46:00 -08:00
f7e1502dd8
Merge pull request #189 from AIM360/FixForDegeneratedObjFiles
...
SortByPType Posprocessing crashed for crappy models with degenerated geometry
2013-11-25 04:59:05 -08:00
35fa7cb441
3DSLoader: Skipped chunks of size 0
2013-11-25 11:53:15 +01:00
d7dbdd6c3b
SortByPType Posprocessing crashed for crappy models with degenerated geometry
...
Which models crashed before the fix?:
The crash was observed for files with the following properties:
1. They contain >=1 meshes
2. They were loaded with SortByPType option
3. They only contained degenerated meshes, so that these were skipped SortByPType
What is improved by the fix?:
Obviously, the affected models were crappy anyway and will still produce empty output after the fix. However, the fix avoids the heap-corruption, which couldn't be solved by try/catch from outside and had the annoying effect that a whole scene with hundreds of individual models could crash due to a single crappy one.
Why did it crash before?
The SortByPType deleted some exluded meshes, but didn't reset the pointers in pScene. After throwing the DeadlyImportException (no remaining meshes), remaining meshes were deleted => Excluded meshes were deleted twice.
2013-11-25 10:50:15 +01:00
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
Léo Terziman
Alexander Gessler
George Papadopoulos
Kim Kulling
Nick Overdijk
gongwei
Jared Duke
Hauke Rehfeld
henrikbuchholz