Kim Kulling [Tue, 28 Feb 2017 23:21:32 +0000 (00:21 +0100)]
Merge pull request #1189 from Lugdunum3D/fix-android-asset-extraction
Create the directory for the asset's extraction on Android
Kim Kulling [Tue, 28 Feb 2017 23:15:12 +0000 (00:15 +0100)]
Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip
Fix buildsystem minizip
Kim Kulling [Tue, 28 Feb 2017 23:12:12 +0000 (00:12 +0100)]
Merge pull request #1186 from astillich/ase_cface
Fixed parsing ASE MESH_CFACE
Antoine Bolvy [Mon, 27 Feb 2017 23:43:46 +0000 (18:43 -0500)]
Fix encoding in names (partially revert ecbf09e)
Antoine Bolvy [Mon, 27 Feb 2017 23:28:59 +0000 (18:28 -0500)]
Fix new lines problem
Quentin01 [Mon, 27 Feb 2017 08:24:44 +0000 (17:24 +0900)]
Creates the directory for the asset's extraction on Android
Antoine Bolvy [Mon, 27 Feb 2017 23:23:39 +0000 (18:23 -0500)]
Disable pkg-config on Android, and use the existing macro for minizip
Kim Kulling [Mon, 27 Feb 2017 21:52:53 +0000 (22:52 +0100)]
Merge pull request #1187 from assimp/issue-1169
Issue-1169: fix clang build.
Kim Kulling [Mon, 27 Feb 2017 20:59:50 +0000 (21:59 +0100)]
Issue-1169: fix clang build.
Kim Kulling [Mon, 27 Feb 2017 19:19:42 +0000 (20:19 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 27 Feb 2017 19:11:59 +0000 (20:11 +0100)]
Issue-1183: add stp to the list of supported extensions for step-files.
Alexander Stillich [Sat, 25 Feb 2017 22:30:41 +0000 (23:30 +0100)]
Fixed parsing ASE MESH_CFACE
Kim Kulling [Tue, 21 Feb 2017 16:29:49 +0000 (17:29 +0100)]
Merge pull request #1181 from assimp/issue_1169
Issue-1169: fix [] operator of vector3.
Kim Kulling [Tue, 21 Feb 2017 16:12:22 +0000 (17:12 +0100)]
Issue-1169: add a unittest.
Kim Kulling [Tue, 21 Feb 2017 10:17:09 +0000 (11:17 +0100)]
Issue-1169: fix travis build.
Kim Kulling [Tue, 21 Feb 2017 09:58:27 +0000 (10:58 +0100)]
Issue-1169: fix [] operator of vector3.
Kim Kulling [Mon, 13 Feb 2017 19:57:25 +0000 (20:57 +0100)]
Merge pull request #1180 from JonAllee/Memory-Fix
Fix memory leak in Collada importer
JonAllee [Mon, 13 Feb 2017 19:25:30 +0000 (11:25 -0800)]
Fix memory leak in Collada importer
Affects Collada files with morph Controller Elements.
Kim Kulling [Sat, 11 Feb 2017 13:19:34 +0000 (14:19 +0100)]
PLY: prepare bugfix by adding missing unittest.
Kim Kulling [Sat, 11 Feb 2017 12:49:48 +0000 (13:49 +0100)]
Closes https://github.com/assimp/assimp/issues/1102: update Version.cpp
Kim Kulling [Sat, 11 Feb 2017 12:48:39 +0000 (13:48 +0100)]
closes https://github.com/assimp/assimp/issues/1102: define line ending for missing files.
Kim Kulling [Sat, 11 Feb 2017 12:45:29 +0000 (13:45 +0100)]
Closes //github.com/assimp/assimp/issues/1102: define line ending for CHANGES file.
Kim Kulling [Sat, 11 Feb 2017 12:44:17 +0000 (13:44 +0100)]
closes https://github.com/assimp/assimp/issues/1102: update CHANGES file.
Kim Kulling [Mon, 6 Feb 2017 12:15:53 +0000 (13:15 +0100)]
Update utObjImportExport.cpp
Unittest: make execution of base exporter test for obj depending of ASSIMP_BUILD_NO_EXPORT.
Kim Kulling [Mon, 6 Feb 2017 12:06:47 +0000 (13:06 +0100)]
Update utObjImportExport.cpp
Unittest: Make obj-exporter test depending on export state.
Kim Kulling [Sun, 5 Feb 2017 20:00:06 +0000 (21:00 +0100)]
Obj-Exporter test: fix test fixure if no export was requetsed.
Kim Kulling [Sun, 5 Feb 2017 19:51:18 +0000 (20:51 +0100)]
Fix the build: next try ( with full namespaces ).
Kim Kulling [Sun, 5 Feb 2017 18:30:11 +0000 (19:30 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 4 Feb 2017 17:32:04 +0000 (18:32 +0100)]
Obj: fix code review findings.
Kim Kulling [Sat, 4 Feb 2017 17:15:50 +0000 (18:15 +0100)]
Fix the build.
Kim Kulling [Sat, 4 Feb 2017 13:51:23 +0000 (14:51 +0100)]
closes https://github.com/assimp/assimp/issues/809: add vertex color
export support.
Kim Kulling [Wed, 1 Feb 2017 19:11:12 +0000 (20:11 +0100)]
Obj-Importer: fix crash when updating the current mat-index: use correct
index.
Kim Kulling [Wed, 1 Feb 2017 17:42:16 +0000 (18:42 +0100)]
Merge pull request #1160 from NolaDonato/materialindex
OBJParser: set material index when changing current material
nola.donato@samsung.com [Wed, 1 Feb 2017 00:40:04 +0000 (16:40 -0800)]
OBJ: check for null mesh before updating material index
Sometimes the current mesh is null, should check before updating the material index
Submitted by: Nola Donato nola.donato@samsung.com
Kim Kulling [Tue, 31 Jan 2017 07:40:36 +0000 (08:40 +0100)]
Merge pull request #1161 from NolaDonato/spacesinfilenames
OBJParser: Support spaces in texture file names
nola.donato@samsung.com [Tue, 31 Jan 2017 04:32:37 +0000 (20:32 -0800)]
OBJParser: set material index when changing current material
When a new material is parsed from the material library, the name of the current material is set but the old material index remains. This leaves an incorrect material index in the current mesh causing textures to not be associated with the right mesh. This patch updates the material index when changing the material name.
submitted by: Nola Donato nola.donato@samsung.com
nola.donato@samsung.com [Tue, 31 Jan 2017 04:27:35 +0000 (20:27 -0800)]
OBJParser: Support spaces in texture file names
This patch allows embedded spaces in texture filenames found in MTL files. It only affects the OBJ parser.
Submitted by: Nola Donato nola.donato@samsung.com
Kim Kulling [Mon, 30 Jan 2017 11:52:01 +0000 (12:52 +0100)]
Merge pull request #1159 from assimp/issues-1155
closes https://github.com/assimp/assimp/issues/1155: remove deprecated
Kim Kulling [Mon, 30 Jan 2017 10:44:51 +0000 (11:44 +0100)]
closes https://github.com/assimp/assimp/issues/1155: remove deprecated
workspaces.
Alexander Gessler [Sat, 28 Jan 2017 12:28:47 +0000 (13:28 +0100)]
Merge pull request #1156 from elect86/patch-7
Update ColladaParser.cpp
Alexander Gessler [Sat, 28 Jan 2017 12:28:31 +0000 (13:28 +0100)]
Merge pull request #1154 from Kvalme/master
Fix for COLLADA export texture mapping #1084
Alexander Gessler [Sat, 28 Jan 2017 12:25:58 +0000 (13:25 +0100)]
Merge pull request #1157 from elect86/patch-8
Update ColladaParser.cpp
Giuseppe Barbieri [Sat, 28 Jan 2017 10:54:11 +0000 (11:54 +0100)]
Update ColladaParser.cpp
Fixed indent
Giuseppe Barbieri [Sat, 28 Jan 2017 07:02:02 +0000 (08:02 +0100)]
Update ColladaParser.cpp
Denis Biryukov [Fri, 27 Jan 2017 11:31:07 +0000 (14:31 +0300)]
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>
Denis Biryukov [Fri, 27 Jan 2017 11:29:18 +0000 (14:29 +0300)]
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>
Denis Biryukov [Fri, 27 Jan 2017 07:57:32 +0000 (10:57 +0300)]
Merge remote-tracking branch 'upstream/master'
Alexander Gessler [Thu, 26 Jan 2017 20:05:06 +0000 (21:05 +0100)]
Merge pull request #1150 from AntiMoron/master
Fix compiler cpp std version
Alexander Gessler [Thu, 26 Jan 2017 20:04:14 +0000 (21:04 +0100)]
Merge pull request #1152 from elect86/patch-6
Update ColladaParser.cpp
Giuseppe Barbieri [Thu, 26 Jan 2017 16:29:31 +0000 (17:29 +0100)]
Update ColladaParser.cpp
Giuseppe Barbieri [Thu, 26 Jan 2017 16:28:39 +0000 (17:28 +0100)]
Update ColladaParser.cpp
AntiMoron [Wed, 25 Jan 2017 07:38:20 +0000 (15:38 +0800)]
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.
Kim Kulling [Fri, 20 Jan 2017 20:15:14 +0000 (21:15 +0100)]
Merge pull request #1147 from elect86/patch-5
Update PlyLoader.cpp, typo
Giuseppe Barbieri [Fri, 20 Jan 2017 18:30:36 +0000 (19:30 +0100)]
Update PlyLoader.cpp
Alexander Gessler [Thu, 19 Jan 2017 23:08:06 +0000 (00:08 +0100)]
Merge pull request #1146 from elect86/patch-4
Update PlyLoader.cpp
Giuseppe Barbieri [Thu, 19 Jan 2017 21:43:38 +0000 (22:43 +0100)]
Update PlyLoader.cpp
Kim Kulling [Thu, 19 Jan 2017 17:54:06 +0000 (18:54 +0100)]
Merge pull request #1145 from elect86/patch-3
typo
Kim Kulling [Thu, 19 Jan 2017 12:38:06 +0000 (13:38 +0100)]
Fix new call.
Kim Kulling [Thu, 19 Jan 2017 10:41:43 +0000 (11:41 +0100)]
API: Fix build
Kim Kulling [Thu, 19 Jan 2017 10:19:02 +0000 (11:19 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 19 Jan 2017 10:18:33 +0000 (11:18 +0100)]
Fixes https://github.com/assimp/assimp/issues/1143: fix build.
Giuseppe Barbieri [Wed, 18 Jan 2017 20:56:33 +0000 (21:56 +0100)]
typo
Kim Kulling [Tue, 17 Jan 2017 21:05:45 +0000 (22:05 +0100)]
fixes https://github.com/assimp/assimp/issues/1141: fix typo.
Kim Kulling [Tue, 17 Jan 2017 20:57:46 +0000 (21:57 +0100)]
Merge pull request #1140 from elect86/patch-2
Update PlyLoader.cpp
Kim Kulling [Tue, 17 Jan 2017 15:21:16 +0000 (16:21 +0100)]
Build: fix cmake warning: inconsistent name for if-endif.
Giuseppe Barbieri [Mon, 16 Jan 2017 20:09:38 +0000 (21:09 +0100)]
Update PlyLoader.cpp
Sorry, I was wrong
Giuseppe Barbieri [Mon, 16 Jan 2017 20:06:05 +0000 (21:06 +0100)]
Update PlyLoader.cpp
Typo
Giuseppe Barbieri [Mon, 16 Jan 2017 20:04:24 +0000 (21:04 +0100)]
Update PlyLoader.cpp
Giuseppe Barbieri [Mon, 16 Jan 2017 20:01:49 +0000 (21:01 +0100)]
Update PlyLoader.cpp
Kim Kulling [Mon, 16 Jan 2017 19:23:37 +0000 (20:23 +0100)]
unittest: reenable LWO import test.
Kim Kulling [Mon, 16 Jan 2017 19:22:41 +0000 (20:22 +0100)]
Merge pull request #1135 from hblasins/objExtension
Added support for parameters Ni and Tf in OBJ/MTL file format.
Kim Kulling [Mon, 16 Jan 2017 19:21:11 +0000 (20:21 +0100)]
GenBlenderDNA: use common formatting.
Kim Kulling [Sun, 15 Jan 2017 17:29:49 +0000 (18:29 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sun, 15 Jan 2017 16:37:45 +0000 (17:37 +0100)]
Scene: add method to add children.
Alexander Gessler [Sat, 14 Jan 2017 20:05:26 +0000 (21:05 +0100)]
Merge pull request #1138 from waldyrious/patch-1
use SVG in Travis badge
Waldir Pimenta [Sat, 14 Jan 2017 16:46:21 +0000 (16:46 +0000)]
use SVG in Travis badge
this improves the sharpness of the resulting image to match the quality of the other badges.
Kim Kulling [Sat, 14 Jan 2017 09:35:06 +0000 (10:35 +0100)]
Merge pull request #1134 from anttimaa/morphanimcollada
Morph animation support for collada
Kim Kulling [Sat, 14 Jan 2017 08:27:21 +0000 (09:27 +0100)]
Merge pull request #1137 from simon-heinen/patch-1
Update Readme.md
Simon Heinen [Sat, 14 Jan 2017 06:28:52 +0000 (07:28 +0100)]
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.
Henryk Blasinski [Fri, 13 Jan 2017 01:11:17 +0000 (17:11 -0800)]
Added support for parameters Ni and Tf in OBJ/MTL file format.
Kim Kulling [Thu, 12 Jan 2017 20:41:19 +0000 (21:41 +0100)]
unittest: add missing file to fix the build.
Kim Kulling [Thu, 12 Jan 2017 19:17:35 +0000 (20:17 +0100)]
unit: add format import test for lws-format.
Antti Määttä [Thu, 12 Jan 2017 11:41:32 +0000 (13:41 +0200)]
Morph animation support for collada
Kim Kulling [Tue, 10 Jan 2017 16:48:35 +0000 (17:48 +0100)]
Merge pull request #1131 from Sibras/master
FBX: Fix light and camera transformations and add some missing properties.
Kim Kulling [Tue, 10 Jan 2017 16:47:42 +0000 (17:47 +0100)]
Merge pull request #1132 from asmaloney/asm_master
{D3MF} Move #ifndefs before #includes
Andy Maloney [Tue, 10 Jan 2017 14:53:11 +0000 (09:53 -0500)]
{D3MF} Move #ifndefs before #includes
Kim Kulling [Mon, 9 Jan 2017 21:11:45 +0000 (22:11 +0100)]
Update Readme.md
Kim Kulling [Mon, 9 Jan 2017 21:10:59 +0000 (22:10 +0100)]
Update Readme.md
Kim Kulling [Mon, 9 Jan 2017 20:33:07 +0000 (21:33 +0100)]
Update Readme.md
Kim Kulling [Mon, 9 Jan 2017 19:01:45 +0000 (20:01 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 9 Jan 2017 19:01:13 +0000 (20:01 +0100)]
unittest: add import test for ifc file importer.
Matt Oliver [Mon, 9 Jan 2017 05:13:25 +0000 (16:13 +1100)]
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.
Matt Oliver [Mon, 9 Jan 2017 05:11:32 +0000 (16:11 +1100)]
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
Matt Oliver [Mon, 9 Jan 2017 05:07:40 +0000 (16:07 +1100)]
FBX: Add correct light locations and falloff values.
Fbx lights are stored in the scene graph as well as having separate light properties.
The separate light properties have a light position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
light being transformed twice. Since the scene graph contains all the relevant
transformations the light position and direction can just use default values. Fbx
specifies lights along the negative y axis so the default light values have a up and
direction set accordingly.
The DecayStart value specifies the distance from the light that the light intensity
will drop to half. Using the default assimp falloff equation of f=1/c+lr+qr^2 then
the falloff coefficients can be calculated for either c,l or q accordingly by setting
r=DecayStart and f=0.5.
Fixes #851
Kim Kulling [Sun, 8 Jan 2017 17:34:34 +0000 (18:34 +0100)]
Merge pull request #1130 from undisputed-seraphim/clear-msvc-codepage-warnings
Cleared majority of codepage warnings in Visual Studio 2015.
Tan Li Boon [Sun, 8 Jan 2017 16:41:10 +0000 (00:41 +0800)]
Cleared majority of codepage warnings in Visual Studio 14.
Kim Kulling [Sun, 8 Jan 2017 10:38:50 +0000 (11:38 +0100)]
Update Readme.md
Kim Kulling [Sun, 8 Jan 2017 10:38:04 +0000 (11:38 +0100)]
Update Readme.md
Kim Kulling [Sat, 7 Jan 2017 20:29:22 +0000 (21:29 +0100)]
unittest: add unittest for hmp import format.
Kim Kulling [Sat, 7 Jan 2017 20:16:24 +0000 (21:16 +0100)]
unittest: add a disabled glft unittest.