Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated boost workaround. Added -noboost build config to VC8.

Browse Source 
Added aiGetVersionMinor, aiGetVersionMajor, aiGetRevision and aiGetLegalInformation(). They allow to query the library version at runtime.
Added reference images for cylindric and spherical mapping.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@255 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-11-29 15:30:50 +00:00
parent be864ce4a0
commit 94d289d1a3
18 changed files with 1757 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/SceneCombiner.cpp
View File

@@ -50,6 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "SceneCombiner.h"
#include "fast_atof.h"
#include "Hash.h"
#include "time.h"
// ----------------------------------------------------------------------------
// We need boost::random here. The workaround uses rand() instead of a proper
@@ -58,12 +59,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// ----------------------------------------------------------------------------
#ifdef ASSIMP_BUILD_BOOST_WORKAROUND
#if _MSC_VER >= 1400
# pragma message( "AssimpBuild: Using -noBoost workaround for boost::random" )
#endif
# include "../include/BoostWorkaround/boost/random/uniform_int.hpp"
# include "../include/BoostWorkaround/boost/random/variate_generator.hpp"
# include "../include/BoostWorkaround/boost/random/mersenne_twister.hpp"
#else
#if _MSC_VER >= 1400
# pragma message( "AssimpBuild: Using standard boost headers for boost::random" )
#endif
# include <boost/random/uniform_int.hpp>
# include <boost/random/variate_generator.hpp>
# include <boost/random/mersenne_twister.hpp>
@@ -289,7 +298,7 @@ void SceneCombiner::MergeScenes(aiScene** _dest, aiScene* master,
{
// Construct a proper random number generator
boost::mt19937 rng( ::clock() );
boost::uniform_int<> dist(1,1 << 24u);
boost::uniform_int<> dist(1u,1 << 24u);
boost::variate_generator<boost::mt19937&, boost::uniform_int<> > rndGen(rng, dist);
for (unsigned int i = 1; i < src.size();++i)