Commit Graph

6877 Commits

Author SHA1 Message Date
Turo Lamminen
6788d7b18b 3DS: Fix strict aliasing violations 2018-06-01 12:28:33 +03:00
Turo Lamminen
bbb60c29f0 Fix strict aliasing violation in MaterialSystem 2018-06-01 12:20:16 +03:00
Michael Roer Pedersen
b176513efa FBX export. to_ktime ticks was ok. 2018-06-01 09:24:53 +02:00
Kim Kulling
31e75b9d54 Update FBXConverter.cpp
Replaces a 0 by nullptr.
2018-05-31 20:18:17 +02:00
Kim Kulling
339cc2e951 Some review findings. 2018-05-31 20:15:13 +02:00
Michael Roer Pedersen
fceeaa72f4 FBX animation export: Assimp animation time is already in seconds. Just convert to FBX time. 2018-05-31 15:07:00 +02:00
Tammo Hinrichs
ffb6756d2a FBX: LayeredTextures now work with embedded texture data 2018-05-30 14:56:53 +02: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
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
aa18e8a2a5 Update Importer.cpp
Make check more expressive.
2018-05-25 21:43:39 +02: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
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
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
3861fb4ab5 Merge branch 'master' into qt_assimp_viewer 2018-05-24 12:36:59 +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
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
smalcom
8abcc454ad [F] Uninitialized variables. 2018-05-21 17:38:01 +03: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
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
Stanlo Slasinski
a1a17c1dda Read and write the KHR_materials_unlit glTF/2.0 extension. 2018-05-18 14:52:02 -07:00
Kim Kulling
c788fff2b0 Merge branch 'master' into bug/exception-on-empty-mesh-after-degenerate-removal 2018-05-17 09:36:53 +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
Alexandre Avenel
2879e0d6ef Fix typos on code using codespell 2018-05-13 16:35:03 +02:00
Kim Kulling
e3548fe850 Update glTF2Exporter.h
Fix typo.
2018-05-12 08:50:17 +02:00
Kim Kulling
950496c351 some minor refactorings. 2018-05-12 08:39:22 +02:00
Kim Kulling
f93ee9dace closes https://github.com/assimp/assimp/issues/1780: check against nullptr before accessing normal data in aiMesh instance. 2018-05-12 08:10:26 +02:00
Kim Kulling
ef605fecaa FBX: small optimization to avoind static computation in loop. 2018-05-12 08:09:27 +02:00
Kim Kulling
c08614bbff closes https://github.com/assimp/assimp/issues/919: add missing cast for vs2015. 2018-05-10 09:44:31 +02:00
Kim Kulling
c160d1f7df Merge branch 'master' into umw_dev 2018-05-09 13:03:07 +02:00
Kim Kulling
400b61b3fe Merge branch 'master' into fix_gltf2_export_componentType_error 2018-05-09 11:22:09 +02:00
Diego Lopes
700c85bbfb _stat64 doesn't seem to exist. use __stat64!
Merely add an extra _ to the type name...
2018-05-08 13:01:56 -04:00
wuxq
ea2c90ae79 Merge branch 'master' into fix_gltf2_export_componentType_error 2018-05-08 18:35:57 +08:00
wuxq
cc1bde0514 change the length of bufferView byteLength
chang the joint  attribute bufferView byteLength
2018-05-08 18:31:27 +08:00
Kim Kulling
f92d4edced Merge branch 'master' into patch-1 2018-05-08 10:22:14 +02:00
Kim Kulling
948cf4d3cc Merge branch 'master' into master 2018-05-07 21:32:13 +02:00
A. Breust
50c5f3cb58 Fixes DXF loader false positive on FBX file
A binary FBX file can have an header section `FBXHeaderVersion` which starts around the 70th byte.
Therefore, the token check for DXF file was hitting true because the `SearchFileHeaderForToken` is case insensitive.
We limit the scope of the token search to the first 32 bytes.
2018-05-07 15:16:32 +02:00
Kim Kulling
ce11aa51f5 add win32-based make script. 2018-05-07 00:07:41 +02:00
Kim Kulling
327a43c26f Merge branch 'master' into fix_gltf2_export_componentType_error 2018-05-06 19:39:37 +02:00
Kim Kulling
be0203229b Merge branch 'master' into master 2018-05-06 16:41:12 +02:00
Kim Kulling
36c6ce7431 Merge branch 'master' into master 2018-05-06 12:29:21 +02:00