From 2c53c839f43021a6c90c262fac25a314ab426e9c Mon Sep 17 00:00:00 2001 From: aramis_acg Date: Fri, 8 Aug 2008 18:21:43 +0000 Subject: [PATCH] git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@96 67173fc5-114c-0410-ac8e-9d2fd5bffc1f --- code/MD2FileData.h | 18 ++++++++++-------- code/SMDLoader.h | 6 ++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/code/MD2FileData.h b/code/MD2FileData.h index d9749d4de..cbca9b7a5 100644 --- a/code/MD2FileData.h +++ b/code/MD2FileData.h @@ -38,7 +38,14 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------- */ -/** @file Defines the helper data structures for importing MD2 files */ +/** @file Defines the helper data structures for importing MD2 files + +********************************************************************** +File format specification: +//http://linux.ucla.edu/~phaethon/q3/formats/md2-schoenblum.html +********************************************************************** + +*/ #ifndef AI_MD2FILEHELPER_H_INC #define AI_MD2FILEHELPER_H_INC @@ -52,11 +59,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "./Compiler/pushpack1.h" -namespace Assimp -{ -//http://linux.ucla.edu/~phaethon/q3/formats/md2-schoenblum.html -namespace MD2 -{ +namespace Assimp { +namespace MD2 { #define AI_MD2_MAGIC_NUMBER_BE 'IDP2' #define AI_MD2_MAGIC_NUMBER_LE '2PDI' @@ -94,8 +98,6 @@ struct Header } PACK_STRUCT; - - // --------------------------------------------------------------------------- /** \brief Data structure for a MD2 OpenGl draw command */ diff --git a/code/SMDLoader.h b/code/SMDLoader.h index 8373b27cd..ba09df30c 100644 --- a/code/SMDLoader.h +++ b/code/SMDLoader.h @@ -46,15 +46,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef AI_SMDLOADER_H_INCLUDED #define AI_SMDLOADER_H_INCLUDED +// internal headers #include "BaseImporter.h" #include "ParsingUtils.h" +// public Assimp headers #include "../include/aiTypes.h" #include "../include/aiTexture.h" #include "../include/aiAnim.h" #include "../include/aiMaterial.h" struct aiNode; +// STL headers #include namespace Assimp { @@ -363,6 +366,9 @@ protected: private: + /** Configuration option: frame to be loaded */ + unsigned int configFrameID; + /** Buffer to hold the loaded file */ char* mBuffer;