remove FileLoader from PhyObj

This commit is contained in:
Josh Holtrop committed 2011-05-19 22:30:58 -04:00
1 parent e40a79435d
commit 89d98be780
2 files changed
+3 -7

No files matched your search

+2 -5
View File
@@ -41,12 +41,9 @@ PhyObj::Geom::Geom(PhyObj::GeomType type, refptr< vector<float> > args)
/********** PhyObj functions **********/
void PhyObj::load(FileLoader * fileLoader, const FileLoader::Path & path)
void PhyObj::load(unsigned char *data, unsigned int size)
{
FileLoader::Buffer buff = fileLoader->load(path);
if (buff.size <= 0)
return;
string str(buff.data, buff.size);
string str((char *) data, size);
stringstream istr(str, ios_base::in);
while (!istr.eof())
{
+1 -2
View File
@@ -3,7 +3,6 @@
#define PHYOBJ_H
#include "refptr/refptr.h"
#include "FileLoader/FileLoader.h"
#include <vector>
class PhyObj
@@ -29,7 +28,7 @@ class PhyObj
};
/* Methods */
void load(FileLoader * fileLoader, const FileLoader::Path & path);
void load(unsigned char *data, unsigned int size);
size_t getNumGeoms() { return m_geoms.size(); }
refptr<Geom> getGeom(int i) { return m_geoms[i]; }