87315883b5
Merge branch 'master' into master
2018-06-04 08:17:50 +02:00
29e269ff95
Merge pull request #1989 from assimp/kimkulling-net-doc
...
Update Readme.md
2018-06-03 01:35:12 +02:00
d112095a83
Merge branch 'master' into kimkulling-net-doc
2018-06-03 00:54:56 +02:00
42b1ea0d65
Merge pull request #1992 from turol/strict-aliasing
...
Fix some strict aliasing warnings
2018-06-01 23:23:25 +03:00
9064c983ad
Merge branch 'master' into master
2018-06-01 13:42:35 +02:00
b0b6048502
LWOMaterial: Fix strict aliasing violations
2018-06-01 12:37:21 +03:00
6788d7b18b
3DS: Fix strict aliasing violations
2018-06-01 12:28:33 +03:00
bbb60c29f0
Fix strict aliasing violation in MaterialSystem
2018-06-01 12:20:16 +03:00
6aa32b41a1
Replace type punning with explicit memcpys
2018-06-01 12:05:54 +03:00
4af69dbeb9
undo .gitignore
2018-06-01 09:33:28 +02:00
b176513efa
FBX export. to_ktime ticks was ok.
2018-06-01 09:24:53 +02:00
bcf8a90b8b
Merge branch 'master' into kimkulling-net-doc
2018-05-31 21:39:18 +02:00
fd2a71b3fd
Merge pull request #1988 from kebby/master
...
FBX: LayeredTextures now work with embedded texture data
2018-05-31 21:38:57 +02:00
31e75b9d54
Update FBXConverter.cpp
...
Replaces a 0 by nullptr.
2018-05-31 20:18:17 +02:00
64ba839f47
Update Readme.md
...
Fix the link to the active repo containing the assimp-net-code.
2018-05-31 20:04:48 +02:00
fceeaa72f4
FBX animation export: Assimp animation time is already in seconds. Just convert to FBX time.
2018-05-31 15:07:00 +02:00
ffb6756d2a
FBX: LayeredTextures now work with embedded texture data
2018-05-30 14:56:53 +02:00
dd0d602681
Merge pull request #1985 from severin-lemaignan/master
...
[pyassimp] Minor changes to setup.py to make it slightly more compliant
2018-05-30 11:10:09 +02:00
2b18903f12
Merge branch 'master' into master
2018-05-30 10:36:21 +02:00
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
1883d44b9b
Merge branch 'master' into master
2018-05-29 19:02:40 +02:00
c12c56d33e
[pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3
2018-05-29 10:47:40 +01:00
b6888962ed
[pyassimp] Updated setup.py
2018-05-28 23:53:28 +01:00
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
bf7ec7d130
Merge branch 'master' into fix-vector-out-of-bound-access
2018-05-26 13:25:57 +02:00
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
aa18e8a2a5
Update Importer.cpp
...
Make check more expressive.
2018-05-25 21:43:39 +02:00
f29af1abc0
[-] Trace print removed.
2018-05-25 21:31:22 +03:00
02d2b6e0d8
[F] Get return "like true" when error occured.
2018-05-25 21:30:59 +03:00
5b23492421
Merge branch 'master' into qt_assimp_viewer
2018-05-25 21:20:03 +03:00
67eff10d8f
[*] qt_assimp_viewer can be built with Qt4 or Qt5.
...
[F] Working in doule precision.
2018-05-25 21:19:06 +03:00
d72ff712cb
[F] List of importers can be empty.
2018-05-25 21:16:08 +03:00
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
f59ab5c34f
[F] More correct control by a mouse
2018-05-24 17:11:21 +03:00
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
c4c22069e1
Merge branch 'master' into master
2018-05-24 14:38:50 +02:00
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
fd7f07068c
[F] React on mouse pressing ig view only.
2018-05-24 13:05:50 +03:00
f56432f713
[F] One alignment for labels.
...
[-] Unused checkbox.
2018-05-24 13:04:39 +03:00
3861fb4ab5
Merge branch 'master' into qt_assimp_viewer
2018-05-24 12:36:59 +03:00
c23f999196
[+] QtCreator temporary file.
2018-05-24 12:34:18 +03:00
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
e201fcf4f4
[-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
2018-05-24 12:25:27 +03:00
b3e41204c1
Merge pull request #1977 from AdrianAtGoogle/fix_gen_vertex_normals
...
Fix GenVertexNormals
2018-05-23 09:04:54 +02:00
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
7777883fe7
Fix GenVertexNormals
2018-05-22 13:55:36 -07:00
8eb2be2c33
Merge pull request #1975 from aavenel/fix1587
...
Fix #1587 : add validation to LWS unit test
2018-05-21 17:49:45 +02:00
348b34a2de
[F] Wrong type in equation.
2018-05-21 17:38:43 +03:00
8abcc454ad
[F] Uninitialized variables.
2018-05-21 17:38:01 +03:00
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
microm8
Kim Kulling
Turo Lamminen
Turo Lamminen
Michael Roer Pedersen
Tammo Hinrichs
Séverin Lemaignan
Séverin Lemaignan
smalcom
gstanlo
Matthias Möller
Adrian Mark Perez
Alexandre Avenel