Bläddra i källkod

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

aramis_acg 17 år sedan
förälder
incheckning
2c53c839f4
2 ändrade filer med 16 tillägg och 8 borttagningar
  1. 10 8
      code/MD2FileData.h
  2. 6 0
      code/SMDLoader.h

+ 10 - 8
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
  */

+ 6 - 0
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 <vector>
 
 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;