Refinement of includes to help IRIX build

This commit is contained in:
Robert Osfield
2005-05-13 12:06:58 +00:00
parent e82a63ca81
commit 3a4b09940b
2 changed files with 23 additions and 28 deletions

View File

@@ -21,38 +21,33 @@
#include "dxfSectionBase.h"
#include "dxfReader.h"
#include "dxfSection.h"
#include "scene.h"
#include "codeValue.h"
class dxfHeader;
class dxfTables;
class dxfBlocks;
class dxfEntities;
class dxfSection;
class scene;
class dxfBlock;
class dxfFile {
public:
dxfFile(std::string fileName) :
_fileName(fileName),
_isNewSection(false)
{}
bool parseFile();
osg::Group* dxf2osg();
dxfBlock* findBlock(std::string name);
VariableList getVariable(std::string var);
dxfFile(std::string fileName) :
_fileName(fileName),
_isNewSection(false)
{}
bool parseFile();
osg::Group* dxf2osg();
dxfBlock* findBlock(std::string name);
VariableList getVariable(std::string var);
protected:
short assign(codeValue& cv);
std::string _fileName;
bool _isNewSection;
osg::ref_ptr<dxfReader> _reader;
osg::ref_ptr<dxfSection> _current;
osg::ref_ptr<dxfHeader> _header;
osg::ref_ptr<dxfTables> _tables;
osg::ref_ptr<dxfBlocks> _blocks;
osg::ref_ptr<dxfEntities> _entities;
osg::ref_ptr<dxfSection> _unknown;
osg::ref_ptr<scene> _scene;
short assign(codeValue& cv);
std::string _fileName;
bool _isNewSection;
osg::ref_ptr<dxfReader> _reader;
osg::ref_ptr<dxfSection> _current;
osg::ref_ptr<dxfHeader> _header;
osg::ref_ptr<dxfTables> _tables;
osg::ref_ptr<dxfBlocks> _blocks;
osg::ref_ptr<dxfEntities> _entities;
osg::ref_ptr<dxfSection> _unknown;
osg::ref_ptr<scene> _scene;
};

View File

@@ -21,7 +21,6 @@
#include "dxfDataTypes.h"
#include "dxfSectionBase.h"
#include "dxfFile.h"
#include "dxfTable.h"
#include "codeValue.h"
#include "scene.h"
@@ -31,6 +30,7 @@
#include <iostream>
#include <string>
class dxfFile;
class dxfEntity;
class dxfBlock;