Commit Graph

2585 Commits (3f68278ea0d8db8e03a1ddd7f65de7282af05726)

Author SHA1 Message Date
Kim Kulling 3f68278ea0 Merge branch 'master' into issue-1262 2017-05-16 21:53:35 +02:00
Kim Kulling a45b5cdfb5 OpenGEX: fix invalid handling with color4 token. 2017-05-16 21:45:23 +02:00
Kim Kulling 542fe31a94 closes https://github.com/assimp/assimp/issues/1262: fix . 2017-05-16 21:07:20 +02:00
Kim Kulling ff7624f06f Merge pull request #1268 from VennGrayDog/b1
Add TokensForSearch in BlenderLoader
2017-05-15 21:37:26 +02:00
Kim Kulling 7e011c92f0 Merge pull request #1269 from assimp/issue_1266
closes https://github.com/assimp/assimp/issues/1266: fix wrong delete
2017-05-15 21:33:42 +02:00
Kim Kulling 428a4cdd71 SpatialSort: use std::vector::clear(). 2017-05-15 19:41:08 +02:00
Kim Kulling e5657bf0c5 closes https://github.com/assimp/assimp/issues/1266: fix wrong delete
Instead of delete delete [] must be used.
2017-05-15 09:55:39 +02:00
Alexander Gessler ab45dc79fa Merge pull request #1263 from jamesgk/gltf-export
GLTF exporter: convert animation time from ticks to seconds
2017-05-15 09:12:57 +02:00
VennGrayDog 0b34089df0 Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files. 2017-05-15 02:34:53 -04:00
Alexander Gessler 24790398b9 Merge pull request #1264 from smokris/master
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'
2017-05-15 00:39:36 +02:00
VennGrayDog 3d05df2d3e Fix location of config.h 2017-05-14 15:09:31 -04:00
Steve Mokris 2e455b78c8 Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'. 2017-05-11 15:21:37 -04:00
jamesgk c33039d682 GLTF exporter: convert animation time from ticks to seconds 2017-05-11 11:04:23 -07:00
Kim Kulling 9b2671b280 Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue
Fixed no member named 'atop' in global namespace issue for Android ND…
2017-05-11 10:55:59 +02:00
Kim Kulling ab19c5e3f7 Merge pull request #1258 from jamesgk/gltf-export
GLTF exporter: ensure animation accessors have same count
2017-05-11 10:46:06 +02:00
Kim Kulling f6a8be5bac AMPImporter: fix coverity findings. 2017-05-10 19:34:50 +02:00
Kim Kulling 5411f769e8 STEPFile: fix coverity findings. 2017-05-10 18:50:51 +02:00
Kim Kulling d36fbfbb8b Merge branch 'master' of https://github.com/assimp/assimp 2017-05-10 18:30:36 +02:00
Kim Kulling 0300574b8b AMFImporter: fix coverity findings. 2017-05-10 18:29:42 +02:00
Kim Kulling b8747fffca Merge pull request #1259 from Squareys/fix-cmake-install
[One-Line-Change] Fix config.h not being found during cmake --build . --target install
2017-05-10 09:37:04 +02:00
Kim Kulling 9ef1a4fae0 X3D: fix coverity findings. 2017-05-09 22:54:04 +02:00
Squareys cfb867b5e7 Fix config.h not being found during install 2017-05-09 21:51:49 +02:00
Kim Kulling eb828a3b71 X3DImporter: fix coverity findings. 2017-05-09 21:35:21 +02:00
Kim Kulling 4a5c483ac4 AMFImporter: make test against nullptr dereferencing meaningful. 2017-05-09 21:03:20 +02:00
Kim Kulling f77e27ca19 ColladaExporter: remove self assignment. 2017-05-09 20:59:01 +02:00
Kim Kulling 03d97b23ec Coverity: fix finding in COBLoader. 2017-05-09 20:15:30 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
jamesgk 36f4fb8826 GLTF exporter: ensure animation accessors have same count 2017-05-08 14:45:26 -07:00
Kim Kulling 186629b372 SpatialSort: use std::vector::resize( 0 ) to improve readability. 2017-05-08 21:57:08 +02:00
Kim Kulling 65653edf88 Merge branch 'master' of https://github.com/assimp/assimp 2017-05-08 21:29:07 +02:00
Kim Kulling 5289954e27 Fix review findings. 2017-05-06 20:57:17 +02:00
Kim Kulling 98100d8cab Blender-Importer: fix coverity findings. 2017-05-06 11:14:04 +02:00
Kim Kulling 39e048dea6 Merge pull request #1254 from samitc/master
Improve performance of obj line break
2017-05-04 19:53:51 +02:00
Kim Kulling 7f014ea889 Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri
Fix incorrect truncation of binary URI in glTF exporter
2017-05-04 19:52:18 +02:00
John Senneker d6e8fd34f0 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".
2017-05-03 15:11:31 -04:00
Amit Cirt dd1d10407e make array non static to support multithreaded 2017-05-01 16:54:07 +03:00
Amit Cirt 8b4e066ca5 Improve performance of obj line break 2017-05-01 16:32:49 +03:00
rdb 0069552183 Fix static init ordering bug in OpenGEX importer 2017-05-01 15:11:22 +02:00
Helio Chissini de Castro 4a0171bd82 - 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.
2017-04-29 08:10:44 +02:00
Cong Jie aff391c681 Fixed no member named 'atop' in global namespace issue for Android NDK compilation 2017-04-27 17:15:03 +09:00
Tyson Grant Nottingham 8445db2cd9 Set UVW index material properties for OBJ files. 2017-04-21 01:09:26 -07:00
Andy Maloney b64882f4c7 Fix spelling 2017-04-11 16:33:13 -04:00
Amit Cirt 9fc7f72b55 fix line breakes in obj files 2017-04-11 17:16:18 +03:00
Guillaume Bittoun 0e3956caf1 Compilation fix: Removing the vector4 headers from code/CMakeLists.txt 2017-04-08 23:25:39 +02:00
Kim Kulling 2825d2daf8 Merge branch 'master' of https://github.com/assimp/assimp 2017-04-07 17:50:20 +02:00
Kim Kulling 38fab5ae8e doc updatedoc update 2017-04-07 17:46:53 +02:00
Maarten Heremans 8f3aaa88f9 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.
2017-04-03 11:07:43 +02:00
Andre Schulz 0f6782df27 Fix PDB file installation in RelWithDebInfo configuration 2017-04-01 16:03:01 +02:00
Kim Kulling 6d71e4d5d7 Config.h.in: fix typo. 2017-03-29 21:08:40 +02:00
Kim Kulling 1ab85f16ff Merge pull request #1217 from Kai-W/master
Added ComponentType Unsigned int and Error handling
2017-03-28 17:06:06 +02:00