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

5290 Commits (bd8d3025bd60a03abe728d4752d141b82d200b8a)

Author SHA1 Message Date
Kim Kulling 39e52341c2 Fix copy-paste-error. 2016-08-14 21:24:00 +02:00
Alexandr Arutjunov 2732e5d9b6 [F] Removed Unicode BOM. 2016-08-14 19:49:05 +03:00
Alexandr Arutjunov e0356b09be Merge branch 'master' into gltf_o3dgc 2016-08-14 16:49:53 +03:00
Alexandr Arutjunov 48f8c117e2 [F] Conditional compilation for Open3DGC-extension. 
[F] Flag comp_allow did not reset when mesh can not be encoded.
 2016-08-14 16:27:16 +03:00
Kim Kulling aaaadd2236 Merge pull request #978 from assimp/issue_975 
closes https://github.com/assimp/assimp/issues/97: define for 32-bit …
 2016-08-14 15:20:59 +02:00
Kim Kulling 86470541b1 Merge pull request #976 from assimp/issues_967 
closes https://github.com/assimp/assimp/issues/967: add unzip include path
 2016-08-14 12:24:49 +02:00
Kim Kulling 6ae545b609 Merge pull request #977 from assimp/update_rapidjson_version_1_0_2 
Update rapidjson to v1.0.2
 2016-08-14 12:24:39 +02:00
Kim Kulling ec67a1f2ea closes https://github.com/assimp/assimp/issues/97: define for 32-bit linux 2016-08-14 12:23:16 +02:00
Kim Kulling c403565d06 Update rapidjson to v1.0.2 2016-08-14 11:58:12 +02:00
Kim Kulling b916857659 closes https://github.com/assimp/assimp/issues/967: add unzip include path 
when no other version was found.
 2016-08-14 11:44:21 +02:00
Alexandr Arutjunov de70f5c028 [+] Added link to RT library when using Open3DGC-compression. 2016-08-13 17:44:58 +03:00
Alexandr Arutjunov 3a10a3cf03 [-] Removed unneeded include. 2016-08-13 16:27:34 +03:00
Alexandr Arutjunov 8ab50aa9a0 [*] Few C++11 constructions are removed. 2016-08-13 16:27:07 +03:00
Alexandr Arutjunov 1844665693 [*] Few C++11 constructions are removed. 2016-08-13 16:09:21 +03:00
Kim Kulling eb82a800cb CMakeLists: cleanup, move all options to one place for mantenace. 2016-08-13 09:13:22 +02:00
Kim Kulling d586aab53b Update Readme.md 
fix link to chat channel. IRC is obsolete now.
 2016-08-12 19:44:07 +02:00
Kim Kulling e2a1a2f751 Merge pull request #974 from assimp/issue_901 
closes https://github.com/assimp/assimp/issues/901
 2016-08-12 19:38:09 +02:00
Kim Kulling 0379675fca Add type to deal with 64-bit filesizes on x86_64-apple-darwin15.5.0x86_64-apple-darwin15.5.0 2016-08-12 18:47:37 +02:00
Kim Kulling 83b02ff41f DefaultIOStream: add missing detection for apple-based OS. 2016-08-12 18:14:26 +02:00
Kim Kulling bdcff35d5d closes https://github.com/assimp/assimp/issues/901 2016-08-12 17:13:18 +02:00
Alexandr Arutjunov 0ad2f2247a [+] glTF import/export. Support for Open3DGC-compression of mesh primitives. 2016-08-11 01:04:30 +03:00
Alexandr Arutjunov 0dcf4dcd16 [F] Typo. 2016-08-11 01:02:32 +03:00
Kim Kulling 8ba10cf26a Closes https://github.com/assimp/assimp/issues/966: add missing doc for 
assimp_cmd.
 2016-08-09 13:42:33 +02:00
