v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,651 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

1067 Commits (48b47464fd51cad9cda8475df876f3c7f80e9340)

Author SHA1 Message Date
aramis_acg f8974b7209 - Ifc: explicitly clamp some computations to [0,1] even if this is already their (arithmetically) defined range to improve numerical robustness. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1309 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-10-17 00:32:59 +00:00
aramis_acg 745a7383f6 Ifc: fix artifacts from window boundaries. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1308 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-10-17 00:04:24 +00:00
aramis_acg f329e1af6f - IFC: fix possible infinite recursion in QuadrifyPart() 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1307 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-10-16 21:27:01 +00:00
aramis_acg 39d13faf9a - Ifc: minor code cleanup. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1306 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-10-16 20:55:19 +00:00
aramis_acg 11a22b671b - IFC: revamp binary subtraction and opening generation logic, which now supports 90deg rotated opening proxies. The new version adds extra cleanup steps to prepare the data for processing by clipper. It also has a slightly refactored code base. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-10-16 19:51:00 +00:00
aramis_acg fa1016ddc8 - Ifc/Step: support line continuations in parser. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1304 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-10-02 14:19:24 +00:00
ulfjorensen 54a5088e14 - added a workaround to load Collada files correctly in case the "texcoord" attribute was missing in a <texture> element 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1303 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-24 08:45:23 +00:00
ulfjorensen 2944e7b210 - Added a workaround for some XFileExporter omitting separator chars at the end of data vectors 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1302 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-21 18:53:36 +00:00
ulfjorensen 62b0284100 - applied patch by peteredc to make the Collada loader write mesh names 
- applied patch by asmaloney for better error messages in the Collada parser

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1301 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-21 08:44:37 +00:00
aramis_acg e22bb03f80 - IFC: fix face winding for IfcSweptDiskSolid geometry 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1300 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-10 01:28:19 +00:00
aramis_acg 15c0b8b955 - IFC: avoid artifacts in high-curvature regions (or the boundaries thereof) of IfcSweptDiskSolid elements. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1299 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-10 00:40:41 +00:00
Alexander Gessler c1cd88e9de - fbx: take shortest quaternion path when interpolating. 2012-08-26 20:10:01 +02:00
Alexander Gessler 310235dd5b - fbx: more warn policy tuning. 2012-08-26 18:58:08 +02:00
Alexander Gessler a1713052e5 - fbx: support reading LimbNode attachments, less Property70 warnings. 2012-08-26 18:53:15 +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 51d84dcfc0 - fbx: improve logging 2012-08-26 17:54:17 +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 eed3cebc18 - fbx: add support for reading Null node attributes. 2012-08-25 20:12:53 +02:00
Alexander Gessler 4921114c7d - fbx: better error reporting reading property tables. 2012-08-25 19:53:46 +02:00
Alexander Gessler c9facf16fa - fbx: support reading of scenes containing no geometry. 2012-08-25 18:17:11 +02:00
Alexander Gessler 1dc2ea05fa - fbx: fix crashbug when animating the root node. 2012-08-25 17:57:07 +02:00
Alexander Gessler 375c4b4242 - fbx: read framerate and output it in aiAnimation::mTicksPerSecond. 2012-08-25 17:31:15 +02:00
Alexander Gessler d881bb9cdc - fbx: add support for reading GlobalSettings. 2012-08-25 16:23:37 +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 8336aa423f - fbx: fix reading of short data tokens in binary files. 2012-08-20 17:39:44 +02:00
jonathanklein a038288af9 Ogre: Fixed memoryleak and missing \0 at end of cstring 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1298 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-08-12 17:00:53 +00:00
Alexander Gessler 3e86e1b857 - fbx: add import settings to public assimp config interface. 2012-08-11 16:41:44 +02:00
Alexander Gessler eb16c193ea - fbx: also support reading binary arrays of UNSIGNED data. 2012-08-11 04:48:08 +02:00
Alexander Gessler 96033e9fc0 - fbx: fix stupid typos killing the decompression logic. 2012-08-11 04:39:47 +02:00
Alexander Gessler 811e2492df - fbx: fix object names when reading binary files. 2012-08-11 04:29:21 +02:00
Alexander Gessler 29b11f1cde - fbx: FINALLY got reading binary data buffers (vertices, normals etc) working! Found out fbx uses deflate to compress them. 2012-08-11 04:16:46 +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 1bdf39448a - fbx: extend list of supported property data types. 2012-08-11 01:59:10 +02:00
Alexander Gessler 391a69e68b - fbx: extend DOM to include the declarations for FBX' rotation order and inheritance enums. 2012-08-11 01:57:32 +02:00
Alexander Gessler 1a5bf26e91 - fbx: light & camera conversion was missing in assimp, somehow. 2012-08-11 01:51:04 +02:00
Alexander Gessler bc0e465f91 - fbx: declare more dynamic properties of Model. 2012-08-10 23:40:02 +02:00
Alexander Gessler 8d5b78c035 - fbx: 32 bit build fixes. 2012-08-10 23:26:49 +02:00
Alexander Gessler 315285faf0 - fbx: refactor parsing code, move all parsing stuff to FBXParser.cpp. Parsing errors now carry the prefix "FBX-Parser". 2012-08-10 23:24:58 +02:00
Alexander Gessler ef0dcaaea2 - fbx: refactor, move DOM utility functions to separate unit. 2012-08-10 23:02:38 +02:00
Alexander Gessler ffbac847ef - fbx: add DOM classes for light and camera node attachments. Devise a new macro-based system to easily define dynamic fbx properties. 2012-08-10 22:58:54 +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 729e98fef0 + fbx: Parser::IsBinary(), Document::IsBinary() 2012-08-10 21:39:47 +02:00
Alexander Gessler 49cfcf4c07 - fbx: add binary support to the various ReadXXX parsing utilities. 2012-08-10 11:06:59 +02:00
Alexander Gessler 10fac9bcd8 - fbx: finished binary tokenizer. Now correctly skips over compressed data arrays. 2012-08-10 10:47:50 +02:00
Alexander Gessler 5250240ed6 - fbx: format fixes. 2012-08-09 02:10:13 +02:00
Alexander Gessler 24ce9495fd - fbx: add binary reading draft. Started from scratch after my first attempt had design flaws. The binary reader now sits on the lexer stage (really) and generates a (fake) token sequence similar to the text lexer's output - this means most parsing code can go unaffected. 2012-08-09 02:08:12 +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
Alexander Gessler 0d2cb96092 - fbx: re-enable FixNodeName(), forgot that a commit ago. 2012-07-27 17:58:34 +02:00
Alexander Gessler bb8e8c6673 - fbx: ignore IKEffector nodes. 2012-07-27 17:57:30 +02:00
Alexander Gessler 44259f0c23 - fbx: fix small typo with big effect. 2012-07-27 17:57:19 +02:00
Alexander Gessler bead86a830 - fbx: take care not to drop transformation chain nodes that have node animations assigned, even if they specify identity transform in bind pose. 2012-07-27 16:18:47 +02:00
Alexander Gessler 80e7e18e28 - fbx: refactor animation code. 2012-07-27 15:53:17 +02:00
Alexander Gessler ffd084a7a7 - fbx: generate inverse nodeanim channels for pivots. 2012-07-27 15:42:06 +02:00
Alexander Gessler 3c37c8e7da - fbx: generate node anims for complex transformation chains with pivots and offsets. 2012-07-27 15:31:02 +02:00
Alexander Gessler 94e1e78c55 - fbx: work on converting animations for complex transformation chains (i.e. chains that contain pivots and offsets). (WIP) 2012-07-27 04:55:56 +02:00
Alexander Gessler 7f082e0aae - fbx: revamp transformation code to support rotation/scaling pivots and offsets. The information is encoded in additional nodes in the scene hierarchy, which are tagged with a special naming scheme to make them easy for users to identify and map to their systems. 2012-07-27 03:00:16 +02:00
Alexander Gessler 23c62f07f7 - fbx: fix memleak in exception cases. 2012-07-27 01:49:02 +02:00
Alexander Gessler 916947327f - fbx: fix weight conversion for multi-mesh geometry. 2012-07-27 00:50:58 +02:00
Alexander Gessler f230ac2f60 - fbx: further work and bugfixes on deformer conversion. 2012-07-26 23:45:07 +02:00
Alexander Gessler d194c83ed8 - fbx: bugfix Model -> Cluster connections. 2012-07-26 22:58:48 +02:00
Alexander Gessler 3e3eb6fb7c - fbx: permit empty deformers. 2012-07-26 22:57:52 +02:00
Alexander Gessler 666f2776d7 - fbx: convert fbx deformers to assimp bones. 2012-07-26 22:53:31 +02:00
Alexander Gessler 05ec3c2e90 - fbx: read Geometry -> Skin and Model -> Cluster connections. Improve logging, some refactoring. 2012-07-26 19:13:19 +02:00
Alexander Gessler 06acead438 - fbx: read deformers (Skin and Cluster). 2012-07-26 18:05:24 +02:00
Alexander Gessler 8d1db6229c - fbx: drop empty animation stacks to pass assimp validation. 2012-07-26 04:13:16 +02:00
Alexander Gessler 6ea67963ba - fbx: fix parsing of CameraSwitcher.CameraIndexName. 2012-07-26 04:07:29 +02:00
Alexander Gessler 44606a1e53 - fbx: fix 64 bit compile warning. 2012-07-26 04:04:29 +02:00
Alexander Gessler c882ef841f - fbx: fix boost compile error. 2012-07-26 04:03:55 +02:00
Alexander Gessler d5c05c7d84 - fbx: NodeAttribute can now be target for AnimCurveNode. 
- fbx: rename Camera -> CameraSwitcher.
 2012-07-26 03:58:42 +02:00
