reorder #includes to compile correctly
This commit is contained in:
parent
5cb33c4b2e
commit
49f48ae529
|
|
@ -17,6 +17,10 @@
|
|||
////////////////////////////////////////////////////////////////////
|
||||
|
||||
#include "softNodeDesc.h"
|
||||
#include "config_softegg.h"
|
||||
#include "eggGroup.h"
|
||||
#include "eggXfmSAnim.h"
|
||||
#include "softToEggConverter.h"
|
||||
|
||||
TypeHandle SoftNodeDesc::_type_handle;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
#include "eggTable.h"
|
||||
#include "eggXfmSAnim.h"
|
||||
#include "eggData.h"
|
||||
#include "softToEggConverter.h"
|
||||
#include "dcast.h"
|
||||
|
||||
#include <SAA.h>
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
SoftToEggConverter stec;
|
||||
|
||||
static const int TEX_PER_MAT = 1;
|
||||
const int TEX_PER_MAT = 1;
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// Function: SoftToEggConverter::Constructor
|
||||
|
|
|
|||
|
|
@ -19,6 +19,14 @@
|
|||
#ifndef SOFTTOEGGCONVERTER_H
|
||||
#define SOFTTOEGGCONVERTER_H
|
||||
|
||||
#include "pandatoolbase.h"
|
||||
#include "somethingToEggConverter.h"
|
||||
#include "softNodeTree.h"
|
||||
|
||||
#include "eggTextureCollection.h"
|
||||
#include "distanceUnit.h"
|
||||
#include "coordinateSystem.h"
|
||||
|
||||
#ifdef _MIN
|
||||
#undef _MIN
|
||||
#endif
|
||||
|
|
@ -26,17 +34,9 @@
|
|||
#undef _MAX
|
||||
#endif
|
||||
|
||||
#include "pandatoolbase.h"
|
||||
#include "somethingToEggConverter.h"
|
||||
#include "softNodeTree.h"
|
||||
|
||||
#include <SAA.h>
|
||||
#include <SI_macros.h>
|
||||
|
||||
#include "eggTextureCollection.h"
|
||||
#include "distanceUnit.h"
|
||||
#include "coordinateSystem.h"
|
||||
|
||||
class EggData;
|
||||
class EggGroup;
|
||||
class EggTable;
|
||||
|
|
@ -173,5 +173,6 @@ public:
|
|||
static TransformType string_transform_type(const string &arg);
|
||||
};
|
||||
|
||||
extern const int TEX_PER_MAT;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue