v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,704 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

95 Commits (4c0171a0e9cd50435eb8be153dacf18a007aa083)

Author SHA1 Message Date
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
acgessler 7fd44f4ab7 Merge branch 'master' of git://github.com/assimp/assimp 2013-01-19 16:35:28 +01:00
Alexander Gessler bae9db2f03 Merge branch 'master' of git://github.com/assimp/assimp 2012-12-21 16:24:05 +01:00
Tor Andersson 771d804c46 ColladaParser: Tolerate empty data arrays and controller weights. 2012-11-28 13:02:51 +01:00
kimmi 30ce13a617 Github merge: Adjusting the Collada Color Parser from albert-wang. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1336 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-11-17 12:47:15 +00:00
Albert Wang 0ea6ec4e84 Fixing some whitespace issues in ColladaParser 2012-11-12 12:39:11 -06:00
Albert Wang 7d4ee98350 Adjusting the Collada Color Parser 
The collada parser parses the RGB descriptor out of the
xml file, but does not use this information when constructing
the actual mColors array.

If you export a collada file with RGB colors, and then import it,
it used to create color values in the form RGBR, taking the
R component from the next color tuple instead of filling in
sensible defaults for the alpha channel.

This patch uses the information to fill each color.
 2012-11-12 12:33:51 -06:00
ulfjorensen 2a580c5518 - fixed/changed/worked on issue 3580054 - XFile materials don't have ambient colours, but emissive 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1322 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-10-25 10:28:40 +00:00
ulfjorensen 54a5088e14 - added a workaround to load Collada files correctly in case the "texcoord" attribute was missing in a <texture> element 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1303 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-24 08:45:23 +00:00
ulfjorensen 62b0284100 - applied patch by peteredc to make the Collada loader write mesh names 
- applied patch by asmaloney for better error messages in the Collada parser

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1301 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-09-21 08:44:37 +00:00
Alexander Gessler 30422fa683 - fix confusion between ASSIMP_BUILD_NO_COLLADA_IMPORTER and ASSIMP_BUILD_NO_DAE_IMPORTER (in favour of the first). 2012-07-07 20:53:24 +02:00
ulfjorensen 6d2857ed4a Bugfix: collada loader now preserves empty data arrays to work around stupid exporters writing empty animation channels 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1246 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-05-05 07:38:14 +00:00
aramis_acg ec6c62e005 - consistent use of ai_assert instead of assert. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-22 23:22:40 +00:00
ulfjorensen 5975f3eff2 - Bugfix: fixed Collada parser to accept empty data elements again 
- Workaround: added a little extra code to handle texture filenames of Maxon Cinema Collada Exporter 

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1231 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-04-02 10:43:18 +00:00
aramis_acg b908b00f96 - Collada: read falloff and hotspot_beam spotlight properties to be compatible with OpenCollada. Thanks to gargaj for the patch. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1201 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-03-14 02:29:17 +00:00
aramis_acg 4dbf539b44 - update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-02-03 03:38:30 +00:00
aramis_acg c12fadc93b - make fast_atof_move a template and rename it to fast_atoreal_move. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1125 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2012-01-31 16:18:32 +00:00
aramis_acg ff705e6fa4 # Collada: allow empty meshes. Thanks to Mark Page for the patch (https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4628297). 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1071 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-08-23 16:27:07 +00:00
aramis_acg 73d109c7cc # bugfix [3295074]: copy'n'paste bug in ReadSamplerProperties would cause y-axis sampler state to be assigned to the respective x values. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@975 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-29 21:32:13 +00:00
aramis_acg 6f30639d7f - refraing from using magic numbers like 0xffffffff all over the repository, rather use UINT_MAX/SIZE_MAX .. 
- minor re-formatting and refactoring at some old code spots.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@970 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2011-04-22 21:29:18 +00:00