fix build for vs2013

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
pull/538/head
Kim Kulling 2015-04-16 11:38:53 +02:00
parent 444a77e170
commit 02ee002878
10 changed files with 268 additions and 263 deletions

View File

@ -10,7 +10,8 @@
#include "irrXMLWrapper.h" #include "irrXMLWrapper.h"
#include "BaseImporter.h" #include "BaseImporter.h"
#include <stdint.h> #include <stdint.h>
class aiMaterial;
struct aiMaterial;
namespace Assimp { namespace Assimp {

View File

@ -51,9 +51,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
struct aiImporterDesc; struct aiImporterDesc;
namespace Assimp { namespace Assimp {
struct BatchLoader; class BatchLoader;
struct Importer; class Importer;
struct IOSystem; class IOSystem;
namespace LWS { namespace LWS {

View File

@ -59,7 +59,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <stdint.h> #include <stdint.h>
#include <vector> #include <vector>
class aiMaterial; struct aiMaterial;
namespace Assimp { namespace Assimp {
namespace MDL { namespace MDL {

View File

@ -50,12 +50,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string> #include <string>
#include <vector> #include <vector>
class IOSystem;
class Importer;
struct aiImporterDesc; struct aiImporterDesc;
struct aiScene; struct aiScene;
namespace Assimp { namespace Assimp {
class IOSystem;
class Importer;
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
/** @brief Importer class to load meshes from Nendo. /** @brief Importer class to load meshes from Nendo.

View File

@ -772,12 +772,12 @@ void OpenGEXImporter::handleColorNode( ODDLParser::DDLNode *node, aiScene *pScen
Property *colorProp = node->getProperties(); Property *colorProp = node->getProperties();
if( NULL != colorProp ) { if( NULL != colorProp ) {
if( NULL != colorProp->m_id ) { if( NULL != colorProp->m_id ) {
ColorType type( getColorType( colorProp->m_primData ) ); /* ColorType type( getColorType( colorProp->m_primData ) );
if( type == DiffuseColor ) { if( type == DiffuseColor ) {
aiColor3D *col = new aiColor3D; aiColor3D *col = new aiColor3D;
getColorRGBA( col, node->getValue() ); getColorRGBA( col, node->getValue() );
m_currentMaterial->AddProperty( col, 1, AI_MATKEY_COLOR_DIFFUSE ); m_currentMaterial->AddProperty( col, 1, AI_MATKEY_COLOR_DIFFUSE );
} }*/
} }
} }
} }

View File

@ -53,6 +53,7 @@ namespace ODDLParser {
struct Context; struct Context;
} }
struct aiNode; struct aiNode;
struct aiMaterial;
namespace Assimp { namespace Assimp {
namespace OpenGEX { namespace OpenGEX {

View File

@ -51,6 +51,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <set> #include <set>
#include <list> #include <list>
#include <stdint.h> #include <stdint.h>
//#include "../include/assimp/Compiler/pstdint.h"
#include <vector> #include <vector>
struct aiScene; struct aiScene;

View File

@ -21,8 +21,8 @@
#include <stdexcept> #include <stdexcept>
#include "StringComparison.h" #include "StringComparison.h"
#include "../include/assimp/Compiler/pstdint.h" //#include "../include/assimp/Compiler/pstdint.h"
#include <stdint.h>
namespace Assimp namespace Assimp
{ {