Commit Graph

3682 Commits (0bc410a5624873b164dd449f4d8a0811783cb75d)

Author SHA1 Message Date
Kim Kulling a66e644bf3 Fix coverity finding: fix possible use after free.. 2016-08-29 15:24:24 +02:00
Kim Kulling 243df452a4 GeometryBuilder: fix update of vertices. 2016-08-25 18:20:52 +02:00
Kim Kulling 3fc384472a Merge pull request #985 from Sailsman63/64b_static_zlib
Building own zlib on 64bit Linux shared library requires -fPIC for C compiler.
2016-08-20 14:48:03 +02:00
Kim Kulling 85b3e45aa7 Merge pull request #984 from jwwalker/upstream
Add typecasts in glTFAssetWriter.inl to fix compile errors
2016-08-19 10:26:48 +02:00
Lucas Stanek 4dfe2a1bad Add -fPIC to C Flags for 64bit linux Shared Object builds without checking if zlib is being built. 2016-08-19 03:28:55 +00:00
Lucas Stanek aef1b1c51b Building static ZLIB on 64b LInux requires -fPIC for C compiler. 2016-08-19 03:28:53 +00:00
Daniel Knezevic 50a2e80e96 Use Assimp namespace to fix build for big-endian architectures 2016-08-19 03:28:50 +00:00
James Walker 666d1ce164 Changed C-style casts to static_cast. 2016-08-18 10:55:24 -07:00
Alexander Gessler 9afb760e06 Merge pull request #986 from Deni90/master
Use Assimp namespace to fix build for big-endian architectures
2016-08-18 15:41:48 +02:00
Daniel Knezevic c2c12c1db5 Use Assimp namespace to fix build for big-endian architectures 2016-08-18 10:51:20 +02:00
James Walker e9ecd6f8a7 Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: <https://github.com/assimp/assimp/issues/980> 2016-08-17 17:48:29 -07:00
Chris Russ 3f08cebfab include config.h to always have the correct types (float/double) exposed 2016-08-17 07:57:31 +10:00
Chris Russ 4f7b624fe8 fix precision issue within memory copy 2016-08-16 16:03:56 +10:00
Chris Russ 6128987210 add explicit config.h include to export 2016-08-16 16:03:56 +10:00
Chris Russ 6613b6382f renaming define for double precision to be picked up by cmake correctly 2016-08-16 16:03:56 +10:00
Chris Russ 63a4591683 Fixing bugs related to 64-bit upgrade in materials 2016-08-16 16:03:56 +10:00
Kim Kulling cc16d4a0db Merge pull request #983 from roshanch/master
adding support to store all the layered textures
2016-08-15 21:30:46 +02:00
roshan.c 27f81884f9 adding support to store all the layered textures 2016-08-15 09:58:53 -07:00
Kim Kulling 644557c6d6 Merge pull request #979 from assimp/issue_975
Fix copy-paste-error.
2016-08-14 21:25:07 +02:00
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