38b9ae2c6c
closes https://github.com/assimp/assimp/issues/584 : export scene combiner.
2016-09-24 00:27:45 +02:00
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
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
0277a23521
Add Triangulate post-processing step to glTF exporters
2016-09-21 11:33:02 -04:00
3052f35824
glTF: move mesh splitting to constructor to cover GLB
2016-09-20 14:15:42 -04:00
c9f28192d9
Merge upstream master
2016-09-20 11:53:12 -04:00
f11545d2c0
[*] Merge with fresh master.
2016-09-20 16:02:41 +03:00
b8950f6d90
Merge pull request #998 from johnmaf/bugfix/gltfUVs
...
Flip UVs in glTFExporter
2016-09-20 09:53:57 +02:00
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
3c827f29f6
Export glTF buffers as separate .bin files
2016-09-19 17:44:38 -04:00
a9284e5a95
[F] Removed unneeded definitions.
...
[F] Add library for linker.
2016-09-15 20:39:39 +03:00
cd038209dd
Add all glTF data to single buffer
2016-09-15 10:38:02 -04:00
65048d1ef7
[F] Removed Unicode BOM at file beginning.
2016-09-15 14:45:00 +03:00
8b3f348d63
Flip UVs in glTFExporter
2016-09-14 18:03:52 -04:00
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
24e25324f2
Merge branch 'master' into gltf_o3dgc
2016-09-13 12:08:51 +03:00
0c00edb40e
Blender: fix some minor findings.
2016-09-12 12:41:49 +02:00
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
a375344052
Merge branch 'master' into gltf_o3dgc
2016-09-10 10:37:32 +03:00
22cfe84cba
3MF: add a simple box example from the 3MF-sample repo.
2016-09-10 09:27:29 +02:00
7cedd4ab89
CMake: fix buildCMake: fix build..
2016-09-10 08:48:01 +02:00
5fe32caa6d
Merge branch 'master' into gltf_o3dgc
2016-09-10 09:14:28 +03:00
d97f00571e
[*] Not needed namespace.
2016-09-10 09:07:50 +03:00
ac1bcaa4cc
Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc
2016-09-10 09:05:36 +03:00
95676b4db9
Merge branch 'master' of https://github.com/assimp/assimp
2016-09-09 20:42:36 +02:00
05fce9a008
3MF: make xml tags static const.
2016-09-09 20:42:02 +02:00
b22f93eabf
3MFImporter: add source group for visual dtudio.
2016-09-09 20:41:04 +02:00
d49ad6c93e
[*] Stylistic changes.
...
[F] Added all files from Open3DGC codec to CMakeLists.txt
2016-09-09 16:38:43 +03:00
702d57fbae
Split mesh before exporting gltf. Fixes #995
2016-09-07 17:03:19 -04:00
ccf1b368c8
Merge branch 'master' of https://github.com/assimp/assimp
2016-09-06 15:46:41 +02:00
ffdca3593b
ObjImporter: remove unused code.
2016-09-06 15:41:37 +02:00
0f2cea7ba6
Blender: revert fix for suspicious crash in blender on windows.
2016-09-06 10:42:02 +02:00
9e19b5103c
IrrImporter: Fix release functions.
2016-09-05 10:48:30 +02:00
cc860ede66
Fix coverity findings: fix usage after free.
2016-09-04 20:40:34 +02:00
9d4d2b2a1c
ComputeUVMappingprocess: add missing initialization for scalar value.
2016-09-04 20:35:07 +02:00
bcdc79ba73
Fix invalid release of mat + mesh.
2016-09-04 20:22:04 +02:00
e51b7d2a61
IFC: fix possible use after free access bug.
2016-09-02 20:06:56 +02:00
b240b9d30d
Blender: fix invalid OnjectCompare op.
2016-09-02 20:06:31 +02:00
2568797015
MDLMoader: fix resource leak.
2016-08-30 19:50:53 +02:00
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
c6f670ff50
glTFImporter: avoid out-of-bounds-access.
2016-08-29 20:05:29 +02:00
147921ac39
MakeVerboseFormat: fix invalid delete statement.
2016-08-29 19:56:38 +02:00
26aa18c75a
Fix findings from code review.
2016-08-29 18:23:41 +02:00
2545dee58d
Fix coverity findings: fix possible out-of-bound access.
2016-08-29 15:32:27 +02:00
238f14f30f
Fix coverity findings: fix possible usage after calling free.
2016-08-29 15:28:37 +02:00
a66e644bf3
Fix coverity finding: fix possible use after free..
2016-08-29 15:24:24 +02:00
243df452a4
GeometryBuilder: fix update of vertices.
2016-08-25 18:20:52 +02:00
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
666d1ce164
Changed C-style casts to static_cast.
2016-08-18 10:55:24 -07:00
c2c12c1db5
Use Assimp namespace to fix build for big-endian architectures
2016-08-18 10:51:20 +02:00
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
3f08cebfab
include config.h to always have the correct types (float/double) exposed
2016-08-17 07:57:31 +10:00
4f7b624fe8
fix precision issue within memory copy
2016-08-16 16:03:56 +10:00
63a4591683
Fixing bugs related to 64-bit upgrade in materials
2016-08-16 16:03:56 +10:00
27f81884f9
adding support to store all the layered textures
2016-08-15 09:58:53 -07:00
2732e5d9b6
[F] Removed Unicode BOM.
2016-08-14 19:49:05 +03:00
e0356b09be
Merge branch 'master' into gltf_o3dgc
2016-08-14 16:49:53 +03:00
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
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
de70f5c028
[+] Added link to RT library when using Open3DGC-compression.
2016-08-13 17:44:58 +03:00
3a10a3cf03
[-] Removed unneeded include.
2016-08-13 16:27:34 +03:00
8ab50aa9a0
[*] Few C++11 constructions are removed.
2016-08-13 16:27:07 +03:00
1844665693
[*] Few C++11 constructions are removed.
2016-08-13 16:09:21 +03:00
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
83b02ff41f
DefaultIOStream: add missing detection for apple-based OS.
2016-08-12 18:14:26 +02:00
bdcff35d5d
closes https://github.com/assimp/assimp/issues/901
2016-08-12 17:13:18 +02:00
0ad2f2247a
[+] glTF import/export. Support for Open3DGC-compression of mesh primitives.
2016-08-11 01:04:30 +03:00
778ad7f06f
[+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression.
2016-08-09 13:37:32 +03:00
9a4fa1321b
[+] Save parameters of mesh extension: Open3DGC-compression.
2016-08-09 13:26:57 +03:00
507668229f
[+] Support Open3DGC for glTF import/export. Intermediate commit.
2016-08-08 19:24:50 +03:00
41ed74beb6
[*] Style. Intermediate commit.
2016-08-08 19:07:30 +03:00
a6ec0e4c7a
[*] Style. Intermediate commit.
2016-08-08 19:06:17 +03:00
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
c024beadba
[+] Put information to log about decompressing.
2016-08-03 11:16:30 +03:00
5e4fd5fa3c
[+] glTF. Support for import meshes with Open3DGC compression.
2016-08-03 03:46:04 +03:00
2e452205aa
[+] Building of Open3DGC codec.
2016-08-03 03:40:53 +03:00
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
66c1a176de
Add files via upload
...
forcing a new build
2016-07-25 23:04:08 -06:00
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
667aa37fdd
Add files via upload
...
used ai_real instead of float
2016-07-24 18:45:41 -06:00
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
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
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
5fc3ee9a21
fix https://github.com/assimp/assimp/issues/946 : use correct test for objectcompare in blender.
2016-07-17 13:54:01 +02:00
c57b524a59
moving cmake configure_file to appropriate location
2016-07-16 18:47:59 +10:00
a7894b090d
Upgrading PLY exporter to allow element definition as double
2016-07-16 18:23:33 +10:00
ad8bb32561
Properly defining build-time defines in config.h
2016-07-16 18:23:33 +10:00
05a6ee6473
Adding double precision import support for formats that can be exported
2016-07-16 18:23:33 +10:00
fa1d6d8c55
propagating precision requirments into operations
2016-07-16 18:23:33 +10:00
5adb0e899c
CMake Option and moving more functions to optional double support
2016-07-16 18:23:33 +10:00
2f7e3dcdcc
Basic changes to introduce optional double precision
2016-07-16 18:23:33 +10:00
45fae27aed
DefaultIOStream: export class for testing.
2016-07-16 09:13:59 +02:00
a15a77dff5
glTF: fix doxygen typo.
2016-07-15 10:35:44 +02:00
e1697b30bc
Blender: mark local function as static.
2016-07-15 10:33:48 +02:00
9678da72c9
Public includes: add pragma statement and formalize include guard schema.
2016-07-11 20:56:38 +02:00
02602ce9af
Update license date.
2016-07-10 15:34:58 +02:00
a8673d4828
Merge pull request #941 from assimp/feature/issue_940
...
Feature/issue 940
2016-07-08 19:29:51 +02:00
4d012bc476
Update version.
2016-07-08 18:40:26 +02:00
599e846f57
Remove dead code.
2016-07-08 18:31:19 +02:00
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
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
10f22779f4
setting default export precision to 17 for all exporters
2016-07-06 14:49:14 +10:00
19769eef8b
Version: prepare 3.3 version.
2016-07-05 18:43:16 +02:00
7b08233ef2
Fix identation
2016-07-01 17:08:28 +02:00
3c7dd2b302
More whitespace consistency
2016-07-01 17:02:54 +02:00
616aa022a7
CMake: whitespace consistency, variable naming
2016-07-01 16:57:45 +02:00
9c7de7b2a8
Update to latest Melange SDK
2016-07-01 14:50:46 +02:00
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
5321072007
Static code analysis: fix minor finding.
2016-06-28 11:25:04 +02:00
7d98643bcf
adding support for per-vertex colors.
2016-06-27 20:08:22 -04:00
9b6de15b74
closes https://github.com/assimp/assimp/issues/904 : add ai_strtof for
...
VS2012.
2016-06-20 20:30:29 +02:00
447a9642c2
closes https://github.com/assimp/assimp/issues/918 : use correct lib
...
install name for macos.
2016-06-17 20:42:19 +02:00
b01e424476
Merge pull request #917 from assimp/feature/new_includes
...
Feature/new includes
2016-06-14 22:54:56 +02:00
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
334ac9a7d0
Merge pull request #908 from Adjective-Object/master
...
Added 'joint' node type to Collada export
2016-06-13 11:35:11 +02:00
f15b6177f7
glTFExporter fixes: spaces to tabs
2016-06-10 13:41:59 -04:00
32d9ef042a
Merge branch 'master' into gltfErrors
2016-06-10 09:51:35 -04:00
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
81773b4e4e
Update fast_atof.h
...
Fix include brackets.
2016-06-07 11:51:09 +02:00
7207e5117c
Use new include bracktes.
2016-06-06 22:04:29 +02:00
d23439451a
Added 'joint' node type to Collada export
2016-06-05 21:04:02 -04:00
814d2e7821
Merge branch 'master' of https://github.com/assimp/assimp
2016-06-04 19:04:06 +02:00
0a1dda22b2
ColladaParser: add warning when empty semantic will be parsed.
2016-06-04 17:53:51 +02:00
d67c8c29b6
Merge pull request #898 from turol/cxx11-refactor
...
Use C++11 range-based for loops
2016-05-26 16:56:07 +02:00
bb2b30e54a
fix strncpy not null terminated bug
2016-05-26 16:13:21 +08:00
8fa0071d16
closes https://github.com/assimp/assimp/issues/892 : add own to_string
...
implementation.
2016-05-26 00:44:29 +02:00
4e982c0538
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-26 00:41:48 +02:00
2cbbc3da09
OpenGEX-Importer: remove dead code.
2016-05-26 00:41:31 +02:00
abad093d09
Update OpenGEXImporter.cpp
...
Fix compiler warning: remove unused variables.
2016-05-25 10:18:24 +02:00
5463146688
Add std::string header.
2016-05-25 00:58:05 +02:00
f9f493d017
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-25 00:27:16 +02:00
037fec275c
std::to_string: add replacement for android build chain.
2016-05-25 00:26:41 +02:00
381f87507f
SplitLargeMeshes: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
896ab8eee2
Unreal: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
d238597459
Raw: Use C++11 range-based for loop
2016-05-23 17:33:52 +03:00
6c9c040419
Q3BSP: Use C++11 range-based for loop
2016-05-23 17:33:51 +03:00
a09a6a40c0
OpenGEX: Use C++11 range-based for loop
2016-05-23 17:33:49 +03:00
32e4dd0bd1
Ogre: Use C++11 range-based for loop
2016-05-23 17:30:48 +03:00
3eb9b8e91b
NFF: Use C++11 range-based for loop
2016-05-23 17:30:47 +03:00
ac676d4d3c
MD5: Use C++11 range-based for loop
2016-05-23 17:30:47 +03:00
b9fbfbc18a
LWO: Use C++11 range-based for loop
2016-05-23 17:30:42 +03:00
cd4f212b5f
Merge pull request #891 from ciechowoj/blender_materials
...
Blender materials
2016-05-22 14:39:45 +02:00
3031470ec1
IRR: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
c7c756d344
FBX: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
8566b9aa90
D3MF: Use C++11 range-based for loop
2016-05-22 13:57:13 +03:00
52405bbe1b
Collada: Use C++11 range-based for loop
2016-05-22 13:57:11 +03:00
f0ebb40f19
ASE: Use C++11 range-based for loop
2016-05-22 13:57:09 +03:00
b345f79d45
3DS: Use C++11 range-based for loop
2016-05-22 13:57:06 +03:00
38ce71d5a0
Update glTFAsset.inl
...
closes https://github.com/assimp/assimp/issues/893 : fix invalid memcpy usage.
2016-05-19 09:10:56 +02:00
c9c6fda28e
Merge pull request #889 from ciechowoj/area_lights
...
Adds support for area lights.
2016-05-18 00:11:05 -07:00
c554b55f97
Merge branch 'blender_materials'
...
Conflicts:
test/CMakeLists.txt
2016-05-17 22:52:18 +02:00
c4a542a994
Adds blender material loading.
2016-05-17 21:17:51 +02:00
fc5464eb38
Pull from upstream, 5/17/2016
2016-05-17 08:44:38 -04:00
913f26475d
Adds importing blender material.
2016-05-16 21:17:58 +02:00
25d84a6aff
Adds support for area lights.
2016-05-16 13:04:43 +02:00
560e1eebc1
fix for https://github.com/assimp/assimp/issues/887 : add missing define.
2016-05-16 11:24:04 +02:00
1acd24e0ae
iSIBImporter: fix possible dereferncing of a null pointer.
2016-05-15 19:56:29 +02:00
6575696459
OpenGEX: fix coverity findings.
2016-05-15 18:57:10 +02:00
e1084b5314
Merge branch 'feature/opengex_missing_features'
2016-05-14 10:36:46 +02:00
210182b17a
OpenGEX: fix coverity findings.
2016-05-14 10:10:05 +02:00
159af06524
Fixed GLTF bugs, and added a few test models
2016-05-10 16:25:15 +02:00
86a636fbbf
Add in IRRMESH option
2016-05-09 18:26:18 -04:00
e9085097f3
OpenGEX: add light impl and add examples.
2016-05-09 20:43:22 +02:00
0d5eb30a28
CameraObj: load camera data in the correct way.
2016-05-08 22:31:16 +02:00
82f73b6d03
OpenGEX: fix invalid access to textures. Next steps to camera and light.
2016-05-08 11:09:53 +02:00
00b574d746
Fixed compile issue for travis-ci
2016-05-07 15:36:05 +02:00
753b63c526
Removed override keywords so compilation success on gcc 4.6
2016-05-07 15:15:00 +02:00
89320bab46
Merge branch 'master' of https://github.com/assimp/assimp
2016-05-07 14:18:17 +02:00
8f4f0047fb
Added 3MF importer
2016-05-07 14:16:33 +02:00
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
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
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
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
167bc579c5
Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std.
2016-05-05 15:41:12 +02:00
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
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
e9b93788ca
Merge pull request #863 from mpersano/master
...
Fix texture coords exporting on binary PLY files
2016-05-03 21:55:17 +02:00
12613720ff
Fix macro used for detecting IRR support
2016-05-02 18:24:26 -04:00
8449afad71
Merge pull request #868 from otgerrogla/master
...
Fixed a few GLTF importer/exporter bugs
2016-04-28 22:56:41 +02:00
11e52dc3d7
Removed rogue comma
2016-04-28 21:34:31 +02:00
2fe401fc54
Fixed gcc compilation error
2016-04-28 21:22:01 +02:00
64f78e003f
Fixed crashes when files were not found, and fixed some warnings
2016-04-28 20:50:01 +02:00
46e7ae5dc0
OpenGEX: prepare light- and camera-node and object.
2016-04-28 20:20:40 +02:00
d9b365eb90
Fixed a few GLTF importer/exporter bugs
2016-04-28 18:44:47 +02:00
5192b837da
Replace std::endl by using backslash n.
2016-04-27 17:58:40 +02:00
7468ca5c35
VS2015-code analysis: fix finding ( index var type too small ).
2016-04-23 09:43:20 +02:00
829e56df0c
cmake env: add license info.
2016-04-23 09:42:05 +02:00
473d2ca052
Fix texture coords exporting on binary PLY files
2016-04-22 16:09:45 -03:00
2f9c33e3e9
closes https://github.com/assimp/assimp/issues/857
2016-04-20 23:27:59 +02:00
0ec1e91722
Regression Testsuite: update database.
2016-04-19 08:49:14 +02:00
22dc22778d
Assxml exporter: Make some local functions static.
2016-04-19 08:48:37 +02:00
1b94b8969f
Blender Importer: fix review findings.
2016-04-19 08:45:04 +02:00
5a8c15d826
fix SceneCombiner copy of aiNode not setting mParent field
2016-04-18 11:28:21 +02:00
de39c49c4c
assxml export: make local functions static.
2016-04-17 23:29:46 +02:00
a6e7938696
Assxml io function: use vsprintf for var-argument list.
2016-04-17 21:33:11 +02:00
dec93efc92
AssxmlExporter: fix crash in writing header info in VS2015.
2016-04-16 18:42:49 +02:00
6b243230b2
C++11-Support: remove boost.
2016-04-07 21:31:04 +02:00
632b58f27e
Merge pull request #850 from mensinda/no-boost
...
Replaced boost with c++11 features
2016-04-06 21:16:23 +02:00
b045a1ec5c
Deleted move constructor of LazyObject
2016-04-06 21:03:54 +02:00
3eafc7e746
Renamed Math.h --> MathFunctions.h
2016-04-06 16:54:03 +02:00
Kim Kulling
Kim Kulling
johnmaf
Alexandr Arutjunov
James Walker
Daniel Knezevic
Chris Russ
roshan.c
Alexander Gessler
TrianglesPCT
Adi Shavit @ MacBookPro
Volodymyr Boichentsov
Fabian Herb
cmdrf
Roy Shilkrot
Kangning Li
Maxwell Huang-Hobbs
Dirk
Turo Lamminen
ciechowoj
Richard Selneck
Otger
Richard Selneck
Gorilux
Alexander Gessler
mpersano
tomacd
mensinda