2009-01-09 21:29:54 +00:00
|
|
|
/*
|
|
|
|
---------------------------------------------------------------------------
|
2012-02-03 03:38:30 +00:00
|
|
|
Open Asset Import Library (assimp)
|
2009-01-09 21:29:54 +00:00
|
|
|
---------------------------------------------------------------------------
|
|
|
|
|
2012-02-03 03:38:30 +00:00
|
|
|
Copyright (c) 2006-2012, assimp team
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
All rights reserved.
|
|
|
|
|
|
|
|
Redistribution and use of this software in source and binary forms,
|
|
|
|
with or without modification, are permitted provided that the following
|
|
|
|
conditions are met:
|
|
|
|
|
|
|
|
* Redistributions of source code must retain the above
|
|
|
|
copyright notice, this list of conditions and the
|
|
|
|
following disclaimer.
|
|
|
|
|
|
|
|
* Redistributions in binary form must reproduce the above
|
|
|
|
copyright notice, this list of conditions and the
|
|
|
|
following disclaimer in the documentation and/or other
|
|
|
|
materials provided with the distribution.
|
|
|
|
|
2012-02-03 03:38:30 +00:00
|
|
|
* Neither the name of the assimp team, nor the names of its
|
2009-01-09 21:29:54 +00:00
|
|
|
contributors may be used to endorse or promote products
|
|
|
|
derived from this software without specific prior
|
2012-02-03 03:38:30 +00:00
|
|
|
written permission of the assimp team.
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
|
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
|
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
|
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
|
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
|
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
|
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
---------------------------------------------------------------------------
|
|
|
|
*/
|
|
|
|
|
|
|
|
/** @file Implementation of the Terragen importer class */
|
|
|
|
|
2015-04-15 23:00:17 +00:00
|
|
|
|
2009-01-09 21:29:54 +00:00
|
|
|
|
2010-05-10 10:22:24 +00:00
|
|
|
#ifndef ASSIMP_BUILD_NO_TERRAGEN_IMPORTER
|
2015-04-15 23:00:17 +00:00
|
|
|
#include "TerragenLoader.h"
|
|
|
|
#include "../include/assimp/Importer.hpp"
|
|
|
|
#include "../include/assimp/IOSystem.hpp"
|
|
|
|
#include "StreamReader.h"
|
|
|
|
#include "../include/assimp/scene.h"
|
|
|
|
#include "../include/assimp/DefaultLogger.hpp"
|
|
|
|
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
using namespace Assimp;
|
|
|
|
|
2012-04-22 22:26:26 +00:00
|
|
|
static const aiImporterDesc desc = {
|
|
|
|
"Terragen Heightmap Importer",
|
|
|
|
"",
|
|
|
|
"",
|
|
|
|
"http://www.planetside.co.uk/",
|
|
|
|
aiImporterFlags_SupportBinaryFlavour,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
0,
|
|
|
|
"ter"
|
|
|
|
};
|
|
|
|
|
2009-01-09 21:29:54 +00:00
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
|
// Constructor to be privately used by Importer
|
|
|
|
TerragenImporter::TerragenImporter()
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
: configComputeUVs (false)
|
2009-01-09 21:29:54 +00:00
|
|
|
{}
|
|
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
|
// Destructor, private as well
|
|
|
|
TerragenImporter::~TerragenImporter()
|
|
|
|
{}
|
|
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
|
// Returns whether the class can handle the format of the given file.
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
bool TerragenImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const
|
2009-01-09 21:29:54 +00:00
|
|
|
{
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
// check file extension
|
|
|
|
std::string extension = GetExtension(pFile);
|
|
|
|
|
|
|
|
if( extension == "ter")
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if( !extension.length() || checkSig) {
|
|
|
|
/* If CanRead() is called in order to check whether we
|
|
|
|
* support a specific file extension in general pIOHandler
|
|
|
|
* might be NULL and it's our duty to return true here.
|
|
|
|
*/
|
|
|
|
if (!pIOHandler)return true;
|
|
|
|
const char* tokens[] = {"terragen"};
|
|
|
|
return SearchFileHeaderForToken(pIOHandler,pFile,tokens,1);
|
|
|
|
}
|
|
|
|
return false;
|
2009-01-09 21:29:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
|
// Build a string of all file extensions supported
|
2012-04-22 22:26:26 +00:00
|
|
|
const aiImporterDesc* TerragenImporter::GetInfo () const
|
2009-01-09 21:29:54 +00:00
|
|
|
{
|
2012-04-22 22:26:26 +00:00
|
|
|
return &desc;
|
2009-01-09 21:29:54 +00:00
|
|
|
}
|
|
|
|
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
|
// Setup import properties
|
|
|
|
void TerragenImporter::SetupProperties(const Importer* pImp)
|
|
|
|
{
|
|
|
|
// AI_CONFIG_IMPORT_TER_MAKE_UVS
|
|
|
|
configComputeUVs = ( 0 != pImp->GetPropertyInteger(AI_CONFIG_IMPORT_TER_MAKE_UVS,0) );
|
|
|
|
}
|
|
|
|
|
2009-01-09 21:29:54 +00:00
|
|
|
// ------------------------------------------------------------------------------------------------
|
|
|
|
// Imports the given file into the given scene structure.
|
|
|
|
void TerragenImporter::InternReadFile( const std::string& pFile,
|
|
|
|
aiScene* pScene, IOSystem* pIOHandler)
|
|
|
|
{
|
|
|
|
IOStream* file = pIOHandler->Open( pFile, "rb");
|
|
|
|
|
|
|
|
// Check whether we can read from the file
|
|
|
|
if( file == NULL)
|
2010-03-18 17:00:12 +00:00
|
|
|
throw DeadlyImportError( "Failed to open TERRAGEN TERRAIN file " + pFile + ".");
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
// Construct a stream reader to read all data in the correct endianess
|
|
|
|
StreamReaderLE reader(file);
|
|
|
|
if(reader.GetRemainingSize() < 16)
|
2010-03-18 17:00:12 +00:00
|
|
|
throw DeadlyImportError( "TER: file is too small" );
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
// Check for the existence of the two magic strings 'TERRAGEN' and 'TERRAIN '
|
|
|
|
if (::strncmp((const char*)reader.GetPtr(),AI_TERR_BASE_STRING,8))
|
2010-03-18 17:00:12 +00:00
|
|
|
throw DeadlyImportError( "TER: Magic string \'TERRAGEN\' not found" );
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
if (::strncmp((const char*)reader.GetPtr()+8,AI_TERR_TERRAIN_STRING,8))
|
2010-03-18 17:00:12 +00:00
|
|
|
throw DeadlyImportError( "TER: Magic string \'TERRAIN\' not found" );
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
unsigned int x = 0,y = 0,mode = 0;
|
|
|
|
float rad = 6370.f;
|
2011-06-09 14:29:32 +00:00
|
|
|
(void)rad;
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
|
|
|
|
aiNode* root = pScene->mRootNode = new aiNode();
|
|
|
|
root->mName.Set("<TERRAGEN.TERRAIN>");
|
|
|
|
|
|
|
|
// Default scaling is 30
|
|
|
|
root->mTransformation.a1 = root->mTransformation.b2 = root->mTransformation.c3 = 30.f;
|
|
|
|
|
|
|
|
// Now read all chunks until we're finished or an EOF marker is encountered
|
|
|
|
reader.IncPtr(16);
|
|
|
|
while (reader.GetRemainingSize() >= 4)
|
|
|
|
{
|
|
|
|
const char* head = (const char*)reader.GetPtr();
|
|
|
|
reader.IncPtr(4);
|
|
|
|
|
|
|
|
// EOF, break in every case
|
|
|
|
if (!::strncmp(head,AI_TERR_EOF_STRING,4))
|
|
|
|
break;
|
|
|
|
|
|
|
|
// Number of x-data points
|
|
|
|
if (!::strncmp(head,AI_TERR_CHUNK_XPTS,4))
|
|
|
|
{
|
|
|
|
x = (uint16_t)reader.GetI2();
|
|
|
|
}
|
|
|
|
// Number of y-data points
|
|
|
|
else if (!::strncmp(head,AI_TERR_CHUNK_YPTS,4))
|
|
|
|
{
|
|
|
|
y = (uint16_t)reader.GetI2();
|
|
|
|
}
|
|
|
|
// Squared terrains width-1.
|
|
|
|
else if (!::strncmp(head,AI_TERR_CHUNK_SIZE,4))
|
|
|
|
{
|
|
|
|
x = y = (uint16_t)reader.GetI2()+1;
|
|
|
|
}
|
|
|
|
// terrain scaling
|
|
|
|
else if (!::strncmp(head,AI_TERR_CHUNK_SCAL,4))
|
|
|
|
{
|
|
|
|
root->mTransformation.a1 = reader.GetF4();
|
|
|
|
root->mTransformation.b2 = reader.GetF4();
|
|
|
|
root->mTransformation.c3 = reader.GetF4();
|
|
|
|
}
|
|
|
|
// mapping == 1: earth radius
|
|
|
|
else if (!::strncmp(head,AI_TERR_CHUNK_CRAD,4))
|
|
|
|
{
|
|
|
|
rad = reader.GetF4();
|
|
|
|
}
|
|
|
|
// mapping mode
|
|
|
|
else if (!::strncmp(head,AI_TERR_CHUNK_CRVM,4))
|
|
|
|
{
|
|
|
|
mode = reader.GetI1();
|
|
|
|
if (0 != mode)
|
|
|
|
DefaultLogger::get()->error("TER: Unsupported mapping mode, a flat terrain is returned");
|
|
|
|
}
|
|
|
|
// actual terrain data
|
|
|
|
else if (!::strncmp(head,AI_TERR_CHUNK_ALTW,4))
|
|
|
|
{
|
|
|
|
float hscale = (float)reader.GetI2() / 65536;
|
|
|
|
float bheight = (float)reader.GetI2();
|
|
|
|
|
|
|
|
if (!hscale)hscale = 1;
|
|
|
|
|
|
|
|
// Ensure we have enough data
|
|
|
|
if (reader.GetRemainingSize() < x*y*2)
|
2010-03-18 17:00:12 +00:00
|
|
|
throw DeadlyImportError("TER: ALTW chunk is too small");
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
if (x <= 1 || y <= 1)
|
2010-03-18 17:00:12 +00:00
|
|
|
throw DeadlyImportError("TER: Invalid terrain size");
|
2009-01-09 21:29:54 +00:00
|
|
|
|
|
|
|
// Allocate the output mesh
|
|
|
|
pScene->mMeshes = new aiMesh*[pScene->mNumMeshes = 1];
|
|
|
|
aiMesh* m = pScene->mMeshes[0] = new aiMesh();
|
|
|
|
|
|
|
|
// We return quads
|
|
|
|
aiFace* f = m->mFaces = new aiFace[m->mNumFaces = (x-1)*(y-1)];
|
|
|
|
aiVector3D* pv = m->mVertices = new aiVector3D[m->mNumVertices = m->mNumFaces*4];
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
|
2009-12-24 11:27:24 +00:00
|
|
|
aiVector3D *uv( NULL );
|
2009-12-24 11:28:54 +00:00
|
|
|
float step_y( 0.0f ), step_x( 0.0f );
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
if (configComputeUVs) {
|
|
|
|
uv = m->mTextureCoords[0] = new aiVector3D[m->mNumVertices];
|
|
|
|
step_y = 1.f/y;
|
|
|
|
step_x = 1.f/x;
|
|
|
|
}
|
2009-01-09 21:29:54 +00:00
|
|
|
const int16_t* data = (const int16_t*)reader.GetPtr();
|
|
|
|
|
|
|
|
for (unsigned int yy = 0, t = 0; yy < y-1;++yy) {
|
|
|
|
for (unsigned int xx = 0; xx < x-1;++xx,++f) {
|
|
|
|
|
|
|
|
// make verts
|
|
|
|
const float fy = (float)yy, fx = (float)xx;
|
2015-03-02 22:44:02 +00:00
|
|
|
unsigned tmp,tmp2;
|
2009-01-09 21:29:54 +00:00
|
|
|
*pv++ = aiVector3D(fx,fy, (float)data[(tmp2=x*yy) + xx] * hscale + bheight);
|
|
|
|
*pv++ = aiVector3D(fx,fy+1, (float)data[(tmp=x*(yy+1)) + xx] * hscale + bheight);
|
|
|
|
*pv++ = aiVector3D(fx+1,fy+1,(float)data[tmp + xx+1] * hscale + bheight);
|
|
|
|
*pv++ = aiVector3D(fx+1,fy, (float)data[tmp2 + xx+1] * hscale + bheight);
|
|
|
|
|
General
- Added format auto-detection to most loaders
- Simplified BaseImporter::CanRead() with some utility methods
- improved fast_atof -> no overruns anymore. Fuck you, irrlicht.
- added assimp_cmd tool to allow command line model processing. Mainly adebugging tool for internal purposes, but others might find it useful, too.
- vc8/vc9: revision number is now written to DLL version header
- mkutil: some batch scripts to simplify tagging & building of release versions
- some API cleanup
- fixing some doxygen markup (+now explicit use of @file <filename>)
- Icon for assimp_view and assimp_cmd
3DS
- Normal vectors are not anymore inverted in some cases
- Improved pivot handling
- Improved handling of x-flipped meshes
Collada
- fixed a minor bug (visual_scene element)
LWS
- WIP implementation. No animations yet, some bugs and crashes.
- Animation system remains disabled, WIP code
- many test files for LWS, but most of them test the anim support, which is, read above, currently disabled.
STL
- fixing a log warning which appears for every model
- added binary&ascii test spider, exported from truespace
MD3
- Cleaning up output tags for automatically joined player models.
IRR
- Fixing coordinate system issues.
- Instance handling improved.
- Some of the reported crashes not yet fixed.
PretransformVertices
- Numerous performance improvements.
- Added config option to preserve the hierarchy during the step.
RemoveRedundantMaterials
- Added config option to specify a list of materials which are kept in every case.
UNREAL
- Added support for the old unreal data format (*.a,*.d,*.uc)
- tested only with exports from Milkshape
- more Unreal stuff to come soon
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@356 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2009-03-05 22:32:13 +00:00
|
|
|
// also make texture coordinates, if necessary
|
|
|
|
if (configComputeUVs) {
|
|
|
|
*uv++ = aiVector3D( step_x*xx, step_y*yy, 0.f );
|
|
|
|
*uv++ = aiVector3D( step_x*xx, step_y*(yy+1), 0.f );
|
|
|
|
*uv++ = aiVector3D( step_x*(xx+1), step_y*(yy+1), 0.f );
|
|
|
|
*uv++ = aiVector3D( step_x*(xx+1), step_y*yy, 0.f );
|
|
|
|
}
|
|
|
|
|
2009-01-09 21:29:54 +00:00
|
|
|
// make indices
|
|
|
|
f->mIndices = new unsigned int[f->mNumIndices = 4];
|
|
|
|
for (unsigned int i = 0; i < 4;++i)
|
|
|
|
f->mIndices[i] = t++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add the mesh to the root node
|
|
|
|
root->mMeshes = new unsigned int[root->mNumMeshes = 1];
|
|
|
|
root->mMeshes[0] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get to the next chunk (4 byte aligned)
|
|
|
|
unsigned dtt;
|
|
|
|
if ((dtt = reader.GetCurrentPos() & 0x3))
|
|
|
|
reader.IncPtr(4-dtt);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check whether we have a mesh now
|
|
|
|
if (pScene->mNumMeshes != 1)
|
2010-03-18 17:00:12 +00:00
|
|
|
throw DeadlyImportError("TER: Unable to load terrain");
|
2009-01-10 17:58:06 +00:00
|
|
|
|
|
|
|
// Set the AI_SCENE_FLAGS_TERRAIN bit
|
|
|
|
pScene->mFlags |= AI_SCENE_FLAGS_TERRAIN;
|
2009-01-09 21:29:54 +00:00
|
|
|
}
|
|
|
|
|
2010-05-10 10:22:24 +00:00
|
|
|
#endif // !! ASSIMP_BUILD_NO_TERRAGEN_IMPORTER
|