9621dff027
Morph animation support for collada
2017-01-12 13:41:32 +02:00
0c7aac02eb
Fixes spelling in comments
2016-12-07 21:31:51 -05:00
98e7eb476d
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/ObjFileImporter.cpp
2016-11-27 13:00:33 +11:00
d87400b76a
Fix some findings in animation header.
2016-11-23 20:20:11 +01:00
3b63e4af54
Fixed build warnings on MSVC14 x64 in the Collada parser.
2016-11-19 02:42:51 +11:00
02e038bbb6
Fix compiler warnings related to issue 957.
2016-11-03 18:37:02 +01:00
5cb4df80ad
C++11-combat: hopefully the last std::to_string to replace.
2016-10-15 21:45:58 +02:00
05a6ee6473
Adding double precision import support for formats that can be exported
2016-07-16 18:23:33 +10:00
0a1dda22b2
ColladaParser: add warning when empty semantic will be parsed.
2016-06-04 17:53:51 +02:00
8fa0071d16
closes https://github.com/assimp/assimp/issues/892 : add own to_string
...
implementation.
2016-05-26 00:44:29 +02:00
b37e25cd7d
Replaced boost::format with internal formater
2016-04-06 00:03:05 +02:00
5dacda0a08
replaced boost smart pointers with c++11 smart pointers
2016-04-05 23:23:53 +02:00
18843fe5e1
Replaced BOOST_FOREACH with c++11 ranged for loops
2016-04-05 22:53:54 +02:00
87e7cf00a2
Fix spelling mistakes
2016-04-03 01:38:00 +01:00
f20a5afcf0
can't add integer to string pointer
2016-02-18 12:17:47 -08:00
ccd9f92533
Fixed a couple of nested template brackets that wasn't spaced out correctly.
2016-02-11 01:00:03 +01:00
7e58a47ba0
* Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes.
...
* Changed name of ColladaParser::RebuildRootAnimationsFromClips to ColladaParser::PostProcessRootAnimations as it now does more than it did before.
2016-02-10 23:57:29 +01:00
c34717639e
Collada: Importer generates animations from <library_animation_clips>, if the node is present.
2016-02-07 23:36:49 +01:00
1191d03405
Update license info.
2016-01-01 21:07:24 +01:00
5847576f41
Merge pull request #703 from terziman/master
...
Improvement of collada transparency handling
2015-12-20 15:59:42 +01:00
210764a6ff
Correct spelling
2015-12-10 16:19:33 +00:00
35fafe3a6f
ColladaParser: use initializer lists again.
2015-12-09 23:49:03 +01:00
b694bfd021
fix build
2015-12-08 20:36:31 +01: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
0a6788d56f
try to fix build.
2015-12-07 20:43:01 +01:00
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
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
9885c3e551
add opencollada extension
2015-08-28 16:20:17 +02:00
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
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
83de707587
Refactor: Expand tabs to 4 spaces
2015-06-28 16:04:15 -06:00
a96a595a7a
Refactor: Trim trailing whitespace
2015-06-28 16:01:32 -06:00
4c1a0507fe
Refactor: Line endings are LF, not CRLF
2015-06-28 15:59:33 -06:00
2bfc353fde
License info: update year info.
2015-06-28 21:48:25 +02:00
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
91c751a03a
Added missing header
2015-04-28 12:29:39 +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
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
16880b3dbd
Fix build after mis-merge.
2015-03-15 23:31:58 +01:00
c59878e427
Merge branch 'master' of github.com:assimp/assimp
...
Conflicts:
code/ColladaLoader.cpp
2015-03-15 00:18:39 +01:00
18ef31cc06
Merge remote-tracking branch 'official/master' into contrib
2015-03-09 11:31:15 +01:00
c410512173
Use material names, set default direction to UP_Y, process extra tag
2015-03-08 22:37:48 +03:00
5a74e07f5f
Mark some more functions with AI_WONT_RETURN
2015-02-27 23:09:12 +02: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
ce1302cd71
Fix VC12 warning "empty but controlled statement found".
2015-02-15 22:20:34 +01:00
b367d9b390
Fixed some warnings related to empty statement when using assert & building in release mode
2014-12-18 11:01:16 +01:00
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
Antti Määttä
Andy Maloney
Jared Mulconry
Kim Kulling
Chris Russ
mensinda
Eric Engestrom
Paul Holland
Trond Abusdal
Alexander Gessler
Joe Hermaszewski
Léo Terziman
Danke Xie
Gargaj
Wil Shipley
Richard
abma
Alexander Gessler
DenisMikhalev
Turo Lamminen
Wolfgang Herget