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
de03173e6d
CMake: simplify.
2013-09-18 14:37:49 +02:00
2580d279e8
Merge branch 'master' of github.com:assimp/assimp into fixes
2013-09-18 14:28:40 +02:00
d56ff34616
Merge pull request #89 from assimp/cmake-fixes
...
CMake Fixes
2013-09-18 05:28:23 -07: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
f8f7e2468c
CMake: use copy_if_different instead of copy and only run PRE_BUILD on Windows as it is not required on *nix anyway.
2013-09-18 14:10:26 +02:00
995978b163
CMake for assimp_cmd: also copy over assimp output binary as PRE_BUILD event.
2013-09-18 13:55:02 +02:00
d45689a2c1
CMake for assimp_view: copy dlls from assimp build over to output folder.
2013-09-18 13:52:49 +02:00
45572e8079
Merge branch 'master' of github.com:assimp/assimp
2013-09-04 21:52:17 +02:00
fd0b3490d1
Clarify exporter doc: how to get a modifiable copy of a previously imported scene.
2013-09-02 21:33:43 +02:00
0edb78d940
Add aiFreeScene() API for symmetry with aiCopyScene.
2013-09-02 21:32:20 +02:00
0cef55263e
Merge pull request #83 from abma/master
...
fix .3DS error "Chunk is too large" with gcc >=4.7.0 / mingw
2013-08-28 22:43:19 -07:00
169e5b9f35
fix error "Chunk is too large" with gcc >=4.7.0 / mingw64
2013-08-29 06:31:10 +02:00
27727f692b
add missing <sstream> header to lexical_cast replacement
2013-08-27 20:17:30 +00:00
f25b84c9a5
Update Readme.md
2013-08-21 12:23:52 +02:00
8dc1043169
Merge pull request #81 from jdduke/android_fix
...
Fix Android compilation with STLport
2013-08-21 03:12:12 -07:00
9f2336e5d4
Fix Android compilation with STLport
...
Satisfy STLport's runtime_error constructor with an explicit string argument.
2013-08-20 20:02:07 -07:00
7496e5ce55
Merge pull request #79 from jdduke/stl_binary_check
...
Improve STL representation detection
2013-08-17 00:33:41 -07: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
85db7d234e
Merge branch 'master' of https://github.com/assimp/assimp
2013-08-15 20:52:04 +02:00
d62c929b7a
bugfix : fix compiler warning.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-15 20:51:34 +02:00
9fc1a96494
Merge pull request #78 from sherief/master
...
Fix for Collada mesh naming bug
2013-08-15 00:59:43 -07: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
1c7cad00ce
update : add initial code convention file.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-13 23:37:08 +02:00
36a899abcf
Merge pull request #70 from YoheiKakiuchi/master
...
Add binary exporter to STLExporter
2013-08-12 16:40:27 -07:00
9e4776abf7
Merge pull request #76 from assimp/fixes
...
Fixes
2013-08-12 16:36:14 -07:00
48b47464fd
Merge branch 'master' of github.com:assimp/assimp
2013-08-12 23:43:01 +02:00
fe248c89ec
Exporter.hpp: predeclare IOSystem
2013-08-12 23:42:46 +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
Calvin Hsu
Marshall Hahn
acgessler
Jared Duke
Jared Duke
abma
Kim Kulling
Sherief Farouk