36e53b75fa
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>
2017-01-27 14:29:18 +03:00
d73a64b061
Merge remote-tracking branch 'upstream/master'
2017-01-27 10:57:32 +03:00
3e4a01ab04
Merge pull request #1150 from AntiMoron/master
...
Fix compiler cpp std version
2017-01-26 21:05:06 +01:00
696b6c1e97
Merge pull request #1152 from elect86/patch-6
...
Update ColladaParser.cpp
2017-01-26 21:04:14 +01:00
0434f5a5ff
Update ColladaParser.cpp
2017-01-26 17:29:31 +01:00
85e2788e50
Update ColladaParser.cpp
2017-01-26 17:28:39 +01:00
81741628a8
Fix cpp std version at least c++11
...
There's list loop enumeration and incompatible template codes which may cause compile errors due to different compilers.
2017-01-25 15:38:20 +08:00
0414b9c69d
Merge pull request #1147 from elect86/patch-5
...
Update PlyLoader.cpp, typo
2017-01-20 21:15:14 +01:00
3323d42ad6
Update PlyLoader.cpp
2017-01-20 19:30:36 +01:00
8748c6f4b6
Merge pull request #1146 from elect86/patch-4
...
Update PlyLoader.cpp
2017-01-20 00:08:06 +01:00
821e9fb0b8
Update PlyLoader.cpp
2017-01-19 22:43:38 +01:00
57975cb007
Merge pull request #1145 from elect86/patch-3
...
typo
2017-01-19 18:54:06 +01:00
82b1769759
Fix new call.
2017-01-19 13:38:06 +01:00
35b95ba710
API: Fix build
2017-01-19 11:41:43 +01:00
ebd04041ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-01-19 11:19:02 +01:00
f121e2eb66
Fixes https://github.com/assimp/assimp/issues/1143 : fix build.
2017-01-19 11:18:33 +01:00
11e1901922
typo
2017-01-18 21:56:33 +01:00
45eb13719e
fixes https://github.com/assimp/assimp/issues/1141 : fix typo.
2017-01-17 22:05:45 +01:00
afe0675e09
Merge pull request #1140 from elect86/patch-2
...
Update PlyLoader.cpp
2017-01-17 21:57:46 +01:00
9736003af0
Build: fix cmake warning: inconsistent name for if-endif.
2017-01-17 16:21:16 +01:00
54757a47a8
Update PlyLoader.cpp
...
Sorry, I was wrong
2017-01-16 21:09:38 +01:00
f14e433dd9
Update PlyLoader.cpp
...
Typo
2017-01-16 21:06:05 +01:00
f438652df8
Update PlyLoader.cpp
2017-01-16 21:04:24 +01:00
342824303c
Update PlyLoader.cpp
2017-01-16 21:01:49 +01:00
ce14a05280
unittest: reenable LWO import test.
2017-01-16 20:23:37 +01:00
f16387e5a7
Merge pull request #1135 from hblasins/objExtension
...
Added support for parameters Ni and Tf in OBJ/MTL file format.
2017-01-16 20:22:41 +01:00
06ca0e094b
GenBlenderDNA: use common formatting.
2017-01-16 20:21:11 +01:00
2e0db8cfd5
Merge branch 'master' of https://github.com/assimp/assimp
2017-01-15 18:29:49 +01:00
c6cceef867
Scene: add method to add children.
2017-01-15 17:37:45 +01:00
6ce590763b
Merge pull request #1138 from waldyrious/patch-1
...
use SVG in Travis badge
2017-01-14 21:05:26 +01:00
f6a5bc601a
use SVG in Travis badge
...
this improves the sharpness of the resulting image to match the quality of the other badges.
2017-01-14 16:46:21 +00:00
2c1830ce2f
Merge pull request #1134 from anttimaa/morphanimcollada
...
Morph animation support for collada
2017-01-14 10:35:06 +01:00
09dcdc4b32
Merge pull request #1137 from simon-heinen/patch-1
...
Update Readme.md
2017-01-14 09:27:21 +01:00
eebe457960
Update Readme.md
...
I would suggest to add https://github.com/makc/assimp2json to the ports of Assimp, also to drive contribution & attention to it since it would be really valuable to have it working in JS.
2017-01-14 07:28:52 +01:00
17cae8ac5a
Added support for parameters Ni and Tf in OBJ/MTL file format.
2017-01-12 17:11:17 -08:00
4d8c1bb54c
unittest: add missing file to fix the build.
2017-01-12 21:41:19 +01:00
69052812f5
unit: add format import test for lws-format.
2017-01-12 20:17:35 +01:00
9621dff027
Morph animation support for collada
2017-01-12 13:41:32 +02:00
2a6f722a7d
Fixed matching ENDIF condition in CMake
2017-01-12 10:19:25 +01:00
cae9e532a0
Merge remote-tracking branch 'github/master' into contrib
...
# Conflicts:
# include/assimp/metadata.h
2017-01-11 16:52:07 +01:00
a97a4fb03b
Merge pull request #1131 from Sibras/master
...
FBX: Fix light and camera transformations and add some missing properties.
2017-01-10 17:48:35 +01:00
be9e4f4cfd
Merge pull request #1132 from asmaloney/asm_master
...
{D3MF} Move #ifndefs before #includes
2017-01-10 17:47:42 +01:00
6483b10997
{D3MF} Move #ifndefs before #includes
2017-01-10 09:53:11 -05:00
9eb4ca6036
Update Readme.md
2017-01-09 22:11:45 +01:00
3f3861a93b
Update Readme.md
2017-01-09 22:10:59 +01:00
3b12d552c0
Update Readme.md
2017-01-09 21:33:07 +01:00
60c593611e
Merge branch 'master' of https://github.com/assimp/assimp
2017-01-09 20:01:45 +01:00
2b4f16d2d2
unittest: add import test for ifc file importer.
2017-01-09 20:01:13 +01:00
2f2fe92b62
FBX: Add additional material properties.
...
Currently there isnt a AI_MATKEY_DISPLACEMENTSCALING define but fbx supports the value so for the moment it is just manually specified.
2017-01-09 17:03:38 +11:00
5be2351dc6
FBX: Correct camera position and clip planes.
...
Fbx cameras are stored in the scene graph as well as having separate camera properties.
The separate camera properties have a camera position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
camera being transformed twice. Since the scene graph contains all the relevant
transformations the camera position and direction can just use default values. Fbx
specifies cameras along the positive x axis so the default camera values have a up and
direction set accordingly.
Fixes : #807 #643
2017-01-09 17:03:32 +11:00
Denis Biryukov
Denis Biryukov
Alexander Gessler
Giuseppe Barbieri
AntiMoron
Kim Kulling
Kim Kulling
Kim Kulling
Waldir Pimenta
Simon Heinen
Henryk Blasinski
Antti Määttä
Leo Terziman
Andy Maloney
Matt Oliver