Léo Terziman
ed586a35ae
Fixed compilation error when using swig
2014-03-24 11:24:27 +01:00
Léo Terziman
1f3be52079
Merge remote-tracking branch 'official/master' into contrib
2014-03-24 10:44:57 +01:00
Léo Terziman
2dd6726c02
Changed order of some post processing steps in order to switch coordinate system as early as possible because pretransform now accept external matrices for the root transformation & this matrice should imperatively be in the same system coordinates as the rest of assimp structures
2014-03-24 10:43:07 +01:00
Kim Kulling
7fc15c3713
Merge pull request #242 from Seed-Of-Hate/master
...
iOS-SDK 7.1 Updated Toolchain
2014-03-21 15:13:33 +01:00
shaded enmity
050b38a69f
Readme and cosmetics
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 17:25:35 -07:00
shaded enmity
aa8bdba920
Merge branch 'master' of https://github.com/Seed-Of-Hate/assimp
...
Mistake
2014-03-20 17:15:38 -07:00
shaded enmity
73c482a293
iOS Path Update
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 17:15:09 -07:00
Seed-Of-Hate
81cc2c5de3
Update README.md
2014-03-20 17:11:46 -07:00
shaded enmity
dd6a624f15
iOS Toolchain Readme
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 16:27:49 -07:00
shaded enmity
2dc5a46e99
Zombie Removal
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 16:25:07 -07:00
shaded enmity
9f4623bec7
iOS Toolchain Update
...
Signed-off-by: shaded enmity <arul@shadeds-Mac.local>
2014-03-20 16:21:28 -07:00
Léo Terziman
358819c1a0
Fixed error in GetProperty when accessed from external libraries using a different language (using swig for example)
2014-03-20 15:32:12 +01:00
Alexander Gessler
331158e410
Merge pull request #237 from frederikaalund/master
...
Added support for heterogenous metadata on aiNode
2014-03-20 02:23:07 -04:00
Léo Terziman
e9fa779a65
Fixed error when compiling with mingw
2014-03-19 15:45:12 +01:00
Léo Terziman
82cc038a83
Merge remote-tracking branch 'official/master' into contrib
2014-03-19 10:18:47 +01:00
Kim Kulling
897fcc7328
Merge pull request #239 from judithhartmann/master
...
Load and save Ke-Value of mtl-Files
2014-03-17 13:39:22 +01:00
Judith Hartmann
7d1a704ed7
saves value in the 'Ke'-Attribute in ObjMtl Files in COLOR_EMISSIVE
2014-03-16 21:30:10 +01:00
Frederik Aalund
595529ef8b
Refactored the metadata for inner consistency.
2014-03-15 08:37:45 +01:00
Frederik Aalund
9b78a180d9
Added a convenience overload for aiMetadata::Get using std::string as key.
2014-03-14 17:12:22 +01:00
Frederik Aalund
56f37a0465
Deprecated some abstraction and fixed a memory leak.
2014-03-14 15:36:12 +01:00
Frederik Aalund
fc39fe9f40
Fixed a compile error involving unnecessary enum resolution qualification.
2014-03-14 15:01:36 +01:00
Frederik Aalund
a8401ba377
Added support for heterogenous metadata on the aiNodes.
2014-03-14 14:17:34 +01:00
Alexander Gessler
9af1dfd48d
Merge pull request #231 from frederikaalund/master
...
Added unparsed FBX properties to the aiNode's metadata.
2014-03-11 00:07:50 -04:00
Alexander Gessler
5adb6c6cda
Merge pull request #232 from autosquid/master
...
for python binding to work on mac '.dylib' should be added to ext_whitelist
2014-03-11 00:01:43 -04:00
autosquid
fd4f7f4572
for python binding to work on mac
...
add dylib to ext_whitelist for posix system
2014-03-11 00:34:49 +08:00
Léo Terziman
8fad549649
Merge remote-tracking branch 'official/master' into contrib
2014-03-10 17:21:26 +01:00
Léo Terziman
77263c631f
Fixed unzip support to use IOSystem/IOStream abstraction
2014-03-10 17:21:17 +01:00
Léo Terziman
29e3b82238
Fixed some header files in CMakeLists
2014-03-10 17:20:14 +01:00
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
Léo Terziman
796e072898
Fixed warnings when using swig
2014-03-03 15:36:49 +01:00
Léo Terziman
172c917c37
Merge remote-tracking branch 'official/master' into contrib
2014-03-03 12:47:45 +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
Léo Terziman
f54c85d4e6
Added custom root transformation for pre-transform vertices post-process step
2014-02-28 15:32:43 +01:00
Léo Terziman
843e56c252
Added matrix properties
2014-02-28 15:21:10 +01:00
Léo Terziman
b90718bd21
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
code/IFCLoader.cpp
2014-02-26 18:06:46 +01: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
Léo Terziman
b75f27492a
Merge remote-tracking branch 'official/master' into contrib
2014-02-17 08:49:43 +01:00
Alexander Gessler
c158638d67
Merge pull request #220 from VirusFree/master
...
detect FBX glossiness map (ShininessExponent)
2014-02-14 22:40:58 -05:00