Alexandr Arutjunov 778ad7f06f [+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression. 2016-08-09 13:37:32 +03:00
Alexandr Arutjunov 9a4fa1321b [+] Save parameters of mesh extension: Open3DGC-compression. 2016-08-09 13:26:57 +03:00
Alexander Gessler fefa4ee9c1 Merge pull request #970 from nyorain/patch-1 
Added documentation for embedded textures
 2016-08-09 01:43:19 +02:00
nyorain e7ed352078 Added documentation for embedded textures 2016-08-09 01:06:43 +02:00
Kim Kulling 86f30e4852 Merge pull request #965 from waldyrious/patch-1 
fix long option name for --om
 2016-08-08 19:48:49 +02:00
Alexandr Arutjunov 507668229f [+] Support Open3DGC for glTF import/export. Intermediate commit. 2016-08-08 19:24:50 +03:00
Alexandr Arutjunov 41ed74beb6 [*] Style. Intermediate commit. 2016-08-08 19:07:30 +03:00
Alexandr Arutjunov a6ec0e4c7a [*] Style. Intermediate commit. 2016-08-08 19:06:17 +03:00
Alexandr Arutjunov e61fc06c40 [F] Comparison between signed and unsigned integer. 2016-08-08 19:04:37 +03:00
Waldir Pimenta a9ebac6b54 fix long option name for --om 
to match the actual code in tools/assimp_cmd/Main.cpp
 2016-08-08 11:46:41 +01:00
Kim Kulling 042b2bbe77 Merge pull request #964 from waldyrious/patch-1 
dox_cmd.h: fix typo 'dumb' --> 'dump'
 2016-08-05 22:19:42 +02:00
Waldir Pimenta a98e524fe2 dox_cmd.h: fix typo 'dumb' --> 'dump' 2016-08-05 19:54:58 +01:00
Madrich 8513089060 Merge pull request #11 from assimp/master 
Update fork
 2016-08-05 09:22:08 +02:00
Alexandr Arutjunov 29e982e185 [F] Fixed problem with more then one mesh in scene. More detaily read at line 529 in glTFAsset.inl. 2016-08-03 18:06:38 +03:00
Kim Kulling ad133a05ec CMake: remove dead code. 2016-08-03 10:20:03 +02:00
Alexandr Arutjunov c024beadba [+] Put information to log about decompressing. 2016-08-03 11:16:30 +03:00
Alexandr Arutjunov 5e4fd5fa3c [+] glTF. Support for import meshes with Open3DGC compression. 2016-08-03 03:46:04 +03:00
Alexandr Arutjunov 2e452205aa [+] Building of Open3DGC codec. 2016-08-03 03:40:53 +03:00
Alexandr Arutjunov 054820e6ff [+] Added Open3DGC codec from KhronosGroup repository. 2016-08-03 03:34:54 +03:00
Kim Kulling 6003616b07 Merge pull request #960 from smalcom/assimp_qt_viewer 
[+] 3D viewer which uses Assimp and Qt4.
 2016-08-01 20:15:00 +02:00
Alexandr Arutjunov 2a815df888 [F] Texture coordinate Y must be flipped for OpenGL. 2016-08-01 13:13:35 +03:00
Alexandr Arutjunov 6fe0895799 [F] Added checks for building assimp_qt_viewer. 2016-07-31 22:51:15 +03:00
Alexandr Arutjunov 28c0109b41 [F] Added include dirs and libraries for OpenGL and DevIL. 2016-07-31 15:50:48 +03:00
Alexandr Arutjunov 7df5e48129 [F] DevIL is needed for compilation. 2016-07-31 15:14:49 +03:00
Alexandr Arutjunov 2d921316ca [+] 3D viewer which uses Assimp and Qt4. 2016-07-31 14:56:30 +03:00
Alexander Gessler 454320ad08 Merge pull request #953 from TrianglesPCT/master 
Fix blender vertex colors being negative, and fix blender vertex colors scaling to be 0 to 1
 2016-07-27 21:37:02 +02:00
TrianglesPCT 66c1a176de Add files via upload 
forcing a new build
 2016-07-25 23:04:08 -06:00