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

2363 Commits (d9b0449e835f3cdee66845295c5cbc15d1f7992d)

Author SHA1 Message Date
Angelo Scandaliato 57b9232075 deleted code/MakeFile and added to .gitignore 2016-10-08 15:23:59 -07:00
Alexandr Arutjunov 0359ded946 [F] Checking directive name with start from symbol 'm'. And checking argument of 'mtllib'. 2016-10-07 16:40:51 +03:00
Kim Kulling 6f6dd69270 Merge pull request #1021 from smalcom/export_x3d 
Export x3d
 2016-10-07 13:05:02 +02:00
Kim Kulling d474c24753 Merge pull request #1024 from ascandal/feature/glTF-animations 
Export glTF node animations
 2016-10-07 10:30:42 +02:00
Angelo Scandaliato 574abd3c01 removed obsolete commented out code 2016-10-07 00:26:08 -07:00
Kim Kulling 0bae2bbfa7 Obj-Importer: start new streaming handling. 2016-10-07 09:19:10 +02:00
Angelo Scandaliato 84803bd51a removed cout debugging statements and older ExportSkins function 2016-10-06 23:57:16 -07:00
Angelo Scandaliato d128837a3a export vertex joint and weight information 2016-10-06 18:59:53 -07:00
Angelo Scandaliato ae36ca0e44 moved ExportSkins function into ExportMeshes function 2016-10-06 15:18:33 -07:00
Angelo Scandaliato 83c9addbc9 removed duplicate function for ExportData 2016-10-06 13:01:03 -07:00
Angelo Scandaliato f59b8b3a59 export inverseBindMatrix Data for skins 2016-10-06 12:56:34 -07:00
Angelo Scandaliato 42a8d58f45 Export Nodes before meshes to avoid issue if node id's are changed 2016-10-06 11:29:09 -07:00
Alexandr Arutjunov c6d233768f [F] Small doc changes. 2016-10-06 19:02:37 +03:00
Alexandr Arutjunov 8c6ee48af5 [*] Merged fresh master and resolved conflicts. 2016-10-06 17:12:56 +03:00
Alexandr Arutjunov 9a4d693773 [+] Export to X3D format. 2016-10-06 17:04:37 +03:00
Alexandr Arutjunov 85d5fc2169 [-] Removed unneeded logging. 
[F] Invalid metadata type used in postprocessing.
 2016-10-06 17:04:08 +03:00
Angelo Scandaliato 4ac57f1fab fixed issues to get node animations working 2016-10-06 02:34:11 -07:00
Angelo Scandaliato 0313328a92 set bindShapeMatrix to identity 2016-10-05 18:16:32 -07:00
Angelo Scandaliato 79852de5ae added skins and jointNames 2016-10-05 17:30:02 -07:00
Angelo Scandaliato cfa0ea3189 finished first version of extport animation data 2016-10-05 13:32:06 -07:00
Kim Kulling b61aaf7ec4 New animation file for OpenGEX. 2016-10-05 20:14:42 +02:00
abma a3295c6640 fix compile warning 2016-10-05 02:07:42 +02:00
Kim Kulling 0aab2aa96a Merge pull request #1018 from johnmaf/bugfix/obj-homogeneous_coords 
Parse homogeneous vertex coordinates in OBJs
 2016-10-04 23:12:05 +02:00
Kim Kulling f94b7287fc Merge pull request #1015 from ascandal/feature/fix-glTF-validator-errors 
Fix glTF validator errors
 2016-10-04 23:10:30 +02:00
Kim Kulling 7a721b3014 Merge pull request #1016 from johnmaf/bugfix/glTF-sort_ptypes 
Sort by primitive type before exporting as glTF
 2016-10-04 23:09:16 +02:00
John Senneker c3ebdc56de Parse homogeneous vertex coordinates in OBJs 2016-10-04 17:06:31 -04:00
Alexandr Arutjunov 9d40f36f87 [F] Fixed type in list. 
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
 2016-10-04 23:58:51 +03:00
