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