Commit Graph

38 Commits (7961c22c55522650255056a0afb9efe22214ffe1)

Author SHA1 Message Date
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
lutz.hoeren 90ddb93940 Fix for FBX Files that do not have a Comma on a new line in a data block 2015-12-17 11:48:44 +01:00
Richard 83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Kim Kulling 2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
Richard 4a5e9352d6 Refactor: Delete unused functions 2015-05-17 20:46:56 -06:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05: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 da3c347a57 add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime) 2015-04-05 15:19:55 +03: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 5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +02:00
Johnny Dickinson 380021e7c4 Check that zlib initialized correctly in FBX parser
Check the return code of inflateInit() indicates success to avoid
crashing later when zstream contains invalid data.
2015-01-24 00:00:35 -05:00
Kim Kulling cee583db06 bugfix: fix compiler warning: converting double to float.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-22 23:05:25 +02:00
Alexander Gessler 7ff7b783ee Merge pull request #335 from abma/master
fix most warnings with -pedantic
2014-08-17 17:49:21 -07:00
abma 6c5f9ecb06 fix most warnings with -pendantic 2014-08-18 02:09:06 +02:00
Alexander Gessler 6636e596ab Merge pull request #334 from jdduke/fbx_binary_fix
Avoid raw reinterpret_casts in the FBX parser
2014-08-17 17:01:10 -07:00
abma 56ddb4f4af fix some compile warnings:
- passing NULL to non-pointer
- unused vars
- unused function
- order of init
- parentheses
2014-08-17 23:28:00 +02:00
Jared Duke 69810a2a07 Avoid raw reinterpret_casts in the FBX parser
As reinterpret_cast can break strict aliasing rules, causing runtime failure
on Android, replace such usage in FBXParser with memcpy.  Also provide a
utility routine for both performing the copy and asserting the validity of
the buffer length relative to the copied region.
2014-08-17 08:41:45 -07:00
Alexander Gessler 1403cabb71 FBXParser: fix compiler warning on double -> float. 2014-06-01 17:34:11 +02:00
Alexander Gessler becd298e77 FBX: use memcpy() instead of reinterpret_cast or union to populate a float from a blob, causing SIGBUS errors on Android due to memory alignment of the source blob not being a multiple of 4/8. This fixes #24. 2014-05-22 16:17:42 +02: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
Sherief Farouk 04b0ea3f9a Initialized stride variable to prevent compiler warnings about potential use of unassigned variable. 2013-08-05 00:02:27 -04: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 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 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 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
acgessler 879f2ed177 - fix some -Wall warnings 2012-07-08 03:28:14 +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 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 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 18b2aebcb1 - FBX importer: basic interface and importer skeleton. Start tokenizer and parser. 2012-06-23 03:36:55 +02:00