git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@96 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

pull/1/head
aramis_acg 2008-08-08 18:21:43 +00:00
parent c3a776ec96
commit 2c53c839f4
2 changed files with 16 additions and 8 deletions

View File

@ -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 #ifndef AI_MD2FILEHELPER_H_INC
#define 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" #include "./Compiler/pushpack1.h"
namespace Assimp namespace Assimp {
{ namespace MD2 {
//http://linux.ucla.edu/~phaethon/q3/formats/md2-schoenblum.html
namespace MD2
{
#define AI_MD2_MAGIC_NUMBER_BE 'IDP2' #define AI_MD2_MAGIC_NUMBER_BE 'IDP2'
#define AI_MD2_MAGIC_NUMBER_LE '2PDI' #define AI_MD2_MAGIC_NUMBER_LE '2PDI'
@ -94,8 +98,6 @@ struct Header
} PACK_STRUCT; } PACK_STRUCT;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** \brief Data structure for a MD2 OpenGl draw command /** \brief Data structure for a MD2 OpenGl draw command
*/ */

View File

@ -46,15 +46,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_SMDLOADER_H_INCLUDED #ifndef AI_SMDLOADER_H_INCLUDED
#define AI_SMDLOADER_H_INCLUDED #define AI_SMDLOADER_H_INCLUDED
// internal headers
#include "BaseImporter.h" #include "BaseImporter.h"
#include "ParsingUtils.h" #include "ParsingUtils.h"
// public Assimp headers
#include "../include/aiTypes.h" #include "../include/aiTypes.h"
#include "../include/aiTexture.h" #include "../include/aiTexture.h"
#include "../include/aiAnim.h" #include "../include/aiAnim.h"
#include "../include/aiMaterial.h" #include "../include/aiMaterial.h"
struct aiNode; struct aiNode;
// STL headers
#include <vector> #include <vector>
namespace Assimp { namespace Assimp {
@ -363,6 +366,9 @@ protected:
private: private:
/** Configuration option: frame to be loaded */
unsigned int configFrameID;
/** Buffer to hold the loaded file */ /** Buffer to hold the loaded file */
char* mBuffer; char* mBuffer;