Commit Graph

2300 Commits (5f646f20976b440f3de8b63f69e53740ca2e0e3b)

Author SHA1 Message Date
George Papadopoulos 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
Kim Kulling 6d630bec50 Merge pull request #208 from NickNick/master
Add support for emissive and gloss-maps
2013-12-18 06:53:36 -08:00
Nick Overdijk 5b076fe234 Fixes warnings in clang for unrecognized attribute 'gcc_struct' 2013-12-14 01:40:37 +01:00
Nick Overdijk 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
Alexander Gessler 9186911da0 Fix build exclude define in BlenderScene.cpp, fixes #205 2013-12-11 17:44:46 +01:00
Alexander Gessler b87a3b33dd Update Readme.md 2013-12-05 22:53:14 +01:00
Kim Kulling 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
gongwei 0b88f72be2 refactor the code, also parse texture option explictly 2013-12-02 22:58:15 +08:00
gongwei 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
acgessler 08cbc0974b Add Blender 2.69 test files (first set - no UVs here or other fancy stuff) 2013-12-01 23:34:58 +01:00
Kim Kulling 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
Alexander Gessler 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
Kim Kulling 84ecb4e2b4 Merge pull request #198 from hrehfeld/master
CMake Fixes
2013-11-27 06:24:45 -08:00
Jared Duke 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
Jared Duke 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
Hauke Rehfeld 268a07b950 Merge https://github.com/hrehfeld/assimp 2013-11-26 20:39:05 +01:00
Hauke Rehfeld 68b897e353 fix: only add uninstall target if not previously defined 2013-11-26 19:43:17 +01:00
Alexander Gessler acca16c82f Merge pull request #196 from AIM360/UpdatedCodeComments
Updated some code comments in DefaultIOStream.cpp
2013-11-26 06:04:54 -08:00
henrikbuchholz 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
Alexander Gessler d6a3df0acf Merge pull request #192 from AIM360/FaultToleranceFor3DSLoader
3DSLoader: Skipped chunks of size 0
2013-11-25 09:46:00 -08:00
Kim Kulling 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
henrikbuchholz 35fa7cb441 3DSLoader: Skipped chunks of size 0 2013-11-25 11:53:15 +01:00
henrikbuchholz 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
Alexander Gessler 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
acgessler d080f92241 BlenderTesselator: Fix OffsetOf() macro 2013-11-22 19:54:47 +01:00
acgessler 857e50ba40 BlenderTesselator: disable GLU tesselation code by default. 2013-11-22 13:58:40 +01:00
acgessler fbb1a79248 Update CMakeLists 2013-11-22 13:57:50 +01:00
Alice 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
Kim Kulling 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
Marcel Metz 6b5b3c64e6 Removed invalid extern keyword. 2013-11-20 14:42:23 +01:00
Marcel Metz c4d797ef58 Replaced function parameters with correct literals. 2013-11-20 14:42:23 +01:00
Marcel Metz 8d0b76a535 Added parenthesis for explicit operator evaluation priority. 2013-11-20 14:42:23 +01:00
Marcel Metz 9e579324d0 Added conditions for compiler oder build mode dependend code. 2013-11-20 14:42:23 +01:00
Marcel Metz c3852c4743 Removed noops and warnings on unused variables. 2013-11-20 14:42:18 +01:00
Marcel Metz c6297ec333 Fixed variable assignment values. 2013-11-20 14:40:25 +01:00
Marcel Metz 846a8959f8 Fixed class attribute initialization order. 2013-11-20 14:40:25 +01:00
Marcel Metz c1b28ff1ce Removed unreferenced variables. 2013-11-20 14:40:25 +01:00
Marcel Metz 07ab616644 Fixed building simple opengl texture example with mingw. 2013-11-20 14:40:24 +01:00
Marcel Metz 93fd1133ff Fixed mingw cross compiler issues. 2013-11-20 14:40:20 +01:00
Kim Kulling e7dbadf3dd Merge pull request #182 from mikedh/master
added additional search paths for dll on windows
2013-11-15 04:29:53 -08:00
Alexander Gessler 156f7c1ded Merge pull request #183 from erich666/master
typo fix: loose -> lose
2013-11-14 10:24:32 -08:00
Eric Haines f2997a562b typo fix: loose -> lose 2013-11-14 10:09:10 -08:00
Michael Dawson-Haggerty f1e43f560a added additional search paths for dll on windows 2013-11-12 22:06:42 -05:00
Alexander Gessler babc54478e Merge pull request #181 from inohiro/master
Enable support of FBX 2011 (7100)
2013-11-12 17:30:33 -08:00
Hiroyuki Inoue 3a3ac4fea2 Fix to support FBX 2011 (7100) 2013-11-12 23:25:40 +09: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