Refactor: Expand tabs to 4 spaces

This commit is contained in:
Richard
2015-05-18 21:57:13 -06:00
parent a96a595a7a
commit 83de707587
324 changed files with 78951 additions and 78956 deletions

View File

@@ -61,8 +61,8 @@ struct Point2;
class ObjFileImporter;
class IOSystem;
/// \class ObjFileParser
/// \brief Parser for a obj waveform file
/// \class ObjFileParser
/// \brief Parser for a obj waveform file
class ObjFileParser
{
public:
@@ -72,31 +72,31 @@ public:
typedef std::vector<char>::const_iterator ConstDataArrayIt;
public:
/// \brief Constructor with data array.
/// \brief Constructor with data array.
ObjFileParser(std::vector<char> &Data,const std::string &strModelName, IOSystem* io);
/// \brief Destructor
/// \brief Destructor
~ObjFileParser();
/// \brief Model getter.
/// \brief Model getter.
ObjFile::Model *GetModel() const;
private:
/// Parse the loaded file
/// Parse the loaded file
void parseFile();
/// Method to copy the new delimited word in the current line.
/// Method to copy the new delimited word in the current line.
void copyNextWord(char *pBuffer, size_t length);
/// Method to copy the new line.
/// Method to copy the new line.
void copyNextLine(char *pBuffer, size_t length);
/// Stores the vector
void getVector( std::vector<aiVector3D> &point3d_array );
/// Stores the following 3d vector.
/// Stores the following 3d vector.
void getVector3( std::vector<aiVector3D> &point3d_array );
/// Stores the following 3d vector.
/// Stores the following 3d vector.
void getVector2(std::vector<aiVector2D> &point2d_array);
/// Stores the following face.
/// Stores the following face.
void getFace(aiPrimitiveType type);
/// Reads the material description.
void getMaterialDesc();
/// Gets a comment.
/// Gets a comment.
void getComment();
/// Gets a a material library.
void getMaterialLib();
@@ -114,35 +114,35 @@ private:
void getObjectName();
/// Creates a new object.
void createObject(const std::string &strObjectName);
/// Creates a new mesh.
/// Creates a new mesh.
void createMesh();
/// Returns true, if a new mesh instance must be created.
/// Returns true, if a new mesh instance must be created.
bool needsNewMesh( const std::string &rMaterialName );
/// Error report in token
/// Error report in token
void reportErrorTokenInFace();
private:
// Copy and assignment constructor should be private
// because the class contains pointer to allocated memory
// Copy and assignment constructor should be private
// because the class contains pointer to allocated memory
ObjFileParser(const ObjFileParser& rhs);
ObjFileParser& operator=(const ObjFileParser& rhs);
ObjFileParser& operator=(const ObjFileParser& rhs);
/// Default material name
/// Default material name
static const std::string DEFAULT_MATERIAL;
//! Iterator to current position in buffer
//! Iterator to current position in buffer
DataArrayIt m_DataIt;
//! Iterator to end position of buffer
//! Iterator to end position of buffer
DataArrayIt m_DataItEnd;
//! Pointer to model instance
//! Pointer to model instance
ObjFile::Model *m_pModel;
//! Current line (for debugging)
//! Current line (for debugging)
unsigned int m_uiLine;
//! Helper buffer
//! Helper buffer
char m_buffer[BUFFERSIZE];
/// Pointer to IO system instance.
/// Pointer to IO system instance.
IOSystem *m_pIO;
};
} // Namespace Assimp
} // Namespace Assimp
#endif