Commit Graph

380 Commits

Author SHA1 Message Date
Alexander Gessler
5847576f41 Merge pull request #703 from terziman/master
Improvement of collada transparency handling
2015-12-20 15:59:42 +01:00
Alexander Gessler
7e85f45abc Merge pull request #713 from ov/normalize-safe
GenVertexNormalsProcess produces invalid results for specific input
2015-12-20 00:06:58 +01:00
rmitton
957426ed72 Tiny misc fixes for documentation 2015-12-13 22:12:25 -08:00
Vitaly Ovchinnikov
6e2b0b4fd1 a speedup 2015-12-14 15:37:27 +13:00
Vitaly Ovchinnikov
b6f14eb917 Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation 2015-12-14 15:31:49 +13:00
Joe Hermaszewski
210764a6ff Correct spelling 2015-12-10 16:19:33 +00:00
Léo Terziman
6eebf8455a Merge remote-tracking branch 'official/master' into contrib 2015-12-08 15:25:13 +01:00
Léo Terziman
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
Kim Kulling
91a6ff7f0e Importer: fix doxygen comment style to default. 2015-11-28 12:05:55 +01:00
Kim Kulling
ba35c97e9d assimp/assimp/issues/698: Increase upper limits for hints. 2015-11-28 10:06:26 +01:00
Kim Kulling
65d366dad0 Merge pull request #694 from OtgerRP/master
Support for FBX embedded textures
2015-11-24 21:26:34 +01:00
Otger
3c358a8e34 Updated dumps for FBX files 2015-11-24 16:33:31 +01:00
Kim Kulling
70540616ce issue 693: add missing release call in c-export interface. 2015-11-23 21:28:35 +01:00
Otger
f94bc8d66e Initial support for FBX embedded textures 2015-11-23 19:49:54 +01:00
Kim Kulling
02ad376631 assimp/issues/685: add test for correct usage. 2015-11-07 10:00:55 +01:00
Kim Kulling
6f75ea5702 Merge branch 'master' of https://github.com/assimp/assimp 2015-10-31 09:07:21 +01:00
Turo Lamminen
46121a1559 Mark single-parameter constructors explicit
Suggested by cppcheck
2015-10-29 14:04:23 +02:00
Kim Kulling
a1be9285b4 Merge branch 'master' of https://github.com/assimp/assimp 2015-10-08 10:25:35 +02:00
Kim Kulling
4a8b459706 OpenDDLParser: latest greatest. 2015-10-01 20:29:15 +02:00
Lectem
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
Kim Kulling
e9937ab0f7 IOSystem: add missing documentation. 2015-08-30 15:37:56 +02:00
Kim Kulling
e4510c26ba Obj-Importer: fix https://github.com/assimp/assimp/issues/641 2015-08-30 15:21:53 +02:00
Turo Lamminen
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
Kim Kulling
524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
Richard
e4b0c27a2e Refactor: Strip trailing whitespace 2015-06-28 16:09:18 -06:00
Richard
54a2d0808c Refactor: Expand tabs to 4 spaces 2015-06-28 16:08:06 -06:00
Richard
6da45599c0 Refactor: Strip trailing whitespace 2015-06-28 16:08:06 -06:00
Richard
5dbd676c01 Refactor: Use LF line endings 2015-06-28 16:08:06 -06:00
Richard
9d736cc1c5 Implemented: Add editor config file 2015-06-28 16:04:15 -06:00
Kim Kulling
2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02:00
Jaime Machado Neto
de6f0f2a7d Creating the functionality to list all Importer descriptions and the number of importers available. 2015-05-26 08:40:43 -03:00
Andy Maloney
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
wise86Android
2c194f629a fix macro for be uesed with expression 2015-05-19 21:57:51 +02:00
Léo Terziman
ca2e47b205 Fixed some typos 2015-04-29 09:26:11 +02:00
Léo Terziman
5b9af11f9b Merge remote-tracking branch 'official/master' into contrib 2015-04-28 12:04:53 +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
abma
470ad98281 fix "headercheck":
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
Léo Terziman
454b85a0ad Improved prototype of Importer & Exporter SetProperty* functions for better integration with tools such as SWIG 2015-03-27 10:56:03 +01:00
Léo Terziman
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
Ser Lev Arris
a7e4babd9d gcc_struct, old fish, but reinterpreted: 92f4c84488 2015-03-21 11:10:33 +01:00
Madrich
56da80bc6e Copy constructor ExportProperties
Fix name dummy node in PreTransformVertices
2015-03-14 19:03:44 +01:00
Madrich
290a16eea5 Copy constructor for ExportProperties
Export Propertie defines in config.h
Remove unnecessary
2015-03-14 16:31:33 +01:00
Madrich
37572f0f52 Missing include map 2015-03-14 14:22:55 +01:00
Madrich
8b1b12682f Add ExportProperties 2015-03-14 14:03:14 +01:00
Léo Terziman
8ae9e2b555 In Collada: Added missing description of importer specific options 2015-03-10 09:20:00 +01:00
Léo Terziman
18ef31cc06 Merge remote-tracking branch 'official/master' into contrib 2015-03-09 11:31:15 +01:00
Alexander Gessler
b1e8c192db Merge pull request #464 from turol/master
Clean up some warnings
2015-02-28 14:41:26 +01:00
Turo Lamminen
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
Turo Lamminen
308884f144 Remove unnecessary semicolons after function definition
Picked up by clang -Wextra-semi
2015-02-27 23:09:12 +02:00