Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,739 Commits 19 Branches 43 Tags
268b18dabf4d3d927fa4cedda70ac49cc78d0abc
Commit Graph

2218 Commits

Author SHA1 Message Date
Alexandr Arutjunov
268b18dabf Merge branch 'master' into import_x3d 2016-10-02 17:31:44 +03:00
Alexandr Arutjunov
3086a07e86 [*] Docs and build-files fixes. 2016-10-02 17:27:13 +03:00
Kim Kulling
59212bf55a Merge pull request #1011 from smalcom/import_amf 
Import amf
 2016-10-02 14:52:00 +02:00
Kim Kulling
6233f65b3a Merge pull request #1012 from johnmaf/bugfix/glTF-transparency 
glTF: Read and write transparency values
 2016-10-02 11:52:59 +02:00
Alexandr Arutjunov
9c0de90ede [F] Fixed missed break. 
[F] Doc changes.
[*] Removed Boost dependency.
[*] Style changes.
 2016-10-02 03:08:34 +03:00
Alexandr Arutjunov
823003ba9b [F] Fixing checking rule 2016-10-02 02:28:06 +03:00
Alexandr Arutjunov
8856f7f6ae Merge branch 'import_amf' into import_x3d 2016-09-30 02:38:59 +03:00
Alexandr Arutjunov
9d4d0de607 [*] Few changes for building using old (or MS) compilers. 2016-09-30 02:24:24 +03:00
Alexandr Arutjunov
c1a3912b3f [F] Erasing with constant iterator. Strange that new gcc is allow this. 
[*] Few changes for building using old (or MS) compilers.
 2016-09-30 02:12:46 +03:00
John Senneker
83c0163ec6 glTF: Read and write transparency values 2016-09-29 17:44:04 -04:00
Alexandr Arutjunov
db54eb98e3 Merge branch 'import_amf' into import_x3d 2016-09-30 00:30:26 +03:00
Alexandr Arutjunov
f497f739fa [*] Not all modern compilers is support new C++ feature "using". What the sad? 2016-09-30 00:03:34 +03:00
Alexandr Arutjunov
8ad6c80dac [*] Removed Boost dependency. 2016-09-29 23:48:41 +03:00
Alexandr Arutjunov
61bced27df [*] Removed Boost dependency. 2016-09-29 23:38:24 +03:00
Alexandr Arutjunov
76c84aa24d [F] Header missed. 2016-09-29 23:19:47 +03:00
Alexandr Arutjunov
ef9b6a7375 [F] Removed UTF-8 BOM 2016-09-29 23:16:59 +03:00
Alexandr Arutjunov
3274951f2a [+] X3D importer. 2016-09-29 18:50:24 +03:00
Alexandr Arutjunov
e4cb388153 [*] Style and doc changes. 2016-09-29 18:04:31 +03:00
Alexandr Arutjunov
818fb2e901 [F] Typo: invalid format hint index. 2016-09-29 17:11:53 +03:00
Alexandr Arutjunov
0a25b076b8 Merge branch 'master' into import_amf 2016-09-28 17:51:59 +03:00
Alexandr Arutjunov
cb38054247 [+] AMF-importer. Also some fixes for modern Assimp. 2016-09-28 17:49:15 +03:00
Kim Kulling
9f7e34663e FBX: make lookup test less strict. closes https://github.com/assimp/assimp/issues/994 2016-09-28 16:16:06 +02:00
Kim Kulling
f383ec0797 Fix some review findings. 2016-09-28 00:06:23 +02:00
Kim Kulling
cd9cb50eaf OpenGEX: fix some review findings. 2016-09-28 00:06:06 +02:00
Kim Kulling
36d770d3db OpenGEX: fix some review findings. 2016-09-27 19:47:27 +02:00
Kim Kulling
78dae87de2 closes https://github.com/assimp/assimp/issues/954: add import of vertex 
colors in
penGEX-importer.
 2016-09-27 19:40:06 +02:00
Alexandr Arutjunov
6a9ccf2016 [+] Flag for scene for supporting formats where more than one face can reference to one vertex. 2016-09-26 13:01:38 +03:00
Alexandr Arutjunov
386128febc [+] Building AMF-importer. 2016-09-26 12:57:44 +03: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
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
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
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
johnmaf
c9f28192d9 Merge upstream master 2016-09-20 11:53:12 -04:00
Alexandr Arutjunov
f11545d2c0 [*] Merge with fresh master. 2016-09-20 16:02:41 +03: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
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
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
5fe32caa6d Merge branch 'master' into gltf_o3dgc 2016-09-10 09:14:28 +03:00