Commit Graph

2195 Commits (f2e6f2f67f04a8c28bc9d025321ae8ac1460995c)

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 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
James Walker 666d1ce164 Changed C-style casts to static_cast. 2016-08-18 10:55:24 -07: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 63a4591683 Fixing bugs related to 64-bit upgrade in materials 2016-08-16 16:03:56 +10:00
roshan.c 27f81884f9 adding support to store all the layered textures 2016-08-15 09:58:53 -07: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 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 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 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
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 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
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
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
Adi Shavit @ MacBookPro f119447549 Fixes compilation on OSX with gcc.
- The symbol `typeof` collides with a non-standard gcc "keyword". See https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
- Renamed to `type_of`.
2016-07-25 16:33:25 +03:00
TrianglesPCT 667aa37fdd Add files via upload
used ai_real instead of float
2016-07-24 18:45:41 -06:00
TrianglesPCT 28c9f56c5e Add files via upload
scale blender vert color out to 0-1 range as aiColor specifies
2016-07-24 02:26:23 -06:00
TrianglesPCT bcb86bcc35 Add files via upload
fix blender vert colors being casted to signed char, which was causing negative values.

Also fix blender vert colors being way outside of 0 to 1 range which aiColor specifies
2016-07-24 02:23:59 -06:00
Volodymyr Boichentsov 5c5acae92e Delete reduntal 'g ' from actual name of Group. (we don't have 'usemtl' in material name)
Fixed issue in case 'usemtl' goes straight after 'g'.
2016-07-22 14:10:06 +01:00
Kim Kulling 5fc3ee9a21 fix https://github.com/assimp/assimp/issues/946: use correct test for objectcompare in blender. 2016-07-17 13:54:01 +02:00
Chris Russ c57b524a59 moving cmake configure_file to appropriate location 2016-07-16 18:47:59 +10:00
Chris Russ a7894b090d Upgrading PLY exporter to allow element definition as double 2016-07-16 18:23:33 +10:00
Chris Russ ad8bb32561 Properly defining build-time defines in config.h 2016-07-16 18:23:33 +10:00
Chris Russ 05a6ee6473 Adding double precision import support for formats that can be exported 2016-07-16 18:23:33 +10:00
Chris Russ fa1d6d8c55 propagating precision requirments into operations 2016-07-16 18:23:33 +10:00
Chris Russ 5adb0e899c CMake Option and moving more functions to optional double support 2016-07-16 18:23:33 +10:00
Chris Russ 2f7e3dcdcc Basic changes to introduce optional double precision 2016-07-16 18:23:33 +10:00
Kim Kulling 45fae27aed DefaultIOStream: export class for testing. 2016-07-16 09:13:59 +02:00
Kim Kulling a15a77dff5 glTF: fix doxygen typo. 2016-07-15 10:35:44 +02:00
Kim Kulling e1697b30bc Blender: mark local function as static. 2016-07-15 10:33:48 +02:00
Kim Kulling 9678da72c9 Public includes: add pragma statement and formalize include guard schema. 2016-07-11 20:56:38 +02:00
Kim Kulling 02602ce9af Update license date. 2016-07-10 15:34:58 +02:00
Kim Kulling a8673d4828 Merge pull request #941 from assimp/feature/issue_940
Feature/issue 940
2016-07-08 19:29:51 +02:00
Kim Kulling 4d012bc476 Update version. 2016-07-08 18:40:26 +02:00
Kim Kulling 599e846f57 Remove dead code. 2016-07-08 18:31:19 +02:00
Kim Kulling 070fb3363f Closes https://github.com/assimp/assimp/issues/940: use standard offsetof
instead of an own version.
2016-07-08 18:30:26 +02:00
Chris Russ a5b3ce9a3c reverting back to 16 digit precision export
having to import 17 digit floats likely leads to issues in many other apps
2016-07-06 15:33:51 +10:00
Chris Russ 10f22779f4 setting default export precision to 17 for all exporters 2016-07-06 14:49:14 +10:00
Kim Kulling 19769eef8b Version: prepare 3.3 version. 2016-07-05 18:43:16 +02:00
Fabian Herb 7b08233ef2 Fix identation 2016-07-01 17:08:28 +02:00
Fabian Herb 3c7dd2b302 More whitespace consistency 2016-07-01 17:02:54 +02:00
Fabian Herb 616aa022a7 CMake: whitespace consistency, variable naming 2016-07-01 16:57:45 +02:00
cmdrf 9c7de7b2a8 Update to latest Melange SDK 2016-07-01 14:50:46 +02:00
Kim Kulling 886cea2933 Merge pull request #927 from royshil/obj_color_vertices_support
adding support for per-vertex colors in OBJ files.
2016-06-28 22:08:59 +02:00
Kim Kulling 5321072007 Static code analysis: fix minor finding. 2016-06-28 11:25:04 +02:00
Roy Shilkrot 7d98643bcf adding support for per-vertex colors. 2016-06-27 20:08:22 -04:00
Kim Kulling 9b6de15b74 closes https://github.com/assimp/assimp/issues/904: add ai_strtof for
VS2012.
2016-06-20 20:30:29 +02:00
Kim Kulling 447a9642c2 closes https://github.com/assimp/assimp/issues/918: use correct lib
install name for macos.
2016-06-17 20:42:19 +02:00
Kim Kulling b01e424476 Merge pull request #917 from assimp/feature/new_includes
Feature/new includes
2016-06-14 22:54:56 +02:00
Kim Kulling 62e07a8af0 closes https://github.com/assimp/assimp/issues/911: use correct include
path for unzip, when detected.
2016-06-14 20:27:40 +02:00
Kim Kulling 334ac9a7d0 Merge pull request #908 from Adjective-Object/master
Added 'joint' node type to Collada export
2016-06-13 11:35:11 +02:00
Kangning Li f15b6177f7 glTFExporter fixes: spaces to tabs 2016-06-10 13:41:59 -04:00
Kangning Li 32d9ef042a Merge branch 'master' into gltfErrors 2016-06-10 09:51:35 -04:00
Kangning Li c98e77907c fixed some small bugs in the gltf exporter: byteOffsets in accessors/bufferViews, logic problem with bufferView targets 2016-06-10 09:49:04 -04:00
Kim Kulling 81773b4e4e Update fast_atof.h
Fix include brackets.
2016-06-07 11:51:09 +02:00
Kim Kulling 7207e5117c Use new include bracktes. 2016-06-06 22:04:29 +02:00
Maxwell Huang-Hobbs d23439451a Added 'joint' node type to Collada export 2016-06-05 21:04:02 -04:00
Kim Kulling 814d2e7821 Merge branch 'master' of https://github.com/assimp/assimp 2016-06-04 19:04:06 +02:00
Kim Kulling 0a1dda22b2 ColladaParser: add warning when empty semantic will be parsed. 2016-06-04 17:53:51 +02:00
Kim Kulling d67c8c29b6 Merge pull request #898 from turol/cxx11-refactor
Use C++11 range-based for loops
2016-05-26 16:56:07 +02:00
Kim Kulling 8fa0071d16 closes https://github.com/assimp/assimp/issues/892: add own to_string
implementation.
2016-05-26 00:44:29 +02:00
Kim Kulling 4e982c0538 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-26 00:41:48 +02:00
Kim Kulling 2cbbc3da09 OpenGEX-Importer: remove dead code. 2016-05-26 00:41:31 +02:00
Kim Kulling abad093d09 Update OpenGEXImporter.cpp
Fix compiler warning: remove unused variables.
2016-05-25 10:18:24 +02:00
Kim Kulling 5463146688 Add std::string header. 2016-05-25 00:58:05 +02:00
Kim Kulling f9f493d017 Merge branch 'master' of https://github.com/assimp/assimp 2016-05-25 00:27:16 +02:00
Kim Kulling 037fec275c std::to_string: add replacement for android build chain. 2016-05-25 00:26:41 +02:00
Turo Lamminen 381f87507f SplitLargeMeshes: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen 896ab8eee2 Unreal: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen d238597459 Raw: Use C++11 range-based for loop 2016-05-23 17:33:52 +03:00
Turo Lamminen 6c9c040419 Q3BSP: Use C++11 range-based for loop 2016-05-23 17:33:51 +03:00
Turo Lamminen a09a6a40c0 OpenGEX: Use C++11 range-based for loop 2016-05-23 17:33:49 +03:00
Turo Lamminen 32e4dd0bd1 Ogre: Use C++11 range-based for loop 2016-05-23 17:30:48 +03:00
Turo Lamminen 3eb9b8e91b NFF: Use C++11 range-based for loop 2016-05-23 17:30:47 +03:00
Turo Lamminen ac676d4d3c MD5: Use C++11 range-based for loop 2016-05-23 17:30:47 +03:00
Turo Lamminen b9fbfbc18a LWO: Use C++11 range-based for loop 2016-05-23 17:30:42 +03:00
Alexander Gessler cd4f212b5f Merge pull request #891 from ciechowoj/blender_materials
Blender materials
2016-05-22 14:39:45 +02:00
Turo Lamminen 3031470ec1 IRR: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen c7c756d344 FBX: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen 8566b9aa90 D3MF: Use C++11 range-based for loop 2016-05-22 13:57:13 +03:00
Turo Lamminen 52405bbe1b Collada: Use C++11 range-based for loop 2016-05-22 13:57:11 +03:00