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
0ba0eca48e
[+] Call for X3D exporter.
2016-10-04 23:55:08 +03:00
8d3184f6fb
Merge branch 'master' of https://github.com/assimp/assimp
2016-10-04 18:41:25 +02:00
86dc3f7a79
X3D: Some more reformattings and missing initializations.
2016-10-04 18:40:58 +02:00
d249cca011
created the asset writer function for animations export gltf
2016-10-04 07:09:01 -07:00
7bf6cfc9f6
removed BOM
2016-10-04 12:45:28 +02:00
7b9162136f
Some small format changes for assimp-style :-).
2016-10-04 11:45:08 +02:00
37d32e79c9
created exportAnimation function
2016-10-03 19:29:37 -07:00
f378230a13
Sort by primitive type before exporting as glTF
2016-10-03 17:19:44 -04:00
9dc4fb2aa3
AMF: add missing license info.
2016-10-03 19:24:14 +02:00
99c93e861c
Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors
2016-10-03 09:34:16 -07:00
aeb99898d3
[*] Set float type for constants: less warnings, less type truncations.
2016-10-02 20:00:57 +03:00
897370b6ff
[*] Pull fresh data.
...
[F] Using ssize_t is bad idea.
2016-10-02 19:52:24 +03:00
268b18dabf
Merge branch 'master' into import_x3d
2016-10-02 17:31:44 +03:00
3086a07e86
[*] Docs and build-files fixes.
2016-10-02 17:27:13 +03:00
59212bf55a
Merge pull request #1011 from smalcom/import_amf
...
Import amf
2016-10-02 14:52:00 +02:00
6233f65b3a
Merge pull request #1012 from johnmaf/bugfix/glTF-transparency
...
glTF: Read and write transparency values
2016-10-02 11:52:59 +02:00
9c0de90ede
[F] Fixed missed break.
...
[F] Doc changes.
[*] Removed Boost dependency.
[*] Style changes.
2016-10-02 03:08:34 +03:00
823003ba9b
[F] Fixing checking rule
2016-10-02 02:28:06 +03:00
0619232aef
included samplers dictionary for textures
2016-09-30 17:23:38 -07:00
8856f7f6ae
Merge branch 'import_amf' into import_x3d
2016-09-30 02:38:59 +03:00
9d4d0de607
[*] Few changes for building using old (or MS) compilers.
2016-09-30 02:24:24 +03:00
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
83c0163ec6
glTF: Read and write transparency values
2016-09-29 17:44:04 -04:00
db54eb98e3
Merge branch 'import_amf' into import_x3d
2016-09-30 00:30:26 +03:00
f497f739fa
[*] Not all modern compilers is support new C++ feature "using". What the sad?
2016-09-30 00:03:34 +03:00
8ad6c80dac
[*] Removed Boost dependency.
2016-09-29 23:48:41 +03:00
61bced27df
[*] Removed Boost dependency.
2016-09-29 23:38:24 +03:00
76c84aa24d
[F] Header missed.
2016-09-29 23:19:47 +03:00
ef9b6a7375
[F] Removed UTF-8 BOM
2016-09-29 23:16:59 +03:00
3274951f2a
[+] X3D importer.
2016-09-29 18:50:24 +03:00
e4cb388153
[*] Style and doc changes.
2016-09-29 18:04:31 +03:00
818fb2e901
[F] Typo: invalid format hint index.
2016-09-29 17:11:53 +03:00
7dd2e7011d
fixed issue with texcoordinate bufferview target
2016-09-28 18:50:08 -07:00
f2e6f2f67f
work around for indices array in ExportData
2016-09-28 15:56:06 -07:00
e89e98291a
calculate and write min and max attributes for accessors
2016-09-28 14:47:15 -07:00
0a25b076b8
Merge branch 'master' into import_amf
2016-09-28 17:51:59 +03:00
cb38054247
[+] AMF-importer. Also some fixes for modern Assimp.
2016-09-28 17:49:15 +03:00
9f7e34663e
FBX: make lookup test less strict. closes https://github.com/assimp/assimp/issues/994
2016-09-28 16:16:06 +02:00
f383ec0797
Fix some review findings.
2016-09-28 00:06:23 +02:00
cd9cb50eaf
OpenGEX: fix some review findings.
2016-09-28 00:06:06 +02:00
3e322495f2
asset.version from int to string
2016-09-27 11:38:17 -07:00
36d770d3db
OpenGEX: fix some review findings.
2016-09-27 19:47:27 +02:00
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
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
386128febc
[+] Building AMF-importer.
2016-09-26 12:57:44 +03:00
8e9c0235d3
153083/2 Buffer not null terminated
2016-09-25 15:21:30 +02:00
07ec476b7d
122143,122139 Copy into fixed size buffer
2016-09-24 21:34:58 +02:00
08da6b278d
122180 Resource leak
2016-09-24 20:29:49 +02:00
33dcf4dbd3
122185 Pointer to local outside scope
2016-09-24 20:24:38 +02:00
94538e9d87
122193 Uninitialized scalar variable
2016-09-24 20:19:43 +02:00
5bec41ad16
122198 Resource leak
2016-09-24 20:11:07 +02:00
4872c4caf8
122238 Use after free
2016-09-24 19:19:48 +02:00
3f53ffa576
122243,122194 Resource leak
2016-09-24 16:27:40 +02:00
61097479c8
122243 Resource leak
2016-09-24 15:55:37 +02:00
04e0552f9e
134062 Use after free
2016-09-24 12:33:53 +02:00
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
96fab1cf55
122219-122218 Big parameter passed by value
2016-09-19 22:23:13 +02: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
f51cd4c6d4
Merge branch 'master' into coverity_scan
2016-09-12 12:42:11 +02: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
a54835c91d
Merge master
2016-09-04 20:41:20 +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
f59cba13eb
Try fixing clang builds
2016-04-06 11:10:12 +02:00
726b004806
Removed boost/noncopyable.hpp
2016-04-06 10:51:18 +02:00
51c80ecb80
Moved gcd and lcm implemetation
2016-04-06 10:21:59 +02:00
cc0fce8568
Replaced boost::timer with std::chrono
2016-04-06 10:13:02 +02:00
ae99f99b99
Replaced boost::tuple with std::tuple
2016-04-06 00:17:21 +02:00
b37e25cd7d
Replaced boost::format with internal formater
2016-04-06 00:03:05 +02:00
5dacda0a08
replaced boost smart pointers with c++11 smart pointers
2016-04-05 23:23:53 +02:00
cff5b0d1a0
Replaced depreacated std::auto_ptr with std::unique_ptr
2016-04-05 22:56:11 +02:00
18843fe5e1
Replaced BOOST_FOREACH with c++11 ranged for loops
2016-04-05 22:53:54 +02:00
4836a2993e
Replaced boost::thread with std::thread
2016-04-05 22:28:21 +02:00
20630e950a
Regression test suite: add ui for simpler text execution.
2016-04-05 22:02:02 +02:00
a2d9cbef7e
Update STEPFileReader.cpp
...
StepFileReadder: initialize var with nullptr.
2016-04-04 12:52:22 +02:00
f2d5921252
Update FBXConverter.cpp
...
FBXConverter: initialize aiNodeAnim with nullptr.
2016-04-04 12:48:53 +02:00
87e7cf00a2
Fix spelling mistakes
2016-04-03 01:38:00 +01:00
d094dfc3a1
Merge pull request #800 from pkholland/master
...
Can't add integer to string pointer
2016-04-01 10:01:23 +02:00
49d60dc856
Merge pull request #832 from assimp/no-boost
...
Removed usage of Boost static assert.
2016-03-31 15:42:53 +02:00
0d44479399
Import reflectance factor from Blender.
2016-03-29 21:16:26 +02:00
1592a18210
PLYLoader: fix review comments.
2016-03-25 00:09:56 +01:00
42d29b1bfe
Merge branch 'master' of https://github.com/assimp/assimp
2016-03-24 19:54:33 +01:00
7c71f0b7a9
PLYLoader: improve readability by refactorings.
2016-03-24 19:53:15 +01:00
6be4d82a6b
Merge pull request #835 from robertliebo/VCS-1030/ObjMtlFilenameFallback
...
Vcs 1030/obj mtl filename fallback
2016-03-22 20:35:41 +01:00
23892a6ded
FBX: add debugging tool to log class type + info.
2016-03-22 20:30:25 +01:00
ca0fa2ba69
FBX-Importer: put debug printf into comments.
2016-03-22 20:25:29 +01:00
124fc9ae27
[VCS-1030] add log info about .mtl fallback
2016-03-22 18:39:52 +01:00
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
397fa374a3
Removed usage of Boost static assert.
2016-03-18 17:02:39 -07:00
76e4e82ecb
FBX: fix https://github.com/assimp/assimp/issues/782
2016-03-16 20:26:33 +01:00
644d6a9a67
Collada: refactorings.
2016-03-15 21:17:38 +01:00
d89e7943ad
FBX Close issue-806: support version 7400.
2016-03-15 21:16:47 +01:00
e3d7ca264c
Collada: reset workaround.
2016-03-15 19:28:57 +01:00
3a7c3a5698
Test for issue-731: possible overflow.
2016-03-14 21:00:08 +01:00
7e9fe2d654
OpenGEX: use correct number of uv-coordinates for texture coordinates.
2016-03-13 20:22:36 +01:00
555f533777
MD3: Check file is big enough to contain all the advertised surfaces
2016-03-13 00:57:08 +02:00
da0b180901
MD3: Fix crash on invalid vertex index
2016-03-13 00:57:08 +02:00
b0f453dba8
MD2: Check file is big enough to contain all the advertised frames
2016-03-13 00:57:08 +02:00
8d2af995de
MD2: Fix integer overflows on malformed input
2016-03-13 00:57:08 +02:00
e2361bf209
MDL: Fix read past end of buffer on malformed input
2016-03-12 22:35:54 +02:00
6ee5fdf567
OpenGEX: fix review finding.
2016-03-12 20:55:11 +01:00
b4b303ab55
OpenGEX: fix alloc for texture coordinates.
2016-03-12 13:22:09 +01:00
93be0f69da
PlyParser: fix invalid loading when comment is empty.
2016-03-10 17:47:07 +01:00
3c9e57fd73
Fix memory leak in OBJ loader when a mesh has no faces.
2016-03-04 03:40:47 -08:00
53370d0d31
FBXImporter: some refactorings to increase readability.
2016-03-03 18:38:50 +01:00
2b09199f4a
FBXImporter: move MeshGeometry declaration into its own header
2016-03-03 15:19:38 +01:00
3079b90622
Importer: when the right importer was found log this info.
2016-02-29 15:57:47 +01:00
e9f47b08c5
FBXImporter: fx build.
2016-02-28 20:56:11 +01:00
28d327b7ea
FBXImporter: fix build.
2016-02-28 20:27:31 +01:00
2496e8a0a3
Lib: reduce number of header files included.
2016-02-28 17:30:11 +01:00
58fc3940f2
Obj Importer: add missing semicolon to fix the build.
2016-02-25 19:04:13 +01:00
99f00834ec
closes ssues/804: add statement to take care of emissive texture, new
...
version.
2016-02-25 18:00:09 +01:00
f20a5afcf0
can't add integer to string pointer
2016-02-18 12:17:47 -08:00
38d462f0b3
Merge pull request #764 from rmitton/sib_import
...
Validation fix for empty SIB scenes.
2016-02-18 11:58:26 +01:00
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
b71bd3df84
LWO: Fix division by zero
2016-02-13 23:37:08 +02:00
322c959424
Merge pull request #791 from trond/collada_animation_clip
...
Collada animation clip support
2016-02-11 22:11:27 +01:00
f0717b1d7c
Merge pull request #793 from AlexBobkov/master
...
Fixed installing pdb file
2016-02-11 22:10:21 +01:00
a5f9d0d3fc
Fixed installing pdb file
2016-02-11 16:24:26 +03:00
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
ccd9f92533
Fixed a couple of nested template brackets that wasn't spaced out correctly.
2016-02-11 01:00:03 +01:00
4d5df6dc9a
use NormalizeSafe to prevent NaN when normalizing zero vectors
2016-02-11 12:19:06 +13:00
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
d9017299a8
iObjParser: refactorings.
2016-02-10 10:40:39 +01:00
8681abe845
Obj_Importer: remove dead code.
2016-02-09 17:50:08 +01:00
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
c34717639e
Collada: Importer generates animations from <library_animation_clips>, if the node is present.
2016-02-07 23:36:49 +01:00
72b5ed50e9
Bump just to get AppVeyor to re-test it.
2016-02-07 13:21:58 -08:00
37a3976b30
Revert "Fix issue: OBJ import takes forever ( #759 ) (attempt 2)"
2016-02-07 20:03:24 +01:00
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
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
dfbae1294f
JoinVerticesProcess: iAdd test for possible null pointer access.
2016-02-05 18:53:23 +01:00
a74b321ed1
Add unittests for defect reproduction.
2016-02-04 20:43:02 +01:00
699aa9c583
Closes https://github.com/assimp/assimp/issues/754 : use correct index
...
token.
2016-02-03 21:09:20 +01:00
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
a1bd83d797
ai_assert: split 2 checks in one macro to 2 separate ai_assert tests.
2016-02-01 16:16:09 +01:00
16fffb2ab1
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-31 00:42:02 +01:00
a37ea18f09
SIBImporter: fix c++14 compilation issue for clang.
2016-01-31 00:41:14 +01:00
bcd38707c5
3DSConverter: fix level 4 compiler warning.
2016-01-29 21:22:41 +01:00
bac6067869
gltf: make code more radable and check against one possible null ptr
...
access.
2016-01-27 20:26:38 +01:00
0e7446af83
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-27 18:49:26 +01:00
8bbd55a790
PostProcessing: first prototype of customized post processing.
2016-01-27 18:49:01 +01:00
f473b17c99
Merge pull request #773 from boxdot/master
...
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 17:20:26 +01:00
13ec11bca8
Import mClipPlane{Near,Far} and mHorizontalFOV from Blender.
2016-01-27 02:12:15 +01:00
b3b08728fa
fix new / delete missmatch
2016-01-26 22:47:50 +01:00
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
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
4633266c31
Revert "Fix issue: OBJ import takes forever ( #759 )"
2016-01-25 23:53:59 +01:00
f23285a1ce
Fixed whitespace to match coding standard.
2016-01-25 13:45:08 -08:00
94a35dfdd2
Fixed NULL pointers to match coding standards.
2016-01-25 13:42:30 -08:00
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
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
ae2cce0899
Validation fix for empty scenes.
...
The validator requires empty scenes to have NULL pointers.
2016-01-23 15:22:48 -08:00
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
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
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
df9bb8b915
Update license date.
2016-01-21 19:53:25 +01:00
ded37e8307
Merge pull request #736 from StepanHrbek/collada-unicode
...
Collada exporter: fix unicode.
2016-01-19 16:35:48 +01:00
24f03141d6
Reimplement isalnum(c,C locale) because I can't make AppVeyor see satndard version.
2016-01-18 10:10:49 +01:00
c7f69e151e
fix memory leak
2016-01-17 15:18:12 +01:00
4af9632269
fix memory leak
2016-01-17 00:00:43 +01:00
bd032488e4
remove read unitilize memory
2016-01-16 23:42:43 +01:00
d51c2e6435
free the allocated import
2016-01-16 23:37:24 +01:00
f0fca826db
remove initialization warnings
2016-01-16 23:28:52 +01:00
01a5035920
remove initialization warnings
2016-01-16 23:26:46 +01:00
8c13c8a558
PLYExporter: forbit copying + add empty destructor.
2016-01-14 20:44:09 +01:00
18c0e41d8f
Colladaloader: fix usage of floorf.
2016-01-13 10:04:24 +01:00
42c1f9d3ba
Closes https://github.com/assimp/assimp/issues/630 : fix mis-merge.
2016-01-12 20:22:37 +01:00
d3ddabbd3e
Merge branch 'master' of https://github.com/assimp/assimp
2016-01-11 21:16:17 +01:00
36668aa31a
ASEParser: fix invalid size of buffer for log writing.
2016-01-11 21:15:30 +01:00
1632f1fbb9
ObjImporter: Added better progress reporting during file import.
...
There are two stages to this:
1) Processing '\'s - this accounts for 1/3rd of the file import progress.
2) Parsing the file data - this accounts for the other 2/3rds.
2016-01-11 12:21:24 -04:00
bd268bd864
coverity scan: add missing initialization.
2016-01-10 20:25:01 +01:00
ec32da512b
coverity scan: fix not initialized member in copy constructor.
2016-01-10 20:21:32 +01:00
3033d8c847
ColladaLoader: add missing .f
2016-01-09 18:09:52 +01:00
d18f978178
ColladaLoader: add missing members to initializer list.
2016-01-09 18:09:10 +01:00
430b614a69
coverity scan: make place of false positive more understandable.
2016-01-08 16:18:32 +01:00
7ef579674d
GenVertexNormalsProcess: use initalizer list instead of setting the earch angle in the constructor.
2016-01-07 15:03:10 +01:00
56a77b2429
snprintf-replacement: fix invalid preprocessor defines for compiler
...
detection on windows for older vs-versions
2016-01-06 19:55:04 +01:00
d43a083dc1
snprintf replacement: fix usage of ai_snprintf when snprintf is available.
2016-01-06 19:25:35 +01:00
6bfdeb6a12
sprintf replacement: introduce au_snprintf to support snprintf for v2013
...
and earier ( closes https://github.com/assimp/assimp/issues/743 )
2016-01-06 15:35:25 +01:00
67c258e75d
snprintf: change next couple of sprintf to snprintf.
2016-01-05 11:38:06 +01:00
c3d4be1dce
sprintf: replace more sprintf by snprintf.
2016-01-04 22:24:25 +01:00
c9d00beab8
sprintf: replace sprintf by snprintf.
2016-01-04 20:24:51 +01:00
f4d3d15bbb
UnrealLoader: replace sprintf by snprintf.
2016-01-04 20:22:46 +01:00
847644ca75
DefaultLogger: fix missing sprintf calls.
2016-01-03 23:29:37 +01:00
540c9f3e9f
Fix assimp/assimp/issues/737: use snprintf instead of sprintf.
2016-01-02 21:29:46 +01:00
1191d03405
Update license info.
2016-01-01 21:07:24 +01:00
189340a99f
License file: update to 2016
2016-01-01 20:24:10 +01:00
912cf63b71
Merge branch 'master' of https://github.com/assimp/assimp
2015-12-31 19:49:37 +01:00
4e9ee4e406
coverity findings: add missing initialization.
2015-12-31 16:00:19 +01:00
39ab716e11
Collada exporter: Fix unicode filenames.
...
Although existing code uses "C" locale partially, both calls to isalnum() clearly did not use it.
So for example character "ä" was written to .dae as is, rather than converted to %e4, generated .dae was unreadable to many parsers.
2015-12-31 03:22:25 +01:00
15d84825d9
Collada exporter: Fix isalnum(negative number) assert.
...
isalnum(negative number) asserts in MSVC.
It was first visible problem when exporting unicode filenames.
2015-12-31 03:18:11 +01:00
217ec76dfb
coverity findings: fix possible derefencing of null pointer.
2015-12-30 21:56:24 +01:00
e02a7cdb3c
Merge pull request #732 from StepanHrbek/collada-export
...
Collada exporter: bind uv channel numbers with <bind_vertex_input>.
2015-12-30 21:31:29 +01:00
68b12ac0c4
Merge pull request #735 from JLouis-B/master
...
Fix a crash issue in XFileExporter
2015-12-30 21:26:34 +01:00
043fef6d21
coverity findings: fix resource leak in MakeVerboseFormat.
2015-12-30 20:39:58 +01:00
56e9a9168c
coverity findings: add missing initializations.
2015-12-30 20:04:16 +01:00
1ea1f6dcfa
coverity findings: add missind intialization in STEPFile.
2015-12-30 20:02:35 +01:00
e1818d8ab6
coverity findings: initialize lookup table for materials.
2015-12-30 19:43:57 +01:00
a02cc6c98e
Fix a crash issue in XFileExporter
2015-12-30 19:01:04 +01:00
0f1874d954
coverity findings: initialize index counter in line splitter.
2015-12-30 16:33:54 +01:00
7c3475c002
Coverity findings: fix resource leak in PlyLoader.cpp.
2015-12-30 15:38:30 +01:00
0c1b5355f4
Coverity finding: remove not used function.
2015-12-30 15:35:26 +01:00
ad55e769bf
Collada exporter: bind uv channels with <bind_vertex_input>.
...
When there are multiple uv channels used by multiple textures, <bind_vertex_input> specifies what channels to use. Without <bind_vertex_input>, at least some importers are unable to match channels to textures.
2015-12-29 17:08:16 +01:00
22f7f60ba0
glTF: usage of (hopefully) correct data type for size types: closes https://github.com/assimp/assimp/issues/723
2015-12-27 20:36:54 +01:00
9409ce3b56
https://github.com/assimp/assimp/issues/714 : fix null pointer access with
...
unknown texture.
2015-12-27 00:19:11 +01:00
9af4747fa8
github.com/assimp/assimp/issues/730: use correct define check
2015-12-26 21:02:32 +01:00
5847576f41
Merge pull request #703 from terziman/master
...
Improvement of collada transparency handling
2015-12-20 15:59:42 +01:00
7e85f45abc
Merge pull request #713 from ov/normalize-safe
...
GenVertexNormalsProcess produces invalid results for specific input
2015-12-20 00:06:58 +01:00
891411514b
Merge pull request #721 from luho383/fbx_file_import
...
Fix for FBX Files that do not have a Comma on a new line in a data block
2015-12-20 00:06:02 +01:00
90ddb93940
Fix for FBX Files that do not have a Comma on a new line in a data block
2015-12-17 11:48:44 +01:00
e8a02ef890
Only read Element Data when there is a valid Mapping Information
2015-12-16 15:25:33 +01:00
87b3af4c3b
Merge branch 'issue-707' of https://github.com/ov/assimp into ov-issue-707
2015-12-14 17:46:54 +01:00
b60f57ece7
Merge pull request #716 from rmitton/empty_objmtl
...
Added support for empty .MTL files.
2015-12-14 09:29:31 +01:00
d952823ffd
Importer for Silo SIB files.
...
Wrote an importer for Nevercenter Silo's binary SIB model format
2015-12-13 22:14:19 -08:00
b9a4e99607
Added support for empty .MTL files.
...
Some programs such as Silo export an empty .MTL file if you export a
.OBJ that doesn't use any materials. This patch allows the loading of
such files.
2015-12-13 22:13:25 -08:00
b6f14eb917
Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation
2015-12-14 15:31:49 +13:00
af40c99a6a
trimming spaces around material names
2015-12-14 08:32:09 +13:00
c9ef6132a8
a small fix
2015-12-13 23:10:31 +13:00
6214fbfbbe
this patch fixes multiple objects generation in OBJ reader if faces are prepended with 'usemtl' line
2015-12-13 22:54:50 +13:00
210764a6ff
Correct spelling
2015-12-10 16:19:33 +00:00
b440f67aae
Merge pull request #704 from Vertexwahn/master
...
Added missing DLL suffix for VS2015 build.
2015-12-09 23:52:15 +01:00
35fafe3a6f
ColladaParser: use initializer lists again.
2015-12-09 23:49:03 +01:00
3013b6b62f
Added missing DLL suffix for VS2015 build.
2015-12-09 21:58:29 +01:00
bf4ca8162d
Update ColladaParser.cpp
...
Introduce workaround again to fix the build.
2015-12-09 15:07:58 +01:00
9ae7d438f0
Update ColladaParser.cpp
...
Try to close resource leak.
2015-12-09 12:10:31 +01:00
b694bfd021
fix build
2015-12-08 20:36:31 +01:00
6eebf8455a
Merge remote-tracking branch 'official/master' into contrib
2015-12-08 15:25:13 +01:00
445ae1fec3
In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO)
...
+ removed user option to invert transparency as it does not seem to be needed anymore
+ fixed bug in default reflectivity value
2015-12-08 15:24:07 +01:00
0a6788d56f
try to fix build.
2015-12-07 20:43:01 +01:00
f5e13874e0
glTF: check if exporter option has broke someting.
2015-12-06 16:49:10 +01:00
99b51eb456
Merge branch 'master' of https://github.com/assimp/assimp
2015-12-06 12:20:11 +01:00
6641188a8e
assimp/issues/702: fix resource leak and use initializer list for all
...
attributes of the loader instance.
2015-12-06 12:18:33 +01:00
ffdcc78d91
Merge
2015-12-02 21:06:22 +01:00
8736907009
Importer: fix overflowImporter: fix overflow.
2015-12-02 19:58:43 +01:00
f896c3329a
Build: remove deprecated third party lib from cmake
2015-11-30 12:52:49 +01:00
166ff63af9
Updated CMAKE - removed removed package inclusion
2015-11-29 21:20:31 +01:00
c5cb7f7b73
Merge branch 'master' of git://github.com/assimp/assimp
2015-11-29 21:17:05 +01:00
f2c49a69ba
Fixing gcc errors - second attempt
2015-11-29 21:13:35 +01:00
d72443d6b0
Fixed gcc warnings and errors
2015-11-29 20:17:06 +01:00
4f757cdf5a
Implemented basic glTF exporter and improved the importer (plus some code refactor)
2015-11-29 19:13:51 +01:00
ba35c97e9d
assimp/assimp/issues/698: Increase upper limits for hints.
2015-11-28 10:06:26 +01:00
5942d60aea
Fixed gcc errors
2015-11-27 02:31:18 +01:00
526027999b
Merge
2015-11-27 01:44:06 +01:00
b307ec643d
Created exporter class and fixed a few bugs
2015-11-27 01:16:48 +01:00
fc6f35dab2
Merge branch 'master' of https://github.com/assimp/assimp
2015-11-26 20:53:41 +01:00
502d9f17b6
glTF: add importer to registry and try to parse json.
2015-11-26 20:49:00 +01:00
a655467b59
Merge pull request #692 from dankex/instance_image
...
instance_image support for sample2D in Collada 1.5
2015-11-26 14:06:09 +01:00
398c1361d3
Merge pull request #674 from suikki/master
...
FBX import: If animation is not defining keys for all vector components (x, y and z), use the node transform as the default value.
2015-11-26 13:50:34 +01:00
148a20a703
Experimental support for glTF
2015-11-26 02:36:22 +01:00
702ef1a513
glTF: add missing attribute buffer for text streams.
2015-11-25 22:31:23 +01:00
db8845d2b2
glTF: add jsn reader + example model to work on.
2015-11-25 22:03:39 +01:00
65d366dad0
Merge pull request #694 from OtgerRP/master
...
Support for FBX embedded textures
2015-11-24 21:26:34 +01:00
a51d9a3884
Ignore FBX 'PP' type connections (they were stopping the file parsing)
2015-11-24 17:51:11 +01:00
da013350f9
aiGetExportFormatDescription() no longer uses free'd memory
...
aiGetExportFormatDescription() now creates an Exporter object at the beginning of the function, so that a call to `GetExportFormatDescription()` doesn't access free'd memory.
2015-11-23 23:50:25 -05:00
c876dce82b
Fixed crashes for Video with no content
2015-11-23 21:46:55 +01:00
032fbe3fe5
Merge branch 'master' of https://github.com/assimp/assimp
2015-11-23 21:29:51 +01:00
70540616ce
issue 693: add missing release call in c-export interface.
2015-11-23 21:28:35 +01:00
f94bc8d66e
Initial support for FBX embedded textures
2015-11-23 19:49:54 +01:00
24b68b1e3d
Support instance_image in Collada 1.5 files
...
The <instance_image> tag in sampler2D elements is not expected by
ColladaParser. This patch parses the instance_image element and
gets the image ID.
2015-11-19 17:36:23 -08:00
57d7085fb8
Fix AndroidJNI header path in CMakelists.txt
2015-11-15 22:53:11 -08:00
756cfd4f74
fix compilation on BigEndian
...
cannot pass a function by reference where an lvalue is expected
(only applies to bigendian, where a macro expands to a byteswap function)
Closes https://github.com/assimp/assimp/issues/613
2015-11-13 22:33:20 +01:00
e6ac1ed66a
glTF-Importer: add files.
2015-11-08 20:29:05 +01:00
655cb65ab2
Version: increase version from 3.1.1 to 3.2.
2015-11-03 19:43:02 +01:00
eadc6116c0
OpenDDLParser: latest greatest.
2015-10-31 09:43:34 +01:00
6f75ea5702
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-31 09:07:21 +01:00
46121a1559
Mark single-parameter constructors explicit
...
Suggested by cppcheck
2015-10-29 14:04:23 +02:00
9825d07764
OFFLoader: Throw error on certain invalid files instead of failing validation later
2015-10-28 14:20:13 +02:00
7a5bc6eca3
OFFLoader: Use a temporary vector to store vertices instead of a raw array
...
Prevents crash on certain malformed inputs but
they still cause a validation failure.
2015-10-28 14:10:18 +02:00
fba7ede639
OFFLoader: Don't use assignments as expressions
2015-10-28 13:39:10 +02:00
12ed07a939
FBX import: If animation is not defining keys for all vector components
...
(x, y and z), use the node transform as the default value.
2015-10-27 21:03:24 +02:00
5160975138
Merge branch 'master' of https://github.com/assimp/assimp
2015-10-27 19:48:36 +01:00
3274bcf8d6
Properly build path to the mtl file when loading loading obj
2015-10-25 20:04:50 +01:00
2750f8da24
Added support for reflection maps for OBJ files
2015-10-15 15:46:35 +02:00
62ec784cef
Fixed issue in PlyParser (uint16 values misparsed)
2015-10-12 20:08:25 +02:00
bfe3bee34b
Merge branch 'master' into md5-fix
2015-10-07 16:49:45 +03:00
4a8b459706
OpenDDLParser: latest greatest.
2015-10-01 20:29:15 +02:00
7ed32fd5a9
fix typo.
2015-09-27 20:49:15 +02:00
1fbc0cc276
DefaultIOSystem: fix typo in macro.
2015-09-27 10:51:33 +02:00
f5c8f7b5e5
DefaultIOSystem: close cygwin issue assimp/assimp/issues/660.
2015-09-27 01:02:12 +02:00
d06945f17e
DefaultIOSystem: fix issue assimp/assimp/issues/660 by checking for _WIN32
...
as well.
2015-09-24 23:51:04 +02:00
3fc251b326
BaseImporter: fix typo and rename attributes for better readability.
2015-09-24 00:57:47 +02:00
ef6baa0acf
DefaultIOSystem: use correct define to detect Visual Studi compiler.
2015-09-22 00:23:33 +02:00
34ee4c4b9a
DefaultIOSystem close assimp/assimp/issues/108 : use correct macro to
...
detect vs-compiler.
2015-09-21 20:43:58 +02:00
6b1cac5743
Merge branch 'master' of https://github.com/assimp/assimp
2015-09-21 17:34:01 +02:00
ca6296f609
STLLoader: mak functions local.
2015-09-21 17:33:41 +02:00
e9937ab0f7
IOSystem: add missing documentation.
2015-08-30 15:37:56 +02:00
e4510c26ba
Obj-Importer: fix https://github.com/assimp/assimp/issues/641
2015-08-30 15:21:53 +02:00
9708a4db93
Subdivision: fix compiler warning from debug check.
2015-08-30 13:48:00 +02:00
305e27d1a5
Merge pull request #645 from l337r007/fix-osx-cmake
...
CMake: Don't try to set property on target before it is defined.
2015-08-29 14:58:53 +02:00
ce5baa95ca
Merge pull request #647 from Gargaj/patch-1
...
add opencollada extension
2015-08-29 14:58:27 +02:00
1f6cead81b
remove junk
2015-08-29 13:39:43 +02:00
9885c3e551
add opencollada extension
2015-08-28 16:20:17 +02:00
9f157ed9b8
CMake: Don't try to set property on target before it is defined.
...
The exact same code this commit removes is repeated in line 748.
There, it actually works, since the "assimp" target is defined there.
2015-08-26 12:36:57 +02:00
d74a1149b7
MD5: Fix quaternion conversions
...
Some of the quaternions loaded from MD5 files were not converted
to follow Assimp conventions.
https://github.com/assimp/assimp/issues/495
2015-08-18 11:49:06 +03:00
4afddf316f
Merge pull request #632 from turol/afl-fixes
...
Random crash fixes
2015-08-14 16:13:54 +02:00
91881065d7
Merge pull request #635 from turol/fix-bad-references
...
IFC: Don't store temporary values by reference
2015-08-14 16:12:07 +02:00
ec43e08295
Fixed issue in STLLoader that lead to wrong node names.
2015-08-14 13:37:41 +02:00
e67bcca744
IFC: Fix more bad references
2015-08-14 14:02:16 +03:00
4540250116
IFC: Don't store temporary values by reference
...
This is not legal in any way and should never have worked.
2015-08-14 13:32:45 +03:00
0b0ba2ec4d
Refactor logic which checks for too large allocations
...
It's now easier to change the limit
2015-08-14 11:53:16 +03:00
5575a54466
Add various checks to avoid either too large or zero-sized memory allocations
2015-08-14 11:53:16 +03:00
e5ddb98dde
STL: Fix another read past EOF
2015-08-14 11:53:13 +03:00
d185cea81c
AC3D: Fix read past end of buffer
2015-08-14 11:37:00 +03:00
4cc716a0f5
MDL: Fix read past end of buffer with malformed input
2015-08-14 11:37:00 +03:00
bcf3f985fb
Fixed spelling error.
2015-08-13 13:22:21 +02:00
860360bd86
Fixed merge conflicts.
2015-08-13 11:06:22 +02:00
b39446b7bb
Avoid reading past EOF when encountering a malformed STL file
...
Since IsSpaceOrNewLine returns true on '\0' we might try to read past
end of buffer on line 310. Add explicit check to avoid this.
2015-08-10 15:50:05 +03:00
295a9abbdc
Update CMakeLists.txt
...
Fix for https://github.com/assimp/assimp/issues/166
2015-08-10 13:13:01 +02:00
524834c307
Fix line endings.
2015-08-08 18:02:37 +02:00
d8d64a8422
TLLoader: fix typo in comment.
2015-08-08 11:57:15 +02:00
e794aaf017
STL-Loader: fix https://github.com/assimp/assimp/issues/103 .
2015-08-08 10:55:10 +02:00
88746af2e6
Blender-Loader: fix issue https://github.com/assimp/assimp/issues/131 .
2015-08-07 21:22:09 +02:00
23dba9fcf2
Merge branch 'master' of https://github.com/assimp/assimp
2015-08-07 21:19:17 +02:00
8836fd6b34
PLY-Loader: fix https://github.com/assimp/assimp/issues/160 .
2015-08-07 21:18:20 +02:00
154760ab52
Abort early when hitting unexpected EOF in AC3D loader
...
Without this the code will try to loop through the specified number
of surfaces which could be very large even though none will succeed.
2015-08-07 14:18:16 +03:00
752961edfe
Merge pull request #625 from turol/afl-fixes
...
Fix out-of-bounds write on malformed input
2015-08-06 17:41:09 +02:00
128923a262
Fix out-of-bounds write on malformed input
2015-08-06 16:16:34 +03:00
5030fe8c7e
Formatting changes.
2015-08-06 13:37:16 +02:00
fb9e4d1266
Ply export now uses uchar as type for the number of vertices per polygon and int as vertex index type.
2015-08-06 13:30:49 +02:00
3fc56de33c
Fixed merge conflicts.
2015-08-06 12:04:05 +02:00
bb8d936246
Fix volume calculation
2015-08-02 19:45:39 +03:00
7a7a496320
- Add include of stdarg, because apparently that's needed to build of Github server with Travis.
2015-07-27 00:54:23 -07:00
8b7fa48d27
- Merge in latest from assimp/assimp on GitHub ( 5c00aef7cd)
...
- Added at least some of the new files to my Xcode 6 project, as
well.
- Built and tested with the DAE importer, seems to work fine.
2015-07-26 19:16:01 -07:00
5c00aef7cd
iOpenGEX: use std::string for grammar::token.
2015-07-17 20:03:23 +02:00
5a207dbb19
Merge branch 'master' of https://github.com/assimp/assimp
2015-07-10 01:21:57 +02:00
14a849b398
Obj-loader: change include brackets.
2015-07-10 01:21:10 +02:00
e138a02dd5
Obj: fix issue 121 - set group names as the mesh names.
2015-07-09 20:15:44 +02:00
891c17ee7b
Obj: remove dead code.
2015-07-09 19:59:47 +02:00
36f0ccced1
Merge branch 'master' of https://github.com/assimp/assimp
...
Conflicts:
tools/assimp_cmd/ImageExtractor.cpp
2015-07-08 00:40:35 +02:00
bc8aa18eb2
Fix : https://github.com/assimp/assimp/issues/557
2015-07-08 00:34:28 +02:00
4a77170399
Coverity finding: fix 2 more resource leaks.
2015-07-06 20:47:45 +02:00
1eef4c387f
Correct value for mColorAmbient for COLLADA files
2015-07-05 14:30:27 +02:00
c09eb045a1
Explicit conversion of a quantity that should be positive to unsigned to avoid compiler warning.
2015-07-04 18:08:31 -04:00
bd0b58d906
Merge pull request #600 from LegalizeAdulthood/cppcheck-format-operator
...
Prefer Format::operator<< over Format::operator,
2015-07-04 09:29:47 +02:00
68f88752b3
Build: fix missing commas.
2015-07-04 09:22:11 +02:00
0faf53af0b
Refactor: Prefer Format::operator<< over Format::operator,
2015-07-03 20:13:00 -06:00
05524726c8
Merge branch 'master' of https://github.com/assimp/assimp
2015-07-03 20:40:19 +02:00
dff3476e50
Line endings.
2015-07-03 20:40:07 +02:00
3af8014055
INcreas readability.
2015-07-03 19:00:21 +02:00
001eef2a9f
Coverify: fix resource leak.
2015-07-03 18:58:02 +02:00
dc28746269
Compiler warning: fix missing commend block.
2015-07-03 16:11:31 +02:00
d763483c67
Merge pull request #596 from LegalizeAdulthood/init-variables
...
Initialize all members in c'tors
2015-07-03 15:36:58 +02:00
67cb86d166
Fixed: Correct memory leak found by cppcheck
2015-07-02 20:55:56 -06:00
987034e080
Fixed: Initialize all members in IntSplitGroupData_MDL7
2015-07-02 20:51:46 -06:00
9f0c12c1c6
Refactor: Prefer value initialization over std::fill
2015-07-02 20:51:46 -06:00
c69e047dfc
Fixed: Initialize all members in STLImporter
2015-07-02 20:51:46 -06:00
85f3b38643
Fixed: Initialize all members in SMDImporter
2015-07-02 20:51:46 -06:00
e584fbdf47
Fixed: Initialize all members in PLYImporter
2015-07-02 20:51:46 -06:00
99e964d8b1
Fixed: Initialize members in MS3DImporter
2015-07-02 20:51:46 -06:00
f13c99e898
Fixed: Initialize all members in MDLImporter
2015-07-02 20:51:46 -06:00
10ca67541e
Fixed: Initialize all members in MDCImporter
2015-07-02 20:51:46 -06:00
a9aa2b1579
Fixed: Initialize all members in MD5Importer
2015-07-02 20:51:46 -06:00
3ebf91d5bb
Fixed: Initialize all members in MD3Importer
2015-07-02 20:51:46 -06:00
abc47f1b4e
Fixed: Initialize all members in MD2Importer
2015-07-02 20:51:46 -06:00
e5c603ea1a
Fixed: Initialize all members in LWSImporter
2015-07-02 20:51:46 -06:00
f032c89c2d
Fixed: Initialize members in LWOImporter
2015-07-02 20:51:46 -06:00
df6e58fd40
Fixed: Initialize all members in LWOAnimation
2015-07-02 20:51:46 -06:00
6fb38a375e
Fixed: Initialize members in SmoothinGroups
2015-07-02 20:51:46 -06:00
db4232cb4a
Fixed: Initialize members in LWSLoader
2015-07-02 20:51:46 -06:00
32a460f667
Fixed: Initialize members in UnrealLoader
2015-07-02 20:51:46 -06:00
3553c4aff2
Fixed: Initialize members in LWOFileData
2015-07-02 20:51:46 -06:00
cd63601831
Fixed: Initialize members in LWOAnimation
2015-07-02 20:51:46 -06:00
d822930848
Fixed: Initialize members in MDCFileData
2015-07-02 20:51:46 -06:00
eaf63bd04b
Fixed: Initialize members in SMDLoader
2015-07-02 20:51:46 -06:00
65ada2596f
Fixed: Initialize members in PlyParser
2015-07-02 20:51:46 -06:00
5cc43ecfad
Fixed: Initialize members in XFileHelper
2015-07-02 20:51:46 -06:00
3543bb7e5f
Fixed: Initialize members in IRRLoader
2015-07-02 20:51:46 -06:00
2f0786068d
Fixed: Initialize members in MDLFileData
2015-07-02 20:51:46 -06:00
c014a2ed21
Fixed: Initialize members in BVHLoader
2015-07-02 20:51:45 -06:00
7cc46ebc22
Fixed: Initialize member sin ASEImporter
2015-07-02 20:51:45 -06:00
a9a8796f71
Fixed: Initialize members in ACLoader
2015-07-02 20:51:45 -06:00
d899f4db57
Fixed: Initialize members in 3DS loader
2015-07-02 20:51:45 -06:00
4619625b84
OpenGEX: add class for exporter.
2015-07-01 20:43:37 +02:00
eee32a5668
Refactor: Expand tags to 4 spaces
2015-06-28 16:12:51 -06:00
4ec76d88f0
Refactor: Use LF for line endings
2015-06-28 16:11:05 -06:00
e4b0c27a2e
Refactor: Strip trailing whitespace
2015-06-28 16:09:18 -06:00
83de707587
Refactor: Expand tabs to 4 spaces
2015-06-28 16:04:15 -06:00
a96a595a7a
Refactor: Trim trailing whitespace
2015-06-28 16:01:32 -06:00
4c1a0507fe
Refactor: Line endings are LF, not CRLF
2015-06-28 15:59:33 -06:00
8326535445
Implemented: Add editor config for source code
2015-06-28 15:50:57 -06:00
1d96486437
Refactored: Reformat CMake files to conform to editor config
2015-06-28 15:50:57 -06:00
2bfc353fde
License info: update year info.
2015-06-28 21:48:25 +02:00
db3aea4b18
Remove finding from code analysis.
2015-06-28 21:06:20 +02:00
6249a1c06f
CMake: add comment for openddl-parser configuration.
2015-06-23 21:28:13 +02:00
85e2f47dc8
Merge pull request #523 from turol/afl-fixes
...
More crash fixes
2015-06-22 16:56:51 +02:00
328cae8a81
Added mesh name importing to .X ascii format.
2015-06-20 17:35:30 -05:00
ff145bfac5
Removed unused variable
2015-06-19 14:24:34 +01:00
927c9cb3ce
Fixes random crash when loading fbx files
2015-06-19 14:04:30 +01:00
b8c12fdc6f
CodeQuality improvements
...
Several small code improvements based on a cppcheck result
2015-06-05 09:52:06 +02:00
36a9f2be1a
Merge pull request #577 from g-pechorin/patch-4
...
not-git (and "nested" builds)
2015-06-04 23:46:05 +02:00
1a2f4ed105
Merge pull request #575 from g-pechorin/patch-3
...
ASSBIN comments seem incorrect
2015-05-31 23:18:17 +02:00
9c26f229a3
- OpenDDL-Parser: latest greatest.
...
- Add support of OpenGEX-texture types.
2015-05-31 20:36:55 +02:00
72b87ec526
removed x64 warnings
2015-05-31 13:35:10 +01:00
6ddb67b321
corrected misinformation in the documentation
...
> corrected note saying that the header was 500 bytes long (512 bytes are written and the number 512 is given elsewhere)
> altered confusing language about how long the chunks are ("length of chunk" implies the number includes the chunk-header. chunk-data-length less so, and reflects the fact that the number written doesn't include the chunk-header)
> removed mistake about how texture coordinates are encoded (the last release, and the current head both write texture coordinates as 3 float components regardless of what they actually are)
2015-05-30 23:40:17 +01:00
6cc32a946b
Fix transformation parsing for OpenGEX-parser.
2015-05-29 20:50:09 +02:00
670278da82
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-29 20:46:10 +02:00
5e1fc39448
Add parsing of texture nodes of OpenGEX-format importer.
2015-05-29 20:45:31 +02:00
de6f0f2a7d
Creating the functionality to list all Importer descriptions and the number of importers available.
2015-05-26 08:40:43 -03:00
4cbce374b6
Code Cleanups
...
- add initializers to classes
- fix %i/%u for unsigned ints
- remove unused vars
- pass by reference
2015-05-24 11:55:37 -04:00
9538b7ed42
Merge pull request #570 from wise86-android/colladaExportLightAndCamera
...
Collada export light and camera
2015-05-23 12:06:23 +02:00
26b3328f3b
fix xml syntax + more deap test
2015-05-23 11:03:56 +02:00
5ad6179bc5
export the light in the collada file
2015-05-19 23:15:18 +02:00
b1d085b6a9
fix the foruma for compute the mAngleOuterCone values
2015-05-19 23:08:31 +02:00
2c194f629a
fix macro for be uesed with expression
2015-05-19 21:57:51 +02:00
28cc934bb9
Fix overlapping merges
2015-05-18 09:51:09 -04:00
7cd8cc1b1f
Merge pull request #560 from asmaloney/fixes/init_cleanup
...
Fix inits and a couple of empty checks
2015-05-18 09:49:59 +02:00
9cbef8cba3
Refactor: Initialize members in declaration order; prefer initialization over assignment
2015-05-17 20:50:58 -06:00
cac8707121
Refactor: Delete unused field
2015-05-17 20:48:04 -06:00
4a5e9352d6
Refactor: Delete unused functions
2015-05-17 20:46:56 -06:00
a34adb8450
Refactor: Delete unused functions
2015-05-17 20:45:16 -06:00
814ef32dce
Refactor: Delete unused fields
2015-05-17 20:43:25 -06:00
5bb09377cb
Refactor: Delete unused variable
2015-05-17 20:40:35 -06:00
7b3fa5ebc2
Refactor: Delete unused forward decls, delete unused function
2015-05-17 20:22:31 -06:00
79c916daf4
Refactor: Remove unused variable
2015-05-17 20:05:05 -06:00
2de6dd4973
Refactor: Delete unused variable
2015-05-17 20:02:58 -06:00
6ae9797648
Refactor: Initialize members in declaration order; initialize POD arrays
2015-05-17 20:01:51 -06:00
d25c36960a
Refactor: Initialize all POD members
2015-05-17 19:57:11 -06:00
8c94e51e90
Refactor: Delete unused functions
2015-05-17 19:47:13 -06:00
fbf90a28ff
Fixed: Ensure variable is always initialized before use
2015-05-17 19:46:01 -06:00
63520d562a
Refactor: Initialize members in declaration order; prefer initialization over assignment
2015-05-17 19:42:30 -06:00
bf4a73e42e
Refactor: Remove unused member variable
2015-05-17 19:42:07 -06:00
91ca983d5f
- Workaround for Collada exporter in SketchUp 15.3.331 (possibly others) where it'll export the wrong "count" when exporting "lines".
...
- When I encounter this condition I just print a warning and use the actual number of points in the file instead of the number they give, as opposed to throwing an exception and bailing on the whole file.
- For an example of this kind of file see https://3dwarehouse.sketchup.com/warehouse/getpubliccontent?contentId=e4587719-2609-49ed-a2f6-20b98d1215f3&fn=Kartell-GE.zip
- Some people have complained about this on http://forums.sketchup.com/t/bug-in-lines-exported-at-collada-format/8145
2015-05-17 18:36:17 -07:00
c014bb977c
- add missing initialization of several class members
...
- prefer check for empty() over check for size() in OptimizeGraph (empty() is guaranteed to be constant time, size() is not)
- fix a couple of incorrect indentations
2015-05-17 20:48:23 -04:00
fb4eb83e84
add the ability to export cameras information in a collada file
2015-05-17 20:54:45 +02:00
98b234020b
Fixed AssBin loader.
...
File reads were used in ai_assert. The function has side effects, so it should not be used in an assert.
Fixed AddGTest.cmake.
There was an issue regarding Xcode project file. The path of libgtest.a was incorrectly set.
2015-05-16 23:39:24 +09:00
a1268bf864
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-12 21:52:25 +02:00
0fe8e739c3
Use "wb" when writing binary STL exports, fixes #556 .
2015-05-12 21:51:27 +02:00
e3c29b7e4b
Merge pull request #554 from assimp/fix-obj-material-name-spaces
...
OBJ: Support spaces in material names, fixes #545 .
2015-05-12 21:44:07 +02:00
faea2ecccc
OBJ: Support spaces in material names, fixes #545 .
...
Adding test file.
2015-05-10 23:50:18 +02:00
b4f5c57b3e
allow to compile only enabled loaders
2015-05-06 23:15:15 +02:00
70722ad318
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-05 22:27:13 +02:00
fd3a0d4a9d
fix name handling of geoemtryobjectname nodes
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:27:05 +02:00
b6d91ec11a
Fix Path functions
...
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
2015-05-02 12:19:20 +02:00
2dde962f0d
FilePath Functions in DefaultIOSystems
...
Replacements in Exporters
2015-05-02 01:56:20 +02:00
148207a073
Fix removed AssimpPCH
2015-05-01 23:16:44 +02:00
71ae322e7b
Merge pull request #5 from assimp/master
...
Update Fork
2015-05-01 23:01:33 +02:00
58a72d9302
Fix Warnings
...
Add Time in Step File
2015-05-01 22:19:40 +02:00
ca8a3909be
Add StepExporter.cpp(stp) Export
...
Fix XFile
2015-05-01 21:40:51 +02:00
4acb1d4c92
Removed FORCE attribute from CMake variable LIBRARY_SUFFIX
2015-05-01 14:13:28 +02:00
2a7e49423a
Merge pull request #547 from assimp/acgessler-patch-2
...
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 15:19:01 +02:00
5357772cf5
fix build.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 14:31:23 +02:00
d5699cc89f
fox build: add missing include for ai_assert.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 13:47:33 +02:00
31cce98680
fix color handling in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 12:54:59 +02:00
78faabf0fa
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 02:37:35 +02:00
880cb473b0
Merge pull request #546 from terziman/master
...
Minor improvments & bug fixes
2015-04-30 02:35:52 +02:00
c99bd9825a
Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...)
2015-04-29 18:13:16 +02:00
2f8f0b1b02
Merge branch 'master' of https://github.com/assimp/assimp
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Conflicts:
code/ObjFileParser.cpp
2015-04-29 13:18:51 +02:00
995bc41d57
color node handling opengex
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:39 +02:00
ca2e47b205
Fixed some typos
2015-04-29 09:26:11 +02:00
91c751a03a
Added missing header
2015-04-28 12:29:39 +02:00
5b9af11f9b
Merge remote-tracking branch 'official/master' into contrib
2015-04-28 12:04:53 +02:00
5c890c1a90
Merge pull request #544 from aru/cygwin-build-fix
...
Modifying files to let assimp build under cygwin.
2015-04-21 15:56:40 -07:00
956fde6e66
Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin.
2015-04-20 17:49:02 -05:00
7043551068
Modifying files to let assimp build under cygwin.
2015-04-20 17:36:47 -05:00
55ae853c2e
Fix compilation with libc++
2015-04-19 10:55:58 +02:00
eb1ee61420
fix code reading findings: use of std::copy
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:48 +02:00
68ca2ca427
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-18 19:17:19 +02:00
08886e28d7
use <> include bracket style.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:10 +02:00
27c6552ae8
Merge pull request #538 from cubeman99/master
...
Added NaN check when outputting normals in PLY exporter, to avoid '-1.#IND'
2015-04-18 07:29:37 -07:00
b38572d1bc
std::fabs from cmath should be right
2015-04-17 23:50:14 -04:00
b575acf2b6
std::absf to std::fabsf
2015-04-17 23:38:54 -04:00
e86d40e4e2
Added infinity check for outputting PLY normals
2015-04-17 23:29:26 -04:00
76dd9467b2
fix win32-build for assimp_viewer .
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-17 20:02:55 +02:00
f435712273
Fix Mac build issues (clang 6.0 compiling x86_64)
2015-04-17 06:42:58 +02:00
f00101f496
Added include of qnan.h (now that AssimpPCH.h include was taken out)
2015-04-16 21:30:50 -04:00
3545d805d2
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 20:40:16 -04:00
fa626aa855
Added NaN check when outputting normals in PLY exporter, to avoid outputting '-1.#IND'
2015-04-16 18:01:24 -04:00
d12868adc4
use correct type in forward declaration.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:32:35 +02:00
97946e25c9
fix travis build
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:09:06 +02:00
e4b84ff48a
fix mem leak.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:47:14 +02:00
02ee002878
fix build for vs2013
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:38:53 +02:00
444a77e170
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 11:10:21 +02:00
ead3e8d275
first version of material handling for opengex
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:10:12 +02:00
1c1f3c25f8
awww, merge error
2015-04-16 03:13:19 +02:00
611778045d
fix for upstream changes
2015-04-16 02:55:41 +02:00
8c45a4dc3b
Merge remote-tracking branch 'origin'
...
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
2015-04-16 01:03:00 +02:00
bf4913b5c9
remove AssimpPCH.h: fixes #534
2015-04-16 01:00:17 +02:00
470ad98281
fix "headercheck":
...
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
56e8dc5a43
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-14 12:04:47 +02:00
1899de6ea9
remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-14 12:03:51 +02:00
0cee21ce3c
COB: code cleanup.
2015-04-13 21:52:09 +02:00
b3a3558da3
Re-gen IFC parsing code with alphabetic order of types. This hopefully gives a stable diff base for the future.
2015-04-13 21:42:50 +02:00
28de609a56
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-13 16:02:02 +02:00
806d3ac8e1
- IFC reader regenerated from schema to include IfcArbitraryProfileDefWithVoids
...
- implemented IfcArbitraryProfileDefWithVoids to fix solar panel covers in test\models-nonbsd\IFC\rac_basic_sample_project.ifc
- warning: another dirty hack on top of dirty hacks - one day all these CSG implementations will blow up in our faces. Mark my words.
2015-04-13 16:01:33 +02:00
e2f234707a
Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401 .
2015-04-12 19:53:24 +02:00
ed57fac879
create node tree
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-08 20:43:55 +02:00
ecf390d51f
set the correct reference to meshes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-06 14:56:12 +02:00
22fc756d4a
- fix double initialization.
...
- use correct number of vectors for dynamic array.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 23:17:16 +02:00
df1134b1a3
- initiate texture coordinate array.
...
- use correct number of vertices for vertex array,
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:47 +02:00
c0e3540ec1
use size_t instead of unsigned int ( static code analysis finding ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:07 +02:00
50d5c5c4ef
Merge pull request #527 from VirusFree/pr_strtol10_64
...
fix for strtol10_64
2015-04-05 17:25:50 +02:00
9a7f90220a
Merge pull request #526 from VirusFree/pr_OpenGEX_textureCoords_init
...
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 17:05:16 +02:00
54ce3d843f
fix for strtol10_64
2015-04-05 16:40:40 +03:00
6a1522ded8
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 16:29:33 +03:00
da3c347a57
add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime)
2015-04-05 15:19:55 +03:00
3fa6882384
generate unique indices for importes vertices in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:59 +02:00
a50fa5f1de
add missing doc in obj importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:24 +02:00
65cb05f381
fix invalid index counter.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-02 01:10:53 +02:00
681c32d5ec
AC3D: Throw DeadlyImportError when too many vertices instead of out-of-memory exception
...
Valgrind can't throw an exception when running out of memory. The program
wil just crash. This fixes it in some cases but not all.
2015-04-01 20:52:58 +03:00
bf5c9413f9
AC3D: Throw exception when encountering a bad vertex index
2015-04-01 16:22:46 +03:00
16c57ab1d3
AC3D: Throw exception on too many vertices instead of crashing
2015-04-01 16:22:06 +03:00
3e728e80eb
Obj: Change asserts to exceptions
...
These can be triggered by malformed input file so they can't be assertions.
2015-04-01 16:13:46 +03:00
4c28f31f43
X: Throw error when scene contains no root node
...
Otherwise MakeLeftHandedProcess will crash.
2015-04-01 16:11:53 +03:00
8cdf9467c5
MD3: Fix assertion failures when filename doesn't contain '.'
2015-04-01 16:09:59 +03:00
9f9774403d
Remove assertion when too long message attempted
...
Since these can be caused by malformed input files assert is the wrong thing.
2015-04-01 16:03:06 +03:00
45cc0b582a
fix creation of unused mesh instance.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-31 12:18:57 +02:00
754897d1aa
add imported meshes from OpenGEX-importer to scene.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 23:54:32 +02:00
8857f26efb
fix: add setup for number of copied vertex attributes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 12:04:28 +02:00
7f3b044b83
add import of index array data.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 11:55:57 +02:00
0e11cfbe6f
add copy op for positions, normals and texture coordinates.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-29 18:53:23 +02:00
20ad00b5e5
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-28 20:47:17 +01:00
8d3853022a
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-28 13:44:11 +01:00
a77f9419a2
XGLLoader: set aiImporterFlags_SupportCompressedFlavour flag.
2015-03-28 13:09:18 +01:00
51514994f3
Merge pull request #512 from VirusFree/pr_FBX_Animations
...
[FBX] add support for multiple animations
2015-03-28 12:56:56 +01:00
aa9dd6a14b
- check property name before setting up the primitive type for meshes.
...
- fix lookup for vertex attribute type lookup.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-28 12:08:59 +01:00
454b85a0ad
Improved prototype of Importer & Exporter SetProperty* functions for better integration with tools such as SWIG
2015-03-27 10:56:03 +01:00
60d58901a5
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
code/ColladaParser.cpp
include/assimp/config.h
2015-03-27 09:55:21 +01:00
6824c8cbfe
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-26 22:45:20 +01:00
8666b614c6
Fix non-determinism in XGL importer output due to std::multimap value ordering not guaranteed < C++11.
...
One step closer to a fully reproducible regression test suite.
2015-03-26 22:45:00 +01:00
08ba782bd5
[FBX] add support for multiple animations (by using LocalStart/LocalStop in takes)
...
+ change key type from uint to int (fixes bugs from negative int_t becoming a junk uint_t value )
+ detect and ignore channels with no keys in the specified take start/stop window
+ add test model with multiple animations
2015-03-26 23:23:38 +02:00
b17a1255a1
add setup for mesh primitives and prepare vertex array copy ops.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-26 20:17:26 +01:00
ca4385fcf2
fix compiler warning ( signed against unsigned ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-26 10:11:14 +01:00
7a01f77a08
fix invalid lookup for token type in opengex-parser.
2015-03-25 21:35:32 +01:00
23b3728254
add setup of transformation information in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-24 00:08:42 +01:00
14324c60cf
Add missing ASSIMP_BUILD_NO_C4D_IMPORTER check to C4DImporter.cpp. Fixes #503 .
2015-03-22 17:53:53 +01:00
0995f3662d
prepare handlers for missing nodes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 16:56:28 +01:00
816ceeda69
Eliminated error in MSVC.
2015-03-20 14:18:26 +01:00
690ebe4f1e
fix https://github.com/assimp/assimp/issues/504 : use correct define for check if OpenGEX-importer shall be used or not.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 13:34:48 +01:00
59b0819866
STL loader can now handle more than one mesh in a single ascii file.
2015-03-19 17:27:06 +01:00
70aafa478d
avoid copying of private struct.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:38:15 +01:00
12efa14777
add openddl_parser directly to assimp.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:37:58 +01:00
b0753c38de
fix code reading finding: rename definition.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:37:11 +01:00
f15d62194b
add nodestack to deal with node hierarchy.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-18 21:37:57 +01:00
2717d51f7e
Merge remote-tracking branch 'origin/master' into opengex_support
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Conflicts:
code/ParsingUtils.h
2015-03-17 14:26:39 +01:00
59633d172f
implementation for mesh resolving.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-17 14:25:40 +01:00
7d7ccfd630
fix compiler warning.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-17 14:24:28 +01:00
b304e7b45c
Add missing break in switch statement in BlobIOSystem.h. Fixes #438 .
...
This probably didn't affect anyone for real since no on uses relative seeks.
2015-03-16 23:26:41 +01:00
adc44d1e83
If caller provides no ExportProperties, pass a pointer to empty properties to the Exporter implementation (instead of a NULL).
2015-03-16 23:09:41 +01:00
4bf090e92c
Merge branch 'master' of https://github.com/Madrich/assimp
...
Conflicts:
code/ColladaParser.cpp
2015-03-16 23:04:16 +01:00
207906f039
first parsing of references and geometry objects.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-16 20:34:42 +01:00
fdad4b51a1
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-16 11:35:33 +01:00
dbc7dc005d
- IfcLoader now evaluates all curve segments at both start and end. Leads to a lot of duplicates which get filtered out afterwards, but fixes the "cutting corners" phenomen that sometimes appeared in conjunction with trimmed curves
2015-03-16 11:35:07 +01:00
dca3f09940
Merge pull request #497 from assimp/regression-ci-test
...
Regression suite fixes, fix cases of non-deterministic output #1 .
2015-03-16 09:15:55 +01:00
7ee5eaafc6
Fix compile: set::erase() returns void prior to C++11.
2015-03-15 23:40:29 +01:00
16880b3dbd
Fix build after mis-merge.
2015-03-15 23:31:58 +01:00
dc441d09e5
Blender importer: fix accidental use of uninitialized fields in the default material.
...
IMHO C++03+ guarantees zero initialization here, so it may be a MSVC-specific issue.
2015-03-15 14:42:28 +01:00
1c64c590f2
Blender importer: always sort sets of objects by their name. Previously we accidentally ordered pointers to objects by their memory address, which was non-deterministic and caused regression tests to be flaky.
2015-03-15 01:26:15 +01:00
c59878e427
Merge branch 'master' of github.com:assimp/assimp
...
Conflicts:
code/ColladaLoader.cpp
2015-03-15 00:18:39 +01:00
c4eb04bb8c
Fix XFile name for $ and {}
...
Memleak copy constructor
2015-03-14 20:52:53 +01:00
ff4e1d9446
Sub-sample axis-angle channels if the delta between two consecutive key-frame angles is >= 180 degrees. Fixes #458 .
2015-03-14 19:57:13 +01:00
edd3ed9e8f
Back PretransformVertice Change
...
Fix Node Name in XFileExport
2015-03-14 19:48:08 +01:00
56da80bc6e
Copy constructor ExportProperties
...
Fix name dummy node in PreTransformVertices
2015-03-14 19:03:44 +01:00
290a16eea5
Copy constructor for ExportProperties
...
Export Propertie defines in config.h
Remove unnecessary
2015-03-14 16:31:33 +01:00
8b1b12682f
Add ExportProperties
2015-03-14 14:03:14 +01:00
ad9d178f0a
- Bugfix: IfcLoader lost nodes and geometry when they were stored in subnodes of IfcSpace and the setting "Filter IfcSpace" was enabled
2015-03-13 15:13:53 +01:00
90a07713c0
Added 'const' to () operator on CompareVector
...
So it can build on clang.
2015-03-11 16:55:21 -07:00
163bbc25c7
Merge pull request #486 from DenisMikhalev/issue-2
...
Adds safety and prevents crashes for damaged files
2015-03-10 16:09:07 +01:00
f120a75617
Merge remote-tracking branch 'official/master' into contrib
2015-03-10 15:40:03 +01:00
18e6a8fbdb
improved handling of commas in fast_atof
2015-03-10 15:39:27 +01:00
62676b56aa
Adds safety and prevents crashes for damaged files
2015-03-09 19:40:13 +03:00
ba4689fd05
Whitespace
2015-03-09 12:33:13 +02:00
c342778f42
Fix read past end of buffer after call to TokenMatch
...
IsSpaceOrNewLine returns true on end of input (NUL character). But if
TokenMatch considers a token at end of input to match it sets "in" to
one past end of buffer. This will lead to reading past the end of
buffer on any subsequent operation.
2015-03-09 12:33:13 +02:00
18ef31cc06
Merge remote-tracking branch 'official/master' into contrib
2015-03-09 11:31:15 +01:00
c410512173
Use material names, set default direction to UP_Y, process extra tag
2015-03-08 22:37:48 +03:00
727888ea10
Merge pull request #480 from turol/subdiv-memory
...
Free edges map before recursive calls to reduce memory consumption
2015-03-08 10:32:26 +01:00
873ae5db3f
addition to c4997f16db
...
(thanks turol)
2015-03-08 03:26:25 +01:00
c89274d366
Free edges map before recursive calls to reduce memory consumption
2015-03-08 00:16:48 +02:00
76c69205b1
- reintroduced IFC openings to floors and ceilings. Were disabled for some unknown reasons, I hope I didn't break anything. Everything I tested works fine.
2015-03-06 14:14:45 +01:00
03a7f36858
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-05 20:18:00 +01:00
a2c9904d59
- Bugfix: polygon-bounded half space clipping now assumes plane in correct coordinate space
...
- Bugfix: closing polygon loop along boundary polygon now correctly projects boundary vertices to polygon plane
2015-03-05 20:17:26 +01:00
0cdc528e01
- Bugfix: IFC loader tested squared length against non-squared epsilon in RemoveDegenerates()
2015-03-03 15:56:09 +01:00
c4997f16db
remove "register" keyword:
...
clang warns: 'register' storage class specifier is deprecated
http://stackoverflow.com/questions/10675072/is-the-register-keyword-still-used
2015-03-02 23:44:02 +01:00
b1e8c192db
Merge pull request #464 from turol/master
...
Clean up some warnings
2015-02-28 14:41:26 +01:00
f6f8462113
Update IfcLoader to use numeric_limits<uint32_t> instead of UINT32_MAX, fixes gcc build and is more consistent with the rest of the codebase. Fixes #471 .
2015-02-28 13:40:10 +01:00
5a74e07f5f
Mark some more functions with AI_WONT_RETURN
2015-02-27 23:09:12 +02:00
dfd171be6d
Remove unnecessary semicolons after FBXDocument property declarations
2015-02-27 23:09:12 +02:00
308884f144
Remove unnecessary semicolons after function definition
...
Picked up by clang -Wextra-semi
2015-02-27 23:09:12 +02:00
e8bcad0840
Silence a warning and add an assertion
...
Another false positive uninitialized variable. Actually it's only false
if ToOutputVertexIndex does't return NULL which should only happen if
index is out of bounds. Add assertion to make sure of that.
2015-02-27 23:09:03 +02:00
b71ded1ad0
- manually merged C4D importer code from acgessler branch
...
- manually merged IFC bugfixes and improvements from schrompf branch
2015-02-23 14:23:28 +01:00
2274c96e3b
Merge remote-tracking branch 'official/master' into contrib
2015-02-18 17:22:44 +01:00
d9a2293491
Improved handling of transparency in collada importer
...
+ started preliminary support for RGB_ZERO collada transparency mode
+ added option to manually invert transparency values to deal with broken exporters that don't follow the specs
2015-02-18 17:20:03 +01:00
51b790c482
ColladaLoader: format.
2015-02-15 22:26:59 +01:00
ce1302cd71
Fix VC12 warning "empty but controlled statement found".
2015-02-15 22:20:34 +01:00
aae0f7e7b1
3DSExporter: export materials first, then meshes. Our own importer requires this.
2015-02-15 22:12:19 +01:00
0292868917
add geomentry node handling.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-14 16:12:09 +01:00
570d02ff6e
Silence more uninitialized variable warnings
...
These are false positives since aiMaterial::Get will have written to output
if it returns AI_SUCCESS but the compiler can't see that.
2015-02-13 13:15:26 +02:00
f708d0b122
Silence some uninitialized variable warnings
...
These are false positives but the compiler isn't smart enough to see that.
Also it might make more sense to use switch here.
2015-02-13 12:21:59 +02:00
84a9514d4b
Fix warning about possibly uninitialized variable
...
It might be better to move FindEmptyUVChannel call earlier
2015-02-13 12:14:39 +02:00
bd1168af30
fix invalid line endling handling.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-10 20:46:02 +01:00
9e87fa178a
add property parsing to opengex parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-10 20:09:26 +01:00
c3e2fa0761
- untabify obj parser.
...
- bugfix openddl: latest version
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-10 19:31:23 +01:00
4e8f7fb802
Fix Visual Studio prefixes
2015-02-08 12:26:29 +01:00
124f408976
add property parsing.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 19:52:06 +01:00
303a6893fc
fix the build.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 13:23:32 +01:00
20b3ce6a40
replace opengexparser by using openddl-parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 12:47:53 +01:00
de66f15a0a
Fix division by zero
2015-02-02 16:03:24 +02:00
b93bd167ed
Fix infinite loop in STL loader error path
...
It appears that this was never tested since hitting it caused an infinite loop.
Fixes testcase hangs/c2eb1fa3e74c6ffe0cebcb1672b03140
2015-02-01 00:35:00 +02:00
fe89773c6f
Fix infinite loop in PLY parser
...
Fixes testcase hangs/9ab979ab256c70aaec9b651f32f051e9
2015-02-01 00:22:32 +02:00
6b9f9afd7a
Fix infinite loop in STL loader
...
If next character was not part of valid token and not whitespace we
would end up spinning in the loop indefinitely. Fix by using do..while
loop which always skips at least one character.
Fixes testcase hangs/73b42cd3b6d05e2ddb5c0fe5888459bc
2015-02-01 00:09:32 +02:00
08ad6ae8fe
Merge pull request #450 from turol/afl-fixes
...
Fix some bugs found with afl
2015-01-31 20:51:07 +01:00
792da49933
Fix out-of-bounds write when STL file node name is too long
2015-01-31 21:36:13 +02:00
f971b66c47
Fix out-of-bounds read in invalid compressed X file
2015-01-31 21:36:08 +02:00
063b2733fc
Merge branch 'master' into opengex_support
2015-01-31 11:09:20 +01:00
1ee4c06e4b
add openddl-parser to contrib.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:07:48 +01:00
95ad827277
Remove bogus delete[] on error path
...
mBuffer is a pointer inside a std::vector so don't try to delete[] it.
2015-01-29 23:22:56 +02:00
0108d5b1f9
Fix read past end of buffer on malformed LWOB files
2015-01-29 23:22:56 +02:00
16f9ca35d2
Fix out-of-bounds read when OFF file contains no vertices
2015-01-29 23:22:56 +02:00
af09e68654
Fix memory corruption when LWO file contains bad-sized points chunk
2015-01-29 23:22:41 +02:00
2f0675ac53
Fix memory corruption when 3DS file has more smoothing groups than faces
2015-01-29 23:18:19 +02:00
b700cd917f
Merge pull request #452 from ricortiz/FixExportedLibraryNameVariable
...
Fix exported library name variable
2015-01-29 17:24:30 +01:00
c5d048a98a
Fix crash when 3DS file contains faces but no vertices
2015-01-28 18:37:36 +02:00
cc346d3e12
Merge pull request #437 from CasperTech/master
...
Add support for component controlled matrix transforms, i.e transform(0)...
2015-01-25 19:44:27 +01:00
f62d03bd03
Merge pull request #439 from expipiplus1/master
...
Fix incorrect abs usage
2015-01-25 19:41:46 +01:00
380021e7c4
Check that zlib initialized correctly in FBX parser
...
Check the return code of inflateInit() indicates success to avoid
crashing later when zstream contains invalid data.
2015-01-24 00:00:35 -05:00
a94e668486
Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX
...
to have a consistent library name accross platforms.
2015-01-23 14:19:29 -05:00
e8d4479344
Squash incorrect abs usage
...
Replace calls to abs with a float to calls to std::abs. Before int abs(int)
was being called.
2015-01-22 20:03:13 +00:00
a09de30d83
Add support for component controlled matrix transforms, i.e transform(0)(0) etc.
2015-01-21 01:45:35 +00:00
62225f61e4
Merge branch 'master' into opengex_support
...
Conflicts:
.gitignore
2015-01-13 20:21:17 +01:00
b367d9b390
Fixed some warnings related to empty statement when using assert & building in release mode
2014-12-18 11:01:16 +01:00
469db95cd5
Merge remote-tracking branch 'official/master' into contrib
2014-12-18 10:42:29 +01:00
b1221ade64
fix some errors/warnings found by static code analyzer
2014-12-16 23:41:10 +01:00
3303f97f13
Merge remote-tracking branch 'official/master' into contrib
2014-12-16 17:48:30 +01:00
ab7754ab2a
Code style changes.
2014-12-11 23:05:09 +01:00
33f9745b62
Formatting changes.
2014-12-05 19:40:09 +01:00
4550279629
Added binary ply exporter.
2014-12-05 17:25:18 +01:00
bc0fd00e96
Merge pull request #414 from l337r007/collada-tristrips
...
Collada: tristrip support: helps a lot :-). Thanks for that!
2014-12-01 20:48:10 +01:00
7a31a68cfc
adapt c-api to get ImporterDesc for a given loader ( see https://github.com/assimp/assimp/issues/412 ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-01 20:34:15 +01:00
1f13158b31
fix vs2013 compiler warnings and add missing doxygen tags.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-29 12:12:32 +01:00
098ddd3a95
make copy constructor and a assignment operator private to avoid misuse of helper class scope guard
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-29 11:56:39 +01:00
9f80a2a2a9
update parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-29 11:33:49 +01:00
c08a5581dd
ColladaParser::CopyVertex: don't make a local copy of the vertex' indices.
...
Instead, we address the relevant indices in the main vector directly by
adding the input offsets to the per-vertex base offset.
2014-11-20 17:53:06 +01:00
8dead93504
ColladaParser: don't arbitrarily limit number of per-vertex attributes.
2014-11-20 16:42:41 +01:00
ca3ce4703d
Rename ColladaParser::CopyPrimitive to ::CopyVertex.
...
That's a bit closer to what the function actually does.
2014-11-20 13:12:09 +01:00
13a157ea66
For Polylists, manually compute the start offset outside CopyPrimitive.
2014-11-20 13:10:15 +01:00
e568c2df9d
ColladaParser::ReadIndexData: don't rely on the specified number of primitives.
...
Especially TriStrips don't specify triangle count upfront, so one needs to
sum up the count of triangles read from all <p> tags in a tristrip collection.
2014-11-19 14:40:43 +01:00
72f67ea0cd
Whitespace changes
2014-11-19 14:40:42 +01:00
593484829b
Add Function ColladaParser::ReadPrimTriStrips.
...
This does the index mangling for reading tristrips.
2014-11-19 14:40:42 +01:00
0f40dcca7e
Add calculation for nuber of Primitives for TriStrips
2014-11-19 14:40:42 +01:00
7c4bf383d7
Move vertex copy operation into switch statement.
...
We will be adding special handling for Tristrips in an upcoming commit,
which unfortunately doesn't map to a common copy loop as it is.
2014-11-19 14:40:42 +01:00
4ef244f672
Extract function ColladaParser::CopyPrimitive
2014-11-19 14:40:42 +01:00
70d2c8571b
ColladaParser::ReadPrimitives: get rid of "idx" iterator.
...
We will be adding non-sequential access to the indices vector in one of the upcoming commits.
2014-11-19 14:04:49 +01:00
543bd5c0d0
ColladaParser::ReadPrimitives: rename "a" to currentPrimitive
2014-11-19 13:51:22 +01:00
c7b6b5ea2f
Support lowercase 'ns' and 'ni' obj material tokens
...
Previously, the obj material parser would interpret all key tokens
starting with 'n' as 'newmtl' tokens. However, there are other tokens
that can start with 'n', namely 'ns' and 'ni' for material properties.
Make the parser robust to such cases, despite their canonical forms
being uppercase.
Resolves #410 .
2014-11-18 16:56:46 -08:00
dbf9536213
bugfix: add correct handling for metric line end for example file.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-02 20:30:45 +01:00
1a5695ff48
update: add parsing of metric nodes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-02 19:01:04 +01:00
6843c42da1
update:
...
- merge master into branch
- fix metrix header parsing.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-28 21:45:09 +01:00
f84589fec4
Merge branch 'master' into opengex_support
2014-10-24 15:24:32 +02:00
cee583db06
bugfix: fix compiler warning: converting double to float.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-22 23:05:25 +02:00
940414104a
Merge remote-tracking branch 'official/master' into contrib
2014-10-13 14:10:11 +02:00
b483be3069
Merge pull request #402 from jdduke/disable_bmesh
...
Temporarily disable Blender BMesh conversion
2014-10-10 22:46:25 -07:00
a1a1bf77a8
Temporarily disable Blender BMesh conversion
...
Disable BMesh conversion while associated unresolved issues receive due
attention. Referencing #400 , #373 , #318 #315 and #132 .
2014-10-10 14:16:42 -07:00
487c9449d2
bugfix: search for token checks for the given tokenlist against the lowercased info coming from the asset file. So we also have to used a lowercased token. Thanks to Robinson for the report.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-10 15:59:42 +02:00
88f6e8213b
Android JNI asset extraction support (API 9+)
...
- installation fixes
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 17:05:14 +02:00
7224476ee1
Android JNI asset extraction support (API 9+)
...
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 16:33:43 +02:00
397989e169
Null-terminate string
...
In theory it shouldn't be necessary since the length is specified but there are parts like https://github.com/assimp/assimp/blob/master/code/MaterialSystem.cpp#L74 that depend on it.
2014-09-26 01:29:23 +02:00
a5afbcf29c
refactoring: remove duplicate code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-23 23:34:05 +02:00
775b26e614
use std:: namespace for most cmath functions:
...
http://en.cppreference.com/w/cpp/header/cmath
2014-09-23 00:43:33 +02:00
b359deb7fd
update:
...
- add assert test in obj-import
- fix material token in Obj.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-21 20:37:36 +02:00
4dcd316430
Use strict inequality when validating BMesh uvloop access
...
Change the inequality to a strict inequality when validating
BMesh uvloop access during face conversion.
2014-09-20 10:23:21 -07:00
6a8f69ad5d
Merge pull request #386 from jdduke/rebase_fbx_fov
...
Rebase FBX regression db entries
2014-09-16 09:37:37 -07:00
aac40dd5b8
Merge pull request #385 from jdduke/fix_blend_and_rebase_regression_tests
...
Fix non-BMesh-containing .blend import
2014-09-16 01:10:53 -07:00
046b7e5f47
Rebase FBX regression db entries
...
The FBX importer now properly parses field-of-view tokens. Rebase
only the failing FBX entries to accomodate the fix, also removing
the comment noting the (now incorrect) comment about improper import
of the FOV property.
2014-09-15 18:14:38 -07:00
c482458cae
Fix non-BMesh containing .blend import
...
BlenderBMeshConverter was erroneously asserting that it contained valid
mesh upon construction. The assertion should only occur when
triangulation is requested, allowing non-BMesh blender meshes to load
properly.
Note that this fixes a number of .blend regression tests that are
currently baselined as failures.
2014-09-15 17:19:33 -07:00
ab6b5a7b21
Fix gcc warnings. (initialization order)
2014-09-15 23:35:03 +04:00
35c9a33718
Fix crash for Blender poly to face conversion without UVs
...
BlenderBMeshConverter assumes that the BMesh has UVs, but that is not
always the case. Handle the non-UV case by only adding a T face when
UVs are present.
2014-09-13 09:43:00 -07:00
485aa8b39d
Fix null check in Q3BSPFileImporter
...
Reverse the null condition, preventing invalid texture stream
dereferencing. Fixes #380 .
2014-09-12 19:37:10 -07:00
db582ee024
bugfix: replace nullptr with NULL:
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 18:12:18 +02:00
49c9786b0a
update: avoid mesh generation on heap, when the mesh will be empty ( obj-loader ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 15:40:50 +02:00
7dff0c6d52
refactoring: remove not use iosystem.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 12:05:42 +02:00
75d3c8e9f2
update: metric parsing ongoing.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 12:00:03 +02:00
43c82b0b38
Remove std::isnan and std::isinf usage from utFastAtofTest
...
These functions were added in C++11, and should not be used nakedly
in the current code base. Replace them with suitable C++03 constructs.
2014-09-09 16:34:10 -07:00
66e608a393
Replace cppunit with the googletest framework
...
The GTest framework has a more active support base, and natively
supports CMake. Introduce it as an external dependency (using CMake's
ExternalProject_Add), replacing cppunit and porting the associated unit
tests.
2014-09-07 16:52:03 -07:00
c3b35f3933
update: add endline.
2014-09-06 09:19:28 +02:00
185f01963f
LWO: replace legacy reinterpret_cast based code by memcpy to solve Android SIGBUS problems due to unaligned accesses. Fixes #351
2014-09-04 20:49:48 -07:00
1a594b861a
Collada: use a counter instead of clock() to generate unique names. Closes #357
2014-09-04 18:50:37 -07:00
ed9a466c30
update:
...
- add OpenGEX parser sceleton
- add base datatypes for OpenGEX support.
2014-09-04 19:41:14 +02:00
8bf26065de
[FBX] parse upper cased Int/Enum properties
2014-09-01 19:06:59 +03:00
625d2b7c4a
Fix #325 ; Blender UV unwrap issue
...
The BMesh converter might be missing more details, but this should get basic UVs working for now.
2014-08-30 00:50:26 -04:00
201807f733
Merge pull request #350 from Gargaj/ambientlight
...
Enable ambient lights
2014-08-28 09:20:04 -07:00
d333e08343
add ambient light type, allow collada to load it
2014-08-28 16:27:29 +02:00
e2401c8b58
fix va_end call
2014-08-28 15:51:01 +02:00
6f828087f9
add stdarg.h
2014-08-28 15:45:48 +02:00
19de24a442
...and some more assbin leftovers
2014-08-28 15:42:22 +02:00
8f0208e5a8
whoops, still some residue from ASSBIN
2014-08-28 15:41:17 +02:00
c47dc2802e
convert assxml exporter
2014-08-28 15:38:57 +02:00
2e9195819a
start assxml exporter basics
2014-08-28 15:17:53 +02:00
7f45f5fc95
bugfix: fix license.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-27 23:01:35 +02:00
8126dce94d
update: add sceleton for OpenGEX importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-27 23:00:19 +02:00
9d04a45088
Collada : Add missing parsing <image> into <effect><profile> markup
2014-08-27 10:15:13 +02:00
e2d9512275
Merge remote-tracking branch 'official/collada_export_escape' into contrib
2014-08-25 10:51:50 +02:00
33ffb0003e
Collada Export: escape user-defined strings in XML output.
2014-08-23 15:42:47 -07:00
fddae20cb7
Merge pull request #338 from jdduke/fast_atof_fix_final
...
Gracefully handle NaN/inf values in fast_atoreal_move
2014-08-20 19:29:44 -07:00
ed124ccbab
Gracefully handle NaN/inf values in fast_atoreal_move
...
There are legitimate cases where inf/nan values are embeddded in a mesh.
Such values should not cause loading to fail, and indeed, previous versions of
Assimp supported their existence. Update the new fast_atoreal_move method
to gracefully parse such values, allowing case-insensitive checks for "NAN",
"INF" and "INFINITY" as per the atof guidelines found at
http://en.cppreference.com/w/cpp/string/byte/atof .
Note that the inf/nan text parsing is fairly loose, but is fast for the general
case and should handle most legitimate inf/nan values.
2014-08-20 18:42:37 -07:00
7ff7b783ee
Merge pull request #335 from abma/master
...
fix most warnings with -pedantic
2014-08-17 17:49:21 -07:00
6c5f9ecb06
fix most warnings with -pendantic
2014-08-18 02:09:06 +02:00
6636e596ab
Merge pull request #334 from jdduke/fbx_binary_fix
...
Avoid raw reinterpret_casts in the FBX parser
2014-08-17 17:01:10 -07:00
48a772b20b
fix compiler warnings:
...
- defined but not used
- deprecated conversion from string constant to ‘char*’
2014-08-18 00:46:21 +02:00
d795491c48
fix unittests on linux / enable on travis-ci
2014-08-18 00:34:45 +02:00
56ddb4f4af
fix some compile warnings:
...
- passing NULL to non-pointer
- unused vars
- unused function
- order of init
- parentheses
2014-08-17 23:28:00 +02:00
aafc8d5f3f
CMake: changed cached bools into "option"
2014-08-17 23:10:06 +02:00
69810a2a07
Avoid raw reinterpret_casts in the FBX parser
...
As reinterpret_cast can break strict aliasing rules, causing runtime failure
on Android, replace such usage in FBXParser with memcpy. Also provide a
utility routine for both performing the copy and asserting the validity of
the buffer length relative to the copied region.
2014-08-17 08:41:45 -07:00
5e265610fb
bugfix: add obj-material handling for <color> 0 instead of <color> r g b.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-16 11:39:28 +02:00
58b78fa265
comment
2014-08-08 13:10:05 +02:00
fa99aa0d3a
add remaining specializations
...
hopefully i didnt mess this up too bad
2014-08-08 12:56:11 +02:00
b712bf1770
Change to looped writes
...
to avoid struct packing issues
2014-08-08 12:46:29 +02:00
9f795c64d5
Merge pull request #326 from Gargaj/newprogresshandler
...
More elaborate progress handler
2014-08-07 11:45:29 +02:00
63a110468f
Merge pull request #327 from Gargaj/assbinintegrate
...
Integrate import/export for .ASSBIN format
2014-08-07 11:41:35 +02:00
5886154247
tweaks according to the comments of kimkulling
2014-08-07 11:30:44 +02:00
c3977bd132
unify data types
2014-08-07 09:32:00 +02:00
61ecff3474
missed one 32/64 type conversion
2014-08-07 09:30:20 +02:00
b53a425fe4
make templates gcc compatible
2014-08-07 09:28:50 +02:00
2775141da3
#include should be outside
2014-08-07 09:07:09 +02:00
3c172988bb
remove BUG notices (discussed with acgessler)
2014-08-07 08:43:52 +02:00
df4b17d145
code style
2014-08-07 08:26:34 +02:00
aa5c1a1a23
syntax
2014-08-07 08:26:04 +02:00
7925dcadba
avoid NULL, just in case
...
(loader might just probably crash anyway)
2014-08-07 08:25:10 +02:00
523d87bbe7
use 0..fileSize as progress metric (easier for loaders)
2014-08-07 08:22:47 +02:00
061911bdbf
add support for compressed, drop support for shortened
2014-08-07 08:05:07 +02:00
fb546b694e
code style
2014-08-06 15:25:39 +02:00
1aeaef2037
add lights and cameras
2014-08-06 15:01:04 +02:00
97c9ce1d5b
add animations and textures
2014-08-06 14:44:06 +02:00
886a704c17
some notes to self
2014-08-06 14:43:47 +02:00
5048793096
add material import
2014-08-06 14:21:53 +02:00
f38dd8e6e2
add mesh loader
2014-08-06 14:06:08 +02:00
ad298cd84f
fix code style
2014-08-06 13:29:09 +02:00
ac5c1f9df1
add to cmake
2014-08-06 13:27:09 +02:00
87dff6a00e
start importer, load nodes
2014-08-06 13:26:26 +02:00
5b512dd9dd
add info + header check
2014-08-06 00:52:05 +02:00
9cdecc780b
Fix wrong nesting
...
Otherwise doesn't compile if ASSIMP_BUILD_NO_3DS_IMPORTER is defined because the #endif is inside the namespace block
2014-08-06 00:44:30 +02:00
0f822d38cd
add basic framework for importer
2014-08-06 00:39:54 +02:00
cd86818888
- add compression support
...
- remove unneeded code
- change log warning to exception
- document
2014-08-05 23:18:45 +02:00
fc9b4e2adf
follow assimp code style (tabs)
2014-08-05 22:55:20 +02:00
2592ff0796
convert exporter from tools/assimp_cmd
2014-08-05 22:54:45 +02:00
3d5e1b5cbc
add basic framework (files, etc)
2014-08-05 20:54:38 +02:00
6b8cbe5c83
this isn't needed anymore
2014-08-05 00:10:23 +02:00
dbc553343c
Granulate file loading too
2014-08-05 00:05:18 +02:00
dfe1f03e5b
Split off postprocessing progress
2014-08-04 23:57:08 +02:00
203d5d6fcc
Obj: make mtl importer accept kd, ks etc. as well (Kd, Ks being the correct form). This is for keeping up compatibility with assimp's own Obj exporter, which has been inaccurate about this since inception.
2014-08-02 21:18:21 -07:00
f5b9f5cb50
Merge pull request #321 from Gargaj/patch-1
...
Add FieldOfView token type (fixes #245 )
2014-08-02 11:38:23 -07:00
e5ed62581d
Handle both types of element names
...
MAX seems to add an "s" to "Binormal" and "Tangent" when exporting
2014-08-02 14:57:43 +02:00
11af0866dc
Add FieldOfView token type ( fixes #245 )
...
"FieldOfView" has its own token type (basically just one float), if it's missing the camera will keep reverting to default FOV in ASSIMP.
2014-08-02 14:47:59 +02:00
5d861a8250
bugfix:
...
- fix gcc-specific compiler warnings.
2014-07-31 15:09:49 +02:00
9eba139feb
Merge pull request #317 from assimp/export-3ds
...
3DS Exporter
2014-07-23 22:26:58 +02:00
a07cde4a81
3DS Exporter: export scene hierarchy.
2014-07-23 22:08:35 +02:00
026f32733d
3DS Export: fix texture export.
2014-07-23 20:14:32 +02:00
d5db6f39e6
Fix CI build.
2014-07-23 18:54:05 +02:00
6fde07f7e5
Initial implementation of 3DS Exporter. Hierarchy exporting and smoothing groups missing.
2014-07-23 18:27:22 +02:00
0c5605d07d
Don't use isspace() in OBJ file parser.
2014-07-22 21:59:23 -07:00
79c56adea4
Don't use isdigit() in fast_atof.
2014-07-22 21:58:41 -07:00
0166518132
Extend StreamWriter to write to a buffer and to allow re-positioning of the write cursor within the buffer.
2014-07-22 20:36:16 +02:00
3419fedb3c
Add StreamWriter utility (mostly symmetric to StreamReader).
2014-07-22 17:55:37 +02:00
36c82fe5b0
Allow several spaces between numbers in OBJ files.
2014-07-21 23:03:08 -07:00
3e9fab3bfc
Allow numbers starting with decimal in fast_atof.
2014-07-21 22:43:13 -07:00
d655199043
bugfix: fix stupid test introduced by myself.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-07-19 16:22:15 +02:00
46ca36cb6f
update:
...
- remove dead code.
- check for a possible division by zero.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-07-19 14:45:21 +02:00
2edccb7f34
fast_atof: If a literal ends with a trailing dot (.), only parse further if the next character is a digit. In cases where the dot ends the literal (i.e. "1.") this would cause strtoul10_64 to throw an exception. To preserve as much of the old behaviour, we still consume trailing dots though. This "regression" was introduced (exposed) by #261 , which added the extra check to strtoul10_64 that triggered here. This commit now fixes #304 (IFC file reading broken due to IFC files containing "(1.,1.,1.)" lists.
2014-07-13 15:08:28 +02:00
7e48c1cce9
FBX: fix memory leak, parsed TokenList never released. See #307 .
2014-07-13 14:11:58 +02:00
5ae010028b
FBX: fix memory leak. Connection objects in Document never freed. See #307
2014-07-13 14:07:19 +02:00
a30ea8e92c
Fix overflow in STL header colour reading.
...
When reading the STL header for a "COLOR=rgb" part, the bytes were treated as signed chars, when in fact they can range from 0-255. This meant that any value greater than 127 would overflow, leading to an incorrect colour.
This change fixes the issue by treating the header as unsigned chars.
2014-07-13 00:34:08 +10:00
ce37d3bcad
Fixed possible bug with map_emmissive keyword and removed second check for ambient texture keyword
2014-07-11 08:11:54 +02:00
afa2d3da94
Improved texture map data in mtl exporter (in most cases an upper first character is used)
2014-07-10 08:26:32 +02:00
47e7667071
Added alpha texture map (map_d)
2014-07-09 15:51:09 +02:00
231e4e0cd0
update: commit not saved changes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-07-04 00:23:02 +02:00
c6b516b68b
bugfix: handling possible nullptr access.
...
update: replace clear be resize( 0 ) at some places to avoid double allocations ( only a micro optimization ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-07-04 00:22:13 +02:00
b3b732c12b
update: some micro improvements, replace post-increment operator with pre-increment operator.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-07-03 20:33:52 +02:00
6d16a5a5b7
Merge remote-tracking branch 'official/master' into contrib
2014-07-03 10:25:47 +02:00
0856ff9659
update: replace some clear / push-back by resize( 0 ) / push_back to avoid redundat allocations.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-06-29 21:16:37 +02:00
7abfcd1a4d
Merge pull request #300 from eyethereal/fix-obj-exporter-vertex-references
...
Fixed vertex reference output format in face element for OBJ exporter
2014-06-21 18:55:51 +02:00
1207f84f7b
Merge pull request #298 from Madrich/master
...
Collada fixes, adding XFile Exporter
2014-06-21 18:54:11 +02:00
2c34f24497
Fix XFile define
2014-06-21 17:23:30 +02:00
9fbc9c4fb7
Merge pull request #301 from eyethereal/obj-exporter-no-name-no-group
...
OBJ Exporter: No "g" lines with empty names
2014-06-21 15:21:27 +02:00
77faf04aa3
OBJ Exporter: No "g" lines with empty names
...
In the OBJ spec ( http://www.martinreddy.net/gfx/3d/OBJ.spec ), in the section labeled "Grouping" -> "Syntax", the structure of the "g" group statement is defined. Though this statement allows multiple names on a single line, it is unclear whether there must be at least one name on the line. However, the examples don't show any "g" group statements with no names. So, let's be conservative and not write out a "g" group statement that doesn't have a name. These empty "g" statements were prompting an error message from the three.js OBJ loader code.
2014-06-20 16:06:04 -07:00
d10d20f62f
Update ObjExporter.cpp
...
In the OBJ spec ( http://www.martinreddy.net/gfx/3d/OBJ.spec ), in the section labeled "Referencing groups of vertices", there is no support for allowing a trailing slash with no valid vertex normal reference at the end. This commit modifies the vertex reference output code to prevent this behavior, as it has been causing compatibility issues with other software that parse OBJ files.
2014-06-20 15:08:29 -07:00
1cb01c54a3
Fix IOSFixed
...
Fix Author/AuthoringTool in Collada by MetaData
2014-06-20 00:08:11 +02:00
be5fc42e16
Fix memory corruption in the aiGetExportFormatDescription() API. Clarify Exporter doc.
2014-06-17 16:10:55 +02:00
75fd29ac19
SceneCombiner: implement proper copying of meta data. This entire module will need to be revamped in future as it is highly likely to cause further regressions as assimp data structures are modified.
2014-06-17 15:18:10 +02:00
d044ce7a62
FBXConverter: avoid creating an empty metadata slot (UDP3DSMAX was erased from list _after_ its size was taken)/
2014-06-17 14:31:14 +02:00
244f981f6a
ObjExporter: cleanup code. Fix bug writing normal: normals would not be transformed by world transform.
2014-06-17 14:15:48 +02:00
5efc0207f3
Merge branch 'master' of https://github.com/assimp/assimp
2014-06-13 10:59:16 +02:00
16ae05eeeb
obj loader: added multiline support
...
collada loaded: bug fixed when importing several files, whith one containing animation
2014-06-13 10:56:10 +02:00
edc7a950c4
ReFix the stuff before
...
Fix XFileExporter Normal
Fix Collada (Triangle->Poly)
2014-06-11 00:41:18 +02:00
8549e4b1b1
fixed OgreImporter compilation error with boost scoped_ptr
2014-06-10 19:58:02 +03:00
272a59cd36
Fix convertToLH for uv coordinates
...
Fix Collada export
Fix XFile export
2014-06-10 13:14:41 +02:00
c4021fbaaf
Fix Collada export validated by Schema
2014-06-09 15:17:45 +02:00
77cec96d74
Fix collada
2014-06-07 21:17:31 +02:00
ec2ce90654
Add Scene Author + AuthorTool
...
Add XFileExporter
Add Collada Triangle+Line export
Fix Obj Comment
2014-06-06 01:56:54 +02:00
1403cabb71
FBXParser: fix compiler warning on double -> float.
2014-06-01 17:34:11 +02:00
9ddd459fe8
Extend Collada Exporter using lines and triangles
2014-05-31 12:50:11 +02:00
fe87b09246
Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290 .
2014-05-30 01:57:21 +03:00
b2ac7b878f
Correction on FBX material texture UV index
...
(keep the previous method for "allMaterials" option, this should be change too since the materials indexes used are not the good ones, or just remove the object / material test
2014-05-27 09:11:27 +02:00
62554a055d
Merge pull request #285 from jdduke/blend_fix_mirror_winding
...
Properly orient mirrored blend mesh faces
2014-05-25 01:34:52 +02:00
d9b65f9bd8
Properly orient mirrored blend mesh faces
...
If the mirrored axis count is odd, the face orientation has logically
been inverted. In such cases, the winding order should be inverted as
well, easing the burden on applications sensitive to index ordering
(e.g., one-sided renderers) to detect and fix such issues after import.
Add this functionality for .blend meshes.
2014-05-24 08:49:33 -07:00
1b6b238f09
FBX: fix handling of string metadata. Before, we would accidentially confuse aiString and std::string and trigger a debug assertion.
2014-05-22 16:22:38 +02:00
becd298e77
FBX: use memcpy() instead of reinterpret_cast or union to populate a float from a blob, causing SIGBUS errors on Android due to memory alignment of the source blob not being a multiple of 4/8. This fixes #24 .
2014-05-22 16:17:42 +02:00
274a6ce1ff
Fixed space
2014-05-21 15:59:13 +02:00
8a5041ea11
Merge remote-tracking branch 'upstream/master' into ogre-binary
2014-05-21 04:55:09 +03:00
43e620e04a
OgreImporter: Fix UV flip for binary meshes. Fix exception XML parsing when positions are declared in a previous vertex buffer than the currentl parsed one (that has eg. UVs). Remove debug prints from material parser.
2014-05-21 04:37:45 +03:00
f8e1dcb102
OgreImporter: Mirror bool return for XmlSerializer as it is in BinarySerializer. Document its meaning.
2014-05-21 04:06:22 +03:00
1129ae5a6e
OgreImporter: Implement binary skeleton serialization. Fix bone/animation matrix stuff to be simpler (aka read as Quats to internal structures). Cleanup code for pull request.
2014-05-21 04:00:11 +03:00
cf9b705829
OgreImporter: Move skeleton functions to the end of file (after mesh functions). Put all constant to same place in the file. Implement support for 'animationlinks' (skipped) and bone 'scale' (read to Bone but not utilized atm).
2014-05-21 00:09:30 +03:00
0b937c5a4b
OgreImporter: Proper rewrite of the XML parser to OgreXmlSerializer. Now more robust for XML sources, previously had hardcoded expectations on the child node ordering. Implement common Skeleton class for both binary and xml serialization. Implement shared IVertexData with proper bone assignment to Assimp bone weights functionality.
2014-05-20 04:52:53 +03:00
311f5b47ca
Fixed bug during compilation with mingw & improved git revision support for automatic up to date revision number.
2014-05-19 14:36:24 +02:00
75598f69b7
OgreImporter: Format code and move commented verbose debug logging behind internal OGRE_BINARY_SERIALIZER_DEBUG. Thow deadly importer error on clear invlid mesh file errors.
2014-05-18 12:30:16 +03:00
4b16b182be
OgreImporter: Implement Ogre binary mesh support (.mesh). All Ogre3D SDK media samples tested to work. Assimp repo does not yet have binary versions of Ogre meshes.
2014-05-18 11:57:44 +03:00
d531945888
Merge branch 'master' of github.com:assimp/assimp
2014-05-16 14:58:01 +02:00
908b945f50
BoostWorkaround/shared_array and shared_ptr: fix checks for whether the boost originals are included already. Fixes #277
2014-05-16 14:57:33 +02:00
427eaad642
Fixes #158 via anonymous user
2014-05-12 12:04:19 -05:00
04f0075b63
Change default extension for binary STL exports from stlb to stl
2014-05-12 12:50:21 +02:00
f6925db3d8
update: add cmake_mimimum_required statement to each cmake file
...
for consistency
2014-05-10 10:31:42 +02:00
eea8099b05
RemoveRedundantMaterials: Fix crash bug when unreferenced materials were destroyed. The logic only rebuilt the material list if there were redundant materials being removed. This is a clear bug as it left freed aiMaterial ptrs into the list and did not fix the scene->numMaterials to be correct, even when deleting materials. This crashed later on in the ComputeUVMappingsProcess that accessed the freed ptr.
2014-05-09 01:33:30 +03:00
f8b79acb36
Fixed compilation errors on OgreImporter with Visual Studio 2012
2014-05-05 10:25:04 +02:00
1ec72cdddb
Release candidate 2 : 3.1
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 19:17:51 +02:00
392730be07
bugfix: export processes for unittests.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-04 16:02:52 +02:00
9ad74e461e
OgreImporter: Added brackets for all conditional etc. statements, even when there is a single line as requested by @kimkulling. I'm still not sure about the coding convention but looked for guidance in the obj importer code. Now newline before { if only one line and no else/else if after it, othewise a newline before it.
2014-05-03 00:20:17 +03:00
22a4215c06
OgreImporter: Remove unnecessary comments.
2014-05-02 01:54:42 +03:00
dcf6002bed
Try fix travis ci produced build errors on gcc and clang.
2014-05-02 01:38:13 +03:00
409c2cf332
OgreImporter: One more function cleanup.
2014-05-02 00:56:35 +03:00
283394d695
OgreImporter: Cleanup skeleton related code and code that populates the assimp scene. Tested skeleton/animation imports and it seems to work correctly now.
2014-05-02 00:28:14 +03:00
f5c7b283bc
OgreImporter: Cleanup and bugfixes to OgreSkeleton.cpp. This was actually so badly broken that it did nothing if the mesh referenced a binary skeleton. Now logs a warning for this case and tries to read from .skeleton.xml like the original author intended it to work. The assimp skeleton is still broken, I will fix that later on when I (eventually) get to that part of the code.
2014-05-02 00:28:13 +03:00
45715df263
OgreImporter: Forgot to rebuild after filename changes so broke the build. Fix includes, add include guards and ASSIMP_BUILD_NO_OGRE_IMPORTER to missing places.
2014-05-02 00:28:12 +03:00
fcb97bb595
OgreImporter: Rename .hpp to .h. Shuffled parsing utils to a single file.
2014-05-02 00:28:12 +03:00
f98584cdea
OgreImporter: Remove unnecessary m_currentX state. Improve and clean OgreMaterial: split tech/pass/texture_unit to their own functions. Document missing features and potential bugs. Improve the original authors 'detection from texture filename' logic (enabled with AI_CONFIG_IMPORT_OGRE_TEXTURETYPE_FROM_FILENAME). Add generic detection from texture unit name, which is commonly used in Ogre materials.
2014-05-02 00:28:10 +03:00
6c51fa2072
OgreImporter: Continue cleanup.
2014-05-02 00:28:09 +03:00
09517b342b
OgreImporter: Started cleanup and refactoring. Aim is to get this into a shape that its easy to read and understand before I start making any new features.
2014-05-02 00:28:09 +03:00
825a61fbc0
update:
...
- update version info for 3.1
- aiGetVersionRevision will now return the git tag.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-05-01 11:32:15 +02:00
d1886daf5a
Merge branch 'master' of https://github.com/assimp/assimp
2014-04-29 00:06:14 +02:00
fbaf89492d
bugfix: Obj-importer is now able to deal with 3d-texture coordinates.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-04-29 00:04:54 +02:00
7c3a039349
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
include/assimp/matrix4x4.inl
include/assimp/vector2.h
include/assimp/vector3.h
2014-04-22 14:32:59 +02:00
129e4318e6
Merge pull request #255 from xantares/master
...
mingw|cmake fixes
2014-04-22 08:49:59 +02:00
25c2dd58de
fix: smoothed normal qnan handling & more stable smoothed normals for imprecise geometry w/ long thin faces
2014-04-21 23:12:51 +02:00
0a01da7242
fix: optimize meshes when vertex & primitive format final
2014-04-21 22:52:50 +02:00
8699021f17
fix: OptimizeMeshes w/o SplitLargeMeshes was disabled due to obscure max_verts = 0 assignment
2014-04-21 22:40:48 +02:00
0e62405406
use standard BUILD_SHARED_LIB option. Install dll to <prefix>/bin (mingw)
2014-04-21 21:36:33 +02:00
aae01c47ad
bugfix: fix compiler warnings for gcc-4.8.1.
2014-04-21 16:18:14 +02:00
a6044e125e
Merge pull request #249 from attila-barsi/master
...
Initial version for FBX layered textures.
2014-04-01 16:02:16 +02:00
4f36e85bd8
Added required changes to doc and protection from nullptr.
2014-03-31 10:30:04 +02:00
38de6a658d
bugfix:
...
- fix redundant checks against nullptr ( see https://github.com/assimp/assimp/issues/241 ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-27 20:33:08 +01:00
2e3b602c0b
Aspect Ratio fix, and comment about field of view.
2014-03-26 16:44:49 -05:00
ed9204ab1b
Initial version for FBX layered textures.
...
Fixed assert during parsing UDP3DSMAX.
2014-03-24 11:46:36 +01:00
1f3be52079
Merge remote-tracking branch 'official/master' into contrib
2014-03-24 10:44:57 +01:00
2dd6726c02
Changed order of some post processing steps in order to switch coordinate system as early as possible because pretransform now accept external matrices for the root transformation & this matrice should imperatively be in the same system coordinates as the rest of assimp structures
2014-03-24 10:43:07 +01:00
358819c1a0
Fixed error in GetProperty when accessed from external libraries using a different language (using swig for example)
2014-03-20 15:32:12 +01:00
331158e410
Merge pull request #237 from frederikaalund/master
...
Added support for heterogenous metadata on aiNode
2014-03-20 02:23:07 -04:00
e9fa779a65
Fixed error when compiling with mingw
2014-03-19 15:45:12 +01:00
82cc038a83
Merge remote-tracking branch 'official/master' into contrib
2014-03-19 10:18:47 +01:00
7d1a704ed7
saves value in the 'Ke'-Attribute in ObjMtl Files in COLOR_EMISSIVE
2014-03-16 21:30:10 +01:00
595529ef8b
Refactored the metadata for inner consistency.
2014-03-15 08:37:45 +01:00
a8401ba377
Added support for heterogenous metadata on the aiNodes.
2014-03-14 14:17:34 +01:00
8fad549649
Merge remote-tracking branch 'official/master' into contrib
2014-03-10 17:21:26 +01:00
77263c631f
Fixed unzip support to use IOSystem/IOStream abstraction
2014-03-10 17:21:17 +01:00
29e3b82238
Fixed some header files in CMakeLists
2014-03-10 17:20:14 +01:00
f65e5d5487
Fixed a compile error due to a >> expression in a nested template statement.
2014-03-09 17:04:27 +01:00
9eb8677aba
Added unparsed FBX properties to the aiNode's metadata. This allows the
...
user to extract extra/custom/user attributes/properties from the scene
graph. E.g., extracting attributes set under "extra attributes" in Maya.
2014-03-09 16:18:05 +01:00
84b66092d7
Merge pull request #217 from lousyphreak/master
...
Fix 3DS instances loading, fixes #151
2014-03-06 00:07:33 +01:00
34882177a9
bugfix: install_name should be set to absolute path to installed library in macosx build #226
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-06 00:06:19 +01:00
ec2b8dd3fa
bugfix:
...
add handling for special cases for the uv-calculation:
- When 3 vector have same UV, using default UV direction:
- When 2 vector have same UV, recalculate tangent/bitangent according to normal and bitangent/tangent.
Thanks to Ya ping Jin.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-03-05 23:25:49 +01:00
172c917c37
Merge remote-tracking branch 'official/master' into contrib
2014-03-03 12:47:45 +01:00
5c95848f51
Merge pull request #224 from VirusFree/master
...
[FBX] Do not rename null nodes. Preserve information in node metadata.
2014-03-02 10:41:28 -05:00
08324b8095
fix miss commit at 8e35ea59d5
2014-03-01 20:34:57 +09:00
f54c85d4e6
Added custom root transformation for pre-transform vertices post-process step
2014-02-28 15:32:43 +01:00
843e56c252
Added matrix properties
2014-02-28 15:21:10 +01:00
b90718bd21
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
code/IFCLoader.cpp
2014-02-26 18:06:46 +01:00
fd4cd67edb
Merge pull request #218 from YoheiKakiuchi/fix-ply-parse
...
remove SkipSpaceAndLineEnd after parsing end_header in PlyParser.cpp
2014-02-26 16:42:18 +01:00
2db48ef532
[FBX] Do not rename nodes if they are marked as null in fbx. Preserve this information in node metadata.
...
Use can use node.Metadata.Get("IsNull") to check. (returns "true" or "false")
2014-02-23 12:27:34 +02:00
5ef8c09dbb
Use AiNode's metadata to keep per-node(and per-instance) FBX (3dsmax) UserDefinedProperties
...
Also simplify metadata structure to avoid unnecessary allocations (and make it easier for wrappers like AssimpNET to read it)
2014-02-22 21:57:01 +02:00
99e4176576
fix using flag
2014-02-18 16:37:23 +09:00
b75f27492a
Merge remote-tracking branch 'official/master' into contrib
2014-02-17 08:49:43 +01:00
02c4344d1d
detect FBX glossiness map (ShininessExponent)
2014-02-14 15:15:18 +02:00
9b25749536
Fixed bug in merging of materials
2014-02-10 15:11:13 +01:00
8e35ea59d5
check binary or not in ParseHeader in PlyParser
2014-02-07 10:38:49 +09:00
52916b094c
remove SkipSpaceAndLineEnd after parsing end_header in PlyParser.cpp
2014-02-06 12:55:52 +09:00
586f1646c5
In Assimp: fixed a bug in Pretransform Vertices post process step where newly created meshes of different instances of the same original meshes where not referenced appropriately by their parent node
2014-01-31 11:12:18 +01:00
9f10553601
Fix 3DS instances loading, fixes #151
2014-01-30 02:39:04 +01:00
53eb9dca32
In Assimp: fixed memory leak in RemoveRedundantMaterial post process step
2014-01-17 12:03:39 +01:00
34c3449cdd
Always activate thread safety if possible
2014-01-17 12:03:18 +01:00
8267d93537
Modif dans le parsing IFC suppressions des espaces avant traitement de la chaine
2014-01-17 12:02:58 +01:00
e6c5095e5b
In Assimp: fixed use of macro ASSIMP_BUILD_NO_VALIDATEDS_PROCESS
2014-01-17 12:00:54 +01:00
7372bf2467
Merge commit 'c0871b35c0ab7091f68c794eb954493722522d4c' into contrib
2014-01-17 11:59:31 +01:00
1002f154ac
In Assimp: fixed typo in comments
2014-01-17 11:58:20 +01:00
41175dacca
Merge commit '6d630bec50fe7767296b0e5184a9c6c7b915df24' into contrib
2014-01-17 11:57:45 +01:00
ec3ef0c9d6
Assimp: fixed 3 memory leaks
2014-01-17 11:55:59 +01:00
419beca470
In Collada: improved embeded textures naming scheme in exporter
2014-01-17 11:54:20 +01:00
94f156f809
In Collada: added support for exporting uncompressed embeded textures as bitmap
2014-01-17 11:53:41 +01:00
3dc62f22fb
In Collada: exporter path parsing improved
2014-01-17 11:53:03 +01:00
54e4c6b20b
In Collada: first preliminary support for export of embeded textures
2014-01-17 11:52:56 +01:00
8bbe14c052
Merge commit '44773b8f9e47d9fe7e80946a1a9eb3d764fc8af2' into contrib
2014-01-17 11:52:08 +01:00
7bc074857e
Missing material functions for aiUVTransform added
2014-01-17 11:51:43 +01:00
d080eb493e
Merge commit 'acca16c82fb9fa37c40475a423e979e9c7aa0d5a' into contrib
2014-01-17 11:49:30 +01:00
bac6b34504
Removing null characters from xml parser input to avoid parsing failures
2014-01-17 11:48:42 +01:00
e2676ec176
Implementing UTF8 to ISO-8859-1 conversion to improve chances of finding files in zip archives
2014-01-17 11:48:27 +01:00
0bf4aea9d5
Improved fast_atof (bis)
2014-01-17 11:47:37 +01:00
3e55dca943
Improved fast_atof
2014-01-17 11:46:44 +01:00
d28fc25c5c
Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib
...
Conflicts:
CMakeLists.txt
2014-01-17 11:45:57 +01:00
4e7b59be55
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
29c125e51d
Minor improvement of ParsingUtils
2014-01-17 11:42:51 +01:00
44f1a1fb5d
Huge optimization of Q3BSPZipArchive to reduce 3DXML importing time by a factor of 15~20. (However, the zip archive is now entirely decompressed in memory, so it takes twice as much memory)
2014-01-17 11:41:46 +01:00
cf817270fc
Reformating Q3BSPZipArchive
2014-01-17 11:39:51 +01:00
bb9288fa26
Improved Q3BSPZipArchive + added material merging
2014-01-17 11:38:01 +01:00
51bf836db4
Fixed bugs in Q3BSPZipArchive & DefaultLogger
2014-01-17 11:36:47 +01:00
053df6907a
Removed precompiled header because of a bug when switching configuration in visual studio
2014-01-17 11:35:30 +01:00
2cca861526
Merge commit '1f012384265e0dcc777e23369470391324d840e5' into contrib
2014-01-17 11:25:01 +01:00
bfd3a206ea
Improved CMakeLists.txt source groups
2014-01-17 11:24:16 +01:00
8ba5fa33af
Improving ColladaExporter to support scenes with only one node
2014-01-17 11:21:32 +01:00
365b3aa412
Improved math operation with epsilon support
2014-01-17 11:21:15 +01:00
6c0ebb679a
Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib
...
Conflicts:
code/ColladaExporter.cpp
2014-01-17 11:19:29 +01:00
a940102d70
Debugging ColladaExporter function for writing header information
2014-01-17 10:38:59 +01:00
3317f667e5
Improving ColladaExporter to add shading model, bump mapping, transparent & refraction properties
2014-01-17 10:38:42 +01:00
78389e2e86
Improved collada exporter
2014-01-17 10:38:17 +01:00
9120689f0d
Improving ColladaExporter to play nice with models imported from any format.
2014-01-17 10:36:18 +01:00
b4b39e026d
Improving ColladaExporter to allow non-destructive cycles of import/export
2014-01-17 10:36:01 +01:00
30c6a74e1d
Improving constructors of aiNode & aiScene
2014-01-17 10:31:27 +01:00
5e603d9ed8
Correcting a bug where the constructor & destructor of aiScene were not exported correctly in the assim library
2014-01-17 10:26:48 +01:00
df700b998f
Another small bug correction in Q3BSPZipArchive
2014-01-17 10:24:14 +01:00
2ef0f0f0e1
Correcting some bugs in Q3BSPZipArchive
2014-01-17 10:23:49 +01:00
2d709dd638
Fix for FBX pivot transformation.
...
Parse and use the GeometricScaling,GeometricRotation and GeometricTranslation model properties in node transformation
2013-12-29 21:02:16 +02:00
284abbe9e1
fix for collada parser when importing empty arrays.
...
Exiting function so early break the parsing procedure, misses node closing and causes improper initialization of element (cannot be referenced later on)
2013-12-20 11:36:35 +02:00
f433746bfa
Add support for emissive and gloss-maps
...
Conflicts:
code/ObjFileMtlImporter.cpp
Someone added support for loading more bump maps, I added support for emmissive-maps. Easy merge.
2013-12-14 01:40:37 +01:00
9186911da0
Fix build exclude define in BlenderScene.cpp, fixes #205
2013-12-11 17:44:46 +01:00
0b88f72be2
refactor the code, also parse texture option explictly
2013-12-02 22:58:15 +08:00
0860254a2b
Fix Obj texture parsing error: where obj texture map statement contains texture option, it will fail to parse the correct image url, as a result, the texture won't be shown. Besides, we also add clamp texture mode for obj
2013-12-02 22:55:51 +08:00
ccd5b30a56
Merge pull request #199 from jdduke/obj_mg_parse
...
Properly parse 'mg' keyword in .obj files
2013-11-28 06:49:00 -08:00
e27d452770
Merge pull request #200 from jdduke/stl_gray_diffuse
...
Default to light gray diffuse for STL
2013-11-27 15:16:37 -08:00
931f0489bd
Properly parse 'mg' keyword in .obj files
...
The 'mg' keyword is currently being interpreted as a material library keyword,
when it really refers to the merging group. Handle this case, in effect ignoring
the keyword as merging groups are currently unsupported.
2013-11-26 14:24:15 -08:00
00717b6474
Default to light gray diffuse for STL
...
For consistency, use a light gray default diffuse color for STL files.
This provides consistency with other geometric types, like PLY, that use a
light-gray default material.
2013-11-26 14:11:24 -08:00
acca16c82f
Merge pull request #196 from AIM360/UpdatedCodeComments
...
Updated some code comments in DefaultIOStream.cpp
2013-11-26 06:04:54 -08:00
5983300422
Updated some code comments in DefaultIOStream.cpp
...
There was a misleading TODO comment that encouraged to use fseek/ftell instead of fstat. However, fstat has been used intionally because fseek/ftell is potentially unsafe.
So I replaced the TODO and added some explanation why fstat is being used instead.
2013-11-26 14:52:53 +01:00
d6a3df0acf
Merge pull request #192 from AIM360/FaultToleranceFor3DSLoader
...
3DSLoader: Skipped chunks of size 0
2013-11-25 09:46:00 -08:00
35fa7cb441
3DSLoader: Skipped chunks of size 0
2013-11-25 11:53:15 +01:00
d7dbdd6c3b
SortByPType Posprocessing crashed for crappy models with degenerated geometry
...
Which models crashed before the fix?:
The crash was observed for files with the following properties:
1. They contain >=1 meshes
2. They were loaded with SortByPType option
3. They only contained degenerated meshes, so that these were skipped SortByPType
What is improved by the fix?:
Obviously, the affected models were crappy anyway and will still produce empty output after the fix. However, the fix avoids the heap-corruption, which couldn't be solved by try/catch from outside and had the annoying effect that a whole scene with hundreds of individual models could crash due to a single crappy one.
Why did it crash before?
The SortByPType deleted some exluded meshes, but didn't reset the pointers in pScene. After throwing the DeadlyImportException (no remaining meshes), remaining meshes were deleted => Excluded meshes were deleted twice.
2013-11-25 10:50:15 +01:00
d080f92241
BlenderTesselator: Fix OffsetOf() macro
2013-11-22 19:54:47 +01:00
857e50ba40
BlenderTesselator: disable GLU tesselation code by default.
2013-11-22 13:58:40 +01:00
fbb1a79248
Update CMakeLists
2013-11-22 13:57:50 +01:00
01a6ec9059
Adding tessellation support for new Blender 2.6 polygons
...
- Added BlenderBMesh.cpp/h which contains a class to convert a BMesh to an old style tri/quad mesh
- Added BlenderTessellator.cpp/h which contains a class to tessellate the poly loops contained within a BMesh
2013-11-22 13:17:21 +01:00
f2997a562b
typo fix: loose -> lose
2013-11-14 10:09:10 -08:00
3a3ac4fea2
Fix to support FBX 2011 (7100)
2013-11-12 23:25:40 +09:00
685612b9f4
- refactoring : remove not used mesh index from private method in obj-importer.
...
- refactoring : remove commented code.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-11 15:29:17 +02:00
a9a881cde6
Blender: map texture influence to aiTextureType
...
Previously assimp mapped all blender image textures as
aiTextureType_DIFFUSE. This change interprets the "mapto" property
which corresponds to the Blender "Influence" in the properties editor.
* Blender's Normal influence with "Normal Map" unchecked maps to
aiTextureType_HEIGHT.
* Blender's Normal influence with "Normal Map" checked maps to
aiTextureType_NORMAL.
* Influence scale is placed into AI_MATKEY_BUMPSCALING.
2013-10-08 19:01:02 -07:00
e3a5480811
bugfix: fix typo's in obj-doxygen documentation.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-08 16:51:59 +02:00
e4fca83237
refactoring : remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-08 16:30:17 +02:00
a889c1575f
Merge branch 'master' of https://github.com/assimp/assimp
2013-10-08 16:24:43 +02:00
9e78823efb
refactoring : remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-08 16:21:47 +02:00
5334020d17
Irrlicht shared code is now excluded only if both the Irrlicht and Irrlicht Mesh importers are excluded from the build.
2013-10-07 19:40:21 -04:00
cb65a97347
Irrlicht mesh loader is now predicated on the proper preprocessor define (ASSIMP_BUILD_NO_IRRMESH_IMPORTER) as opposed to a similarly named but wrong define (ASSIMP_BUILD_NO_IRR_IMPORTER).
2013-10-07 19:32:46 -04:00
ad0b214656
Exporter: do not make any assumptions on previously run PP steps if the scene is a copy.
2013-10-05 16:26:52 +02:00
9d4f7c32e4
Scene: keep an internal flag whether the scene was copied using aiCopyScene() (and potentially modified by the user afterwards)
2013-10-05 16:26:16 +02:00
3bee2818e4
Exporter: stop non intuitive automatic applying of "reverse" pp steps if user specifies no postprocessing steps.
2013-10-05 16:19:03 +02:00
7aa966e204
Obj: fix texture coordinate indexing bug, fixes #41
2013-10-04 13:07:59 +02:00
2fb07823f1
Add basic light and camera support
...
* Convert point and directional light
* Convert perspective camera
Not suppoted:
* Spotlight, area lights
* Perspective camera fov angle / focal length
* Orthogonal camera
2013-10-02 16:41:49 -07:00
c4ead93c34
Merge branch 'master' of github.com:assimp/assimp into blender-stackoverflow
2013-10-02 17:09:35 +02:00
fcedc7e8a6
FBX: make clear that we do not support 6.n file format, closes #93 .
2013-10-02 17:09:10 +02:00
7e16767229
Merge branch 'master' of github.com:assimp/assimp
2013-10-02 16:46:46 +02:00
c95697dd0e
Exporter: if AI_SCENE_FLAGS_NON_VERBOSE_FORMAT is not set in input scenes, still check if the data is really in verbose format. This is a pure question of API usability and user surprise.
2013-10-02 16:46:31 +02:00
586753bc19
Merge branch 'master' of github.com:assimp/assimp into blender-stackoverflow
2013-10-02 14:16:51 +02:00
b70650e9a4
Blender: new DNA loading code generated by genblenddna.py script, now machine-generates the previously hand-written fix.
2013-10-02 14:16:09 +02:00
20204b49c5
Merge branch 'master' of github.com:assimp/assimp
2013-10-02 14:08:10 +02:00
cf639edb44
ObjExporter: request smooth normals.
2013-10-02 14:07:02 +02:00
3408a0a838
Blender: iterative loading code for the linked list of scene objects, fixes #28 but is preliminary as it touches code that is normally machine-generated.
2013-10-02 01:39:59 +02:00
fdbfa572ab
Merge branch 'master' of github.com:assimp/assimp
2013-10-01 17:56:12 +02:00
325ef632cf
PlyExporter: fix export format for compatibility with Blender and MeshLab (and the PLY spec). Fixes #122
2013-10-01 17:56:00 +02:00
2abdf05a62
Merge pull request #136 from marshallExocortex/obj_exporter__unique_vector_export
...
remove duplicate vertices, normals and uvs when exporting obj format
2013-10-01 08:48:14 -07:00
c592154006
using a custom compare function instead of a global aiVector3t less than operator
2013-10-01 11:21:36 -04:00
32a10ec0a0
obj: Add support for relative vertex indexing
...
obj files allow faces to specify indices relatively by using negative
integers. See vertex refering in http://www.martinreddy.net/gfx/3d/OBJ.spec
2013-09-30 15:26:40 -07:00
c29109d1a4
obj: Fix tabs causing vertices to be skipped
...
If an obj vertex definition 'v' is followed by a tab instead of a space,
the vertex definition is skipped.
2013-09-30 15:16:26 -07:00
b72b16c90b
whitespace fix
2013-09-30 14:12:38 -04:00
66fd9bb8a2
fixed bad merge
2013-09-30 14:11:37 -04:00
8f34c24ae0
remove duplicate vectors when export obj format
2013-09-30 14:07:53 -04:00
e8a23ccec9
Merge branch 'master' of github.com:assimp/assimp
2013-09-29 21:56:52 +02:00
5a0b40db92
ColladaExporter: fix assertion in ::isalnum() when a special character > 0x7f is present in material names.
2013-09-29 21:56:32 +02:00
6f4632e4d9
Allow spaces before the ascii STL header keyword
...
The text "solid" is the general STL header indicator that the file is in fact
an ascii STL archive. Allows spaces to precede the "solid" keyword, providing
compatibility with exporters that insert such (non-compliant )spaces.
2013-09-25 13:25:02 -07:00
e80886f12c
Obj: support line continuations with \ ( fixes #91 )
2013-09-18 19:34:03 +02:00
0f5272cb50
Obj: set aiMesh::mPrimitiveTypes
2013-09-18 18:35:41 +02:00
ab2e81d004
LWO: take last CLIP with the requested index (CLIPs ordered by ordinal string)
2013-09-18 14:27:56 +02:00
e9ffabbfee
LWO: ignore chunks of length zero.
2013-09-18 14:27:24 +02:00
45572e8079
Merge branch 'master' of github.com:assimp/assimp
2013-09-04 21:52:17 +02:00
0edb78d940
Add aiFreeScene() API for symmetry with aiCopyScene.
2013-09-02 21:32:20 +02:00
27727f692b
add missing <sstream> header to lexical_cast replacement
2013-08-27 20:17:30 +00:00
7db5dcb357
Improve STL representation detection
...
Previously, the STL loader relied on a string check at the start of the
buffer to determine if the STL file was of ASCII representation. This led to
certain false-positives for binary STL files with the magic string present in
their header. This patch addresses the issue by adding a proper binary check
to the representation detection.
2013-08-16 18:10:19 -07:00
6eaff77a7c
bugfix : fix pedantic vs2012 warnings.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-15 20:57:54 +02:00
c59a67ba28
Merge branch 'master' of https://github.com/assimp/assimp
2013-08-15 00:21:44 -04:00
d23430c4bd
Collada mesh name is copied from id only if there was no name attribute in the <geometry> node.
2013-08-15 00:21:00 -04:00
57e34cc90a
Added loading of mesh name from Collada mesh to aiMesh struct.
2013-08-15 00:14:19 -04:00
a540c6255c
Added parsing of Collada mesh names.
2013-08-15 00:12:58 -04:00
a6ddce7758
Added name member to Collada::Mesh.
2013-08-15 00:11:23 -04:00
36a899abcf
Merge pull request #70 from YoheiKakiuchi/master
...
Add binary exporter to STLExporter
2013-08-12 16:40:27 -07:00
48b47464fd
Merge branch 'master' of github.com:assimp/assimp
2013-08-12 23:43:01 +02:00
a2fb2dfb28
Exporter: if the scene data was converted to verbose format to meet the requirements of a preprocessing step, we should un-verbosify it again before the actual exporter is run.
2013-08-12 23:42:30 +02:00
9b591fadb8
Fixes for uninitialized variable warnings.
2013-08-09 19:52:15 -04:00
a90e208e6d
Fixed parameter type mismatch in StreamReader.
2013-08-09 19:10:56 -04:00
60a65aaaeb
add AI_SWAP4 for big endian architecture
2013-08-09 17:54:28 +09:00
c8428fa67a
Added value range assertions to prevent static analysis false-positives on Clang.
2013-08-07 18:43:29 -04:00
8d80f56396
fix include/ define in PostStepRegistry
...
allow to build without any post processing steps:
* typo in ASSIMP_BUILD_DEBONE_PROCESS -> ASSIMP_BUILD_NO_DEBONE_PROCESS
* needs to include ProcessHelper.h itself
2013-08-07 14:59:16 +02:00
6920c433fd
add missing include to fast_atof.h
2013-08-07 14:29:17 +02:00
04b0ea3f9a
Initialized stride variable to prevent compiler warnings about potential use of unassigned variable.
2013-08-05 00:02:27 -04:00
ace5b763c3
Added AI_WONT_RETURN and AI_WONT_RETURN_SUFFIX to DOMError.
2013-08-04 10:11:02 -04:00
32b694d4f6
Added AI_WONT_RETURN_SUFFIX to ReportError().
2013-08-04 10:10:41 -04:00
4ccb16fe01
add binary exporter to STLExporter
2013-07-31 20:15:59 +09:00
5470f5fb28
add AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION for not transforming position of vertices
2013-07-27 10:34:48 +09:00
07c1b2a68f
Merge branch 'master' of github.com:assimp/assimp
2013-06-25 16:40:18 +02:00
b597ebbe43
Change spec of obj exporter.
2013-06-25 16:39:40 +02:00
34d2bdd178
Exporters: raise errors if output files cannot be opened.
2013-06-25 14:09:28 +02:00
b5e916a646
Merge branch 'master' of github.com:assimp/assimp into fixes
2013-06-25 00:22:59 +02:00
31311bdb3b
IFC: support reading from IFCZip archives that don't use the same name for the embedded IFC file as the ZIP itself.
2013-06-25 00:22:47 +02:00
fd2f1ca3a8
Merge pull request #56 from asmaloney/init_stuff
...
Make sure members are initialized properly
2013-06-21 09:53:41 -07:00
1da281c1f8
Make sure members are initialized properly
...
Prefer initialization lists
Assignment operator should not return a const ref
2013-06-21 10:56:11 -04:00
d7c6cd9ece
{OBJ} Allow spaces in group names
2013-06-20 08:40:08 -04:00
a03cb84d0c
{COLLADA} Add detail to some errors/warnings & prefer '<>' for elements for readability
2013-06-15 18:00:40 -04:00
88da17a246
Drop M3 Importer.
2013-06-13 11:22:23 +02:00
c6d1a73854
Fix a logging message and a comment
2013-06-12 09:01:05 -04:00
d411cbfbf4
Make use of unit tag in asset info to scale the whole model
2013-05-23 12:15:14 +12:00
b8ed6fbcef
Fix Heap corruption in BlenderImporter::ConvertMesh function. closes #36
2013-05-03 23:16:56 +02:00
7efb94580f
- LWO: fix crash when computing normals for meshes that contain line or point faces. Thanks to Thomas Sevaldrud for the patch.
2013-04-26 16:49:24 +02:00
4b748c2442
- CMake: use precompiled headers when compiling for msvc. This makes compilation about 40% faster.
2013-04-20 23:15:59 +02:00
17e2588588
- workaround for older gcc versions (<4.6) sometimes copying temporaries even though they shouldn't.
2013-04-13 16:08:13 +02:00
afe1dd8c02
Merge branch 'master' of github.com:assimp/assimp into gcc-fixes
2013-04-08 23:21:33 +02:00
a288a631e2
- FBX: avoid more gcc warnings.
2013-04-08 20:21:28 +02:00
bd05acf872
bugfix : fix unresolved symbols if 3DS-import is configured not to be oart of the lib.
...
Signed-off-by: Kim <Kulling>
2013-04-08 20:16:56 +02:00
232e69dc2a
- Ifc: code cleanup, remove various non-needed variables as pointed out by gcc.
2013-04-08 20:10:25 +02:00
052a8634d2
OgreMaterial: remove unneeded variable.
2013-04-08 20:05:56 +02:00
f6cb467275
- FBX::ImportSettings: fix initialization list order.
2013-04-08 20:05:19 +02:00
5fe03f692e
- FBX: silence some warnings produced by clang about missing switch cases. Add TokenType_BINARY_DATA to TokenTypeString() function.
2013-04-08 19:45:09 +02:00
47b2832dd8
- XGL: fix non isocpp-compliant definition of LogFunctions::log_prefix outside the namespace where the class resides.
2013-04-08 19:41:18 +02:00
d25715ad2c
- Ifc: fix issue pointed out by clang that caused an epsilon check to go totally wrong. A pair of extra parentheses invoked C++ expression evaluation instead of argument passing.
2013-04-08 19:39:15 +02:00
67472f3feb
- remove self-assignment in MD5Loader.cpp
2013-04-08 19:37:08 +02:00
8f2e816042
- LWS: fix bugs pointed out by clang leading to path strings being incorrectly build.
2013-04-08 19:36:24 +02:00
27767031e6
make all targets build under OSX 10.8.2 and add iOS target
2013-03-31 21:48:38 +09:00
eaee34b028
Merge pull request #21 from assimp/assimp-metadata
...
Assimp metadata implementation. This adds aiNode::mMetaData, the <assimp/metadata.h> header containing the aiMetaData structure. Also adds support for Ifc reading metadata to test out the new feature.
2013-03-29 12:08:29 -07:00
afc07503d6
- Ifc: limit nesting of IfcComplexProperty's.
2013-03-29 14:21:06 +01:00
2ad24f7940
- Ifc: support reading IfcComplexProperty
2013-03-29 14:07:28 +01:00
94a012ae7a
- add metadata.h to cmake.
2013-03-29 13:37:55 +01:00
10f8eda497
- Ifc: prevent infinite recursion due to cyclic back references which the new STEP backref tracker might produce.
2013-03-29 13:33:18 +01:00
03b8431d54
- IFC: add support for reading IfcProperties as node metadata.
2013-03-28 23:28:49 +01:00
cded602950
- STEP: fix bug that caused back references contained in nested aggregates to be not tracked.
2013-03-28 23:28:20 +01:00
3ad7aea123
Merge branch 'master' of https://github.com/assimp/assimp
2013-03-28 18:56:19 +01:00
cca53d6a04
- fix [3595689] by requiring gcc 4.6 for the full magic in LogAux.h
2013-03-28 14:30:45 +01:00
5a0903668d
- NDOLoader: fix ASSIMP_BUILD_NO_NDO_IMPORTER guard.
2013-03-28 13:41:58 +01:00
bdfcb4b0cb
- add ASSIMP_BUILD_NO_COMPRESSED_IFC option. Properly integrate Q3BSP's unzip dependency into the build configuration.
2013-03-28 13:38:42 +01:00
9379e63636
Merge branch 'master' of github.com:assimp/assimp
2013-03-27 13:53:22 +01:00
368092174b
Merge branch 'master' of https://github.com/assimp/assimp
2013-03-27 12:52:28 +01:00
1cfd3b93fe
- Bugfix: Collada URL parser now does read 2 digits of a %xy char only, as the spec says.
2013-03-27 12:52:22 +01:00
3713383b0f
Added uv and colour support
2013-03-26 21:28:15 +01:00
eaf9cbc120
Added (basic) Blender 2.63 support. No uvs or colours supported yet.
2013-03-26 21:28:15 +01:00
b4f666083a
- collada: avoid unsafe float comparison against a magic number.
2013-03-21 20:00:33 +01:00
0b9d6bec0d
- drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits.
2013-03-21 19:54:55 +01:00
fe19ba9da6
Ogre: Material nullptr-fix, Loader is hopefully no longer confused by 'submeshnames' tag
2013-03-17 17:07:30 +01:00
8213805dc6
bugfix : fix for Build problem on Mac OS 10.8.2.
...
Signed-off-by: Kim <Kulling>
2013-03-17 14:44:24 +01:00
3587eef6eb
bugfix : fix a w4 compiler warning.
...
Signed-off-by: Kim <Kulling>
2013-03-11 22:44:53 +01:00
16744d78d7
fixed the broken cmake config files (assimp-cmake), adding version suffix libraries
2013-02-26 14:02:35 +09:00
de7b1aaa50
- IFCBoolean.cpp: fix capitalization error in filename
2013-02-18 16:10:47 +01:00
c4a8193e4b
- fix a typo.
2013-02-17 20:25:30 +01:00
d893b95be6
- Ifc: further improvements on the IfcPolygonalBoundedHalfSpace code. Still causes artifacts sometimes.
2013-02-15 01:01:08 +01:00
196d1b54cb
Merge branch 'master' of https://github.com/assimp/assimp
2013-02-12 13:22:17 +01:00
18f01268e6
- rewrote the XFileLoader material management to handle meshes with dummy material names correctly.
2013-02-12 13:13:12 +01:00
c2db6a0abd
Fix array access when loading colored binary STLs
...
Loading binary STLs with colors caused a crash due to writing after the end of the colors array.
2013-02-09 17:35:59 -05:00
078150da57
- better way to construct NULL-shared_ptr
2013-02-09 17:43:29 +01:00
667a51e0ab
- fix various vc compile errors when building with boost.
2013-02-09 17:36:36 +01:00
6ac80ea901
- Ifc: further work on IfcPolygonalBoundedHalfSpace - always pick closest intersection points.
2013-02-09 17:22:26 +01:00
e5ea457ade
- Ifc: re-enable previously disabled code to determine more intersection points for polygonally bounded half splits.
2013-02-09 17:06:55 +01:00
5a24a91ea1
- Ifc: code cleanup.
2013-02-09 16:59:03 +01:00
7e78e141b2
- Ifc: implementation of IfcPolygonalBoundedHalfSpace now supports most of the possible geometric cases.
2013-02-07 22:42:13 +01:00
50861aa861
- Ifc: more work on polygonally bounded plane cuts.
2013-02-07 21:02:39 +01:00
16a635a961
- Ifc: support IfcPolygonalBoundedHalfSpace entities (WIP).
2013-02-07 16:31:43 +01:00
f7680f7f28
- Ifc: refactor code, move opening generation and boolean clipping code to separate units.
2013-02-07 09:51:33 +01:00
2359a83132
- Ifc: get rid of erroneous error messages.
2013-01-30 13:01:16 +01:00
250ca6837f
- Ifc: rework geometry generation for openings to use 2D profiles for approximate boolean differentiation whenever possible. Also fix issues in 2D projection, which caused very spurious triangle artifacts.
2013-01-27 21:21:30 +01:00
2e6ad884bb
- Ifc: append GUID to node names to preserve them.
2013-01-27 15:44:57 +01:00
6260221f0f
Merge branch 'master' of github.com:assimp/assimp
2013-01-27 03:25:04 +01:00
9bb9868a93
- STEP: fix possible compilation error due to unwanted line continuation in a comment line.
2013-01-27 03:23:41 +01:00
fbe408dd2e
update : implement obj-support for normal maps.
...
refactoring : some improvements for more readable code.
Signed-off-by: Kim <Kulling>
2013-01-26 14:11:57 +01:00
0f781516bf
Merge branch 'master' of https://github.com/albert-wang/assimp
...
Conflicts:
code/ColladaParser.cpp
2013-01-25 19:08:10 +01:00
e375a1c944
Merge branch 'master' of github.com:assimp/assimp
2013-01-25 08:09:57 +01:00
b90882a4cb
- Ifc: more opening tweaks, half a step back again.
2013-01-25 08:09:32 +01:00
d4bcd3ab69
- Ifc: [openings] more fine-tuning and some debugging aid.
2013-01-25 07:42:51 +01:00
1a60697282
- Ifc: more opening tweaks.
2013-01-25 05:55:32 +01:00
302fad13b0
- Ifc: [openings] don't accidentally mirror stuff when projecting onto 2D planes.
2013-01-25 05:16:02 +01:00
528c7c7737
Update code/STEPFileEncoding.cpp
...
Fixing Boost 1.48 build.
2013-01-24 19:45:42 -08:00
20506ead3c
Update code/FBXConverter.cpp
...
Fixing VC10 build.
2013-01-24 19:44:08 -08:00
af0d4ef3da
- Ifc: clean up temporary wall points when switching from horizontal to vertical openings.
2013-01-25 04:35:30 +01:00
9647c87c7c
- Ifc: no need to generate contour skiplist twice.
2013-01-25 04:19:12 +01:00
bbd10cd748
- Ifc: fix normalization of base mesh normal for opening generation.
2013-01-25 03:48:06 +01:00
bbe8763d9e
- FBX: workaround to handle files using the 'b' typecode.
2013-01-24 22:25:44 +01:00
03c01685d3
- STEP: support UTF16, UTF32 and Mac/Roman escape sequences.
2013-01-24 19:51:46 +01:00
da88ab4408
- STEP: support \S\ escaping for cp1252 characters.
2013-01-24 16:18:12 +01:00
5ac2354da0
- Ifc: implement IfcIShapeProfileDef entity.
2013-01-24 15:16:03 +01:00
3b30a39fe1
- Ifc: add debug code for checking correctness of coordinate transforms.
2013-01-24 12:44:53 +01:00
b42f279110
- Ifc: improve intersection check for openings.
2013-01-24 01:09:48 +01:00
650e515dd6
- Ifc: bix bug that caused some openings to be generated twice. This stops lots of the z noise.
2013-01-22 16:50:18 +01:00
2d01b9bdc9
- Ifc: pick average of all coordinates as projection plane.
2013-01-22 16:39:43 +01:00
c2bd22507c
- Ifc: check for self-intersecting contour lines to avoid duplicates.
2013-01-22 16:31:31 +01:00
8b823bd631
- Ifc: improve heuristic to detect unwanted crossing lines by not running it when the window is not the result of arbitrary boolean ops on rectangles.
2013-01-22 16:08:44 +01:00
e9bbe64115
- Ifc: fine-tune epsilons. Correct epsilon approximation for a squared value is max(e^2 +- 2e).
2013-01-21 22:46:11 +01:00
6905229603
- Ifc: refactor border detection code.
2013-01-21 22:37:53 +01:00
fcf86f1e0a
- Ifc: add heuristic to detect remaining, unwanted "crossing caps" and to drop them silently. Testing this on some larger files, it typically reduces artifacts due to z-fighting on lower window caps.
2013-01-21 22:27:48 +01:00
d20126f7a1
- Ifc: fine-tune some epsilons.
2013-01-21 21:56:55 +01:00
58f087e04d
- Ifc: fix boolean differentiation for 3D openings to avoid having duplicate contour lines or inner points in the contour data that gets used as input for window cap generation. This solves various instances of 'crossing' caps in windows.
2013-01-21 21:11:16 +01:00
470f4f3757
- Ifc: fix another indexing error.
2013-01-20 17:40:09 +01:00
0e5db8a369
- Ifc: fix loop indexing error in detection of overlapping window contours. Improve numerical robustness of intersection tests by explicitly catching a/b=inf.
2013-01-20 15:40:36 +01:00
23a2ff629c
- Ifc: drop flawed assertion.
2013-01-20 15:16:20 +01:00
f7106887cc
- some fixes for vc12
2013-01-19 17:00:14 +01:00
7fd44f4ab7
Merge branch 'master' of git://github.com/assimp/assimp
2013-01-19 16:35:28 +01:00
ab9587dd1e
Merge pull request #12 from ccxvii/master
...
Precision fix and Collada robustness fix.
2013-01-15 12:04:48 -08:00
cc88a3a0de
update : add displacement map support to obj-material importer. this feature is supported by some special exporters.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1347 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2013-01-07 21:05:53 +00:00
bae9db2f03
Merge branch 'master' of git://github.com/assimp/assimp
2012-12-21 16:24:05 +01:00
84939d5aec
- fixed preprocessor checks for some importers
...
- fixed warning about shadowing variables in quaternion.h
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1346 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-20 11:43:09 +00:00
Alexandr Arutjunov
Kim Kulling
Angelo Scandaliato
Martin Gerhardy
John Senneker
Kim Kulling
wise86Android
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
Eric Engestrom
boxdot
Robert Liebo
Sherief Farouk
emvivre
Thiago Goulart
Paul Holland
Alexander Bobkov
rdb
Trond Abusdal
Vitaly Ovchinnikov
rmitton
abma
Andrew Parlane
Stepan Hrbek
JLouis-B
lutz.hoeren
Joe Hermaszewski
Vertexwahn
Léo Terziman
Yotam Gingold
Danke Xie
IOhannes m zmölnig
Olli Kallioinen
Łukasz Twarduś
Francesco Guastella
Sebastien Bonopera
Jaakko Keränen
Gargaj
Wolfgang Herget
Andreas Henne
Ilya Smelkov
Wil Shipley
rdb
Russ Taylor
Richard
Henry Stratmann III
Marvin Pohl
rob100
Peter LaValle
Jaime Machado Neto
Andy Maloney
shin_mbpr_late2013
Madrich
Madrich
Highlife1911
U-ORADEV\albihern
David Jordan
ulf
George Papadopoulos
Andreas Henne
DenisMikhalev
OgreTransporter
Johnny Dickinson
Ricardo Ortiz
Joe Hermaszewski
Tom Mettam
Andreas Henne
Andreas Henne
Johannes Ebersold
Jared Duke
Filip Wasil
Jared Duke
Denis Biryukov
Adam Petrone
unknown
Tyson Grant Nottingham
Andrew Short
Nathan Morse
Gregory Jaegy
EdgarsT
Jonne Nauha
arkeon
James Lupiani
tszirr
xantares
attila-barsi
DoubleLee
Judith Hartmann
Frederik Aalund
YoheiKakiuchi
Martin Büchler
guillaume
Nick Overdijk
gongwei
henrikbuchholz
Alice
Eric Haines
Hiroyuki Inoue
Calvin Hsu
Sherief Farouk
Marshall Hahn
Pavel Rojtberg
Andy Maloney
Matt Lilley
Kim
Willy Blandin
Kester Maddock
Jonathan Klein
rdiankov
Nicholas Bishop
kimmi
ulfjorensen