Optimized triangulation algorithm. Must more faster now.
Added loader for TERRAGEN terrains (*.ter). ScenePreprocessor generates a default material if none is given. AC: file extension bug Added terragen test files. git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@279 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
@@ -129,7 +129,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#ifndef AI_BUILD_NO_COLLADA_IMPORTER
|
||||
# include "ColladaLoader.h"
|
||||
#endif
|
||||
|
||||
#ifndef AI_BUILD_NO_TERRAGEN_IMPORTER
|
||||
# include "TerragenLoader.h"
|
||||
#endif
|
||||
|
||||
// PostProcess-Steps
|
||||
#ifndef AI_BUILD_NO_CALCTANGENTS_PROCESS
|
||||
@@ -193,11 +195,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
# include "TextureTransform.h"
|
||||
#endif
|
||||
|
||||
|
||||
using namespace Assimp;
|
||||
|
||||
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
// Constructor.
|
||||
Importer::Importer() :
|
||||
@@ -205,12 +204,12 @@ Importer::Importer() :
|
||||
mScene(NULL),
|
||||
mErrorString("")
|
||||
{
|
||||
// allocate a default IO handler
|
||||
// Allocate a default IO handler
|
||||
mIOHandler = new DefaultIOSystem;
|
||||
mIsDefaultHandler = true;
|
||||
bExtraVerbose = false; // disable extra verbose mode by default
|
||||
|
||||
// add an instance of each worker class here
|
||||
// Add an instance of each worker class here
|
||||
// the order doesn't really care, however file formats that are
|
||||
// used more frequently than others should be at the beginning.
|
||||
mImporter.reserve(25);
|
||||
@@ -290,6 +289,9 @@ Importer::Importer() :
|
||||
#if (!defined AI_BUILD_NO_COLLADA_IMPORTER)
|
||||
mImporter.push_back( new ColladaLoader());
|
||||
#endif
|
||||
#if (!defined AI_BUILD_NO_TERRAGEN_IMPORTER)
|
||||
mImporter.push_back( new TerragenImporter());
|
||||
#endif
|
||||
|
||||
// Add an instance of each post processing step here in the order
|
||||
// of sequence it is executed. steps that are added here are not validated -
|
||||
|
||||
Reference in New Issue
Block a user