Commit Graph

291 Commits

Author SHA1 Message Date
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
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
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
Léo Terziman
796e072898 Fixed warnings when using swig 2014-03-03 15:36:49 +01: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
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
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
ad55783f56 Boost libraries on windows are too much a hassle to handle, so thread safety is not worth all the trouble => think to move to c++11 thread support 2014-01-17 12:03:24 +01:00
Léo Terziman
34c3449cdd Always activate thread safety if possible 2014-01-17 12:03:18 +01:00
Léo Terziman
41175dacca Merge commit '6d630bec50fe7767296b0e5184a9c6c7b915df24' into contrib 2014-01-17 11:57:45 +01:00
Léo Terziman
7bc074857e Missing material functions for aiUVTransform added 2014-01-17 11:51:43 +01:00
Léo Terziman
d28fc25c5c Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib
Conflicts:
	CMakeLists.txt
2014-01-17 11:45:57 +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
Léo Terziman
2c4e55ac61 Fixed gcc /mingw building 2014-01-17 11:31:39 +01:00
Léo Terziman
f5e3382d58 Correct some warnings when building with mingw 2014-01-17 11:30:51 +01:00
Léo Terziman
bc40ebd730 Improved color comparison 2014-01-17 11:28:06 +01:00
Léo Terziman
365b3aa412 Improved math operation with epsilon support 2014-01-17 11:21:15 +01:00
Léo Terziman
6c0ebb679a Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib
Conflicts:
	code/ColladaExporter.cpp
2014-01-17 11:19:29 +01:00
Léo Terziman
bbfd56046b Fixed constructor of aiMesh for improved lisibility 2014-01-17 10:33:54 +01:00
Léo Terziman
30c6a74e1d Improving constructors of aiNode & aiScene 2014-01-17 10:31:27 +01:00
Léo Terziman
6b471317d2 Adding support for matrix4x4 construction from position, rotation and scaling parameters 2014-01-17 10:27:11 +01:00
Léo Terziman
5e603d9ed8 Correcting a bug where the constructor & destructor of aiScene were not exported correctly in the assim library 2014-01-17 10:26:48 +01:00
Nick Overdijk
5b076fe234 Fixes warnings in clang for unrecognized attribute 'gcc_struct' 2013-12-14 01:40:37 +01:00
Marcel Metz
93fd1133ff Fixed mingw cross compiler issues. 2013-11-20 14:40:20 +01:00
acgessler
faaea5224f Exporter: update documentation. 2013-10-05 16:18:36 +02:00
acgessler
9c3a0727c6 Material API: fix regression caused by previous commit 69e9e7c403
. Lots of importers use explicit template syntax for AddProperty(), changing to overloads now called the fallback template version. This caused material properties to be often registered as BINARY (instead of FLOAT, INT).
2013-10-03 17:10:01 +02:00
Alexander Gessler
69e9e7c403 aiMaterial: use overloads instead of template specializations. This fixes multiple instances of int material properties being accidentally registered as BINARY because the given type was unsigned int. 2013-09-18 15:17:04 +02:00
Alexander Gessler
45572e8079 Merge branch 'master' of github.com:assimp/assimp 2013-09-04 21:52:17 +02:00
Alexander Gessler
fd0b3490d1 Clarify exporter doc: how to get a modifiable copy of a previously imported scene. 2013-09-02 21:33:43 +02:00
Alexander Gessler
0edb78d940 Add aiFreeScene() API for symmetry with aiCopyScene. 2013-09-02 21:32:20 +02:00
abma
169e5b9f35 fix error "Chunk is too large" with gcc >=4.7.0 / mingw64 2013-08-29 06:31:10 +02:00
Sherief Farouk
0d57e659cb Added AI_WONT_RETURN_SUFFIX mainly for Clang's static analyzer. 2013-08-04 10:10:21 -04:00
YoheiKakiuchi
5470f5fb28 add AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION for not transforming position of vertices 2013-07-27 10:34:48 +09:00
Alexander Gessler
506d3fa154 Forward declare IOSystem in Exporter.hpp 2013-06-30 16:25:46 +02:00
Andy Maloney
1da281c1f8 Make sure members are initialized properly
Prefer initialization lists
Assignment operator should not return a const ref
2013-06-21 10:56:11 -04:00
Alexander Gessler
27c578675a Merge pull request #51 from asmaloney/init_fixes
Prefer init list and add missing initializations
2013-06-12 08:16:14 -07:00
Andy Maloney
c6d1a73854 Fix a logging message and a comment 2013-06-12 09:01:05 -04:00
Andy Maloney
0e54b87b1e Prefer init list and add missing initializations 2013-06-12 08:59:47 -04:00
Dennis Schridde
2bdbcd78e7 Amend dd1a18149cac29a69a0242a5efc467498f5f05cd: Visibility attribute is needed for MSVC/C++ 2013-05-16 13:08:05 +02:00
Dennis Schridde
a65a69fdc9 Fixes a bunch of errors with -pedantic -std=c99 and GCC 4.7.2: ISO C restricts enumerator values to range of ‘int’ 2013-05-16 13:08:05 +02:00
Dennis Schridde
bcc311515a Fixes an error with -pedantic -std=c99 and GCC 4.7.2: ‘visibility’ attribute ignored on types 2013-05-16 13:08:05 +02:00
Jared Duke
6551fd4903 Update material.inl
aiMaterial::AddProperty template specializations are used by import methods in B3DImporter and SceneProcessor; they should be defined accordingly even when ASSIMP_BUILD_NO_EXPORT is defined.
2013-04-17 18:47:52 -07:00