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
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.
Tyson Grant Nottingham [Fri, 21 Apr 2017 08:09:26 +0000 (01:09 -0700)]
Set UVW index material properties for OBJ files.
Kim Kulling [Wed, 19 Apr 2017 17:57:56 +0000 (19:57 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 19 Apr 2017 17:57:20 +0000 (19:57 +0200)]
Unittests: add validation for TestIOSystem parameters.
Kim Kulling [Tue, 18 Apr 2017 15:11:41 +0000 (17:11 +0200)]
Merge pull request #1234 from heliocastro/html_output
Enable doxygen been properly used from cmake build and install.
Helio Chissini de Castro [Tue, 18 Apr 2017 12:51:17 +0000 (14:51 +0200)]
Enable doxygen been properly used from cmake build and install.
Current documentation lacks a proper directory handling and switch for
Unix like systems.
The option BUILD_DOCS are added as disable by default, even so the
Doxyfile file is generated for a manual build.
Option HTML_OUTPUT are made cached to be properly replaced, as usually
done by some Linux distributions
Microsoft CHM option is enabled if MSVC is detected.
Kim Kulling [Mon, 17 Apr 2017 19:25:57 +0000 (21:25 +0200)]
Unittests: prepare ctest usage.
Kim Kulling [Mon, 17 Apr 2017 12:26:54 +0000 (14:26 +0200)]
closes github.com/assimp/assimp/issues/1228: use test extension for exported test files.
Kim Kulling [Mon, 17 Apr 2017 12:15:33 +0000 (14:15 +0200)]
Unittest: add missing test for ply-parser.
Kim Kulling [Wed, 12 Apr 2017 11:24:55 +0000 (13:24 +0200)]
Merge pull request #1232 from asmaloney/fix-spelling
Fix spelling
Andy Maloney [Tue, 11 Apr 2017 20:33:13 +0000 (16:33 -0400)]
Fix spelling
Kim Kulling [Tue, 11 Apr 2017 17:14:00 +0000 (19:14 +0200)]
Merge pull request #1231 from samitc/master
fix line breakes in obj files
Amit Cirt [Tue, 11 Apr 2017 14:16:18 +0000 (17:16 +0300)]
fix line breakes in obj files
Kim Kulling [Sun, 9 Apr 2017 08:57:50 +0000 (10:57 +0200)]
Merge pull request #1226 from gbittoun/master
Python wrapping improvements
Guillaume Bittoun [Sat, 8 Apr 2017 21:25:39 +0000 (23:25 +0200)]
Compilation fix: Removing the vector4 headers from code/CMakeLists.txt
Guillaume Bittoun [Sat, 8 Apr 2017 10:05:54 +0000 (12:05 +0200)]
Adding a fallback to shader version 120 when version 130 failed to compile
Guillaume Bittoun [Sat, 8 Apr 2017 09:16:28 +0000 (11:16 +0200)]
Installing assimp library as well
Kim Kulling [Fri, 7 Apr 2017 15:50:20 +0000 (17:50 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 7 Apr 2017 15:50:13 +0000 (17:50 +0200)]
add missing doc.
Kim Kulling [Fri, 7 Apr 2017 15:49:59 +0000 (17:49 +0200)]
add missing doc.
Kim Kulling [Fri, 7 Apr 2017 15:49:43 +0000 (17:49 +0200)]
add missing doc.
Kim Kulling [Fri, 7 Apr 2017 15:49:26 +0000 (17:49 +0200)]
add doc.
Kim Kulling [Fri, 7 Apr 2017 15:49:03 +0000 (17:49 +0200)]
add missing image.
Kim Kulling [Fri, 7 Apr 2017 15:48:18 +0000 (17:48 +0200)]
export doc.# with '#' will be ignored, and an empty message aborts the commit.
Kim Kulling [Fri, 7 Apr 2017 15:46:53 +0000 (17:46 +0200)]
doc updatedoc update
Kim Kulling [Thu, 6 Apr 2017 14:32:17 +0000 (16:32 +0200)]
CMake: Fix compatibility check for so-version of the assimp lib.
Kim Kulling [Mon, 3 Apr 2017 10:49:00 +0000 (12:49 +0200)]
Merge pull request #1221 from mhereman/bugfix/clang_4.0
Fixed compiler error on clang 4.0 running on OSX
Maarten Heremans [Mon, 3 Apr 2017 09:07:43 +0000 (11:07 +0200)]
Fixed compiler error on clang 4.0 running on OSX
glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
(aka 'aiVector3t<float> *') and 'int')
if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
Kim Kulling [Sat, 1 Apr 2017 20:14:55 +0000 (22:14 +0200)]
Merge pull request #1220 from andre-schulz/fix-pdb-install-relwithdebinfo
Fix PDB file installation in RelWithDebInfo configuration
Andre Schulz [Sat, 1 Apr 2017 14:03:01 +0000 (16:03 +0200)]
Fix PDB file installation in RelWithDebInfo configuration
Galen Cochrane [Fri, 31 Mar 2017 13:56:49 +0000 (07:56 -0600)]
fixed cmake typo preventing use of assimp as submodule in builds that prohibit in-source changes
Kim Kulling [Thu, 30 Mar 2017 19:15:51 +0000 (21:15 +0200)]
Setup: Fix setup-script.
Kim Kulling [Wed, 29 Mar 2017 19:13:44 +0000 (21:13 +0200)]
X3D: add working example.
Kim Kulling [Wed, 29 Mar 2017 19:08:40 +0000 (21:08 +0200)]
Config.h.in: fix typo.
Kim Kulling [Wed, 29 Mar 2017 18:56:55 +0000 (20:56 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 29 Mar 2017 18:56:30 +0000 (20:56 +0200)]
Closes https://github.com/assimp/assimp/issues/1205: fix typo in docu.
Kim Kulling [Tue, 28 Mar 2017 15:06:06 +0000 (17:06 +0200)]
Merge pull request #1217 from Kai-W/master
Added ComponentType Unsigned int and Error handling
Kim Kulling [Tue, 28 Mar 2017 12:06:31 +0000 (14:06 +0200)]
Update Readme.md
Kim Kulling [Tue, 28 Mar 2017 11:42:32 +0000 (13:42 +0200)]
Update Readme.md
Add patron link to Readme.md.
Kim Kulling [Mon, 27 Mar 2017 22:35:56 +0000 (00:35 +0200)]
3MF: reformattings.
Kai Westerkamp [Mon, 27 Mar 2017 15:22:49 +0000 (17:22 +0200)]
Added ComponentType Unsigned int and Error handling
Part of GLTF 2.0 changes
Kim Kulling [Thu, 23 Mar 2017 19:36:01 +0000 (20:36 +0100)]
Merge pull request #1214 from assimp/issue_1211
closes https://github.com/assimp/assimp/issues/1211: defensice handling
Kim Kulling [Thu, 23 Mar 2017 16:11:52 +0000 (17:11 +0100)]
closes https://github.com/assimp/assimp/issues/1211: defensice handling
of utf-8 decode issues.
Kim Kulling [Wed, 22 Mar 2017 19:08:21 +0000 (20:08 +0100)]
Merge pull request #1208 from terziman/master
Added parameters to IFC importer to control tessellation
Kim Kulling [Tue, 21 Mar 2017 13:31:34 +0000 (14:31 +0100)]
Merge pull request #1210 from rmitton/sib-normals
Fix for faceted normals in SIB files
rmitton [Sun, 19 Mar 2017 20:46:23 +0000 (13:46 -0700)]
Fixed infinite loop on non-manifold geometry
Geometry that had strange non-manifold faces could cause the normal
calculation to enter an infinite loop. Instead we now correctly detect
which faces to scan over.
rmitton [Sat, 18 Mar 2017 21:52:48 +0000 (14:52 -0700)]
Fixed faceted normals in SIB importer.
Leo Terziman [Fri, 17 Mar 2017 13:55:18 +0000 (14:55 +0100)]
Extended support for tessellation parameter to more IFC shapes
Leo Terziman [Fri, 17 Mar 2017 11:13:52 +0000 (12:13 +0100)]
Merge remote-tracking branch 'github/master' into contrib
Leo Terziman [Fri, 17 Mar 2017 10:58:50 +0000 (11:58 +0100)]
Added parameter to control cylindrical shapes tessellation
+ renamed smoothing angle parameter for better user understanding
Leo Terziman [Fri, 17 Mar 2017 10:53:36 +0000 (11:53 +0100)]
Fixed bug in IFC openings when curmesh.vertcnt is empty