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
Léo Terziman
George Papadopoulos
Nick Overdijk
Alexander Gessler
gongwei
Kim Kulling
Jared Duke
henrikbuchholz
Alice
Eric Haines
Hiroyuki Inoue
Calvin Hsu
Sherief Farouk
Marshall Hahn
YoheiKakiuchi
Pavel Rojtberg
Andy Maloney
Andy Maloney
Matt Lilley
Kim
Willy Blandin