Skip to content

Commit

Permalink
merge with git://github.com/tonttu/assimp.git
Browse files Browse the repository at this point in the history 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1029 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
  • Loading branch information
aramis_acg committed Jun 9, 2011
1 parent 2de55ee commit 9edc0a9
Show file tree
Hide file tree
Showing 56 changed files with 178 additions and 130 deletions.
2 changes: 1 addition & 1 deletion code/3DSConverter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ void Discreet3DSImporter::ConvertMeshes(aiScene* pcOut)
// ------------------------------------------------------------------------------------------------
// Add a node to the scenegraph and setup its final transformation
void Discreet3DSImporter::AddNodeToGraph(aiScene* pcSOut,aiNode* pcOut,
D3DS::Node* pcIn, aiMatrix4x4& absTrafo)
D3DS::Node* pcIn, aiMatrix4x4& /*absTrafo*/)
{
std::vector<unsigned int> iArray;
iArray.reserve(3);
Expand Down
3 changes: 2 additions & 1 deletion code/3DSLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void Discreet3DSImporter::GetExtensionList(std::set<std::string>& extensions)

// ------------------------------------------------------------------------------------------------
// Setup configuration properties
void Discreet3DSImporter::SetupProperties(const Importer* pImp)
void Discreet3DSImporter::SetupProperties(const Importer* /*pImp*/)
{
// nothing to be done for the moment
}
Expand Down Expand Up @@ -1373,6 +1373,7 @@ void Discreet3DSImporter::ParseColorChunk(aiColor3D* out,
// Skip unknown chunks, hope this won't cause any problems.
return ParseColorChunk(out,acceptPercent);
};
(void)bGamma;
}

#endif // !! ASSIMP_BUILD_NO_3DS_IMPORTER
2 changes: 1 addition & 1 deletion code/B3DImporter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ using namespace std;
//#define DEBUG_B3D

