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

5834 Commits (6600446e2c5369956ec5713d00f9f7f3979854d7)

Author SHA1 Message Date
Doron Adler 6600446e2c Merge branch 'master' into ios-build-script 
* master:
  https://github.com/assimp/assimp/issues/1796: return correct value on detach logger.
 2018-03-20 18:04:20 +02:00
Kim Kulling 9febb392d8
Merge pull request #1843 from assimp/issue_1796 
https://github.com/assimp/assimp/issues/1796: return correct value on…
 2018-03-20 16:13:31 +01:00
Doron Adler 643cf9bea2 Norod: Brought back 32bit archs 2018-03-20 17:09:50 +02:00
Kim Kulling e36f78482c https://github.com/assimp/assimp/issues/1796: return correct value on detach logger. 2018-03-20 14:53:57 +01:00
Doron Adler c1f6683b20 Partial revert, build only 64bit targets 2018-03-20 14:45:54 +02:00
Doron Adler c2f22be99a Norod: Default build type is set as Release, no shared libraries 2018-03-20 13:46:03 +02:00
Doron Adler e2e09ba2fa Norod: Support building assimp as dylib for iOS (set as default) 2018-03-19 22:51:52 +02:00
Doron Adler 14a1b9980e Norod: Do not attempt to look for Qt5Widgets when building for iOS 
Norod: Toolchain files get their SDKVER, DEVROOT and SDKROOT values from build.sh
Norod: Removed deprecated CMAKE_FORCE_
Norod: Build shared libs is now set-able from a flag, so to be more extendable later
Norod: .gitignore updated
 2018-03-19 15:49:16 +02:00
Doron Adler 3ca6b10810 Norod: Set IOS_SDK_VERSION to the latest based on xcodebuild sdk version 
Norod:Set XCODE_ROOT_DIR based on xcode-select's --print-path
 2018-03-19 13:17:18 +02:00
Kim Kulling 3390185270
Merge pull request #1837 from gonchar/master 
Support Maya 2018 Collada Export
 2018-03-18 23:34:09 +01:00
Kim Kulling f7854e4b32
Merge branch 'master' into master 2018-03-18 20:56:25 +01:00
Kim Kulling 14df0e1bd7
Merge pull request #1829 from JeffH-BMG/patch-3 
Add support for texture file in PLY exports
 2018-03-18 20:55:58 +01:00
Kim Kulling 6843b7a00c
Merge branch 'master' into patch-3 2018-03-18 17:44:21 +01:00
Sergey Gonchar 2d980c16f0 Support Maya 2018 Collada Export with blendshapes and bones controllers for a mesh 2018-03-15 21:41:40 -07:00
Kim Kulling 9444935ce8
Merge pull request #1834 from assimp/issue_1120 
closes https://github.com/assimp/assimp/issues/1120: use euler angles…
 2018-03-14 21:54:37 +01:00
Kim Kulling 5cf6509fb5 closes https://github.com/assimp/assimp/issues/1120: use euler angles for pre- and post-rotation. 2018-03-14 20:42:42 +01:00
Kim Kulling 58e73143fc
Merge pull request #1832 from assimp/3mf_basematerial_support 
3mf basematerial support
 2018-03-13 22:51:23 +01:00
Kim Kulling 4c023c3818 fix unittest folder for roundtriptest. 2018-03-13 21:40:23 +01:00
JeffH-BMG 546ad1c1bd
Merge branch 'master' into patch-3 2018-03-13 15:19:14 -04:00
Kim Kulling 20c817bc36
Update utD3MFImportExport.cpp 
Fix compiler warning: unused var.
 2018-03-13 19:42:06 +01:00
