Commit Graph

99 Commits (1c4a8e90177a61740a5665bc31ba027c4a65d4db)

Author SHA1 Message Date
arkeon b2ac7b878f Correction on FBX material texture UV index
(keep the previous method for "allMaterials" option, this should be change too since the materials indexes used are not the good ones, or just remove the object / material test
2014-05-27 09:11:27 +02:00
Alexander Gessler 1b6b238f09 FBX: fix handling of string metadata. Before, we would accidentially confuse aiString and std::string and trigger a debug assertion. 2014-05-22 16:22:38 +02:00
Léo Terziman 7c3a039349 Merge remote-tracking branch 'official/master' into contrib
Conflicts:
	include/assimp/matrix4x4.inl
	include/assimp/vector2.h
	include/assimp/vector3.h
2014-04-22 14:32:59 +02:00
Kim Kulling a6044e125e Merge pull request #249 from attila-barsi/master
Initial version for FBX layered textures.
2014-04-01 16:02:16 +02:00
attila-barsi 4f36e85bd8 Added required changes to doc and protection from nullptr. 2014-03-31 10:30:04 +02:00
DoubleLee 2e3b602c0b Aspect Ratio fix, and comment about field of view. 2014-03-26 16:44:49 -05:00
attila-barsi ed9204ab1b Initial version for FBX layered textures.
Fixed assert during parsing UDP3DSMAX.
2014-03-24 11:46:36 +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 82cc038a83 Merge remote-tracking branch 'official/master' into contrib 2014-03-19 10:18:47 +01:00
Frederik Aalund 595529ef8b Refactored the metadata for inner consistency. 2014-03-15 08:37:45 +01:00
Frederik Aalund a8401ba377 Added support for heterogenous metadata on the aiNodes. 2014-03-14 14:17:34 +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
Léo Terziman 172c917c37 Merge remote-tracking branch 'official/master' into contrib 2014-03-03 12:47:45 +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
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
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
Léo Terziman b75f27492a Merge remote-tracking branch 'official/master' into contrib 2014-02-17 08:49:43 +01:00
George Papadopoulos 02c4344d1d detect FBX glossiness map (ShininessExponent) 2014-02-14 15:15:18 +02:00
Léo Terziman 7372bf2467 Merge commit 'c0871b35c0ab7091f68c794eb954493722522d4c' into contrib 2014-01-17 11:59:31 +01:00
Léo Terziman 4e7b59be55 Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio 2014-01-17 11:43:48 +01: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
Sherief Farouk 9b591fadb8 Fixes for uninitialized variable warnings. 2013-08-09 19:52:15 -04:00
Sherief Farouk c8428fa67a Added value range assertions to prevent static analysis false-positives on Clang. 2013-08-07 18:43:29 -04:00
Alexander Gessler a288a631e2 - FBX: avoid more gcc warnings. 2013-04-08 20:21:28 +02:00
Alexander Gessler 5fe03f692e - FBX: silence some warnings produced by clang about missing switch cases. Add TokenType_BINARY_DATA to TokenTypeString() function. 2013-04-08 19:45:09 +02:00
Jared Duke 20506ead3c Update code/FBXConverter.cpp
Fixing VC10 build.
2013-01-24 19:44:08 -08:00
Alexander Gessler c1cd88e9de - fbx: take shortest quaternion path when interpolating. 2012-08-26 20:10:01 +02:00
Alexander Gessler 5bc573edb8 - fbx: pre-filter animated property we don't support as early as possible. 2012-08-26 18:40:04 +02:00
Alexander Gessler 9ea7fc2856 - fbx: don't die if a file contains no GlobalSettings. 2012-08-26 17:45:09 +02:00
Alexander Gessler cdb7caffbd - fbx: add special output node name tag to mark fbx null nodes. 2012-08-25 22:24:08 +02:00
Alexander Gessler c9facf16fa - fbx: support reading of scenes containing no geometry. 2012-08-25 18:17:11 +02:00
Alexander Gessler 375c4b4242 - fbx: read framerate and output it in aiAnimation::mTicksPerSecond. 2012-08-25 17:31:15 +02:00
Alexander Gessler 5ea9de5d3e - fbx: return time in seconds. 2012-08-25 16:13:19 +02:00
Alexander Gessler 3f2a796b9d - fbx: fix time scaling in my previous patch. 2012-08-20 19:23:54 +02:00
Alexander Gessler 99aab0d9a7 - fbx: also handle cases where some of the SRT channels are empty/constant. 2012-08-20 19:15:59 +02:00
Alexander Gessler 6bbbbfde4c - fbx: collapse animation nodes whenever possible to avoid overly busted output scenes. 2012-08-20 18:33:54 +02:00
Alexander Gessler 3e86e1b857 - fbx: add import settings to public assimp config interface. 2012-08-11 16:41:44 +02:00
Alexander Gessler 1cd04a2671 - fbx: formatting. 2012-08-11 02:24:59 +02:00
Alexander Gessler 826b97a4fa - fbx: handle arbitrary rotation orders (all combinations of euler angles etc). 2012-08-11 02:17:22 +02:00
Alexander Gessler 1a5bf26e91 - fbx: light & camera conversion was missing in assimp, somehow. 2012-08-11 01:51:04 +02:00
Alexander Gessler 8d5b78c035 - fbx: 32 bit build fixes. 2012-08-10 23:26:49 +02:00
Alexander Gessler c126cfa1ff - fbx: rework material reading to support negative indices (these will be assigned a default material).
- fbx: fix uninitialized variable.
2012-08-10 22:33:57 +02:00
Alexander Gessler 5250240ed6 - fbx: format fixes. 2012-08-09 02:10:13 +02:00
Alexander Gessler 3899fc5257 - fbx: bone bind matrix now includes mesh world transformation. 2012-07-27 22:36:40 +02:00
Alexander Gessler d5d6df36e3 - fbx: fix rotation order and a whole bunch of related problems. 2012-07-27 21:09:45 +02:00
Alexander Gessler 4c58328c98 - fbx: switch to always generating a full transformation chain (temporary solution to get the transformation order right for now!). 2012-07-27 19:41:14 +02:00
Alexander Gessler 6efe9517f0 - fbx: forgot child links in transformation chains. 2012-07-27 19:29:57 +02:00
Alexander Gessler 4aac334358 - fbx: bugfix node chain generation, was omitting some nodes. 2012-07-27 19:20:05 +02:00
Alexander Gessler 54be52ea28 - fbx: add option to detect dummy animation tracks and to remove them. Actually, this is mostly a debugging aid (and it cuts down memory usage). 2012-07-27 18:45:02 +02:00