Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,225 Commits 19 Branches 43 Tags
c34717639ecb7c99e136bce9952e32b7be330c2a
Commit Graph

114 Commits

Author SHA1 Message Date
Trond Abusdal
c34717639e Collada: Importer generates animations from <library_animation_clips>, if the node is present. 2016-02-07 23:36:49 +01:00
Kim Kulling
1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Alexander Gessler
5847576f41 Merge pull request #703 from terziman/master 
Improvement of collada transparency handling
 2015-12-20 15:59:42 +01:00
Joe Hermaszewski
210764a6ff Correct spelling 2015-12-10 16:19:33 +00:00
Kim Kulling
35fafe3a6f ColladaParser: use initializer lists again. 2015-12-09 23:49:03 +01:00
Kim Kulling
b694bfd021 fix build 2015-12-08 20:36:31 +01: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
0a6788d56f try to fix build. 2015-12-07 20:43:01 +01:00
Kim Kulling
6641188a8e assimp/issues/702: fix resource leak and use initializer list for all 
attributes of the loader instance.
 2015-12-06 12:18:33 +01:00
Danke Xie
24b68b1e3d Support instance_image in Collada 1.5 files 
The <instance_image> tag in sampler2D elements is not expected by
ColladaParser. This patch parses the instance_image element and
gets the image ID.
 2015-11-19 17:36:23 -08:00
Gargaj
9885c3e551 add opencollada extension 2015-08-28 16:20:17 +02:00
Wil Shipley
7a7a496320 - Add include of stdarg, because apparently that's needed to build of Github server with Travis. 2015-07-27 00:54:23 -07:00
Wil Shipley
8b7fa48d27 - Merge in latest from assimp/assimp on GitHub (5c00aef7cd) 
- Added at least some of the new files to my Xcode 6 project, as
well.
    - Built and tested with the DAE importer, seems to work fine.
 2015-07-26 19:16:01 -07: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
Wil Shipley
91ca983d5f - Workaround for Collada exporter in SketchUp 15.3.331 (possibly others) where it'll export the wrong "count" when exporting "lines". 
- When I encounter this condition I just print a warning and use the actual number of points in the file instead of the number they give, as opposed to throwing an exception and bailing on the whole file.
	- For an example of this kind of file see https://3dwarehouse.sketchup.com/warehouse/getpubliccontent?contentId=e4587719-2609-49ed-a2f6-20b98d1215f3&fn=Kartell-GE.zip
	- Some people have complained about this on http://forums.sketchup.com/t/bug-in-lines-exported-at-collada-format/8145
 2015-05-17 18:36:17 -07:00
Léo Terziman
91c751a03a Added missing header 2015-04-28 12:29:39 +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
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
Alexander Gessler
16880b3dbd Fix build after mis-merge. 2015-03-15 23:31:58 +01:00
Alexander Gessler
c59878e427 Merge branch 'master' of github.com:assimp/assimp 
Conflicts:
	code/ColladaLoader.cpp
 2015-03-15 00:18:39 +01: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
Turo Lamminen
5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +02: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
Alexander Gessler
ce1302cd71 Fix VC12 warning "empty but controlled statement found". 2015-02-15 22:20:34 +01:00
Léo Terziman
b367d9b390 Fixed some warnings related to empty statement when using assert & building in release mode 2014-12-18 11:01:16 +01:00
Wolfgang Herget
c08a5581dd ColladaParser::CopyVertex: don't make a local copy of the vertex' indices. 
Instead, we address the relevant indices in the main vector directly by
adding the input offsets to the per-vertex base offset.
 2014-11-20 17:53:06 +01:00
Wolfgang Herget
8dead93504 ColladaParser: don't arbitrarily limit number of per-vertex attributes. 2014-11-20 16:42:41 +01:00
Wolfgang Herget
ca3ce4703d Rename ColladaParser::CopyPrimitive to ::CopyVertex. 
That's a bit closer to what the function actually does.
 2014-11-20 13:12:09 +01:00
Wolfgang Herget
13a157ea66 For Polylists, manually compute the start offset outside CopyPrimitive. 2014-11-20 13:10:15 +01:00
Johannes Ebersold
e568c2df9d ColladaParser::ReadIndexData: don't rely on the specified number of primitives. 
Especially TriStrips don't specify triangle count upfront, so one needs to
sum up the count of triangles read from all <p> tags in a tristrip collection.
 2014-11-19 14:40:43 +01:00
Johannes Ebersold
72f67ea0cd Whitespace changes 2014-11-19 14:40:42 +01:00
Johannes Ebersold
593484829b Add Function ColladaParser::ReadPrimTriStrips. 
This does the index mangling for reading tristrips.
 2014-11-19 14:40:42 +01:00
Johannes Ebersold
0f40dcca7e Add calculation for nuber of Primitives for TriStrips 2014-11-19 14:40:42 +01:00
Johannes Ebersold
7c4bf383d7 Move vertex copy operation into switch statement. 
We will be adding special handling for Tristrips in an upcoming commit,
which unfortunately doesn't map to a common copy loop as it is.
 2014-11-19 14:40:42 +01:00
Johannes Ebersold
4ef244f672 Extract function ColladaParser::CopyPrimitive 2014-11-19 14:40:42 +01:00
Johannes Ebersold
70d2c8571b ColladaParser::ReadPrimitives: get rid of "idx" iterator. 
We will be adding non-sequential access to the indices vector in one of the upcoming commits.
 2014-11-19 14:04:49 +01:00
Johannes Ebersold
543bd5c0d0 ColladaParser::ReadPrimitives: rename "a" to currentPrimitive 2014-11-19 13:51:22 +01:00
unknown
9d04a45088 Collada : Add missing parsing <image> into <effect><profile> markup 2014-08-27 10:15:13 +02:00
George Papadopoulos
284abbe9e1 fix for collada parser when importing empty arrays. 
Exiting function so early break the parsing procedure, misses node closing and causes improper initialization of element (cannot be referenced later on)
 2013-12-20 11:36:35 +02:00
Sherief Farouk
a540c6255c Added parsing of Collada mesh names. 2013-08-15 00:12:58 -04:00
Andy Maloney
a03cb84d0c {COLLADA} Add detail to some errors/warnings & prefer '<>' for elements for readability 2013-06-15 18:00:40 -04:00
Alexander Gessler
0b9d6bec0d - drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits. 2013-03-21 19:54:55 +01:00
ulf
0f781516bf Merge branch 'master' of https://github.com/albert-wang/assimp 
Conflicts:
	code/ColladaParser.cpp
 2013-01-25 19:08:10 +01:00