v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,267 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

32 Commits (406d9a10cb32eaab06d6f3c1bae766f3260e21f3)

Author SHA1 Message Date
Kim Kulling 524834c307 Fix line endings. 2015-08-08 18:02:37 +02:00
Wil Shipley 8b7fa48d27 - Merge in latest from assimp/assimp on GitHub (5c00aef7cd) 
- Added at least some of the new files to my Xcode 6 project, as
well.
    - Built and tested with the DAE importer, seems to work fine.
 2015-07-26 19:16:01 -07:00
abma 470ad98281 fix "headercheck": 
part of https://github.com/assimp/assimp/issues/534
 2015-04-15 21:22:26 +02:00
abma 6c5f9ecb06 fix most warnings with -pendantic 2014-08-18 02:09:06 +02:00
Alexander Gessler 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
Alexander C. Gessler 27727f692b add missing <sstream> header to lexical_cast replacement 2013-08-27 20:17:30 +00:00
Willy Blandin 27767031e6 make all targets build under OSX 10.8.2 and add iOS target 2013-03-31 21:48:38 +09:00
Alexander Gessler 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
Kim 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
ulfjorensen 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 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
aramis_acg 1928dc7df7 fix shared_ptr and shared_array implementation. add pointer_cast facility. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@716 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-05-10 10:18:54 +00:00
aramis_acg 4f50c04347 Add shared_array to vc8 solution. 
Fix shared_xxx::operator=.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@669 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-11 02:52:27 +00:00
aramis_acg 630005619b Add missing boost workaround files to CMakeLists.txt. 
Boost workaround's shared_xxx stuff now matches boosts documented API.
Add shared_array.hpp to boost workaround (forgot to commit it when I added shared_ptr.hpp).

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@668 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-11 02:46:52 +00:00
aramis_acg b10315e2df shared_ptr: Add missing conversion to bool. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@657 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-06 11:46:49 +00:00
aramis_acg 6db8987248 Fix shared_ptr workaround. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@635 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-02 23:41:20 +00:00
aramis_acg f9b4a825aa COB loaders should now read most binary files as well. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@634 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-02 23:25:52 +00:00
aramis_acg bb5aca8a17 Add TinyFormatter, a convenience wrapper around std::stringstream's, intended to replace boost.format. 
Fix non-standard friend declaration in noboost/shared_ptr.
Deprecate boost.format workaround.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@632 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-02 00:17:58 +00:00
aramis_acg 4bb7cbb422 Add boost.shared_ptr workaround. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@631 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-04-01 20:25:07 +00:00
klickverbot ac8479f542 Moved private headers to code/ as discussed; removed boost::random workaround which was no longer needed; CMake cleanup part two (Boost detection, …). 
Please be quick to suspect this commit if the build should break on Windows/MSVC.

(Again, sorry for the large commit, but I didnt want to flood the commit log with my git-style tiny commits.)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@577 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2010-03-03 21:48:23 +00:00