Alexandr Arutjunov 0ba0eca48e [+] Call for X3D exporter. 2016-10-04 23:55:08 +03:00
Kim Kulling 8d3184f6fb Merge branch 'master' of https://github.com/assimp/assimp 2016-10-04 18:41:25 +02:00
Kim Kulling 86dc3f7a79 X3D: Some more reformattings and missing initializations. 2016-10-04 18:40:58 +02:00
Angelo Scandaliato d249cca011 created the asset writer function for animations export gltf 2016-10-04 07:09:01 -07:00
Martin Gerhardy 7bf6cfc9f6 removed BOM 2016-10-04 12:45:28 +02:00
Kim Kulling 7b9162136f Some small format changes for assimp-style :-). 2016-10-04 11:45:08 +02:00
Angelo Scandaliato 37d32e79c9 created exportAnimation function 2016-10-03 19:29:37 -07:00
John Senneker f378230a13 Sort by primitive type before exporting as glTF 2016-10-03 17:19:44 -04:00
Kim Kulling 9dc4fb2aa3 AMF: add missing license info. 2016-10-03 19:24:14 +02:00
Angelo Scandaliato 99c93e861c Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors 2016-10-03 09:34:16 -07:00
Alexandr Arutjunov aeb99898d3 [*] Set float type for constants: less warnings, less type truncations. 2016-10-02 20:00:57 +03:00
Alexandr Arutjunov 897370b6ff [*] Pull fresh data. 
[F] Using ssize_t is bad idea.
 2016-10-02 19:52:24 +03:00
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
Angelo Scandaliato 0619232aef included samplers dictionary for textures 2016-09-30 17:23:38 -07: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
Angelo Scandaliato 7dd2e7011d fixed issue with texcoordinate bufferview target 2016-09-28 18:50:08 -07:00
Angelo Scandaliato f2e6f2f67f work around for indices array in ExportData 2016-09-28 15:56:06 -07:00
Angelo Scandaliato e89e98291a calculate and write min and max attributes for accessors 2016-09-28 14:47:15 -07: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
Angelo Scandaliato 3e322495f2 asset.version from int to string 2016-09-27 11:38:17 -07: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
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
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
Kim Kulling ffdca3593b ObjImporter: remove unused code. 2016-09-06 15:41:37 +02:00
Kim Kulling 0f2cea7ba6 Blender: revert fix for suspicious crash in blender on windows. 2016-09-06 10:42:02 +02:00
Kim Kulling 9e19b5103c IrrImporter: Fix release functions. 2016-09-05 10:48:30 +02:00
Kim Kulling cc860ede66 Fix coverity findings: fix usage after free. 2016-09-04 20:40:34 +02:00
Kim Kulling 9d4d2b2a1c ComputeUVMappingprocess: add missing initialization for scalar value. 2016-09-04 20:35:07 +02:00
Kim Kulling bcdc79ba73 Fix invalid release of mat + mesh. 2016-09-04 20:22:04 +02:00
Kim Kulling e51b7d2a61 IFC: fix possible use after free access bug. 2016-09-02 20:06:56 +02:00
Kim Kulling b240b9d30d Blender: fix invalid OnjectCompare op. 2016-09-02 20:06:31 +02:00
Kim Kulling 2568797015 MDLMoader: fix resource leak. 2016-08-30 19:50:53 +02:00
Kim Kulling 659a55be4a Fix coverity finding: use deep copy instead of reference showing to 
mem-adress when reading and calling push_back in a std::vector.
 2016-08-30 19:46:34 +02:00
Kim Kulling c6f670ff50 glTFImporter: avoid out-of-bounds-access. 2016-08-29 20:05:29 +02:00
Kim Kulling 147921ac39 MakeVerboseFormat: fix invalid delete statement. 2016-08-29 19:56:38 +02:00
Kim Kulling 26aa18c75a Fix findings from code review. 2016-08-29 18:23:41 +02:00
Kim Kulling 2545dee58d Fix coverity findings: fix possible out-of-bound access. 2016-08-29 15:32:27 +02:00
Kim Kulling 238f14f30f Fix coverity findings: fix possible usage after calling free. 2016-08-29 15:28:37 +02:00
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