Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,105 Commits 19 Branches 43 Tags
02d2b6e0d8e5dfd43e310fe1774eff4e6a522c0f
Commit Graph

6105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smalcom
02d2b6e0d8 [F] Get return "like true" when error occured. 2018-05-25 21:30:59 +03:00
smalcom
5b23492421 Merge branch 'master' into qt_assimp_viewer 2018-05-25 21:20:03 +03:00
smalcom
67eff10d8f [*] qt_assimp_viewer can be built with Qt4 or Qt5. 
[F] Working in doule precision.
 2018-05-25 21:19:06 +03:00
smalcom
d72ff712cb [F] List of importers can be empty. 2018-05-25 21:16:08 +03:00
smalcom
f59ab5c34f [F] More correct control by a mouse 2018-05-24 17:11:21 +03:00
Kim Kulling
604b56b96f Merge pull request #1978 from gstanlo/master 
glTF/2.0: Pick scene 0 as scene to load if no "scene" property is specified
 2018-05-24 15:38:49 +02:00
Kim Kulling
c4c22069e1 Merge branch 'master' into master 2018-05-24 14:38:50 +02:00
smalcom
fd7f07068c [F] React on mouse pressing ig view only. 2018-05-24 13:05:50 +03:00
smalcom
f56432f713 [F] One alignment for labels. 
[-] Unused checkbox.
 2018-05-24 13:04:39 +03:00
