Kim Kulling
|
078dd0c08b
|
Merge pull request #705 from Vertexwahn/master
Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder
|
2015-12-11 14:09:59 +01:00 |
Vertexwahn
|
270355f326
|
Improved Findassimp.cmake to support VS2013. Added deployment of VS2013 libs and dll files.
|
2015-12-11 10:33:47 +01:00 |
Alexander Gessler
|
5fc66d6c43
|
Merge pull request #706 from expipiplus1/spelling
Correct spelling
|
2015-12-10 21:49:24 +01:00 |
|
Vertexwahn
|
1fd66df37d
|
Improved Findassimp.cmake to support VS2015.
|
2015-12-10 17:58:55 +01:00 |
Joe Hermaszewski
|
210764a6ff
|
Correct spelling
|
2015-12-10 16:19:33 +00:00 |
|
Vertexwahn
|
c6d1fcca74
|
Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder
|
2015-12-10 17:15:27 +01:00 |
|
Vertexwahn
|
cbafae9e49
|
Merge pull request #1 from assimp/master
Merge
|
2015-12-10 16:52:03 +01:00 |
|
Kim Kulling
|
b440f67aae
|
Merge pull request #704 from Vertexwahn/master
Added missing DLL suffix for VS2015 build.
|
2015-12-09 23:52:15 +01:00 |
Kim Kulling
|
9a6049d98d
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2015-12-09 23:50:00 +01:00 |
|
Kim Kulling
|
35fafe3a6f
|
ColladaParser: use initializer lists again.
|
2015-12-09 23:49:03 +01:00 |
Vertexwahn
|
3013b6b62f
|
Added missing DLL suffix for VS2015 build.
|
2015-12-09 21:58:29 +01:00 |
|
Kim Kulling
|
bf4ca8162d
|
Update ColladaParser.cpp
Introduce workaround again to fix the build.
|
2015-12-09 15:07:58 +01:00 |
|
Kim Kulling
|
9ae7d438f0
|
Update ColladaParser.cpp
Try to close resource leak.
|
2015-12-09 12:10:31 +01:00 |
|
Kim Kulling
|
bcff6210b3
|
Regression test: fix deprecated python print call.
|
2015-12-08 21:33:08 +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 |
lutz.hoeren
|
2f3c47cab6
|
Only read Element Data when there is a valid Mapping Information
|
2015-12-08 12:26:41 +01:00 |
|
Kim Kulling
|
0a6788d56f
|
try to fix build.
|
2015-12-07 20:43:01 +01:00 |
|
Kim Kulling
|
f5e13874e0
|
glTF: check if exporter option has broke someting.
|
2015-12-06 16:49:10 +01:00 |
|
Kim Kulling
|
99b51eb456
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2015-12-06 12:20:11 +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 |
|
Kim Kulling
|
a972397196
|
Merge pull request #699 from otgerp/master
glTF exporter + improved the importer (and code refactor)
|
2015-12-03 13:19:38 +01:00 |
Otger
|
ffdcc78d91
|
Merge
|
2015-12-02 21:06:22 +01:00 |
|
Kim Kulling
|
8736907009
|
Importer: fix overflowImporter: fix overflow.
|
2015-12-02 19:58:43 +01:00 |
|
Kim Kulling
|
f839232938
|
Uinittests: add missing license info headers.
|
2015-12-02 14:54:29 +01:00 |
|
Kim Kulling
|
1ef84a962f
|
README: add glTF to readme.md
|
2015-12-01 19:34:54 +01:00 |
|
Kim Kulling
|
f896c3329a
|
Build: remove deprecated third party lib from cmake
|
2015-11-30 12:52:49 +01:00 |
|
Otger
|
166ff63af9
|
Updated CMAKE - removed removed package inclusion
|
2015-11-29 21:20:31 +01:00 |
|
Otger
|
c5cb7f7b73
|
Merge branch 'master' of git://github.com/assimp/assimp
|
2015-11-29 21:17:05 +01:00 |
|
Otger
|
f2c49a69ba
|
Fixing gcc errors - second attempt
|
2015-11-29 21:13:35 +01:00 |
|
Kim Kulling
|
714630cc11
|
Contrib: remove deprecated pacakgeContrib: remove deprecated pacakge..
|
2015-11-29 20:37:05 +01:00 |
|
Otger
|
d72443d6b0
|
Fixed gcc warnings and errors
|
2015-11-29 20:17:06 +01:00 |
|
Otger
|
4f757cdf5a
|
Implemented basic glTF exporter and improved the importer (plus some code refactor)
|
2015-11-29 19:13:51 +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
|
75f7d93434
|
Merge pull request #697 from otgerp/master
Basic glTF support (experimental)
|
2015-11-27 08:54:32 +01:00 |
|
Otger
|
5942d60aea
|
Fixed gcc errors
|
2015-11-27 02:31:18 +01:00 |
|
Otger
|
526027999b
|
Merge
|
2015-11-27 01:44:06 +01:00 |
|
Otger
|
b307ec643d
|
Created exporter class and fixed a few bugs
|
2015-11-27 01:16:48 +01:00 |
|
Kim Kulling
|
fc6f35dab2
|
Merge branch 'master' of https://github.com/assimp/assimp
|
2015-11-26 20:53:41 +01:00 |
|
Kim Kulling
|
502d9f17b6
|
glTF: add importer to registry and try to parse json.
|
2015-11-26 20:49:00 +01:00 |
|
Kim Kulling
|
a655467b59
|
Merge pull request #692 from dankex/instance_image
instance_image support for sample2D in Collada 1.5
|
2015-11-26 14:06:09 +01:00 |
|
Kim Kulling
|
398c1361d3
|
Merge pull request #674 from suikki/master
FBX import: If animation is not defining keys for all vector components (x, y and z), use the node transform as the default value.
|
2015-11-26 13:50:34 +01:00 |
|
Otger
|
148a20a703
|
Experimental support for glTF
|
2015-11-26 02:36:22 +01:00 |
|
Otger
|
64a020965f
|
Added RapidJSON to contrib
|
2015-11-26 02:33:39 +01:00 |
|
Kim Kulling
|
702ef1a513
|
glTF: add missing attribute buffer for text streams.
|
2015-11-25 22:31:23 +01:00 |
|
Kim Kulling
|
db8845d2b2
|
glTF: add jsn reader + example model to work on.
|
2015-11-25 22:03:39 +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
|
a51d9a3884
|
Ignore FBX 'PP' type connections (they were stopping the file parsing)
|
2015-11-24 17:51:11 +01:00 |