9e78823efb
refactoring : remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-10-08 16:21:47 +02:00
075bdb42d6
Merge pull request #145 from sherief/master
...
Fix for issue #114
2013-10-07 16:47:33 -07: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
7a4edbd126
Merge branch 'master' of github.com:assimp/assimp
2013-10-06 22:30:41 +02:00
56c4ee5525
Turn ASSIMP_BUILD_BOOST_WORKAROUND on by default, fixes #144
2013-10-06 22:30:19 +02: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
faaea5224f
Exporter: update documentation.
2013-10-05 16:18:36 +02:00
7aa966e204
Obj: fix texture coordinate indexing bug, fixes #41
2013-10-04 13:07:59 +02:00
45178dc3af
Merge branch 'master' of github.com:assimp/assimp
2013-10-03 17:10:38 +02:00
9c3a0727c6
Material API: fix regression caused by previous commit 69e9e7c403
...
. Lots of importers use explicit template syntax for AddProperty(), changing to overloads now called the fallback template version. This caused material properties to be often registered as BINARY (instead of FLOAT, INT).
2013-10-03 17:10:01 +02:00
de1cfd0c8b
Merge pull request #142 from jdduke/simple_textured_ogl
...
Allow commandline-supplied model path for the SimpledTexturedOGL sample
2013-10-03 07:45:22 -07:00
4328636d14
Allow commandline-supplied model path for the SimpledTexturedOGL sample
...
Currently, the path to the model in the sample is hardcoded. Allow the user
to provide a model path via the command line for the sample, and remove a few
redundant comments.
2013-10-02 18:09:03 -07:00
8581e2d98e
Merge pull request #141 from calvindhsu/blender-light-camera
...
Blender: Add basic light and camera support
2013-10-02 17:22:07 -07: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
5de7c6a34b
Merge pull request #140 from assimp/blender-stackoverflow
...
Blender: iterative loading code for the linked list of scene objects
2013-10-02 05:21:21 -07: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
00037e669c
update genblenddna.py script to include workaround for reading blender Base list.
2013-10-02 14:15:14 +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
ffcd000003
Merge pull request #138 from calvindhsu/master
...
OBJ: Add relative indexing support
2013-09-30 15:46:55 -07: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
d4ce9571b7
Merge pull request #106 from jdduke/stl_ascii_check
...
Allow spaces before the ascii STL header keyword
2013-09-26 07:07:48 -07: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
deeeaf5c05
Merge pull request #95 from jdduke/mac_viewer_fix
...
Enable SimpleAssimpViewX compilation on OSX
2013-09-21 12:42:20 -07:00
90179ec6e3
Enable SimpleAssimpViewX compilation on OSX
...
Update the XCode projects, and fix several compilation problems.
2013-09-21 10:59:13 -07:00
6d8ccd5882
Merge branch 'master' of github.com:assimp/assimp into fixes
2013-09-18 19:34:28 +02: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
1b7ba63953
Merge pull request #90 from assimp/material-overloads
...
aiMaterial: use overloads instead of template specializations. This fixe...
2013-09-18 06:57:45 -07:00
69e9e7c403
aiMaterial: use overloads instead of template specializations. This fixes multiple instances of int material properties being accidentally registered as BINARY because the given type was unsigned int.
2013-09-18 15:17:04 +02:00
69acdabdef
CMake: make assimp_view/assimp_cmd's file copying DEPEND on assimp.
2013-09-18 14:42:42 +02:00
Kim Kulling
Alexander Gessler
Sherief Farouk
Jared Duke
Calvin Hsu
Marshall Hahn
Jared Duke