smalcom
3861fb4ab5 Merge branch 'master' into qt_assimp_viewer 2018-05-24 12:36:59 +03:00
smalcom
c23f999196 [+] QtCreator temporary file. 2018-05-24 12:34:18 +03:00
smalcom
6093769da1 [*] Refactoring of "draw axes" procedure. 
[-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
 2018-05-24 12:31:49 +03:00
smalcom
e201fcf4f4 [-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed. 2018-05-24 12:25:27 +03:00
Kim Kulling
b3e41204c1 Merge pull request #1977 from AdrianAtGoogle/fix_gen_vertex_normals 
Fix GenVertexNormals
 2018-05-23 09:04:54 +02:00
gstanlo
0c07397720 glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified. 2018-05-22 17:32:12 -07:00
Adrian Mark Perez
7777883fe7 Fix GenVertexNormals 2018-05-22 13:55:36 -07:00
Kim Kulling
8eb2be2c33 Merge pull request #1975 from aavenel/fix1587 
Fix #1587 : add validation to LWS unit test
 2018-05-21 17:49:45 +02:00
smalcom
348b34a2de [F] Wrong type in equation. 2018-05-21 17:38:43 +03:00
smalcom
8abcc454ad [F] Uninitialized variables. 2018-05-21 17:38:01 +03:00
Alexandre Avenel
978a7cbeb2 Fix #1587 : add validation to LWS unit test 
It seems that the validation is now OK.
Also add a bunch of tests to try to import each file we have in this
format.
 2018-05-21 11:50:19 +02:00
Kim Kulling
4a81b7f0d1 Merge pull request #1972 from aavenel/fix1970 
Fix #1970 STL Ascii, failed managing "empty solid"
 2018-05-20 16:48:42 +02:00
Alexandre Avenel
84739fda0a Fix #1970: stl with empty solid 
Log warning instead of stopping whole import.
 2018-05-19 23:19:36 +02:00
Alexandre Avenel
4b5c49b087 Add test for issue 1970: STL with empty solid 2018-05-19 23:19:35 +02:00
Alexandre Avenel
6c0553d810 Add mesh name to ValidateDataStructure log 2018-05-19 23:19:25 +02:00
Alexander Gessler
0d0ba4e1b8 Merge pull request #1966 from a17r/qt-5.11 
Fix build with Qt 5.11.0_beta3, add missing install target
 2018-05-19 03:05:09 +02:00
Alexander Gessler
a7ce5e838e Merge branch 'master' into qt-5.11 2018-05-19 00:45:17 +02:00
Alexander Gessler
2281822339 Merge pull request #1971 from gstanlo/unlit_gltf 
Read and write the KHR_materials_unlit glTF/2.0 extension.
 2018-05-19 00:44:24 +02:00
Stanlo Slasinski
a1a17c1dda Read and write the KHR_materials_unlit glTF/2.0 extension. 2018-05-18 14:52:02 -07:00
Kim Kulling
e75cc86375 Merge branch 'master' into qt-5.11 2018-05-18 14:58:45 +02:00
Kim Kulling
f8c4891acf Merge pull request #1965 from loebl/bug/exception-on-empty-mesh-after-degenerate-removal 
Bug/exception on empty mesh after degenerate removal
 2018-05-18 14:57:44 +02:00
Kim Kulling
273bbeca6d Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal 2018-05-18 13:44:13 +02:00
Kim Kulling
670c634fe8 Merge pull request #1963 from lieven/ios-fat-binaries 
Create fat binaries for libIrrXML and libzlibstatic too
 2018-05-18 00:19:24 +02:00
Kim Kulling
dbcffaf4d1 Merge branch 'master' into ios-fat-binaries 2018-05-17 22:41:54 +02:00
Kim Kulling
9859993d11 Merge pull request #1953 from assimp/assimpviewer_dev 
Some minor fixes of typos and formatting issues.
 2018-05-17 22:41:39 +02:00
Kim Kulling
b872d8021f Merge branch 'master' into assimpviewer_dev 2018-05-17 20:55:10 +02:00
Kim Kulling
c788fff2b0 Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal 2018-05-17 09:36:53 +02:00
Kim Kulling
d210707f5a Merge pull request #1968 from assimp/kimkulling-CHANGESUpdate 
Update CHANGES
 2018-05-17 08:43:28 +02:00
Kim Kulling
224b43a3a9 Update CHANGES 
Add 4.1.0 release notes
 2018-05-16 21:19:30 +02:00
Kim Kulling
431f76c65f Merge branch 'master' into assimpviewer_dev 2018-05-16 21:07:28 +02:00
Kim Kulling
7555c94ed4 Merge pull request #1967 from assimp/kimkulling-fixdoc 
Update Readme.md
 2018-05-16 21:07:13 +02:00
Kim Kulling
df9faaae41 Update Readme.md 
Remove deprecated doc.
 2018-05-16 19:39:27 +02:00
Kim Kulling
0b0e7316ce Merge pull request #1960 from aavenel/codespell 
Fix typos using codespell
 2018-05-16 19:34:34 +02:00
Andreas Sturmlechner
5bbf0a8afa Add missing assimp_qt_viewer install target 2018-05-16 14:02:54 +02:00
Andreas Sturmlechner
7251c3c51a Fix build with Qt 5.11.0_beta3 (qt5_use_modules is gone) 2018-05-16 14:02:54 +02:00
Daniel Löber
9e80e18b1a Remove dead code 2018-05-16 11:10:48 +02:00
Daniel Löber
46ed73c768 Do not throw exception on empty mesh after removal of degenerates 
Remove mesh instead. This keeps one edge case open: nodes without mesh
references. They are kept as it is for now (they may stilol contain
transformations and child references).
 2018-05-16 11:06:06 +02:00
Kim Kulling
ae3c4e6733 Merge branch 'master' into codespell 2018-05-15 20:31:55 +02:00
Kim Kulling
8f587b9750 Merge pull request #1964 from ruxkor/master 
PyAssimp: Encode filename using file system encoding instead of ASCII
 2018-05-15 20:30:51 +02:00
Andor Goetzendorff
f4fd5840b1 Encode filename using file system encoding instead of ASCII 2018-05-15 15:35:44 +02:00
Lieven Dekeyser
d8af63519d Create fat binaries for libIrrXML and libzlibstatic too 2018-05-15 12:38:50 +02:00