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
f507994299
- Ifc: vastly improved algorithm for fixing up window caps.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1345 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-19 02:24:06 +00:00
01972bbbcf
bugfix : Fix a memory leak in the obj-loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1344 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-08 12:28:06 +00:00
ac7d7d20c9
- fixed compilation error on GCC in IFC loader. Thanks to larsp for the report!
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1343 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-12-04 07:42:15 +00:00
ddea19ead1
- triangulation: re-introduce special handling for quads, now with proper support for concave quads. This should *really* fix [3429812], but it leaves me to suspect bugs in the general-purpose triangulation code for ngons.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1341 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-29 15:25:09 +00:00
771d804c46
ColladaParser: Tolerate empty data arrays and controller weights.
2012-11-28 13:02:51 +01:00
477995f860
- Ifc: fix lost line that causes compile errors in debug build, WIP work on removing overlapping window caps.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1340 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-27 19:59:09 +00:00
c338b665ed
- applied patch to fix compilation errors with CLang following issue #3590305
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1339 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-27 18:40:38 +00:00
d395e88670
- Ifc: more refactoring in the window generation code.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1338 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-18 19:41:26 +00:00
b7ee62080a
- Ifc: refactor opening/window generation code.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1337 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-18 16:36:38 +00:00
30ce13a617
Github merge: Adjusting the Collada Color Parser from albert-wang.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1336 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-17 12:47:15 +00:00
e3e8c92546
- Ifc: since overlapping opening bounding boxes cause lots of trouble, we now try to avoid them in a subset of all cases. This is possible whenever two openings overlap in a way that their bounding boxes can easily be made disjunct by differentiating the polygons.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1335 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-17 02:04:53 +00:00
0ea6ec4e84
Fixing some whitespace issues in ColladaParser
2012-11-12 12:39:11 -06:00
7d4ee98350
Adjusting the Collada Color Parser
...
The collada parser parses the RGB descriptor out of the
xml file, but does not use this information when constructing
the actual mColors array.
If you export a collada file with RGB colors, and then import it,
it used to create color values in the form RGBR, taking the
R component from the next color tuple instead of filling in
sensible defaults for the alpha channel.
This patch uses the information to fill each color.
2012-11-12 12:33:51 -06:00
81aef90f4a
- manually pulled the three smaller change requests from Github.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1331 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-05 09:13:09 +00:00
3f38d91e88
- Ifc: further improvements to opening caps algorithm.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1329 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-03 00:43:28 +00:00
1553bd91f6
- Ifc: work on generating proper closing caps for openings generated by doing a boolean difference.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1328 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-02 23:56:38 +00:00
7484dd379c
- Ifc: revamped Quadrify() version now correctly clips overlapping non-rectangular windows.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1327 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-02 04:46:46 +00:00
ccf629bd19
- Ifc: allow arbitrary IfcSolidModel entities as difference operands for openings (rather than just IfcExtrudedAreaSolid et al).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1326 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-02 03:29:04 +00:00
612f67da0a
- Ifc: avoid duplicate points in opening contour lines, this sometimes screws up the clipping algorithm.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1325 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-01 21:36:39 +00:00
11b2219b1a
- Ifc: fix regressions caused by previous commit. This also fixes a bug which caused openings to appear at the wrong place.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1324 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-01 20:40:45 +00:00
39ae26bfd8
bugfix : fix level 4 compiler warnings for Visual studio 2012.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1323 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-27 19:41:56 +00:00
2a580c5518
- fixed/changed/worked on issue 3580054 - XFile materials don't have ambient colours, but emissive
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1322 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-25 10:28:40 +00:00
d128e3d531
- Ifc: fix projection artifacts during opening generation.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1321 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 21:50:30 +00:00
c3adc004bf
- Ifc: always remove degenerate geometry from geometric entities after finishing processing.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1320 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 19:12:18 +00:00
a598ac53b4
- Ifc: improve robustness towards degenerate geometry.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1319 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 18:52:48 +00:00
33a50f515a
- Ifc: move some utility functions to TempMesh. Add TempMesh::RemoveDegenerates() method.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1318 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 18:32:25 +00:00
7ed1400c68
- Ifc: better handling of degenerate primitives occuring in clipping operations.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1317 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 18:10:56 +00:00
f6f2c087db
- Ifc: skip lines during boolean differentiation between two solids.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1316 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 17:08:12 +00:00
d660ec35ad
- Ifc: first attempt at also supporting extruded area solids for boolean differentiation.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1315 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 16:58:22 +00:00
71fb04849c
- Ifc: experimental code to connect window holes, commented by default.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1314 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-21 01:05:48 +00:00
2f5475d50a
- Ifc: [Quadrulation] use generalized matrix multiplication for projections. Add table to map from contours to the openings they originated from and from openings to the points that were generated from it.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1313 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-20 23:18:48 +00:00
a3d5b2e0d7
- Ifc: replace old algorithm to merge nested polygons with a version that reduces the problem to an instance of the quadrulate algorithm. This great reduces artifacts in walls.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1312 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-20 21:26:49 +00:00
8a77193a33
- Ifc: more sanity clamping, improve error messages for degenerate windows.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1310 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-17 00:37:52 +00:00
f8974b7209
- Ifc: explicitly clamp some computations to [0,1] even if this is already their (arithmetically) defined range to improve numerical robustness.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1309 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-17 00:32:59 +00:00
745a7383f6
Ifc: fix artifacts from window boundaries.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1308 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-17 00:04:24 +00:00
f329e1af6f
- IFC: fix possible infinite recursion in QuadrifyPart()
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1307 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-16 21:27:01 +00:00
39d13faf9a
- Ifc: minor code cleanup.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1306 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-16 20:55:19 +00:00
11a22b671b
- IFC: revamp binary subtraction and opening generation logic, which now supports 90deg rotated opening proxies. The new version adds extra cleanup steps to prepare the data for processing by clipper. It also has a slightly refactored code base.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1305 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-16 19:51:00 +00:00
fa1016ddc8
- Ifc/Step: support line continuations in parser.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1304 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-10-02 14:19:24 +00:00
54a5088e14
- added a workaround to load Collada files correctly in case the "texcoord" attribute was missing in a <texture> element
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1303 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-24 08:45:23 +00:00
2944e7b210
- Added a workaround for some XFileExporter omitting separator chars at the end of data vectors
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1302 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-21 18:53:36 +00:00
62b0284100
- applied patch by peteredc to make the Collada loader write mesh names
...
- applied patch by asmaloney for better error messages in the Collada parser
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1301 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-21 08:44:37 +00:00
e22bb03f80
- IFC: fix face winding for IfcSweptDiskSolid geometry
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1300 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-10 01:28:19 +00:00
15c0b8b955
- IFC: avoid artifacts in high-curvature regions (or the boundaries thereof) of IfcSweptDiskSolid elements.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1299 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-09-10 00:40:41 +00:00
c1cd88e9de
- fbx: take shortest quaternion path when interpolating.
2012-08-26 20:10:01 +02:00
310235dd5b
- fbx: more warn policy tuning.
2012-08-26 18:58:08 +02:00
a1713052e5
- fbx: support reading LimbNode attachments, less Property70 warnings.
2012-08-26 18:53:15 +02:00
5bc573edb8
- fbx: pre-filter animated property we don't support as early as possible.
2012-08-26 18:40:04 +02:00
51d84dcfc0
- fbx: improve logging
2012-08-26 17:54:17 +02:00
9ea7fc2856
- fbx: don't die if a file contains no GlobalSettings.
2012-08-26 17:45:09 +02:00
cdb7caffbd
- fbx: add special output node name tag to mark fbx null nodes.
2012-08-25 22:24:08 +02:00
eed3cebc18
- fbx: add support for reading Null node attributes.
2012-08-25 20:12:53 +02:00
4921114c7d
- fbx: better error reporting reading property tables.
2012-08-25 19:53:46 +02:00
c9facf16fa
- fbx: support reading of scenes containing no geometry.
2012-08-25 18:17:11 +02:00
1dc2ea05fa
- fbx: fix crashbug when animating the root node.
2012-08-25 17:57:07 +02:00
375c4b4242
- fbx: read framerate and output it in aiAnimation::mTicksPerSecond.
2012-08-25 17:31:15 +02:00
d881bb9cdc
- fbx: add support for reading GlobalSettings.
2012-08-25 16:23:37 +02:00
5ea9de5d3e
- fbx: return time in seconds.
2012-08-25 16:13:19 +02:00
3f2a796b9d
- fbx: fix time scaling in my previous patch.
2012-08-20 19:23:54 +02:00
99aab0d9a7
- fbx: also handle cases where some of the SRT channels are empty/constant.
2012-08-20 19:15:59 +02:00
6bbbbfde4c
- fbx: collapse animation nodes whenever possible to avoid overly busted output scenes.
2012-08-20 18:33:54 +02:00
8336aa423f
- fbx: fix reading of short data tokens in binary files.
2012-08-20 17:39:44 +02:00
a038288af9
Ogre: Fixed memoryleak and missing \0 at end of cstring
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1298 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-08-12 17:00:53 +00:00
3e86e1b857
- fbx: add import settings to public assimp config interface.
2012-08-11 16:41:44 +02:00
eb16c193ea
- fbx: also support reading binary arrays of UNSIGNED data.
2012-08-11 04:48:08 +02:00
96033e9fc0
- fbx: fix stupid typos killing the decompression logic.
2012-08-11 04:39:47 +02:00
811e2492df
- fbx: fix object names when reading binary files.
2012-08-11 04:29:21 +02:00
29b11f1cde
- fbx: FINALLY got reading binary data buffers (vertices, normals etc) working! Found out fbx uses deflate to compress them.
2012-08-11 04:16:46 +02:00
1cd04a2671
- fbx: formatting.
2012-08-11 02:24:59 +02:00
826b97a4fa
- fbx: handle arbitrary rotation orders (all combinations of euler angles etc).
2012-08-11 02:17:22 +02:00
1bdf39448a
- fbx: extend list of supported property data types.
2012-08-11 01:59:10 +02:00
391a69e68b
- fbx: extend DOM to include the declarations for FBX' rotation order and inheritance enums.
2012-08-11 01:57:32 +02:00
1a5bf26e91
- fbx: light & camera conversion was missing in assimp, somehow.
2012-08-11 01:51:04 +02:00
bc0e465f91
- fbx: declare more dynamic properties of Model.
2012-08-10 23:40:02 +02:00
8d5b78c035
- fbx: 32 bit build fixes.
2012-08-10 23:26:49 +02:00
315285faf0
- fbx: refactor parsing code, move all parsing stuff to FBXParser.cpp. Parsing errors now carry the prefix "FBX-Parser".
2012-08-10 23:24:58 +02:00
ef0dcaaea2
- fbx: refactor, move DOM utility functions to separate unit.
2012-08-10 23:02:38 +02:00
ffbac847ef
- fbx: add DOM classes for light and camera node attachments. Devise a new macro-based system to easily define dynamic fbx properties.
2012-08-10 22:58:54 +02:00
c126cfa1ff
- fbx: rework material reading to support negative indices (these will be assigned a default material).
...
- fbx: fix uninitialized variable.
2012-08-10 22:33:57 +02:00
729e98fef0
+ fbx: Parser::IsBinary(), Document::IsBinary()
2012-08-10 21:39:47 +02:00
49cfcf4c07
- fbx: add binary support to the various ReadXXX parsing utilities.
2012-08-10 11:06:59 +02:00
10fac9bcd8
- fbx: finished binary tokenizer. Now correctly skips over compressed data arrays.
2012-08-10 10:47:50 +02:00
5250240ed6
- fbx: format fixes.
2012-08-09 02:10:13 +02:00
24ce9495fd
- fbx: add binary reading draft. Started from scratch after my first attempt had design flaws. The binary reader now sits on the lexer stage (really) and generates a (fake) token sequence similar to the text lexer's output - this means most parsing code can go unaffected.
2012-08-09 02:08:12 +02:00
3899fc5257
- fbx: bone bind matrix now includes mesh world transformation.
2012-07-27 22:36:40 +02:00
d5d6df36e3
- fbx: fix rotation order and a whole bunch of related problems.
2012-07-27 21:09:45 +02:00
4c58328c98
- fbx: switch to always generating a full transformation chain (temporary solution to get the transformation order right for now!).
2012-07-27 19:41:14 +02:00
6efe9517f0
- fbx: forgot child links in transformation chains.
2012-07-27 19:29:57 +02:00
4aac334358
- fbx: bugfix node chain generation, was omitting some nodes.
2012-07-27 19:20:05 +02:00
54be52ea28
- fbx: add option to detect dummy animation tracks and to remove them. Actually, this is mostly a debugging aid (and it cuts down memory usage).
2012-07-27 18:45:02 +02:00
0d2cb96092
- fbx: re-enable FixNodeName(), forgot that a commit ago.
2012-07-27 17:58:34 +02:00
bb8e8c6673
- fbx: ignore IKEffector nodes.
2012-07-27 17:57:30 +02:00
44259f0c23
- fbx: fix small typo with big effect.
2012-07-27 17:57:19 +02:00
bead86a830
- fbx: take care not to drop transformation chain nodes that have node animations assigned, even if they specify identity transform in bind pose.
2012-07-27 16:18:47 +02:00
80e7e18e28
- fbx: refactor animation code.
2012-07-27 15:53:17 +02:00
ffd084a7a7
- fbx: generate inverse nodeanim channels for pivots.
2012-07-27 15:42:06 +02:00
3c37c8e7da
- fbx: generate node anims for complex transformation chains with pivots and offsets.
2012-07-27 15:31:02 +02:00
94e1e78c55
- fbx: work on converting animations for complex transformation chains (i.e. chains that contain pivots and offsets). (WIP)
2012-07-27 04:55:56 +02:00
7f082e0aae
- fbx: revamp transformation code to support rotation/scaling pivots and offsets. The information is encoded in additional nodes in the scene hierarchy, which are tagged with a special naming scheme to make them easy for users to identify and map to their systems.
2012-07-27 03:00:16 +02:00
23c62f07f7
- fbx: fix memleak in exception cases.
2012-07-27 01:49:02 +02:00
916947327f
- fbx: fix weight conversion for multi-mesh geometry.
2012-07-27 00:50:58 +02:00
f230ac2f60
- fbx: further work and bugfixes on deformer conversion.
2012-07-26 23:45:07 +02:00
d194c83ed8
- fbx: bugfix Model -> Cluster connections.
2012-07-26 22:58:48 +02:00
3e3eb6fb7c
- fbx: permit empty deformers.
2012-07-26 22:57:52 +02:00
666f2776d7
- fbx: convert fbx deformers to assimp bones.
2012-07-26 22:53:31 +02:00
05ec3c2e90
- fbx: read Geometry -> Skin and Model -> Cluster connections. Improve logging, some refactoring.
2012-07-26 19:13:19 +02:00
06acead438
- fbx: read deformers (Skin and Cluster).
2012-07-26 18:05:24 +02:00
8d1db6229c
- fbx: drop empty animation stacks to pass assimp validation.
2012-07-26 04:13:16 +02:00
6ea67963ba
- fbx: fix parsing of CameraSwitcher.CameraIndexName.
2012-07-26 04:07:29 +02:00
44606a1e53
- fbx: fix 64 bit compile warning.
2012-07-26 04:04:29 +02:00
c882ef841f
- fbx: fix boost compile error.
2012-07-26 04:03:55 +02:00
d5c05c7d84
- fbx: NodeAttribute can now be target for AnimCurveNode.
...
- fbx: rename Camera -> CameraSwitcher.
2012-07-26 03:58:42 +02:00
cab713b4c5
- fbx: attach node attachments to their nodes.
2012-07-26 03:45:37 +02:00
b66dfc85e1
- fbx: read NodeAttribute and Camera.
2012-07-26 03:42:02 +02:00
38be981151
- set aiNodeAnim.mNodeName
2012-07-26 03:11:14 +02:00
776d8e339b
Merge branch 'master' of https://github.com/assimp/assimp
2012-07-24 03:30:47 +02:00
8747614e89
- fbx: ensure node names are converted consistently and with no ambiguity.
2012-07-22 02:12:38 +02:00
29057096fd
- add extra check whether the keyframes are well-ordered.
2012-07-22 01:23:23 +02:00
5ff8c90a35
- fbx: set animation duration.
2012-07-21 23:48:52 +02:00
f617e766b1
- fbx: add "strict" import mode (only accept 2012,2013 files).
2012-07-21 23:08:48 +02:00
b7456307dd
- fbx: fix "could not read property name" warn message.
2012-07-21 22:45:23 +02:00
fd828a1b44
- fbx: always set all tracks in aiNodeAnim to pass validation.
2012-07-21 22:29:42 +02:00
e4305149be
- fbx: bugfix animation interpolation code, fix various quirks.
2012-07-21 21:28:02 +02:00
09aaaba7b8
- fbx: improved DOM object construction and dependency resolution.
2012-07-21 20:02:00 +02:00
5db5634494
- fbx: add utility functions to filter connections to other objects by their type.
2012-07-21 18:02:10 +02:00
4f6dbac919
- fbx: prevent infinite recursion when resolving objects with cyclic references.
2012-07-21 17:13:03 +02:00
378bc93593
- fbx: resolve target node for node animations.
2012-07-21 17:12:04 +02:00
ae3007b42b
- fbx: better size estimate for keyframe buffer.
2012-07-21 16:19:46 +02:00
382f4619ad
- fbx: animation conversion from fbx's representation to assimp's. This involves evaluating animation layers etc.
2012-07-21 04:15:10 +02:00
711878567a
- more fine-grained import settings.
2012-07-21 01:00:26 +02:00
67c55990cd
- fbx: initial code to read animations plus the accompanying DOM classes.
2012-07-21 00:45:37 +02:00
aaf0be0bbf
- CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190 )
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-17 22:56:15 +00:00
d8c2295962
- blend: compute parent inverses on your own instead of trusting the blend input. Thanks to Kalmár Dániel for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1291 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-17 22:18:10 +00:00
3f47ac3fe2
Bugfix : Fix an invalid getName function. Thanks to cyrilchampier.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1290 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-17 21:48:03 +00:00
56bf755c4b
- Ifc: fix handling of curves with RADIAN parameters.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1289 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-12 00:20:28 +00:00
d7fe61c255
- Ifc: improved subsampling of curves for IfcSweptDiskSolid entities.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1288 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-11 23:08:44 +00:00
d7410e6f08
- Ifc: implement basic support for IfcSweptDiskSolid elements.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1287 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-11 22:11:16 +00:00
c70646912c
- add IFCZIP support to IFC loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1286 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-11 19:18:51 +00:00
ab93c6f38e
Merge branch 'master' of github.com:acgessler/assimp-gsoc2012-fbx
2012-07-08 01:29:49 +02:00
879f2ed177
- fix some -Wall warnings
2012-07-08 03:28:14 +02:00
8ec96d88c5
update CMake build
2012-07-07 21:11:09 +02:00
30422fa683
- fix confusion between ASSIMP_BUILD_NO_COLLADA_IMPORTER and ASSIMP_BUILD_NO_DAE_IMPORTER (in favour of the first).
2012-07-07 20:53:24 +02:00
e56b39ecaf
fbx: gcc 4.6 compile fixes
2012-07-07 20:46:29 +02:00
1a9790ae9a
- fbx: read first set of header properties (format version, timestamp etc).
2012-07-06 22:46:19 +02:00
e4aee83c5b
- fbx: set mesh names, drop prefix from root node, simplify mesh splitting logic.
2012-07-06 19:32:41 +02:00
6441f9d984
- fbx: strip prefixes from Material and Mesh names. Don't set empty material names.
2012-07-06 17:08:02 +02:00
72f1734f82
- fbx: fix another stupid bug in the multi-mesh splitting code.
2012-07-06 17:00:59 +02:00
2d2a87b70c
- fbx: fix stupid bug that kills the node hierarchy.
2012-07-06 16:55:25 +02:00
4bfd5c11d7
- fbx: bugfix multi-material splitting.
2012-07-06 16:48:09 +02:00
d6e929b670
- fbx: accidentially passed a wrong predicate for sorting Connections to std::sort.
2012-07-05 17:18:54 +02:00
4db113395c
- fbx: read local transforms (different modes of rotation not yet implemented, though).
2012-07-05 17:06:15 +02:00
3179e949bb
- fbx: set default material when no material layer is assigned to a mesh.
2012-07-05 16:37:13 +02:00
61c6c37e30
- fbx: implement mesh splitting for meshes with multiple materials.
2012-07-05 16:35:08 +02:00
cfb05376d2
- fbx: fix diffuse material color.
2012-07-05 14:26:26 +02:00
04c77029e8
- fbx: fix boost build errors (was building with BOOST_WORKAROUND for a while).
2012-07-04 17:06:55 +02:00
6e6dbe97de
- fbx: fix bug that caused normals to be wrong.
2012-07-04 16:47:10 +02:00
0d2f04d50a
- fbx: fix recursive node construction.
2012-07-04 16:38:12 +02:00
89d5380c81
- fbx: argh. forgot to add FBXModel.cpp
2012-07-04 16:33:46 +02:00
bf79c83bf2
- fbx: read node hierarchy and assign model material indices. Cache already converted materials and meshes to make FBX instancing work as intended.
2012-07-04 16:33:21 +02:00
17629f1ff1
- fbx: work on resolving material links.
2012-07-04 15:07:57 +02:00
2f5ec6f136
- fbx: fix bug that caused textures to be ignored in some cases.
2012-07-04 01:45:15 +02:00
c7ee6fd70f
- fbx: texture conversion & UV channel mapping.
2012-07-03 20:41:21 +02:00
a0c45f9190
- fbx: read texture -> material connections.
2012-07-03 19:42:14 +02:00
effcaf066a
- fbx: Objects now carry their ID.
2012-07-03 19:36:38 +02:00
8a12b179a6
- fbx: add utility functions to get object connections in sequential (i.e. insertion) order.
2012-07-03 17:57:21 +02:00
fd451f7ba6
- fbx: read object-object and object-property connections.
2012-07-03 16:50:58 +02:00
23914685f9
- fbx: read textures.
2012-07-03 14:59:40 +02:00
97b69364ad
- fbx: refactor code for fetching property templates.
2012-07-03 14:40:45 +02:00
ec50632f2e
- fbx: fix bug that caused vertex colors to be not loaded correctly.
2012-07-03 00:26:40 +02:00
990e6bdf3f
- fbx: better conversion of material colors.
2012-07-02 23:31:48 +02:00
3f811f4a62
- fbx: DOM Material -> aiMaterial converter (WIP!).
2012-07-02 19:59:31 +02:00
131008cea1
- fbx: read materials.
2012-07-02 17:37:00 +02:00
b49cf16bc2
- fbx: change const semantics for PropertyTable's. Lazy parsing of properties no longer affects logical constness.
2012-07-02 17:09:32 +02:00
97e1761ecd
- fbx: support more property data types (there are way more, though - don't know yet how to handle them, fbx files don't seem to have overly strong semantics for properties).
2012-07-02 17:00:56 +02:00
21713841d3
- fbx: read property templates. Fix some memory leaks.
2012-07-02 16:51:19 +02:00
00f249b8dd
- fbx: add property system
2012-07-02 15:57:51 +02:00
6ddb1c9aa7
- fbx: refactor code
2012-07-01 14:38:14 +02:00
7a3e3b1353
- fbx: create dummy root node and assign converted meshes. This is a temporary solution to be able to test mesh reading.
2012-06-28 23:44:23 +02:00
524285c90d
- fbx: converter now handles FBX mesh to aiMesh conversion.
2012-06-28 23:24:46 +02:00
0c0c9bce66
- update CMakeLists
2012-06-28 20:03:29 +02:00
d7270aa278
- fbx: skeleton for DOM -> aiScene converter.
2012-06-28 20:02:09 +02:00
e945998fc8
- fbx: warn about empty meshes and ignore them.
2012-06-28 19:23:08 +02:00
d61c86081c
- fbx: depending on settings.readAllLayers, the loader now scans through all geometry layers and pulls in all vertex data channels that fit into the output data structure.
2012-06-28 19:20:44 +02:00
05bc8ab684
- fbx: add ImportSettings to keep track of fbx-specific import settings. The settings are generated by the importer instance and injected into parser and DOM.
2012-06-28 19:16:14 +02:00
3f10314656
- fbx: support ByPolygon mapping for materials, refactor code to read material indices.
2012-06-28 17:13:13 +02:00
e821988c64
- fbx: also read vertex colors, tangents and binormals.
2012-06-28 16:51:55 +02:00
ffe0ed7926
- fbx: refactor code to handle FBX vertex data access. Support the same access & indexing types for UVs and normals.
2012-06-28 02:06:24 +02:00
026cec7d7b
- fbx: UVs, normals and materials arw now read properly. Fix bug related to reading vertices.
2012-06-28 01:49:52 +02:00
fcdb2fc6b8
- fbx: work on reading normals, UVs and material channels.
2012-06-28 00:35:40 +02:00
f9e310edfb
- fbx: work on reading vertex data.
2012-06-27 23:02:00 +02:00
f354d8d7c7
- fbx: add some utility functions to parse tokens to values and to handle errors automatically.
2012-06-27 21:55:28 +02:00
e658a7f98f
Added Animationoverview diagram to documentation
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1270 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-26 19:46:18 +00:00
7108713238
- fbx: work on reading the first layer of geometry data channels.
2012-06-26 21:35:16 +02:00
79711b018a
- blend: patch for material importer, read emissive color. Thanks to Laurent Belcour for the patch!
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1269 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-26 19:16:09 +00:00
a996ecba75
- fbx: add helper functions to read FBX data arrays.
2012-06-26 20:05:24 +02:00
c0af603f0c
- fbx: further work on DOM, start work on geometry extraction.
2012-06-26 19:19:13 +02:00
25dfbdf58d
- fbx: add DOM layer to represent the parsed FBX file in-memory, capturing the essential semantics we need for importing.
2012-06-26 18:31:19 +02:00
05b98c279b
- fbx: fix tab width when logging columns.
2012-06-26 15:43:31 +02:00
4c30c00585
# fbx: forgot a <Windows.h> in my code.
2012-06-26 15:40:16 +02:00
ecd79b3cc3
- fbx: fix infinite recursion when parsing nested Scope's.
2012-06-26 03:31:34 +02:00
c9d9fcdfd1
- fbx: parser working now. Drop shared_ptr's in favour of raw pointers to reduce memory overhead (a pity - I want unique_ptr and move semantics in C++03).
2012-06-25 23:03:06 +02:00
ff995307ac
- fbx: further work on broadphase tokenization.
2012-06-25 16:10:35 +02:00
b6d0f05143
- update CMakeLists.
2012-06-23 03:38:44 +02:00
18b2aebcb1
- FBX importer: basic interface and importer skeleton. Start tokenizer and parser.
2012-06-23 03:36:55 +02:00
4e9a0bba20
+ add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it.
2012-06-21 17:24:50 +02:00
1d7018c826
# fix bug in STEPFileReader, loader fails if string literals contain more than one ". Thanks to Juha Vesanen for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1258 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-17 12:15:49 +00:00
526150a8e3
Update: Debian-related cmake changes ( I changed the revision to 1256 instead of 1251 ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1256 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-11 11:49:08 +00:00
97995e41f4
Debian-specific adapting cmake.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1255 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-05 19:30:45 +00:00
29243071fa
Ogre: Importerproperty to set Texture Mode from Filename (bla_n.png -> Normalmap etc.)
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1254 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-03 18:01:32 +00:00
5b462d484b
Ogre: small tweaks
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1253 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-03 11:06:47 +00:00
7384ce4005
Bugfix: Fix gcc 4.4 compilation error on r1251, thanks to Rosen Diankov for that.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1252 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-03 06:10:26 +00:00
8441ecf6bf
Bugfix : Fix a compiler issue with OSX and Linux.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1250 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-05-28 10:19:50 +00:00
0693df00c5
- Bugfix: catched a null pointer crash when post processing removed everything from an invalid scene
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1249 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-05-23 09:25:40 +00:00
d9d57804fa
Ogre: Support for multiple texcoords
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1248 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-05-23 09:23:34 +00:00
1ac5a47c5d
Bugfix : Fix a compiler bug for iOS arm, thanks to Brian Miller.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1247 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-05-20 20:41:06 +00:00
6d2857ed4a
Bugfix: collada loader now preserves empty data arrays to work around stupid exporters writing empty animation channels
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1246 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-05-05 07:38:14 +00:00
7cb9438522
Refactoring : Move sources into one source variable to avoid redundant code.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1245 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-05-01 10:33:55 +00:00
f9cd8845b1
- Bugfix : Bug 3511751 closed, handling no defined material name.
...
- Update : Add a model for the regression test.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1244 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-05-01 09:39:51 +00:00
ec6c62e005
- consistent use of ai_assert instead of assert.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1241 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 23:22:40 +00:00
adfef670cc
- rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1240 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 23:14:39 +00:00
53665faacf
- make BaseImporter::GetExtensionList more robust, improve error checking.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1237 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 22:59:47 +00:00
078c1cd621
# bugfix Importer::GetImporterIndex
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1236 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 22:59:15 +00:00
68d2b71893
Patch [3520194] Fix compiler warning for non-virtual destructor by Andy Maloney.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1235 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 22:33:43 +00:00
5a81b42ebe
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1234 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-22 22:26:26 +00:00
93c3723da5
# Remove Experimental flag from blender loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1233 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-18 23:23:14 +00:00
e479355d0a
+ add aiImporterDesc API to hold importer meta information.
...
- cleanup some Importer APIs: FindLoader -> GetImporter, add some utility APIs. Note that this is a breaking API change.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1232 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-18 23:07:52 +00:00
5975f3eff2
- Bugfix: fixed Collada parser to accept empty data elements again
...
- Workaround: added a little extra code to handle texture filenames of Maxon Cinema Collada Exporter
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1231 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-04-02 10:43:18 +00:00
07841c3e13
# Blender: fix memory leaking due to cycle refs. Thanks to Vitalii Trubchaninov for pointing this out.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1230 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-27 22:09:09 +00:00
6caf98d945
Bugfix : Changed ColladaParser to be non-const in ColladaLoader::BuildMaterials. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1229 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-21 22:17:42 +00:00
0e5ae5145b
Ogre Importer: Small fixes
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1228 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-21 08:49:46 +00:00
6c1cb4f159
Bugfix : Fixed some compiler warnings and some C99 and C++11 specific syntax. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1225 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:31:56 +00:00
d17071746d
Bugfix : Removed some unnecessary const_casts. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1223 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:11:05 +00:00
fa71305e07
Bugfix : Removed useless and weird const_cast from TokenMatch. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1222 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:03:14 +00:00
d7341094ca
Bugfix : Fixed the Subdivision input mesh to be non-const. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1221 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 21:00:16 +00:00
9f6e45d651
Bugfix : Removed const_cast from CIOSystemWrapper::Exists. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1220 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:54:31 +00:00
478846c310
Bugfix : Cleaned up code and removed const_cast in DXFImporter::ConvertMeshes. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1219 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:52:28 +00:00
23381d9710
Bugfix : Refactored ImproveCacheLocalityProcess::ProcessMesh. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1218 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:48:26 +00:00
42def11d13
Bugfix : Replaced ugly (const_)casting by a better ctor and placement new. ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1217 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:45:33 +00:00
cb71e6f5f2
Bugfix : pcGroupTris isn't really const, removed const and const_cast ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1216 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:42:16 +00:00
f8deb8ff83
Bugfix : Replaced some new[]s with std::vectors ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1215 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:37:15 +00:00
79f255bc40
Bugfix : Replaced some new[]s with std::vectors ( merged from GitHub, thanks to Riku Palomäki ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1214 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:35:21 +00:00
b724ac5c2c
- Bugfix : Fix build of Obj-FileImporter ( this is currently only a work-around, loader is leaking memory, I am working on it ).
...
- Update : Merge fixes from GitHub, thanks to Riku Palomäki ( more fixes will merged soon ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1213 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 20:31:14 +00:00
397603bac0
+ add XGL/ZGL importer. Some features (includes, object refs, textures not supported yet).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1210 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 16:52:33 +00:00
687a4644d6
# fast_atof: fix comma handling.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1209 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-20 16:29:57 +00:00
25fbc9989c
# fix VS10 Debug Runtime check Failure due to data loss on type conversion.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1205 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-19 17:33:21 +00:00
d9b8db78cd
Ogre: Animation Bug fixed (they seem to work now)
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1204 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-18 13:04:11 +00:00
861974f05c
# gcc fix: Remove "OgreImporter::" prefix in OgreImporter::ProcessSubMesh(....
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1203 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-18 03:22:05 +00:00
f633437d88
- Bugfix: Collada loader writes "zero transparency" to material now
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1202 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-16 13:06:56 +00:00
b908b00f96
- Collada: read falloff and hotspot_beam spotlight properties to be compatible with OpenCollada. Thanks to gargaj for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1201 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-14 02:29:17 +00:00
973e3fede3
Ogre: Shared BoneWeights get loaded
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1200 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-13 16:29:29 +00:00
761c974fde
Ogre: Improvements on loading Skeleton and Animation Keys (nearly working now!)
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1199 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-13 13:59:07 +00:00
df7f177794
Ogre: Fix in Material Loader
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1198 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-12 13:59:51 +00:00
accbcb575b
- fix off-by-one error in FileSystemFilter.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1197 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-11 20:04:35 +00:00
7f1e7b7d6b
Ogre: TestModel added, Texture-Bug in Materialloader fixed
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1195 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-10 23:04:02 +00:00
89c3aaebbc
removed accidental C++11 usage
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1194 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-09 21:11:42 +00:00
830388ab90
Ogre: VertexAttributs from SharedGeometry are now loaded correctly; Material Loading is more robustly
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1193 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-09 11:43:31 +00:00
005887f381
Ogre: MaterialLoader now searches for Materialfile with the MaterialName as Filename
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1192 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-09 11:42:47 +00:00
6970307b4e
- Collada Exporter id naming scheme once again revised to exclude any potential invalid chars
...
- Collada Exporter outputs proper URLs for texture file names now.
- Updated Collada Loader to understand and convert texture file name URLs
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1191 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-08 16:08:46 +00:00
3ed356d3c4
Ogre Importer: Support for Shared Geometry, as exported by Blender2Ogre for Blender 2.6 (still experimental)
...
CleanUp for OgreImporter (splitted the big file in smaller ones)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1190 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-07 22:42:40 +00:00
7a0c5a431e
- filtered some more invalid characters from collada export URL generation
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1189 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-05 22:00:00 +00:00
9d4c46b53c
- Bugfix: ColladaExporter avoids output of empty xml elements
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1187 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-28 09:06:25 +00:00
648e8fe924
- Bugfix: Fix two possible reasons for bug ID 3039342 : On skipping an invalid material description in obj-loader avoid creating aiMaterial instance. Release obj-specific material instances.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1186 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-26 13:36:29 +00:00
df13d315db
# workaround crash in aiReleaseImport due to an suspected bug in gcc. See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52339 . See assimp-discussions for the details.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1184 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 14:10:18 +00:00
34e7ce131b
# BlenderLoader: use dna index to locate scenes, not SC tag. This fixes https://sourceforge.net/projects/assimp/forums/forum/817654/topic/5052480 .
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1183 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 14:02:09 +00:00
6485f8d486
# OgreImporter: fix bool-to-int conversion warning.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1181 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-23 13:53:12 +00:00
2743a0706e
small fix
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1179 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-21 16:46:37 +00:00
8c0d3a9a31
Ogre
...
- Animations without Scaling Key supported
- when the model has more than 1 texcoord, the first one is loaded (instead of nothing)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1178 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-21 16:46:02 +00:00
521088e134
Ogre:
...
- better support for OgreXmlConverter generated files
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1177 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-20 10:27:27 +00:00
37fb338c1f
- Update : Fix the M3-Importer: geometry import works.
...
- Update : Add a non-bsp example model for the m3-loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1176 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-19 09:10:04 +00:00
946b2f0354
Bugfix : Fix the extension check for the m3-loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1175 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 18:03:39 +00:00
6cb8ca9652
- Collada exporter texture references in materials are now written correctly
...
- removed various optional xml attributes from Collada Exporter which caused warnings in OpenCollada
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1174 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 15:20:28 +00:00
eebba5348d
- Added Debug Postfix
...
- added Viewer Installer
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1172 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 10:55:47 +00:00
f41e106efc
- ColladaExporter filters empty meshes which fooled certain loaders - specifically Assimp's Collada Loader :-)
...
- Bugfix: ColladaExporter now writes proper URLs when referencing materials in meshes
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1170 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-17 10:48:25 +00:00
08fe2e7d20
+ add Ply exporter.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1169 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-16 02:11:29 +00:00
4ebba5bdd4
Removed C++11 usage which I accidentally inserted
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1167 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-15 23:44:52 +00:00
82f027b01f
- added materials to Collada Export
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1165 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-14 17:42:25 +00:00
fa6039e1cb
Bugfix: Collada Exporter writes proper mesh references now - that makes static scenes work just fine
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1164 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-13 15:53:59 +00:00
29d3a18962
Fix [3211530] heap corruption in the ms3d importer.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1163 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-05 16:10:50 +00:00
58d0a89b25
- rework FileSystemFilter to scan sub-folders of the model folder recursively for external files. This should fix [3473792] ( https://sourceforge.net/tracker/?func=detail&atid=1067634&aid=3473792&group_id=226462 ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1160 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-05 15:13:39 +00:00
ced8d8279a
Fix [3484066] Compilation error in Visual Studio 2011 Preview
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1159 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-05 14:38:47 +00:00
bed6c84cb6
- Update : IMport uv- coordinates.
...
- Bugfix : Fix invvalid M3-faces.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1158 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-04 21:08:20 +00:00
c84a14a7a8
[3118522] OBJ material/texture filename with spaces support.
...
I also added a test case for this issue.
(see https://sourceforge.net/tracker/?func=detail&aid=3118522&group_id=226462&atid=1067632 )
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1157 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 18:16:15 +00:00
06bfcbf22d
# [3191607] ColladaLoader error: attempt to copy-construct an iterator from a singular (see https://sourceforge.net/tracker/?func=detail&aid=3191607&group_id=226462&atid=1067632 )
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1156 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 18:05:38 +00:00
d508e44030
- change major version number to 3.0. trunk is definitely no longer compatible with 2.0.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1154 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:39:33 +00:00
4b61e27590
- TriangulateProcess: use ear cutting for quads. This fixes [3429812] ( http://sourceforge.net/tracker/?func=detail&aid=3429812&group_id=226462&atid=1067632 ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1153 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:36:07 +00:00
6fa251c2f2
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1150 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 17:04:06 +00:00
075b1acaf0
- move include/ to include/assimp/ to have consistent header locations between installed and trunk version.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1148 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 16:25:12 +00:00
4dbf539b44
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1147 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 03:38:30 +00:00
db3cee8501
# Ifc: fix bug while filling window contours.
...
# Ifc: filter out duplicate openings.
- poly2tri: change comparison epsilon to a more suitable value (found by trial&error).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1146 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 02:28:25 +00:00
4080cd601c
# Ifc: merge overlapping openings if possible.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1145 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-03 00:50:07 +00:00
16b3d19f7f
# fast_atoreal_move: avoid floating-point casts. Compilers have trouble optimizing this.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1144 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 22:53:26 +00:00
15e50959e6
- Ifc: enable double-precision arithmetics for the entire pipeline. This does fix bugs, but unfortunately not all if them.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1143 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 22:50:24 +00:00
4fcf61c31f
# Ifc: update color conversion routines to always work with single precision.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1142 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 22:42:11 +00:00
bfb8fd8483
# Ifc: fix materials when running double precision.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1141 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 22:41:23 +00:00
38e6d90e40
- Configure STEP reader to use double precision, small changes to the Ifc code to tolerate this (Ifc itself still working with single precision).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1136 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 03:06:28 +00:00
8252a31e82
# fix gcc compile errors
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1134 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 02:19:11 +00:00
e867c73327
- Ifc: make code base ready for running double precision by using the new math templates with a customizable float type, IfcFloat. (still using floats with this commit).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1133 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 02:09:49 +00:00
0f541f5e2b
- Vertex: don't expose operators that aren't well-defined in a mathematical sense.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1132 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 02:08:23 +00:00
7a98c0d8ab
- templatize some internal math utilities as well.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1131 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 02:07:43 +00:00
b54d3ff522
# IrrLoader: fix typo.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1130 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 02:06:31 +00:00
ea3f655c57
- templatize math library. All standard math classes (i.e. aiMatrix4x4) have been replaced by templates which are usually named like the old type with a 't' postfix. For compatibility, typedefs to replace the old types exist. For the C interface, these still map to raw structures.
...
While principally backwards-compatible, this is still a breaking change since I also changed some method signatures (i.e. aiVector3t<TReal>(TReal) is now explicit). Normal users should not be affected, though.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1129 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-02 02:06:08 +00:00
418c1bfbe0
# fix compile error introduced by previous changes, we are not yet ready for this.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1128 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-01 03:39:05 +00:00
2e4b1a08ff
# STEPFileReader now scans real number literals as doubles.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1127 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-31 16:29:06 +00:00
5716c4b007
- Set AI_FAST_ATOF_RELAVANT_DECIMALS to 15. This may cause regressions.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1126 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-31 16:28:19 +00:00
c12fadc93b
- make fast_atof_move a template and rename it to fast_atoreal_move.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1125 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-31 16:18:32 +00:00
16a5bef3ba
Bugfix: Bugfixes fror VS 2010 with CMake ( thanks to Jonathan Klein ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1124 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-25 18:42:14 +00:00
edd1e2e99a
# Ifc: re-introduce the previous triangulation code algorithm, but use Clipper to clip to the outer contour line and poly2tri as fallback.
...
# Ifc: fix a issue when closing window contours. Sometimes a corner would be left out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1122 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 17:40:15 +00:00
ab6c348c2d
# Ifc: if generating wall openings fails, revert to the original wall rather than leaving polygon crap.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1121 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 02:18:59 +00:00
de865532f4
# DXFLoader: EOLs.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1119 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:50:37 +00:00
ad759f6efe
- Ifc: use a combination of clipper and poly2tri to triangulate arbitrary polygons with arbitrarily-shaped holes (the former to workaround the cases not supported by the latter ...). Issues with doors et al. (i.e. openings touching the outer contour of a wall polygon) remain and are yet to be solved. Overall, this change should make IfcLoader much more robust, though. Since this means that the previous algorithm to triangulate walls is dropped altogether, regressions are highly likely.
...
Note 1: there are cases in which the previous algorithm may have produced 'better' triangles, but my big hope is that poly2tri's CDT implementation will implement more advanced refinement algorithms over time.
Note 2: This issue http://code.google.com/p/poly2tri/issues/detail?id=34 is relevant, first versions of my poly2tri embedding would indeed stackoverflow or assert. I somehow avoided this by using Clipper as prepass and scaling the entire polygon to 0..1 range (as recommended).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1118 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-17 01:49:17 +00:00
000ef3de02
# IFCLoader: < predicate to order representations by use for us was accidentally a total ordering.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1114 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-15 13:51:34 +00:00
81ef6af2df
Apply patch [3473792] - LWS loader failed to find LWO files referenced with inaccessible, absolute paths, but actually residing in the folder of the LWS file. Applied the patch to FileSystemFilter, so all loaders do this now.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1113 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-15 13:46:21 +00:00
3f369342d6
- Redesign the C interface to allow per-import settings.
...
- Make C-API threadsafe even without boost (no longer a global importer <-> scene map).
- Cleanup headers.
- Change the way how Importer::pimpl is accessed - all users are no longer friends of Importer to avoid spoiling the public interface. Rather, pimpl is exposed via a public member function and anyone having the definition of ImporterPimpl can access it.
THIS IS A BREAKING API CHANGE for anyone using properties with the C API. It is, however, a huge step forward and finally makes our C API functionally equivalent to the C++ interface.
I hope we can adapt all ports as soon as possible. I'd be grateful if the respective maintainers could do this.
Documentation is not yet up to date.
All this is in anticipation to the upcoming 3.0 release, which I'm actively working on.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1111 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-13 14:07:58 +00:00
2c0965795c
[ 3460982] Patch for Bug 3460978 - Obj loader not generating new objects for material groups.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1108 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-11 13:38:56 +00:00
e52a49a990
Fix [3472310] Unnecessary output in LWOImporter
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1107 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-11 09:41:48 +00:00
aa189c0247
# TextureTransform-Step: fix memory leak due to uvtrafo keys not being deleted properly. This fixes [3463286].
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1104 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-04 15:27:56 +00:00
67e8e52a00
Fix a compiler warning.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1102 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-12-27 17:22:47 +00:00
a73397198c
- Bugfix #3457587 : correct decomposition of matrices with negative scaling. Thanks to anonymous google account user for the fix.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1099 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-12-12 08:44:48 +00:00
d9f7df6bcd
- LWSLoader: don't use free().
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1097 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-12-12 00:04:58 +00:00
5957e9996b
merge https://github.com/gellule/assimp.git
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1096 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-12-11 23:54:04 +00:00
052ad0e3de
# LWO: set layer skip parameter, thanks to gellule for the patch [ https://sourceforge.net/projects/assimp/forums/forum/817654/topic/4853762 ]
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1095 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-12-01 12:24:33 +00:00
34089b4596
# include <memory> for auto_ptr [3445528]
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1094 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-11-30 13:34:28 +00:00
3d00f36faf
# fix unit tests, although static linkage to Assimp is a requirement or symbols will be missing. This involves declaring some members of certain pp step classes public to give the tests access to them. Those are harmless and completely safe to use from outside, though.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1092 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-11-29 13:53:24 +00:00
2c0b36bc45
Update CMake environment to accept BUILD_STATIC_LIB option to allow building of static library for platforms that require it (such as iOS). Sorry if I overstepped any bounds here; feel free to revert if required.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1088 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-11-24 10:59:09 +00:00
db29c9a20d
Spelling fixes, thanks to Jan Dittberner.
...
This patch replaces »continously« with »continuously« and »treshold« with »threshold«.
(merged from https://github.com/assimp/assimp/pull/2 )
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1086 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-11-08 12:15:18 +00:00
ab71ca60c3
- Feature : First buggy prototype of the M3-loader for starcraft models.
...
- Bugfix : Fix some typo's in the obj-loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1085 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-10-31 08:34:55 +00:00
255ed412d5
+ add Exporter::RegisterExporter and Exporter::UnregisterExporter pair of methods. Make parts of the internal export interface public to allow custom exporters to be added on the fly. This is a non-breaking API change.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1084 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-10-15 13:37:59 +00:00
c807fd65f3
- no longer distinguish between textured and non-textured default materials. Also, do not spit out dummy texture names. This was once a workaround to get some viewers to display a dummy texture rather than a plain shaded asset, but this is no longer appropriate. This involves removal of the public #define AI_DEFAULT_TEXTURED_MATERIAL_NAME.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1083 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-10-15 10:28:36 +00:00
d5bd7009a6
- Update : Apply simple patch for debian-specific build-fixes: adapt architecture-macro.
...
- Bugfix : Fix a type in FixNormalStep.
- Bugfix : Fix a missing exception in Obj-Importer, texture coordinate import.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1079 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-09-23 16:45:17 +00:00
487071be77
Bugfix: FCollada's special texture tag "bump" now maps to aiTEXTURE_NORMAL. Thanks to agent8261 for the hint
...
Bugfix: AssimpView now properly skips the leading quotation mark when being executed with a file
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1078 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-09-14 09:41:48 +00:00
1305376060
# PolyTools.h, fix point of declaration for GetArea2D, thanks to Joe Hermaszewski to point it out.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1077 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-09-05 13:13:30 +00:00
4f1a95a584
# STLLoader: avoid potential division by zero.
...
# irrMeshLoader: fix potentially uninitialized variable.
Thanks to erikbuck for pointing these out (http://sourceforge.net/projects/assimp/forums/forum/817653/topic/4691387 ).
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1076 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-09-04 15:09:45 +00:00
c01d81c882
BUGFIX VC9 does not support unordered_map
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1075 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-09-04 07:40:25 +00:00
78493b833c
+ Obj: implement exporting of p and l entities.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1074 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-27 23:32:53 +00:00
40ed87e05c
Bugfix : Fix patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1073 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-26 14:04:32 +00:00
8928523266
- Committed the patch of Makr Page: VertexTriangleAdjacency set member.
...
- Updated CREDITS.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1072 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-25 19:28:21 +00:00
ff705e6fa4
# Collada: allow empty meshes. Thanks to Mark Page for the patch ( https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4628297 ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1071 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-23 16:27:07 +00:00
df63b4b3ed
[3298060] OBJ: Add support for p and l elements
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1070 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-23 16:23:13 +00:00
ce08069399
- remove makefile from code, use CMake to generate one.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1068 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-22 20:47:24 +00:00
9177c7df8d
# fix float constant 'f' suffix
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1067 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-22 20:46:54 +00:00
9d85c8834d
- extract MaterialHelper and move all of its members to aiMaterial in /include.
...
- pull in IOhannes' patch to set the gcc default visibility for all symbols to NO and to mark ASSIMP_API with __attribute__ ((visibility("default"))).
- drop unneeded ASSIMP_API from most internal classes in /code, we just need to keep some exports on Windows to keep AssimpView alive.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1066 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-22 20:22:51 +00:00
9f32504792
[3393728] [PATCH 2/2] renamed MDL::IntSplittedGroupData_MDL7 to MDL::IntSplitGroupData_MDL7
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1065 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-20 22:01:46 +00:00
2ffac898d6
[3393728] [PATCH 1/2] ommit->omit and splitted->split
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1064 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-20 22:00:33 +00:00
45b0ccfc92
+ experimental STL exporter.
...
- improve process handling during exporting. This is still WIP.
+ BaseProcess::RequireVerboseFormat.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1062 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-04 11:27:13 +00:00
36b3695a31
- improve symmetry between Assimp::Importer and Assimp::Exporter.
...
+ aiCopyScene -- a bit dysfunctional because we will also need getters and setters for all other scene components to avoid running into ownership & heap issues when users modify scenes.
# fix handling of postprocessing during exporting
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1061 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-04 08:53:59 +00:00
665f73861e
- move importer and postprocessing step construction chain to separate files to make them available to the exporter part.
...
+ introduce aiScene::mPrivate. This is a potentially breaking API change. The new member is added at the end of the structure though, so serious regressions are not to be expected.
+ add a mPreprocessing parameter to all Export API calls. Allow exporters to specify further PP steps to be executed prior to handing control to them. The entire export API now operates on a copy of the scene that the user passed in.
- mass refactoring: all constructors of BaseProcess/BaseImporter inherited classes are public now and Importer will perhaps feel a bit sad after having loft all of its friends.
# fix const correctness in SceneCombiner
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1060 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-01 20:58:31 +00:00
967e87d625
# ammendment to previous: take care for gcc.major > 4
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1059 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-28 21:53:52 +00:00
4f5b36b850
# [3358562] disable the second set of LogFunctions<T>::LogXXX overloads, which cause trouble on Mac OSX with gcc 4.2 for reasons not totally comprehensible to me.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1058 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-28 12:23:39 +00:00
c58480d608
+ first version of OBJ exporter
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1056 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-19 21:41:59 +00:00
d29dde1646
# NoBoost: fix a critical issue in the foreach replacement. All local variables introduced by the loop header have longer, magic names now. This avoids unintended shadowing of other local variables.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1055 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-18 03:13:57 +00:00
de0b632e15
- IFC: implement the SameSense flag for IfcCompositeCurveSegment
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1053 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-18 02:17:36 +00:00
409eb6cee7
- IFC: IfcTrimmingCurve sampling code now supports trimming by points rather than by parameter values.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1052 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-18 01:13:40 +00:00
56a5230d3a
# IFC: improve IfcTrimmedCurve implementation and support wrap-over parameters for closed, conic curves.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1051 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-17 23:35:39 +00:00
a7e43173db
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1046 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-17 01:09:56 +00:00
0276a09a87
# Ifc: fix generation of wall openings, now no longer 'forgets' wall parts.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1043 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-15 21:51:33 +00:00
47836d23e7
# fix vc10 compile warning
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1042 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-15 21:50:32 +00:00
b2c4963f72
Update : Add a hint for the source of the m3-data definition.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1041 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-15 11:15:10 +00:00
cd963608c6
Feature : Add first M3-format deta definitions and a prototype importer for M3-models. Many thanks to libm3 for their great work ( see http://code.google.com/p/libm3/ ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1040 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-15 11:13:42 +00:00
7ad99f3baf
# lowercase include (mingw cross compile fix). Thanks to abma for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1038 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-07-14 16:59:18 +00:00
29676ce70f
# Fix gcc compile error (namespace ambiguous)
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1034 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-14 16:46:33 +00:00
81ad224f84
- IFC: Refactor source to simplify maintenance.
...
- IFC: rate all available representations by a simple ranking system and take the one that is easiest to load. This should avoid loading the same geometry twice. Also it might result in quality improvements when BRep geometry is avoided in favour of extrusion geometry.
# IFC: Various bugfixes related to geometry loading.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1033 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-14 15:58:22 +00:00
ffdb479411
+ Blender: read specular hardness. Thanks to Marvin for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1032 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 15:10:54 +00:00
e479ca33d4
manual IFC merge, forgot some points
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1030 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:29:46 +00:00
9edc0a9b8e
merge with git://github.com/tonttu/assimp.git
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-09 14:29:32 +00:00
2de55ee880
Bugfix: apply transformation as well when filtering out empty proxy nodes in XFile imports. Thanks to Magnus Norddahl for the patch
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1028 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-08 12:25:03 +00:00
323b9d8400
# make source UV index for tangent space computation configurable via the AI_CONFIG_PP_CT_TEXTURE_CHANNEL_INDEX option.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1027 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-06-02 14:02:30 +00:00
2f4989a35d
# include <memory> and <typeinfo>, which were missing if compiled with the boost workaround enabled
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1026 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 18:15:50 +00:00
1aab7e4a5e
# noboost.tuple: prefix access of nested, but dependent templates with template<> for ISO compliance
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1025 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 18:14:16 +00:00
89b6c2b288
# make noboost`s BOOST_FOREACH work with const containers
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1024 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 18:13:13 +00:00
68a10dd1b0
+ add dummy implementation of make_shared to boost workaround (unlike the original, it does *not* offer any performance benefits).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1023 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 17:38:22 +00:00
b9f14beb76
- IFC: use boost::make_shared to cut the number of allocations by 50%.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1022 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 17:37:17 +00:00
326b11b72f
# bugfix boost workaround, shared_ptr didn't offer a const operator*
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1021 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 17:35:17 +00:00
a4e371af4b
# fic gcc compile error caused by a temporary beeing accidentially bound to a non-const reference
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1020 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 14:33:46 +00:00
1e2dd3eefc
- IFC: use smart pointers to keep STEP-SELECT entities in the converted output data structures. This allows us to free the original parameter tuples early as ownership of their members can be transferred. This cuts down memory overhead to 8x (assuming a typical x64 builds) and reduces loading time on average by ~5% as measured on my system.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1019 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 14:23:43 +00:00
228be125cf
# really fix false negative reading compressed x files. Silently ignore out-of-bounds indices.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1017 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-31 13:27:52 +00:00
15565c4858
# IFC: fix potential crash during merging of polygon boundaries
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1016 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 21:04:11 +00:00
23ea1ac97d
# STEP: reduce memory overhead of STEP reader. A typical x64 build now has approx. 10x overhead (compared to the size of the file being read), as opposed to 20-40x that it had before.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1015 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 20:17:57 +00:00
bf7b1d3514
# IFC: track references only for the types for which we actually need reverse indices. On average, this results in a 10% reduction in memory usage and a 5% speed improvement.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1014 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 15:38:48 +00:00
af8533a0bf
# IFC: add workaround to read malformed files that contain IFCSIUNIT elements with the first field not set, which is not allowed by the IFC2X3 specification.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1013 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 14:52:39 +00:00
e7c9e4d5aa
[3309083] Allow external unzip, and buildsys cleanup (many thanks to Rick Mattes for the patch).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1011 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 14:13:33 +00:00
799ae75d67
# Obj: add missing check for empty normals, which caused models with no or partial normal sets to fail in some cases.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1010 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-29 20:38:46 +00:00
d467b5bb27
# improve robustness of IFC loader: filter out duplicate points, adjacent colinear edges, silently ignore zero-vertex polygons. fix various small bugs and improve numeric stability of some code segments.
...
- workaround: silently drop very small nested polygon boundaries to avoid cases where a large polygon brep (i.e. a slab) has extremely holes that are so extremely small in comparison to the dimensions of the outer polygon that the resulting numeric accuracies make the triangulation fail. I guess the ultimate solution would be a delauney triangulator with extremely high numeric stability, however this is difficult to achieve.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1009 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-29 19:16:52 +00:00
73a7fdf200
# fix potential off-by-one error when reading compressed X files.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1008 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-29 11:11:47 +00:00
78b44c3aed
- IFC: slight optimization, take less memory.
...
# IFC: try to make normals point outwards, if possible.
# IFC: implement recursive polygon merging, but leave it disabled since it seems to fail on very complicated polygons with multiple, nested boundaries.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1007 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-21 15:38:39 +00:00
f522143909
+ IFC: use custom triangulation algorithm to generate walls with openings. Introduce a configuration option to toggle the triangulation implementation.
...
# IFC: fix bug in boolean clipping code leading to polygons having undefined normals.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1006 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-18 18:08:18 +00:00
3a021e934e
# IFC: fix loading of the IFF2X2 scheme.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1005 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-13 01:14:38 +00:00
fc5ab64790
# q3bsp: quick compile fix
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1004 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-13 01:03:08 +00:00
bce502c0bc
- update CMakeLists.txt, fix a small typo
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1003 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-13 00:54:53 +00:00
bbd7547fff
- Further work on IFC, fix transformations, support non-uniform transformations, optimize loading, use recursive algorithm to resolve holes in polygons, implement CSG logic to generate wall openings. The latter is currently disabled.
...
- Triangulation step now automatically drops polygons with an area of zero.
- Add debug preprocessor switch to dump all triangulations to a separate file.
- Refactoring, collect some polygon related functions in a separate header, PolyTools.h
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1002 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-13 00:52:50 +00:00
e23767a170
Bugfix : Set right extension for Q3bsp loader
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1001 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-11 17:28:12 +00:00
cbceae960c
# IFC: forgot to include <iterator>
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1000 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-10 20:51:52 +00:00
ee64441305
- IFC: initial implementation of boolean clipping (simple kind of CSG). Currently only supports clipping against unbounded planes.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@999 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-10 15:37:40 +00:00
f64f0446db
- IFC: implement the IfcRevolvedAreaSolid and IfcCircleProfileDef entities. Improve vertical extrusion code.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@998 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-10 12:30:13 +00:00
c05acabea9
- update cmake build environment, now includes targets to build debian packages for Assimp.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@997 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 19:34:21 +00:00
2907c35641
# IFC: correct some error messages, skip over some unneeded elements (i.e. bounding boxes) automatically with no warnings.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@996 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 18:39:13 +00:00
f3ff403a91
# add missing template<> declarations that would screw up gcc
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@995 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 18:03:55 +00:00
c55509132b
- IFC: implement automatic conversion from polygons with holes to polygons that consist of only one piece and are thus applicable to triangulation by ear-cutting. This solves many of the broken windows that would fall victim to z-fighting in earlier revisions.
...
- IFC: reduce logging overhead
- Move parts of IFC and BLENDs logging code to a shared implementation.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@994 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 18:00:55 +00:00
6a9e0f57d4
# fix vc10 compilation issue, thanks for Stepan Hrbek for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@993 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 13:44:58 +00:00
95e0148f95
- IFC: directly keep a pointer to the class name in STEP::Object. This avoid hacking around with typeid().name(), which yields platform-dependent results.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@992 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-08 20:08:28 +00:00
27ee419355
# fix crashbug in rtrim(), hackpatch STEP::Object::GetClassName() for gcc
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@990 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-08 00:17:16 +00:00
a283c2ef91
# IFC: drop rt flag for opening the file stream
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@989 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-07 23:41:17 +00:00
af8058498e
- StreamReader now should be able to deal with files opened in text mode.
...
# rename StreamReader::_Begin() to InternBegin(), underscore+capital letter is reserved in C++.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@988 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-07 23:40:36 +00:00
f3bd6ac49b
# use a more or less heuristic approach to fix the face winding order automatically. Overall things look much better now and normals are 100% right for most models.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@987 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-07 20:53:51 +00:00
5ac47b9873
# don't run cache optimization if mesh fits into cache anyway ...
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@986 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-07 19:29:33 +00:00
50b780e21e
# work on IFC face winding, but the extensive use of mirroring in IFC screws things up. Add a documentation node that one should better render them with bf culling turned off.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@985 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-07 16:57:58 +00:00
4116ec7a6a
# fix global orientation for IFC models
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@983 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-07 13:14:56 +00:00
36d3a60c40
# fix obj crashes due to out-of-bounds indices in the input files. This fixes models/invalid/malformed.obj and models/invalid/malformed2.obj.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@982 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-07 11:14:06 +00:00
8b89edecfa
# fix -noboost
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@980 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-07 00:23:55 +00:00
1400ae79e7
+ add first prototype version of the IFC-STEP loader. Loads many test models fine but does not support some of the more sophisticated format features.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@979 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-06 23:55:38 +00:00
a83183d95f
# fix transposed memset() parameters -> replace by fill_n
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@978 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-06 20:26:55 +00:00
e241749511
# FileSystemFilter now skips over empty paths as opposed to crashing on them.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@977 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-03 22:47:14 +00:00
73d109c7cc
# bugfix [3295074]: copy'n'paste bug in ReadSamplerProperties would cause y-axis sampler state to be assigned to the respective x values.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@975 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-29 21:32:13 +00:00
3fe2a40193
# bugfix [3294475] - ASE BUMP map record not read
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@974 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-29 17:37:08 +00:00
4aed392d03
# add missing newline at EOF
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@972 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 22:23:20 +00:00
e400dc46ef
# fix gcc compile errors
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@971 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 21:43:51 +00:00
6f30639d7f
- refraing from using magic numbers like 0xffffffff all over the repository, rather use UINT_MAX/SIZE_MAX ..
...
- minor re-formatting and refactoring at some old code spots.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@970 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 21:29:18 +00:00
4ddddbc381
# Blend: fix loading of UV coordinates for models older than Blender 2.42
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@966 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 19:43:18 +00:00
7807c15e65
# fix portability problem with the Hsieh hash, which I had introduced accidentially.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@964 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 17:14:21 +00:00
ea3372f232
# pk3: fix CanRead()
...
# fix small typo in Importer.cpp
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@962 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 16:08:31 +00:00
2ecbf3f244
# PretransformVertices: fix crash during scene destruction if the resulting scene is empty
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@960 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 15:55:34 +00:00
5576b31aa6
# MD5 loader: fail early for empty files
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@959 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 15:54:42 +00:00
1fcb1a1d8e
# OptimizeGraph: fix crash if there is no data remaining after flattening the graph and removing everything that serves no purpose.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@958 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-22 15:54:08 +00:00
94f8e5fdb0
# fix compile error with gcc due to <limits.h> not being included
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@953 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-20 20:08:55 +00:00
6e74e066a2
# fix gcc compile errors
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@950 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-15 15:31:22 +00:00
a6e0a5075f
+ integrate Debone-Process into Assimp. This step was contributed by mick-p, see [3262561] ( https://sourceforge.net/tracker/?func=detail&aid=3262561&group_id=226462&atid=1067634 )
...
- refactor ProcessHelper.h. Some functions now reside in ProcessHelper.cpp, which is new.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@946 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-15 15:09:53 +00:00
2c83543b39
- remove aiAssert, use a plain assert instead. This removes the exit() call in Assimp.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@943 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-06 12:06:40 +00:00
1c37910f5f
- UPDATE : VArious Bugfixes from rdb in the PK3BSP-Loader: fix lightmap copying, fix a typo, offer a way to get texture names from external, if they a re not part of the archive.
...
- UPDATE : Make the loading of several formats for textures more generic, thanks to rdb for the idea.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@940 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 17:22:36 +00:00
85cd9be46d
# some fixes to reduce the size of the binary. Total savings are ~3%. Thanks to Krishty for his efforts in that regard.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@939 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 15:12:05 +00:00
f8add9bb22
-add missing unit to cmake script for assimp_cmd, fix linux build trouble.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@934 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 11:44:09 +00:00
4bde6808b2
- CMakeLists: turn on export functionality by default, offer NO_EXPORT option to turn it off.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@931 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 11:21:34 +00:00
932d163d21
BUGFIX: Fix the build.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@927 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-31 21:41:28 +00:00
5f10c38baa
BUGFIX: Use the correct path for the file assimp.pc.in ( thanks to Roman Kharitonov ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@925 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-31 21:38:18 +00:00
0fc965da91
Rename strtolxxx family of functions, all functions returning unsigned integers now carry an 'u' in their name (this is for compatibility with Irrlicht's fast_atof see http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?p=243079#243079 ).
...
strtol10 -> strtoul10
strtol16 -> strtoul16
strtol8 -> strtoul8
strtol10_64 -> strtoul10_64
strtol_cppstyle -> strtoul_cppstyle
strtol10_s -> strtol10
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@923 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-23 14:26:19 +00:00
f0044cf7d7
# fix LWS animation evaluator. pivot implementation still incorrect.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@922 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-18 18:27:22 +00:00
efc5c91746
- BUGFIX : Fix CanRead-method of obj-file-importer class: add missing token for a format validation.
...
- REFACTORING : Make token list static.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@920 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-18 12:21:26 +00:00
dbfa8a4f37
BUGFIX : Fix an android-specific build issue in the logging.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@919 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-16 22:55:28 +00:00
f77d0afa55
- revert previous changes to the 3DS loader until further clarification is done.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@917 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 17:46:39 +00:00
1eee9890a9
- move ByteSwap template code from StreamReader.h to ByteSwap.h, where it belongs to.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@915 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 16:23:37 +00:00
ee827e8870
- update CMakeLists. However, the export interface still remains disabled.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@914 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 16:15:09 +00:00
621bdef663
- rework exporter interface to be based primarily on the existing IOSystem.
...
- implement ExportToBlob/aiExportToBlob via a custom IOSystem implementation.
- split exporter C and C++ interfaces.
+ test cases for the exporter interface
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@913 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-08 16:09:54 +00:00
32c8ca0a37
# PretransformVertices step now (re-)normalizes normals and tangents after applying transformations on them. See [ https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4378272?message=9501683 ].
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@912 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-03 11:36:22 +00:00
649483f97f
# bugfix 3ds orientation. [see https://sourceforge.net/projects/assimp/forums/forum/817653/topic/4086997 ]
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@911 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-27 19:47:00 +00:00
990f5bd77e
- DXF: convert AutoCAD's coordinate system conventions to Assimp's.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@910 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-27 19:15:17 +00:00
6587130e9c
# fix dxf face order (and the normals, respectively).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@909 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-27 17:40:07 +00:00
21e3b5e087
# fix debug build of the MakeVerboseFormat-process - it asserted AI_MAX_NUMBER_OF_TEXTURECOORDS==4 for no reason.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@908 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-27 17:20:21 +00:00
bee6884864
- DXF: improve polyline (2D) reading.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@907 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-23 14:24:14 +00:00
4a88e50aa4
- revamp DXF loader. It now correctly distinguishes BLOCKS and ENTITIES and resolves cross references to entities from a block. Support for block-based coordinate-space transformations. Better polymesh handling. Improve error reporting. Refactor loader structure: the class itself is now stateless, reading is done using LineSplitter.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@905 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-22 19:58:29 +00:00
00238e84e8
# fix vc8 compilation. See https://sourceforge.net/projects/assimp/forums/forum/817654/topic/4372824
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@904 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-22 19:51:32 +00:00
94767ecf8c
Merge https://github.com/tonttu/assimp
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@903 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-20 00:01:52 +00:00
2b9ad081e0
- CHANGE vertex count and texture channel count limits to 8. Adapt all parts of the code which depended on both of them being set to 4. Test suite passes.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@900 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-03 14:14:09 +00:00
58ce3ee879
# fix potential LWO crashbug related to UV processing [ http://sourceforge.net/projects/assimp/forums/forum/817653/topic/4070109 ]
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@899 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-02-03 13:22:38 +00:00
0d5ac4725a
Adapted included to allow compiling with Visual Studio 2010
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@898 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-27 17:03:30 +00:00
0e77095ace
Experimental bugfix: avoid most pstdint.h stuff when VC10 stdint.h is included.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@897 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-24 19:44:09 +00:00
45fca4b005
BUGFIX : Fix compile error on SunOS xentros 5.11: symbol conflict.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@896 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-23 22:49:02 +00:00
28008debf7
forgot the new files...
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@895 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-21 15:37:34 +00:00
3a4651b0ec
Bugfix: SplitByBoneCountProcess sometimes split too early
...
Export API continued.
First version of the Collada Exporter added. Handles static geometry and node hierarchy upto now.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@894 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-21 15:37:00 +00:00
553b3567c8
- work on export API prototype, now relies on IOStreams.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@893 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-11 22:15:28 +00:00
99f2e3bd97
# bugfix typo in blender loader leading to warnings due to non-existent fields in the DNA.
...
# bugfix: blender loader no longer fails on embedded textures with uppercase file names.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@892 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-11 22:11:58 +00:00
a63c56f4f7
+ add boost.noncopyable to boost-workaround.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@891 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-09 23:15:20 +00:00
f1d02ecd5d
- UPDATE : Add missing files for export-API.
...
- UPDATE : Disable export API for temporary until implementation is finished.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@890 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-09 19:39:42 +00:00
a6a1d57781
BUGFIX : Set the object name in assimp-node instance.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@888 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-09 19:36:18 +00:00
cef429bb70
Refined exporter implementation
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@887 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-06 14:16:22 +00:00
e5f7fe0c3a
- More work on the current draft of the export interface. Again, please comment.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@886 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-05 22:07:51 +00:00
ae23c03bd9
First proposal of the Assimp export API. Please comment.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@885 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-05 15:33:01 +00:00
24a0132598
+ SplitByBonesCountProcess: make bone limit configurable.
...
- fix tabbing.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@883 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-05 13:22:44 +00:00
9a47236bb3
Bugfix: SplitByBoneCount process now updates "used"-flags for bones after having checked the whole face. Avoids the addition of empty bones to a submesh when a face requires multiple bones of which only a part fit into the bone count limit.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@882 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-01-04 19:31:54 +00:00
74d9339274
- Change AI_FAST_ATOF_RELAVANT_DECIMALS to 10.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@880 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-27 15:59:06 +00:00
3baec40ade
# fix memory leak in Importer -- progress handler was never deleted. Thanks to dee_ment to point it out (see https://sourceforge.net/tracker/index.php?func=detail&aid=3134561&group_id=226462&atid=1067632 ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@877 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-11 15:50:14 +00:00
62f6b57637
# fix throw statement in Q3BSPFileImporter.cpp -- we don't new() DeadlyImportError.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@876 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-06 21:34:31 +00:00
e2e5463845
# fix potential memory leak in MD5Loader.cpp.
...
- unify formatting in the aforementioned loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@875 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-06 21:31:52 +00:00
86629f5c10
- remove old test code stub. I have no idea how this ugly piece of shit managed to survive *that* long.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@874 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-12-06 19:49:55 +00:00
bd92f15128
- BUGFIX : Fix aiQuaternion::nomalize method.
...
- UPDATE : Improve performance by avoiding multiple divisions.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@873 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-27 13:53:34 +00:00
a9e96e2f9b
- added a new post processing step to split up meshes into submeshes with a limited number of bones.
...
- fixed some wording details
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@864 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-22 18:14:51 +00:00
140efeadc0
Bump the SOVERSION on CMake builds as well.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@855 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 19:01:22 +00:00
580041dce7
- fix regression on Ogre importer.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@851 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 18:27:28 +00:00
6f1408a7f0
- update CHANGES.current.
...
- mark aiAnimMesh data structures as *NOT CURRENTLY USED*. They are, however, still contained and visible because some ports may be relying on their presence.
- add SimpleAssimpViewX sample provided by drparallax. Thanks! (http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3917829 )
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@843 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 14:57:00 +00:00
ec6ef9f145
Added a workaround to the Collada parser to handle certain XML tags which irrxml doesn't handle well. Corrected formatting on the way.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@842 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-19 14:06:32 +00:00
fba2f78e06
Added a workaround to guess which material applies to anonymous Collada geometry subgroups.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@841 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-19 12:49:51 +00:00
76e15fd5c9
Use the *_SECURE_NO_WARNINGS defines for MSVC 2010 as well.
...
MSVC is Windows-only anyway, so I removed the extra check.
The version check could probably be just MSVC since I can think of no way the defines would break older or future versions.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@840 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-10 21:54:05 +00:00
998de54048
some code updates, ogre animation still not working :(
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@837 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-09 18:13:08 +00:00
e0e0bf3c1e
BUGFIX: Use correct not-importing preprocessor declaration for blender importer.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@836 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-05 20:31:13 +00:00
5ef9e63ac6
- UPDATE : Add first version of bsp-loader with assimp-internal texture support.
...
- UPDATE : Actualize docu.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@835 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-05 18:45:42 +00:00
8a336e8876
- Update build for xcode - parallel and universal, plus PCH. Update XCode project to reflect current state of the tree (thanks to Jørgen P. Tjernø for the patch)
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@834 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-02 18:19:49 +00:00
b0d8d83b75
BUGFIX 2970556: Fix possible overflow in material importer ( obj ) .
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@833 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-26 18:48:55 +00:00
613a4cc679
- BUGFIX: Crash in obj-model.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@832 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-26 18:32:07 +00:00
abec0f9a77
- windows.h not needed in Q3BSPFileImporter.cpp (merge flaw?).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@831 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-18 22:19:39 +00:00
ff3769cb19
BUGFIX: Fix memory leaks in Q3-bsp loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@830 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-18 21:15:35 +00:00
d7ce23893e
BUGFIX: Fix for material import in Q3-BSP-loader ( thanks to Matthias Fauconneau ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@829 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-18 19:18:28 +00:00
8a27ecf827
Fix: FindLoader() now converts the input file extension to lowercase.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@828 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-13 19:34:44 +00:00
f601309db5
- anonym XFile materials are named now, to prevent them from being merged somehow
...
- added another boost dependency - lexical_cast - and a little replacement for all those boost haters out there
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@826 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-08 17:27:59 +00:00
8aac702e1e
- Workaround: ASCII XFiles aren't as strict on separator chars as before anymore. Should allow some more files to be parsed correctly.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@825 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-08 16:51:54 +00:00
136ef7609d
Bugfix: removed unnecessary windows.h include from Quake3BSP loader
...
Bugfix: added workaround to allow reading invalid Collada files sporting negative indices into data arrays
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@824 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-04 18:12:35 +00:00
733fd48f9e
- UPDATE : Add documentation to Q3BSP-importer.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@822 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-29 19:42:50 +00:00
d4f563c795
- UPDATE : Add bugfixes for the correct topology import from a bsp-level.
...
- UPDATE : Add the first pk3-archive for the bsp-loader.
- UPDATE : Add missing license info to aiAssert-file.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@818 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-26 15:56:52 +00:00
bbca6ce865
Fix g++ specific compiler warning: Usage of temporary object.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@817 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-15 20:29:48 +00:00
bd4a4fd608
further work on http://sourceforge.net/tracker/index.php?func=detail&aid=3054873&group_id=226462&atid=1067632 - first try the old node resolving algorithm (which checks for node IDs), if this fails switch to a workaround which takes both node names and IDs into account.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@815 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-13 14:40:25 +00:00
e440fb2769
NDOLoader: improve reusability of some temporary vectors.
...
ColladaLoader: fix http://sourceforge.net/tracker/?func=detail&aid=3054873&group_id=226462&atid=1067632 , thanks to Adario for the report.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@814 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-11 19:44:06 +00:00
960f7defd7
Workaround: Collada loader combines alot of animations each affecting a single node into a combined animation. The stupidity of some export plugins knows no bounds.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@812 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-04 15:36:38 +00:00
693a3a039d
BlenderLoader: don't output diffuse color if it is all black. Seems to be Blenders way of telling us there is no diffuse color.
...
AssimpView: add 'no transparency' option in UI and implement underlying logic.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@811 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-31 17:24:04 +00:00
76bdf7d0cb
Fix makefile.mingw, see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3828839 .
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@808 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-30 13:13:18 +00:00
cab35c496d
[3053648] Obj: segfault when first line is a material.
...
Add test file to reproduce the issues. Thanks to Ingo Kresse for providing the patch.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@807 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-27 12:36:02 +00:00
c5c5338397
Add first version of the planned progress feedback API to the public Cpp API. Currently, progress reporting is done between each major import stage.
...
Fix various issues with the vc9 solution and assimp_cmd.
Declare some more Importer methods const. This marks them as safe to use from within a progress callback.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@806 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-26 18:16:12 +00:00
a9fd7651fa
Print version line to log upon loading a new file. This should aid at debugging incoming bugreports with logs attached.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@804 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-26 14:20:28 +00:00
9cc61781d0
Changes forgotten in the previous commit – the code was moved out to the top-level CMakeLists.txt.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@803 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-25 16:55:38 +00:00
9d70caef0a
[3031725] FileSystemFilter destroys "://" in paths. Addresss this issue. FileSystemFilter now acts with more caution, first tries to open the file given the input path.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@801 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 18:52:53 +00:00
9b6b99842d
Blenderloader: get rid of some type mismatch warnings in 32 bit mode.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@800 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 18:13:36 +00:00
72a64192b8
Unittests: make them compile again in builds with regular boost.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@799 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 18:03:34 +00:00
20cc623ecd
noboost: Add working implementation for boost.format to get proper Collada error messages. See https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3820367 .
...
Add unit test for this.
Fix build errors due to invalid pch settings in vc9 | release-noboost.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@798 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 17:49:03 +00:00
7a50b03fc5
Obj: Remove deprecated assertion - empty object names are fine.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@796 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 15:34:48 +00:00
dbcc1902ed
ColladaParser: skip over extra <camera>,<light>,<material>,.. chunks contained within <extra> blocks. Thanks to Juha Vesanen for the fix.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@793 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 10:33:30 +00:00
e3fffb7a52
- added some more empty element checks to Collada loader
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@792 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-22 11:40:36 +00:00
81bebcd0ec
Add basic support for the IZWARE NENDO file format (extension: ndo). The loader has been tested with files in format version 1.0, 1.1 and 1.2. Materials and textures are read but ignored for now.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@791 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-09 08:24:16 +00:00
8fef884dbc
- UPDATE : Use of correct indices in Q3BSP-loader
...
- UPDATE : Add enum for primitive-description in Q3BSP-loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@790 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-07 15:10:27 +00:00
3204cf2736
Add conditional define to allow users to compile against their own zlib's.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@784 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-16 17:49:04 +00:00
e5aad11944
Introduce limits for vertices, faces (per mesh), face indices (per face) and weights (per bone).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@783 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-16 11:44:31 +00:00
a9fd02c14e
JoinIdenticalVertices: Performance optimizations by Krishty („Fuck the System”). Yields a 9x speedup in first benchmarks with meshes > 2k triangles.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@780 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-11 23:07:11 +00:00
8881d5f752
- SpatialSort generation now notifies the logger.
...
- Fix VC10 incompatibility in BlenderDNA (0 to ptr-to-mem conversion fails). Thanks to Krishty to point it out.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@775 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-09 17:49:29 +00:00
b18d782231
Fix compile error in debug builds.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@774 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-09 17:45:21 +00:00
9c1306a95a
Skip ear cutting algorithm for quadrilaterals, makes triangulation MUCH, MUCH faster (100x) for models composed of quadrilaterals (i.e. Blender, Terragen).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@773 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-09 16:44:13 +00:00
aae8637666
Add GLOB_MEASURE_TIME configuration option to profile the runtime of the postprocessing steps.
...
Start new documentation page for Performance/Profiling questions.
Migrate existing notes on multithreading to a new doc page, add more details.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@772 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-08 22:44:44 +00:00
7f2f5e7555
- UPDATE : Q3BSPLoader now imports topology of a quake-level. Known issues: It seems, that faces a still missing.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@771 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-08 21:25:48 +00:00
729b70ae0f
BLENDER: Normal vectors are now read properly.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@766 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 15:17:18 +00:00
fb2815047d
Update my standalone handcrafted makefiles to compile ./contrib/unzip as well.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@765 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 14:54:22 +00:00
d082330cea
BLENDER: Fix potential stack overflow caused by a DOM object referencing itself.
...
Add general infrastructure to apply modifiers.
Implement mirror and subdivision modifiers using existing stuff.
Update BlenderDNA with related structures.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@763 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-07-07 14:50:19 +00:00
9f951857de
Fix non-standard use of friend in tuple replacement. https://sourceforge.net/projects/assimp/forums/forum/817654/topic/3735078
...
Disable PCH for unzip files now for the whole build matrix.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@758 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-24 10:49:39 +00:00
3adce87c5c
- Made it mostly compile again
...
- Updated VC9 project files
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@756 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-21 17:28:02 +00:00
f017b5a4a4
- FEATURE : First version of PK3 format loader.
...
- FEATURE : First prototype of Quake 3 BSP format loader.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@755 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-18 17:36:46 +00:00
ca645a493c
MDL loader now checks for magic bytes even if the file extension is .mdl.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@754 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-11 14:38:31 +00:00
2e909b35d8
Bugfix: Collada node instances are correctly loaded and resolved now.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@752 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-07 14:02:56 +00:00
a9161ede18
Bugfix WIP: collada instanced nodes, still working on it.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@751 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-04 14:36:41 +00:00
219f9fadc6
Bugfix: removed misuse of "static" attribute preventing multithreaded usage of the importer
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@750 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-06-04 14:05:06 +00:00
c38c91d28d
Bugfix : Fixed not ANSI character in comment.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@746 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-30 18:35:55 +00:00
f3310b0f36
BUGFIX : Fix handling of multiple materials per object definition in Obj-Loader.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@745 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-30 12:45:38 +00:00
31ff5d27eb
fix: colladaloader is now a bit more tolerant to empty top-level (library) elements. See https://sourceforge.net/tracker/index.php?func=detail&aid=3008871&group_id=226462&atid=1067632
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@744 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-29 20:53:42 +00:00
dc3218b08a
adding some #ifndef SWIG for swig processing
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@743 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-27 18:30:28 +00:00
053d606a21
blenderloader now skips over common name prefix, such as OB for objects, MA for materials, ME for meshes, ...
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@739 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-26 00:39:04 +00:00
1b87557fd1
update to zlib 1.2.5.
...
blenderloader now reads gzip compressed files.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@737 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-26 00:21:07 +00:00
9d978918d1
colladaloader now skips over empty data arrays.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@736 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-25 14:37:28 +00:00
188aa3da37
blender loader now reads basic material colors and even simple textures, be them embedded into the BLEND file or not.
...
adding some test files.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@735 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-05-24 01:24:18 +00:00
Jared Duke
Alexander Gessler
abma
Kim Kulling
Gargaj
Kim Kulling
Tyson Grant Nottingham
Andrew Short
Robin
Léo Terziman
Madrich
Nathan Morse
Gregory Jaegy
EdgarsT
Jonne Nauha
arkeon
James Lupiani
tszirr
xantares
attila-barsi
DoubleLee
Judith Hartmann
Frederik Aalund
YoheiKakiuchi
George Papadopoulos
Martin Büchler
guillaume
Nick Overdijk
gongwei
henrikbuchholz
Alice
Eric Haines
Hiroyuki Inoue
Calvin Hsu
Sherief Farouk
Marshall Hahn
Pavel Rojtberg
Andy Maloney
Andy Maloney
Matt Lilley
Kim
Willy Blandin
ulf
Kester Maddock
Jonathan Klein
rdiankov
Nicholas Bishop
kimmi
ulfjorensen
aramis_acg
Tor Andersson
Albert Wang
jonathanklein
mmathias01
klickverbot
rave3d