Kim Kulling
b069e7d7d0
Merge branch 'master' into feature/glTFv2_blendshapes_support
2018-07-14 17:09:05 +02:00
Kim Kulling
72de09a562
Update FBXConverter.cpp
...
Remove dead code.
2018-07-14 17:08:04 +02:00
Kim Kulling
91b30e7e74
Update FBXConverter.cpp
...
simple change to retrigger CI
2018-07-14 12:10:59 +02:00
Kenneth Perry (thothonegan)
7967f0a33f
FBXImporter: Fix GetUniqueName to return names properly
2018-07-13 15:25:04 -05:00
Kim Kulling
309c52b10f
Merge branch 'master' into patch-1
2018-07-10 13:07:28 +02:00
Kim Kulling
c58aef4b4b
Merge branch 'master' into ios-build-script
2018-07-10 11:28:54 +02:00
Sebastian Matusik
992194b1b9
Removed signed int vs unsigned int comparison in for loops
2018-07-05 15:15:50 +01:00
Sebastian Matusik
0cc9240886
Build fix
2018-07-05 14:46:15 +01:00
Sebastian Matusik
ec1333bfdf
JoinVerticesProcess should only try to deduplicate used vertices.
2018-07-05 14:38:58 +01:00
Sebastian Matusik
3e3a785750
glTF v2 importer morph targets support
2018-07-05 14:28:29 +01:00
Paul Arden
e43e30b726
Slight rework for fix to issue #2046 to remove some duplicated code.
2018-07-05 09:49:08 +10:00
Paul Arden
e7699ca585
Added support for non-indexed meshes in glTF importer. Addresses issue #2046 .
2018-07-05 09:37:57 +10:00
Seb Bro
cb1fc76859
Add TARGET_INCLUDE_DIRECTORIES for assimp target
...
With `TARGET_INCLUDE_DIRECTORIES` the `assimp` target can directly used in another CMake project, e.g. assimp can be used in a submodule with an `add_subdirectory()` call.
2018-07-04 22:56:35 +02:00
Kim Kulling
1a0231f91e
Merge branch 'master' into bug/keep_small_triangles_in_triangulation
2018-07-02 18:08:09 +02:00
Doron Adler
6a45f84b73
Revert
2018-07-01 13:10:44 +03:00
Doron Adler
6e346a5504
Added comment
2018-07-01 11:35:56 +03:00
Daniel Löber
1feb0d1c60
Change order of PP steps to triangulate before searching for degenerates
2018-06-29 15:52:12 +02:00
Daniel Löber
3c5c0a0df3
Deactivate area based rejection of triangles in triangulation
...
Use FindDegenerates post processing step for that.
2018-06-29 15:52:09 +02:00
Doron Adler
eebf549e8e
Merge branch 'master' into ios-build-script
...
* master:
Fix regression on FBX importer unit test
Check nb of faces and vertices for FBX unit test
Update helper.py
Update helper.py
Solved pyassimp.errors.AssimpError in conda
Hide commit signature information when fetching commit hash
2018-06-27 09:59:51 +03:00
Max Vollmer
a17e788808
Merge branch 'master' into master
2018-06-26 15:12:03 +02:00
Max Vollmer
52c017b595
Added check to BaseImporter::SearchFileHeaderForToken making sure that a detected token is not in fact just a fraction of a longer token. Microsoft exported binary gltf files were detected as OBJ, because the "gltf " in the string "Microsoft GLTF Exporter 2.4.1.7" was detected as the token "f ". I added a new bool parameter to the method enabling this check. It's default false, and only ObjFileImporter sets it to true, so no other code should be affected.
2018-06-25 12:05:37 +02:00
Alexandre Avenel
de8adacb54
Fix regression on FBX importer unit test
...
box.fbx was broken since b28bcc commit.
2018-06-23 20:25:31 +02:00
Doron Adler
097625e542
Merge branch 'master' into ios-build-script
...
* master:
Make glTF2 the default exporter for glft
2018-06-20 14:34:17 +03:00
Kim Kulling
7acc4c6808
Make glTF2 the default exporter for glft
...
- Put it in front of the list of exporters
closes https://github.com/assimp/assimp/issues/2001
2018-06-19 20:40:41 +02:00
Doron Adler
ee2f0bccac
Merge branch 'master' into ios-build-script
...
* master:
Fix missing model error in Irr-instancing
closes https://github.com/assimp/assimp/issues/2024 : make code more readable.
closes https://github.com/assimp/assimp/issues/2019 : fix the qt-viewer without export.
applied coding conventions added check against the known faces
issue_2016 only add material uv mappings if set, ignore when no uvmapping set removed unneccessary pad_i1 field (to prevent unnecessary field read exceptions)
Update XFileParser.cpp
Update XFileParser.cpp
Some FBX files have Null/LimbNode attributes with an empty Properties70 element, where the Element is not NULL, but it's Compound is. The code only checked if the Element itself is NULL, thus causing a DeadlyImportError when trying to instantiate a PropertyTable for an Element that doesn't have a Compound.
fix build for independent build dir
Some review findings.
2018-06-19 10:02:25 +03:00
Kim Kulling
961cefb227
Merge branch 'master' into issue_2024
2018-06-18 21:49:07 +02:00
Kim Kulling
43ddd93fae
Merge branch 'master' into issue_2024
2018-06-18 21:21:07 +02:00
Kim Kulling
cc08c19248
closes https://github.com/assimp/assimp/issues/2024 : make code more readable.
2018-06-18 21:19:54 +02:00
Christian
cd0f5d0f70
Merge branch 'master' into master
2018-06-18 20:16:12 +02:00
Kim Kulling
e5fa1798f6
closes https://github.com/assimp/assimp/issues/2019 : fix the qt-viewer without export.
2018-06-17 20:37:09 +02:00
CwTCwT
a96587d551
applied coding conventions
...
added check against the known faces
2018-06-16 15:30:22 +02:00
CwTCwT
41bf572af6
issue_2016
...
only add material uv mappings if set, ignore when no uvmapping set
removed unneccessary pad_i1 field (to prevent unnecessary field read exceptions)
2018-06-16 15:08:19 +02:00
Kim Kulling
d416fe874e
Update XFileParser.cpp
...
Fix compiler warnings.
2018-06-16 10:32:43 +02:00
Kim Kulling
3e45acbf4e
Merge branch 'master' into review
2018-06-16 09:10:41 +02:00
Kim Kulling
a03ab068be
Update XFileParser.cpp
...
Fix typo.
2018-06-16 09:10:30 +02:00
Max Vollmer
0b02b92701
Some FBX files have Null/LimbNode attributes with an empty Properties70 element, where the Element is not NULL, but it's Compound is. The code only checked if the Element itself is NULL, thus causing a DeadlyImportError when trying to instantiate a PropertyTable for an Element that doesn't have a Compound.
2018-06-15 15:46:38 +02:00
Doron Adler
1d5b1b12e2
Merge branch 'master' into ios-build-script
...
* master: (34 commits)
Update INSTALL for iOS build
Improve the contribution guide
usage of dynamic_cast instead of static_cast
prevent zero sized array allocations
reworked to ElemBase *
use of malloc and free (given to shared ptr) for correct mem management
rereworked suggested by clang
travis changes according clang 5.0
again travis hit me
changes according travis compiles
changes according travis build
changed to coding convention
issue_1973 added support for CustomData(Layer) to support multiple (texture) UV mappings added unittest with sample model
Update script.iss
replace typo by comment statement.
Update script.iss
Update script.iss
Update script.iss
Update script.iss
Update script.iss
...
2018-06-14 14:55:02 +03:00
Kim Kulling
a8236f2986
Merge branch 'master' into master
2018-06-12 22:10:54 +02:00
Kim Kulling
5f3aa142b4
Merge branch 'master' into master
2018-06-12 11:40:40 +02:00
CwTCwT
9415380b4c
usage of dynamic_cast instead of static_cast
2018-06-10 10:35:15 +02:00
CwTCwT
7db668e66f
prevent zero sized array allocations
2018-06-09 23:36:42 +02:00
CwTCwT
959c0e8907
reworked to ElemBase *
2018-06-09 23:29:50 +02:00
CwTCwT
5b4b16f360
use of malloc and free (given to shared ptr) for correct mem management
2018-06-09 21:25:59 +02:00
CwTCwT
9d2a1ca047
rereworked suggested by clang
2018-06-09 21:12:05 +02:00
CwTCwT
19fade2164
travis changes according clang 5.0
2018-06-09 20:57:32 +02:00
CwTCwT
09825d8d03
again travis hit me
2018-06-09 20:42:02 +02:00
CwTCwT
96bc2d3146
changes according travis compiles
2018-06-09 20:22:59 +02:00
CwTCwT
2c2b76a2bb
changes according travis build
2018-06-09 16:47:05 +02:00
CwTCwT
b8facc5dae
changed to coding convention
2018-06-09 15:56:26 +02:00
CwTCwT
85b0026c92
issue_1973
...
added support for CustomData(Layer) to support multiple (texture) UV mappings
added unittest with sample model
2018-06-09 15:45:09 +02:00
Sebastian Maisch
fbdb4b17fd
Merge branch 'force_generate_normals'
...
# solved Conflicts:
# code/GenFaceNormalsProcess.cpp
# code/GenVertexNormalsProcess.cpp
2018-06-04 10:51:12 +02:00
Kim Kulling
a2a7877939
Merge branch 'master' into make_tools
2018-06-04 09:12:11 +02:00
microm8
87315883b5
Merge branch 'master' into master
2018-06-04 08:17:50 +02:00
Doron Adler
d86a0e3adb
Merge branch 'master' into ios-build-script
...
* master:
LWOMaterial: Fix strict aliasing violations
3DS: Fix strict aliasing violations
Fix strict aliasing violation in MaterialSystem
Replace type punning with explicit memcpys
Update FBXConverter.cpp
Update Readme.md
FBX: LayeredTextures now work with embedded texture data
[pyassimp] README.{md->rst} to please distutils. Bumped to 4.1.3
[pyassimp] Updated setup.py
Properly reads in glTF/2.0 sampler address modes.
does not access undefined memory area anymore.
2018-06-03 14:25:36 +03:00
Sebastian Maisch
f15dcf7663
Added forced generation of normals with extra flag.
2018-06-01 17:32:02 +02:00
microm8
9064c983ad
Merge branch 'master' into master
2018-06-01 13:42:35 +02:00
Turo Lamminen
b0b6048502
LWOMaterial: Fix strict aliasing violations
2018-06-01 12:37:21 +03:00
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
Eugene Barnett
908ef3e44a
1740 Issue - Enabling and Disabling importers
...
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
2018-05-05 16:57:59 -04:00
Nicholas Woodfield
458a7ae801
Silencing compile warnings during build, all little stuff like uint to size_t or BOOL to bool.
2018-05-03 15:03:14 -04:00
Kim Kulling
b759aa63a0
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-05-03 20:33:50 +02:00
Alexis Breust
4aaf7ad547
Added name to nodes
2018-05-03 11:07:39 +02:00
LoicFr
a5791b66fe
Merge branch 'master' into master
2018-05-02 17:47:32 +02:00
LoicFr
99139e9c9e
Merge branch 'master' into master
2018-05-02 17:11:54 +02:00
kimkulling
a0bf664695
closes code/SortByPTypeProcess.cpp: fix memory leak.
2018-05-02 16:42:22 +02:00
Loïc Fricoteaux
ed86023016
Change glTF2 file extensions from gltf2/glb2 to gltf/glb in the exporter so that it matches the importer and respect the standard specifications
2018-05-02 16:13:17 +02:00
Kim Kulling
2acb513732
Merge branch 'master' into issue-1167
2018-05-02 15:45:52 +02:00
Kim Kulling
7bb2d6271b
Merge branch 'master' into fix_fbx_empty_names
2018-05-02 14:57:08 +02:00
wuxq
27d41442c9
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-05-02 15:28:57 +08:00
Kim Kulling
5c5226a98c
Merge branch 'master' into issue-1923
2018-05-01 21:10:52 +02:00
Kim Kulling
037a213bb4
STL-Exporter: fix division by zero in normalize method during update
2018-05-01 15:06:56 +02:00
Kim Kulling
eced86b949
some refactorings.
2018-05-01 13:41:39 +02:00
Kim Kulling
2c47717ca6
Introduce export with test for point clouds.
2018-05-01 13:28:53 +02:00
Kim Kulling
9f835ea843
closes https://github.com/assimp/assimp/issues/842 : experimental suppor for ascii stl pointcloud export.
2018-05-01 09:06:22 +02:00
Korbinian Würl
4b7b692e5e
Fix Issue #1923 : OBJ Exporter can't correctly export vertex colors
...
The indexMap for vertices now uses a combined vp + vc index
2018-04-30 16:29:22 +02:00
Trylz
6fb9ebe3c8
Apply fix
2018-04-28 23:34:07 -04:00
wuxq
7a7a706ebd
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-29 11:29:43 +08:00
wuxq
814b56e5e2
multi joint has bug with ReplaceData
...
multi joint has a bug in ReplaceData_joint with "bin" change
2018-04-28 15:05:21 +08:00
Korbinian Würl
1533aec21c
Fix ply exporter to be conformant to spec respecting vertex colors.
...
Vertex colors should be defined as red, green, blue, alpha instead of r, g, b, a and should have the type 'uchar' instead of 'float'
2018-04-27 22:11:36 +02:00
Sebastian Matusik
af8f9a97a9
Merge branch 'master' into fix/blendshapes_join_identical_vertices_optimization_flag_v2
2018-04-27 12:45:47 +01:00
Sebastian Matusik
1f9d6f1ec4
Fix for blendshapes import when using the JoinIdenticalVertices optimization flag
2018-04-27 11:52:31 +01:00
Kim Kulling
e2d0c07791
Merge branch 'master' into use_log_macros
2018-04-26 22:02:18 +02:00
Kim Kulling
b877b3e10e
use correct log macro.
2018-04-26 22:01:41 +02:00
kimkulling
6a311210e7
fix another bug of misusage of the log macros.
2018-04-26 17:01:22 +02:00
kimkulling
8626b185fb
Fix misused log macros + compiler warnings.
2018-04-26 16:38:42 +02:00
kimkulling
c299755721
DXF: fix macro issues.
2018-04-26 16:13:57 +02:00
kimkulling
a5e14db19b
fix invaid macro usage.
2018-04-26 15:41:31 +02:00
kimkulling
68288782e4
Merge branch 'use_log_macros' of https://github.com/assimp/assimp into use_log_macros
2018-04-26 15:18:24 +02:00
kimkulling
75c7b15b55
Fix c++11 usage.
2018-04-26 15:05:49 +02:00
kimkulling
3d79472172
fix the build.
2018-04-26 14:36:59 +02:00
Kim Kulling
dd7d0943f6
Update glTF2Asset.inl
...
Move creation of vars to avoid useless creation in case of an error.
2018-04-26 14:24:00 +02:00
Kim Kulling
8f26b9d840
Merge branch 'master' into use_log_macros
2018-04-26 14:13:04 +02:00
kimkulling
30c20eb5fc
INtroduce new log macros.
2018-04-26 14:10:18 +02:00
Kim Kulling
972fffe70b
Merge branch 'master' into fix_gltf2_export_componentType_error
2018-04-26 13:40:49 +02:00
wuxiaoqian
f6af6ded1f
fixed the bug of export gltf2, the JOINTS_0 componentType is Incorrect
2018-04-26 11:03:50 +08:00
wuxiaoqian
6b4caa0f12
fix export gltf2, The JOINTS_0 componentType is incorrect
2018-04-26 10:56:56 +08:00
Loïc Fricoteaux
a8077baed5
Add vertex color support to glTF2 export
2018-04-25 11:37:56 +02:00
Sergio Acereda
ce6a5e5d56
ImproveCacheLocality crashes if non triangular faces
2018-04-23 11:33:48 +02:00
kimkulling
0e15b25cd1
Next log call changes.
2018-04-20 16:23:24 +02:00
kimkulling
b6f29bf54f
Add usage of log macros, next files.
2018-04-19 17:21:21 +02:00
kimkulling
066349f36b
Add usage of log macros.
2018-04-19 16:48:43 +02:00
kimkulling
f2833539d7
closes https://github.com/assimp/assimp/issues/1784 : change so.name to keep track of the minor version of the lib.
2018-04-19 08:52:21 +02:00
Leo Terziman
c797f16b0e
In IFC, fixed parser to avoid interpretation of '##' in string as identifiers
2018-04-18 11:53:49 +02:00
Leo Terziman
6ca8423e24
Improved memory footprint of IFC loading by avoiding keeping in cache duplicated indices.
2018-04-18 11:12:40 +02:00
Arkeon
f235646030
Correction on Collada parser missing textures when the image is in CDATA
...
<image id="image-1404706686">
<init_from><![CDATA[textures\burgundy.png]]></init_from>
</image>
2018-04-13 09:36:01 +02:00
kimkulling
e57394a772
move log tools from blender to logger interface.
2018-04-12 16:09:01 +02:00
Kim Kulling
096f7e272a
Merge branch 'master' into isue_1621
2018-04-12 00:05:38 +02:00
Kim Kulling
5319974fe1
Use correct check to do a tokensearch.
2018-04-11 21:16:20 +02:00
Kim Kulling
0f9268bf01
Merge branch 'master' into issue_1893
2018-04-11 20:27:05 +02:00
kimkulling
da073f1270
closes https://github.com/assimp/assimp/issues/1893 : fix mem leak in glft2Importer.
2018-04-11 17:22:31 +02:00
kimkulling
9ca32b2373
closes https://github.com/assimp/assimp/issues/1894 : use mesh name to name exported obj node.
2018-04-11 17:04:49 +02:00
Kim Kulling
f096843c45
Merge branch 'master' into umw_dev
2018-04-08 21:42:10 +02:00
Kim Kulling
c41d459e21
add missing constructor to ensure RTTI
2018-04-08 21:27:18 +02:00
Kim Kulling
483541ee25
Merge branch 'master' into isue_1621
2018-04-06 20:54:01 +02:00
Kim Kulling
183224f045
closes https://github.com/assimp/assimp/issues/1621 : add file check for dxf file without extensions.
2018-04-06 20:51:07 +02:00
Kim Kulling
0a3fb04b04
Update ScenePrivate.h
...
add missing header
2018-04-06 16:23:59 +02:00
Kim Kulling
32b466941b
Add missig docs and fix some small review findings.
2018-04-06 12:01:22 +02:00
Kim Kulling
08ddd5c296
Export missig symbols.
2018-04-06 10:53:32 +02:00
Kim Kulling
a636146cf2
Merge branch 'master' into develop_kimkulling
2018-04-06 10:34:46 +02:00
Kim Kulling
a3cb1ef55e
Merge branch 'master' into develop_kimkulling
2018-04-06 10:32:35 +02:00
Kim Kulling
40f5f19ce0
Merge branch 'master' into issue-1219
2018-04-05 15:24:40 +02:00
James Carthew
8cb25328cb
committing all changes.
2018-04-05 17:50:30 +10:00
Edward Andrew
b8025d92fc
Merge branch 'master' into issue-1219
2018-04-04 21:12:52 +01:00
Kim Kulling
0e945b5581
Merge branch 'master' into develop_kimkulling
2018-04-04 16:32:46 +02:00
James Carthew
6147a4f50d
Updated COB importer plugin to flip normals.
2018-04-04 08:08:28 +10:00
Edward Andrew
0c035f131d
Merge branch 'master' into issue-1219
2018-04-02 14:39:13 +01:00
Kim Kulling
4d662c42b3
Add check for SSE2-support.
2018-04-02 10:27:05 +02:00
Edward Andrew
35f4e7101a
Fixed issue#1219. CalcTangentsProcess::ProcessMesh.
2018-04-02 01:46:14 +01:00
A. Breust
0624eb0e08
Merge branch 'master' into gltf2-duplicated-textures
2018-04-01 18:09:14 +02:00
Kim Kulling
d17047cfd1
Merge branch 'master' into fbx_export_ascii
2018-04-01 17:00:42 +02:00
Kim Kulling
c9bb3592ff
FBX-Importer: remove unused lookup tables for nodes.
2018-03-31 18:10:29 +02:00
Kim Kulling
f3cc2f79fc
FBX-Importer: remove unused lookup table.
2018-03-31 17:30:31 +02:00
Kim Kulling
2a5728b4c3
FBX-Importer: fix usage of deprecated include.
2018-03-31 17:25:29 +02:00
Kim Kulling
c97fb99435
closes https://github.com/assimp/assimp/issues/1855 : fix correction of node names.
2018-03-31 16:37:39 +02:00
aoowweenn
21b518e350
use memset to allow VS compiler
2018-03-31 14:44:18 +08:00
aoowweenn
1ea7230785
Handle materials with texture id < 0
2018-03-31 14:06:26 +08:00
aoowweenn
04d70dc76d
adjust encoding to fit the new utf8 library
2018-03-31 13:29:42 +08:00
Kim Kulling
4919d3da2f
closes https://github.com/assimp/assimp/issues/1836 : make documentation much more clear how to apply global scaling.
2018-03-30 16:58:11 +02:00
Alexis Breust
26ac2ffb6c
Not duplicating textures for embedded ones
2018-03-29 15:52:05 +02:00
Tommy
070acfbadd
FBX Export: relax bindpose matrix check slightly.
...
Apparently +/- 1e-5 is too strict.
2018-03-29 14:29:02 +02:00
Tommy
39d9878429
FBX Export: use ai_snprintf.
2018-03-29 13:10:41 +02:00
Tommy
4b2120ab56
FBX Export: fix for geometric transform nodes with multiple children.
2018-03-29 10:45:23 +02:00
Tommy
0dad1d0c04
FBX Export: fix Texture_Alpha_soutce typo.
2018-03-29 01:47:31 +02:00
Tommy
826243f289
Implement ascii FBX export.
...
It's available under the 'fbxa' format id.
2018-03-29 01:44:32 +02:00
Tommy
aadb413fc0
Explicit handling of an FBXExportNode edge-case.
2018-03-28 16:09:07 +02:00
Tommy
00277d93f2
Tidier FBXExportNode construction with properties.
2018-03-28 15:47:27 +02:00
Tommy
e972b73fc2
FBX Export: tidy includes
2018-03-27 13:29:03 +02:00
Tommy
ee0cdb3954
FBX Export: Tidy animation export code.
2018-03-27 13:12:15 +02:00
Tommy
57bd125839
FBX Export: implement basic animation export.
2018-03-27 11:45:03 +02:00
Tommy
2dff6e2d5b
FBXExportProperty: implement float and long array properties.
2018-03-26 18:27:15 +02:00
Kim Kulling
d810446bb2
Merge branch 'master' into patch-1
2018-03-23 19:43:58 +01:00
Kim Kulling
666e224359
Merge branch 'master' into issue_1527
2018-03-22 23:57:30 +01:00
Kim Kulling
be4c780115
Update FBXMeshGeometry.cpp
...
Fix build.
2018-03-22 23:08:25 +01:00
Kim Kulling
13ae0a0ac3
FBX: fix parse error for uv-coordinates.
2018-03-22 22:14:10 +01:00
JeffH-BMG
376586b164
Merge branch 'master' into patch-1
2018-03-22 13:09:32 -04:00
Cloud Wu
cad11df039
Fix mingw compilation
2018-03-22 16:54:12 +08:00
Kim Kulling
e01e77a6c7
Merge branch 'master' into develop_kimkulling
2018-03-21 21:20:28 +01:00
Kim Kulling
af3bba1572
fix review findings.
2018-03-20 23:38:08 +01:00
Kim Kulling
4ae7298489
Update DefaultIOSystem.cpp
...
fix typo
2018-03-20 21:59:45 +01:00
Kim Kulling
1a887a64c1
Update EmbedTexturesProcess.cpp
...
Fix typo.
2018-03-20 21:56:26 +01:00
Kim Kulling
b01594f6a8
Update EmbedTexturesProcess.cpp
...
Replace c-cast by static_cast.
2018-03-20 21:52:42 +01:00
Kim Kulling
339e33303e
Update DefaultIOSystem.cpp
...
Use static_cast instead of int.
2018-03-20 20:39:15 +01:00
Kim Kulling
d0edb94208
Update D3MFImporter.cpp
...
Use static cast instead of c-cast.
2018-03-20 20:38:03 +01:00
Kim Kulling
f898f40486
Merge branch 'master' into master
2018-03-20 20:33:17 +01:00
Kim Kulling
5814e6f9f0
Optimize some std::string usages.
2018-03-20 18:43:54 +01:00
Kim Kulling
2d7ece4ce7
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 16:14:25 +01:00
Kim Kulling
e36f78482c
https://github.com/assimp/assimp/issues/1796 : return correct value on detach logger.
2018-03-20 14:53:57 +01:00
Kim Kulling
e668b97453
Merge branch 'master' into 3mf_basematerial_support
2018-03-20 14:12:00 +01:00
Kim Kulling
317f3e2a59
3MF: Export metadata.
2018-03-20 14:10:08 +01:00
Kim Kulling
b66bee8d79
Export: Copy metadata to be able to export it properly.
2018-03-20 14:09:07 +01:00
Kim Kulling
ef12eb84bb
3MF: add metadata import.
2018-03-20 10:09:47 +01:00
Marco Di Benedetto
9d813a48b0
fixed emply buffer stream write, removed some cast warnings.
2018-03-19 18:22:27 +01:00
JeffH-BMG
4841ee05c5
Merge branch 'master' into patch-1
2018-03-19 10:29:43 -04:00
Kim Kulling
f7854e4b32
Merge branch 'master' into master
2018-03-18 20:56:25 +01:00
Kim Kulling
6843b7a00c
Merge branch 'master' into patch-3
2018-03-18 17:44:21 +01:00
Sergey Gonchar
2d980c16f0
Support Maya 2018 Collada Export with blendshapes and bones controllers for a mesh
2018-03-15 21:41:40 -07:00
Kim Kulling
5cf6509fb5
closes https://github.com/assimp/assimp/issues/1120 : use euler angles for pre- and post-rotation.
2018-03-14 20:42:42 +01:00
Kim Kulling
4c023c3818
fix unittest folder for roundtriptest.
2018-03-13 21:40:23 +01:00
JeffH-BMG
546ad1c1bd
Merge branch 'master' into patch-3
2018-03-13 15:19:14 -04:00
JeffH-BMG
9e1638e813
Merge branch 'master' into patch-1
2018-03-13 15:18:50 -04:00
Kim Kulling
6b9add5594
fix compiler warning fr 64 bit
2018-03-13 18:19:10 +01:00
Kim Kulling
f11d4902c6
fix CanRead-method for the 3MF-Importer.
2018-03-13 17:50:34 +01:00
Kim Kulling
c5c0052a6c
Merge branch '3mf_basematerial_support' of https://github.com/assimp/assimp into 3mf_basematerial_support
2018-03-12 22:28:53 +01:00
Kim Kulling
c7ac32f891
fix naming readout + export.
2018-03-12 22:28:00 +01:00
Kim Kulling
a3ad45f3b3
Merge branch 'master' into 3mf_basematerial_support
2018-03-11 20:16:40 +01:00
Kim Kulling
c8ae0bbb3d
3MF: fix model folder desc.
2018-03-11 20:15:49 +01:00
Kim Kulling
017b7d1a2f
3MF: add missig tags for meta data.
2018-03-11 20:15:25 +01:00
Kim Kulling
336a09ee0e
add material reference to faces.
2018-03-09 23:35:12 +01:00
JeffH-BMG
72280463c2
Merge branch 'master' into patch-3
2018-03-09 14:40:30 -05:00
JeffH-BMG
f7469df871
Merge branch 'master' into patch-2
2018-03-09 14:40:16 -05:00
JeffH-BMG
c539dfe7a2
Merge branch 'master' into patch-1
2018-03-09 14:38:54 -05:00
Kim Kulling
6668eeb68e
Fix possible nullptr dereferencing.
2018-03-09 19:03:05 +01:00
Kim Kulling
2ca2e7e355
Merge branch 'master' into fbx_export_footer_tweak
2018-03-09 18:11:56 +01:00
Kim Kulling
69742670dd
3mf: use correct material assignment in case of multi-materials.
2018-03-09 11:40:45 +01:00
Kim Kulling
56f9069eb5
Merge branch 'master' into blender_fbx_opacity_fix
2018-03-09 08:30:23 +01:00
Kim Kulling
7f04b4dd43
Merge branch 'master' into fix/issue623
2018-03-09 00:04:28 +01:00
JeffH-BMG
cfd56a43a5
Fix compile error
...
Fixed bad cast.
2018-03-07 18:24:38 -05:00
JeffH-BMG
89a4cf9495
Respond to comments
...
Use memcpy() to read normals and vertices, to mitigate alignment issues, per comments.
2018-03-07 17:26:01 -05:00
Kim Kulling
af8839a8b5
Merge branch 'master' into fbx_export_footer_tweak
2018-03-07 19:44:38 +01:00
Tommy
9f02c8a97c
Fix default opacity of materials exported to FBX by Blender.
2018-03-07 09:15:08 +01:00
JeffH-BMG
6fd64b95c3
Fix compile error
...
Add parens to use of 'sizeof' operator
2018-03-06 15:03:44 -05:00
JeffH-BMG
5ea06e1bb6
Add support for texture file in PLY exports
...
The PLY format has an unofficial way to specify an associated texture, using the "comment TextureFile" comment line. The PLY loader supports this, but the exporter does not. The change looks for a diffuse texture in the scene's materials, and if it finds one, it adds it to the exported mesh using "comment TextureFile".
2018-03-06 14:50:02 -05:00
JeffH-BMG
0dab5c508e
STL binary Export should write 4-byte floats for vertex and normal coordinates
...
The STL binary format uses 4-byte floats. When using double-precision builds of Asset Importer, the STL exporter was writing out 8-byte double values instead..
2018-03-06 13:55:32 -05:00
JeffH-BMG
05cf8bfb2e
Fix import of binary STL files in double-precision builds
...
When ASSIMP_DOUBLE_PRECISION is used, the STL loader attempts to read 8-byte double vertex and normal values from the STL file. STL files are written using 4-byte floats, however, and the import will read past the end of the buffer, and possibly crash.
2018-03-06 13:48:11 -05:00
Daniel Kirchner
f4c37fa245
Collada: add importer property that forces the use of collada names. Closes #1375 .
2018-03-06 00:30:33 +01:00
Kim Kulling
5312ec806e
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-03-05 18:19:36 +01:00
Kim Kulling
22182a907e
Merge branch 'master' into master
2018-03-05 13:20:07 +01:00
Alexandre Avenel
15fa86f100
Set primitive_type to point when PLY is a point cloud
2018-03-04 22:43:20 +01:00
Alexandre Avenel
f053695176
Fix issue #623 PLY importer should not create faces
...
When the PLY file contains no faces, we should not create them.
2018-03-04 22:43:20 +01:00
Alexandre Avenel
d2547e84f5
Fix for undefined behavior when loading binary PLY
...
This commit fix undefined behavior reported by UBSAN when loading a binary
PLY file.
2018-03-04 22:04:31 +01:00
Tommy
701f9ccfe9
FBX Export: minor tweak to footer.
...
Should now be identical to those output by the FBX SDK.
2018-03-03 19:53:49 +01:00
Kim Kulling
8e7b7a0d87
Merge branch 'master' into master
2018-03-02 15:04:28 +01:00
Tommy
a58f8e1c1a
FBX Export: add missing 0 value to file footer.
2018-02-28 23:38:49 +01:00
Josh Faust
f07d27eb07
Merge branch 'master' into bugfix/c4d_obj_export_mtllib_after_g
2018-02-27 18:47:11 -08:00
Josh Faust
190190c1d7
Fix material index off-by-one error in some OBJ files (seen in a C4D export)
2018-02-27 14:58:04 -08:00
Kim Kulling
ef371bddd6
Merge branch 'master' into master
2018-02-27 18:34:34 +01:00
Kim Kulling
c0f04bf965
IMporter: fix lookup for tokens during inmemory imports.
2018-02-27 18:30:36 +01:00
Kim Kulling
e99dfdb050
fix cppcheck findings.
2018-02-25 21:03:09 +01:00
Tommy
9d9acf6840
FBX Export: allow export even when not in bind pose,
...
iff all bones have an offset matrix defined.
2018-02-25 11:45:38 +01:00
Tommy
249f1844ae
FBX Export: reconstruct full skeleton for any FBX deformers.
2018-02-25 09:53:09 +01:00
Marco Di Benedetto
72e9f3ecb9
fixed embedded texture reading.
2018-02-24 18:47:43 +01:00
Marco Di Benedetto
138b990d0a
added missing install of pbrmaterial.h
2018-02-24 17:57:42 +01:00
Marco Di Benedetto
4b7cd97fea
added support for embedded textures defined with buffer views.
2018-02-24 17:44:40 +01:00
Marco Di Benedetto
b0ac2d9daf
Merge https://github.com/assimp/assimp
2018-02-24 17:06:12 +01:00
Tommy
a9d70b2dbc
FBX Import: properly delete inverse geotrans nodes when not using them.
2018-02-24 09:37:36 +01:00
Tommy
c18a07e47f
FBX Import: Properly clean up post_nodes_chain in case of exception.
2018-02-24 08:43:36 +01:00
Tommy
b91976eead
FBX Export: handle newly-added geometric transform inverse nodes.
...
This also tidies up the imported node structure a little,
by not adding the inverse nodes if there are no child nodes.
2018-02-24 08:42:05 +01:00
Kim Kulling
5e4b2b898f
Merge branch 'master' into fbx_export_squashed
2018-02-23 23:33:43 +01:00
Kim Kulling
375dd4c179
Update D3MFImporter.cpp
...
Fix order of init list.
2018-02-23 20:34:34 +01:00
Kim Kulling
437ae0c839
Merge branch 'master' into 3mf_basematerial_support
2018-02-23 18:29:54 +01:00
Kim Kulling
606a28dbe8
Merge branch 'master' into develop_kimkulling
2018-02-23 17:54:58 +01:00
Kim Kulling
1d901f075c
3mf-importer: fix parsing of base-material color.
2018-02-23 17:49:29 +01:00
Tommy
f847d4817d
FBX Export: fix logic for determining if scale transformation is identity.
...
Previously it was comparing scale.SquareLength() to 1.0.
2018-02-21 15:29:59 +01:00
Tommy
c1f353f6c7
FBX Export: Geometric transformations always create transformation chain.
...
In combination with fb213e4b
, this fixes #1112 .
2018-02-21 14:15:03 +01:00
Kim Kulling
50b6c63594
Merge branch 'master' into develop_kimkulling
2018-02-21 13:31:32 +01:00
Kim Kulling
22dbb6c2d2
Update FileSystemFilter.h
...
- Fix typo.
-test in public metod against invalid parameters
2018-02-21 13:10:51 +01:00
Tommy
fb213e4bac
FBX Importer: apply inverse of geometric transform to child nodes.
2018-02-21 12:45:09 +01:00
Kim Kulling
7cd1a66c8b
Use correct lookup.
2018-02-20 22:08:40 +01:00
Kim Kulling
a92dbabc25
Update FileSystemFilter.h
...
Fix missing save.
2018-02-20 16:36:55 +01:00
Kim Kulling
7c33d932e3
Merge branch 'master' into master
2018-02-20 10:40:04 +01:00
Kim Kulling
d49c5b6ecf
Merge branch 'master' into fix-paint3d-vertexcolor
2018-02-20 09:23:53 +01:00
Kim Kulling
a84604f566
Merge branch 'master' into develop_kimkulling
2018-02-20 09:04:11 +01:00
Kim Kulling
f0ccff70a4
Update FileSystemFilter.h
...
Fix review findings
2018-02-20 09:03:18 +01:00
Kim Kulling
5f4539db28
Merge branch 'master' into issue_1773
2018-02-19 22:55:11 +01:00
Kim Kulling
b9a34dbc50
Merge branch 'master' into globalscale-registry
2018-02-19 20:19:17 +01:00
Kim Kulling
f78f273916
Merge branch 'master' into issue_1773
2018-02-19 15:54:46 +01:00
Tommy
1de9b3232a
Silence a clang warning.
2018-02-19 15:04:46 +01:00
Tommy
95f66f84ef
Remove constexpr for MSVC.
2018-02-19 14:33:40 +01:00
Tommy
242b5d5874
Initial FBX Export Support, sponsored by MyDidimo (mydidimo.com).
...
Supports:
* mesh data with normals and uvs
* lambert and phong materials
* file textures
* bones / skeletons
* skinning
Does not yet support:
* animations
* cameras
* lights
* embedded textures
2018-02-19 13:53:55 +01:00
Kim Kulling
219702597f
Merge branch 'master' into develop_kimkulling
2018-02-19 11:47:41 +01:00
Kim Kulling
8950504cf0
Fix import of materials.
2018-02-18 21:30:23 +01:00
Giuseppe Barbieri
58436068e7
Update BlenderScene.cpp
2018-02-16 22:16:10 +01:00
Kim Kulling
1b53c26943
Merge branch 'master' into globalscale-registry
2018-02-15 18:04:38 +01:00
Martin Buchner
a7587cb526
Merge branch 'master' into issue_1773
2018-02-15 15:31:41 +01:00
Kim Kulling
ccbcaa2ee8
fix some static-analysis findings.
2018-02-13 20:36:22 +01:00
Kim Kulling
cdfe33e3f2
Merge branch 'master' into pbrmaterial_h
2018-02-13 19:17:18 +01:00
Kim Kulling
4fb0e85d9d
Merge branch 'master' into issue_1773
2018-02-13 14:45:14 +01:00
Sergio Acereda
9a7611a93e
AI_MATKEY_GLTF_... -> assimp/pbrmaterial.h
2018-02-12 22:33:51 +01:00
Kim Kulling
331e67c32d
3mf: introduce first prototype for basematerial support.
2018-02-12 22:07:12 +01:00
Sergio Acereda
8a4fd2f947
globalScale process not registered
2018-02-12 21:51:40 +01:00
Kim Kulling
78173177e8
closes https://github.com/assimp/assimp/issues/1564 : remove copy constructor.
2018-02-12 21:45:47 +01:00
mbuchner
1299905026
Make FileSystemFilter forward all virtual functions to wrapped IOSystem instance
...
This makes it possible to override those functions. Previously the
default implementation was always used.
Fixes #1773
2018-02-12 12:13:44 +01:00
Giuseppe Barbieri
f00d450d25
Update BlenderDNA.inl
2018-02-11 17:43:49 +01:00
Marco Di Benedetto
c874fd8ae2
changed std::to_string to to_string.
2018-02-09 16:18:49 +01:00
Marco Di Benedetto
affedc139e
Merge https://github.com/assimp/assimp
2018-02-09 15:54:34 +01:00
Turo Lamminen
ebdad4f883
Ogre: Avoid creating function-scoped static constants
...
They're causing false positive race condition messages from Helgrind
2018-02-09 15:40:28 +02:00
Kim Kulling
4e4098f1fc
Merge branch 'master' into issue_567
2018-02-08 20:29:47 +01:00
Kim Kulling
674a47dd3e
closes https://github.com/assimp/assimp/issues/567 : prevend dependency cycle
2018-02-08 20:24:18 +01:00
Kim Kulling
c7ea536351
closes https://github.com/assimp/assimp/issues/1386 : fix undefined behaviour in compare function.
2018-02-07 20:21:05 +01:00
Max Vollmer
990dc983ed
Issue #1776 Fixed potential crash bug in ObjectCompare, because it didn't follow strict weak ordering. As counter-intuitive as it seems, a comparator must return false for equal values. The C++ standard defines and expects this behavior: true if lhs < rhs, false otherwise.
2018-02-07 10:48:39 +01:00
Kim Kulling
277fa2da93
Merge branch 'master' into memleaks
2018-02-07 00:38:23 +01:00
Kim Kulling
57c1fe5954
x-parser: fix the crash.
2018-02-06 23:59:46 +01:00
Giuseppe Barbieri
4736160b79
Update BlenderDNA.h
2018-02-06 22:36:37 +01:00
Kim Kulling
495ae70cc5
XFileParser: release x-file-based scene when throwing an exception.
2018-02-06 19:21:56 +01:00
Turo Lamminen
17b26c91e2
OpenGEX: Use std::unique_ptr to fix some memory leaks
2018-02-06 20:20:16 +02:00
Turo Lamminen
5ce9ece0cc
OpenGEX: Replace std::copy with explicit loop
2018-02-06 20:08:49 +02:00
Turo Lamminen
aa434b9566
OpenGEX: Add comment about pointer ownership
2018-02-06 20:05:02 +02:00
Turo Lamminen
ef891fb850
LWO: Move some assignments to make it clearer when the thing should be moved
2018-02-06 19:58:05 +02:00
Turo Lamminen
3b68ffe363
LWO: Use C++11 auto for easier refactoring
2018-02-06 19:50:42 +02:00
Turo Lamminen
9344074a04
MDLLoader: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:22:32 +02:00
Turo Lamminen
1aed63afb7
OpenGEX: Replace another raw pointer with vector to fix a memory leak
2018-02-06 19:13:54 +02:00
Turo Lamminen
880be5403f
OpenGEX: Replace raw pointer with vector to fix a memory leak
2018-02-06 19:03:47 +02:00
Turo Lamminen
c42dd9104c
BlenderLoader: Fix memory leak
2018-02-06 18:52:23 +02:00
Turo Lamminen
d284d107e7
XGLLoader: Fix a memory leak
2018-02-06 18:43:51 +02:00
Kim Kulling
dceb7257dd
Update XFileParser.cpp
...
Fix the build.
2018-02-05 13:53:06 +01:00
Kim Kulling
eb23946fe7
Update XFileParser.cpp
...
Fix alignment for float and double.
2018-02-05 13:44:19 +01:00
Kim Kulling
ff556027ef
X: fix some review findings.
2018-02-05 00:33:41 +01:00
Kim Kulling
3685791e0d
closes https://github.com/assimp/assimp/issues/1729 : check for bit flip when unsigned int overflow happens in x-file parsing.
2018-02-04 22:15:18 +01:00
Kim Kulling
1a9f17e13d
Merge branch 'master' into issue_774
2018-02-04 18:33:22 +01:00
Kim Kulling
c5157bc471
fbx: global settings use float instead of double.
2018-02-04 17:13:58 +01:00
Kim Kulling
37d352622b
closes https://github.com/assimp/assimp/issues/774 : use correct type for unitscale in fbx.
2018-02-04 16:42:36 +01:00
Turo Lamminen
5278e1a5f8
CSM: Fix a possible memory leak by using std::unique_ptr
2018-02-03 17:52:25 +02:00
Turo Lamminen
cfcaf3e97b
BVH: Initialize all members of Node in constructor
2018-02-03 17:38:30 +02:00
Turo Lamminen
da19ed0b2a
BaseImporter: Remove dead condition
...
operator new never returns NULL, it throws exception on allocation failure
2018-02-03 17:25:31 +02:00
Turo Lamminen
be865ae613
LimitBoneWeightsProcess: Initialize all members of Weight in constructor
2018-02-03 17:19:27 +02:00
Turo Lamminen
9397932e4f
PretransformVertices: Rearrange some assignments to clarify things
2018-02-03 17:08:25 +02:00
Kim Kulling
d47f34344e
closes https://github.com/assimp/assimp/issues/1752 : move guard over include statement.
2018-02-03 08:46:03 +01:00
Kim Kulling
58d1ef6492
Merge branch 'master' into unzipExt
2018-02-01 19:21:09 +01:00
Kim Kulling
a1963feab7
Merge branch 'master' into warning4221
2018-01-31 20:27:45 +01:00
Kim Kulling
2714e146e0
Update OgreXmlSerializer.cpp
...
- Make constats static
- add asserts to check against nullptr dereferencing
2018-01-31 09:57:34 +01:00
Sergio Acereda
8f99c1a0be
including <unzip.h> instead of <contrib/unzip/unzip.h>
2018-01-30 22:13:44 +01:00
Kim Kulling
46e9d1321d
Merge branch 'master' into warning4221
2018-01-30 21:41:44 +01:00
Turo Lamminen
388ec8461c
Ogre: Change OgreXmlSerializer::ReadAttribute parameter from std::string to pointer
2018-01-30 20:12:46 +02:00
Turo Lamminen
cfc9a69512
Ogre: Don't create std::strings in global scope where char pointer will do
2018-01-30 20:03:28 +02:00
Turo Lamminen
0c66b3902e
Ogre: Avoid creating static std::strings
...
They're causing false positive race condition messages from Helgrind
2018-01-30 19:47:15 +02:00
Turo Lamminen
12396d0ce3
Ogre: Change OgreXmlSerializer::HasAttribute parameter from std::string to pointer
...
It's immediately passed via string pointer and in most places
it's already a raw string constant.
2018-01-30 19:42:58 +02:00
Sergio Acereda
be33feba44
Warning LNK4221 when not building exporter.
2018-01-29 12:39:40 +01:00
Kim Kulling
bd29fe73fa
Merge branch 'master' into new_license_dates
2018-01-28 20:16:17 +01:00
Kim Kulling
b049933d2f
update license dates.
2018-01-28 19:42:05 +01:00
Turo Lamminen
e0cbd92da4
ASE: Delete BaseNode constructor which doesn't take name
2018-01-27 18:48:57 +02:00
Turo Lamminen
4b20e9712c
ASE: Explicitly pass "DUMMY" as Dummy node name
2018-01-27 18:48:57 +02:00
Turo Lamminen
2d1bd1eec4
ASE: Delete Camera default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
7fef5e6d23
ASE: Explicitly pass "UNNAMED" as default camera name
2018-01-27 18:48:57 +02:00
Turo Lamminen
945f2bed09
ASE: Add Camera constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
039ca38542
ASE: Delete Light default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
4fd791796c
ASE: Explicitly pass "UNNAMED" as default Light name
2018-01-27 18:48:57 +02:00
Turo Lamminen
f3d702339c
ASE: Add Light constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
17f801ae8a
ASE: Delete Mesh default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
59ab30cb25
ASE: Explicitly pass "UNNAMED" as default mesh name
2018-01-27 18:48:57 +02:00
Turo Lamminen
f3474fb399
ASE: Add Mesh constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
3874720947
ASE: Add BaseNode constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
1836b00f51
ASE: Delete Bone default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
e75f7a5964
ASE: Explicitly pass "UNNAMED" as default bone name
2018-01-27 18:48:57 +02:00
Turo Lamminen
3f377e11f5
3DS: Delete Node default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
0d69b15238
3DS: Explicitly pass "UNNAMED" as 3DS root node name
2018-01-27 18:48:57 +02:00
Turo Lamminen
6c23b57208
3DS: Pass name to Node constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
56a19ac492
3DS: Add Node constructor which takes name
2018-01-27 18:48:57 +02:00
Turo Lamminen
c0c06093b4
3DS: Whitespace
2018-01-27 18:48:57 +02:00
Turo Lamminen
8c219c7bd1
3DS: Delete Mesh default constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
93fa373206
3DS: Pass name to Mesh constructor
2018-01-27 18:48:57 +02:00
Turo Lamminen
b580064414
3DS: Add Mesh constructor with takes name
2018-01-27 18:48:57 +02:00
Kim Kulling
25c5384208
Merge branch 'master' into master
2018-01-25 09:11:14 +01:00
Kim Kulling
2e7e16b52b
Merge branch 'master' into issue_1728
2018-01-24 23:58:55 +01:00
Kim Kulling
1037ac5b93
Merge branch 'master' into issue_1721
2018-01-24 21:57:53 +01:00
Kim Kulling
5baba37414
closes https://github.com/assimp/assimp/issues/1728 : check if mesh is a null instance before dereferencing it.
2018-01-24 21:43:36 +01:00
Giuseppe Barbieri
47a2775b94
Update FBXConverter.cpp
...
Renamed nested looping variable
2018-01-24 21:30:25 +01:00
Kim Kulling
0b15d5cd46
closes https://github.com/assimp/assimp/issues/1721 : set camera parameters instead of nonsense.
2018-01-24 21:20:34 +01:00
Rohan Singh
b28bcc365c
Interpret IndexAToDirect as Direct when the index element is missing
...
Paint3D exports FBX like this, which is wrong, but could still support it
2018-01-24 09:45:20 -05:00
Turo Lamminen
a8fd9f668f
ASE: Explicitly write out Material move constructor and assignment operator
...
Because MSVC doesn't support defaulting them
2018-01-24 12:25:30 +02:00
Turo Lamminen
cbd7916ced
3DS: Explicitly write out Material move constructor and assignment operator
...
Because MSVC doesn't support defaulting them
2018-01-24 12:11:19 +02:00
Turo Lamminen
e6ff15d201
3DS: Initialize Material name in initializer list
2018-01-23 20:41:26 +02:00
Turo Lamminen
4acd96d405
3DS: Remove Material default constructor
2018-01-23 20:36:51 +02:00
Turo Lamminen
dd7035372d
3DS: Pass default material name to constructor instead of changing after the fact
2018-01-23 20:36:05 +02:00
Turo Lamminen
10246bf052
3DS: Pass default material name to Material constructor
2018-01-23 20:29:46 +02:00
Turo Lamminen
f2ec3eeeb8
ASE: Delete Material default constructor
2018-01-23 20:20:37 +02:00
Turo Lamminen
209966ef35
ASE: Pass default material name to constructor
2018-01-23 20:15:21 +02:00
Turo Lamminen
1b28124f21
ASE: Pass a default material name when resizing submaterials buffer
2018-01-23 19:54:16 +02:00
Turo Lamminen
4b1b5f1b59
ASE: Pass a default material name when resizing materials buffer
2018-01-23 19:50:20 +02:00
Turo Lamminen
60d78f1701
ASE: Add Material constructor which takes material name
2018-01-23 19:43:15 +02:00
Turo Lamminen
d49996d8a6
3DS: Add Material constructor which takes material name
2018-01-23 19:38:38 +02:00
Turo Lamminen
024aade208
ASE: Add explicit default constructors and assignment operators to Material
2018-01-23 19:33:50 +02:00
Turo Lamminen
9e7b21f83d
3DS: Add explicit default constructors and assignment operators to Material
2018-01-23 19:24:22 +02:00
Turo Lamminen
4d946d9e31
ASE: Reformat another initializer list
2018-01-23 19:10:00 +02:00
Turo Lamminen
6c4e3bce53
3DS: Reformat initializer list
2018-01-23 18:58:23 +02:00
Turo Lamminen
70ae30f26a
ASE: Reformat initializer list
2018-01-23 18:58:19 +02:00
kim kulling
88a0bb1b6d
FBX: store UnitScaleFactor for fbx-files.
2018-01-23 15:13:23 +01:00
kim kulling
8ac1de3287
closes https://github.com/assimp/assimp/issues/1390 : aiScene now stores metadata as well.
2018-01-23 15:12:57 +01:00
Kim Kulling
f0d03ec6b8
closes https://github.com/assimp/assimp/issues/1722 : use a const reference to fix issue with ppc.
2018-01-22 14:35:06 +01:00
Marco Di Benedetto
5f38bd01ec
restored gltf checks.
2018-01-18 22:28:44 +01:00
Marco Di Benedetto
c749594e9d
gltf instant ok on valid extension.
2018-01-18 19:12:51 +01:00
Marco Di Benedetto
55ca48e838
Merge branch 'master' of https://github.com/assimp/assimp
2018-01-18 19:08:54 +01:00
Kim Kulling
8b9b770f9f
Merge branch 'master' into gltf2-fixes
2018-01-16 21:50:48 +01:00
Kim Kulling
81fbe2c7d3
Merge branch 'master' into issue_1660
2018-01-16 17:13:02 +01:00
Kim Kulling
d230635ff6
STLLoader: closes https://github.com/assimp/assimp/issues/1660 : use memcpy instead of a c-style dynamic cast to parse a aiVector3D
2018-01-16 16:31:15 +01:00
Alexis Breust
5e6cae3094
Force normalized normals
2018-01-16 09:56:44 +01:00
Alexis Breust
0f4189c77e
Forced 4-bits alignment for glTF buffers
2018-01-16 09:26:18 +01:00
BuildTools
0c37ef55be
IFCLoader.h fix
2018-01-15 19:23:13 -08:00
BuildTools
f88572f572
fix includes
2018-01-15 19:14:44 -08:00
Christian Meurin
86fa0f4524
Merge branch 'master' into master
2018-01-15 19:10:14 -08:00
BuildTools
d0c92e30be
conflict resolution again, temp. move LogAux.h
2018-01-15 19:07:33 -08:00
BuildTools
68db518696
Fix IFC branch merge conflict
2018-01-15 19:00:56 -08:00
Kim Kulling
c07069821d
Merge branch 'master' into better_fbx_material_import
2018-01-14 22:04:20 +01:00
Kim Kulling
03b43ee9c3
Merge branch 'master' into ifc_40
2018-01-13 14:40:50 +01:00
Kim Kulling
5e339d0ff0
fix case-sensitive typo in include.
2018-01-13 10:54:38 +01:00
Kim Kulling
cecab969c6
IFC: introduce new namespace fpr IFC-schema2x3
2018-01-13 10:27:45 +01:00
BuildTools
4410de1c44
correct header path for new process
2018-01-11 13:21:40 -08:00
Christian Meurin
925be5e983
Merge branch 'master' into master
2018-01-11 13:13:46 -08:00
awefers
193165fb43
Merge branch 'master' into issue_1684
2018-01-11 10:16:20 -08:00
Axel Wefers
0e99f1f587
Build fix for 1684
...
Requires cast from size_t to uint64 like in other places, otherwise the call to the constructor for GenericValue() is ambiguous.
Fixes #1684
2018-01-11 10:15:05 -08:00
Tommy
fb4a67d4fe
Improve FBX material import.
...
Some properties were being incorrectly interpreted,
and by default it was relying on a legacy system.
2018-01-11 17:30:21 +01:00
Kim Kulling
88df886bcc
Merge branch 'master' into issue_1605
2018-01-11 11:39:14 +01:00
Christian Meurin
538bc95499
Merge branch 'master' into master
2018-01-10 20:10:54 -08:00
Axel Wefers
3e127bebff
glTF 2.0: Import scale for normal textures and strength for occlusion textures
...
resolves #1693
2018-01-10 16:45:17 -08:00
Kim Kulling
936eb26dde
Merge branch 'master' into issue_1605
2018-01-11 00:54:35 +01:00
awefers
bb71f2ba64
Merge branch 'master' into issue_1605
2018-01-10 12:04:41 -08:00
Kim Kulling
45d5f2eec8
Merge branch 'master' into issue_1691
2018-01-10 20:50:37 +01:00
Marco Di Benedetto
978c156c2a
added import of material properties (double sided and transparency) in glTF 1.0 importer.
2018-01-10 20:02:41 +01:00
Axel Wefers
901b981260
glTF: Always check signature
...
Always check signature for glTF 1.0 and glTF 2.0 files to select the correct importer. Fixes #1605
2018-01-09 09:37:57 -08:00
Axel Wefers
dc79b572cf
glTF 2.0: Assign default material to meshes with no material reference.
...
fixes #1691
2018-01-08 14:57:55 -08:00
Axel Wefers
4235765856
glTF 2.0: Set camera "look at" to (0.0, 0.0, -1.0).
2018-01-08 14:19:30 -08:00
Kim Kulling
0fff3b1232
Merge branch 'master' into master
2018-01-08 15:36:03 +01:00
Alexis Breust
559bc38e5d
Embedding images post-process
2018-01-08 09:26:52 +01:00
Christian Meurin
5ef13e7b38
Merge branch 'master' into master
2018-01-07 11:34:18 -08:00
Kim Kulling
dd7a323103
Merge branch 'master' into issue_1574
2018-01-07 11:30:03 +01:00
Christian Meurin
7b5c543b82
Merge branch 'master' into master
2018-01-06 14:48:23 -08:00
Kim Kulling
abc01bcdf0
closes https://github.com/assimp/assimp/issues/1574 : add API to get name of current branch.
2018-01-06 21:52:58 +01:00
Kim Kulling
b2bfb40859
Merge branch 'master' into remove_ctest
2018-01-06 21:31:22 +01:00
Kim Kulling
3896f3ffce
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 20:40:27 +01:00
Kim Kulling
01081765ad
closes https://github.com/assimp/assimp/issues/1638 : use memcpy instead of dynamic_cast.
2018-01-06 18:03:27 +01:00
Kim Kulling
6bbdb669e1
Merge branch 'master' into master
2018-01-06 09:30:13 +01:00
A. Breust
ca152f41e2
Merge branch 'master' into 1674-buffer-relative-uri
2018-01-06 09:19:48 +01:00
BuildTools
66171de915
Successful lib build, unit testing still WIP
2018-01-05 16:18:33 -08:00
Alexis Breust
9b5df71150
Not using external bin file for glb2
2018-01-05 10:28:12 +01:00
Alexis Breust
988acd00f1
Using relative buffers URI
2018-01-05 10:08:17 +01:00
Kim Kulling
f376a3e8cd
move data declaration after test if elements are in current scope.
2018-01-04 13:09:43 +01:00
Kim Kulling
9efa4282fe
closes https://github.com/assimp/assimp/issues/1460 : skip uv- and color-components if these are not defined.
2018-01-04 12:37:35 +01:00
Kim Kulling
2f6dab53f4
Merge branch 'master' into remove_ctest
2018-01-04 00:28:04 +01:00
Kim Kulling
c66c7d7ae6
remove ctest to make workspace more readable.
2018-01-03 17:22:07 +01:00
Leo Terziman
d0bee866c0
Merge remote-tracking branch 'github/master' into contrib
2018-01-03 16:15:07 +01:00
Leo Terziman
712a7ee779
Fixed bug in IFC where SweptDiskSolid tessellation would fail for polylines with only 2 points.
...
Indeed, the EstimateSampleCount is not always accurate in this case, as the number of generated curvature pointer is greater by one. Moreover, it is redundant to call EstimateSampleCount, as the SampleDiscrete method will provide the (correct) number of points anyway. This commit fix the described bug, but also increase the efficiency of the ProcessSweptDiskSolid method, as EstimateSampleCount is only called once now, instead of two times.
2018-01-03 16:14:20 +01:00
Leo Terziman
32dfd423db
Fixed bug in IFC when dimensional exponent parameters in IfcSIUnits is not defined.
...
Usually, the value of this parameter is derived from parents, but it is not always the case for some files.
2018-01-03 16:08:18 +01:00
Turo Lamminen
8a505398a3
MMD: Fix memory leak
2018-01-02 20:35:06 +02:00
Turo Lamminen
aac41cf2c3
MMD: Fix delete / delete[] mismatch
...
Also this was a horrible abuse of std::vector and shouldn't have worked
2018-01-02 20:28:08 +02:00
Turo Lamminen
7ebd8e7543
glTFAsset: Use std:unique_ptr for Image data
2018-01-02 20:09:22 +02:00
Turo Lamminen
d308cfcb43
glTF: Fix delete / delete[] mismatch
2018-01-02 19:23:21 +02:00
Alexandre Avenel
ced6e8ce43
Use std::unique_ptr in ObjFileParser
2017-12-30 13:23:44 +01:00
Alexandre Avenel
606fd6b1a1
Replace assertion by an exception in Obj parsing
...
This crash could happen when the user try to parse an ill-formed obj file.
2017-12-29 18:07:41 +01:00
Alexandre Avenel
20ef807982
Remove assertion in ObjFileImporter
...
This assertion is already handled by an exception, and could lead to a
crash when parsing an ill-formed OBJ file.
2017-12-29 17:56:30 +01:00
Turo Lamminen
096056b899
Q3BSP: Fix build with clang libc++
2017-12-24 22:17:59 +02:00
Turo Lamminen
dc94e5921e
MDLImporter: Use unique_ptr
...
Fixes a double free
2017-12-24 22:17:11 +02:00
Turo Lamminen
55e69272bd
MMD: Remove bogus assert
...
It can be triggered by input file, it's undocumented and it looks like nothing breaks
2017-12-24 22:15:19 +02:00
Turo Lamminen
90cdd0f20c
RemoveComments: Fix out-of-bounds read when file ends with a comment
2017-12-24 22:14:39 +02:00
Turo Lamminen
4078543827
OpenGEX: Throw exception on malformed color4 instead of crashing
2017-12-24 14:57:14 +02:00
Turo Lamminen
7932a85ca1
Raw: Fix unitialized values in scene
2017-12-24 14:38:26 +02:00
Turo Lamminen
1ad789bae9
Raw: Reformat code, no functional change
2017-12-24 14:26:53 +02:00
Faule Socke
4a65e76ca7
Fix buffer overflow in obj loader
...
The overflow-checking code in ObjFileImporter::createVertexArray is at
the wrong position, allowing buffer overflows in preceding code.
This fix moves the code to the right spot.
An actual overflow can be caused by usign some more bugs and weird
behaviours and injecting a malformed line statement into the object
file, containing only one index. Such a malformed file could for
example look like:
o 1
v 0 0 0
v 1 1 1
v 2 2 2
l 1
f 1 2 3
Because the code in ObjFileImporter::createTopology incorrectly handles
line-type faces containing only one index (in line 364), it
underestimates the number of required indices and therefore causes the
buffer allocated in line 421 to be too small.
I believe, the correct fix for this would be in the parser and
rejecting such faces early. However the overflow check was misplaced
anyway.
If you can't reproduce a crash, just insert some more "l 1" lines
before the "f 1 2 3" line until it crashes. The behaviour of heap buffer
overflows strongly depends on memory layout and allocation history.
2017-12-23 17:57:48 +01:00
Kim Kulling
5a30bccdae
closes https://github.com/assimp/assimp/issues/1612 : make wstaring handling depend from encoding of the filename.
2017-12-22 16:45:07 +01:00
Kim Kulling
2294390917
Merge branch 'master' into iosystem-patch
2017-12-20 09:57:54 +01:00
Giuseppe Barbieri
06179cee04
Update FBXDocument.cpp
2017-12-19 22:53:59 +01:00
Turo Lamminen
bb5495f99a
Q3BSP: Add assertion to silence a static analyzer warning
2017-12-19 19:39:04 +02:00
Turo Lamminen
c44522d4db
ObjImporter: Fix possible memory leak
2017-12-19 19:38:38 +02:00
Turo Lamminen
47b725a8c8
MDCLoader: Fix horrible pointer casting hack
2017-12-19 18:55:14 +02:00
Turo Lamminen
0cf772a4d4
MDCLoader: Replace min and strlen with strnlen
2017-12-19 18:46:48 +02:00
Turo Lamminen
65ffeaa81e
ObjImporter: Use unique_ptr
2017-12-19 18:24:03 +02:00
Turo Lamminen
1e9f329e6d
MMD: Add virtual destructor to a class which already has virtual functions
2017-12-19 18:18:14 +02:00
Turo Lamminen
b6800a9992
X3DImporter: Add virtual destructors to some classes which already have virtual functions
2017-12-19 18:16:41 +02:00
rickomax
4623c2f14c
FBX Embedding Fix
...
FBX files may use a texture reference from an embedded texture that hasn't been loaded yet. This patch fixes this issue, storing all texture filenames, that can be acessed later via "scene::GetEmbeddedTexture", when all textures are already loaded.
Some warnings have been added to other file formats that uses embedded data.
2017-12-18 18:14:54 -02:00
Kim Kulling
04dc52fcf0
Merge branch 'master' into iosystem-patch
2017-12-18 08:59:14 +01:00
Kim Kulling
39e36371f9
Merge branch 'master' into nonascii_chars_in_fbxmaterial_cpp
2017-12-17 20:41:52 +01:00
Giuseppe Barbieri
76dd48d64f
Update FBXDocumentUtil.h
2017-12-17 18:43:23 +01:00
Tommy
47c422ea49
Fix non-ascii encoding in comments in FBXMaterial.cpp.
...
It looks like it was just saved with a wrong encoding,
as these 0xB4 characters were in place of "'".
Also converted tabs to spaces to match indent in the rest of the file.
2017-12-17 16:40:12 +01:00
Kim Kulling
d081b4ab4e
Merge branch 'master' into fix_clang5_issue
2017-12-17 16:11:44 +01:00
Kim Kulling
efc893a139
Merge branch 'master' into gltf2-exporter-improvements
2017-12-17 09:39:14 +01:00
Kim Kulling
3d743151ce
Merge branch 'master' into fix_1623
2017-12-17 09:04:08 +01:00
Kim Kulling
0bcf5c22db
Merge branch 'master' into unique_ptr
2017-12-17 02:16:48 +01:00
Kim Kulling
74319a6a50
Merge branch 'master' into fix_gltf_exporter_define_name
2017-12-17 00:30:56 +01:00
Kim Kulling
05f8af950a
Merge branch 'master' into master
2017-12-16 19:56:41 +01:00
Turo Lamminen
463dec5c7e
Change StreamReader::IncPtr argument to signed
...
Negative values are passed to it so it needs to be signed
2017-12-16 15:48:01 +02:00
Turo Lamminen
2f082340fc
MDLLoader: Add workaround for clang 5.0 build issue
2017-12-16 15:48:01 +02:00
Tommy
379562055b
Fix incorrect NO_GLTF_IMPORTER define name in glTFExporter.h
2017-12-15 23:18:45 +01:00
Alexis Breust
32e5e3a576
Forgot to uncomment isBinary
2017-12-15 15:40:31 +01:00
Kim Kulling
5e63ba9a9d
typo.
2017-12-14 18:10:42 +01:00
Kim Kulling
dec3e2ba42
XGLLoader: fix const issue when seeting vec2.
2017-12-14 18:06:28 +01:00
Alexis Breust
d29173aaa9
Following specification for padding
2017-12-14 17:32:18 +01:00
Kim Kulling
eb0608f2e9
diable unaigned pointer access temprary, second one.
2017-12-14 17:00:16 +01:00
Kim Kulling
722420c5dc
diable unaigned pointer access temprary.
2017-12-14 16:51:47 +01:00
Kim Kulling
422776b479
Merge branch 'master' into master
2017-12-14 16:38:22 +01:00
Alexis Breust
d09df8cc07
Fixed leftover log
2017-12-14 16:18:17 +01:00
Alexis Breust
31a4ccaebb
Added support for generating glb2 (binary glTF 2)
2017-12-14 16:11:12 +01:00
Alexandre Avenel
50bcaf39fd
Fix issue #1623 : crash when loading multiple PLY files
...
Pointer mGeneratedMesh was not reset to nullptr when transfering ownership
to pScene->mMeshes
2017-12-12 20:48:51 +01:00
Turo Lamminen
89afe0780b
B3DImporter: Fix double free when reusing Importer
2017-12-12 20:03:16 +02:00
Turo Lamminen
824dfc314b
B3DImporter: Store node animations in unique_ptr
2017-12-12 19:46:11 +02:00
Turo Lamminen
08a35d4e1f
B3DImporter: Store materials in unique_ptr
2017-12-12 19:46:11 +02:00
Turo Lamminen
f1707e920d
B3DImporter: Store meshes in unique_ptr
2017-12-12 19:46:11 +02:00
Turo Lamminen
acab4c327e
B3DImporter: Store animations in unique_ptr
2017-12-12 19:46:07 +02:00
Turo Lamminen
30ae14fae9
B3DImporter: Add unique_to_array helper function
2017-12-12 18:40:28 +02:00
Teybeo
99031997bd
Fix 3MF define typo
2017-12-11 16:27:27 +01:00
Teybeo
8cd1ede9ba
Fix 3MF define typo
2017-12-11 16:26:45 +01:00
Teybeo
7337474b6c
Fix 3MF define typo
2017-12-11 16:26:00 +01:00
Kim Kulling
28b01cbdd1
Update to 4.1.0
2017-12-11 13:20:19 +01:00
Daniel Löber
2f93cd77f8
added path conversion code for unicode on windows
2017-12-11 10:28:50 +01:00
Giuseppe Barbieri
3e0b072263
Update FBXBinaryTokenizer.cpp
2017-12-09 23:42:23 +01:00
Kim Kulling
972d8517b5
fix the model xml
2017-12-07 17:50:18 +01:00
Kim Kulling
0588d6cccf
FBX: closes https://github.com/assimp/assimp/issues/1619 : return correct index for embedded textures.
2017-12-07 09:44:48 +01:00
Kim Kulling
c23c63e821
fix correct folder naming scheme.
2017-12-06 22:15:34 +01:00
Kim Kulling
95e9cd75fa
3MF: fix working test for 3MF-export.
2017-12-06 21:41:48 +01:00
Giuseppe Barbieri
e741e7aec6
Update MD5Loader.h
2017-12-02 23:16:10 +01:00
Kim Kulling
b8ab90ae4b
Merge branch 'master' into patch-16
2017-12-02 21:15:54 +01:00
Turo Lamminen
2c3558fdd0
Remove ScopeGuard
2017-12-02 17:24:19 +02:00
Turo Lamminen
b60d84a8a2
C4D: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:23:49 +02:00
Turo Lamminen
bd4f024562
XGLLoader: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:22:19 +02:00
Turo Lamminen
e8eccfa27d
FBX: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:19:18 +02:00
Turo Lamminen
6f50be82aa
3MF: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:15:57 +02:00
Turo Lamminen
f35d5952dc
BlenderLoader: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:13:43 +02:00
Turo Lamminen
af8e297e0f
BaseImporter: Replace ScopeGuard with std::unique_ptr
2017-12-02 17:10:06 +02:00
Giuseppe Barbieri
42c1c733b9
Update MD3Loader.cpp
2017-12-01 15:20:50 +01:00
Kim Kulling
4811c0bdd1
Merge branch 'master' into fix/multibody-binary-stls
2017-11-30 10:13:56 +01:00
Kim Kulling
5822d1920e
Update STLLoader.cpp
...
Retrigger travis + appveyor.
2017-11-30 09:22:55 +01:00
Kim Kulling
c27fda62e5
Merge branch 'master' into export_3mf
2017-11-30 00:32:23 +01:00
Kim Kulling
9be69a90b1
Merge branch 'master' into fix/multibody-binary-stls
2017-11-30 00:28:59 +01:00
Kim Kulling
46caecdf35
enable compiler switch test for no exporter requested.
2017-11-29 21:02:52 +01:00
Daniel Hritzkiv
98e98dc40c
Fix node names sharing same name
...
Uses node name if it is set, and globally unique id otherwise.
This may still break in some models (glTF2 spec doesn’t guaruntee name values to be unique). However, I couldn’t cause it to break any further using gltf2 models on hand.
Closes #1600
2017-11-29 12:20:44 -05:00
Daniel Hritzkiv
67c236647d
Restore import of multi mesh binary STLs
...
Regression introduced in: 9a9f18bbed
This restores the behaviour for binary STLs with multiple bodies.
The code could be improved (to reuse code found at the end of LoadASCIIFile) but for now this is a quick fix
2017-11-29 11:20:09 -05:00
Kim Kulling
b5e79c3cb6
fix invalid include
2017-11-29 16:11:33 +01:00
Kim Kulling
ddd23fad3f
Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf
2017-11-28 19:05:00 +01:00
Kim Kulling
6a2cd1c91d
Update D3MFExporter.cpp
...
Fix the build
2017-11-28 10:14:23 +01:00
Kim Kulling
9bd9b3d99c
Merge branch 'master' into export_3mf
2017-11-28 09:24:02 +01:00
Kim Kulling
4b6e49ca7b
Update D3MFExporter.h
...
Fix review findings.
2017-11-28 09:09:04 +01:00
Kim Kulling
4f972661e8
Update D3MFExporter.cpp
...
Fix review findings.
2017-11-28 09:08:16 +01:00
Kim Kulling
7a395e274f
Merge branch 'master' into fix/gltf2-transforms
2017-11-28 08:48:19 +01:00
Kim Kulling
8ce5985aa0
Merge branch 'master' into fix/gltf2-preserve-node-names
2017-11-28 00:50:07 +01:00
Kim Kulling
09f7769820
remove unused attribute.
2017-11-27 23:36:32 +01:00
Kim Kulling
8e413ac1e3
Merge branch 'master' into export_3mf
2017-11-27 22:50:17 +01:00
Kim Kulling
7280dec838
fix unittest.
2017-11-27 22:46:57 +01:00
Kim Kulling
3dfca3bc84
3MF: add export to a given archive.
2017-11-27 21:48:33 +01:00
awefers
0031165789
Add support for tangents in glTF2.0 import
...
Closes #1562
2017-11-27 13:45:40 -05:00
awefers
0b04ae1d91
Preserve node names when importing glTF2.0
...
Closes #1522
2017-11-27 11:58:19 -05:00
awefers
e53d4735b0
Fix transform matrices multiplication order per glTF2.0 spec
...
Closes #1568
2017-11-27 11:32:05 -05:00
Kim Kulling
623b5a515a
Merge branch 'master' into fix-typo-gltf
2017-11-25 20:11:49 +01:00
Alexandre Avenel
eb452b28a2
Fix warning on MSVC14
2017-11-25 11:38:12 +01:00
Alexandre Avenel
d529dd17f9
Fix warning cast double to float
2017-11-24 22:29:58 +01:00
Alexandre Avenel
273f6b0267
Fix MSVC14 warning cast double to real
2017-11-24 22:13:38 +01:00
Alexandre Avenel
f80e8b39a1
Fix warning C4138: '*/' found outside of comment on MSVC14
2017-11-24 22:08:50 +01:00
Alexandre Avenel
c63263b025
Fix typo on gltf2 camera parameters
2017-11-24 22:02:47 +01:00
Kim Kulling
0bdb375804
Add missing file export into archive.
2017-11-24 18:59:37 +01:00
Kim Kulling
09a5946dbd
Prepare archive structure.
2017-11-23 22:47:18 +01:00
Kim Kulling
d180cfcba5
Merge branch 'master' into master
2017-11-22 16:01:16 +01:00
Kim Kulling
e35f789ace
Merge branch 'master' into scene_combiner_crash
2017-11-22 13:46:14 +01:00
Kim Kulling
454b8919b0
use one header for all xml-tags.
2017-11-21 21:34:25 +01:00
Kim Kulling
b474e75e29
3Mf-Export: add prototypes for relations and rest of 3MF-document.
2017-11-21 18:41:16 +01:00
Kim Kulling
a7be5b527f
add missing return statement.
2017-11-20 23:53:53 +01:00
Kim Kulling
9ca7b00280
Merge branch 'master' into export_3mf
2017-11-20 22:36:50 +01:00
Kim Kulling
c22b4acd47
3MF: Export initial commit.
2017-11-20 22:36:17 +01:00
Kim Kulling
70d9df868d
Merge branch 'master' into patch-12
2017-11-20 22:23:47 +01:00
Kim Kulling
ba3acd7459
Merge branch 'master' into patch-12
2017-11-20 19:56:14 +01:00
Patrick Dähne
a05d74a281
[glTF2] Moved byteStride from accessor to bufferView
2017-11-20 19:01:28 +01:00
Kim Kulling
beff88228d
Merge branch 'master' into master
2017-11-20 18:56:10 +01:00
Patrick Dähne
6cbfd5b977
[glTF2] Implemented reading binary glTF2 (glb) files
2017-11-20 14:59:05 +01:00
Mika Rautio
9f1dce8e57
Merge branch 'master' into master
2017-11-20 10:27:11 +02:00
Mika Rautio
4fb5038fb1
Add support for building Mac OS X Framework bundles
2017-11-20 00:10:05 +02:00
Kim Kulling
2a9f79f958
check for 0 properties before copy them
2017-11-19 19:05:51 +01:00
Kim Kulling
55c9761228
Merge branch 'master' into patch-12
2017-11-19 18:25:22 +01:00
Kim Kulling
9707fde709
check for nullptr dereferencing before copying scene data
2017-11-19 17:41:31 +01:00
Kim Kulling
65d6daa414
Merge branch 'master' into patch-13
2017-11-18 20:36:05 +01:00
Kim Kulling
1a1d96d3e2
Merge branch 'master' into fix_android
2017-11-18 18:32:58 +01:00
Kim Kulling
a8e65a1e8a
Fix android build.
2017-11-18 18:32:16 +01:00
Turo Lamminen
8ae7231654
Blender: Silence warning about uninitialized member
2017-11-18 16:50:45 +02:00
Turo Lamminen
2c8cc1f732
BlenderDNA: Silence warning about uninitialized member
2017-11-18 16:49:03 +02:00
Turo Lamminen
bcffa28a33
MDLImporter: Don't take address of packed struct member
2017-11-18 16:39:43 +02:00
Turo Lamminen
1067ae4bfa
FIReader: Fix strict-aliasing warnings
2017-11-18 15:54:40 +02:00
Turo Lamminen
c1515db56f
Blender: Fix strict-aliasing warnings
2017-11-18 15:50:56 +02:00
Giuseppe Barbieri
703d046fd9
Update ValidateDataStructure.cpp
2017-11-18 00:34:00 +01:00
Giuseppe Barbieri
fc360b9cc8
Update ValidateDataStructure.h
2017-11-18 00:05:17 +01:00
Giuseppe Barbieri
b428c66f39
Update ValidateDataStructure.h
2017-11-17 23:10:05 +01:00
Kim Kulling
07a99e0843
Merge branch 'master' into issue_1513
2017-11-16 17:32:34 +01:00
Giuseppe Barbieri
d9965f6220
Update Importer.cpp
2017-11-16 14:42:20 +01:00
Kim Kulling
7db10022e9
closes https://github.com/assimp/assimp/issues/1513 : fix assimp for cross compile for android
2017-11-15 21:26:25 +01:00
Turo Lamminen
f475803f93
X3DImporter: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
Turo Lamminen
66c18cc406
TerragenLoader: Remove unused variable
2017-11-15 11:45:21 +02:00
Turo Lamminen
e47bf932e8
SIBImporter: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
Turo Lamminen
583d3f88b8
FBX: Remove dead assignment
2017-11-15 11:45:21 +02:00
Turo Lamminen
ef0af40f90
IFC: Remove dead code
2017-11-15 11:45:21 +02:00
Turo Lamminen
b49a4e1338
PLY: Remove dead assignment and reduce scope of a variable
2017-11-15 11:45:21 +02:00
Turo Lamminen
97843f19d2
OpenGEX: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
Turo Lamminen
f470b8466f
GLTF2: Fix signed/unsigned warning
2017-11-15 11:45:21 +02:00
Turo Lamminen
f90019bc1e
NFF: Add assertions to silence static analyzer warnings
2017-11-15 11:45:21 +02:00
Turo Lamminen
3f299b2a2b
NFF: Split up some complicated assignments
2017-11-15 11:45:21 +02:00
Turo Lamminen
d24e0d44b2
Raw: Fix misleading indentation warning
2017-11-15 11:45:21 +02:00
Turo Lamminen
2b93a210c9
NFF: Reduce scope of a variable
2017-11-15 11:45:21 +02:00
Turo Lamminen
940449d837
LWO: Reduce scope of a variable
2017-11-15 11:45:21 +02:00
Turo Lamminen
a276a02726
IRRLoader: Fix confusing boolean casting
2017-11-15 11:45:21 +02:00
Turo Lamminen
437816fc33
AssbinExporter: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
Turo Lamminen
4c9f169109
ASE: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
Turo Lamminen
856d402b59
AMFImporter: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
Turo Lamminen
2c7770eed5
AMFImporter: Add a block
2017-11-15 11:45:21 +02:00
Turo Lamminen
bd0d47c5fc
Whitespace
2017-11-15 11:45:21 +02:00
Turo Lamminen
a7fccf8f33
OptimizeGraph: Fix possible null pointer dereference
2017-11-15 11:45:21 +02:00
Turo Lamminen
c51b92cfa3
RemoveRedundantMaterials: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
Turo Lamminen
95f2319b41
ImproveCacheLocality: Add assertion to silence a static analyzer warning
2017-11-15 11:45:21 +02:00
Turo Lamminen
c774e864a0
Remove some dead assignments
2017-11-15 11:45:21 +02:00
Turo Lamminen
266e3b29a8
RemoveRedundantMaterials: Set pointer to nullptr after deleting it
2017-11-15 11:45:21 +02:00
Turo Lamminen
76919e87ea
fast_atof: Silence some uninitialized variable warnings
2017-11-15 11:45:21 +02:00
Kim Kulling
24b728b3ea
FindDegeneratives: adapt unittests and add configs
2017-11-12 22:09:18 +01:00
Kim Kulling
9206d1b62b
Merge branch 'master' into issue_216
2017-11-12 11:04:51 +01:00
Kim Kulling
005b537324
unittests: add VS-based source groups for the unittests.
2017-11-10 20:40:00 +01:00
Kim Kulling
de1ec4ee5d
Merge branch 'master' into gltf2-mesh-export-fix
2017-11-10 19:07:46 +01:00
Unknown
12dbbd4ce9
Misc. typos
...
Some are doxy comments, some are just trivial source comment typos.
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
2017-11-09 17:19:26 -05:00
Kim Kulling
ad2ff9fd71
check for area test if the face is a triangle.
2017-11-09 21:40:10 +01:00
Kim Kulling
30e06f7437
closes https://github.com/assimp/assimp/issues/216 : check the area of a triangle to check if its degenerated or not.
2017-11-09 21:31:16 +01:00
Daniel Hritzkiv
9ec117d0bc
Fix export of deleted meshes; Add LazyDict::Remove method
...
When I was merging a node’s multiple meshes into that node’s first mesh’s primitives, I was deleting the merged meshes from the node.
However, I wasn’t deleting the merged meshes from the mAsset->meshes Dict, causing the gltf2 export to contain extra unreferenced meshes and duplicate primitives.
This new code adds a new method to LazyDict, which removes the object from it, taking care to update indexes of the subsequent objects. This change also requires that `Ref`s of `Mesh`es (stored in node->meshes) have their indexes updated.
2017-11-08 18:31:32 -05:00
Kim Kulling
5bc4e73727
Merge branch 'master' into issue_1292
2017-11-08 22:52:46 +01:00
Kim Kulling
ab639a71ae
Merge branch 'master' into issue_1315
2017-11-08 21:09:02 +01:00
Kim Kulling
36475bf868
closes https://github.com/assimp/assimp/issues/1292 : export class subdivision
2017-11-08 20:50:16 +01:00
Kim Kulling
cdfd4b9702
closes https://github.com/assimp/assimp/issues/1315 : check in exporting against out-of-bounds-access .
2017-11-08 20:44:53 +01:00
Kim Kulling
6954c7d75b
Merge branch 'master' into master
2017-11-08 18:34:25 +01:00
Kim Kulling
fe55bc9996
Update ColladaExporter.cpp
...
fix build
2017-11-08 18:34:16 +01:00
Kim Kulling
6b826fecfd
Merge branch 'master' into issue_1251
2017-11-08 01:07:35 +01:00
Kim Kulling
f41ed2f41f
closes https://github.com/assimp/assimp/issues/1251 : use correct lookup for utf32.
2017-11-08 01:07:04 +01:00
Kim Kulling
29cf414468
Merge branch 'master' into md2_fix
2017-11-07 22:03:02 +01:00
Kim Kulling
75fdd25b6b
Merge branch 'master' into issue_104
2017-11-07 11:27:06 +01:00
Kim Kulling
da7ce89ff2
Update STLLoader.cpp
...
add missing const.
2017-11-07 10:47:27 +01:00
Kim Kulling
b87e7643d2
Update STLLoader.cpp
...
Fix memory-alignment bug.
2017-11-07 10:42:51 +01:00
Kim Kulling
4ff2592747
Update STLLoader.h
...
Fixed a typo.
2017-11-07 00:31:09 +01:00
Kim Kulling
9a9f18bbed
closes https://github.com/assimp/assimp/issues/104 : deal with more solids in one STL file.
2017-11-06 22:30:07 +01:00
Kim Kulling
4a4f3fddc7
closes https://github.com/assimp/assimp/issues/213 : log an error instead of letting the fbx-importer crash.
2017-11-05 22:52:07 +01:00
Kim Kulling
ab3cf3687c
Merge branch 'master' into UnitTest_X3D
2017-11-05 18:10:10 +01:00
Kim Kulling
2929a27edc
add unittest for x3d-importer.
2017-11-05 17:41:26 +01:00
Kim Kulling
02b042d78e
closes https://github.com/assimp/assimp/issues/1351 : use correct name for obj-meshname export for groups.
2017-11-05 16:35:22 +01:00
Kim Kulling
a33e115fd1
fix mem-lead: face will be not released in case of an error.
2017-11-04 18:26:30 +01:00
Kim Kulling
c9ada44ab5
Fix memory leak in case of an error.
2017-11-04 17:05:23 +01:00
Kim Kulling
c700c08fa5
Merge branch 'master' into master
2017-11-04 10:45:57 +01:00
Kim Kulling
b7bd006304
Merge branch 'master' into ObjExporter_nomtl
2017-11-04 09:32:50 +01:00
Kim Kulling
4587e63e2f
Merge branch 'master' into fix_trivial_warnings
2017-11-03 20:05:16 +01:00
Daniel Hritzkiv
2922753589
Return early when element is TextureFile
...
In cases where the TextureFile name would start with an integer, `strtoul10` would parse that number and incorrectly set `numOccur` to that number. This caused PLY parsing to fail for vertex positions.
Since TextureFile is a single line, and does not have any follow-up lines, it’s okay to return early
2017-11-03 11:50:28 -04:00
Kim Kulling
d279a3cc02
Merge branch 'master' into fix_trivial_warnings
2017-11-03 10:35:02 +01:00
Thomas Lemaire
5b76a31485
fix trivial warnings
...
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
2017-11-02 11:13:52 +01:00
thomas-lemaire
931542bf3c
Merge branch 'master' into ObjExporter_nomtl
2017-11-02 10:46:57 +01:00
Daniel Hritzkiv
e52e44ea07
Formatting
2017-10-31 15:18:08 -04:00
Daniel Hritzkiv
cc4531459f
Set mNumUVComponents to 0 when deleting texture coordinate sets
2017-10-31 15:14:21 -04:00
Kim Kulling
8be196f77d
closes https://github.com/assimp/assimp/issues/1490 : fix invalid access to mesh array when the array is empty.
2017-10-31 14:03:03 +01:00
Kim Kulling
af4556d569
only scale the root node because this will rescale all children nodes as well.
2017-10-31 13:08:24 +01:00
Kim Kulling
64ee21024b
Add missing file.
2017-10-31 13:07:07 +01:00
Kim Kulling
ae020281e2
Add unittest
2017-10-31 12:24:32 +01:00
Lars Jørgen Solberg
711050de8a
fix frame pointer arithmetic
2017-10-30 19:08:51 +01:00
thomas-lemaire
4d09e61b13
Merge branch 'master' into master
2017-10-30 11:41:25 +01:00
Victor NG
99b9ba4c11
Merge branch 'master' into master
2017-10-30 16:33:47 +08:00
Victor NG
aca8f068d0
Update ColladaExporter.cpp
2017-10-30 16:29:57 +08:00
Kim Kulling
bbeb9dd640
Use correct lookup if scaling is enabled.
2017-10-29 23:18:37 +01:00
Kim Kulling
f49de6ecfe
closes https://github.com/assimp/assimp/issues/1514 : add postprocess step for scaling
2017-10-29 20:28:59 +01:00
Thomas
18cef9b391
[ObjExporter] add a "no mtl" version of the obj exporter
2017-10-27 10:14:38 +02:00
Daniel Hritzkiv
8b73ec7541
Fix shininess to roughness conversion; Add comments
...
Was accidentally flipping to value (1 - x) twice, thus negating the effect.
2017-10-26 11:33:33 -04:00
Kim Kulling
bfa33b50ad
Merge branch 'master' into gltf2-materials
2017-10-24 10:40:20 +02:00
Alexandre Avenel
cc8374dd80
Return exception when obj file contains invalid face indice
2017-10-21 20:58:00 +02:00
Victor NG
90ba199ad4
Update ColladaExporter.cpp
2017-10-21 18:28:14 +08:00
Victor NG
cd4ef0a2e9
Update ColladaExporter.h
2017-10-21 18:15:46 +08:00
ndotl
8cf61c3c89
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-20 15:22:49 +02:00
Daniel Hritzkiv
6e88838602
powf -> pow
...
Fix build errors on linux
2017-10-19 16:21:29 -04:00
Daniel Hritzkiv
40147d253d
Prefer “BLEND” over “MASK” as an alphaMode default
...
“BLEND” is a much nicer alphaMode value (if the hardware supports it – not a steep requirement) than “MASK” as mask is either fully opaque or fully transparent, depending on the alphaCutoff. This matches many other converters’ alphaMode default.
2017-10-19 16:21:29 -04:00
Daniel Hritzkiv
89358458f0
Approximate specularity / glossiness in metallicRoughness materials
...
Before, models (of traditional lighting models) with specularity/glossiness would be completely flat when exported to metallicRoughness. These changes approximate glossiness (as an inverse of roughness, with specular intensity as a multiplier) both reading from gltf2 and writing to gltf2.
2017-10-19 16:21:29 -04:00
Daniel Hritzkiv
a898c1f2d1
SpecularFactor import and export improvements
...
The changes here (which only apply to reading from or writing to pbrSpecularGlossiness) will:
- store and read specular color on `AI_MATKEY_COLOR_SPECULAR ` rather than `AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_SPECULAR_FACTOR`
- store and read specular texture from `aiTextureType_SPECULAR` rather than `AI_MATKEY_GLTF_PBRSPECULARGLOSSINESS_SPECULARGLOSSINESS_TEXTURE`. Even though pbrSG’s specularGlossiness texture uses the alpha channel for glossiness, it will still work well enough with just the RGB channels of the image
2017-10-19 16:21:29 -04:00
Daniel Hritzkiv
c71790c78d
Diffuse color and diffuse texture import and export improvements
...
These changes do a better of importing and exporting baseColor colors and textures, as well as diffuse colors and textures (in the case of pbrSpecularGlossiness)
- baseColorFactor will be stored on both `$clr.diffuse` and `$mat.gltf.pbrMetallicRoughness.baseColorFactor`, and will be extracted from `$mat.gltf.pbrMetallicRoughness.baseColorFactor` first, and falling back to `$clr.diffuse`. The behaviour for baseColorTexture is similar
- pbrSG’s diffuseFactor will now only be store on `$clr.diffuse` (overwriting any previous assignments to `$clr.diffuse`, e.g. from metallicRoughness’ baseColorFactor, as diffuseFactor is more analogous to diffuse color than baseColor), and will only extract from `$clr.diffuse`
2017-10-19 16:21:16 -04:00
Daniel Hritzkiv
5eaf083fbd
Fix output of glTF 1 version string
...
Was writing out “\u0001” instead of “1.0” as the data types were incorrect
2017-10-19 12:43:52 -04:00
Kim Kulling
b2eb599176
Update ColladaExporter.cpp
...
Retrigger travis.
2017-10-16 18:51:25 +02:00
Kim Kulling
44ad80201c
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-14 21:47:21 +02:00
Jared Mulconry
f8c4002294
Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug
2017-10-14 18:46:19 +03:00
Turo Lamminen
9a6b141568
FBX: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
Turo Lamminen
7cbb5f4d3b
B3DImporter: Replace bad pointer casting with memcpy
2017-10-14 18:46:19 +03:00
Kim Kulling
e662f2dc6f
Blender: fix short overflow.
2017-10-13 22:41:38 +02:00
Kim Kulling
e79848ff79
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-11 13:49:47 +02:00
Jared Mulconry
3e7dbb5dfb
Merge branch 'master' of github.com:assimp/assimp into appveyor
2017-10-11 19:06:29 +11:00
Kim Kulling
a1b79e23e6
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-10 19:33:07 +02:00
Kim Kulling
c128e7e56c
Merge branch 'master' into issue_1453
2017-10-10 18:20:22 +02:00
Jared Mulconry
fa91a0f64c
Another minor source change, this time even more minor than the last. Let's see what the cache can do with this.
2017-10-10 22:45:45 +11:00
Jared Mulconry
1497cc27b2
Cleaned up the whitespace again. Let's see how the cache does.
2017-10-10 22:08:13 +11:00
Jared Mulconry
b8ad03baa1
Because I have to change a file somewhere to properly test the cache on AppVeyor, I've made some whitespace a bit better.
2017-10-10 19:45:57 +11:00
ndotl
7c8e8e04fa
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
2017-10-09 16:00:46 +02:00
Haik Lorenz
7353d25c13
Prevent failing stringstream to crash the export process
...
Text exporters are using string streams to hold the file content first and then write them to the file in a single pass. If for whatever reason the stream has the fail bit set, tellp() will return pos_type(-1), which in turn makes the subsequent write crash - at least on Windows systems. One reason for the stream being in fail state is when its size exceeds 2^31 bytes, even on 64-bit systems (i.e., when very large scenes get exported).
The fix is checking the fail() before even opening the file.
2017-10-09 15:47:17 +02:00
Kim Kulling
d60fe38253
Merge branch 'master' into master
2017-10-09 00:07:43 +02:00
Turo Lamminen
cd64eae590
GenericProperty: Remove useless const qualifier from return value
2017-10-08 12:45:48 +03:00
Turo Lamminen
7e033c6cef
FBX: Remove useless const qualifier from return value
...
const qualifier on primitive return type does nothing.
2017-10-08 12:45:02 +03:00
Kim Kulling
b57011552b
Merge branch 'master' into issue_1453
2017-10-07 19:08:52 +02:00
Kim Kulling
f925e2cf4e
Reproduce issue and remove assertion when a nullptr makes more sence
2017-10-07 19:08:20 +02:00
Marco Di Benedetto
9a79d243f9
added additional displacement texture token.
2017-10-07 12:36:02 +02:00
Jared Mulconry
326158633b
Fixed warnings on MSVC caused by implicit conversions from double to float.
2017-10-06 18:23:28 +03:00
Turo Lamminen
50b43f76e1
OpenGEXImporter: Copy materials to scene
2017-10-06 18:23:28 +03:00
Turo Lamminen
b841ed194b
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
Turo Lamminen
775f984d99
OpenGEXImporter: Fix IOStream leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
22b55d01a2
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
2017-10-06 18:23:28 +03:00
Turo Lamminen
61278aa408
AMFImporter: Fix memory leak
2017-10-06 18:23:28 +03:00
Turo Lamminen
1f16ed9fd0
UnrealLoader: Fix IOStream leak
2017-10-06 18:23:28 +03:00
Kim Kulling
c1f93a69ae
Revert "WIP: Enable Travis clang build"
2017-10-06 15:42:05 +02:00
Kim Kulling
c9b9dab1ff
Merge pull request #1475 from jaredmulconry/master
...
Fixed warning on clang 3.9 caused by static data member in class template
2017-10-06 15:37:33 +02:00
Jared Mulconry
3803a5181c
Fixed warnings on MSVC caused by implicit conversions from double to float.
2017-10-06 20:32:33 +11:00
Jared Mulconry
341222697a
Address warnings on Clang 3.9 caused by having a static data member in a class template.
2017-10-05 23:55:10 +11:00
Turo Lamminen
3f0bb9c634
OpenGEXImporter: Copy materials to scene
2017-10-05 12:51:08 +03:00
Turo Lamminen
568003a0d3
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
2017-10-05 12:43:49 +03:00
Turo Lamminen
e7ff7b167f
OpenGEXImporter: Fix IOStream leak
2017-10-05 12:38:44 +03:00
Turo Lamminen
b6d2b91799
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
2017-10-05 12:35:17 +03:00
Turo Lamminen
316046f748
AMFImporter: Fix memory leak
2017-10-05 12:15:28 +03:00
Turo Lamminen
34acf47acd
UnrealLoader: Fix IOStream leak
2017-10-05 12:15:28 +03:00
Turo Lamminen
afce984228
FBXImporter: Add explicit instantiation of log_prefix so other FBX source files can see it
2017-10-05 12:15:25 +03:00
Turo Lamminen
bf1aaf98f9
IFCImporter: Add explicit instantiation of log_prefix so IFCMaterial.cpp can see it
2017-10-05 12:15:11 +03:00
Kim Kulling
cbca8f574e
Merge pull request #1432 from turol/asan
...
Asan
2017-10-04 16:12:44 +02:00
Kim Kulling
c3e9d6132c
Merge pull request #1468 from assimp/issue_1467
...
closes https://github.com/assimp/assimp/issues/1467 .
2017-10-03 09:58:56 +02:00
Jared Mulconry
5804667dbb
Addressed some mismatched news/deletes caused by the new glTF2 sources.
2017-10-02 11:04:15 +03:00
Jared Mulconry
1eb7eceddf
Addressed a number of memory leaks identified in unit tests by asan
2017-10-02 11:03:24 +03:00
Turo Lamminen
1095ec454b
Fix delete / delete[] mismatches in glTF2 importer
2017-10-02 10:55:26 +03:00
Turo Lamminen
efd861253d
Fix delete / delete[] mismatches in MakeVerboseFormat
2017-10-02 10:55:26 +03:00
Turo Lamminen
5ecab20bd0
Fix delete / delete[] mismatch in glTFAsset
2017-10-02 10:55:26 +03:00
Kim Kulling
6ec25be0a6
OpenGEX: improve logging to be able to detect error-prone situations.
2017-10-02 09:41:01 +02:00
Kim Kulling
3f4663e369
closes https://github.com/assimp/assimp/issues/1467 .
2017-10-02 09:33:51 +02:00
Jared Mulconry
9088deeb1d
Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project.
2017-09-30 23:29:56 +10:00
Kim Kulling
c4e91eb33f
add some asserts.
2017-09-30 10:47:23 +02:00
Kim Kulling
1c76962c98
closes https://github.com/assimp/assimp/issues/1450 : use correct name of exporter to gltf2
2017-09-30 09:38:13 +02:00
Kim Kulling
9033071237
Obj: rename attribute from exporter.
2017-09-30 09:37:34 +02:00
Kim Kulling
5adc029225
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-29 21:59:11 +02:00
Kim Kulling
c42589460d
closes https://github.com/assimp/assimp/issues/1459 : fix out-of-boundary access error
2017-09-29 21:58:58 +02:00
Josh Faust
febd611d48
Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars
2017-09-27 18:41:35 -07:00
Jared Mulconry
79a5165106
Fixed unused variable warning by replacing them with descriptive comments
2017-09-24 21:46:15 +10:00
Jared Mulconry
8dabd76e03
Fixed a warning caused by aiVector3D appearing in a packed struct, causing it to fail to pack as requested.
2017-09-24 21:19:03 +10:00
Jared Mulconry
059a32654e
Addressed warnings generated on MSVC across x86 and x64.
2017-09-24 19:29:43 +10:00
Kim Kulling
b5ac248703
Merge pull request #1444 from turol/warnings
...
Clean up some more GCC warnings
2017-09-20 22:18:21 +02:00
Kim Kulling
81b94a1dca
Merge pull request #1445 from Matter-and-Form/gltf2-alphaMode-fix
...
Fix glTF2 alphaMode storage and reading
2017-09-19 15:40:53 +02:00
Kim Kulling
5c44776532
Merge pull request #1447 from Matter-and-Form/gltf1-color-import-fix
...
[gltf1] Don’t ignore rgba(1,1,1,1) color properties
2017-09-19 15:40:00 +02:00
Kim Kulling
adec1b2175
Merge pull request #1446 from Matter-and-Form/feature/gltf2-primitives
...
glTF2 primitives fixes
2017-09-19 15:39:11 +02:00
Kim Kulling
d27e667f1e
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-19 00:32:50 +02:00
Kim Kulling
af9596674d
FBX: add missing inversion of postrotation matrix for fbx.
2017-09-19 00:31:41 +02:00
Daniel Hritzkiv
3e8955faf5
Don’t ignore rgba(1,1,1,1) color properties
...
Do not ignore rgba(1,1,1,1) material properties when importing glTF1. While a white diffuse color may be the default value for a default assimp material, `1,1,1,1` is a very explicit color value for ambient/specular/emissive color properties.
Closes #1434
2017-09-18 18:16:48 -04:00
Daniel Hritzkiv
798542d7bd
Formatting
2017-09-18 14:48:07 -04:00
Daniel Hritzkiv
de0bf2ea96
Fix alphaMode storage and reading
...
alphaMode is now converted from a std::string to an aiString and back to std::string, since aiString is easier to store and retrieve from aiMaterial properties than std::string
Fixes issues of alphaMode being written out as `\fOPAQUE\0\0\0\0\0\0…`
2017-09-18 12:19:55 -04:00
Daniel Hritzkiv
8743d28ec5
SImplify mesh merging code
...
My assumption that primitives of different types (modes) can’t be in the same mesh was incorrect.
2017-09-18 12:16:30 -04:00
Daniel Hritzkiv
2efd2cdef8
tweaks to primitive merging logic; comments + formatting
2017-09-18 11:16:05 -04:00
Daniel Hritzkiv
814e8b3f8e
Formatting
2017-09-18 11:16:05 -04:00
Daniel Hritzkiv
28523232cf
Merge multiple meshes in a node into one mesh with many primtives; write out only one mesh per node
...
To do:
- clean up MergeMeshes
- see if there’s a way to do this earlier in the flow
2017-09-18 11:16:05 -04:00
Daniel Hritzkiv
5147acfe65
Revert "store node mesh vs. meshes"
...
This reverts commit a0d97505e5
.
2017-09-18 11:16:04 -04:00
Turo Lamminen
982430c3ce
BlenderDNA: Silence warning about inline function which is declared but not defined
...
It's a templated method which is meant to be specialized. The base version
is never called. Just remove 'inline' to make GCC shut up.
2017-09-18 15:21:51 +03:00
Turo Lamminen
40c308af44
glTF: Silence uninitialized variable warning
...
This is a false positive. 'jointNamesIndex' is either set by the loop
or the following conditional is false which also sets it. The undefined value
is never seen by the following code.
2017-09-18 15:18:45 +03:00
Turo Lamminen
b74fc9495a
PlyLoader: Fix operator precedence issue in header check
...
The previous version might read past end of buffer
2017-09-18 15:16:21 +03:00
Turo Lamminen
4652be8f18
FIReader: Silence uninitialized variable warning
...
This is a false positive. First time through the loop 'imod3' is always 0
so c1 is not used. It's also set so further iterations have a valid 'c1'.
If 'value' is empty the switch doesn't look at 'c1' either since 'imod3'
is still 0.
2017-09-18 14:59:55 +03:00
Turo Lamminen
41724ace2d
Collada: Silence uninitialized variable warning
...
This is a false positive. Value of 'method' is only used if 'targetMeshes'
contains something and all paths through the first loop which add stuff
to 'targetMeshes' also set 'method'.
2017-09-18 14:10:58 +03:00
Jeremy Cowles
c207e74534
Fix glTF 2.0 multi-primitive support
...
Previously, only one primitive was supported, in fact memory was corrupted
when more than one primitive was found per glTF mesh.
In this change, each primitive is unrolled as a new Assimp Mesh, resulting
in multiple Assimp meshes per node when multiple primitives exist per
glTF mesh. This is required in the general case, since glTF primitives can
have different material bindings and primitive modes.
2017-09-17 10:08:49 -07:00
Kim Kulling
484f73b179
Merge pull request #1437 from rmitton/sib-version
...
Added support for SIB models from Silo 2.5
2017-09-16 16:27:38 +02:00
Richard Mitton
f602055da5
Added Silo 2.5 support
...
Silo 2.5 bumps the version number of SIB files for no apparent reason. Doesn't appear to be any other changes to the file format.
2017-09-15 12:40:38 -07:00
Richard Mitton
234ffc0ad6
Fixed truncated material names
...
The previous Unicode library change accidentally trimmed off the last character of SIB material names.
2017-09-15 12:39:58 -07:00
Turo Lamminen
01c50394ce
FBXParser: Silence uninitialized variable warnings
2017-09-15 12:42:17 +03:00
Turo Lamminen
f1998d52dc
Importer: Whitespace cleanup to fix GCC misleading indentation warning
2017-09-15 12:41:53 +03:00
Turo Lamminen
046c229e48
AssbinExporter: Fix strict aliasing violation
2017-09-15 12:41:40 +03:00
Turo Lamminen
f4a0ab81b1
AssbinExporter: Add Write specialization for aiColor3D
2017-09-15 12:41:13 +03:00
Turo Lamminen
b9efc234d0
DefaultLogger: Whitespace cleanup to fix GCC misleading indentation warning
2017-09-15 12:40:07 +03:00
Turo Lamminen
0b140db0a4
glTFExporter: Silence uninitialized variable warning
...
This is a false positive, idx_srcdata_begin is only used if comp_allow
is true and in that case it's also initialized.
2017-09-15 12:39:58 +03:00
vkovalev123
58213804ff
Update 3DSLoader.cpp
...
Fixed reading of CHINK_RGBF. If reading performs on x32 platform then reading will execute right, but on x64 it`s wrong because it will read 8 bytes instead 4.
2017-09-14 14:55:02 +03:00
Kim Kulling
afd6c4d57d
Revert "Asan"
2017-09-13 21:40:44 +02:00
Kim Kulling
d139b4d180
Merge pull request #1423 from Matter-and-Form/feature/gltf2
...
glTF 2 Importer + glTF 2 Spec Conformity
2017-09-13 20:01:38 +02:00
Kim Kulling
d49f86f1e7
Merge pull request #1427 from turol/asan
...
Asan
2017-09-13 19:38:44 +02:00
Turo Lamminen
b6f122ff2c
Fix delete / delete[] mismatch in glTFAsset
2017-09-13 11:31:05 +03:00
Kim Kulling
6a3b030094
MDP: fix encoding issues.
2017-09-12 21:16:59 +02:00
Kim Kulling
b5f770e456
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-12 19:07:21 +02:00
Kim Kulling
e3163ec15e
FBX: fix some minor findings.
2017-09-12 19:07:17 +02:00
Kim Kulling
cbedc448c6
closes https://github.com/assimp/assimp/issues/1426 : add Defines.h to include folder for install.
2017-09-12 18:59:38 +02:00
John Senneker
933bbb4f1c
Manually read alphaMode material property
2017-09-12 11:55:52 -04:00
John Senneker
eca008d5ec
Properly move string passed to JSON writer
2017-09-12 11:55:22 -04:00
Daniel Hritzkiv
b0da0796c8
Fix Segfault caused by losing pointer to std::string
...
Keep std::string alive
2017-09-12 10:07:15 -04:00
Daniel Hritzkiv
cde29c937c
Formatting
2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
b1a5ca4516
Use `forceNumber` argument of `WriteAttrs` to write correct attribute names, instead
2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
990fe143a1
Fix mesh primitive’s attributes’ names
...
Per spec
TEXCOORD -> TEXCOORD_0
COLOR -> COLOR_0
JOINTS -> JOINTS_0
WEIGHTS -> WEIGHTS_0
Remove JOINTMATRIX since it’s not supported (and doesn’t seem to be output, anyway)
TANGENT should be added at a later date
2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
816e6909ca
Remove KHR_binary_glTF code
...
Binary glTF is now part of the glTF2 spec. However, it’s implemented incorrectly, so will be temporarily removed
2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
b4f5033d89
Remove compresssed file format flag
2017-09-11 11:02:16 -04:00
Daniel Hritzkiv
d518289e72
more specific token search for Collada Loader
...
collada can appear in many files, such as glTFs via the “generator” field (in the form of collada2gltf)
2017-09-11 11:02:15 -04:00
Daniel Hritzkiv
5cb13aa4b3
Load gltf .bin files from correct directory
2017-09-11 11:02:15 -04:00
Daniel Hritzkiv
a438ece655
Remove premultipliedAlpha from gltf2
2017-09-11 11:02:15 -04:00
John Senneker
140b903d7a
Fix parsing of glTF version
...
Handle version as int in gltf
Fix format specifiers in glTF version parser
2017-09-11 11:02:15 -04:00
John Senneker
19876e9822
Add support for importing both glTF and glTF2 files
2017-09-11 11:02:15 -04:00
John Senneker
2ee7991558
Restrict search for OFF header to first 3 bytes
2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
a5e8e0b2bd
Remove commented out code
2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
0a8183531e
Set alphaMode, baseColorFactor opacity when model’s opacity isn’t 1
2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
37582131f4
Set the metallicFactor to 0 if source file doesn’t have metallicFactor
...
Otherwise, the models have full metallic materials and appear very dim
2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
da6a252efb
Fix METALLIC_FACTOR typo
2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
3ba00ca421
Define gltf material property names as constants
2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
54dd4804cd
Fix indentation
2017-09-11 11:02:14 -04:00
Daniel Hritzkiv
44757af34a
Implement pbrSpecularGlossiness property as Nullable
2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
03cfa04ee4
Define default material values as static constants
...
for reuse
2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
1a5823700f
Remove need for Has by returning an empty Ref in Get
2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
21259e0835
Use different form of index accessor
2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
37527849b7
Export material names properly
2017-09-11 11:02:13 -04:00
Daniel Hritzkiv
a9c4fa84b5
Sampler improvements; Add new LazyDict method
...
Samplers are now imported into assimp internal format from textures;
Samplers have defaults as per spec;
Sampler enums are strongly typed with UNSET values;
Samplers are exported properly;
Sampler filters are exported as well;
Samplers are re-used across textures on export
Default sampler values are not written
2017-09-11 11:02:12 -04:00
Daniel Hritzkiv
7245cceead
Set default values on Sampler
2017-09-11 10:55:51 -04:00
Daniel Hritzkiv
2abdbdb55e
Fix unused CopyValue
2017-09-11 10:55:51 -04:00
Daniel Hritzkiv
63ef19d9ad
Export extensions
2017-09-11 10:55:51 -04:00
Daniel Hritzkiv
d277995a97
Formatting
2017-09-11 10:55:51 -04:00
Daniel Hritzkiv
7f01e3f48f
Only export byteStride if not 0
2017-09-11 10:55:50 -04:00
Daniel Hritzkiv
a0d97505e5
store node mesh vs. meshes
...
glTF nodes can only hold one mesh. this simply assigns to and check’s a Node’s Mesh
2017-09-11 10:55:50 -04:00
Daniel Hritzkiv
ab08a7c3cb
reenable animation and skins exports
...
Currently incorrect, however. May need to be removed
2017-09-11 10:55:50 -04:00
Daniel Hritzkiv
f09892ab63
Write specularGlossiness textures on the specularGlossiness object
2017-09-11 10:50:39 -04:00
Daniel Hritzkiv
feee7528d6
Make sure `on` flag for specularGlossiness is being persisted
2017-09-11 10:50:39 -04:00
Daniel Hritzkiv
8bef546b41
mention pbrSpecularGlossiness support
2017-09-11 10:50:39 -04:00
Daniel Hritzkiv
2d54019b8f
Remove OPEN3DGC and compression references
2017-09-11 10:50:39 -04:00
Daniel Hritzkiv
562920fbb8
Changes to GLTF2 materials
...
pbrMetallicRoughness and pbrSpecularGlossiness as structs; persist textureinfo properties from start to finish; persist pbrSpecularGlossiness (via extensionsUsed) usage from start to finish
2017-09-11 10:50:39 -04:00
Daniel Hritzkiv
7532d6aac1
Remove Light, Technique references
2017-09-11 10:50:38 -04:00
Daniel Hritzkiv
863458cd4a
Start removing materials common, and adding pbrSpecularGlossiness
2017-09-11 10:50:38 -04:00
Daniel Hritzkiv
7615a97cd3
Remove redundant function
2017-09-11 10:50:38 -04:00
Daniel Hritzkiv
0cf69479c3
Use `!ObjectEmpty()` vs. `MemberCount() > 0`
2017-09-11 10:50:38 -04:00
Daniel Hritzkiv
11cb9ac139
Working read, import, export, and write of gltf2 (pbr) material
2017-09-11 10:50:38 -04:00
Daniel Hritzkiv
b42d785afe
Start managing and importing gltf2 pbr materials
2017-09-11 10:50:38 -04:00
Daniel Hritzkiv
67eb3b0608
temporarily disable gltf exporting of animations and skins
2017-09-11 10:50:38 -04:00
Daniel Hritzkiv
39172feb3e
Start reading pbr materials
2017-09-11 10:50:37 -04:00
Daniel Hritzkiv
4d59dee5ea
Cache retrieved items via an original index map
2017-09-11 10:50:37 -04:00
Daniel Hritzkiv
47c7c3cf50
Disambiguate Get methods
2017-09-11 10:50:37 -04:00
Daniel Hritzkiv
f814acf33a
Update glTF2 Asset to use indexes
2017-09-11 10:50:37 -04:00
Daniel Hritzkiv
63d3655f1b
Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List
2017-09-11 10:50:36 -04:00
Jared Mulconry
3c1cda0b8c
Merge branch 'master' of github.com:assimp/assimp into issue_1065
2017-09-11 00:17:23 +10:00
Jared Mulconry
698cd5826d
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:16:26 +10:00
Jared Mulconry
e40cd6c13c
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:09:40 +10:00
Jared Mulconry
1167edaeca
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-11 00:09:35 +10:00
Jared Mulconry
6db0a63d6e
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:13:12 +10:00
Jared Mulconry
6e02bcd8d6
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:10:59 +10:00
Jared Mulconry
b7f1277175
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:07:37 +10:00
Jared Mulconry
98532b45bf
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 19:04:44 +10:00
Jared Mulconry
97b67d5cb5
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
2017-09-10 18:47:24 +10:00
Amit Cirt
2ec46cc188
fix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag
2017-09-09 19:04:15 +03:00
Kim Kulling
c143d2e02c
closes https://github.com/assimp/assimp/issues/1404 : set name with merged meshes for output mesh.
2017-09-07 20:30:17 +02:00
IOhannes m zmölnig
3de9bbb73d
fixed spelling error
2017-09-02 19:44:51 +02:00
Kim Kulling
b4da9c4f56
Fix review findings: remove unused includes
2017-08-31 11:30:31 +02:00
Kim Kulling
00e3b03c5b
closes https://github.com/assimp/assimp/issues/1406 : fix merge issue + improve 3MF-tests
2017-08-31 11:04:13 +02:00
Alexander Gessler
f8ef94095a
Update version check in FBX reader to check for version >= 7500 instead of exactly 7500.
2017-08-29 15:41:25 +02:00
Kim Kulling
7151cf117b
Merge branch 'master' of https://github.com/rickomax/assimp into rickomax-master
2017-08-25 16:47:08 +02:00
Kim Kulling
ce9c8a4efc
Merge pull request #1403 from kebby/fbx_anim_fix
...
FBX importer: Use actual min/max of anim keys when start/stop time is missing
2017-08-25 13:33:09 +02:00
Tammo Hinrichs
12a28d33ce
FBX importer: try a constant again (ll suffix this time)
2017-08-25 12:14:03 +02:00
Tammo Hinrichs
9a12b6ef0b
FBX importer: Back to INT64_MIN but include <stdint.h> also.
2017-08-25 11:17:07 +02:00
Kim Kulling
cac93ad0a8
Merge pull request #1400 from kebby/master
...
Collada importer: Add support for line strip primitives
2017-08-25 09:10:38 +02:00
Tammo Hinrichs
80489963a1
FBX importer: don't rely ont INT64_MIN / ..MAX macros
2017-08-24 17:18:54 +02:00
Tammo Hinrichs
7182f89a51
FBX importer: Use actual min/max of animation keyframes when start/stop time is missing
2017-08-24 14:40:53 +02:00
Tammo Hinrichs
92beee9924
Collada importer: Add support for line strip primitives
2017-08-23 17:52:53 +02:00
Eduardo Costa
2e5e56c000
Re-enabling PACK_STRUCT for MDL files.
...
When using this compiler:
Apple LLVM version 7.3.0 (clang-703.0.31)
Target: x86_64-apple-darwin15.4.0
Thread model: posix
The MDL::Frame is aligned in 8-byte boundaries instead of 4. This
generates this error when loading old Quake 1 MDL files:
ERROR: Failed to load file: Invalid MDL file. The file is too small
or contains invalid data (File: MDLLoader.cpp Line: 422)
It seems this error was introduced by commit
bd2af6591f
due to compilation warnings.
2017-08-21 09:27:40 +01:00
Arshia001
e0fc412e57
Fix OBJ discarding all material names if the material library is missing
2017-08-18 17:40:07 +04:30
Minmin Gong
b26fea4cf5
Fix compiling problems under VS2017.3.
...
1. WordIterator's operator== and operator!= must take const WordIterator& as parameter type.
2. OpenMP doesn't work with new two phase lookups. Need to disable twoPhase.
2017-08-14 21:51:59 -07:00
Kim Kulling
dab0985994
assert: remove assert with more than one statement and use only ai_assert.
2017-08-14 22:20:26 +02:00
Jeremy Abel
b1313b04b8
should be map, not set
2017-08-12 00:16:00 -04:00
Jeremy Abel
847e0291a0
changed a few leftover asserts to ai_assert
2017-08-12 00:13:24 -04:00
Daniel Hritzkiv
5b3b80cbc2
Formatting
2017-08-09 11:41:12 -04:00
Daniel Hritzkiv
83bfa61f8d
version in glb header is stored as uint32_t
...
Validator complains about `1` not being a valid version, however.
2017-08-09 11:09:43 -04:00
Daniel Hritzkiv
7a4a32625c
Ensure gltf asset version is printed as \d.0
2017-08-09 10:47:34 -04:00
Kim Kulling
7fd9c3dc98
§
2017-08-05 18:54:17 +02:00
Kim Kulling
8091e46e81
Merge pull request #1370 from 0xcccc/master
...
Fix android build issues
2017-08-03 16:40:32 +02:00
Kim Kulling
ba658e7813
ply-importer: fix creation of vertex attributes.
2017-08-03 14:57:48 +02:00
Kim Kulling
8478df7dbd
PlyLoader: fix vertex attribute lookup.
2017-08-02 14:24:53 +02:00
Knox Shao
def42bf624
Fix android build issues
2017-08-02 19:15:07 +08:00
Kim Kulling
81fd027860
closes https://github.com/assimp/assimp/issues/1270 : use HasTexture for
...
texture coordinates.
2017-08-02 11:35:57 +02:00
Kim Kulling
44e2ba541f
Merge pull request #1363 from jamesgk/gltf2
...
glTF2 export support
2017-07-29 15:08:52 +02:00
Kim Kulling
efa0aaf729
Merge pull request #1364 from pdaehne/master
...
X3D importer: Workaround for buggy Android NDK (issue #1361 )
2017-07-29 15:07:38 +02:00
7557fdbb72
Fix install for builds with MSVC compiler and NMake.
...
The CMake variable "MSVC" and the related versioned variables indicate that the
Visual Studio compiler is used but when using that compiler and the "NMake
Makefiles JOM" build generator the files it tried to install weren't in the
expected Debug folder.
2017-07-29 07:45:25 -04:00
Kim Kulling
3fe8c72f5d
new release: update to 4.0.1.
2017-07-28 22:27:36 +02:00
Kim Kulling
6c526d7c64
PPdPmdParser: fix compilation for clang.
2017-07-28 22:23:08 +02:00
jamesgk
5939d81138
glTF2: Use better mipmap filter defaults
2017-07-27 15:18:35 -07:00
Kim Kulling
d052b74b96
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-27 20:49:54 +02:00
Kim Kulling
a2bbf76cf4
StreamReader: fix out-of-range exception
2017-07-27 20:49:49 +02:00
Kim Kulling
d74306ad67
fix build
2017-07-27 13:07:26 +02:00
jamesgk
c91e9a94da
glTF2: export materials' normal maps
2017-07-26 14:42:22 -07:00
jamesgk
b7b17b03ec
glTF2: use opacity for diffuse alpha + alphaMode
...
The "transparency" attribute is unused in glTF2.
2017-07-26 14:39:35 -07:00
jamesgk
acf8c54e55
glTF2: Fix animation export
2017-07-26 14:20:53 -07:00
Patrick Dähne
16ed8861eb
X3D importer: Workaround for buggy Android NDK (issue #1361 )
2017-07-26 14:14:11 +02:00
jamesgk
bb55246c18
Export glTF 2
2017-07-25 18:05:18 -07:00
jamesgk
d7cbbaf23e
Compile with glTF2 export option (currently same as glTF1 output)
2017-07-25 17:34:03 -07:00
jamesgk
38626d4260
glTF: start fork of files used in export, for glTF2
2017-07-25 17:34:03 -07:00
Kim Kulling
4dc2cd8442
Profiler: fix invalid using statement.
2017-07-25 08:54:29 +02:00
Kim Kulling
2cb1a9efc6
Profiler: add a unittest.
2017-07-25 00:00:43 +02:00
Alexander Gessler
96cb3f7140
Merge pull request #1359 from sacereda/profilerLogging
...
Elapsed seconds not shown correctly
2017-07-23 01:56:22 +02:00
Sergio Acereda
6429502fc5
Elapsed seconds not shown correctly
2017-07-22 23:31:10 +02:00
Sergio Acereda
8606ec6060
Low performance in OptimizeMeshesProcess::ProcessNode with huge number of aiMeshes
2017-07-22 23:28:55 +02:00
rickomax
147541ab7f
Complementing last fix
...
Complementing last fix
2017-07-19 19:04:10 -03:00
rickomax
3d4b54f8fc
Fixed FBX 7500 Binary reading
...
Seems that all FBX 7.5 Binary files uses 32 bits adresses. The code now is taking this in consideration. This commit fixes the https://github.com/assimp/assimp/issues/838 issue.
2017-07-19 19:00:53 -03:00
Kim Kulling
3859cd692f
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-18 19:02:47 +02:00
Kim Kulling
5e98898dca
Update version.
2017-07-18 19:02:08 +02:00
Kim Kulling
a895808959
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-18 17:03:45 +02:00
Kim Kulling
4361262029
PlyLoader: fix out of bound access.
2017-07-18 17:02:21 +02:00
Madrich
80acc1f241
Fix Collada export image tag
...
Fix compiler double issues
2017-07-17 09:42:26 +02:00
Kim Kulling
3346fb517f
fix compiler warnings.
2017-07-16 01:02:33 +02:00
rickomax
328646f1d1
Merge branch 'master' of https://github.com/assimp/assimp
2017-07-15 11:22:14 -03:00
Kim Kulling
c9d18ebe1f
Merge pull request #1345 from jamesgk/master
...
Use unique node names when loading Collada files
2017-07-15 11:08:59 +02:00
Kim Kulling
bd7fdfeeca
Merge pull request #1338 from pdaehne/master
...
X3D importer: Support for binary X3D files
2017-07-15 11:08:08 +02:00
rickomax
c86013b08d
Fixed many FBX bugs
...
Fixed a bug where FBX loader won´t load embedded textures that don´t have the Content data filled. Some FBX files only fill this data once, so any embedded texture with the same source filename, should use the pre-loaded data.
Fixed another bug where FBX Texture "Filename" field came different than on some files than the one defined by the code. One suggestion is load all properties by the case-insensitive function created.
Added the "AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" flag to tell the importer to load embedded texture data from already loaded ones.
2017-07-15 00:27:33 -03:00
jamesgk
727cffdfb4
Use unique node names when loading Collada files
2017-07-14 11:54:37 -07:00
Patrick Dähne
0a1a4a0b96
X3D importer: Fixed iterator on MSVC 2015
2017-07-12 20:48:49 +02:00
Patrick Dähne
c1442c63cf
X3D importer: Fixed problems with auto, override and regex on older compilers
2017-07-12 19:57:10 +02:00
Patrick Dähne
e97ba7aec2
X3D importer: Fixed missing header file
2017-07-11 21:32:47 +02:00
Patrick Dähne
8959bcb847
X3D importer: Fixed path handling
2017-07-11 19:41:24 +02:00
Patrick Dähne
457dff1bf1
X3D importer: Implemented support for binary X3D files
2017-07-11 19:28:40 +02:00
Leo Terziman
1026264c64
Fixed bug in assbin metadata export when no metadata are defined
2017-07-11 18:15:56 +02:00
Leo Terziman
6c6a8fe671
Added support for metadata in assbin format
2017-07-11 17:39:36 +02:00
Kim Kulling
e66dc5c9ad
Collada: add workaround to deal with polygon with holes .
2017-07-11 10:42:10 +02:00
Kim Kulling
d40b6089e8
Fix compiler warnings + one review finding.
2017-07-09 22:17:35 +02:00
Kim Kulling
647b59b7fa
Merge pull request #1334 from assimp/x_deals_with_lines
...
X-Importer: make it deal with lines.
2017-07-07 18:38:51 +02:00
Kim Kulling
af216ec294
X-Importer: make it deal with lines.
2017-07-07 16:34:08 +02:00
Minmin Gong
4efe7bfd41
Remove std functions deprecated by C++11.
2017-07-04 17:01:03 -07:00
Kim Kulling
ac37e4ddba
closes https://github.com/assimp/assimp/issues/1320 : check if all
...
exporters are disabled.
2017-06-28 22:13:49 +02:00
Kim Kulling
12908506ab
Merge pull request #1322 from assimp/issue_1319
...
closes https://github.com/assimp/assimp/issues/1319 : fix build without
2017-06-28 22:08:44 +02:00
Kim Kulling
f30fd58494
fix review findings.,
2017-06-28 22:08:20 +02:00
Kim Kulling
27b7b44c9d
fix unittests.
2017-06-28 20:11:13 +02:00
Vitaly Kovalev
6891db99af
Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes
...
Signed-off-by: Vitaly Kovalev <vkovalev@gkmsoft.ru>
2017-06-27 13:52:43 +03:00
Kim Kulling
a408b92279
closes https://github.com/assimp/assimp/issues/1319 : fix build without
...
3DS.
2017-06-26 22:01:15 +02:00
Kim Kulling
9ffc1a97c1
Merge pull request #1321 from pdaehne/master
...
Fixes for X3DImporter/X3DExporter
2017-06-26 21:04:25 +02:00
Patrick Dähne
d8cac6eb24
Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet
2017-06-26 15:25:15 +02:00
Kim Kulling
afb2f3036e
OpenDDLParser: latest greatest.
2017-06-25 13:21:36 +02:00
Patrick Dähne
aaa476cb10
X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags
2017-06-23 11:59:14 +02:00
Patrick Dähne
3c8a4a5abb
X3D Exporter: fixed missing attributes
2017-06-22 20:48:33 +02:00
Patrick Dähne
855589d2a1
X3D importer: Fixed import of normals for the single index / normal per vertex case
2017-06-22 18:54:03 +02:00
Patrick Dähne
6118f77d3b
X3D importer: Fixed handling of inlined files
2017-06-22 16:29:26 +02:00
Patrick Dähne
840ed9dd34
X3D importer: fixed whitespace handling (issue #1202 )
2017-06-22 15:05:23 +02:00
Kim Kulling
6aca0f86b4
Merge pull request #1314 from jamesgk/gltf-export
...
GLTF exporter: ensure buffer view byte offsets are correctly aligned
2017-06-22 08:31:07 +02:00
Kim Kulling
735e64309b
LWO: use forward declaration in header.
2017-06-21 23:06:53 +02:00
Kim Kulling
bd2af6591f
Fix compiler warnings.
2017-06-21 23:02:46 +02:00
jamesgk
7e45c63901
GLTF exporter: ensure buffer view byte offsets are correctly aligned
2017-06-21 09:58:24 -07:00
Kim Kulling
439409bef2
SceneCombiner: fix the build.
2017-06-21 15:24:06 +02:00
Kim Kulling
b727420cf2
SceneCOmbiner: Fix the build.
2017-06-21 14:31:37 +02:00
Kim Kulling
612ac234c5
SceneCombiner: move header for scenecombiner to public folder.
2017-06-21 14:21:16 +02:00
Kim Kulling
d3140a68ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-06-17 21:17:39 +02:00
Kim Kulling
64cbc69337
remove dead code.
2017-06-17 20:36:59 +02:00
Kim Kulling
d7e13e67c4
Utf8: integrate new lib.
2017-06-17 19:38:47 +02:00
Kim Kulling
6e1034996e
UTF8Encoding: introduce new lib.
2017-06-16 16:43:39 +02:00
Kim Kulling
79818145a7
ObjImporter: remove dead code.
2017-06-15 20:24:10 +02:00
Kim Kulling
7977ded078
Merge pull request #1300 from assimp/ply_export_test
...
ply-exporter: add unittest.
2017-06-09 23:02:30 +02:00
Leo Terziman
4974c99288
Merge remote-tracking branch 'github/master' into contrib
2017-06-08 11:01:11 +02:00
Kim Kulling
548c09271b
ply-exporter: add unittest.
2017-06-07 14:06:38 +02:00
Kim Kulling
7f8839b1f4
Merge pull request #1293 from arkeon7/PLY_refactoring
...
PLYImporter refactoring
2017-06-06 11:55:37 +02:00
Kim Kulling
19d59b630b
SpatialSort: use much easier reabability.
2017-06-06 11:37:02 +02:00
arkeon
44a9f80e40
Ply importer with correction from last general trunk merge
2017-06-02 22:19:41 +02:00
Arkeon
f84851e893
PLYImporter: - optimize memory and speed on ply importer / change parser to use a file stream - manage texture path in ply import - manage texture coords on faces in ply import - correction on point cloud faces generation
...
IFC :
- update poly2tri to avoid crash on some IFC files
Collada :
- manage missing texture reference in collada import
2017-06-02 13:48:57 +02:00
Leo Terziman
ca5ac0b532
Fixed bug where IFC models with multiple IFCSite only loaded 1 site instead of the complete model
2017-06-01 09:47:50 +02:00
Kim Kulling
9e98097aae
closes https://github.com/assimp/assimp/issues/1244 : log error for
...
overflow.
2017-05-31 21:43:41 +02:00
Kim Kulling
8c6f18ea2a
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-31 21:37:42 +02:00
Kim Kulling
1207a81b70
ObjImporter: remove dead code.
2017-05-31 21:37:16 +02:00
Kim Kulling
4dc7940ac5
ObjImporter: fix dead code.
2017-05-31 20:28:00 +02:00
Kim Kulling
e501cc17c2
Merge branch 'obj_with_linebreaks' of https://github.com/assimp/assimp into obj_with_linebreaks
2017-05-31 20:18:39 +02:00
Kim Kulling
82380084c5
ObjImporter: next try for multiple line stuff.
2017-05-31 16:36:08 +02:00
Kim Kulling
813f3b8248
ObjLoader: improve performance of obj-import.
2017-05-30 21:10:33 +02:00
Kim Kulling
c121cec68a
Obj-Importer: introduce working test for line breaks.
2017-05-29 22:00:13 +02:00
Kim Kulling
d30b1e585c
Tests how o adress this topic.
2017-05-28 22:25:06 +02:00
Kim Kulling
8cc80a3d9c
ObjImporter: fix the build.
2017-05-28 14:14:22 +02:00
Kim Kulling
3d99892b94
Opj-Importer: fix coverity finding.
2017-05-27 19:37:28 +02:00
Kim Kulling
e93355c8b4
Build: fix some compiler warnings for g++.
2017-05-26 09:18:23 +02:00
Kim Kulling
1b4cbcc6ad
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-25 22:40:36 +02:00
Kim Kulling
fb33199d99
GLTFImporter: exclude headers from build whem no_glft_importer is
...
defined.
2017-05-25 22:34:45 +02:00
Kim Kulling
b7d4b69e0d
X3DImporter: fix the build.
2017-05-24 22:35:35 +02:00
Kim Kulling
3c370c83b9
MDLImporter: remove dead code.
2017-05-24 21:18:51 +02:00
Kim Kulling
18b0316d52
X3DImporter: fix coverity finding ( missing comma ).
2017-05-24 21:15:55 +02:00
Kim Kulling
ec496a5833
X3DImporter: fix coverity finding.
2017-05-24 21:04:35 +02:00
Kim Kulling
3d5e94477f
Merge pull request #1272 from assimp/issue-1262
...
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-19 23:13:40 +02:00
Kim Kulling
febf94f6aa
Merge pull request #1212 from aoowweenn/umw_dev
...
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
Kim Kulling
eba06f0c8b
Merge pull request #1275 from ab4d/master
...
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-17 11:34:35 +02:00
Kim Kulling
1daad40b30
Merge branch 'master' into issue-1262
2017-05-17 10:20:45 +02:00
Kim Kulling
04f908aa4c
Obj-Exporter: fix build.
2017-05-17 10:13:07 +02:00
Kim Kulling
60c54cbf59
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-17 09:25:30 +02:00
Kim Kulling
2f649833d5
LWOLoader: fix link in loader description.
2017-05-17 09:25:07 +02:00
Andrej
331bbacf3d
Fixed build error in ObjExporter :: GetMaterialLibFileName
2017-05-16 22:18:47 +02:00
Andrej
2b89a3cffc
Using single quote for one character parameter in find_last_of method call
2017-05-16 21:56:49 +02:00
Kim Kulling
3f68278ea0
Merge branch 'master' into issue-1262
2017-05-16 21:53:35 +02:00
Kim Kulling
a45b5cdfb5
OpenGEX: fix invalid handling with color4 token.
2017-05-16 21:45:23 +02:00
Kim Kulling
542fe31a94
closes https://github.com/assimp/assimp/issues/1262 : fix .
2017-05-16 21:07:20 +02:00
Andrej
c3974512e4
Improved obj exporter to export materials to fileName.mtl instead of fileName.obj.mtl
2017-05-16 15:55:40 +02:00
Andrej
04dbdca329
Revert "Creating fileName.mtl file instead of fileName.obj.mtl"
...
This reverts commit 5757980ea5
.
2017-05-16 15:47:57 +02:00
Andrej
5757980ea5
Creating fileName.mtl file instead of fileName.obj.mtl
2017-05-16 15:34:50 +02:00
Kim Kulling
ff7624f06f
Merge pull request #1268 from VennGrayDog/b1
...
Add TokensForSearch in BlenderLoader
2017-05-15 21:37:26 +02:00
Kim Kulling
7e011c92f0
Merge pull request #1269 from assimp/issue_1266
...
closes https://github.com/assimp/assimp/issues/1266 : fix wrong delete
2017-05-15 21:33:42 +02:00
Kim Kulling
428a4cdd71
SpatialSort: use std::vector::clear().
2017-05-15 19:41:08 +02:00
Kim Kulling
e5657bf0c5
closes https://github.com/assimp/assimp/issues/1266 : fix wrong delete
...
Instead of delete delete [] must be used.
2017-05-15 09:55:39 +02:00
Alexander Gessler
ab45dc79fa
Merge pull request #1263 from jamesgk/gltf-export
...
GLTF exporter: convert animation time from ticks to seconds
2017-05-15 09:12:57 +02:00
VennGrayDog
0b34089df0
Added TokensForSearch in BlenderLoader to allow CanRead return true for in-memory files.
2017-05-15 02:34:53 -04:00
Alexander Gessler
24790398b9
Merge pull request #1264 from smokris/master
...
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'
2017-05-15 00:39:36 +02:00
VennGrayDog
3d05df2d3e
Fix location of config.h
2017-05-14 15:09:31 -04:00
Steve Mokris
2e455b78c8
Add support for reading texture coordinates from PLY meshes with properties named 'texture_u' and 'texture_v'.
2017-05-11 15:21:37 -04:00
jamesgk
c33039d682
GLTF exporter: convert animation time from ticks to seconds
2017-05-11 11:04:23 -07:00
Kim Kulling
9b2671b280
Merge pull request #1248 from NcJie/fixed-android-atof-not-found-issue
...
Fixed no member named 'atop' in global namespace issue for Android ND…
2017-05-11 10:55:59 +02:00
Kim Kulling
ab19c5e3f7
Merge pull request #1258 from jamesgk/gltf-export
...
GLTF exporter: ensure animation accessors have same count
2017-05-11 10:46:06 +02:00
Kim Kulling
f6a8be5bac
AMPImporter: fix coverity findings.
2017-05-10 19:34:50 +02:00
Kim Kulling
5411f769e8
STEPFile: fix coverity findings.
2017-05-10 18:50:51 +02:00
Kim Kulling
d36fbfbb8b
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-10 18:30:36 +02:00
Kim Kulling
0300574b8b
AMFImporter: fix coverity findings.
2017-05-10 18:29:42 +02:00
Kim Kulling
b8747fffca
Merge pull request #1259 from Squareys/fix-cmake-install
...
[One-Line-Change] Fix config.h not being found during cmake --build . --target install
2017-05-10 09:37:04 +02:00
Kim Kulling
9ef1a4fae0
X3D: fix coverity findings.
2017-05-09 22:54:04 +02:00
Squareys
cfb867b5e7
Fix config.h not being found during install
2017-05-09 21:51:49 +02:00
Kim Kulling
eb828a3b71
X3DImporter: fix coverity findings.
2017-05-09 21:35:21 +02:00
Kim Kulling
4a5c483ac4
AMFImporter: make test against nullptr dereferencing meaningful.
2017-05-09 21:03:20 +02:00
Kim Kulling
f77e27ca19
ColladaExporter: remove self assignment.
2017-05-09 20:59:01 +02:00
Kim Kulling
03d97b23ec
Coverity: fix finding in COBLoader.
2017-05-09 20:15:30 +02:00
Kim Kulling
a2b8d66a86
Update license info.
2017-05-09 19:57:36 +02:00
jamesgk
36f4fb8826
GLTF exporter: ensure animation accessors have same count
2017-05-08 14:45:26 -07:00
Kim Kulling
186629b372
SpatialSort: use std::vector::resize( 0 ) to improve readability.
2017-05-08 21:57:08 +02:00
Kim Kulling
65653edf88
Merge branch 'master' of https://github.com/assimp/assimp
2017-05-08 21:29:07 +02:00
Kim Kulling
5289954e27
Fix review findings.
2017-05-06 20:57:17 +02:00
Kim Kulling
98100d8cab
Blender-Importer: fix coverity findings.
2017-05-06 11:14:04 +02:00
Kim Kulling
39e048dea6
Merge pull request #1254 from samitc/master
...
Improve performance of obj line break
2017-05-04 19:53:51 +02:00
Kim Kulling
7f014ea889
Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri
...
Fix incorrect truncation of binary URI in glTF exporter
2017-05-04 19:52:18 +02:00
John Senneker
d6e8fd34f0
Search for .gltf extension at end of file name for buffer prefix.
...
Previously the code assumed that there would be only one '.' in the file
name, which is not a valid assumption. This patch fixes this issue, but
still assumes that the only occurrence of the string ".gltf" is at the
end of the file name. In particular, it will fail on a file name like
"/path/to/a.gltf/my_gltf.wrong_extension".
2017-05-03 15:11:31 -04:00
Amit Cirt
dd1d10407e
make array non static to support multithreaded
2017-05-01 16:54:07 +03:00
Amit Cirt
8b4e066ca5
Improve performance of obj line break
2017-05-01 16:32:49 +03:00
rdb
0069552183
Fix static init ordering bug in OpenGEX importer
2017-05-01 15:11:22 +02:00
Helio Chissini de Castro
4a0171bd82
- Apply mechanism to decide use for IrrXML external or internal
...
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.
Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists
Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
Cong Jie
aff391c681
Fixed no member named 'atop' in global namespace issue for Android NDK compilation
2017-04-27 17:15:03 +09:00
Tyson Grant Nottingham
8445db2cd9
Set UVW index material properties for OBJ files.
2017-04-21 01:09:26 -07:00
Andy Maloney
b64882f4c7
Fix spelling
2017-04-11 16:33:13 -04:00
Amit Cirt
9fc7f72b55
fix line breakes in obj files
2017-04-11 17:16:18 +03:00
Guillaume Bittoun
0e3956caf1
Compilation fix: Removing the vector4 headers from code/CMakeLists.txt
2017-04-08 23:25:39 +02:00
Kim Kulling
2825d2daf8
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-07 17:50:20 +02:00
Kim Kulling
38fab5ae8e
doc updatedoc update
2017-04-07 17:46:53 +02:00
Maarten Heremans
8f3aaa88f9
Fixed compiler error on clang 4.0 running on OSX
...
glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
(aka 'aiVector3t<float> *') and 'int')
if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
2017-04-03 11:07:43 +02:00
Andre Schulz
0f6782df27
Fix PDB file installation in RelWithDebInfo configuration
2017-04-01 16:03:01 +02:00
Kim Kulling
6d71e4d5d7
Config.h.in: fix typo.
2017-03-29 21:08:40 +02:00
Kim Kulling
1ab85f16ff
Merge pull request #1217 from Kai-W/master
...
Added ComponentType Unsigned int and Error handling
2017-03-28 17:06:06 +02:00
Kim Kulling
8accf5b386
3MF: reformattings.
2017-03-28 00:35:56 +02:00
Kai Westerkamp
6c73cc8aff
Added ComponentType Unsigned int and Error handling
...
Part of GLTF 2.0 changes
2017-03-27 17:22:49 +02:00
aoowweenn
7bd3242563
comment out override specifier
2017-03-27 22:49:58 +08:00
aoowweenn
51dae22828
merge master and adjust assimp/DefaultIOSystem.h
2017-03-27 22:35:19 +08:00
aoowweenn
8cd0d3b3c7
change std::make_unique to mmd::make_unique
2017-03-27 22:16:19 +08:00
aoowweenn
ccf2bce2b0
correct offset matrix
2017-03-24 15:45:50 +08:00
aoowweenn
59b48fb960
finish skin controller
2017-03-24 14:39:34 +08:00
aoowweenn
968612fea1
testing2
2017-03-24 12:04:40 +08:00
aoowweenn
314bb451bb
testing weights, still strange
2017-03-23 16:30:01 +08:00
aoowweenn
f10f2f5814
Almost finish vertex weghts
2017-03-23 04:33:53 +08:00
Kim Kulling
1c525a9365
Merge pull request #1208 from terziman/master
...
Added parameters to IFC importer to control tessellation
2017-03-22 20:08:21 +01:00
aoowweenn
845d206959
Fill in mParent for each node in Assbin Loader
2017-03-22 21:11:17 +08:00
aoowweenn
5bf974ae3b
keep writing dae skinning
2017-03-22 17:06:55 +08:00
aoowweenn
e5a3038abd
try to fill in vertex weights to dae exportor
2017-03-21 16:21:49 +08:00
rmitton
d1c7d905e8
Fixed infinite loop on non-manifold geometry
...
Geometry that had strange non-manifold faces could cause the normal
calculation to enter an infinite loop. Instead we now correctly detect
which faces to scan over.
2017-03-19 13:46:23 -07:00
rmitton
209e972762
Fixed faceted normals in SIB importer.
2017-03-18 14:52:48 -07:00
Leo Terziman
bf2e2f7537
Extended support for tessellation parameter to more IFC shapes
2017-03-17 14:55:18 +01:00
Leo Terziman
d4ead31c18
Merge remote-tracking branch 'github/master' into contrib
2017-03-17 12:13:52 +01:00
Leo Terziman
9ef234b842
Added parameter to control cylindrical shapes tessellation
...
+ renamed smoothing angle parameter for better user understanding
2017-03-17 11:58:50 +01:00
Leo Terziman
fff0e886a1
Fixed bug in IFC openings when curmesh.vertcnt is empty
2017-03-17 11:53:36 +01:00
aoowweenn
0eecff74d8
correct node hierarchy
2017-03-16 01:25:53 +08:00
Kim Kulling
2cd6c3d755
Closes https://github.com/assimp/assimp/issues/1128 : do not use non
...
verbose format flag for import.
2017-03-14 19:01:41 +01:00
aoowweenn
0231af4343
skeleton almost done
2017-03-14 02:01:26 +08:00
Kim Kulling
bb7f387bcf
Merge branch 'master' of https://github.com/assimp/assimp
2017-03-11 22:13:48 +01:00
Kim Kulling
1c6145b39e
Merge branch 'fix-include-api' of https://github.com/Lugdunum3D/assimp into Lugdunum3D-fix-include-api
2017-03-11 18:19:36 +01:00
Kim Kulling
b47bfeb0d7
StringUtils: add the right missing header.
2017-03-11 17:25:34 +01:00
Kim Kulling
6179e22749
StringUtils: add missing include for VS2012 & 2013
2017-03-11 11:34:23 +01:00
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
aoowweenn
2d3dd1d40f
use SkeletonMeshBuilder to show bone positions.
2017-03-10 17:15:01 +08:00
Kim Kulling
b725d7dbf5
Merge branch 'cleanup_includes' of https://github.com/assimp/assimp into cleanup_includes
2017-03-08 10:27:57 +01:00
Kim Kulling
3bd9efa82c
Cleanup_includes: fix linux build.
2017-03-08 09:55:44 +01:00
aoowweenn
c0c480a4cb
fixup! merge master and mv FindDevIL to cmake-modules
2017-03-05 23:36:36 +08:00
aoowweenn
83db3fc084
fixup! remove dependency of ICU library
2017-03-05 23:14:21 +08:00
aoowweenn
7226d73682
merge master and mv FindDevIL to cmake-modules
2017-03-05 23:07:06 +08:00
aoowweenn
34906071fc
remove dependency of ICU library
2017-03-05 22:59:53 +08:00
Kim Kulling
8d27945619
Merge branch 'master' into cleanup_includes
2017-03-05 15:15:29 +01:00
Kim Kulling
e6dcad384a
Fix missing includes.
2017-03-05 15:05:40 +01:00
aoowweenn
0c0ca403b5
Convert to OpenGL space by three processes.
2017-03-05 20:40:41 +08:00
aoowweenn
7a25f5ac25
finish UV texture
2017-03-02 23:16:29 +08:00
Shin-ya Murakami
ffc95162ec
fix for FreeBSD
2017-03-01 16:30:03 +09:00
aoowweenn
e89c29a9cc
finish vertex
2017-03-01 13:52:46 +08: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
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
Kim Kulling
f312d8709e
More cleanup
2017-02-28 16:37:07 +01:00
Antoine Bolvy
5dd1bb9d6c
Export DefaultIOSystem and move it with DefaultIOStream to include/ instead of code/
2017-02-28 11:44:04 +09:00
Antoine Bolvy
d77989088c
Allow to enable importers in a whitelist manner
2017-02-28 11:42:53 +09:00
Antoine Bolvy
4495162f5f
Fix new lines problem
2017-02-27 18:34:04 -05: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
UMW
e80d3aa9d4
finish mesh creation
2017-02-27 21:02:58 +08:00
Alexander Stillich
0700dfe711
Fixed parsing ASE MESH_CFACE
2017-02-25 23:30:41 +01:00
aoowweenn
4045466f73
pass through but panic
2017-02-24 08:35:15 +08:00
Kim Kulling
5e2c846ca0
Remove unused header.
2017-02-22 17:22:23 +01:00
Kim Kulling
ef540f46a3
Remove unused headers.
2017-02-22 17:20:26 +01: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
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
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
Alexander Gessler
28a78ca460
Merge pull request #1156 from elect86/patch-7
...
Update ColladaParser.cpp
2017-01-28 13:28:47 +01:00
Alexander Gessler
16c50df071
Merge pull request #1154 from Kvalme/master
...
Fix for COLLADA export texture mapping #1084
2017-01-28 13:28:31 +01:00
Giuseppe Barbieri
ca47232101
Update ColladaParser.cpp
...
Fixed indent
2017-01-28 11:54:11 +01:00
Giuseppe Barbieri
c3c637be37
Update ColladaParser.cpp
2017-01-28 08:02:02 +01:00
Denis Biryukov
36e53b75fa
Issue#1084 - Fix collada export. Don't duplicate TEXCOORD/NORMALS/COLORS in <vertices> and <polylist>
2017-01-27 14:29:18 +03:00
Giuseppe Barbieri
0434f5a5ff
Update ColladaParser.cpp
2017-01-26 17:29:31 +01:00
Giuseppe Barbieri
85e2788e50
Update ColladaParser.cpp
2017-01-26 17:28:39 +01:00
Giuseppe Barbieri
3323d42ad6
Update PlyLoader.cpp
2017-01-20 19:30:36 +01:00
Giuseppe Barbieri
821e9fb0b8
Update PlyLoader.cpp
2017-01-19 22:43:38 +01:00
Kim Kulling
57975cb007
Merge pull request #1145 from elect86/patch-3
...
typo
2017-01-19 18:54:06 +01:00
Kim Kulling
82b1769759
Fix new call.
2017-01-19 13:38:06 +01:00
Kim Kulling
35b95ba710
API: Fix build
2017-01-19 11:41:43 +01:00
Kim Kulling
ebd04041ab
Merge branch 'master' of https://github.com/assimp/assimp
2017-01-19 11:19:02 +01:00
Kim Kulling
f121e2eb66
Fixes https://github.com/assimp/assimp/issues/1143 : fix build.
2017-01-19 11:18:33 +01:00
Giuseppe Barbieri
11e1901922
typo
2017-01-18 21:56:33 +01:00
Kim Kulling
45eb13719e
fixes https://github.com/assimp/assimp/issues/1141 : fix typo.
2017-01-17 22:05:45 +01:00
Giuseppe Barbieri
54757a47a8
Update PlyLoader.cpp
...
Sorry, I was wrong
2017-01-16 21:09:38 +01:00
Giuseppe Barbieri
f14e433dd9
Update PlyLoader.cpp
...
Typo
2017-01-16 21:06:05 +01:00
Giuseppe Barbieri
f438652df8
Update PlyLoader.cpp
2017-01-16 21:04:24 +01:00
Giuseppe Barbieri
342824303c
Update PlyLoader.cpp
2017-01-16 21:01:49 +01:00
Kim Kulling
f16387e5a7
Merge pull request #1135 from hblasins/objExtension
...
Added support for parameters Ni and Tf in OBJ/MTL file format.
2017-01-16 20:22:41 +01:00
Henryk Blasinski
17cae8ac5a
Added support for parameters Ni and Tf in OBJ/MTL file format.
2017-01-12 17:11:17 -08:00
Antti Määttä
9621dff027
Morph animation support for collada
2017-01-12 13:41:32 +02:00
Kim Kulling
a97a4fb03b
Merge pull request #1131 from Sibras/master
...
FBX: Fix light and camera transformations and add some missing properties.
2017-01-10 17:48:35 +01:00
Andy Maloney
6483b10997
{D3MF} Move #ifndefs before #includes
2017-01-10 09:53:11 -05:00
Matt Oliver
2f2fe92b62
FBX: Add additional material properties.
...
Currently there isnt a AI_MATKEY_DISPLACEMENTSCALING define but fbx supports the value so for the moment it is just manually specified.
2017-01-09 17:03:38 +11:00
Matt Oliver
5be2351dc6
FBX: Correct camera position and clip planes.
...
Fbx cameras are stored in the scene graph as well as having separate camera properties.
The separate camera properties have a camera position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
camera being transformed twice. Since the scene graph contains all the relevant
transformations the camera position and direction can just use default values. Fbx
specifies cameras along the positive x axis so the default camera values have a up and
direction set accordingly.
Fixes : #807 #643
2017-01-09 17:03:32 +11:00
Matt Oliver
b34a552fb7
FBX: Add correct light locations and falloff values.
...
Fbx lights are stored in the scene graph as well as having separate light properties.
The separate light properties have a light position and direction that is already fully
transformed based on its position in the scene graph so this results in the assimp
light being transformed twice. Since the scene graph contains all the relevant
transformations the light position and direction can just use default values. Fbx
specifies lights along the negative y axis so the default light values have a up and
direction set accordingly.
The DecayStart value specifies the distance from the light that the light intensity
will drop to half. Using the default assimp falloff equation of f=1/c+lr+qr^2 then
the falloff coefficients can be calculated for either c,l or q accordingly by setting
r=DecayStart and f=0.5.
Fixes #851
2017-01-09 17:03:25 +11:00
Tan Li Boon
c3d40810b5
Cleared majority of codepage warnings in Visual Studio 14.
2017-01-09 00:41:10 +08:00
Kim Kulling
dfa3409de9
Blender: add missing constructors.
2017-01-05 20:23:02 +01:00
Kim Kulling
58af9efdc9
FBX: fix compiler warning: remove unused local function.
2016-12-31 16:09:17 +01:00
Kim Kulling
6dfff37d8f
SubDivision: fix compiler warning: unused variable.
2016-12-31 16:07:11 +01:00
Kim Kulling
b934331985
closes https://github.com/assimp/assimp/issues/1111 : add warning when
...
detecting invalid mat definition.
2016-12-19 20:44:00 +01:00
Kim Kulling
bd0449ea79
closes assimp/assimp/issues/1101: copy aiTexture type declaration instead
...
of using decltype for declaration to fix iOS build.
2016-12-14 21:42:01 +01:00
Kim Kulling
5caa232b15
Merge pull request #1109 from assimp/issue_899
...
closes assimp/assimp/issues/899: fix parsing of texture name.
2016-12-12 23:42:24 +01:00
Kim Kulling
df03c657bf
Merge pull request #1106 from elect86/master
...
OBJ, added the index to handle clamp option for each cubemap texture
2016-12-12 21:22:56 +01:00
Kim Kulling
859d15d3a0
closes assimp/assimp/issues/899: fix parsing of texture name.
2016-12-12 21:22:03 +01:00
Giuseppe Barbieri
5127e18da6
Update PlyParser.h
...
Typo
2016-12-11 13:01:26 +01:00
Giuseppe Barbieri
b1d5390413
Update ObjFileImporter.cpp
2016-12-09 19:31:07 +01:00
Giuseppe Barbieri
83896f18b3
Update ObjFileImporter.h
2016-12-09 19:27:01 +01:00
Kim Kulling
b1e89e3636
closes https://github.com/assimp/assimp/issues/1098 : add license info.
2016-12-08 20:07:56 +01:00
Kim Kulling
d24ba9a4bb
Merge pull request #1099 from asmaloney/warning_fixes
...
Fixes two type warnings and a missing case option
2016-12-08 17:49:36 +01:00
Andy Maloney
0c7aac02eb
Fixes spelling in comments
2016-12-07 21:31:51 -05:00
Andy Maloney
3c5f1578c2
Fixes two type warnings and a missing case option
2016-12-07 20:30:45 -05:00
Kim Kulling
a3a1c82380
Merge pull request #1087 from elect86/patch-4
...
Update ObjFileMtlImporter.cpp
2016-12-07 20:16:57 +01:00
Giuseppe Barbieri
ff73821cea
Update ObjFileMtlImporter.cpp
2016-12-07 19:52:03 +01:00
Mika Rautio
8929760b3e
Add better MinGW support for IFCReaderGen big objects
2016-12-05 12:57:05 +02:00
Mika Rautio
f9cce7f59c
MinGW __stat64 support depends on MSVCRT version
2016-12-05 12:33:48 +02:00
Mika Rautio
17fc3eea8f
Do not build exporter if its importer is not built
2016-12-05 11:12:46 +02:00
Kim Kulling
769805efd0
Merge branch 'master' into issue_1089
2016-12-02 14:31:18 +01:00
Kim Kulling
dcfc696e86
FBX: woraround for issue 1089.
2016-12-02 11:32:34 +01:00
Kim Kulling
c46ac37c9b
Merge pull request #1085 from elect86/patch-3
...
Update ObjFileParser.cpp
2016-12-01 17:56:20 +01:00
Kim Kulling
c80777f13f
Enable SIBImport test.
2016-11-30 17:49:22 +01:00
Kim Kulling
12ea506504
Enable unittest for apacity bug for dae files.
2016-11-30 15:05:06 +01:00
Kim Kulling
c2deb3e15f
BaseIMporter: fix review findings.
2016-11-30 15:03:32 +01:00
Kim Kulling
a80d7346d8
AMFImporter: fix some review findings.
2016-11-30 15:03:02 +01:00
Kim Kulling
f2817587ab
AMFImporter: use correct unique token to identify schema for AMF-assets.
2016-11-29 19:50:40 +01:00
Kim Kulling
43e1cae2ea
Fix appveyor build: disable bugger mingw config.
2016-11-28 10:40:10 +01:00
Giuseppe Barbieri
a2c82051d4
Update ObjFileMtlImporter.cpp
...
Fixed grammar
2016-11-27 22:44:03 +01:00
Giuseppe Barbieri
fe7863d22f
Update ObjFileParser.cpp
...
Fixed error message
2016-11-27 20:32:59 +01:00
Kim Kulling
181f78687f
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-27 16:44:03 +01:00
Kim Kulling
8272514b83
ObjImporter: use pre increment as a micro optimization.
2016-11-27 16:43:25 +01:00
Kim Kulling
8bfe465d03
Merge pull request #1083 from jaredmulconry/implementation_warning_fix
...
Fixed warnings on MSVC14 x64 (Issue #1065 )
2016-11-27 16:40:45 +01:00
Kim Kulling
1d9f91946f
Merge pull request #1080 from johnmaf/bugfix/collada-transparency
...
Properly export COLLADA <transparency> value
2016-11-27 16:30:59 +01:00
Jared Mulconry
cf151b77d8
Fixed build warnings on MSVC14 x64 in the XGL loader.
2016-11-27 16:03:25 +11:00
Jared Mulconry
7415289649
Fixed build warnings on MSVC14 x64 in X file importer.
2016-11-27 16:02:21 +11:00
Jared Mulconry
cbfbf2a256
Fixed build warnings on MSVC14 x64 in the X3D format sources.
2016-11-27 15:54:22 +11:00
Jared Mulconry
f22d78a3d3
Fixed build warnings on MSVC14 x64 in Unreal importer.
2016-11-27 14:36:45 +11:00
Jared Mulconry
39f54bf183
Fixed build warnings on MSVC14 x64 in Target Animation source.
2016-11-27 14:35:49 +11:00
Jared Mulconry
387afcf74f
Fixed build warnings on MSVC14 x64 in subdivision routine.
2016-11-27 13:37:32 +11:00
Jared Mulconry
58e0d8c261
Fixed build warnings on MSVC14 x64 in the STL format sources.
2016-11-27 13:32:44 +11:00
Jared Mulconry
f2e2aad647
Fixed build warnings on MSVC14 x64 in spacial sort.
2016-11-27 13:28:40 +11:00
Jared Mulconry
20318811ff
Fixed build warnings on MSVC14 x64 in the skeleton mesh builder.
2016-11-27 13:17:02 +11:00
Jared Mulconry
98e7eb476d
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/ObjFileImporter.cpp
2016-11-27 13:00:33 +11:00
John Senneker
578ed3f5d0
Properly export COLLADA <transparency> value
2016-11-25 12:09:49 -05:00
John Senneker
1541db01cc
Remove scaling of specular exponent in OBJFileImporter.cpp
2016-11-25 10:56:11 -05:00
Kim Kulling
f1254639d0
Merge pull request #1075 from Chainsawkitten/MinGW
...
Fix some MinGW warnings
2016-11-24 21:34:56 +01:00
Kim Kulling
d82fd0d750
closes https://github.com/assimp/assimp/issues/1076 : use ai_assert instead
...
of assert.
2016-11-24 21:15:07 +01:00
Albin Bernhardsson
347c09c539
Put back unused line (in comments)
2016-11-24 15:15:17 +01:00
Albin Bernhardsson
bde2b466be
Remove unnecessary semicolon
2016-11-24 14:53:33 +01:00
Albin Bernhardsson
bd6f94b926
Remove unused variable
2016-11-24 14:15:13 +01:00
Albin Bernhardsson
3b49dfe93e
Comment out unused variables
2016-11-24 14:10:24 +01:00
Albin Bernhardsson
30cd60ff82
Remove unnecessary semicolons
2016-11-24 13:26:18 +01:00
Kim Kulling
83e472cef3
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-23 20:20:45 +01:00
Kim Kulling
d87400b76a
Fix some findings in animation header.
2016-11-23 20:20:11 +01:00
Jared Mulconry
f206249fbf
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
...
# Conflicts:
# code/AMFImporter_Postprocess.cpp
# code/FBXConverter.cpp
# code/IFCLoader.cpp
# code/NDOLoader.cpp
# code/glTFAsset.inl
2016-11-23 22:24:04 +11:00
Kim Kulling
ba2f377b52
Fix coverity findings.
2016-11-22 22:03:31 +01:00
Kim Kulling
61e974f767
Merge pull request #1074 from assimp/testsuite_aiMetadata
...
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:20:02 +01:00
Kim Kulling
f45aeca3f6
Fix build: use ai_assert instead of assert.
2016-11-22 21:17:47 +01:00
Kim Kulling
a446d75250
Ue new alloc semantic when using aiMetadata + increase test coverage.
2016-11-22 21:06:14 +01:00
Kim Kulling
c5e3058ab3
Fix coverity findings.
2016-11-22 10:22:15 +01:00
Kim Kulling
566aa1ae00
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-21 23:55:14 +01:00
Kim Kulling
c61146f52e
Add unittest fixure for aiMetadata.
2016-11-21 23:54:39 +01:00
Kim Kulling
9e07701f3e
Merge branch 'master' into coverity_scan
2016-11-21 10:18:17 +01:00
Kim Kulling
eb6390a639
Merge pull request #1071 from jaredmulconry/master
...
AMF Postprocessed Metadata given type bool regardless of original type
2016-11-20 17:52:47 +01:00
Giuseppe Barbieri
b6fb1f3c05
Update STLLoader.cpp
...
If `faceVertexCounter` does not start equal 3, then at line 291 you will get a warning
2016-11-20 15:14:33 +01:00
Jared Mulconry
ff31abf57c
Fixed build warnings on MSVC14 x64 in the scene combiner.
2016-11-20 14:07:24 +11:00
Jared Mulconry
439b4861c8
Fixed build warnings on MSVC14 x64 in the SIB format sources.
2016-11-20 14:06:56 +11:00
Jared Mulconry
655a470fc9
Fixed build warnings on MSVC14 x64 in the Quake 3 format sources.
2016-11-20 13:30:20 +11:00
Jared Mulconry
98aea657ff
Fixed build warnings on MSVC14 x64 in some helpers.
2016-11-20 13:18:11 +11:00
Jared Mulconry
f81e28f320
Fixed build warnings on MSVC14 x64 in the pre-transform vertices post-process.
2016-11-20 13:06:50 +11:00
Jared Mulconry
3e08a47d4f
Fixed build warnings on MSVC14 x64 in some scene optimisations.
2016-11-20 13:04:56 +11:00
Jared Mulconry
48e542d8d4
Fixed build warnings on MSVC14 x64 in the OpenGEX format sources.
2016-11-20 13:02:26 +11:00
Jared Mulconry
4a63f1759c
Fixed build warnings on MSVC14 x64 in the Ogre format sources.
2016-11-20 12:49:33 +11:00
Jared Mulconry
0c13322089
Fixed build warnings on MSVC14 x64 in the Obj format sources.
2016-11-20 12:29:26 +11:00
Jared Mulconry
8478b03f22
Fixed build warnings on MSVC14 x64 in the NDO format sources.
2016-11-20 12:27:04 +11:00
Jared Mulconry
2946a7349b
Fixed build warnings on MSVC14 x64 in the MS3D format sources.
2016-11-20 02:40:36 +11:00
Jared Mulconry
923b014472
Fixed build warnings on MSVC14 x64 in the MD3 and MD5 format sources.
2016-11-20 02:40:18 +11:00
Jared Mulconry
60cd4605eb
Fixed build warnings on MSVC14 x64 in the Material System source.
2016-11-20 02:11:01 +11:00
Jared Mulconry
335003a5a3
Fixed build warnings on MSVC14 x64 in the LWS format sources.
2016-11-20 02:03:53 +11:00
Jared Mulconry
2c93e29dcc
Fixed build warnings on MSVC14 x64 in the LWO format sources.
2016-11-20 02:01:57 +11:00
Jared Mulconry
4df18f93ea
Fixed build warnings on MSVC14 x64 in the limit bone weights post-process.
2016-11-20 01:53:47 +11:00
Jared Mulconry
1e2c0279b0
Fixed build warnings on MSVC14 x64 in the IRR format sources.
2016-11-20 01:52:04 +11:00
Jared Mulconry
c7efb50ad1
Fixed build warnings on MSVC14 x64 in the core Importer.
2016-11-20 01:36:33 +11:00
Jared Mulconry
5f098b2f94
Fixed build warnings on MSVC14 x64 in the IFC format sources.
2016-11-20 01:13:55 +11:00
Jared Mulconry
d9b0449e83
Fixed build warnings on MSVC14 x64 in the glTF format sources. One warning
...
yet to be resolved.
2016-11-20 00:18:29 +11:00
Jared Mulconry
2ac9b0ce45
Fixed build warnings on MSVC14 x64 in the FBX format sources.
2016-11-19 23:50:03 +11:00
Jared Mulconry
acad22cc1e
Fixed build warnings on MSVC14 x64 in the DXF format sources.
2016-11-19 03:53:28 +11:00
Jared Mulconry
0469a5c2e4
Fixed build warnings on MSVC14 x64 in the debone process.
2016-11-19 03:45:25 +11:00
Jared Mulconry
43ef4ec715
Fixed build warnings on MSVC14 x64 in the D3MF format sources.
2016-11-19 03:34:39 +11:00
Jared Mulconry
9a323d6de3
Fixed build warnings on MSVC14 x64 in the CSM loader.
2016-11-19 03:29:47 +11:00
Jared Mulconry
d16b8953b5
Fixed build warnings on MSVC14 x64 in the Collada exporter.
2016-11-19 03:24:55 +11:00
Jared Mulconry
4b6c69c4f8
Fixed an incorrect cast introduced in an earlier commit.
2016-11-19 03:17:39 +11:00
Jared Mulconry
128c27e89c
Fixed build warnings on MSVC14 x64 in the Collada loader.
2016-11-19 03:16:06 +11:00
Jared Mulconry
3b63e4af54
Fixed build warnings on MSVC14 x64 in the Collada parser.
2016-11-19 02:42:51 +11:00
Jared Mulconry
2866da1262
Fixed build warnings on MSVC14 x64 in the COB format sources.
2016-11-19 02:35:30 +11:00
Jared Mulconry
df6707a262
Fixed build warnings on MSVC14 x64 in the BVH format sources.
2016-11-19 02:33:58 +11:00
Jared Mulconry
e4d43aa51a
Fixed a bug in the AMF Importer Postprocessing where metadata would be
...
incorrectly recorded as having type bool for all entries.
2016-11-19 02:07:32 +11:00
Jared Mulconry
06beb50391
Fixed build warnings on MSVC14 x64 in the Blender format sources, as well as
...
build warnings in tests.
2016-11-19 01:54:27 +11:00
Jared Mulconry
bf5fc593eb
Fixed build warnings on MSVC14 x64 in the B3D format sources.
2016-11-19 01:21:59 +11:00
Jared Mulconry
a2dadbbe52
Fixed build warnings on MSVC14 x64 in the AssBin sources.
2016-11-19 00:39:11 +11:00
Jared Mulconry
6ba2dc4db3
Fixed build warnings on MSVC14 x64 in the postprocessing of AMF format.
2016-11-19 00:31:32 +11:00
Jared Mulconry
505928cc02
Fixed build warnings on MSVC14 x64 in the 3DS format sources.
2016-11-19 00:20:53 +11:00
Kim Kulling
cae8a172c3
Merge branch 'master' into coverity_scan
2016-11-18 11:38:45 +01:00
Kim Kulling
a9c5b6f1be
Ensure that filelist for assimp lib is not empty for coveralls.
2016-11-17 19:57:24 +01:00
Kim Kulling
302b8044c6
Merge pull request #1064 from snowzurfer/master
...
Fix obj .mtl file loading
2016-11-14 20:17:28 +01:00
Jared Mulconry
eceb61b854
Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
...
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8
.
2016-11-14 22:52:29 +11:00
Alberto Taiuti
ce4f696312
Revert "Make assimp build cherry-picked importers in CMake"
...
This reverts commit 70d5bb8c7b
.
2016-11-12 02:10:51 +00:00
Alberto Taiuti
70d5bb8c7b
Make assimp build cherry-picked importers in CMake
...
Modify assimp's cmake to exclude the build of all the importers
by default; the user has then to manually select the ones needed
by setting the relative option.
From the explanation as written in the CMakeLists itself:
---
This option allows to select whether to build all the importers and then
manually select which ones not to build (old behaviour), or if to
exclude all importers from build and manually select the ones to actually
build.
By default, exclude all importers and manually select which ones to use.
To have all importers excluded, simply do not set this option in the parent
CmakeLists. Then, set the option for the importer(s) needed in the parent
CMakeLists, e.g.:
OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" TRUE)
To have assimp build all the importers, set the option to true, then manually
exclude which importers you don't need, e.g.:
OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" FALSE)
NOTE: In order to use this method of exclusion, the tools build must be disabled;
their code references certain importers/exporters which would be excluded.
If you need the tools, either manually add the importers/exporters the code
references (you will see linkage errors), or just enable the build of all the
importers as explained above.
---
As mentioned there, set the main CMakeLists not to build the tools and
the tests by default, since they use certain exporters and importers
which, with this method, are not necessarily used/built.
2016-11-12 02:04:05 +00:00
Kim Kulling
fdd01bda83
BatchImporter: make validation configurable and add unittest for class.
2016-11-12 02:04:05 +00:00
Kim Kulling
631eef49c3
BatchImporter: make validation configurable and add unittest for class.
2016-11-11 12:49:05 +01:00
Alberto Taiuti
cf7059f074
Fix obj .mtl file loading
...
Fix the obj file loader by adding a new method which allows
a name to be read considering the space in the middle between two
words and use that for parsing the "mtlib" line in the .obj file
parsing method.
Before, the method used in the obj parsing function would have
returned the string "mtlib NAME_OF_MTL" instead of "mtlib" only,
which resulted in the .mtl file being never parsed.
2016-11-10 23:12:36 +00:00
Kim Kulling
c5d6ac2c30
ObjParser: remove deprecated code.
2016-11-10 21:39:32 +01:00
Kim Kulling
888ea72f20
Merge pull request #1061 from assimp/optimized_faces_in_obj
...
ObjImporter: remove unnecessary allocations of std::vector
2016-11-09 20:52:22 +01:00
Kim Kulling
c07aee21b7
Fix build
2016-11-09 20:18:26 +01:00
Kim Kulling
568b459e24
Fix review findings.
2016-11-09 20:16:45 +01:00
Kim Kulling
ae956044aa
ObjImporter: remove unnecessary allocations of std::vector in obj-specific
...
face.
2016-11-09 20:09:45 +01:00
Kim Kulling
1d08c9e2e2
Merge pull request #1060 from assimp/issue_1059
...
Issue 1059
2016-11-08 21:31:47 +01:00
Kim Kulling
9f96126362
ObjParser: remove dead code.
2016-11-08 20:35:21 +01:00
Kim Kulling
5ff1c39e02
Obj-Parser: Fix performance issue.
2016-11-08 20:34:55 +01:00
Kim Kulling
1aafe6287c
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-07 17:20:27 +01:00
Kim Kulling
8ffd94937e
Fix BlenderDNA for clang cross compiler.
2016-11-07 17:19:49 +01:00
Kim Kulling
d4223d1fce
closes https://github.com/assimp/assimp/issues/105://github.com/assimp/assimp/issues/1057
2016-11-06 19:36:37 +01:00
Kim Kulling
cc7b7723c1
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-05 18:41:52 +01:00
Kim Kulling
499886f89e
ScenePreprocessor: fix invalid index counter.
2016-11-05 18:41:19 +01:00
AndrzejKozik
dcb7478785
Update FBXConverter.cpp
2016-11-04 09:20:04 +01:00
AndrzejKozik
a074ca58b3
Keys interpolation fix
...
In line 3073 there was an unproper scope of cast to double.
2016-11-04 08:48:14 +01:00
Kim Kulling
dfaea27dfc
MaterialSystem: fix some findings.
2016-11-03 23:29:03 +01:00
Kim Kulling
c849e0108d
Merge pull request #1055 from assimp/issue_957
...
Fix compiler warnings related to issue 957.
2016-11-03 19:11:56 +01:00
Kim Kulling
02e038bbb6
Fix compiler warnings related to issue 957.
2016-11-03 18:37:02 +01:00
Martin Gerhardy
b30dc8ffc9
Fixes compile issue for 3ds exporter
...
... when you have disabled the 3ds importer
2016-11-02 19:54:53 +01:00
Kim Kulling
3e05d13827
Merge pull request #1048 from tomacd/keep_materials_names
...
Keep original materials names in RemoveRedundantMaterials, ColladaExporter
2016-10-31 09:42:45 +01:00
Kim Kulling
fcac614ad0
Blender: fix compiler warning: FAIL already defined.
2016-10-30 19:21:38 +01:00
Kim Kulling
810fc405a8
Fix build.
2016-10-30 09:06:45 +01:00
Kim Kulling
293654fe7c
Fix unittest.
2016-10-30 08:55:11 +01:00
Kim Kulling
b9261f01a3
Obj-Stream-Handling: fix compiler-errors and warnings.
2016-10-29 21:41:24 +02:00
Kim Kulling
186f3f091f
Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling
2016-10-29 20:07:53 +02:00
Kim Kulling
b13c30f50e
Obj: Fix some small issues
2016-10-29 19:07:30 +02:00
tomacd
8e8757f800
Keep original materials names after RemoveRedundant materials process and export to collada
2016-10-27 19:23:43 +02:00
Kim Kulling
949a27a743
New streaming interface: fix build.
2016-10-22 23:34:56 +02:00
Kim Kulling
cbe2e9af49
Merge branch 'master' into new_obj_stream_handling
2016-10-22 21:04:02 +02:00
Kim Kulling
d3a3bd9c12
BUgfixes regarding filepos setupBUgfixes regarding filepos setup.
2016-10-22 21:03:11 +02:00
Kim Kulling
33e370a8b7
Obj-Stream-Handling: fix readin of linewise import.
2016-10-21 21:14:35 +02:00
Kim Kulling
1724cc9e66
Remove redundant file.
2016-10-21 19:44:31 +02:00
Kim Kulling
50803b897c
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-21 19:43:56 +02:00
Kim Kulling
fe0cfc52bc
Q3BSP-Loader: reformat include.
2016-10-20 22:25:39 +02:00
Kim Kulling
af54cb8a29
Q3BSP: fix license dates.
2016-10-20 17:04:37 +02:00
Kim Kulling
6a31e3528e
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-20 16:43:38 +02:00
Kim Kulling
91e833056e
Q3BSP-Importer: remove commented code.
2016-10-20 16:42:00 +02:00
Kim Kulling
b0f09ee6e2
Merge pull request #903 from dontbmh/upstream
...
fix strncpy not null terminated string
2016-10-20 16:18:30 +02:00
Kim Kulling
74ab4afd01
Merge pull request #1042 from VeganPower/Fix_988
...
Added support for 64 bit version header introduced in FbxSdk2016
2016-10-19 16:03:53 +02:00
Kim Kulling
bac28061ea
3MF: fix nullptr access.
2016-10-18 21:16:44 +02:00
John Senneker
acd2802f22
Check for std::string::npos before applying std::string::substr
2016-10-18 10:48:47 -04:00
Kim Kulling
a54e42cb5a
Some more fixes.
2016-10-18 14:02:58 +02:00
John Senneker
4b15dfd9af
Fix OBJ parser mtllib statement parsing bug.
...
Since `getName` returns the whole line (including spaces) parse out the
first word for comparison.
2016-10-17 18:48:04 -04:00
Kim Kulling
5cd16a0aa6
Merge pull request #1034 from ascandal/feature/gltf-compact-skins
...
glTF compact skins
2016-10-17 21:45:50 +02:00
Kim Kulling
ea0424de18
Merge pull request #1037 from ystreet/cfileio-leaks
...
cfileio: fix leaks by not closing files in the destructor
2016-10-17 17:29:38 +02:00
Kim Kulling
862dfd5a05
Merge pull request #1032 from ashdnazg/master
...
use cmath and C++ (std::) versions of math functions
2016-10-17 17:26:32 +02:00
Matthew Waters
cbcaa107eb
cfileio: fix leaks by not closing files in the destructor
...
Numerous importers rely on the default C++ IOSystem implementation
having the destructor close the file for them. The C IOSystem wrapper
wasn't and instead assumed that the Close() method was going to be
called.
This brings the C IOSystem wrapper in line with the default C++ IOSystem
by having the destructor close the file.
2016-10-18 00:35:56 +11:00
Kim Kulling
09ad67f469
3MF-Importer: remove unused variable.
2016-10-16 17:14:22 +02:00
Angelo Scandaliato
6ce2a37b82
merge upstream/master and fix conflicts
2016-10-15 18:12:02 -07:00
Angelo Scandaliato
fcf2d6357e
check if bones exist before creating skin
2016-10-15 17:21:55 -07:00
Kim Kulling
5cb4df80ad
C++11-combat: hopefully the last std::to_string to replace.
2016-10-15 21:45:58 +02:00
Kim Kulling
46d78f57d5
OpenGEXImporter: fix compiler warning.
2016-10-15 21:45:09 +02:00
Kim Kulling
7681089abc
C++11-Combat: last replacements of std::to_string.
2016-10-15 21:30:02 +02:00
Kim Kulling
e0dde73018
C++11-combat: replace more std::to_string by assimp-specific to_string
2016-10-15 21:25:16 +02:00
Kim Kulling
b90669c45e
C++11: Replace std::to_string by assimp-specific implementation.
2016-10-15 20:36:51 +02:00
Eshed
a84bf869c2
replace more math.h functions occurences with std::
2016-10-15 12:05:57 +03:00
Eshed
3b6ffc3ef5
fix mingw build (mingw supports stat64 nowadays)
2016-10-15 03:52:50 +03:00
Eshed
25cda401c5
use cmath and C++ (std::) versions of functions
2016-10-15 03:29:45 +03:00
Angelo Scandaliato
9c4bb1c9bc
find the correct index in jointNames
2016-10-14 15:47:21 -07:00
Rosario Leonardi
2505f02263
Added support for 64 bit version header introduced in FbxSdk2016
2016-10-14 17:47:10 +01:00
Angelo Scandaliato
1c03aebfb8
test combining skins
2016-10-13 19:49:59 -07:00
Kim Kulling
084a6f6415
Obj-Streaming: add new io-stream for line-wise cached reading + first
...
bugfixes.
2016-10-12 15:30:04 +02:00
Angelo Scandaliato
dc1e11c8be
added some comments
2016-10-11 15:33:52 -07:00
Angelo Scandaliato
57a00d5faa
find skeleton root joint and only allow four joint weights per vertex
2016-10-11 15:28:04 -07:00
Kim Kulling
ccf32aaf57
Merge pull request #1029 from samitc/master
...
fix bug when reading strings in quote in MD5 models
2016-10-11 13:48:24 +02:00
Kim Kulling
905e48a35c
Buffered stream API for big files: add next try of a prototype.^
2016-10-11 12:29:40 +02:00
amit512
96a64a353a
fix bug when reading strings in quote in MD5 models
2016-10-11 13:04:41 +03:00
Kim Kulling
6a0d4bac35
Merge pull request #1026 from ascandal/feature/gltf-skins-animation
...
glTF skinning animation
2016-10-10 22:20:10 +02:00
Sergey Kosarevsky
1c78f1be03
Fixed: unzip.h was still included even if the D3MF importer is disabled
2016-10-10 17:58:06 +02:00
Kim Kulling
bf06ee3ed4
Merge branch 'master' into new_obj_stream_handling
2016-10-10 10:19:45 +02:00
Kim Kulling
ad4d1f717f
Obj-Import: finish first prototype of IOStreamBuffer.
2016-10-10 10:18:14 +02:00
Kim Kulling
47dd1eb227
Merge pull request #1025 from smalcom/issue_768
...
Issue 768
2016-10-09 18:09:19 +02:00
Angelo Scandaliato
1f377bc99d
try to find root joint node for skeleton
2016-10-08 19:18:13 -07:00
Angelo Scandaliato
c49971e120
fix bug when exporting mRotationKeys data
2016-10-08 15:36:01 -07:00
Angelo Scandaliato
71de606770
add skeleton and mesh to node containing the mesh
2016-10-08 15:34:00 -07:00
Angelo Scandaliato
57b9232075
deleted code/MakeFile and added to .gitignore
2016-10-08 15:23:59 -07:00
Alexandr Arutjunov
0359ded946
[F] Checking directive name with start from symbol 'm'. And checking argument of 'mtllib'.
2016-10-07 16:40:51 +03:00
Kim Kulling
6f6dd69270
Merge pull request #1021 from smalcom/export_x3d
...
Export x3d
2016-10-07 13:05:02 +02:00
Kim Kulling
d474c24753
Merge pull request #1024 from ascandal/feature/glTF-animations
...
Export glTF node animations
2016-10-07 10:30:42 +02:00
Angelo Scandaliato
574abd3c01
removed obsolete commented out code
2016-10-07 00:26:08 -07:00
Kim Kulling
0bae2bbfa7
Obj-Importer: start new streaming handling.
2016-10-07 09:19:10 +02:00
Angelo Scandaliato
84803bd51a
removed cout debugging statements and older ExportSkins function
2016-10-06 23:57:16 -07:00
Angelo Scandaliato
d128837a3a
export vertex joint and weight information
2016-10-06 18:59:53 -07:00
Angelo Scandaliato
ae36ca0e44
moved ExportSkins function into ExportMeshes function
2016-10-06 15:18:33 -07:00
Angelo Scandaliato
83c9addbc9
removed duplicate function for ExportData
2016-10-06 13:01:03 -07:00
Angelo Scandaliato
f59b8b3a59
export inverseBindMatrix Data for skins
2016-10-06 12:56:34 -07:00
Angelo Scandaliato
42a8d58f45
Export Nodes before meshes to avoid issue if node id's are changed
2016-10-06 11:29:09 -07:00
Alexandr Arutjunov
c6d233768f
[F] Small doc changes.
2016-10-06 19:02:37 +03:00
Alexandr Arutjunov
8c6ee48af5
[*] Merged fresh master and resolved conflicts.
2016-10-06 17:12:56 +03:00
Alexandr Arutjunov
9a4d693773
[+] Export to X3D format.
2016-10-06 17:04:37 +03:00
Alexandr Arutjunov
85d5fc2169
[-] Removed unneeded logging.
...
[F] Invalid metadata type used in postprocessing.
2016-10-06 17:04:08 +03:00
Angelo Scandaliato
4ac57f1fab
fixed issues to get node animations working
2016-10-06 02:34:11 -07:00
Angelo Scandaliato
0313328a92
set bindShapeMatrix to identity
2016-10-05 18:16:32 -07:00
Angelo Scandaliato
79852de5ae
added skins and jointNames
2016-10-05 17:30:02 -07:00
Angelo Scandaliato
cfa0ea3189
finished first version of extport animation data
2016-10-05 13:32:06 -07:00
Kim Kulling
b61aaf7ec4
New animation file for OpenGEX.
2016-10-05 20:14:42 +02:00
abma
a3295c6640
fix compile warning
2016-10-05 02:07:42 +02:00
Kim Kulling
0aab2aa96a
Merge pull request #1018 from johnmaf/bugfix/obj-homogeneous_coords
...
Parse homogeneous vertex coordinates in OBJs
2016-10-04 23:12:05 +02:00
Kim Kulling
f94b7287fc
Merge pull request #1015 from ascandal/feature/fix-glTF-validator-errors
...
Fix glTF validator errors
2016-10-04 23:10:30 +02:00
Kim Kulling
7a721b3014
Merge pull request #1016 from johnmaf/bugfix/glTF-sort_ptypes
...
Sort by primitive type before exporting as glTF
2016-10-04 23:09:16 +02:00
John Senneker
c3ebdc56de
Parse homogeneous vertex coordinates in OBJs
2016-10-04 17:06:31 -04:00
Alexandr Arutjunov
9d40f36f87
[F] Fixed type in list.
...
[+] Added function to metadata class for conveniance.
[*] Enumeration AI_INT changed to AI_INT32.
2016-10-04 23:58:51 +03:00
Alexandr Arutjunov
0ba0eca48e
[+] Call for X3D exporter.
2016-10-04 23:55:08 +03:00
Kim Kulling
8d3184f6fb
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-04 18:41:25 +02:00
Kim Kulling
86dc3f7a79
X3D: Some more reformattings and missing initializations.
2016-10-04 18:40:58 +02:00
Angelo Scandaliato
d249cca011
created the asset writer function for animations export gltf
2016-10-04 07:09:01 -07:00
Martin Gerhardy
7bf6cfc9f6
removed BOM
2016-10-04 12:45:28 +02:00
Kim Kulling
7b9162136f
Some small format changes for assimp-style :-).
2016-10-04 11:45:08 +02:00
Angelo Scandaliato
37d32e79c9
created exportAnimation function
2016-10-03 19:29:37 -07:00
John Senneker
f378230a13
Sort by primitive type before exporting as glTF
2016-10-03 17:19:44 -04:00
Kim Kulling
9dc4fb2aa3
AMF: add missing license info.
2016-10-03 19:24:14 +02:00
Angelo Scandaliato
99c93e861c
Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
2016-10-03 09:34:16 -07:00
Alexandr Arutjunov
aeb99898d3
[*] Set float type for constants: less warnings, less type truncations.
2016-10-02 20:00:57 +03:00
Alexandr Arutjunov
897370b6ff
[*] Pull fresh data.
...
[F] Using ssize_t is bad idea.
2016-10-02 19:52:24 +03:00
Alexandr Arutjunov
268b18dabf
Merge branch 'master' into import_x3d
2016-10-02 17:31:44 +03:00
Alexandr Arutjunov
3086a07e86
[*] Docs and build-files fixes.
2016-10-02 17:27:13 +03:00
Kim Kulling
59212bf55a
Merge pull request #1011 from smalcom/import_amf
...
Import amf
2016-10-02 14:52:00 +02:00
Kim Kulling
6233f65b3a
Merge pull request #1012 from johnmaf/bugfix/glTF-transparency
...
glTF: Read and write transparency values
2016-10-02 11:52:59 +02:00
Alexandr Arutjunov
9c0de90ede
[F] Fixed missed break.
...
[F] Doc changes.
[*] Removed Boost dependency.
[*] Style changes.
2016-10-02 03:08:34 +03:00
Alexandr Arutjunov
823003ba9b
[F] Fixing checking rule
2016-10-02 02:28:06 +03:00
Angelo Scandaliato
0619232aef
included samplers dictionary for textures
2016-09-30 17:23:38 -07:00
Alexandr Arutjunov
8856f7f6ae
Merge branch 'import_amf' into import_x3d
2016-09-30 02:38:59 +03:00
Alexandr Arutjunov
9d4d0de607
[*] Few changes for building using old (or MS) compilers.
2016-09-30 02:24:24 +03:00
Alexandr Arutjunov
c1a3912b3f
[F] Erasing with constant iterator. Strange that new gcc is allow this.
...
[*] Few changes for building using old (or MS) compilers.
2016-09-30 02:12:46 +03:00
John Senneker
83c0163ec6
glTF: Read and write transparency values
2016-09-29 17:44:04 -04:00
Alexandr Arutjunov
db54eb98e3
Merge branch 'import_amf' into import_x3d
2016-09-30 00:30:26 +03:00
Alexandr Arutjunov
f497f739fa
[*] Not all modern compilers is support new C++ feature "using". What the sad?
2016-09-30 00:03:34 +03:00
Alexandr Arutjunov
8ad6c80dac
[*] Removed Boost dependency.
2016-09-29 23:48:41 +03:00
Alexandr Arutjunov
61bced27df
[*] Removed Boost dependency.
2016-09-29 23:38:24 +03:00
Alexandr Arutjunov
76c84aa24d
[F] Header missed.
2016-09-29 23:19:47 +03:00
Alexandr Arutjunov
ef9b6a7375
[F] Removed UTF-8 BOM
2016-09-29 23:16:59 +03:00
Alexandr Arutjunov
3274951f2a
[+] X3D importer.
2016-09-29 18:50:24 +03:00
Alexandr Arutjunov
e4cb388153
[*] Style and doc changes.
2016-09-29 18:04:31 +03:00
Alexandr Arutjunov
818fb2e901
[F] Typo: invalid format hint index.
2016-09-29 17:11:53 +03:00
Angelo Scandaliato
7dd2e7011d
fixed issue with texcoordinate bufferview target
2016-09-28 18:50:08 -07:00
Angelo Scandaliato
f2e6f2f67f
work around for indices array in ExportData
2016-09-28 15:56:06 -07:00
Angelo Scandaliato
e89e98291a
calculate and write min and max attributes for accessors
2016-09-28 14:47:15 -07:00
Alexandr Arutjunov
0a25b076b8
Merge branch 'master' into import_amf
2016-09-28 17:51:59 +03:00
Alexandr Arutjunov
cb38054247
[+] AMF-importer. Also some fixes for modern Assimp.
2016-09-28 17:49:15 +03:00
Kim Kulling
9f7e34663e
FBX: make lookup test less strict. closes https://github.com/assimp/assimp/issues/994
2016-09-28 16:16:06 +02:00
Kim Kulling
f383ec0797
Fix some review findings.
2016-09-28 00:06:23 +02:00
Kim Kulling
cd9cb50eaf
OpenGEX: fix some review findings.
2016-09-28 00:06:06 +02:00
Angelo Scandaliato
3e322495f2
asset.version from int to string
2016-09-27 11:38:17 -07:00
Kim Kulling
36d770d3db
OpenGEX: fix some review findings.
2016-09-27 19:47:27 +02:00
Kim Kulling
78dae87de2
closes https://github.com/assimp/assimp/issues/954 : add import of vertex
...
colors in
penGEX-importer.
2016-09-27 19:40:06 +02:00
Alexandr Arutjunov
6a9ccf2016
[+] Flag for scene for supporting formats where more than one face can reference to one vertex.
2016-09-26 13:01:38 +03:00
Alexandr Arutjunov
386128febc
[+] Building AMF-importer.
2016-09-26 12:57:44 +03:00
wise86Android
8e9c0235d3
153083/2 Buffer not null terminated
2016-09-25 15:21:30 +02:00
wise86Android
07ec476b7d
122143,122139 Copy into fixed size buffer
2016-09-24 21:34:58 +02:00
wise86Android
08da6b278d
122180 Resource leak
2016-09-24 20:29:49 +02:00
wise86Android
33dcf4dbd3
122185 Pointer to local outside scope
2016-09-24 20:24:38 +02:00
wise86Android
94538e9d87
122193 Uninitialized scalar variable
2016-09-24 20:19:43 +02:00
wise86Android
5bec41ad16
122198 Resource leak
2016-09-24 20:11:07 +02:00
wise86Android
4872c4caf8
122238 Use after free
2016-09-24 19:19:48 +02:00
wise86Android
3f53ffa576
122243,122194 Resource leak
2016-09-24 16:27:40 +02:00
wise86Android
61097479c8
122243 Resource leak
2016-09-24 15:55:37 +02:00
wise86Android
04e0552f9e
134062 Use after free
2016-09-24 12:33:53 +02:00
Kim Kulling
38b9ae2c6c
closes https://github.com/assimp/assimp/issues/584 : export scene combiner.
2016-09-24 00:27:45 +02:00
Kim Kulling
b50d734d75
IFC: Switch generated file to 2 files to fix issue related to <mingw4.9 (
...
Thanks Qt! )
2016-09-23 19:48:38 +02:00
Kim Kulling
38cbdcd885
Merge pull request #1001 from johnmaf/feature/glTF/separate-bin
...
Export glTF buffer data in a separate .bin file
2016-09-21 19:39:38 +02:00
johnmaf
0277a23521
Add Triangulate post-processing step to glTF exporters
2016-09-21 11:33:02 -04:00
johnmaf
3052f35824
glTF: move mesh splitting to constructor to cover GLB
2016-09-20 14:15:42 -04:00
johnmaf
c9f28192d9
Merge upstream master
2016-09-20 11:53:12 -04:00
Alexandr Arutjunov
f11545d2c0
[*] Merge with fresh master.
2016-09-20 16:02:41 +03:00
Kim Kulling
b8950f6d90
Merge pull request #998 from johnmaf/bugfix/gltfUVs
...
Flip UVs in glTFExporter
2016-09-20 09:53:57 +02:00
Kim Kulling
097743880c
Merge pull request #999 from johnmaf/feature/single-glTF-buffer
...
Add all glTF data to single buffer
2016-09-20 09:52:54 +02:00
johnmaf
3c827f29f6
Export glTF buffers as separate .bin files
2016-09-19 17:44:38 -04:00
wise86Android
96fab1cf55
122219-122218 Big parameter passed by value
2016-09-19 22:23:13 +02:00
Alexandr Arutjunov
a9284e5a95
[F] Removed unneeded definitions.
...
[F] Add library for linker.
2016-09-15 20:39:39 +03:00
johnmaf
cd038209dd
Add all glTF data to single buffer
2016-09-15 10:38:02 -04:00
Alexandr Arutjunov
65048d1ef7
[F] Removed Unicode BOM at file beginning.
2016-09-15 14:45:00 +03:00
johnmaf
8b3f348d63
Flip UVs in glTFExporter
2016-09-14 18:03:52 -04:00
Alexandr Arutjunov
40cfb45c74
[F] Not set option-variable (only define for compilation was set.
...
[F] For adding library can not be used TARGET_LINK_LIBRARIES
2016-09-13 13:29:12 +03:00
Alexandr Arutjunov
24e25324f2
Merge branch 'master' into gltf_o3dgc
2016-09-13 12:08:51 +03:00
Kim Kulling
f51cd4c6d4
Merge branch 'master' into coverity_scan
2016-09-12 12:42:11 +02:00
Kim Kulling
0c00edb40e
Blender: fix some minor findings.
2016-09-12 12:41:49 +02:00
Kim Kulling
c98915e382
Merge pull request #949 from r-chris/fix-material-bugs
...
Fixing bugs related to 64-bit upgrade in materials
2016-09-12 09:41:58 +02:00
Alexandr Arutjunov
a375344052
Merge branch 'master' into gltf_o3dgc
2016-09-10 10:37:32 +03:00
Kim Kulling
22cfe84cba
3MF: add a simple box example from the 3MF-sample repo.
2016-09-10 09:27:29 +02:00
Kim Kulling
7cedd4ab89
CMake: fix buildCMake: fix build..
2016-09-10 08:48:01 +02:00
Alexandr Arutjunov
5fe32caa6d
Merge branch 'master' into gltf_o3dgc
2016-09-10 09:14:28 +03:00
Alexandr Arutjunov
d97f00571e
[*] Not needed namespace.
2016-09-10 09:07:50 +03:00
Alexandr Arutjunov
ac1bcaa4cc
Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc
2016-09-10 09:05:36 +03:00
Kim Kulling
95676b4db9
Merge branch 'master' of https://github.com/assimp/assimp
2016-09-09 20:42:36 +02:00
Kim Kulling
05fce9a008
3MF: make xml tags static const.
2016-09-09 20:42:02 +02:00
Kim Kulling
b22f93eabf
3MFImporter: add source group for visual dtudio.
2016-09-09 20:41:04 +02:00
Alexandr Arutjunov
d49ad6c93e
[*] Stylistic changes.
...
[F] Added all files from Open3DGC codec to CMakeLists.txt
2016-09-09 16:38:43 +03:00
johnmaf
702d57fbae
Split mesh before exporting gltf. Fixes #995
2016-09-07 17:03:19 -04:00
Kim Kulling
ccf1b368c8
Merge branch 'master' of https://github.com/assimp/assimp
2016-09-06 15:46:41 +02:00
Kim Kulling
ffdca3593b
ObjImporter: remove unused code.
2016-09-06 15:41:37 +02:00
Kim Kulling
0f2cea7ba6
Blender: revert fix for suspicious crash in blender on windows.
2016-09-06 10:42:02 +02:00
Kim Kulling
9e19b5103c
IrrImporter: Fix release functions.
2016-09-05 10:48:30 +02:00
Kim Kulling
a54835c91d
Merge master
2016-09-04 20:41:20 +02:00
Kim Kulling
cc860ede66
Fix coverity findings: fix usage after free.
2016-09-04 20:40:34 +02:00
Kim Kulling
9d4d2b2a1c
ComputeUVMappingprocess: add missing initialization for scalar value.
2016-09-04 20:35:07 +02:00
Kim Kulling
bcdc79ba73
Fix invalid release of mat + mesh.
2016-09-04 20:22:04 +02:00
Kim Kulling
e51b7d2a61
IFC: fix possible use after free access bug.
2016-09-02 20:06:56 +02:00
Kim Kulling
b240b9d30d
Blender: fix invalid OnjectCompare op.
2016-09-02 20:06:31 +02:00
Kim Kulling
2568797015
MDLMoader: fix resource leak.
2016-08-30 19:50:53 +02:00
Kim Kulling
659a55be4a
Fix coverity finding: use deep copy instead of reference showing to
...
mem-adress when reading and calling push_back in a std::vector.
2016-08-30 19:46:34 +02:00
Kim Kulling
c6f670ff50
glTFImporter: avoid out-of-bounds-access.
2016-08-29 20:05:29 +02:00
Kim Kulling
147921ac39
MakeVerboseFormat: fix invalid delete statement.
2016-08-29 19:56:38 +02:00
Kim Kulling
26aa18c75a
Fix findings from code review.
2016-08-29 18:23:41 +02:00
Kim Kulling
2545dee58d
Fix coverity findings: fix possible out-of-bound access.
2016-08-29 15:32:27 +02:00
Kim Kulling
238f14f30f
Fix coverity findings: fix possible usage after calling free.
2016-08-29 15:28:37 +02:00
Kim Kulling
a66e644bf3
Fix coverity finding: fix possible use after free..
2016-08-29 15:24:24 +02:00
Kim Kulling
243df452a4
GeometryBuilder: fix update of vertices.
2016-08-25 18:20:52 +02:00
Kim Kulling
85b3e45aa7
Merge pull request #984 from jwwalker/upstream
...
Add typecasts in glTFAssetWriter.inl to fix compile errors
2016-08-19 10:26:48 +02:00
James Walker
666d1ce164
Changed C-style casts to static_cast.
2016-08-18 10:55:24 -07:00
Daniel Knezevic
c2c12c1db5
Use Assimp namespace to fix build for big-endian architectures
2016-08-18 10:51:20 +02:00
James Walker
e9ecd6f8a7
Add typecasts in glTFAssetWriter.inl to fix compile errors about ambiguous constructors, see: < https://github.com/assimp/assimp/issues/980 >
2016-08-17 17:48:29 -07:00
Chris Russ
3f08cebfab
include config.h to always have the correct types (float/double) exposed
2016-08-17 07:57:31 +10:00
Chris Russ
4f7b624fe8
fix precision issue within memory copy
2016-08-16 16:03:56 +10:00
Chris Russ
63a4591683
Fixing bugs related to 64-bit upgrade in materials
2016-08-16 16:03:56 +10:00
roshan.c
27f81884f9
adding support to store all the layered textures
2016-08-15 09:58:53 -07:00
Alexandr Arutjunov
2732e5d9b6
[F] Removed Unicode BOM.
2016-08-14 19:49:05 +03:00
Alexandr Arutjunov
e0356b09be
Merge branch 'master' into gltf_o3dgc
2016-08-14 16:49:53 +03:00
Alexandr Arutjunov
48f8c117e2
[F] Conditional compilation for Open3DGC-extension.
...
[F] Flag comp_allow did not reset when mesh can not be encoded.
2016-08-14 16:27:16 +03:00
Kim Kulling
b916857659
closes https://github.com/assimp/assimp/issues/967 : add unzip include path
...
when no other version was found.
2016-08-14 11:44:21 +02:00
Alexandr Arutjunov
de70f5c028
[+] Added link to RT library when using Open3DGC-compression.
2016-08-13 17:44:58 +03:00
Alexandr Arutjunov
3a10a3cf03
[-] Removed unneeded include.
2016-08-13 16:27:34 +03:00
Alexandr Arutjunov
8ab50aa9a0
[*] Few C++11 constructions are removed.
2016-08-13 16:27:07 +03:00
Alexandr Arutjunov
1844665693
[*] Few C++11 constructions are removed.
2016-08-13 16:09:21 +03:00
Kim Kulling
0379675fca
Add type to deal with 64-bit filesizes on x86_64-apple-darwin15.5.0x86_64-apple-darwin15.5.0
2016-08-12 18:47:37 +02:00
Kim Kulling
83b02ff41f
DefaultIOStream: add missing detection for apple-based OS.
2016-08-12 18:14:26 +02:00
Kim Kulling
bdcff35d5d
closes https://github.com/assimp/assimp/issues/901
2016-08-12 17:13:18 +02:00
Alexandr Arutjunov
0ad2f2247a
[+] glTF import/export. Support for Open3DGC-compression of mesh primitives.
2016-08-11 01:04:30 +03:00
Alexandr Arutjunov
778ad7f06f
[+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression.
2016-08-09 13:37:32 +03:00
Alexandr Arutjunov
9a4fa1321b
[+] Save parameters of mesh extension: Open3DGC-compression.
2016-08-09 13:26:57 +03:00
Alexandr Arutjunov
507668229f
[+] Support Open3DGC for glTF import/export. Intermediate commit.
2016-08-08 19:24:50 +03:00
Alexandr Arutjunov
41ed74beb6
[*] Style. Intermediate commit.
2016-08-08 19:07:30 +03:00
Alexandr Arutjunov
a6ec0e4c7a
[*] Style. Intermediate commit.
2016-08-08 19:06:17 +03:00
Alexandr Arutjunov
29e982e185
[F] Fixed problem with more then one mesh in scene. More detaily read at line 529 in glTFAsset.inl.
2016-08-03 18:06:38 +03:00
Alexandr Arutjunov
c024beadba
[+] Put information to log about decompressing.
2016-08-03 11:16:30 +03:00
Alexandr Arutjunov
5e4fd5fa3c
[+] glTF. Support for import meshes with Open3DGC compression.
2016-08-03 03:46:04 +03:00
Alexandr Arutjunov
2e452205aa
[+] Building of Open3DGC codec.
2016-08-03 03:40:53 +03:00
Alexander Gessler
454320ad08
Merge pull request #953 from TrianglesPCT/master
...
Fix blender vertex colors being negative, and fix blender vertex colors scaling to be 0 to 1
2016-07-27 21:37:02 +02:00
TrianglesPCT
66c1a176de
Add files via upload
...
forcing a new build
2016-07-25 23:04:08 -06:00
Adi Shavit @ MacBookPro
f119447549
Fixes compilation on OSX with gcc.
...
- The symbol `typeof` collides with a non-standard gcc "keyword". See https://gcc.gnu.org/onlinedocs/gcc/Typeof.html
- Renamed to `type_of`.
2016-07-25 16:33:25 +03:00
TrianglesPCT
667aa37fdd
Add files via upload
...
used ai_real instead of float
2016-07-24 18:45:41 -06:00
TrianglesPCT
28c9f56c5e
Add files via upload
...
scale blender vert color out to 0-1 range as aiColor specifies
2016-07-24 02:26:23 -06:00
TrianglesPCT
bcb86bcc35
Add files via upload
...
fix blender vert colors being casted to signed char, which was causing negative values.
Also fix blender vert colors being way outside of 0 to 1 range which aiColor specifies
2016-07-24 02:23:59 -06:00
Volodymyr Boichentsov
5c5acae92e
Delete reduntal 'g ' from actual name of Group. (we don't have 'usemtl' in material name)
...
Fixed issue in case 'usemtl' goes straight after 'g'.
2016-07-22 14:10:06 +01:00
Kim Kulling
5fc3ee9a21
fix https://github.com/assimp/assimp/issues/946 : use correct test for objectcompare in blender.
2016-07-17 13:54:01 +02:00
Chris Russ
c57b524a59
moving cmake configure_file to appropriate location
2016-07-16 18:47:59 +10:00
Chris Russ
a7894b090d
Upgrading PLY exporter to allow element definition as double
2016-07-16 18:23:33 +10:00
Chris Russ
ad8bb32561
Properly defining build-time defines in config.h
2016-07-16 18:23:33 +10:00
Chris Russ
05a6ee6473
Adding double precision import support for formats that can be exported
2016-07-16 18:23:33 +10:00
Chris Russ
fa1d6d8c55
propagating precision requirments into operations
2016-07-16 18:23:33 +10:00
Chris Russ
5adb0e899c
CMake Option and moving more functions to optional double support
2016-07-16 18:23:33 +10:00
Chris Russ
2f7e3dcdcc
Basic changes to introduce optional double precision
2016-07-16 18:23:33 +10:00
Kim Kulling
45fae27aed
DefaultIOStream: export class for testing.
2016-07-16 09:13:59 +02:00
Kim Kulling
a15a77dff5
glTF: fix doxygen typo.
2016-07-15 10:35:44 +02:00
Kim Kulling
e1697b30bc
Blender: mark local function as static.
2016-07-15 10:33:48 +02:00
Kim Kulling
9678da72c9
Public includes: add pragma statement and formalize include guard schema.
2016-07-11 20:56:38 +02:00
Kim Kulling
02602ce9af
Update license date.
2016-07-10 15:34:58 +02:00
Kim Kulling
a8673d4828
Merge pull request #941 from assimp/feature/issue_940
...
Feature/issue 940
2016-07-08 19:29:51 +02:00
Kim Kulling
4d012bc476
Update version.
2016-07-08 18:40:26 +02:00
Kim Kulling
599e846f57
Remove dead code.
2016-07-08 18:31:19 +02:00
Kim Kulling
070fb3363f
Closes https://github.com/assimp/assimp/issues/940 : use standard offsetof
...
instead of an own version.
2016-07-08 18:30:26 +02:00
Chris Russ
a5b3ce9a3c
reverting back to 16 digit precision export
...
having to import 17 digit floats likely leads to issues in many other apps
2016-07-06 15:33:51 +10:00
Chris Russ
10f22779f4
setting default export precision to 17 for all exporters
2016-07-06 14:49:14 +10:00
Kim Kulling
19769eef8b
Version: prepare 3.3 version.
2016-07-05 18:43:16 +02:00
Fabian Herb
7b08233ef2
Fix identation
2016-07-01 17:08:28 +02:00
Fabian Herb
3c7dd2b302
More whitespace consistency
2016-07-01 17:02:54 +02:00
Fabian Herb
616aa022a7
CMake: whitespace consistency, variable naming
2016-07-01 16:57:45 +02:00
cmdrf
9c7de7b2a8
Update to latest Melange SDK
2016-07-01 14:50:46 +02:00
Kim Kulling
886cea2933
Merge pull request #927 from royshil/obj_color_vertices_support
...
adding support for per-vertex colors in OBJ files.
2016-06-28 22:08:59 +02:00
Kim Kulling
5321072007
Static code analysis: fix minor finding.
2016-06-28 11:25:04 +02:00
Roy Shilkrot
7d98643bcf
adding support for per-vertex colors.
2016-06-27 20:08:22 -04:00
Kim Kulling
9b6de15b74
closes https://github.com/assimp/assimp/issues/904 : add ai_strtof for
...
VS2012.
2016-06-20 20:30:29 +02:00
Kim Kulling
447a9642c2
closes https://github.com/assimp/assimp/issues/918 : use correct lib
...
install name for macos.
2016-06-17 20:42:19 +02:00
Kim Kulling
b01e424476
Merge pull request #917 from assimp/feature/new_includes
...
Feature/new includes
2016-06-14 22:54:56 +02:00
Kim Kulling
62e07a8af0
closes https://github.com/assimp/assimp/issues/911 : use correct include
...
path for unzip, when detected.
2016-06-14 20:27:40 +02:00
Kim Kulling
334ac9a7d0
Merge pull request #908 from Adjective-Object/master
...
Added 'joint' node type to Collada export
2016-06-13 11:35:11 +02:00
Kangning Li
f15b6177f7
glTFExporter fixes: spaces to tabs
2016-06-10 13:41:59 -04:00
Kangning Li
32d9ef042a
Merge branch 'master' into gltfErrors
2016-06-10 09:51:35 -04:00
Kangning Li
c98e77907c
fixed some small bugs in the gltf exporter: byteOffsets in accessors/bufferViews, logic problem with bufferView targets
2016-06-10 09:49:04 -04:00
Kim Kulling
81773b4e4e
Update fast_atof.h
...
Fix include brackets.
2016-06-07 11:51:09 +02:00
Kim Kulling
7207e5117c
Use new include bracktes.
2016-06-06 22:04:29 +02:00
Maxwell Huang-Hobbs
d23439451a
Added 'joint' node type to Collada export
2016-06-05 21:04:02 -04:00
Kim Kulling
814d2e7821
Merge branch 'master' of https://github.com/assimp/assimp
2016-06-04 19:04:06 +02:00
Kim Kulling
0a1dda22b2
ColladaParser: add warning when empty semantic will be parsed.
2016-06-04 17:53:51 +02:00
Kim Kulling
d67c8c29b6
Merge pull request #898 from turol/cxx11-refactor
...
Use C++11 range-based for loops
2016-05-26 16:56:07 +02:00
Dirk
bb2b30e54a
fix strncpy not null terminated bug
2016-05-26 16:13:21 +08:00
Kim Kulling
8fa0071d16
closes https://github.com/assimp/assimp/issues/892 : add own to_string
...
implementation.
2016-05-26 00:44:29 +02:00
Kim Kulling
4e982c0538
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-26 00:41:48 +02:00
Kim Kulling
2cbbc3da09
OpenGEX-Importer: remove dead code.
2016-05-26 00:41:31 +02:00
Kim Kulling
abad093d09
Update OpenGEXImporter.cpp
...
Fix compiler warning: remove unused variables.
2016-05-25 10:18:24 +02:00
Kim Kulling
5463146688
Add std::string header.
2016-05-25 00:58:05 +02:00
Kim Kulling
f9f493d017
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-25 00:27:16 +02:00
Kim Kulling
037fec275c
std::to_string: add replacement for android build chain.
2016-05-25 00:26:41 +02:00
Turo Lamminen
381f87507f
SplitLargeMeshes: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
Turo Lamminen
896ab8eee2
Unreal: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
Turo Lamminen
d238597459
Raw: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
Turo Lamminen
6c9c040419
Q3BSP: Use C++11 range-based for loop
2016-05-23 17:33:51 +03:00
Turo Lamminen
a09a6a40c0
OpenGEX: Use C++11 range-based for loop
2016-05-23 17:33:49 +03:00
Turo Lamminen
32e4dd0bd1
Ogre: Use C++11 range-based for loop
2016-05-23 17:30:48 +03:00
Turo Lamminen
3eb9b8e91b
NFF: Use C++11 range-based for loop
2016-05-23 17:30:47 +03:00
Turo Lamminen
ac676d4d3c
MD5: Use C++11 range-based for loop
2016-05-23 17:30:47 +03:00
Turo Lamminen
b9fbfbc18a
LWO: Use C++11 range-based for loop
2016-05-23 17:30:42 +03:00
Alexander Gessler
cd4f212b5f
Merge pull request #891 from ciechowoj/blender_materials
...
Blender materials
2016-05-22 14:39:45 +02:00
Turo Lamminen
3031470ec1
IRR: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
Turo Lamminen
c7c756d344
FBX: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
Turo Lamminen
8566b9aa90
D3MF: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
Turo Lamminen
52405bbe1b
Collada: Use C++11 range-based for loop
2016-05-22 13:57:11 +03:00
Turo Lamminen
f0ebb40f19
ASE: Use C++11 range-based for loop
2016-05-22 13:57:09 +03:00
Turo Lamminen
b345f79d45
3DS: Use C++11 range-based for loop
2016-05-22 13:57:06 +03:00
Kim Kulling
38ce71d5a0
Update glTFAsset.inl
...
closes https://github.com/assimp/assimp/issues/893 : fix invalid memcpy usage.
2016-05-19 09:10:56 +02:00
Kim Kulling
c9c6fda28e
Merge pull request #889 from ciechowoj/area_lights
...
Adds support for area lights.
2016-05-18 00:11:05 -07:00
ciechowoj
c554b55f97
Merge branch 'blender_materials'
...
Conflicts:
test/CMakeLists.txt
2016-05-17 22:52:18 +02:00
ciechowoj
c4a542a994
Adds blender material loading.
2016-05-17 21:17:51 +02:00
Richard Selneck
fc5464eb38
Pull from upstream, 5/17/2016
2016-05-17 08:44:38 -04:00
ciechowoj
913f26475d
Adds importing blender material.
2016-05-16 21:17:58 +02:00
ciechowoj
25d84a6aff
Adds support for area lights.
2016-05-16 13:04:43 +02:00
Kim Kulling
560e1eebc1
fix for https://github.com/assimp/assimp/issues/887 : add missing define.
2016-05-16 11:24:04 +02:00
Kim Kulling
1acd24e0ae
iSIBImporter: fix possible dereferncing of a null pointer.
2016-05-15 19:56:29 +02:00
Kim Kulling
6575696459
OpenGEX: fix coverity findings.
2016-05-15 18:57:10 +02:00
Kim Kulling
e1084b5314
Merge branch 'feature/opengex_missing_features'
2016-05-14 10:36:46 +02:00
Kim Kulling
210182b17a
OpenGEX: fix coverity findings.
2016-05-14 10:10:05 +02:00
Otger
159af06524
Fixed GLTF bugs, and added a few test models
2016-05-10 16:25:15 +02:00
Richard Selneck
86a636fbbf
Add in IRRMESH option
2016-05-09 18:26:18 -04:00
Kim Kulling
e9085097f3
OpenGEX: add light impl and add examples.
2016-05-09 20:43:22 +02:00
Kim Kulling
0d5eb30a28
CameraObj: load camera data in the correct way.
2016-05-08 22:31:16 +02:00
Kim Kulling
82f73b6d03
OpenGEX: fix invalid access to textures. Next steps to camera and light.
2016-05-08 11:09:53 +02:00
Gorilux
00b574d746
Fixed compile issue for travis-ci
2016-05-07 15:36:05 +02:00
Gorilux
753b63c526
Removed override keywords so compilation success on gcc 4.6
2016-05-07 15:15:00 +02:00
Gorilux
89320bab46
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-07 14:18:17 +02:00
Gorilux
8f4f0047fb
Added 3MF importer
2016-05-07 14:16:33 +02:00
Alexander Gessler
0b79d1ebda
Revert previous glTF fix ( e5233283ef
) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions.
2016-05-05 19:11:33 +02:00
Alexander Gessler
f5327a99ba
Add using namespace std on top of assxml exporter so vsnprintf is found no matter where it lives.
2016-05-05 19:05:02 +02:00
Alexander Gessler
e5233283ef
Fix travis compile: glTFImporter chokes on unavailability of WriteLazyDict<T>. It does not use it directly, but instantiation of LazyDict<T> creates a reference.
...
My understanding is that compilers were correct in rejecting this, but I may be missing some detail of C++' template instantiation rules.
2016-05-05 16:37:55 +02:00
Alexander Gessler
896120b76a
Assimp mostly uses unsigned int where it perhaps should've used size_t, nonetheless SPBC insisted on size_t, causing lots of noisy compile warnings.
2016-05-05 15:41:50 +02:00
Alexander Gessler
167bc579c5
Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std.
2016-05-05 15:41:12 +02:00
Alexander Gessler
1daae7b7b9
STEPFile.h: delete deleted copy ctor and move ctors. Class has a const member, so implicit creation is off anyway. Enables pre cpp11 compilation.
2016-05-05 15:40:36 +02:00
Alexander Gessler
e7fd168114
Merge pull request #854 from tomacd/fix_scene_combiner
...
fix SceneCombiner copy of aiNode not setting mParent field
2016-05-05 15:07:09 +02:00
Kim Kulling
e9b93788ca
Merge pull request #863 from mpersano/master
...
Fix texture coords exporting on binary PLY files
2016-05-03 21:55:17 +02:00
Richard Selneck
12613720ff
Fix macro used for detecting IRR support
2016-05-02 18:24:26 -04:00
Kim Kulling
8449afad71
Merge pull request #868 from otgerrogla/master
...
Fixed a few GLTF importer/exporter bugs
2016-04-28 22:56:41 +02:00
Otger
11e52dc3d7
Removed rogue comma
2016-04-28 21:34:31 +02:00
Otger
2fe401fc54
Fixed gcc compilation error
2016-04-28 21:22:01 +02:00
Otger
64f78e003f
Fixed crashes when files were not found, and fixed some warnings
2016-04-28 20:50:01 +02:00
Kim Kulling
46e7ae5dc0
OpenGEX: prepare light- and camera-node and object.
2016-04-28 20:20:40 +02:00
Otger
d9b365eb90
Fixed a few GLTF importer/exporter bugs
2016-04-28 18:44:47 +02:00
Kim Kulling
5192b837da
Replace std::endl by using backslash n.
2016-04-27 17:58:40 +02:00
Kim Kulling
7468ca5c35
VS2015-code analysis: fix finding ( index var type too small ).
2016-04-23 09:43:20 +02:00
Kim Kulling
829e56df0c
cmake env: add license info.
2016-04-23 09:42:05 +02:00
mpersano
473d2ca052
Fix texture coords exporting on binary PLY files
2016-04-22 16:09:45 -03:00
Kim Kulling
2f9c33e3e9
closes https://github.com/assimp/assimp/issues/857
2016-04-20 23:27:59 +02:00
Kim Kulling
0ec1e91722
Regression Testsuite: update database.
2016-04-19 08:49:14 +02:00
Kim Kulling
22dc22778d
Assxml exporter: Make some local functions static.
2016-04-19 08:48:37 +02:00
Kim Kulling
1b94b8969f
Blender Importer: fix review findings.
2016-04-19 08:45:04 +02:00
tomacd
5a8c15d826
fix SceneCombiner copy of aiNode not setting mParent field
2016-04-18 11:28:21 +02:00
Kim Kulling
de39c49c4c
assxml export: make local functions static.
2016-04-17 23:29:46 +02:00
Kim Kulling
a6e7938696
Assxml io function: use vsprintf for var-argument list.
2016-04-17 21:33:11 +02:00
Kim Kulling
dec93efc92
AssxmlExporter: fix crash in writing header info in VS2015.
2016-04-16 18:42:49 +02:00
Kim Kulling
6b243230b2
C++11-Support: remove boost.
2016-04-07 21:31:04 +02:00
Kim Kulling
632b58f27e
Merge pull request #850 from mensinda/no-boost
...
Replaced boost with c++11 features
2016-04-06 21:16:23 +02:00
mensinda
b045a1ec5c
Deleted move constructor of LazyObject
2016-04-06 21:03:54 +02:00
mensinda
3eafc7e746
Renamed Math.h --> MathFunctions.h
2016-04-06 16:54:03 +02:00
mensinda
f59cba13eb
Try fixing clang builds
2016-04-06 11:10:12 +02:00
mensinda
726b004806
Removed boost/noncopyable.hpp
2016-04-06 10:51:18 +02:00
mensinda
51c80ecb80
Moved gcd and lcm implemetation
2016-04-06 10:21:59 +02:00
mensinda
cc0fce8568
Replaced boost::timer with std::chrono
2016-04-06 10:13:02 +02:00
mensinda
ae99f99b99
Replaced boost::tuple with std::tuple
2016-04-06 00:17:21 +02:00
mensinda
b37e25cd7d
Replaced boost::format with internal formater
2016-04-06 00:03:05 +02:00
mensinda
5dacda0a08
replaced boost smart pointers with c++11 smart pointers
2016-04-05 23:23:53 +02:00
mensinda
cff5b0d1a0
Replaced depreacated std::auto_ptr with std::unique_ptr
2016-04-05 22:56:11 +02:00
mensinda
18843fe5e1
Replaced BOOST_FOREACH with c++11 ranged for loops
2016-04-05 22:53:54 +02:00
mensinda
4836a2993e
Replaced boost::thread with std::thread
2016-04-05 22:28:21 +02:00
Kim Kulling
20630e950a
Regression test suite: add ui for simpler text execution.
2016-04-05 22:02:02 +02:00
Kim Kulling
a2d9cbef7e
Update STEPFileReader.cpp
...
StepFileReadder: initialize var with nullptr.
2016-04-04 12:52:22 +02:00
Kim Kulling
f2d5921252
Update FBXConverter.cpp
...
FBXConverter: initialize aiNodeAnim with nullptr.
2016-04-04 12:48:53 +02:00
Eric Engestrom
87e7cf00a2
Fix spelling mistakes
2016-04-03 01:38:00 +01:00
Kim Kulling
d094dfc3a1
Merge pull request #800 from pkholland/master
...
Can't add integer to string pointer
2016-04-01 10:01:23 +02:00
Kim Kulling
49d60dc856
Merge pull request #832 from assimp/no-boost
...
Removed usage of Boost static assert.
2016-03-31 15:42:53 +02:00
boxdot
0d44479399
Import reflectance factor from Blender.
2016-03-29 21:16:26 +02:00
Kim Kulling
1592a18210
PLYLoader: fix review comments.
2016-03-25 00:09:56 +01:00
Kim Kulling
42d29b1bfe
Merge branch 'master' of https://github.com/assimp/assimp
2016-03-24 19:54:33 +01:00
Kim Kulling
7c71f0b7a9
PLYLoader: improve readability by refactorings.
2016-03-24 19:53:15 +01:00
Kim Kulling
6be4d82a6b
Merge pull request #835 from robertliebo/VCS-1030/ObjMtlFilenameFallback
...
Vcs 1030/obj mtl filename fallback
2016-03-22 20:35:41 +01:00
Kim Kulling
23892a6ded
FBX: add debugging tool to log class type + info.
2016-03-22 20:30:25 +01:00
Kim Kulling
ca0fa2ba69
FBX-Importer: put debug printf into comments.
2016-03-22 20:25:29 +01:00
Robert Liebo
124fc9ae27
[VCS-1030] add log info about .mtl fallback
2016-03-22 18:39:52 +01:00
Robert Liebo
abb3e6b854
[VCS-1030] fallback for non-found .mtl file: try file name of original obj with just the file extension replaced by "mtl"
2016-03-22 18:38:28 +01:00
Sherief Farouk
397fa374a3
Removed usage of Boost static assert.
2016-03-18 17:02:39 -07:00
Kim Kulling
76e4e82ecb
FBX: fix https://github.com/assimp/assimp/issues/782
2016-03-16 20:26:33 +01:00
Kim Kulling
644d6a9a67
Collada: refactorings.
2016-03-15 21:17:38 +01:00
Kim Kulling
d89e7943ad
FBX Close issue-806: support version 7400.
2016-03-15 21:16:47 +01:00
Kim Kulling
e3d7ca264c
Collada: reset workaround.
2016-03-15 19:28:57 +01:00
Kim Kulling
3a7c3a5698
Test for issue-731: possible overflow.
2016-03-14 21:00:08 +01:00
Kim Kulling
7e9fe2d654
OpenGEX: use correct number of uv-coordinates for texture coordinates.
2016-03-13 20:22:36 +01:00
Turo Lamminen
555f533777
MD3: Check file is big enough to contain all the advertised surfaces
2016-03-13 00:57:08 +02:00
Turo Lamminen
da0b180901
MD3: Fix crash on invalid vertex index
2016-03-13 00:57:08 +02:00
Turo Lamminen
b0f453dba8
MD2: Check file is big enough to contain all the advertised frames
2016-03-13 00:57:08 +02:00
Turo Lamminen
8d2af995de
MD2: Fix integer overflows on malformed input
2016-03-13 00:57:08 +02:00
Turo Lamminen
e2361bf209
MDL: Fix read past end of buffer on malformed input
2016-03-12 22:35:54 +02:00
Kim Kulling
6ee5fdf567
OpenGEX: fix review finding.
2016-03-12 20:55:11 +01:00
Kim Kulling
b4b303ab55
OpenGEX: fix alloc for texture coordinates.
2016-03-12 13:22:09 +01:00
emvivre
93be0f69da
PlyParser: fix invalid loading when comment is empty.
2016-03-10 17:47:07 +01:00
Thiago Goulart
3c9e57fd73
Fix memory leak in OBJ loader when a mesh has no faces.
2016-03-04 03:40:47 -08:00
Kim Kulling
53370d0d31
FBXImporter: some refactorings to increase readability.
2016-03-03 18:38:50 +01:00
Kim Kulling
2b09199f4a
FBXImporter: move MeshGeometry declaration into its own header
2016-03-03 15:19:38 +01:00
Kim Kulling
3079b90622
Importer: when the right importer was found log this info.
2016-02-29 15:57:47 +01:00
Kim Kulling
e9f47b08c5
FBXImporter: fx build.
2016-02-28 20:56:11 +01:00
Kim Kulling
28d327b7ea
FBXImporter: fix build.
2016-02-28 20:27:31 +01:00
Kim Kulling
2496e8a0a3
Lib: reduce number of header files included.
2016-02-28 17:30:11 +01:00
Kim Kulling
58fc3940f2
Obj Importer: add missing semicolon to fix the build.
2016-02-25 19:04:13 +01:00
Kim Kulling
99f00834ec
closes ssues/804: add statement to take care of emissive texture, new
...
version.
2016-02-25 18:00:09 +01:00
Paul Holland
f20a5afcf0
can't add integer to string pointer
2016-02-18 12:17:47 -08:00
Alexander Gessler
38d462f0b3
Merge pull request #764 from rmitton/sib_import
...
Validation fix for empty SIB scenes.
2016-02-18 11:58:26 +01:00
Alexander Gessler
88fee56cce
Merge pull request #790 from ov/safe-normalizing-in-smoothing-groups
...
use NormalizeSafe to prevent NaN when normalizing zero vectors
2016-02-18 11:53:57 +01:00
Turo Lamminen
b71bd3df84
LWO: Fix division by zero
2016-02-13 23:37:08 +02:00
Kim Kulling
322c959424
Merge pull request #791 from trond/collada_animation_clip
...
Collada animation clip support
2016-02-11 22:11:27 +01:00
Kim Kulling
f0717b1d7c
Merge pull request #793 from AlexBobkov/master
...
Fixed installing pdb file
2016-02-11 22:10:21 +01:00
Alexander Bobkov
a5f9d0d3fc
Fixed installing pdb file
2016-02-11 16:24:26 +03:00
rdb
7d4a713a86
Fix loading of pk3 q3bsp maps
...
This fixes loading of pk3 maps. The pk3 files contain directory entries with a size of 0, which triggered an assertion.
2016-02-11 14:10:49 +01:00
Trond Abusdal
ccd9f92533
Fixed a couple of nested template brackets that wasn't spaced out correctly.
2016-02-11 01:00:03 +01:00
Vitaly Ovchinnikov
4d5df6dc9a
use NormalizeSafe to prevent NaN when normalizing zero vectors
2016-02-11 12:19:06 +13:00
Trond Abusdal
7e58a47ba0
* Combining single-channel animations like the previous code did, except now it has been deferred until after all nodes have been read. This makes the regression tests pass for a database created before these code changes.
...
* Changed name of ColladaParser::RebuildRootAnimationsFromClips to ColladaParser::PostProcessRootAnimations as it now does more than it did before.
2016-02-10 23:57:29 +01:00
Kim Kulling
d9017299a8
iObjParser: refactorings.
2016-02-10 10:40:39 +01:00
Kim Kulling
8681abe845
Obj_Importer: remove dead code.
2016-02-09 17:50:08 +01:00
Kim Kulling
1550191256
Closes https://github.com/assimp/assimp/issues/777 : fix invalid skipping
...
of line during face defintion parsing.
2016-02-08 18:07:00 +01:00
Trond Abusdal
c34717639e
Collada: Importer generates animations from <library_animation_clips>, if the node is present.
2016-02-07 23:36:49 +01:00
rmitton
72b5ed50e9
Bump just to get AppVeyor to re-test it.
2016-02-07 13:21:58 -08:00
Kim Kulling
37a3976b30
Revert "Fix issue: OBJ import takes forever ( #759 ) (attempt 2)"
2016-02-07 20:03:24 +01:00
Kim Kulling
c084a47c5d
Merge pull request #771 from andrewparlane/obj_load_forever_fix
...
Fix issue: OBJ import takes forever (#759 ) (attempt 2)
2016-02-07 20:00:03 +01:00
Kim Kulling
522f4e0882
Closes https://github.com/assimp/assimp/issues/786 :
...
- fix invalid value get for index data.
- update OpenDDL-library
2016-02-07 17:58:28 +01:00
Kim Kulling
dfbae1294f
JoinVerticesProcess: iAdd test for possible null pointer access.
2016-02-05 18:53:23 +01:00
Kim Kulling
a74b321ed1
Add unittests for defect reproduction.
2016-02-04 20:43:02 +01:00
Kim Kulling
699aa9c583
Closes https://github.com/assimp/assimp/issues/754 : use correct index
...
token.
2016-02-03 21:09:20 +01:00
Turo Lamminen
0e06404ec1
SIBImporter: Properly fix C++11 issues for Clang
...
C-style cast has a higher precedence than & -operator so this was getting
parsed differently than Kim assumed. Thou shalt not use C-style casts.
2016-02-02 20:29:40 +02:00
Kim Kulling
a1bd83d797
ai_assert: split 2 checks in one macro to 2 separate ai_assert tests.
2016-02-01 16:16:09 +01:00
Kim Kulling
16fffb2ab1
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-31 00:42:02 +01:00
Kim Kulling
a37ea18f09
SIBImporter: fix c++14 compilation issue for clang.
2016-01-31 00:41:14 +01:00
Kim Kulling
bcd38707c5
3DSConverter: fix level 4 compiler warning.
2016-01-29 21:22:41 +01:00
Kim Kulling
bac6067869
gltf: make code more radable and check against one possible null ptr
...
access.
2016-01-27 20:26:38 +01:00
Kim Kulling
0e7446af83
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-27 18:49:26 +01:00
Kim Kulling
8bbd55a790
PostProcessing: first prototype of customized post processing.
2016-01-27 18:49:01 +01:00
Kim Kulling
f473b17c99
Merge pull request #773 from boxdot/master
...
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 17:20:26 +01:00
boxdot
13ec11bca8
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 02:12:15 +01:00
abma
b3b08728fa
fix new / delete missmatch
2016-01-26 22:47:50 +01:00
Andrew Parlane
109f6feb6e
ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
...
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
This time I've fixed the order of evaluation bug in the call to getFace().
2016-01-25 20:44:31 -04:00
Andrew Parlane
c7d86e97cc
ObjTools: Update getName() to work with const iterators.
...
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-25 20:43:34 -04:00
Kim Kulling
4633266c31
Revert "Fix issue: OBJ import takes forever ( #759 )"
2016-01-25 23:53:59 +01:00
rmitton
f23285a1ce
Fixed whitespace to match coding standard.
2016-01-25 13:45:08 -08:00
rmitton
94a35dfdd2
Fixed NULL pointers to match coding standards.
2016-01-25 13:42:30 -08:00
Andrew Parlane
9969167c2a
ObjFileParser: Moved the parsing of line continuations (backslashes) to the parsing code.
...
Rather than removing all backslashes followed by newlines from the buffer,
and then parsing it. Handle removing the backslashes as we go. This means
we don't need to erase the backslashes from the buffer (which is O(n))
instead we just skip those characters as we parse the buffer line by line.
2016-01-23 20:01:44 -04:00
Andrew Parlane
ce64dfb3fd
ObjTools: Update getName() to work with const iterators.
...
Ther's no need to convert the input parameter to a char * when we can just
leave it as it is.
2016-01-23 20:01:44 -04:00
rmitton
ae2cce0899
Validation fix for empty scenes.
...
The validator requires empty scenes to have NULL pointers.
2016-01-23 15:22:48 -08:00
Kim Kulling
0e4cf64a45
Merge pull request #763 from andrewparlane/mtlFix
...
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
2016-01-23 19:51:49 +01:00
Andrew Parlane
3c4e06c23f
ObjFileMtlImporter: Fixed a segfault due to NULL ptr access.
...
We don't handle reflection textures during MTL import. This allowed a NULL
ptr to be used. Simply return in the case of a reflection texture.
2016-01-23 13:11:47 -04:00
Stepan Hrbek
c062eb0db4
Collada exporter: improve compatibility when exported path contains ':'.
...
Old code exported "c:/foo.jpg" path as "c%3a/foo.jpg".
Replacing : with %3a was probably legal, but it made paths unreadable for existing Max importers.
2016-01-21 22:35:44 +01:00
Kim Kulling
df9bb8b915
Update license date.
2016-01-21 19:53:25 +01:00
Kim Kulling
ded37e8307
Merge pull request #736 from StepanHrbek/collada-unicode
...
Collada exporter: fix unicode.
2016-01-19 16:35:48 +01:00
Stepan Hrbek
24f03141d6
Reimplement isalnum(c,C locale) because I can't make AppVeyor see satndard version.
2016-01-18 10:10:49 +01:00
wise86Android
c7f69e151e
fix memory leak
2016-01-17 15:18:12 +01:00
wise86Android
4af9632269
fix memory leak
2016-01-17 00:00:43 +01:00
wise86Android
bd032488e4
remove read unitilize memory
2016-01-16 23:42:43 +01:00
wise86Android
d51c2e6435
free the allocated import
2016-01-16 23:37:24 +01:00
wise86Android
f0fca826db
remove initialization warnings
2016-01-16 23:28:52 +01:00
wise86Android
01a5035920
remove initialization warnings
2016-01-16 23:26:46 +01:00
Kim Kulling
8c13c8a558
PLYExporter: forbit copying + add empty destructor.
2016-01-14 20:44:09 +01:00
Kim Kulling
18c0e41d8f
Colladaloader: fix usage of floorf.
2016-01-13 10:04:24 +01:00
Kim Kulling
42c1f9d3ba
Closes https://github.com/assimp/assimp/issues/630 : fix mis-merge.
2016-01-12 20:22:37 +01:00
Kim Kulling
d3ddabbd3e
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-11 21:16:17 +01:00
Kim Kulling
36668aa31a
ASEParser: fix invalid size of buffer for log writing.
2016-01-11 21:15:30 +01:00