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

4259 Commits (8bc183182c971a3989f14f9a4340c634ed3505a7)

Author SHA1 Message Date
Leo Terziman 8bc183182c Added new option to IFC importer to control tessellation angle 
+ removed unused IFC option
 2017-03-10 14:42:17 +01:00
Leo Terziman bbd487308b Merge remote-tracking branch 'github/master' into contrib 2017-03-09 17:28:47 +01:00
Kim Kulling d402825d03 Merge pull request #1194 from Sailsman63/fixbuild 
Import FindPkgMacros to main CMake Configuration
 2017-03-02 16:47:37 +01:00
Lucas Stanek 951f51a066 Import FindPkgMacros to main CMake Configuration 2017-03-02 03:12:47 +00:00
Kim Kulling 8dd137cb3f Merge pull request #1193 from murashin/fix-for-freebsd 
fix for FreeBSD
 2017-03-01 12:52:52 +01:00
Kim Kulling ea72b06c21 Update Readme.md 
Fix typo
 2017-03-01 09:53:36 +01:00
Kim Kulling 191936a339 Update Readme.md 
Readme: Reintroduce irc ahain
 2017-03-01 09:53:15 +01:00
Shin-ya Murakami ffc95162ec fix for FreeBSD 2017-03-01 16:30:03 +09:00
Kim Kulling a38b2fb10f Merge pull request #1191 from Lugdunum3D/feature-importers-whitelist 
Allow to enable importers in a whitelist manner
 2017-03-01 00:34:10 +01:00
Kim Kulling 5c45b408d0 Merge pull request #1189 from Lugdunum3D/fix-android-asset-extraction 
Create the directory for the asset's extraction on Android
 2017-03-01 00:21:32 +01:00
Kim Kulling 9a0a74ef1f Merge pull request #1190 from Lugdunum3D/fix-buildsystem-minizip 
Fix buildsystem minizip
 2017-03-01 00:15:12 +01:00
Kim Kulling 574c192575 Merge pull request #1186 from astillich/ase_cface 
Fixed parsing ASE MESH_CFACE
 2017-03-01 00:12:12 +01:00
Antoine Bolvy d77989088c Allow to enable importers in a whitelist manner 2017-02-28 11:42:53 +09:00
Antoine Bolvy 18a12a4a47 Fix encoding in names (partially revert ecbf09e) 2017-02-27 18:43:46 -05:00
Antoine Bolvy 4495162f5f Fix new lines problem 2017-02-27 18:34:04 -05:00
Quentin01 cf68e03b21 Creates the directory for the asset's extraction on Android 2017-02-27 18:26:44 -05:00
Antoine Bolvy 125d2ab955 Disable pkg-config on Android, and use the existing macro for minizip 2017-02-27 18:25:17 -05:00
Kim Kulling 22896f7fec Merge pull request #1187 from assimp/issue-1169 
Issue-1169: fix clang build.
 2017-02-27 22:52:53 +01:00
Kim Kulling a75eb86af4 Issue-1169: fix clang build. 2017-02-27 21:59:50 +01:00
Kim Kulling 4d92c01933 Merge branch 'master' of https://github.com/assimp/assimp 2017-02-27 20:19:42 +01:00
Kim Kulling 7a47f1f8f7 Issue-1183: add stp to the list of supported extensions for step-files. 2017-02-27 20:11:59 +01:00
Alexander Stillich 0700dfe711 Fixed parsing ASE MESH_CFACE 2017-02-25 23:30:41 +01:00
Kim Kulling c3bb2b66ac Merge pull request #1181 from assimp/issue_1169 
Issue-1169: fix [] operator of vector3.
 2017-02-21 17:29:49 +01:00
Kim Kulling 0f3731ab20 Issue-1169: add a unittest. 2017-02-21 17:12:22 +01:00
Kim Kulling d43d9368f2 Issue-1169: fix travis build. 2017-02-21 11:17:09 +01:00
Kim Kulling 695439fad0 Issue-1169: fix [] operator of vector3. 2017-02-21 10:58:27 +01:00
Kim Kulling 2afeddd5cb Merge pull request #1180 from JonAllee/Memory-Fix 
Fix memory leak in Collada importer
 2017-02-13 20:57:25 +01:00
