v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Obj-loader: change include brackets.

pull/612/head
Kim Kulling 2015-07-10 01:21:10 +02:00
parent 891c17ee7b
commit 14a849b398
8 changed files with 35 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/ObjExporter.cpp
View File

@ -44,15 +44,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER #ifndef ASSIMP_BUILD_NO_OBJ_EXPORTER
#include "ObjExporter.h" #include "ObjExporter.h"
#include "../include/assimp/version.h"
#include "../include/assimp/IOSystem.hpp"
#include "../include/assimp/Exporter.hpp"
#include <boost/scoped_ptr.hpp>
#include "Exceptional.h" #include "Exceptional.h"
#include "../include/assimp/material.h"
#include "../include/assimp/scene.h"
#include "StringComparison.h" #include "StringComparison.h"
#include <assimp/version.h>
#include <assimp/IOSystem.hpp>
#include <assimp/Exporter.hpp>
#include <assimp/material.h>
#include <assimp/scene.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/scoped_ptr.hpp>
using namespace Assimp; using namespace Assimp;

2
code/ObjExporter.h
View File

@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_OBJEXPORTER_H_INC #ifndef AI_OBJEXPORTER_H_INC
#define AI_OBJEXPORTER_H_INC #define AI_OBJEXPORTER_H_INC
#include "../include/assimp/types.h" #include <assimp/types.h>
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <map> #include <map>

11
code/ObjFileData.h
View File

@ -43,15 +43,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include <map> #include <map>
#include "../include/assimp/types.h" #include <assimp/types.h>
#include "../include/assimp/mesh.h" #include <assimp/mesh.h>
namespace Assimp namespace Assimp {
{ namespace ObjFile {
namespace ObjFile
{
// ------------------------------------------------------------------------------------------------
struct Object; struct Object;
struct Face; struct Face;
struct Material; struct Material;

8
code/ObjFileImporter.cpp
View File

@ -47,10 +47,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ObjFileParser.h" #include "ObjFileParser.h"
#include "ObjFileData.h" #include "ObjFileData.h"
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
#include "../include/assimp/Importer.hpp" #include <assimp/Importer.hpp>
#include "../include/assimp/scene.h" #include <assimp/scene.h>
#include "../include/assimp/ai_assert.h" #include <assimp/ai_assert.h>
#include "../include/assimp/DefaultLogger.hpp" #include <assimp/DefaultLogger.hpp>
static const aiImporterDesc desc = { static const aiImporterDesc desc = {

4
code/ObjFileMtlImporter.cpp
View File

@ -48,8 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ObjFileData.h" #include "ObjFileData.h"
#include "fast_atof.h" #include "fast_atof.h"
#include "ParsingUtils.h" #include "ParsingUtils.h"
#include "../include/assimp/material.h" #include <assimp/material.h>
#include "../include/assimp/DefaultLogger.hpp" #include <assimp/DefaultLogger.hpp>
namespace Assimp { namespace Assimp {

11
code/ObjFileMtlImporter.h
View File

@ -44,14 +44,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
struct aiColor3D; struct aiColor3D;
namespace Assimp namespace Assimp {
{
namespace ObjFile
{
struct Model;
struct Material;
namespace ObjFile {
struct Model;
struct Material;
} }

7
code/ObjFileParser.cpp
View File

@ -47,12 +47,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "ObjTools.h" #include "ObjTools.h"
#include "ObjFileData.h" #include "ObjFileData.h"
#include "ParsingUtils.h" #include "ParsingUtils.h"
#include "../include/assimp/types.h"
#include "DefaultIOSystem.h" #include "DefaultIOSystem.h"
#include "BaseImporter.h" #include "BaseImporter.h"
#include "../include/assimp/DefaultLogger.hpp" #include <assimp/DefaultLogger.hpp>
#include "../include/assimp/material.h" #include <assimp/material.h>
#include "../include/assimp/Importer.hpp" #include <assimp/Importer.hpp>
#include <cstdlib> #include <cstdlib>

23
code/ObjFileParser.h
View File

@ -43,21 +43,20 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <vector> #include <vector>
#include <string> #include <string>
#include <map> #include <map>
#include "../include/assimp/vector2.h" #include <assimp/vector2.h>
#include "../include/assimp/vector3.h" #include <assimp/vector3.h>
#include "../include/assimp/mesh.h" #include <assimp/mesh.h>
namespace Assimp namespace Assimp {
{
namespace ObjFile namespace ObjFile {
{ struct Model;
struct Model; struct Object;
struct Object; struct Material;
struct Material; struct Point3;
struct Point3; struct Point2;
struct Point2;
} }
class ObjFileImporter; class ObjFileImporter;
class IOSystem; class IOSystem;