Kim Kulling [Wed, 31 May 2017 19:37:42 +0000 (21:37 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 31 May 2017 19:37:16 +0000 (21:37 +0200)]
ObjImporter: remove dead code.
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
Kim Kulling [Wed, 31 May 2017 18:28:00 +0000 (20:28 +0200)]
ObjImporter: fix dead code.
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
Kim Kulling [Wed, 31 May 2017 14:36:08 +0000 (16:36 +0200)]
ObjImporter: next try for multiple line stuff.
Kim Kulling [Tue, 30 May 2017 19:10:33 +0000 (21:10 +0200)]
ObjLoader: improve performance of obj-import.
Kim Kulling [Mon, 29 May 2017 20:00:13 +0000 (22:00 +0200)]
Obj-Importer: introduce working test for line breaks.
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
Kim Kulling [Sun, 28 May 2017 20:25:06 +0000 (22:25 +0200)]
Tests how o adress this topic.
Kim Kulling [Sun, 28 May 2017 12:14:22 +0000 (14:14 +0200)]
ObjImporter: fix the build.
Kim Kulling [Sat, 27 May 2017 17:37:28 +0000 (19:37 +0200)]
Opj-Importer: fix coverity finding.
Kim Kulling [Fri, 26 May 2017 18:29:21 +0000 (20:29 +0200)]
Unittests: fix import material test.
Kim Kulling [Fri, 26 May 2017 07:18:23 +0000 (09:18 +0200)]
Build: fix some compiler warnings for g++.
Kim Kulling [Thu, 25 May 2017 20:40:36 +0000 (22:40 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 25 May 2017 20:35:27 +0000 (22:35 +0200)]
aiMetaData: introduce aiMetaData::Dealloc.
Kim Kulling [Thu, 25 May 2017 20:34:45 +0000 (22:34 +0200)]
GLTFImporter: exclude headers from build whem no_glft_importer is
defined.
Kim Kulling [Wed, 24 May 2017 20:35:35 +0000 (22:35 +0200)]
X3DImporter: fix the build.
Kim Kulling [Wed, 24 May 2017 19:18:51 +0000 (21:18 +0200)]
MDLImporter: remove dead code.
Kim Kulling [Wed, 24 May 2017 19:15:55 +0000 (21:15 +0200)]
X3DImporter: fix coverity finding ( missing comma ).
Kim Kulling [Wed, 24 May 2017 19:04:35 +0000 (21:04 +0200)]
X3DImporter: fix coverity finding.
rdb [Tue, 23 May 2017 13:34:02 +0000 (15:34 +0200)]
Fix error when custom CMAKE_C_FLAGS is specified
Kim Kulling [Mon, 22 May 2017 19:11:01 +0000 (21:11 +0200)]
ObjImporter: Add unittest.
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)
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 .
Kim Kulling [Fri, 19 May 2017 21:00:57 +0000 (23:00 +0200)]
OpenGEX: fix lowercase typo for linux.
Squareys [Fri, 19 May 2017 11:31:20 +0000 (13:31 +0200)]
docs: Explain texture paths for embedded textures
Squareys [Fri, 19 May 2017 11:30:48 +0000 (13:30 +0200)]
docs: Update logging docs
Squareys [Fri, 19 May 2017 11:30:11 +0000 (13:30 +0200)]
docs: Update copyright notice in preamble
Kim Kulling [Wed, 17 May 2017 10:01:46 +0000 (12:01 +0200)]
Merge pull request #1212 from aoowweenn/umw_dev
MikuMikuDance Format
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
Kim Kulling [Wed, 17 May 2017 08:20:45 +0000 (10:20 +0200)]
Merge branch 'master' into issue-1262
Kim Kulling [Wed, 17 May 2017 08:13:07 +0000 (10:13 +0200)]
Obj-Exporter: fix build.
Kim Kulling [Wed, 17 May 2017 07:25:30 +0000 (09:25 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 17 May 2017 07:25:07 +0000 (09:25 +0200)]
LWOLoader: fix link in loader description.
Andrej [Tue, 16 May 2017 20:18:47 +0000 (22:18 +0200)]
Fixed build error in ObjExporter :: GetMaterialLibFileName
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
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
Kim Kulling [Tue, 16 May 2017 19:53:35 +0000 (21:53 +0200)]
Merge branch 'master' into issue-1262
Kim Kulling [Tue, 16 May 2017 19:46:04 +0000 (21:46 +0200)]
build: add missing files.
Kim Kulling [Tue, 16 May 2017 19:45:23 +0000 (21:45 +0200)]
OpenGEX: fix invalid handling with color4 token.
Kim Kulling [Tue, 16 May 2017 19:07:20 +0000 (21:07 +0200)]
closes https://github.com/assimp/assimp/issues/1262: fix .
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
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.
Andrej [Tue, 16 May 2017 13:34:50 +0000 (15:34 +0200)]
Creating fileName.mtl file instead of fileName.obj.mtl
Kim Kulling [Mon, 15 May 2017 19:37:26 +0000 (21:37 +0200)]
Merge pull request #1268 from VennGrayDog/b1
Add TokensForSearch in BlenderLoader
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
Kim Kulling [Mon, 15 May 2017 19:18:34 +0000 (21:18 +0200)]
issue-1266: add unittest for it.
Kim Kulling [Mon, 15 May 2017 17:41:08 +0000 (19:41 +0200)]
SpatialSort: use std::vector::clear().
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.
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
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.
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'
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
VennGrayDog [Sat, 13 May 2017 18:09:21 +0000 (14:09 -0400)]
Fix location of config.h
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'.
jamesgk [Thu, 11 May 2017 18:04:23 +0000 (11:04 -0700)]
GLTF exporter: convert animation time from ticks to seconds
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…
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
Kim Kulling [Wed, 10 May 2017 17:34:50 +0000 (19:34 +0200)]
AMPImporter: fix coverity findings.
Kim Kulling [Wed, 10 May 2017 16:50:51 +0000 (18:50 +0200)]
STEPFile: fix coverity findings.
Kim Kulling [Wed, 10 May 2017 16:30:36 +0000 (18:30 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 10 May 2017 16:29:42 +0000 (18:29 +0200)]
AMFImporter: fix coverity findings.
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
Kim Kulling [Tue, 9 May 2017 20:54:04 +0000 (22:54 +0200)]
X3D: fix coverity findings.
Squareys [Tue, 9 May 2017 19:51:49 +0000 (21:51 +0200)]
Fix config.h not being found during install
Kim Kulling [Tue, 9 May 2017 19:35:21 +0000 (21:35 +0200)]
X3DImporter: fix coverity findings.
Kim Kulling [Tue, 9 May 2017 19:03:20 +0000 (21:03 +0200)]
AMFImporter: make test against nullptr dereferencing meaningful.
Kim Kulling [Tue, 9 May 2017 18:59:01 +0000 (20:59 +0200)]
ColladaExporter: remove self assignment.
Kim Kulling [Tue, 9 May 2017 18:15:30 +0000 (20:15 +0200)]
Coverity: fix finding in COBLoader.
Kim Kulling [Tue, 9 May 2017 17:57:36 +0000 (19:57 +0200)]
Update license info.
jamesgk [Fri, 5 May 2017 23:45:28 +0000 (16:45 -0700)]
GLTF exporter: ensure animation accessors have same count
Kim Kulling [Mon, 8 May 2017 19:57:08 +0000 (21:57 +0200)]
SpatialSort: use std::vector::resize( 0 ) to improve readability.
Kim Kulling [Mon, 8 May 2017 19:29:07 +0000 (21:29 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 6 May 2017 18:57:17 +0000 (20:57 +0200)]
Fix review findings.
Kim Kulling [Sat, 6 May 2017 09:14:04 +0000 (11:14 +0200)]
Blender-Importer: fix coverity findings.
Kim Kulling [Sat, 6 May 2017 09:08:57 +0000 (11:08 +0200)]
Mesh: fix coverity finding.
Kim Kulling [Sat, 6 May 2017 09:04:40 +0000 (11:04 +0200)]
Mesh: fix coverity bug.
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
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
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".
Kim Kulling [Tue, 2 May 2017 18:07:08 +0000 (20:07 +0200)]
Merge pull request #1252 from a-day-old-bagel/master
Shouldn't the configured "config.h" file be going into the binary directory?
Kim Kulling [Tue, 2 May 2017 18:06:08 +0000 (20:06 +0200)]
Merge pull request #1255 from heliocastro/fpic_fix
Add missing CFLAGS -fPIC.
Helio Chissini de Castro [Tue, 2 May 2017 14:45:37 +0000 (16:45 +0200)]
Add missing CFLAGS -fPIC.
This entry was missing due revert of CMAKE_POSITION_INDEPENDENT_CODE
usage. Reported by @Sailsman63
Kim Kulling [Tue, 2 May 2017 09:03:59 +0000 (11:03 +0200)]
Merge pull request #1253 from rdb/master
Fix static init ordering bug in OpenGEX importer
Amit Cirt [Mon, 1 May 2017 13:54:07 +0000 (16:54 +0300)]
make array non static to support multithreaded
Amit Cirt [Mon, 1 May 2017 13:32:49 +0000 (16:32 +0300)]
Improve performance of obj line break
rdb [Mon, 1 May 2017 13:11:22 +0000 (15:11 +0200)]
Fix static init ordering bug in OpenGEX importer
Kim Kulling [Mon, 1 May 2017 08:56:34 +0000 (10:56 +0200)]
Merge pull request #1247 from rspencer01/master
Adds texture type enum to pyassimp
Kim Kulling [Mon, 1 May 2017 08:56:00 +0000 (10:56 +0200)]
Merge pull request #1250 from heliocastro/irrxml
- Apply mechanism to decide use for IrrXML external or internal
Galen Cochrane [Sat, 29 Apr 2017 21:10:35 +0000 (15:10 -0600)]
Merge branch 'master' of https://github.com/assimp/assimp
Helio Chissini de Castro [Sat, 29 Apr 2017 06:44:58 +0000 (08:44 +0200)]
Group libstdc++ entry in the compiler optionas as well
Helio Chissini de Castro [Thu, 27 Apr 2017 15:19:51 +0000 (17:19 +0200)]
- Apply mechanism to decide use for IrrXML external or internal
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.
Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists
Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
Kim Kulling [Fri, 28 Apr 2017 17:30:21 +0000 (19:30 +0200)]
Update Readme.md
Update patreon button.
Kim Kulling [Thu, 27 Apr 2017 14:59:33 +0000 (16:59 +0200)]
Update Readme.md
Fix typo
Cong Jie [Thu, 27 Apr 2017 08:15:03 +0000 (17:15 +0900)]
Fixed no member named 'atop' in global namespace issue for Android NDK compilation
Kim Kulling [Wed, 26 Apr 2017 18:33:13 +0000 (20:33 +0200)]
Merge pull request #1246 from heliocastro/fix_docinstall
- Fix documentation install process.
Robert Spencer [Wed, 26 Apr 2017 13:05:45 +0000 (15:05 +0200)]
Adds texture type enum to pyassimp
Keeping the same style of `postprocess.py`, this is a port of the aiTextureType enum in [`material.h`](https://github.com/assimp/assimp/blob/master/include/assimp/material.h).
Helio Chissini de Castro [Tue, 25 Apr 2017 12:35:07 +0000 (14:35 +0200)]
- Fix documentation install process. It's nonsense second BUILD_DOCS
check on doc/CMakeLists since is already checked on main CMakeLists.
At same time, Doxygen becomes required as no documentation can be built
without it.
Output directory now uses the user defined HTML_OUTPUT instead of
forced dir.
- Added included GNUInstallDirs on same UNIX check, avoiding duplication
of checks
Kim Kulling [Sat, 22 Apr 2017 12:22:29 +0000 (14:22 +0200)]
Merge pull request #1239 from tgnottingham/master
Set UVW index material properties for OBJ files.