Commit Graph

2036 Commits (1c4a8e90177a61740a5665bc31ba027c4a65d4db)

Author SHA1 Message Date
Alexander Gessler de03173e6d CMake: simplify. 2013-09-18 14:37:49 +02:00
Alexander Gessler 2580d279e8 Merge branch 'master' of github.com:assimp/assimp into fixes 2013-09-18 14:28:40 +02:00
Alexander Gessler d56ff34616 Merge pull request #89 from assimp/cmake-fixes
CMake Fixes
2013-09-18 05:28:23 -07:00
Alexander Gessler ab2e81d004 LWO: take last CLIP with the requested index (CLIPs ordered by ordinal string) 2013-09-18 14:27:56 +02:00
Alexander Gessler e9ffabbfee LWO: ignore chunks of length zero. 2013-09-18 14:27:24 +02:00
Alexander Gessler 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
Alexander Gessler 995978b163 CMake for assimp_cmd: also copy over assimp output binary as PRE_BUILD event. 2013-09-18 13:55:02 +02:00
Alexander Gessler d45689a2c1 CMake for assimp_view: copy dlls from assimp build over to output folder. 2013-09-18 13:52:49 +02:00
Alexander Gessler 45572e8079 Merge branch 'master' of github.com:assimp/assimp 2013-09-04 21:52:17 +02:00
Alexander Gessler fd0b3490d1 Clarify exporter doc: how to get a modifiable copy of a previously imported scene. 2013-09-02 21:33:43 +02:00
Alexander Gessler 0edb78d940 Add aiFreeScene() API for symmetry with aiCopyScene. 2013-09-02 21:32:20 +02:00
Alexander Gessler 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
abma 169e5b9f35 fix error "Chunk is too large" with gcc >=4.7.0 / mingw64 2013-08-29 06:31:10 +02:00
Alexander C. Gessler 27727f692b add missing <sstream> header to lexical_cast replacement 2013-08-27 20:17:30 +00:00
Alexander Gessler f25b84c9a5 Update Readme.md 2013-08-21 12:23:52 +02:00
Alexander Gessler 8dc1043169 Merge pull request #81 from jdduke/android_fix
Fix Android compilation with STLport
2013-08-21 03:12:12 -07:00
Jared Duke 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
Kim Kulling 7496e5ce55 Merge pull request #79 from jdduke/stl_binary_check
Improve STL representation detection
2013-08-17 00:33:41 -07:00
Jared Duke 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
Kim Kulling 6eaff77a7c bugfix : fix pedantic vs2012 warnings.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-15 20:57:54 +02:00
Kim Kulling 85db7d234e Merge branch 'master' of https://github.com/assimp/assimp 2013-08-15 20:52:04 +02:00
Kim Kulling d62c929b7a bugfix : fix compiler warning.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-15 20:51:34 +02:00
Kim Kulling 9fc1a96494 Merge pull request #78 from sherief/master
Fix for Collada mesh naming bug
2013-08-15 00:59:43 -07:00
Sherief Farouk c59a67ba28 Merge branch 'master' of https://github.com/assimp/assimp 2013-08-15 00:21:44 -04:00
Sherief Farouk 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
Sherief Farouk 57e34cc90a Added loading of mesh name from Collada mesh to aiMesh struct. 2013-08-15 00:14:19 -04:00
Sherief Farouk a540c6255c Added parsing of Collada mesh names. 2013-08-15 00:12:58 -04:00
Sherief Farouk a6ddce7758 Added name member to Collada::Mesh. 2013-08-15 00:11:23 -04:00
Kim Kulling 1c7cad00ce update : add initial code convention file.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-08-13 23:37:08 +02:00
Alexander Gessler 36a899abcf Merge pull request #70 from YoheiKakiuchi/master
Add binary exporter to STLExporter
2013-08-12 16:40:27 -07:00
Alexander Gessler 9e4776abf7 Merge pull request #76 from assimp/fixes
Fixes
2013-08-12 16:36:14 -07:00
Alexander Gessler 48b47464fd Merge branch 'master' of github.com:assimp/assimp 2013-08-12 23:43:01 +02:00
Alexander Gessler fe248c89ec Exporter.hpp: predeclare IOSystem 2013-08-12 23:42:46 +02:00
Alexander Gessler 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
Sherief Farouk 9b591fadb8 Fixes for uninitialized variable warnings. 2013-08-09 19:52:15 -04:00
Sherief Farouk a90e208e6d Fixed parameter type mismatch in StreamReader. 2013-08-09 19:10:56 -04:00
YoheiKakiuchi 60a65aaaeb add AI_SWAP4 for big endian architecture 2013-08-09 17:54:28 +09:00
Sherief Farouk c8428fa67a Added value range assertions to prevent static analysis false-positives on Clang. 2013-08-07 18:43:29 -04:00
Kim Kulling e9b1754306 Merge pull request #73 from paroj/master
fix include/ define in PostStepRegistry
2013-08-07 09:17:04 -07:00
Pavel Rojtberg 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
Alexander Gessler bebe13e103 Merge pull request #72 from paroj/master
add missing include to fast_atof.h
2013-08-07 05:44:28 -07:00
Pavel Rojtberg 6920c433fd add missing include to fast_atof.h 2013-08-07 14:29:17 +02:00
Alexander Gessler 9dca64d135 Merge pull request #69 from sherief/master
Fix for potential use of unassigned variable compiler warning.
2013-08-05 02:58:51 -07:00
Sherief Farouk 04b0ea3f9a Initialized stride variable to prevent compiler warnings about potential use of unassigned variable. 2013-08-05 00:02:27 -04:00
Alexander Gessler 5f0bd28b15 Merge pull request #66 from sherief/Robustness
Hints for Clang's static analyzer - preventing false positives.
2013-08-04 17:42:36 -07:00
Sherief Farouk ace5b763c3 Added AI_WONT_RETURN and AI_WONT_RETURN_SUFFIX to DOMError. 2013-08-04 10:11:02 -04:00
Sherief Farouk 32b694d4f6 Added AI_WONT_RETURN_SUFFIX to ReportError(). 2013-08-04 10:10:41 -04:00
Sherief Farouk 0d57e659cb Added AI_WONT_RETURN_SUFFIX mainly for Clang's static analyzer. 2013-08-04 10:10:21 -04:00
Alexander Gessler d99d4dadd3 Update Readme with info on my C4D branch. 2013-08-04 01:34:38 +02:00
Kim Kulling e06cdaac46 Merge pull request #64 from faulesocke/master
Now actually fixed the bug with the normals.
2013-08-01 06:54:14 -07:00