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

3799 Commits (1f377bc99dd933142e4db06041b09bc4e8a26703)

Author SHA1 Message Date
odalet 4d229559fb Update appveyor.yml 2016-09-24 17:03:23 +02:00
Kim Kulling 38b9ae2c6c closes https://github.com/assimp/assimp/issues/584: export scene combiner. 2016-09-24 00:27:45 +02:00
Kim Kulling 304556ab16 Merge pull request #1005 from assimp/issues/177 
IFC: Switch generated file to 2 files
 2016-09-24 00:21:47 +02:00
Kim Kulling b50d734d75 IFC: Switch generated file to 2 files to fix issue related to <mingw4.9 ( 
Thanks Qt! )
 2016-09-23 19:48:38 +02:00
Kim Kulling e72dbad130 Refactoring: rename ModelDiffer to Scenediffer. 2016-09-23 10:22:14 +02:00
Kim Kulling 68d33a99a1 ModelDiffer: update material testser + create material for unittests. 2016-09-23 10:10:00 +02:00
Kim Kulling d005b38f99 Merge branch 'master' of https://github.com/assimp/assimp 2016-09-22 09:52:56 +02:00
Kim Kulling 1e7af6f24a ObjImporter: fix test for vertices import. 2016-09-22 09:15:41 +02:00
Kim Kulling 38cbdcd885 Merge pull request #1001 from johnmaf/feature/glTF/separate-bin 
Export glTF buffer data in a separate .bin file
 2016-09-21 19:39:38 +02:00
Kim Kulling 787d734efb Merge pull request #1004 from johnmaf/bugfix/glTF-triangulate 
Add Triangulate post-processing step to glTF exporters
 2016-09-21 19:37:54 +02:00
johnmaf 0277a23521 Add Triangulate post-processing step to glTF exporters 2016-09-21 11:33:02 -04:00
johnmaf 3052f35824 glTF: move mesh splitting to constructor to cover GLB 2016-09-20 14:15:42 -04:00
Kim Kulling ce2532e93b ModelDiffer: use Equal-method to compare vectors. 2016-09-20 19:48:03 +02:00
johnmaf c9f28192d9 Merge upstream master 2016-09-20 11:53:12 -04:00
Kim Kulling c11ae8e722 Merge pull request #972 from smalcom/gltf_o3dgc 
Support for Open3DGC-compression in glTF importer/exporter.
 2016-09-20 12:36:59 +02:00
Alexandr Arutjunov 0bc410a562 Merge branch 'gltf_o3dgc' of https://github.com/smalcom/assimp into gltf_o3dgc 2016-09-20 16:06:08 +03:00
Alexandr Arutjunov f11545d2c0 [*] Merge with fresh master. 2016-09-20 16:02:41 +03:00
Kim Kulling 2e943e5443 Obj: prepare unittest and add missing tests for mesh comparison in 
Modeldiffer.
 2016-09-20 11:27:58 +02:00
Kim Kulling b8950f6d90 Merge pull request #998 from johnmaf/bugfix/gltfUVs 
Flip UVs in glTFExporter
 2016-09-20 09:53:57 +02:00
Kim Kulling 097743880c Merge pull request #999 from johnmaf/feature/single-glTF-buffer 
Add all glTF data to single buffer
 2016-09-20 09:52:54 +02:00
johnmaf 3c827f29f6 Export glTF buffers as separate .bin files 2016-09-19 17:44:38 -04:00
Kim Kulling 61419cc0ae Unittest: add first approach for modeldiffer. 2016-09-19 21:35:45 +02:00
Kim Kulling 0b060d6738 Renaming doc. 2016-09-17 10:20:03 +02:00
Kim Kulling a29f562241 Doc: add uml-diagrams for import and export. 2016-09-17 10:07:14 +02:00
smalcom dad4d0fa99 [F] min/max redefined when including windows.h 2016-09-15 22:25:34 +03:00
Alexandr Arutjunov a9284e5a95 [F] Removed unneeded definitions. 
[F] Add library for linker.
 2016-09-15 20:39:39 +03:00
johnmaf cd038209dd Add all glTF data to single buffer 2016-09-15 10:38:02 -04:00
Alexandr Arutjunov 65048d1ef7 [F] Removed Unicode BOM at file beginning. 2016-09-15 14:45:00 +03:00
johnmaf 8b3f348d63 Flip UVs in glTFExporter 2016-09-14 18:03:52 -04:00
Alexandr Arutjunov 40cfb45c74 [F] Not set option-variable (only define for compilation was set. 
[F] For adding library can not be used TARGET_LINK_LIBRARIES
 2016-09-13 13:29:12 +03:00
Alexandr Arutjunov 24e25324f2 Merge branch 'master' into gltf_o3dgc 2016-09-13 12:08:51 +03:00
Kim Kulling 0c00edb40e Blender: fix some minor findings. 2016-09-12 12:41:49 +02:00
Kim Kulling c98915e382 Merge pull request #949 from r-chris/fix-material-bugs 
Fixing bugs related to 64-bit upgrade in materials
 2016-09-12 09:41:58 +02:00
Kim Kulling 44a7d600e6 unittests: add platform libs for linux build. 2016-09-11 17:28:20 +02:00
Kim Kulling 68e6f2a32c Unittest: add gtest as part of the contrib to avoid build issues on 
offline systems.
 2016-09-11 16:06:29 +02:00
Alexandr Arutjunov a375344052 Merge branch 'master' into gltf_o3dgc 2016-09-10 10:37:32 +03:00
Kim Kulling 22cfe84cba 3MF: add a simple box example from the 3MF-sample repo. 2016-09-10 09:27:29 +02:00
Kim Kulling 7cedd4ab89 CMake: fix buildCMake: fix build.. 2016-09-10 08:48:01 +02:00
Alexandr Arutjunov 7212ad9f0e [+] FindRT cmake module. 2016-09-10 09:16:47 +03:00
Alexandr Arutjunov a72a6f8873 Merge branch 'master' into gltf_o3dgc 2016-09-10 09:14:40 +03:00
Alexandr Arutjunov 5fe32caa6d Merge branch 'master' into gltf_o3dgc 2016-09-10 09:14:28 +03:00
Alexandr Arutjunov d97f00571e [*] Not needed namespace. 2016-09-10 09:07:50 +03:00
Alexandr Arutjunov ac1bcaa4cc Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc 2016-09-10 09:05:36 +03:00
Kim Kulling 95676b4db9 Merge branch 'master' of https://github.com/assimp/assimp 2016-09-09 20:42:36 +02:00
Kim Kulling 05fce9a008 3MF: make xml tags static const. 2016-09-09 20:42:02 +02:00
Kim Kulling b22f93eabf 3MFImporter: add source group for visual dtudio. 2016-09-09 20:41:04 +02:00
Alexandr Arutjunov d49ad6c93e [*] Stylistic changes. 
[F] Added all files from Open3DGC codec to CMakeLists.txt
 2016-09-09 16:38:43 +03:00
Kim Kulling f336f30335 Merge pull request #996 from johnmaf/bugfix/gltf-split 
Split mesh before exporting gltf. Fixes #995
 2016-09-08 12:37:07 +02:00
johnmaf 702d57fbae Split mesh before exporting gltf. Fixes #995 2016-09-07 17:03:19 -04:00
Kim Kulling ccf1b368c8 Merge branch 'master' of https://github.com/assimp/assimp 2016-09-06 15:46:41 +02:00