Commit Graph

4398 Commits (1daad40b301c29936a5cf2f13b00fa8366709c2d)

Author SHA1 Message Date
Kim Kulling 1daad40b30 Merge branch 'master' into issue-1262 2017-05-17 10:20:45 +02:00
Kim Kulling 04f908aa4c Obj-Exporter: fix build. 2017-05-17 10:13:07 +02:00
Kim Kulling 60c54cbf59 Merge branch 'master' of https://github.com/assimp/assimp 2017-05-17 09:25:30 +02:00
Kim Kulling 2f649833d5 LWOLoader: fix link in loader description. 2017-05-17 09:25:07 +02:00
Kim Kulling 2b785e4e81 Merge pull request #1274 from ab4d/master
Improved obj exporter to export materials to fileName.mtl file instead of fileName.obj.mtl
2017-05-16 22:09:59 +02:00
Andrej 2b89a3cffc Using single quote for one character parameter in find_last_of method call 2017-05-16 21:56:49 +02:00
Kim Kulling 3f68278ea0 Merge branch 'master' into issue-1262 2017-05-16 21:53:35 +02:00
Kim Kulling 6c70edaf28 build: add missing files. 2017-05-16 21:46:04 +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
Andrej c3974512e4 Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl 2017-05-16 15:55:40 +02:00
Andrej 04dbdca329 Revert "Creating fileName.mtl file instead of fileName.obj.mtl"
This reverts commit 5757980ea5.
2017-05-16 15:47:57 +02:00
Andrej 5757980ea5 Creating fileName.mtl file instead of fileName.obj.mtl 2017-05-16 15:34:50 +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 0c3a145729 issue-1266: add unittest for it. 2017-05-15 21:18:34 +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
Alexander Gessler cd7cc2e58c Merge pull request #1267 from VennGrayDog/b1
Fix location of config.h
2017-05-15 00:39:05 +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 d02a4c36a9 Mesh: fix coverity finding. 2017-05-06 11:08:57 +02:00
Kim Kulling c1b56715fe Mesh: fix coverity bug. 2017-05-06 11:04:40 +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
Kim Kulling 82e213fb7c Merge pull request #1252 from a-day-old-bagel/master
Shouldn't the configured "config.h" file be going into the binary directory?
2017-05-02 20:07:08 +02:00