// ------------------------------------------------------------------------------------------------
bool B3DImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const{
bool B3DImporter::CanRead( const std::string& pFile, IOSystem* /*pIOHandler*/, bool /*checkSig*/) const{

size_t pos=pFile.find_last_of( '.' );
if( pos==string::npos ) return false;
Expand Down
2 changes: 1 addition & 1 deletion code/BVHLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ void BVHLoader::ReadNodeChannels( BVHLoader::Node& pNode)

// ------------------------------------------------------------------------------------------------
// Reads the motion data
void BVHLoader::ReadMotion( aiScene* pScene)
void BVHLoader::ReadMotion( aiScene* /*pScene*/)
{
// Read number of frames
std::string tokenFrames = GetNextToken();
Expand Down
2 changes: 1 addition & 1 deletion code/BaseImporter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ aiScene* BaseImporter::ReadFile(const Importer* pImp, const std::string& pFile,
}

// ------------------------------------------------------------------------------------------------
void BaseImporter::SetupProperties(const Importer* pImp)
void BaseImporter::SetupProperties(const Importer* /*pImp*/)
{
// the default implementation does nothing
}
Expand Down
2 changes: 1 addition & 1 deletion code/BaseProcess.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void BaseProcess::ExecuteOnScene( Importer* pImp)
}

// ------------------------------------------------------------------------------------------------
void BaseProcess::SetupProperties(const Importer* pImp)
void BaseProcess::SetupProperties(const Importer* /*pImp*/)
{
// the default implementation does nothing
}
2 changes: 1 addition & 1 deletion code/BlenderDNA.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ boost::shared_ptr< ElemBase > DNA :: ConvertBlobToStructure(
// ------------------------------------------------------------------------------------------------
DNA::FactoryPair DNA :: GetBlobToStructureConverter(
const Structure& structure,
const FileDatabase& db
const FileDatabase& /*db*/
) const
{
std::map<std::string, FactoryPair>::const_iterator it = converters.find(structure.name);
Expand Down
12 changes: 6 additions & 6 deletions code/BlenderDNA.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ template <> struct Structure :: _defaultInitializer<ErrorPolicy_Warn> {
template <> struct Structure :: _defaultInitializer<ErrorPolicy_Fail> {

template <typename T>
void operator ()(T& out,const char* = "") {
void operator ()(T& /*out*/,const char* = "") {
// obviously, it is crucial that _DefaultInitializer is used
// only from within a catch clause.
throw;
Expand Down Expand Up @@ -681,7 +681,7 @@ template <> class ObjectCache<Blender::vector>

ObjectCache(const FileDatabase&) {}

template <typename T> void get(const Structure&, vector<T>&t, const Pointer&) {}
template <typename T> void get(const Structure&, vector<T>&, const Pointer&) {}
template <typename T> void set(const Structure&, const vector<T>&, const Pointer&) {}
};

Expand All @@ -701,9 +701,9 @@ class FileDatabase


FileDatabase()
: next_cache_idx()
, _cacheArrays(*this)
: _cacheArrays(*this)
, _cache(*this)
, next_cache_idx()
{}

public:
Expand All @@ -727,12 +727,12 @@ class FileDatabase
// arrays of objects are never cached because we can't easily
// ensure their proper destruction.
template <typename T>
ObjectCache<boost::shared_ptr>& cache(boost::shared_ptr<T>& in) const {
ObjectCache<boost::shared_ptr>& cache(boost::shared_ptr<T>& /*in*/) const {
return _cache;
}

template <typename T>
ObjectCache<vector>& cache(vector<T>& in) const {
ObjectCache<vector>& cache(vector<T>& /*in*/) const {
return _cacheArrays;
}

Expand Down
4 changes: 2 additions & 2 deletions code/BlenderDNA.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ void Structure :: ResolvePointer(TOUT<T>& out, const Pointer & ptrval, const Fil
}

//--------------------------------------------------------------------------------
inline void Structure :: ResolvePointer( boost::shared_ptr< FileOffset >& out, const Pointer & ptrval, const FileDatabase& db, const Field& f) const
inline void Structure :: ResolvePointer( boost::shared_ptr< FileOffset >& out, const Pointer & ptrval, const FileDatabase& db, const Field& /*f*/) const
{
// Currently used exclusively by PackedFile::data to represent
// a simple offset into the mapped BLEND file.
Expand Down Expand Up @@ -402,7 +402,7 @@ void Structure :: ResolvePointer(vector< TOUT<T> >& out, const Pointer & ptrval,
template <> void Structure :: ResolvePointer<boost::shared_ptr,ElemBase>(boost::shared_ptr<ElemBase>& out,
const Pointer & ptrval,
const FileDatabase& db,
const Field& f
const Field& /*f*/
) const
{
// Special case when the data type needs to be determined at runtime.
Expand Down
12 changes: 6 additions & 6 deletions code/BlenderLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ const aiLoaderDesc& BlenderImporter::GetInfo () const

// ------------------------------------------------------------------------------------------------
// Setup configuration properties for the loader
void BlenderImporter::SetupProperties(const Importer* pImp)
void BlenderImporter::SetupProperties(const Importer* /*pImp*/)
{
// nothing to be done for the moment
}
Expand Down Expand Up @@ -400,7 +400,7 @@ void BlenderImporter::ConvertBlendFile(aiScene* out, const Scene& in,const FileD
// ------------------------------------------------------------------------------------------------
void BlenderImporter::ResolveImage(MaterialHelper* out, const Material* mat, const MTex* tex, const Image* img, ConversionData& conv_data)
{
mat; tex; conv_data;
(void)mat; (void)tex; (void)conv_data;
aiString name;

// check if the file contents are bundled with the BLEND file
Expand Down Expand Up @@ -445,7 +445,7 @@ void BlenderImporter::ResolveImage(MaterialHelper* out, const Material* mat, con
// ------------------------------------------------------------------------------------------------
void BlenderImporter::AddSentinelTexture(MaterialHelper* out, const Material* mat, const MTex* tex, ConversionData& conv_data)
{
mat; tex; conv_data;
(void)mat; (void)tex; (void)conv_data;

aiString name;
name.length = sprintf(name.data, "Procedural,num=%i,type=%s",conv_data.sentinel_cnt++,
Expand Down Expand Up @@ -600,7 +600,7 @@ void BlenderImporter::NotSupportedObjectType(const Object* obj, const char* type
}

// ------------------------------------------------------------------------------------------------
void BlenderImporter::ConvertMesh(const Scene& in, const Object* obj, const Mesh* mesh,
void BlenderImporter::ConvertMesh(const Scene& /*in*/, const Object* /*obj*/, const Mesh* mesh,
ConversionData& conv_data, TempArray<std::vector,aiMesh>& temp
)
{
Expand Down Expand Up @@ -847,15 +847,15 @@ void BlenderImporter::ConvertMesh(const Scene& in, const Object* obj, const Mesh
}

// ------------------------------------------------------------------------------------------------
aiCamera* BlenderImporter::ConvertCamera(const Scene& in, const Object* obj, const Camera* mesh, ConversionData& conv_data)
aiCamera* BlenderImporter::ConvertCamera(const Scene& /*in*/, const Object* /*obj*/, const Camera* /*mesh*/, ConversionData& /*conv_data*/)
{
ScopeGuard<aiCamera> out(new aiCamera());

return NULL ; //out.dismiss();
}

// ------------------------------------------------------------------------------------------------
aiLight* BlenderImporter::ConvertLight(const Scene& in, const Object* obj, const Lamp* mesh, ConversionData& conv_data)
aiLight* BlenderImporter::ConvertLight(const Scene& /*in*/, const Object* /*obj*/, const Lamp* /*mesh*/, ConversionData& /*conv_data*/)
{
ScopeGuard<aiLight> out(new aiLight());

Expand Down
4 changes: 2 additions & 2 deletions code/BlenderModifier.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ bool BlenderModifier_Mirror :: IsActive (const ModifierData& modin)

// ------------------------------------------------------------------------------------------------
void BlenderModifier_Mirror :: DoIt(aiNode& out, ConversionData& conv_data, const ElemBase& orig_modifier,
const Scene& in,
const Scene& /*in*/,
const Object& orig_object )
{
// hijacking the ABI, see the big note in BlenderModifierShowcase::ApplyModifiers()
Expand Down Expand Up @@ -271,7 +271,7 @@ bool BlenderModifier_Subdivision :: IsActive (const ModifierData& modin)

// ------------------------------------------------------------------------------------------------
void BlenderModifier_Subdivision :: DoIt(aiNode& out, ConversionData& conv_data, const ElemBase& orig_modifier,
const Scene& in,
const Scene& /*in*/,
const Object& orig_object )
{
// hijacking the ABI, see the big note in BlenderModifierShowcase::ApplyModifiers()
Expand Down
10 changes: 5 additions & 5 deletions code/BlenderModifier.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,19 +64,19 @@ class BlenderModifier

// --------------------
/** Check if *this* modifier is active, given a ModifierData& block.*/
virtual bool IsActive( const ModifierData& modin) {
virtual bool IsActive( const ModifierData& /*modin*/) {
return false;
}

// --------------------
/** Apply the modifier to a given output node. The original data used
* to construct the node is given as well. Not called unless IsActive()
* was called and gave positive response. */
virtual void DoIt(aiNode& out,
ConversionData& conv_data,
virtual void DoIt(aiNode& /*out*/,
ConversionData& /*conv_data*/,
const ElemBase& orig_modifier,
const Scene& in,
const Object& orig_object
const Scene& /*in*/,
const Object& /*orig_object*/
) {
DefaultLogger::get()->warn((Formatter::format("This modifier is not supported, skipping: "),orig_modifier.dna_type));
return;
Expand Down
10 changes: 5 additions & 5 deletions code/BlobIOSystem.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ class BlobIOStream : public IOStream
public:

BlobIOStream(BlobIOSystem* creator, const std::string& file, size_t initial = 4096)
: file_size()
, cursor()
, buffer()
, creator(creator)
, file(file)
: buffer()
, cur_size()
, file_size()
, cursor()
, initial(initial)
, file(file)
, creator(creator)
{
}

Expand Down
2 changes: 1 addition & 1 deletion code/BoostWorkaround/boost/static_assert.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace boost {


#define BOOST_STATIC_ASSERT(eval) \
{boost::detail::static_assertion_failure<(eval)> assert_dummy;assert_dummy;}
{boost::detail::static_assertion_failure<(eval)> assert_dummy;(void)assert_dummy;}

#endif
#endif // !! AI_BOOST_STATIC_ASSERT_INCLUDED
2 changes: 1 addition & 1 deletion code/ByteSwap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ struct Getter {

template <bool SwapEndianess, typename T>
struct Getter<SwapEndianess,T,false> {
void operator() (T* inout, bool le) {

void operator() (T* inout, bool /*le*/) {
// static branch
ByteSwapper<T,(SwapEndianess && sizeof(T)>1)> () (inout);
}
Expand Down
12 changes: 6 additions & 6 deletions code/COBLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void COBImporter::GetExtensionList(std::set<std::string>& app)

// ------------------------------------------------------------------------------------------------
// Setup configuration properties for the loader
void COBImporter::SetupProperties(const Importer* pImp)
void COBImporter::SetupProperties(const Importer* /*pImp*/)
{
// nothing to be done for the moment
}
Expand Down Expand Up @@ -505,7 +505,7 @@ void COBImporter::LogDebug_Ascii(const Formatter::format& message) {
}

// ------------------------------------------------------------------------------------------------
void COBImporter::ReadBasicNodeInfo_Ascii(Node& msh, LineSplitter& splitter, const ChunkInfo& nfo)
void COBImporter::ReadBasicNodeInfo_Ascii(Node& msh, LineSplitter& splitter, const ChunkInfo& /*nfo*/)
{
for(;splitter;++splitter) {
if (splitter.match_start("Name")) {
Expand Down Expand Up @@ -639,7 +639,7 @@ void COBImporter::ReadUnit_Ascii(Scene& out, LineSplitter& splitter, const Chunk
}

// ------------------------------------------------------------------------------------------------
void COBImporter::ReadChan_Ascii(Scene& out, LineSplitter& splitter, const ChunkInfo& nfo)
void COBImporter::ReadChan_Ascii(Scene& /*out*/, LineSplitter& splitter, const ChunkInfo& nfo)
{
if(nfo.version > 8) {
return UnsupportedChunk_Ascii(splitter,nfo,"Chan");
Expand Down Expand Up @@ -850,7 +850,7 @@ void COBImporter::ReadPolH_Ascii(Scene& out, LineSplitter& splitter, const Chunk
}

// ------------------------------------------------------------------------------------------------
void COBImporter::ReadBitM_Ascii(Scene& out, LineSplitter& splitter, const ChunkInfo& nfo)
void COBImporter::ReadBitM_Ascii(Scene& /*out*/, LineSplitter& splitter, const ChunkInfo& nfo)
{
if(nfo.version > 1) {
return UnsupportedChunk_Ascii(splitter,nfo,"BitM");
Expand Down Expand Up @@ -886,7 +886,7 @@ void COBImporter::ReadString_Binary(std::string& out, StreamReaderLE& reader)
}

// ------------------------------------------------------------------------------------------------
void COBImporter::ReadBasicNodeInfo_Binary(Node& msh, StreamReaderLE& reader, const ChunkInfo& nfo)
void COBImporter::ReadBasicNodeInfo_Binary(Node& msh, StreamReaderLE& reader, const ChunkInfo& /*nfo*/)
{
const unsigned int dupes = reader.GetI2();
ReadString_Binary(msh.name,reader);
Expand Down Expand Up @@ -1077,7 +1077,7 @@ void COBImporter::ReadPolH_Binary(COB::Scene& out, StreamReaderLE& reader, const
}

// ------------------------------------------------------------------------------------------------
void COBImporter::ReadBitM_Binary(COB::Scene& out, StreamReaderLE& reader, const ChunkInfo& nfo)
void COBImporter::ReadBitM_Binary(COB::Scene& /*out*/, StreamReaderLE& reader, const ChunkInfo& nfo)
{
if(nfo.version > 1) {
return UnsupportedChunk_Binary(reader,nfo,"BitM");
Expand Down
2 changes: 1 addition & 1 deletion code/CSMLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ void CSMImporter::GetExtensionList(std::set<std::string>& extensions)

// ------------------------------------------------------------------------------------------------
// Setup configuration properties for the loader
void CSMImporter::SetupProperties(const Importer* pImp)
void CSMImporter::SetupProperties(const Importer* /*pImp*/)
{
// nothing to be done for the moment
}
Expand Down
2 changes: 1 addition & 1 deletion code/ColladaExporter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ void ColladaExporter::WriteNode( const aiNode* pNode)
// instance every geometry
for( size_t a = 0; a < pNode->mNumMeshes; ++a )
{
const aiMesh* mesh = mScene->mMeshes[pNode->mMeshes[a]];
// const aiMesh* mesh = mScene->mMeshes[pNode->mMeshes[a]];
mOutput << startstr << "<instance_geometry url=\"#" << GetMeshId( a) << "\">" << endstr;
PushTag();

Expand Down
4 changes: 2 additions & 2 deletions code/ColladaLoader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1180,7 +1180,7 @@ void ColladaLoader::AddTexture ( Assimp::MaterialHelper& mat, const ColladaParse

// ------------------------------------------------------------------------------------------------
// Fills materials from the collada material definitions
void ColladaLoader::FillMaterials( const ColladaParser& pParser, aiScene* pScene)
void ColladaLoader::FillMaterials( const ColladaParser& pParser, aiScene* /*pScene*/)
{
for (std::vector<std::pair<Collada::Effect*, aiMaterial*> >::iterator it = newMats.begin(),
end = newMats.end(); it != end; ++it)
Expand Down Expand Up @@ -1272,7 +1272,7 @@ void ColladaLoader::FillMaterials( const ColladaParser& pParser, aiScene* pScene

// ------------------------------------------------------------------------------------------------
// Constructs materials from the collada material definitions
void ColladaLoader::BuildMaterials( const ColladaParser& pParser, aiScene* pScene)
void ColladaLoader::BuildMaterials( const ColladaParser& pParser, aiScene* /*pScene*/)
{
newMats.reserve(pParser.mMaterialLibrary.size());

Expand Down
2 changes: 1 addition & 1 deletion code/ComputeUVMappingProcess.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ void ComputeUVMappingProcess::ComputePlaneMapping(aiMesh* mesh,const aiVector3D&
}

// ------------------------------------------------------------------------------------------------
void ComputeUVMappingProcess::ComputeBoxMapping(aiMesh* mesh, aiVector3D* out)
void ComputeUVMappingProcess::ComputeBoxMapping(aiMesh* /*mesh*/, aiVector3D* /*out*/)
{
DefaultLogger::get()->error("Mapping type currently not implemented");
}
Expand Down
Loading

0 comments on commit 9edc0a9

Please sign in to comment.