goat3dgfx

diff src/assload.cc @ 15:7d6b667821cf

wrapped everything in the goatgfx namespace
author John Tsiombikas <nuclear@member.fsf.org>
date Sat, 30 Nov 2013 20:52:21 +0200
parents 1873dfd13f2d
children
line diff
     1.1 --- a/src/assload.cc	Sat Nov 30 15:15:34 2013 +0200
     1.2 +++ b/src/assload.cc	Sat Nov 30 20:52:21 2013 +0200
     1.3 @@ -12,8 +12,10 @@
     1.4  #include "assimp/postprocess.h"
     1.5  #include "texman.h"
     1.6  #include "material.h"
     1.7 +#include "scene.h"
     1.8  
     1.9  using namespace std;
    1.10 +using namespace goatgfx;
    1.11  
    1.12  static bool load_material(Material *mat, const aiMaterial *aimat);
    1.13  static Object *load_node(const aiScene *aiscn, const aiNode *ainode);
    1.14 @@ -428,6 +430,8 @@
    1.15  
    1.16  #else	// !defined USE_ASSIMP
    1.17  
    1.18 +using namespace goatgfx;
    1.19 +
    1.20  bool load_ass(Scene *scn, const char *fname)
    1.21  {
    1.22  	error_log("load_ass: assimp support not compiled in\n");