Alexander Gessler cab713b4c5 - fbx: attach node attachments to their nodes. 2012-07-26 03:45:37 +02:00
Alexander Gessler b66dfc85e1 - fbx: read NodeAttribute and Camera. 2012-07-26 03:42:02 +02:00
Alexander Gessler 38be981151 - set aiNodeAnim.mNodeName 2012-07-26 03:11:14 +02:00
Alexander Gessler 776d8e339b Merge branch 'master' of https://github.com/assimp/assimp 2012-07-24 03:30:47 +02:00
Alexander Gessler 8747614e89 - fbx: ensure node names are converted consistently and with no ambiguity. 2012-07-22 02:12:38 +02:00
Alexander Gessler 29057096fd - add extra check whether the keyframes are well-ordered. 2012-07-22 01:23:23 +02:00
Alexander Gessler 5ff8c90a35 - fbx: set animation duration. 2012-07-21 23:48:52 +02:00
Alexander Gessler f617e766b1 - fbx: add "strict" import mode (only accept 2012,2013 files). 2012-07-21 23:08:48 +02:00
Alexander Gessler b7456307dd - fbx: fix "could not read property name" warn message. 2012-07-21 22:45:23 +02:00
Alexander Gessler fd828a1b44 - fbx: always set all tracks in aiNodeAnim to pass validation. 2012-07-21 22:29:42 +02:00
Alexander Gessler e4305149be - fbx: bugfix animation interpolation code, fix various quirks. 2012-07-21 21:28:02 +02:00
Alexander Gessler 09aaaba7b8 - fbx: improved DOM object construction and dependency resolution. 2012-07-21 20:02:00 +02:00
Alexander Gessler 5db5634494 - fbx: add utility functions to filter connections to other objects by their type. 2012-07-21 18:02:10 +02:00
Alexander Gessler 4f6dbac919 - fbx: prevent infinite recursion when resolving objects with cyclic references. 2012-07-21 17:13:03 +02:00
Alexander Gessler 378bc93593 - fbx: resolve target node for node animations. 2012-07-21 17:12:04 +02:00
Alexander Gessler ae3007b42b - fbx: better size estimate for keyframe buffer. 2012-07-21 16:19:46 +02:00
Alexander Gessler 382f4619ad - fbx: animation conversion from fbx's representation to assimp's. This involves evaluating animation layers etc. 2012-07-21 04:15:10 +02:00
Alexander Gessler 711878567a - more fine-grained import settings. 2012-07-21 01:00:26 +02:00
Alexander Gessler 67c55990cd - fbx: initial code to read animations plus the accompanying DOM classes. 2012-07-21 00:45:37 +02:00
aramis_acg aaf0be0bbf - CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:56:15 +00:00
aramis_acg d8c2295962 - blend: compute parent inverses on your own instead of trusting the blend input. Thanks to Kalmár Dániel for the patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1291 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 22:18:10 +00:00
kimmi 3f47ac3fe2 Bugfix : Fix an invalid getName function. Thanks to cyrilchampier. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1290 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-17 21:48:03 +00:00
aramis_acg 56bf755c4b - Ifc: fix handling of curves with RADIAN parameters. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1289 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-12 00:20:28 +00:00
aramis_acg d7fe61c255 - Ifc: improved subsampling of curves for IfcSweptDiskSolid entities. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1288 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-11 23:08:44 +00:00
aramis_acg d7410e6f08 - Ifc: implement basic support for IfcSweptDiskSolid elements. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1287 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-11 22:11:16 +00:00
aramis_acg c70646912c - add IFCZIP support to IFC loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1286 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-07-11 19:18:51 +00:00
Alexander Gessler ab93c6f38e Merge branch 'master' of github.com:acgessler/assimp-gsoc2012-fbx 2012-07-08 01:29:49 +02:00
acgessler 879f2ed177 - fix some -Wall warnings 2012-07-08 03:28:14 +02:00
acgessler 8ec96d88c5 update CMake build 2012-07-07 21:11:09 +02:00
Alexander Gessler 30422fa683 - fix confusion between ASSIMP_BUILD_NO_COLLADA_IMPORTER and ASSIMP_BUILD_NO_DAE_IMPORTER (in favour of the first). 2012-07-07 20:53:24 +02:00
acgessler e56b39ecaf fbx: gcc 4.6 compile fixes 2012-07-07 20:46:29 +02:00
Alexander Gessler 1a9790ae9a - fbx: read first set of header properties (format version, timestamp etc). 2012-07-06 22:46:19 +02:00
Alexander Gessler e4aee83c5b - fbx: set mesh names, drop prefix from root node, simplify mesh splitting logic. 2012-07-06 19:32:41 +02:00
Alexander Gessler 6441f9d984 - fbx: strip prefixes from Material and Mesh names. Don't set empty material names. 2012-07-06 17:08:02 +02:00
Alexander Gessler 72f1734f82 - fbx: fix another stupid bug in the multi-mesh splitting code. 2012-07-06 17:00:59 +02:00
Alexander Gessler 2d2a87b70c - fbx: fix stupid bug that kills the node hierarchy. 2012-07-06 16:55:25 +02:00
Alexander Gessler 4bfd5c11d7 - fbx: bugfix multi-material splitting. 2012-07-06 16:48:09 +02:00
Alexander Gessler d6e929b670 - fbx: accidentially passed a wrong predicate for sorting Connections to std::sort. 2012-07-05 17:18:54 +02:00
Alexander Gessler 4db113395c - fbx: read local transforms (different modes of rotation not yet implemented, though). 2012-07-05 17:06:15 +02:00
Alexander Gessler 3179e949bb - fbx: set default material when no material layer is assigned to a mesh. 2012-07-05 16:37:13 +02:00
Alexander Gessler 61c6c37e30 - fbx: implement mesh splitting for meshes with multiple materials. 2012-07-05 16:35:08 +02:00
Alexander Gessler cfb05376d2 - fbx: fix diffuse material color. 2012-07-05 14:26:26 +02:00
Alexander Gessler 04c77029e8 - fbx: fix boost build errors (was building with BOOST_WORKAROUND for a while). 2012-07-04 17:06:55 +02:00
Alexander Gessler 6e6dbe97de - fbx: fix bug that caused normals to be wrong. 2012-07-04 16:47:10 +02:00
Alexander Gessler 0d2f04d50a - fbx: fix recursive node construction. 2012-07-04 16:38:12 +02:00
Alexander Gessler 89d5380c81 - fbx: argh. forgot to add FBXModel.cpp 2012-07-04 16:33:46 +02:00
Alexander Gessler bf79c83bf2 - fbx: read node hierarchy and assign model material indices. Cache already converted materials and meshes to make FBX instancing work as intended. 2012-07-04 16:33:21 +02:00
Alexander Gessler 17629f1ff1 - fbx: work on resolving material links. 2012-07-04 15:07:57 +02:00
Alexander Gessler 2f5ec6f136 - fbx: fix bug that caused textures to be ignored in some cases. 2012-07-04 01:45:15 +02:00
Alexander Gessler c7ee6fd70f - fbx: texture conversion & UV channel mapping. 2012-07-03 20:41:21 +02:00
Alexander Gessler a0c45f9190 - fbx: read texture -> material connections. 2012-07-03 19:42:14 +02:00
Alexander Gessler effcaf066a - fbx: Objects now carry their ID. 2012-07-03 19:36:38 +02:00
Alexander Gessler 8a12b179a6 - fbx: add utility functions to get object connections in sequential (i.e. insertion) order. 2012-07-03 17:57:21 +02:00
Alexander Gessler fd451f7ba6 - fbx: read object-object and object-property connections. 2012-07-03 16:50:58 +02:00
Alexander Gessler 23914685f9 - fbx: read textures. 2012-07-03 14:59:40 +02:00
Alexander Gessler 97b69364ad - fbx: refactor code for fetching property templates. 2012-07-03 14:40:45 +02:00
Alexander Gessler ec50632f2e - fbx: fix bug that caused vertex colors to be not loaded correctly. 2012-07-03 00:26:40 +02:00
Alexander Gessler 990e6bdf3f - fbx: better conversion of material colors. 2012-07-02 23:31:48 +02:00
acgessler 3f811f4a62 - fbx: DOM Material -> aiMaterial converter (WIP!). 2012-07-02 19:59:31 +02:00
acgessler 131008cea1 - fbx: read materials. 2012-07-02 17:37:00 +02:00
acgessler b49cf16bc2 - fbx: change const semantics for PropertyTable's. Lazy parsing of properties no longer affects logical constness. 2012-07-02 17:09:32 +02:00
acgessler 97e1761ecd - fbx: support more property data types (there are way more, though - don't know yet how to handle them, fbx files don't seem to have overly strong semantics for properties). 2012-07-02 17:00:56 +02:00
acgessler 21713841d3 - fbx: read property templates. Fix some memory leaks. 2012-07-02 16:51:19 +02:00
acgessler 00f249b8dd - fbx: add property system 2012-07-02 15:57:51 +02:00
acgessler 6ddb1c9aa7 - fbx: refactor code 2012-07-01 14:38:14 +02:00
Alexander Gessler 7a3e3b1353 - fbx: create dummy root node and assign converted meshes. This is a temporary solution to be able to test mesh reading. 2012-06-28 23:44:23 +02:00
Alexander Gessler 524285c90d - fbx: converter now handles FBX mesh to aiMesh conversion. 2012-06-28 23:24:46 +02:00
Alexander Gessler 0c0c9bce66 - update CMakeLists 2012-06-28 20:03:29 +02:00
Alexander Gessler d7270aa278 - fbx: skeleton for DOM -> aiScene converter. 2012-06-28 20:02:09 +02:00
Alexander Gessler e945998fc8 - fbx: warn about empty meshes and ignore them. 2012-06-28 19:23:08 +02:00
Alexander Gessler d61c86081c - fbx: depending on settings.readAllLayers, the loader now scans through all geometry layers and pulls in all vertex data channels that fit into the output data structure. 2012-06-28 19:20:44 +02:00
Alexander Gessler 05bc8ab684 - fbx: add ImportSettings to keep track of fbx-specific import settings. The settings are generated by the importer instance and injected into parser and DOM. 2012-06-28 19:16:14 +02:00
Alexander Gessler 3f10314656 - fbx: support ByPolygon mapping for materials, refactor code to read material indices. 2012-06-28 17:13:13 +02:00
Alexander Gessler e821988c64 - fbx: also read vertex colors, tangents and binormals. 2012-06-28 16:51:55 +02:00
Alexander Gessler ffe0ed7926 - fbx: refactor code to handle FBX vertex data access. Support the same access & indexing types for UVs and normals. 2012-06-28 02:06:24 +02:00
Alexander Gessler 026cec7d7b - fbx: UVs, normals and materials arw now read properly. Fix bug related to reading vertices. 2012-06-28 01:49:52 +02:00
Alexander Gessler fcdb2fc6b8 - fbx: work on reading normals, UVs and material channels. 2012-06-28 00:35:40 +02:00
Alexander Gessler f9e310edfb - fbx: work on reading vertex data. 2012-06-27 23:02:00 +02:00
Alexander Gessler f354d8d7c7 - fbx: add some utility functions to parse tokens to values and to handle errors automatically. 2012-06-27 21:55:28 +02:00
jonathanklein e658a7f98f Added Animationoverview diagram to documentation 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1270 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-26 19:46:18 +00:00
Alexander Gessler 7108713238 - fbx: work on reading the first layer of geometry data channels. 2012-06-26 21:35:16 +02:00
aramis_acg 79711b018a - blend: patch for material importer, read emissive color. Thanks to Laurent Belcour for the patch! 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1269 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-26 19:16:09 +00:00
Alexander Gessler a996ecba75 - fbx: add helper functions to read FBX data arrays. 2012-06-26 20:05:24 +02:00
Alexander Gessler c0af603f0c - fbx: further work on DOM, start work on geometry extraction. 2012-06-26 19:19:13 +02:00
Alexander Gessler 25dfbdf58d - fbx: add DOM layer to represent the parsed FBX file in-memory, capturing the essential semantics we need for importing. 2012-06-26 18:31:19 +02:00
Alexander Gessler 05b98c279b - fbx: fix tab width when logging columns. 2012-06-26 15:43:31 +02:00
Alexander Gessler 4c30c00585 # fbx: forgot a <Windows.h> in my code. 2012-06-26 15:40:16 +02:00
Alexander Gessler ecd79b3cc3 - fbx: fix infinite recursion when parsing nested Scope's. 2012-06-26 03:31:34 +02:00
Alexander Gessler c9d9fcdfd1 - fbx: parser working now. Drop shared_ptr's in favour of raw pointers to reduce memory overhead (a pity - I want unique_ptr and move semantics in C++03). 2012-06-25 23:03:06 +02:00
acgessler ff995307ac - fbx: further work on broadphase tokenization. 2012-06-25 16:10:35 +02:00
acgessler b6d0f05143 - update CMakeLists. 2012-06-23 03:38:44 +02:00
acgessler 18b2aebcb1 - FBX importer: basic interface and importer skeleton. Start tokenizer and parser. 2012-06-23 03:36:55 +02:00
Alexander Gessler 4e9a0bba20 + add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it. 2012-06-21 17:24:50 +02:00
aramis_acg 1d7018c826 # fix bug in STEPFileReader, loader fails if string literals contain more than one ". Thanks to Juha Vesanen for the patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1258 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-17 12:15:49 +00:00
kimmi 526150a8e3 Update: Debian-related cmake changes ( I changed the revision to 1256 instead of 1251 ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1256 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-11 11:49:08 +00:00
kimmi 97995e41f4 Debian-specific adapting cmake. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1255 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-05 19:30:45 +00:00
jonathanklein 29243071fa Ogre: Importerproperty to set Texture Mode from Filename (bla_n.png -> Normalmap etc.) 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1254 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 18:01:32 +00:00
jonathanklein 5b462d484b Ogre: small tweaks 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1253 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 11:06:47 +00:00
kimmi 7384ce4005 Bugfix: Fix gcc 4.4 compilation error on r1251, thanks to Rosen Diankov for that. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1252 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-06-03 06:10:26 +00:00
kimmi 8441ecf6bf Bugfix : Fix a compiler issue with OSX and Linux. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1250 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-28 10:19:50 +00:00
ulfjorensen 0693df00c5 - Bugfix: catched a null pointer crash when post processing removed everything from an invalid scene 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1249 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-23 09:25:40 +00:00
jonathanklein d9d57804fa Ogre: Support for multiple texcoords 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1248 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-23 09:23:34 +00:00
kimmi 1ac5a47c5d Bugfix : Fix a compiler bug for iOS arm, thanks to Brian Miller. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1247 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-20 20:41:06 +00:00
ulfjorensen 6d2857ed4a Bugfix: collada loader now preserves empty data arrays to work around stupid exporters writing empty animation channels 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1246 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-05 07:38:14 +00:00
kimmi 7cb9438522 Refactoring : Move sources into one source variable to avoid redundant code. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1245 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-01 10:33:55 +00:00
kimmi f9cd8845b1 - Bugfix : Bug 3511751 closed, handling no defined material name. 
- Update : Add a model for the regression test.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1244 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-01 09:39:51 +00:00
aramis_acg ec6c62e005 - consistent use of ai_assert instead of assert. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:22:40 +00:00
aramis_acg adfef670cc - rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:14:39 +00:00
aramis_acg 53665faacf - make BaseImporter::GetExtensionList more robust, improve error checking. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1237 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:59:47 +00:00
aramis_acg 078c1cd621 # bugfix Importer::GetImporterIndex 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1236 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:59:15 +00:00
aramis_acg 68d2b71893 Patch [3520194] Fix compiler warning for non-virtual destructor by Andy Maloney. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1235 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:33:43 +00:00
aramis_acg 5a81b42ebe - add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1234 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 22:26:26 +00:00
aramis_acg 93c3723da5 # Remove Experimental flag from blender loader. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1233 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-18 23:23:14 +00:00
aramis_acg e479355d0a + add aiImporterDesc API to hold importer meta information. 
- cleanup some Importer APIs: FindLoader -> GetImporter, add some utility APIs. Note that this is a breaking API change.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1232 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-18 23:07:52 +00:00
ulfjorensen 5975f3eff2 - Bugfix: fixed Collada parser to accept empty data elements again 
- Workaround: added a little extra code to handle texture filenames of Maxon Cinema Collada Exporter 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1231 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-02 10:43:18 +00:00
aramis_acg 07841c3e13 # Blender: fix memory leaking due to cycle refs. Thanks to Vitalii Trubchaninov for pointing this out. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1230 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-27 22:09:09 +00:00
kimmi 6caf98d945 Bugfix : Changed ColladaParser to be non-const in ColladaLoader::BuildMaterials. ( merged from GitHub, thanks to Riku Palomäki ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1229 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-21 22:17:42 +00:00
jonathanklein 0e5ae5145b Ogre Importer: Small fixes 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1228 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-21 08:49:46 +00:00
kimmi 6c1cb4f159 Bugfix : Fixed some compiler warnings and some C99 and C++11 specific syntax. ( merged from GitHub, thanks to Riku Palomäki ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1225 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 21:31:56 +00:00
kimmi d17071746d Bugfix : Removed some unnecessary const_casts. ( merged from GitHub, thanks to Riku Palomäki ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1223 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 21:11:05 +00:00
kimmi fa71305e07 Bugfix : Removed useless and weird const_cast from TokenMatch. ( merged from GitHub, thanks to Riku Palomäki ). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1222 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-20 21:03:14 +00:00