c02a1dd11a
closes assimp/assimp/issues/710: use correct include for importerdesc in
...
cimport.h
2016-01-20 21:25:47 +01:00
430b614a69
coverity scan: make place of false positive more understandable.
2016-01-08 16:18:32 +01:00
346bf9375b
ai_assert: add missing license info.
2016-01-07 15:02:41 +01:00
b6673c3fca
Update license info in public headers
2016-01-01 21:08:28 +01:00
5847576f41
Merge pull request #703 from terziman/master
...
Improvement of collada transparency handling
2015-12-20 15:59:42 +01:00
7e85f45abc
Merge pull request #713 from ov/normalize-safe
...
GenVertexNormalsProcess produces invalid results for specific input
2015-12-20 00:06:58 +01:00
957426ed72
Tiny misc fixes for documentation
2015-12-13 22:12:25 -08:00
6e2b0b4fd1
a speedup
2015-12-14 15:37:27 +13:00
b6f14eb917
Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation
2015-12-14 15:31:49 +13:00
210764a6ff
Correct spelling
2015-12-10 16:19:33 +00:00
6eebf8455a
Merge remote-tracking branch 'official/master' into contrib
2015-12-08 15:25:13 +01:00
445ae1fec3
In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO)
...
+ removed user option to invert transparency as it does not seem to be needed anymore
+ fixed bug in default reflectivity value
2015-12-08 15:24:07 +01:00
91a6ff7f0e
Importer: fix doxygen comment style to default.
2015-11-28 12:05:55 +01:00
ba35c97e9d
assimp/assimp/issues/698: Increase upper limits for hints.
2015-11-28 10:06:26 +01:00
65d366dad0
Merge pull request #694 from OtgerRP/master
...
Support for FBX embedded textures
2015-11-24 21:26:34 +01:00
3c358a8e34
Updated dumps for FBX files
2015-11-24 16:33:31 +01:00
70540616ce
issue 693: add missing release call in c-export interface.
2015-11-23 21:28:35 +01:00
f94bc8d66e
Initial support for FBX embedded textures
2015-11-23 19:49:54 +01:00
02ad376631
assimp/issues/685: add test for correct usage.
2015-11-07 10:00:55 +01:00
6f75ea5702
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-31 09:07:21 +01:00
46121a1559
Mark single-parameter constructors explicit
...
Suggested by cppcheck
2015-10-29 14:04:23 +02:00
a1be9285b4
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-08 10:25:35 +02:00
4a8b459706
OpenDDLParser: latest greatest.
2015-10-01 20:29:15 +02:00
6f0bc9bcb2
remove memory.h dependancy
...
Some embedded (or exotic) systems won't provide this header, and it seems to be unused (since memcpy is in string.h).
Tested on MinGW and VS2015.
2015-09-30 09:16:18 -04:00
e9937ab0f7
IOSystem: add missing documentation.
2015-08-30 15:37:56 +02:00
e4510c26ba
Obj-Importer: fix https://github.com/assimp/assimp/issues/641
2015-08-30 15:21:53 +02:00
0b0ba2ec4d
Refactor logic which checks for too large allocations
...
It's now easier to change the limit
2015-08-14 11:53:16 +03:00
524834c307
Fix line endings.
2015-08-08 18:02:37 +02:00
e4b0c27a2e
Refactor: Strip trailing whitespace
2015-06-28 16:09:18 -06:00
54a2d0808c
Refactor: Expand tabs to 4 spaces
2015-06-28 16:08:06 -06:00
6da45599c0
Refactor: Strip trailing whitespace
2015-06-28 16:08:06 -06:00
5dbd676c01
Refactor: Use LF line endings
2015-06-28 16:08:06 -06:00
9d736cc1c5
Implemented: Add editor config file
2015-06-28 16:04:15 -06:00
2bfc353fde
License info: update year info.
2015-06-28 21:48:25 +02:00
de6f0f2a7d
Creating the functionality to list all Importer descriptions and the number of importers available.
2015-05-26 08:40:43 -03:00
4cbce374b6
Code Cleanups
...
- add initializers to classes
- fix %i/%u for unsigned ints
- remove unused vars
- pass by reference
2015-05-24 11:55:37 -04:00
2c194f629a
fix macro for be uesed with expression
2015-05-19 21:57:51 +02:00
ca2e47b205
Fixed some typos
2015-04-29 09:26:11 +02:00
5b9af11f9b
Merge remote-tracking branch 'official/master' into contrib
2015-04-28 12:04:53 +02:00
8c45a4dc3b
Merge remote-tracking branch 'origin'
...
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
2015-04-16 01:03:00 +02:00
bf4913b5c9
remove AssimpPCH.h: fixes #534
2015-04-16 01:00:17 +02:00
470ad98281
fix "headercheck":
...
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
454b85a0ad
Improved prototype of Importer & Exporter SetProperty* functions for better integration with tools such as SWIG
2015-03-27 10:56:03 +01:00
60d58901a5
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
code/ColladaParser.cpp
include/assimp/config.h
2015-03-27 09:55:21 +01:00
a7e4babd9d
gcc_struct, old fish, but reinterpreted: 92f4c84488
2015-03-21 11:10:33 +01:00
56da80bc6e
Copy constructor ExportProperties
...
Fix name dummy node in PreTransformVertices
2015-03-14 19:03:44 +01:00
290a16eea5
Copy constructor for ExportProperties
...
Export Propertie defines in config.h
Remove unnecessary
2015-03-14 16:31:33 +01:00
37572f0f52
Missing include map
2015-03-14 14:22:55 +01:00
8b1b12682f
Add ExportProperties
2015-03-14 14:03:14 +01:00
8ae9e2b555
In Collada: Added missing description of importer specific options
2015-03-10 09:20:00 +01:00
18ef31cc06
Merge remote-tracking branch 'official/master' into contrib
2015-03-09 11:31:15 +01:00
b1e8c192db
Merge pull request #464 from turol/master
...
Clean up some warnings
2015-02-28 14:41:26 +01:00
db6d8a4dc5
Use attribute noreturn on both GCC and Clang
...
Both GCC and Clang define __GNUC__ and both also understand
attribute noreturn.
2015-02-27 23:09:12 +02:00
308884f144
Remove unnecessary semicolons after function definition
...
Picked up by clang -Wextra-semi
2015-02-27 23:09:12 +02:00
2274c96e3b
Merge remote-tracking branch 'official/master' into contrib
2015-02-18 17:22:44 +01:00
d9a2293491
Improved handling of transparency in collada importer
...
+ started preliminary support for RGB_ZERO collada transparency mode
+ added option to manually invert transparency values to deal with broken exporters that don't follow the specs
2015-02-18 17:20:03 +01:00
7bab42f55f
Fixed many doxygen errors
2015-02-18 17:02:30 +09:00
1bdb31f8aa
Fixed error of aiQuaterniont::Rotate()
...
The function rotates a point to opposite direction.
Conjugate() should be applied to inverse of the quaternion.
2015-01-26 21:09:54 +09:00
50dbb867ec
Include stdint.h for uint64_t
2015-01-22 21:27:43 +00:00
7494cb6e4b
Use correct include file for INT_MAX
...
INT_MAX is defined in limits.h, not stdint.h
2015-01-22 20:19:34 +00:00
b367d9b390
Fixed some warnings related to empty statement when using assert & building in release mode
2014-12-18 11:01:16 +01:00
951431db94
add missing documentation.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-01 21:27:48 +01:00
7a31a68cfc
adapt c-api to get ImporterDesc for a given loader ( see https://github.com/assimp/assimp/issues/412 ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-01 20:34:15 +01:00
7224476ee1
Android JNI asset extraction support (API 9+)
...
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 16:33:43 +02:00
775b26e614
use std:: namespace for most cmath functions:
...
http://en.cppreference.com/w/cpp/header/cmath
2014-09-23 00:43:33 +02:00
ae7aba3647
+ comment
2014-08-28 16:34:39 +02:00
d333e08343
add ambient light type, allow collada to load it
2014-08-28 16:27:29 +02:00
6c5f9ecb06
fix most warnings with -pendantic
2014-08-18 02:09:06 +02:00
8f960f0ed2
avoid division by zero
2014-08-05 19:36:18 +02:00
dbc553343c
Granulate file loading too
2014-08-05 00:05:18 +02:00
dfe1f03e5b
Split off postprocessing progress
2014-08-04 23:57:08 +02:00
1207f84f7b
Merge pull request #298 from Madrich/master
...
Collada fixes, adding XFile Exporter
2014-06-21 18:54:11 +02:00
1cb01c54a3
Fix IOSFixed
...
Fix Author/AuthoringTool in Collada by MetaData
2014-06-20 00:08:11 +02:00
be5fc42e16
Fix memory corruption in the aiGetExportFormatDescription() API. Clarify Exporter doc.
2014-06-17 16:10:55 +02:00
edc7a950c4
ReFix the stuff before
...
Fix XFileExporter Normal
Fix Collada (Triangle->Poly)
2014-06-11 00:41:18 +02:00
272a59cd36
Fix convertToLH for uv coordinates
...
Fix Collada export
Fix XFile export
2014-06-10 13:14:41 +02:00
ec2ce90654
Add Scene Author + AuthorTool
...
Add XFileExporter
Add Collada Triangle+Line export
Fix Obj Comment
2014-06-06 01:56:54 +02:00
199d455261
Make aiMatrix4x4t ctor that takes in pos, rot and scale take in const refs. Fixes #284 .
2014-05-30 02:01:29 +03:00
fe87b09246
Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290 .
2014-05-30 01:57:21 +03:00
3acf60f5d7
Correction on quaternion initialization values
...
a 0 0 0 0 quaternion is not valid
2014-05-27 11:26:55 +02:00
0f71d46c35
Merge pull request #276 from g-pechorin/master
...
lt operator for aiVector3
2014-05-14 21:35:48 +02:00
057a7ffe60
added a lt operator to the inline
...
added a lt operator to the inline, so that I can use aiVectors as stl keys and such
2014-05-14 14:16:53 +01:00
09fffac068
added a lt operator to the header
...
added a lt operator to the header, so that I can use aiVectors as stl keys and such
2014-05-14 14:16:49 +01:00
fb1c9ab86d
bugfix: fix cexport API for c compilers.
2014-05-11 16:50:35 +02:00
8c8c5329e9
bugfix:
...
- fix c-api: insert a missing typedef for the metadata api enum.
- gix c-api: move cpp-include to cpp-part of the api.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 15:24:12 +02:00
283394d695
OgreImporter: Cleanup skeleton related code and code that populates the assimp scene. Tested skeleton/animation imports and it seems to work correctly now.
2014-05-02 00:28:14 +03:00
6ea07f39e1
OgreImporter: Rewrote documentation for AI_CONFIG_IMPORT_OGRE_MATERIAL_FILE and AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME to reflect the current logic. And to be honest the earlier one was very confusing english and was not very clear what is happening with these config options.
2014-05-02 00:28:11 +03:00
825a61fbc0
update:
...
- update version info for 3.1
- aiGetVersionRevision will now return the git tag.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-01 11:32:15 +02:00
c329e81c94
Fix stdint.h include that broke the build for VC9 and below.
2014-04-30 05:58:19 +03:00
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
f48c8eccce
Fix for issue #177 with mingw
2014-04-21 21:58:29 +02:00
38de6a658d
bugfix:
...
- fix redundant checks against nullptr ( see https://github.com/assimp/assimp/issues/241 ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-27 20:33:08 +01:00
f9d5852ef9
bugfix:
...
- add global namespace statement to sqrt.
refactoring:
- include cmath instead of math.h in c++ API.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-27 19:19:25 +01:00
ed586a35ae
Fixed compilation error when using swig
2014-03-24 11:24:27 +01:00
1f3be52079
Merge remote-tracking branch 'official/master' into contrib
2014-03-24 10:44:57 +01:00
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
595529ef8b
Refactored the metadata for inner consistency.
2014-03-15 08:37:45 +01:00
9b78a180d9
Added a convenience overload for aiMetadata::Get using std::string as key.
2014-03-14 17:12:22 +01:00
56f37a0465
Deprecated some abstraction and fixed a memory leak.
2014-03-14 15:36:12 +01:00
fc39fe9f40
Fixed a compile error involving unnecessary enum resolution qualification.
2014-03-14 15:01:36 +01:00
a8401ba377
Added support for heterogenous metadata on the aiNodes.
2014-03-14 14:17:34 +01:00
796e072898
Fixed warnings when using swig
2014-03-03 15:36:49 +01:00
f54c85d4e6
Added custom root transformation for pre-transform vertices post-process step
2014-02-28 15:32:43 +01:00
843e56c252
Added matrix properties
2014-02-28 15:21:10 +01:00
b90718bd21
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
code/IFCLoader.cpp
2014-02-26 18:06:46 +01:00
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
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
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
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
34c3449cdd
Always activate thread safety if possible
2014-01-17 12:03:18 +01:00
41175dacca
Merge commit '6d630bec50fe7767296b0e5184a9c6c7b915df24' into contrib
2014-01-17 11:57:45 +01:00
7bc074857e
Missing material functions for aiUVTransform added
2014-01-17 11:51:43 +01:00
d28fc25c5c
Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib
...
Conflicts:
CMakeLists.txt
2014-01-17 11:45:57 +01:00
4e7b59be55
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
2c4e55ac61
Fixed gcc /mingw building
2014-01-17 11:31:39 +01:00
f5e3382d58
Correct some warnings when building with mingw
2014-01-17 11:30:51 +01:00
bc40ebd730
Improved color comparison
2014-01-17 11:28:06 +01:00
365b3aa412
Improved math operation with epsilon support
2014-01-17 11:21:15 +01:00
6c0ebb679a
Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib
...
Conflicts:
code/ColladaExporter.cpp
2014-01-17 11:19:29 +01:00
bbfd56046b
Fixed constructor of aiMesh for improved lisibility
2014-01-17 10:33:54 +01:00
30c6a74e1d
Improving constructors of aiNode & aiScene
2014-01-17 10:31:27 +01:00
6b471317d2
Adding support for matrix4x4 construction from position, rotation and scaling parameters
2014-01-17 10:27:11 +01:00
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
5b076fe234
Fixes warnings in clang for unrecognized attribute 'gcc_struct'
2013-12-14 01:40:37 +01:00
93fd1133ff
Fixed mingw cross compiler issues.
2013-11-20 14:40:20 +01:00
faaea5224f
Exporter: update documentation.
2013-10-05 16:18:36 +02:00
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
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
45572e8079
Merge branch 'master' of github.com:assimp/assimp
2013-09-04 21:52:17 +02:00
fd0b3490d1
Clarify exporter doc: how to get a modifiable copy of a previously imported scene.
2013-09-02 21:33:43 +02:00
0edb78d940
Add aiFreeScene() API for symmetry with aiCopyScene.
2013-09-02 21:32:20 +02:00
169e5b9f35
fix error "Chunk is too large" with gcc >=4.7.0 / mingw64
2013-08-29 06:31:10 +02:00
0d57e659cb
Added AI_WONT_RETURN_SUFFIX mainly for Clang's static analyzer.
2013-08-04 10:10:21 -04:00
5470f5fb28
add AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION for not transforming position of vertices
2013-07-27 10:34:48 +09:00
506d3fa154
Forward declare IOSystem in Exporter.hpp
2013-06-30 16:25:46 +02:00
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
27c578675a
Merge pull request #51 from asmaloney/init_fixes
...
Prefer init list and add missing initializations
2013-06-12 08:16:14 -07:00
c6d1a73854
Fix a logging message and a comment
2013-06-12 09:01:05 -04:00
0e54b87b1e
Prefer init list and add missing initializations
2013-06-12 08:59:47 -04:00
2bdbcd78e7
Amend dd1a18149cac29a69a0242a5efc467498f5f05cd: Visibility attribute is needed for MSVC/C++
2013-05-16 13:08:05 +02:00
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
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
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
fa5831f41a
- add metadata support to aiScene. Some doc cleanup. Add const versions of aiScene::aiNode.
2013-03-28 20:54:12 +01:00
bdfcb4b0cb
- add ASSIMP_BUILD_NO_COMPRESSED_IFC option. Properly integrate Q3BSP's unzip dependency into the build configuration.
2013-03-28 13:38:42 +01:00
c016198191
aiMesh: fix copy constructor so issue [3572335] (and any further instances of the same pattern in creating face arrays) is resolved.
2013-03-21 20:17:09 +01:00
260568912c
- Importer::ReadFileFromMemory/aiImportFileFromMemory() clarify wording in documentation
2013-03-10 19:15:14 +01:00
b20023ed3d
Pass by reference, not value
2013-02-10 22:23:13 -05:00
7fd44f4ab7
Merge branch 'master' of git://github.com/assimp/assimp
2013-01-19 16:35:28 +01:00
ab9587dd1e
Merge pull request #12 from ccxvii/master
...
Precision fix and Collada robustness fix.
2013-01-15 12:04:48 -08:00
Kim Kulling
Alexander Gessler
rmitton
Vitaly Ovchinnikov
Joe Hermaszewski
Léo Terziman
Kim Kulling
Otger
Turo Lamminen
Lectem
Richard
Jaime Machado Neto
Andy Maloney
wise86Android
abma
Ser Lev Arris
Madrich
mbp566
yeonseok-yi
Joe Hermaszewski
Filip Wasil
Gargaj
Madrich
Jonne Nauha
arkeon
Peter LaValle
xantares
Frederik Aalund
George Papadopoulos
David Greaves
Nick Overdijk
Marcel Metz
Sherief Farouk
YoheiKakiuchi
Andy Maloney
Dennis Schridde
Jared Duke