v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,461 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

2638 Commits (4c2385b55ba0154fde850568a4161db65726070e)

Author SHA1 Message Date
Kim Kulling 9e98097aae closes https://github.com/assimp/assimp/issues/1244: log error for 
overflow.
 2017-05-31 21:43:41 +02:00
Kim Kulling 8c6f18ea2a Merge branch 'master' of https://github.com/assimp/assimp 2017-05-31 21:37:42 +02:00
Kim Kulling 1207a81b70 ObjImporter: remove dead code. 2017-05-31 21:37:16 +02:00
Kim Kulling 4dc7940ac5 ObjImporter: fix dead code. 2017-05-31 20:28:00 +02:00
Kim Kulling e501cc17c2 Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks 2017-05-31 20:18:39 +02:00
Kim Kulling 82380084c5 ObjImporter: next try for multiple line stuff. 2017-05-31 16:36:08 +02:00
Kim Kulling 813f3b8248 ObjLoader: improve performance of obj-import. 2017-05-30 21:10:33 +02:00
Kim Kulling c121cec68a Obj-Importer: introduce working test for line breaks. 2017-05-29 22:00:13 +02:00
Kim Kulling d30b1e585c Tests how o adress this topic. 2017-05-28 22:25:06 +02:00
Kim Kulling 8cc80a3d9c ObjImporter: fix the build. 2017-05-28 14:14:22 +02:00
Kim Kulling 3d99892b94 Opj-Importer: fix coverity finding. 2017-05-27 19:37:28 +02:00
Kim Kulling e93355c8b4 Build: fix some compiler warnings for g++. 2017-05-26 09:18:23 +02:00
Kim Kulling 1b4cbcc6ad Merge branch 'master' of https://github.com/assimp/assimp 2017-05-25 22:40:36 +02:00
Kim Kulling fb33199d99 GLTFImporter: exclude headers from build whem no_glft_importer is 
defined.
 2017-05-25 22:34:45 +02:00
Kim Kulling b7d4b69e0d X3DImporter: fix the build. 2017-05-24 22:35:35 +02:00
Kim Kulling 3c370c83b9 MDLImporter: remove dead code. 2017-05-24 21:18:51 +02:00
Kim Kulling 18b0316d52 X3DImporter: fix coverity finding ( missing comma ). 2017-05-24 21:15:55 +02:00
Kim Kulling ec496a5833 X3DImporter: fix coverity finding. 2017-05-24 21:04:35 +02:00
Kim Kulling 3d5e94477f Merge pull request #1272 from assimp/issue-1262 
closes https://github.com/assimp/assimp/issues/1262: fix .
 2017-05-19 23:13:40 +02:00
Kim Kulling febf94f6aa Merge pull request #1212 from aoowweenn/umw_dev 
MikuMikuDance Format
 2017-05-17 12:01:46 +02:00
Kim Kulling eba06f0c8b Merge pull request #1275 from ab4d/master 
Fixed build error in ObjExporter :: GetMaterialLibFileName
 2017-05-17 11:34:35 +02:00
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
Andrej 331bbacf3d Fixed build error in ObjExporter :: GetMaterialLibFileName 2017-05-16 22:18:47 +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 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 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