Kim Kulling 18e9aa13d6 fix vs2017-compiler-warning c4002: tr1 is deprecated. 2018-03-13 19:15:56 +01:00
Kim Kulling f857d72dbb add roundtrip test for 3mf. 2018-03-13 18:56:47 +01:00
Kim Kulling 6b9add5594 fix compiler warning fr 64 bit 2018-03-13 18:19:10 +01:00
Kim Kulling f11d4902c6 fix CanRead-method for the 3MF-Importer. 2018-03-13 17:50:34 +01:00
Kim Kulling c5c0052a6c Merge branch '3mf_basematerial_support' of https://github.com/assimp/assimp into 3mf_basematerial_support 2018-03-12 22:28:53 +01:00
Kim Kulling c7ac32f891 fix naming readout + export. 2018-03-12 22:28:00 +01:00
Kim Kulling a3ad45f3b3
Merge branch 'master' into 3mf_basematerial_support 2018-03-11 20:16:40 +01:00
Kim Kulling c8ae0bbb3d 3MF: fix model folder desc. 2018-03-11 20:15:49 +01:00
Kim Kulling 017b7d1a2f 3MF: add missig tags for meta data. 2018-03-11 20:15:25 +01:00
Kim Kulling beaadf55df
Merge pull request #1828 from JeffH-BMG/patch-2 
STL binary Export should write 4-byte floats for vertex and normal co…
 2018-03-10 15:48:32 +01:00
Kim Kulling 336a09ee0e add material reference to faces. 2018-03-09 23:35:12 +01:00
JeffH-BMG 72280463c2
Merge branch 'master' into patch-3 2018-03-09 14:40:30 -05:00
JeffH-BMG f7469df871
Merge branch 'master' into patch-2 2018-03-09 14:40:16 -05:00
Kim Kulling 26baa5c5b7
Merge pull request #1823 from mesilliac/fbx_export_footer_tweak 
FBX Export: minor tweak to footer.
 2018-03-09 19:04:07 +01:00
Kim Kulling 6668eeb68e Fix possible nullptr dereferencing. 2018-03-09 19:03:05 +01:00
Kim Kulling 2ca2e7e355
Merge branch 'master' into fbx_export_footer_tweak 2018-03-09 18:11:56 +01:00
Kim Kulling 887f78bc36
Merge pull request #1820 from mesilliac/blender_fbx_opacity_fix 
Fix default opacity of materials exported to FBX by Blender.
 2018-03-09 18:11:27 +01:00
Kim Kulling 69742670dd 3mf: use correct material assignment in case of multi-materials. 2018-03-09 11:40:45 +01:00
Kim Kulling 56f9069eb5
Merge branch 'master' into blender_fbx_opacity_fix 2018-03-09 08:30:23 +01:00
Kim Kulling e93d14a2e9
Merge pull request #1822 from aavenel/fix/issue623 
Fix #623 : PLY importer should not automatically create faces
 2018-03-09 00:26:03 +01:00
Kim Kulling 7f04b4dd43
Merge branch 'master' into fix/issue623 2018-03-09 00:04:28 +01:00
Kim Kulling af8839a8b5
Merge branch 'master' into fbx_export_footer_tweak 2018-03-07 19:44:38 +01:00
Tommy 9f02c8a97c Fix default opacity of materials exported to FBX by Blender. 2018-03-07 09:15:08 +01:00
JeffH-BMG 5ea06e1bb6
Add support for texture file in PLY exports 
The PLY format has an unofficial way to specify an associated texture, using the "comment TextureFile"  comment line. The PLY loader supports this, but the exporter does not. The change looks for a diffuse texture in the scene's materials, and if it finds one, it adds it to the exported mesh using "comment TextureFile".
 2018-03-06 14:50:02 -05:00
JeffH-BMG 0dab5c508e
STL binary Export should write 4-byte floats for vertex and normal coordinates 
The STL binary format uses 4-byte floats. When using double-precision builds of Asset Importer, the STL exporter was writing out 8-byte double values instead..
 2018-03-06 13:55:32 -05:00
Kim Kulling 6173ac6cee
Merge pull request #1821 from ekpyron/master 
Collada: add importer property that forces the use of collada names. …
 2018-03-06 17:25:39 +01:00
Daniel Kirchner f4c37fa245 Collada: add importer property that forces the use of collada names. Closes #1375. 2018-03-06 00:30:33 +01:00
Kim Kulling 81474e6d9a
Merge pull request #1818 from jfaust/bugfix/c4d_obj_export_mtllib_after_g 
Fix material index off-by-one error in some OBJ files
 2018-03-05 18:54:32 +01:00
Kim Kulling 5312ec806e
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g 2018-03-05 18:19:36 +01:00
Kim Kulling d82fff757b
Update utObjImportExport.cpp 
Add missing end of line.
 2018-03-05 15:01:37 +01:00