Kim Kulling
2b18903f12
Merge branch 'master' into master
2018-05-30 10:36:21 +02:00
Kim Kulling
948e915a4c
Merge pull request #1980 from gstanlo/master
...
Properly reads in glTF/2.0 sampler address modes.
2018-05-30 09:19:04 +02:00
Doron Adler
6e49d288c3
now only x86_64 builds :(
2018-05-30 09:40:18 +03:00
Doron Adler
e3847b7996
Default to release builds, update CC/LD/etc flags
2018-05-30 09:21:28 +03:00
Doron Adler
1ee9200277
smallerMax
2018-05-30 08:49:11 +03:00
Kim Kulling
1883d44b9b
Merge branch 'master' into master
2018-05-29 19:02:40 +02:00
Sebastian Maisch
c6eda67296
Changed assimp to force regeneration of normals.
2018-05-29 13:01:11 +02:00
Séverin Lemaignan
c12c56d33e
[pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3
2018-05-29 10:47:40 +01:00
Séverin Lemaignan
b6888962ed
[pyassimp] Updated setup.py
2018-05-28 23:53:28 +01:00
Kim Kulling
bbe9973425
Merge pull request #1979 from TinyTinni/fix-vector-out-of-bound-access
...
Fix STL unittest in Debug mode
2018-05-28 22:26:06 +02:00
Doron Adler
3023df8f7e
Norod: Configurable from script parameters: dynamic libraries and debug/release build type
2018-05-28 17:36:43 +03:00
Doron Adler
27b989fd36
Merge branch 'master' into ios-build-script
...
* master: (148 commits)
Update Importer.cpp
[-] Trace print removed.
[F] Get return "like true" when error occured.
[*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
[F] List of importers can be empty.
[F] More correct control by a mouse
[F] React on mouse pressing ig view only.
[F] One alignment for labels. [-] Unused checkbox.
[+] QtCreator temporary file.
[*] 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."
[-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
Fix GenVertexNormals
[F] Wrong type in equation.
[F] Uninitialized variables.
Fix #1587 : add validation to LWS unit test
Fix #1970 : stl with empty solid
Add test for issue 1970: STL with empty solid
Add mesh name to ValidateDataStructure log
Read and write the KHR_materials_unlit glTF/2.0 extension.
...
# Conflicts:
# CMakeLists.txt
# port/iOS/build.sh
2018-05-28 16:27:00 +03:00
Doron Adler
323d59c7aa
Check for null
2018-05-28 16:12:54 +03:00
Kim Kulling
bf7ec7d130
Merge branch 'master' into fix-vector-out-of-bound-access
2018-05-26 13:25:57 +02:00
Kim Kulling
48100d0016
Merge pull request #1981 from smalcom/qt_assimp_viewer
...
Qt assimp viewer and few fixes in another places
2018-05-26 11:04:30 +02:00
Kim Kulling
aa18e8a2a5
Update Importer.cpp
...
Make check more expressive.
2018-05-25 21:43:39 +02:00
smalcom
f29af1abc0
[-] Trace print removed.
2018-05-25 21:31:22 +03:00
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
gstanlo
97cecc858a
Properly reads in glTF/2.0 sampler address modes.
...
Assimp was returning glTF/2.0 values as address modes instead of aiTextureMapModes.
Also modified text glTF/2.0 model's sampler uv address modes to mirror/clamp respectively, and tests for them in the unit test.
2018-05-24 17:25:26 -07: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
Matthias Möller
e761f13c80
does not access undefined memory area anymore.
...
This will fix some Debuggers, which throw an exception, when accessing out-of-bound memory
2018-05-24 12:07:05 +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
caecd385b5
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-19 03:05:29 +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