Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,329 Commits 19 Branches 43 Tags
a2d9cbef7e1ed1b5655262edb7daabeabc00a43a
Commit Graph

119 Commits

Author SHA1 Message Date
Kim Kulling
f2d5921252 Update FBXConverter.cpp 
FBXConverter: initialize aiNodeAnim with nullptr.
 2016-04-04 12:48:53 +02:00
Kim Kulling
76e4e82ecb FBX: fix https://github.com/assimp/assimp/issues/782 2016-03-16 20:26:33 +01:00
Kim Kulling
53370d0d31 FBXImporter: some refactorings to increase readability. 2016-03-03 18:38:50 +01:00
Kim Kulling
2b09199f4a FBXImporter: move MeshGeometry declaration into its own header 2016-03-03 15:19:38 +01:00
Kim Kulling
1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Kim Kulling
398c1361d3 Merge pull request #674 from suikki/master 
FBX import: If animation is not defining keys for all vector components (x, y and z), use the node transform as the default value.
 2015-11-26 13:50:34 +01:00
Otger
c876dce82b Fixed crashes for Video with no content 2015-11-23 21:46:55 +01:00
Otger
f94bc8d66e Initial support for FBX embedded textures 2015-11-23 19:49:54 +01:00
Olli Kallioinen
12ed07a939 FBX import: If animation is not defining keys for all vector components 
(x, y and z), use the node transform as the default value.
 2015-10-27 21:03:24 +02:00
Richard
83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard
a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Kim Kulling
2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
abma
8c45a4dc3b Merge remote-tracking branch 'origin' 
Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h
 2015-04-16 01:03:00 +02:00
abma
bf4913b5c9 remove AssimpPCH.h: fixes #534 2015-04-16 01:00:17 +02:00
George Papadopoulos
08ba782bd5 [FBX] add support for multiple animations (by using LocalStart/LocalStop in takes) 
+ change key type from uint to int (fixes bugs from negative int_t becoming a junk uint_t value )
+ detect and ignore channels with no keys in the specified take start/stop window
+ add test model with multiple animations
 2015-03-26 23:23:38 +02:00
Turo Lamminen
e8bcad0840 Silence a warning and add an assertion 
Another false positive uninitialized variable. Actually it's only false
if ToOutputVertexIndex does't return NULL which should only happen if
index is out of bounds. Add assertion to make sure of that.
 2015-02-27 23:09:03 +02:00
abma
775b26e614 use std:: namespace for most cmath functions: 
http://en.cppreference.com/w/cpp/header/cmath
 2014-09-23 00:43:33 +02:00
Jared Duke
046b7e5f47 Rebase FBX regression db entries 
The FBX importer now properly parses field-of-view tokens. Rebase
only the failing FBX entries to accomodate the fix, also removing
the comment noting the (now incorrect) comment about improper import
of the FOV property.
 2014-09-15 18:14:38 -07:00
abma
6c5f9ecb06 fix most warnings with -pendantic 2014-08-18 02:09:06 +02:00
Alexander Gessler
d044ce7a62 FBXConverter: avoid creating an empty metadata slot (UDP3DSMAX was erased from list _after_ its size was taken)/ 2014-06-17 14:31:14 +02:00
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