JonAllee 5deb441a9c Fix memory leak in Collada importer 
Affects Collada files with morph Controller Elements.
 2017-02-13 11:25:30 -08:00
Kim Kulling a75fa44bde PLY: prepare bugfix by adding missing unittest. 2017-02-11 14:19:34 +01:00
Kim Kulling 615bdb27d9 Closes https://github.com/assimp/assimp/issues/1102: update Version.cpp 2017-02-11 13:49:48 +01:00
Kim Kulling bf4f4d0730 closes https://github.com/assimp/assimp/issues/1102: define line ending for missing files. 2017-02-11 13:48:39 +01:00
Kim Kulling 5073e41b8b Closes //github.com/assimp/assimp/issues/1102: define line ending for CHANGES file. 2017-02-11 13:45:29 +01:00
Kim Kulling 8cda10a497 closes https://github.com/assimp/assimp/issues/1102: update CHANGES file. 2017-02-11 13:44:17 +01:00
Kim Kulling db1c6f5fc8 Update utObjImportExport.cpp 
Unittest: make execution of base exporter test for obj depending of ASSIMP_BUILD_NO_EXPORT.
 2017-02-06 13:15:53 +01:00
Kim Kulling 8a7e30b6a7 Update utObjImportExport.cpp 
Unittest: Make obj-exporter test depending on export state.
 2017-02-06 13:06:47 +01:00
Kim Kulling 95387298ab Obj-Exporter test: fix test fixure if no export was requetsed. 2017-02-05 21:00:06 +01:00
Kim Kulling da34ffd6ce Fix the build: next try ( with full namespaces ). 2017-02-05 20:51:18 +01:00
Kim Kulling 6ed1f7570e Merge branch 'master' of https://github.com/assimp/assimp 2017-02-05 19:30:11 +01:00
Kim Kulling 31bb9f7ba6 Obj: fix code review findings. 2017-02-04 18:32:04 +01:00
Kim Kulling 11e2ca173d Fix the build. 2017-02-04 18:15:50 +01:00
Kim Kulling 692fb216f7 closes https://github.com/assimp/assimp/issues/809: add vertex color 
export support.
 2017-02-04 14:51:23 +01:00
Kim Kulling f9fa95a7c2 Obj-Importer: fix crash when updating the current mat-index: use correct 
index.
 2017-02-01 20:11:12 +01:00
Kim Kulling bfb6eb317c Merge pull request #1160 from NolaDonato/materialindex 
OBJParser: set material index when changing current material
 2017-02-01 18:42:16 +01:00
nola.donato@samsung.com e28b5422e0 OBJ: check for null mesh before updating material index 
Sometimes the current mesh is null, should check before updating the material index

Submitted by: Nola Donato nola.donato@samsung.com
 2017-01-31 16:40:04 -08:00
Kim Kulling cbaec4cae8 Merge pull request #1161 from NolaDonato/spacesinfilenames 
OBJParser: Support spaces in texture file names
 2017-01-31 08:40:36 +01:00
nola.donato@samsung.com fc4243a08f OBJParser: set material index when changing current material 
When a new material is parsed from the material library, the name of the current material is set but the old material index remains. This leaves an incorrect material index in the current mesh causing textures to not be associated with the right mesh. This patch updates the material index when changing the material name.

submitted by: Nola Donato nola.donato@samsung.com
 2017-01-30 20:32:37 -08:00
nola.donato@samsung.com df5fc5f68d OBJParser: Support spaces in texture file names 
This patch allows embedded spaces in texture filenames found in MTL files. It only affects the OBJ parser.

Submitted by: Nola Donato nola.donato@samsung.com
 2017-01-30 20:27:35 -08:00
Kim Kulling a046268a67 Merge pull request #1159 from assimp/issues-1155 
closes https://github.com/assimp/assimp/issues/1155: remove deprecated
 2017-01-30 12:52:01 +01:00
Kim Kulling 6cc3bb5024 closes https://github.com/assimp/assimp/issues/1155: remove deprecated 
workspaces.
 2017-01-30 11:44:51 +01:00
Alexander Gessler 28a78ca460 Merge pull request #1156 from elect86/patch-7 
Update ColladaParser.cpp
 2017-01-28 13:28:47 +01:00