Frederik Aalund
f65e5d5487
Fixed a compile error due to a >> expression in a nested template statement.
2014-03-09 17:04:27 +01:00
Frederik Aalund
9eb8677aba
Added unparsed FBX properties to the aiNode's metadata. This allows the
...
user to extract extra/custom/user attributes/properties from the scene
graph. E.g., extracting attributes set under "extra attributes" in Maya.
2014-03-09 16:18:05 +01:00
Kim Kulling
84b66092d7
Merge pull request #217 from lousyphreak/master
...
Fix 3DS instances loading, fixes #151
2014-03-06 00:07:33 +01:00
Kim Kulling
34882177a9
bugfix: install_name should be set to absolute path to installed library in macosx build #226
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-06 00:06:19 +01:00
Kim Kulling
ec2b8dd3fa
bugfix:
...
add handling for special cases for the uv-calculation:
- When 3 vector have same UV, using default UV direction:
- When 2 vector have same UV, recalculate tangent/bitangent according to normal and bitangent/tangent.
Thanks to Ya ping Jin.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-05 23:25:49 +01:00
Alexander Gessler
5c95848f51
Merge pull request #224 from VirusFree/master
...
[FBX] Do not rename null nodes. Preserve information in node metadata.
2014-03-02 10:41:28 -05:00
Kim Kulling
49e9ad9fa5
Merge pull request #228 from YoheiKakiuchi/fix_ply_bug
...
fix miss commit at 8e35ea59d5
2014-03-01 14:24:18 +01:00
YoheiKakiuchi
08324b8095
fix miss commit at 8e35ea59d5
2014-03-01 20:34:57 +09:00
Kim Kulling
fd4cd67edb
Merge pull request #218 from YoheiKakiuchi/fix-ply-parse
...
remove SkipSpaceAndLineEnd after parsing end_header in PlyParser.cpp
2014-02-26 16:42:18 +01:00
George Papadopoulos
2db48ef532
[FBX] Do not rename nodes if they are marked as null in fbx. Preserve this information in node metadata.
...
Use can use node.Metadata.Get("IsNull") to check. (returns "true" or "false")
2014-02-23 12:27:34 +02:00
Alexander Gessler
de914d375f
Merge pull request #223 from VirusFree/master
...
[FBX ] Use AiNode's metadata to keep objects UserDefinedProperties
2014-02-22 16:40:38 -05:00
George Papadopoulos
5ef8c09dbb
Use AiNode's metadata to keep per-node(and per-instance) FBX (3dsmax) UserDefinedProperties
...
Also simplify metadata structure to avoid unnecessary allocations (and make it easier for wrappers like AssimpNET to read it)
2014-02-22 21:57:01 +02:00
YoheiKakiuchi
99e4176576
fix using flag
2014-02-18 16:37:23 +09:00
Alexander Gessler
b188ed2977
Merge pull request #221 from lbt/master
...
docs: clarify the use of Importer properties in post processing steps
2014-02-18 00:34:21 -05:00
David Greaves
660d5c4e84
docs: clarify the use of Importer properties in post processing steps
...
Signed-off-by: David Greaves <david@dgreaves.com>
2014-02-17 23:09:56 +00:00
Alexander Gessler
c158638d67
Merge pull request #220 from VirusFree/master
...
detect FBX glossiness map (ShininessExponent)
2014-02-14 22:40:58 -05:00
George Papadopoulos
02c4344d1d
detect FBX glossiness map (ShininessExponent)
2014-02-14 15:15:18 +02:00
YoheiKakiuchi
8e35ea59d5
check binary or not in ParseHeader in PlyParser
2014-02-07 10:38:49 +09:00
YoheiKakiuchi
52916b094c
remove SkipSpaceAndLineEnd after parsing end_header in PlyParser.cpp
2014-02-06 12:55:52 +09:00
Martin BĂĽchler
9f10553601
Fix 3DS instances loading, fixes #151
2014-01-30 02:39:04 +01:00
Kim Kulling
3cc4ece11e
bugfix:
...
- https://github.com/assimp/assimp/issues/94 : fix assimp-config.cmake.in file.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-01-29 21:19:00 +01:00
Kim Kulling
f99e307c4b
bugfix:
...
- remove commented code in cmake build for zlib_static.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-01-29 21:07:21 +01:00
Kim Kulling
630dd259f2
bugfix:
...
- fix typo in cmake file.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-01-29 20:29:13 +01:00
Alexander Gessler
c0871b35c0
Merge pull request #211 from VirusFree/master
...
Fix for FBX pivot transformation.
2013-12-29 11:26:34 -08:00
George Papadopoulos
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
Alexander Gessler
3086569e36
Merge pull request #210 from VirusFree/master
...
fix for collada parser when importing empty arrays.
2013-12-20 05:04:14 -08:00
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