platform/upstream/assimp.git
7 years agoPly importer with correction from last general trunk merge
arkeon [Fri, 2 Jun 2017 20:19:41 +0000 (22:19 +0200)]
Ply importer with correction from last general trunk merge

7 years agoPLYImporter: - optimize memory and speed on ply importer / change parser to use a...
Arkeon [Fri, 2 Jun 2017 11:24:56 +0000 (13:24 +0200)]
PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation

IFC :
 - update poly2tri to avoid crash on some IFC files

Collada :
 - manage missing texture reference in collada import

7 years agoUpdate CMakeLists.txt
Kim Kulling [Fri, 2 Jun 2017 09:20:48 +0000 (11:20 +0200)]
Update CMakeLists.txt

Enable check for OpenMP-support.

7 years agoMerge pull request #1291 from Ias0601/samples
Kim Kulling [Fri, 2 Jun 2017 08:33:17 +0000 (10:33 +0200)]
Merge pull request #1291 from Ias0601/samples

A new sample : Directx11 Textured Sample with embedded texture support

7 years agoUpdate ModelLoader.cpp
Ias0601 [Thu, 1 Jun 2017 15:42:48 +0000 (21:12 +0530)]
Update ModelLoader.cpp

7 years agoUpdate Mesh.h
Ias0601 [Thu, 1 Jun 2017 15:41:48 +0000 (21:11 +0530)]
Update Mesh.h

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 1 Jun 2017 14:22:25 +0000 (16:22 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge commit 'cab6cdf7'
Kim Kulling [Thu, 1 Jun 2017 14:22:14 +0000 (16:22 +0200)]
Merge commit 'cab6cdf7'

7 years agoViewer: fix the build.
Kim Kulling [Thu, 1 Jun 2017 14:21:23 +0000 (16:21 +0200)]
Viewer: fix the build.

7 years agoAdd files via upload
Ias0601 [Thu, 1 Jun 2017 13:59:22 +0000 (19:29 +0530)]
Add files via upload

7 years agoAdd files via upload
Ias0601 [Thu, 1 Jun 2017 13:58:25 +0000 (19:28 +0530)]
Add files via upload

7 years agoCreate main.cpp
Ias0601 [Thu, 1 Jun 2017 13:55:25 +0000 (19:25 +0530)]
Create main.cpp

7 years agoDelete SimpleTexturedDirectx11.sln
Ias0601 [Thu, 1 Jun 2017 13:54:41 +0000 (19:24 +0530)]
Delete SimpleTexturedDirectx11.sln

7 years agoAdd files via upload
Ias0601 [Thu, 1 Jun 2017 13:54:08 +0000 (19:24 +0530)]
Add files via upload

7 years agoUpdate CMakeLists.txt
Kim Kulling [Thu, 1 Jun 2017 13:50:19 +0000 (15:50 +0200)]
Update CMakeLists.txt

Build: Make windows headers much smaller.

7 years agoDelete a.txt
Ias0601 [Thu, 1 Jun 2017 13:45:10 +0000 (19:15 +0530)]
Delete a.txt

7 years agoCreate a.txt
Ias0601 [Thu, 1 Jun 2017 13:44:56 +0000 (19:14 +0530)]
Create a.txt

7 years agoMerge pull request #1290 from assimp/issue_1244
Kim Kulling [Wed, 31 May 2017 20:25:46 +0000 (22:25 +0200)]
Merge pull request #1290 from assimp/issue_1244

closes https://github.com/assimp/assimp/issues/1244: log error for

7 years agocloses https://github.com/assimp/assimp/issues/1244: log error for
Kim Kulling [Wed, 31 May 2017 19:43:41 +0000 (21:43 +0200)]
closes https://github.com/assimp/assimp/issues/1244: log error for
overflow.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 31 May 2017 19:37:42 +0000 (21:37 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoObjImporter: remove dead code.
Kim Kulling [Wed, 31 May 2017 19:37:16 +0000 (21:37 +0200)]
ObjImporter: remove dead code.

7 years agoMerge pull request #1289 from assimp/obj_with_linebreaks
Kim Kulling [Wed, 31 May 2017 19:34:59 +0000 (21:34 +0200)]
Merge pull request #1289 from assimp/obj_with_linebreaks

Obj with linebreaks

7 years agoObjImporter: fix dead code.
Kim Kulling [Wed, 31 May 2017 18:28:00 +0000 (20:28 +0200)]
ObjImporter: fix dead code.

7 years agoMerge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_...
Kim Kulling [Wed, 31 May 2017 18:18:39 +0000 (20:18 +0200)]
Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks

7 years agoObjImporter: next try for multiple line stuff.
Kim Kulling [Wed, 31 May 2017 14:36:08 +0000 (16:36 +0200)]
ObjImporter: next try for multiple line stuff.

7 years agoObjLoader: improve performance of obj-import.
Kim Kulling [Tue, 30 May 2017 19:10:33 +0000 (21:10 +0200)]
ObjLoader: improve performance of obj-import.

7 years agoObj-Importer: introduce working test for line breaks.
Kim Kulling [Mon, 29 May 2017 20:00:13 +0000 (22:00 +0200)]
Obj-Importer: introduce working test for line breaks.

7 years agoMerge pull request #1282 from rdb/master
Kim Kulling [Mon, 29 May 2017 10:52:26 +0000 (12:52 +0200)]
Merge pull request #1282 from rdb/master

Fix error when custom CMAKE_C_FLAGS is specified

7 years agoTests how o adress this topic.
Kim Kulling [Sun, 28 May 2017 20:25:06 +0000 (22:25 +0200)]
Tests how o adress this topic.

7 years agoObjImporter: fix the build.
Kim Kulling [Sun, 28 May 2017 12:14:22 +0000 (14:14 +0200)]
ObjImporter: fix the build.

7 years agoOpj-Importer: fix coverity finding.
Kim Kulling [Sat, 27 May 2017 17:37:28 +0000 (19:37 +0200)]
Opj-Importer: fix coverity finding.

7 years agoUnittests: fix import material test.
Kim Kulling [Fri, 26 May 2017 18:29:21 +0000 (20:29 +0200)]
Unittests: fix import material test.

7 years agoBuild: fix some compiler warnings for g++.
Kim Kulling [Fri, 26 May 2017 07:18:23 +0000 (09:18 +0200)]
Build: fix some compiler warnings for g++.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 25 May 2017 20:40:36 +0000 (22:40 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoaiMetaData: introduce aiMetaData::Dealloc.
Kim Kulling [Thu, 25 May 2017 20:35:27 +0000 (22:35 +0200)]
aiMetaData: introduce aiMetaData::Dealloc.

7 years agoGLTFImporter: exclude headers from build whem no_glft_importer is
Kim Kulling [Thu, 25 May 2017 20:34:45 +0000 (22:34 +0200)]
GLTFImporter: exclude headers from build whem no_glft_importer is
defined.

7 years agoX3DImporter: fix the build.
Kim Kulling [Wed, 24 May 2017 20:35:35 +0000 (22:35 +0200)]
X3DImporter: fix the build.

7 years agoMDLImporter: remove dead code.
Kim Kulling [Wed, 24 May 2017 19:18:51 +0000 (21:18 +0200)]
MDLImporter: remove dead code.

7 years agoX3DImporter: fix coverity finding ( missing comma ).
Kim Kulling [Wed, 24 May 2017 19:15:55 +0000 (21:15 +0200)]
X3DImporter: fix coverity finding ( missing comma ).

7 years agoX3DImporter: fix coverity finding.
Kim Kulling [Wed, 24 May 2017 19:04:35 +0000 (21:04 +0200)]
X3DImporter: fix coverity finding.

7 years agoFix error when custom CMAKE_C_FLAGS is specified
rdb [Tue, 23 May 2017 13:34:02 +0000 (15:34 +0200)]
Fix error when custom CMAKE_C_FLAGS is specified

7 years agoObjImporter: Add unittest.
Kim Kulling [Mon, 22 May 2017 19:11:01 +0000 (21:11 +0200)]
ObjImporter: Add unittest.

7 years agoMerge pull request #1279 from Squareys/update-docs
Kim Kulling [Sat, 20 May 2017 18:45:26 +0000 (20:45 +0200)]
Merge pull request #1279 from Squareys/update-docs

Update docs (Logging, Preamble Copyright and embedded Textures)

7 years agoMerge pull request #1272 from assimp/issue-1262
Kim Kulling [Fri, 19 May 2017 21:13:40 +0000 (23:13 +0200)]
Merge pull request #1272 from assimp/issue-1262

closes https://github.com/assimp/assimp/issues/1262: fix .

7 years agoOpenGEX: fix lowercase typo for linux.
Kim Kulling [Fri, 19 May 2017 21:00:57 +0000 (23:00 +0200)]
OpenGEX: fix lowercase typo for linux.

7 years agodocs: Explain texture paths for embedded textures
Squareys [Fri, 19 May 2017 11:31:20 +0000 (13:31 +0200)]
docs: Explain texture paths for embedded textures

7 years agodocs: Update logging docs
Squareys [Fri, 19 May 2017 11:30:48 +0000 (13:30 +0200)]
docs: Update logging docs

7 years agodocs: Update copyright notice in preamble
Squareys [Fri, 19 May 2017 11:30:11 +0000 (13:30 +0200)]
docs: Update copyright notice in preamble

7 years agoMerge pull request #1212 from aoowweenn/umw_dev
Kim Kulling [Wed, 17 May 2017 10:01:46 +0000 (12:01 +0200)]
Merge pull request #1212 from aoowweenn/umw_dev

MikuMikuDance Format

7 years agoMerge pull request #1275 from ab4d/master
Kim Kulling [Wed, 17 May 2017 09:34:35 +0000 (11:34 +0200)]
Merge pull request #1275 from ab4d/master

Fixed build error in ObjExporter :: GetMaterialLibFileName

7 years agoMerge branch 'master' into issue-1262
Kim Kulling [Wed, 17 May 2017 08:20:45 +0000 (10:20 +0200)]
Merge branch 'master' into issue-1262

7 years agoObj-Exporter: fix build.
Kim Kulling [Wed, 17 May 2017 08:13:07 +0000 (10:13 +0200)]
Obj-Exporter: fix build.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 17 May 2017 07:25:30 +0000 (09:25 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoLWOLoader: fix link in loader description.
Kim Kulling [Wed, 17 May 2017 07:25:07 +0000 (09:25 +0200)]
LWOLoader: fix link in loader description.

7 years agoFixed build error in ObjExporter :: GetMaterialLibFileName
Andrej [Tue, 16 May 2017 20:18:47 +0000 (22:18 +0200)]
Fixed build error in ObjExporter :: GetMaterialLibFileName

7 years agoMerge pull request #1274 from ab4d/master
Kim Kulling [Tue, 16 May 2017 20:09:59 +0000 (22:09 +0200)]
Merge pull request #1274 from ab4d/master

Improved obj exporter to export materials to fileName.mtl file instead of fileName.obj.mtl

7 years agoUsing single quote for one character parameter in find_last_of method call
Andrej [Tue, 16 May 2017 19:56:49 +0000 (21:56 +0200)]
Using single quote for one character parameter in find_last_of method call

7 years agoMerge branch 'master' into issue-1262
Kim Kulling [Tue, 16 May 2017 19:53:35 +0000 (21:53 +0200)]
Merge branch 'master' into issue-1262

7 years agobuild: add missing files.
Kim Kulling [Tue, 16 May 2017 19:46:04 +0000 (21:46 +0200)]
build: add missing files.

7 years agoOpenGEX: fix invalid handling with color4 token.
Kim Kulling [Tue, 16 May 2017 19:45:23 +0000 (21:45 +0200)]
OpenGEX: fix invalid handling with color4 token.

7 years agocloses https://github.com/assimp/assimp/issues/1262: fix .
Kim Kulling [Tue, 16 May 2017 19:07:20 +0000 (21:07 +0200)]
closes https://github.com/assimp/assimp/issues/1262: fix .

7 years agoImproved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl
Andrej [Tue, 16 May 2017 13:55:40 +0000 (15:55 +0200)]
Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl

7 years agoRevert "Creating fileName.mtl file instead of fileName.obj.mtl"
Andrej [Tue, 16 May 2017 13:47:57 +0000 (15:47 +0200)]
Revert "Creating fileName.mtl file instead of fileName.obj.mtl"

This reverts commit 5757980ea5b00d4c68fe7fcaa204212c31a2c8d7.

7 years agoCreating fileName.mtl file instead of fileName.obj.mtl
Andrej [Tue, 16 May 2017 13:34:50 +0000 (15:34 +0200)]
Creating fileName.mtl file instead of fileName.obj.mtl

7 years agoMerge pull request #1268 from VennGrayDog/b1
Kim Kulling [Mon, 15 May 2017 19:37:26 +0000 (21:37 +0200)]
Merge pull request #1268 from VennGrayDog/b1

Add TokensForSearch in BlenderLoader

7 years agoMerge pull request #1269 from assimp/issue_1266
Kim Kulling [Mon, 15 May 2017 19:33:42 +0000 (21:33 +0200)]
Merge pull request #1269 from assimp/issue_1266

closes https://github.com/assimp/assimp/issues/1266: fix wrong delete

7 years agoissue-1266: add unittest for it.
Kim Kulling [Mon, 15 May 2017 19:18:34 +0000 (21:18 +0200)]
issue-1266: add unittest for it.

7 years agoSpatialSort: use std::vector::clear().
Kim Kulling [Mon, 15 May 2017 17:41:08 +0000 (19:41 +0200)]
SpatialSort: use std::vector::clear().

7 years agocloses https://github.com/assimp/assimp/issues/1266: fix wrong delete
Kim Kulling [Mon, 15 May 2017 07:55:39 +0000 (09:55 +0200)]
closes https://github.com/assimp/assimp/issues/1266: fix wrong delete

Instead of delete delete [] must be used.

7 years agoMerge pull request #1263 from jamesgk/gltf-export
Alexander Gessler [Mon, 15 May 2017 07:12:57 +0000 (09:12 +0200)]
Merge pull request #1263 from jamesgk/gltf-export

GLTF exporter: convert animation time from ticks to seconds

7 years agoAdded TokensForSearch in BlenderLoader to allow CanRead return true for in-memory...
VennGrayDog [Mon, 15 May 2017 06:27:14 +0000 (02:27 -0400)]
Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.

7 years agoMerge pull request #1264 from smokris/master
Alexander Gessler [Sun, 14 May 2017 22:39:36 +0000 (00:39 +0200)]
Merge pull request #1264 from smokris/master

Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'

7 years agoMerge pull request #1267 from VennGrayDog/b1
Alexander Gessler [Sun, 14 May 2017 22:39:05 +0000 (00:39 +0200)]
Merge pull request #1267 from VennGrayDog/b1

Fix location of config.h

7 years agoFix location of config.h
VennGrayDog [Sat, 13 May 2017 18:09:21 +0000 (14:09 -0400)]
Fix location of config.h

7 years agoAdd support for reading texture coordinates from PLY meshes with properties named...
Steve Mokris [Thu, 11 May 2017 19:21:37 +0000 (15:21 -0400)]
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'.

7 years agoGLTF exporter: convert animation time from ticks to seconds
jamesgk [Thu, 11 May 2017 18:04:23 +0000 (11:04 -0700)]
GLTF exporter: convert animation time from ticks to seconds

7 years agoMerge pull request #1248 from NcJie/fixed-android-atof-not-found-issue
Kim Kulling [Thu, 11 May 2017 08:55:59 +0000 (10:55 +0200)]
Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue

Fixed no member named 'atop' in global namespace issue for Android ND…

7 years agoMerge pull request #1258 from jamesgk/gltf-export
Kim Kulling [Thu, 11 May 2017 08:46:06 +0000 (10:46 +0200)]
Merge pull request #1258 from jamesgk/gltf-export

GLTF exporter: ensure animation accessors have same count

7 years agoAMPImporter: fix coverity findings.
Kim Kulling [Wed, 10 May 2017 17:34:50 +0000 (19:34 +0200)]
AMPImporter: fix coverity findings.

7 years agoSTEPFile: fix coverity findings.
Kim Kulling [Wed, 10 May 2017 16:50:51 +0000 (18:50 +0200)]
STEPFile: fix coverity findings.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 10 May 2017 16:30:36 +0000 (18:30 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoAMFImporter: fix coverity findings.
Kim Kulling [Wed, 10 May 2017 16:29:42 +0000 (18:29 +0200)]
AMFImporter: fix coverity findings.

7 years agoMerge pull request #1259 from Squareys/fix-cmake-install
Kim Kulling [Wed, 10 May 2017 07:37:04 +0000 (09:37 +0200)]
Merge pull request #1259 from Squareys/fix-cmake-install

[One-Line-Change] Fix config.h not being found during cmake --build . --target install

7 years agoX3D: fix coverity findings.
Kim Kulling [Tue, 9 May 2017 20:54:04 +0000 (22:54 +0200)]
X3D: fix coverity findings.

7 years agoFix config.h not being found during install
Squareys [Tue, 9 May 2017 19:51:49 +0000 (21:51 +0200)]
Fix config.h not being found during install

7 years agoX3DImporter: fix coverity findings.
Kim Kulling [Tue, 9 May 2017 19:35:21 +0000 (21:35 +0200)]
X3DImporter: fix coverity findings.

7 years agoAMFImporter: make test against nullptr dereferencing meaningful.
Kim Kulling [Tue, 9 May 2017 19:03:20 +0000 (21:03 +0200)]
AMFImporter: make test against nullptr dereferencing meaningful.

7 years agoColladaExporter: remove self assignment.
Kim Kulling [Tue, 9 May 2017 18:59:01 +0000 (20:59 +0200)]
ColladaExporter: remove self assignment.

7 years agoCoverity: fix finding in COBLoader.
Kim Kulling [Tue, 9 May 2017 18:15:30 +0000 (20:15 +0200)]
Coverity: fix finding in COBLoader.

7 years agoUpdate license info.
Kim Kulling [Tue, 9 May 2017 17:57:36 +0000 (19:57 +0200)]
Update license info.

7 years agoGLTF exporter: ensure animation accessors have same count
jamesgk [Fri, 5 May 2017 23:45:28 +0000 (16:45 -0700)]
GLTF exporter: ensure animation accessors have same count

7 years agoSpatialSort: use std::vector::resize( 0 ) to improve readability.
Kim Kulling [Mon, 8 May 2017 19:57:08 +0000 (21:57 +0200)]
SpatialSort: use std::vector::resize( 0 ) to improve readability.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 8 May 2017 19:29:07 +0000 (21:29 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoFix review findings.
Kim Kulling [Sat, 6 May 2017 18:57:17 +0000 (20:57 +0200)]
Fix review findings.

7 years agoBlender-Importer: fix coverity findings.
Kim Kulling [Sat, 6 May 2017 09:14:04 +0000 (11:14 +0200)]
Blender-Importer: fix coverity findings.

7 years agoMesh: fix coverity finding.
Kim Kulling [Sat, 6 May 2017 09:08:57 +0000 (11:08 +0200)]
Mesh: fix coverity finding.

7 years agoMesh: fix coverity bug.
Kim Kulling [Sat, 6 May 2017 09:04:40 +0000 (11:04 +0200)]
Mesh: fix coverity bug.

7 years agoMerge pull request #1254 from samitc/master
Kim Kulling [Thu, 4 May 2017 17:53:51 +0000 (19:53 +0200)]
Merge pull request #1254 from samitc/master

Improve performance of obj line break

7 years agoMerge pull request #1256 from johnmaf/bugfix/gltf-bin-uri
Kim Kulling [Thu, 4 May 2017 17:52:18 +0000 (19:52 +0200)]
Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri

Fix incorrect truncation of binary URI in glTF exporter

7 years agoSearch for .gltf extension at end of file name for buffer prefix.
John Senneker [Wed, 3 May 2017 19:11:31 +0000 (15:11 -0400)]
Search for .gltf extension at end of file name for buffer prefix.

Previously the code assumed that there would be only one '.' in the file
name, which is not a valid assumption. This patch fixes this issue, but
still assumes that the only occurrence of the string ".gltf" is at the
end of the file name. In particular, it will fail on a file name like
"/path/to/a.gltf/my_gltf.wrong_extension".