Commit Graph

130 Commits

Author SHA1 Message Date
Daniel Hritzkiv
d518289e72 more specific token search for Collada Loader
collada can appear in many files, such as glTFs via the “generator” field (in the form of collada2gltf)
2017-09-11 11:02:15 -04:00
Jared Mulconry
98532b45bf Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-10 19:04:44 +10:00
jamesgk
727cffdfb4 Use unique node names when loading Collada files 2017-07-14 11:54:37 -07:00
Kim Kulling
e66dc5c9ad Collada: add workaround to deal with polygon with holes . 2017-07-11 10:42:10 +02:00
Arkeon
f84851e893 PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation
IFC :
 - update poly2tri to avoid crash on some IFC files

Collada :
 - manage missing texture reference in collada import
2017-06-02 13:48:57 +02:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Kim Kulling
bb7f387bcf Merge branch 'master' of https://github.com/assimp/assimp 2017-03-11 22:13:48 +01:00
Antoine Bolvy
5dd1bb9d6c Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/ 2017-02-28 11:44:04 +09:00
Kim Kulling
ef540f46a3 Remove unused headers. 2017-02-22 17:20:26 +01:00
Antti Määttä
9621dff027 Morph animation support for collada 2017-01-12 13:41:32 +02:00
Jared Mulconry
128c27e89c Fixed build warnings on MSVC14 x64 in the Collada loader. 2016-11-19 03:16:06 +11:00
Kim Kulling
02e038bbb6 Fix compiler warnings related to issue 957. 2016-11-03 18:37:02 +01:00
Eshed
a84bf869c2 replace more math.h functions occurences with std:: 2016-10-15 12:05:57 +03:00
Eshed
25cda401c5 use cmath and C++ (std::) versions of functions 2016-10-15 03:29:45 +03:00
Chris Russ
05a6ee6473 Adding double precision import support for formats that can be exported 2016-07-16 18:23:33 +10:00
Kim Kulling
7207e5117c Use new include bracktes. 2016-06-06 22:04:29 +02:00
Turo Lamminen
52405bbe1b Collada: Use C++11 range-based for loop 2016-05-22 13:57:11 +03:00
mensinda
b37e25cd7d Replaced boost::format with internal formater 2016-04-06 00:03:05 +02:00
mensinda
18843fe5e1 Replaced BOOST_FOREACH with c++11 ranged for loops 2016-04-05 22:53:54 +02:00
Eric Engestrom
87e7cf00a2 Fix spelling mistakes 2016-04-03 01:38:00 +01:00
Kim Kulling
644d6a9a67 Collada: refactorings. 2016-03-15 21:17:38 +01:00
Kim Kulling
e3d7ca264c Collada: reset workaround. 2016-03-15 19:28:57 +01:00
Kim Kulling
3a7c3a5698 Test for issue-731: possible overflow. 2016-03-14 21:00:08 +01:00
Kim Kulling
18c0e41d8f Colladaloader: fix usage of floorf. 2016-01-13 10:04:24 +01:00
Kim Kulling
42c1f9d3ba Closes https://github.com/assimp/assimp/issues/630: fix mis-merge. 2016-01-12 20:22:37 +01:00
Kim Kulling
3033d8c847 ColladaLoader: add missing .f 2016-01-09 18:09:52 +01:00
Kim Kulling
d18f978178 ColladaLoader: add missing members to initializer list. 2016-01-09 18:09:10 +01:00
Kim Kulling
1191d03405 Update license info. 2016-01-01 21:07:24 +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
rdb
1eef4c387f Correct value for mColorAmbient for COLLADA files 2015-07-05 14:30:27 +02:00
Richard
83de707587 Refactor: Expand tabs to 4 spaces 2015-06-28 16:04:15 -06:00
Richard
a96a595a7a Refactor: Trim trailing whitespace 2015-06-28 16:01:32 -06:00
Richard
4c1a0507fe Refactor: Line endings are LF, not CRLF 2015-06-28 15:59:33 -06:00
Kim Kulling
2bfc353fde License info: update year info. 2015-06-28 21:48:25 +02: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
Alexander Gessler
9538b7ed42 Merge pull request #570 from wise86-android/colladaExportLightAndCamera
Collada export light and camera
2015-05-23 12:06:23 +02:00
wise86Android
b1d085b6a9 fix the foruma for compute the mAngleOuterCone values 2015-05-19 23:08:31 +02:00
Andy Maloney
c014bb977c - add missing initialization of several class members
- prefer check for empty() over check for size() in OptimizeGraph (empty() is guaranteed to be constant time, size() is not)
- fix a couple of incorrect indentations
2015-05-17 20:48:23 -04:00
Léo Terziman
5b9af11f9b Merge remote-tracking branch 'official/master' into contrib 2015-04-28 12:04:53 +02:00
abma
611778045d fix for upstream changes 2015-04-16 02:55:41 +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
Léo Terziman
18ef31cc06 Merge remote-tracking branch 'official/master' into contrib 2015-03-09 11:31:15 +01:00
DenisMikhalev
c410512173 Use material names, set default direction to UP_Y, process extra tag 2015-03-08 22:37:48 +03:00
Léo Terziman
2274c96e3b Merge remote-tracking branch 'official/master' into contrib 2015-02-18 17:22:44 +01:00
Léo Terziman
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
Tom Mettam
a09de30d83 Add support for component controlled matrix transforms, i.e transform(0)(0) etc. 2015-01-21 01:45:35 +00:00
abma
775b26e614 use std:: namespace for most cmath functions:
http://en.cppreference.com/w/cpp/header/cmath
2014-09-23 00:43:33 +02:00
acgessler
1a594b861a Collada: use a counter instead of clock() to generate unique names. Closes #357 2014-09-04 18:50:37 -07:00
Gargaj
d333e08343 add ambient light type, allow collada to load it 2014-08-28 16:27:29 +02:00