mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-11 02:43:57 +02:00
Code Issues Projects Releases Wiki Activity

Start to abstract model

Browse Source
This commit is contained in:
Will
2013-12-05 16:17:41 +01:00
parent bf1c7df8bb
commit 6afadafa1e
22 changed files with 123 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/shared_lib/include/graphics/gl/graphics_factory_basic_gl.h
View File

@@ -33,7 +33,7 @@ public:
virtual TextRenderer3D *newTextRenderer3D() {return new TextRenderer3DGl();}
virtual ModelRenderer *newModelRenderer() {return new ModelRendererGl();}
virtual Context *newContext() {return new ContextGl();}
virtual Model *newModel() {return new ModelGl();}
virtual Model *newModel(const string &path,bool deletePixMapAfterLoad,std::map<string,vector<pair<string, string> > > *loadedFileList, string *sourceLoader) { return new ModelGl(path,deletePixMapAfterLoad,loadedFileList,sourceLoader); }
virtual Texture2D *newTexture2D() {return new Texture2DGl();}
virtual Font2D *newFont2D() {return new Font2DGl();}
virtual Font3D *newFont3D() {return new Font3DGl();}

2
source/shared_lib/include/graphics/gl/graphics_factory_gl.h
View File

@@ -47,7 +47,7 @@ public:
//models
virtual ModelManager *newModelManager() {return new ModelManager();}
virtual ModelRenderer *newModelRenderer() {return new ModelRendererGl();}
virtual Model *newModel() {return new ModelGl();}
virtual Model *newModel(const string &path,bool deletePixMapAfterLoad,std::map<string,vector<pair<string, string> > > *loadedFileList, string *sourceLoader) { return new ModelGl(path,deletePixMapAfterLoad,loadedFileList,sourceLoader); }
//text
virtual FontManager *newFontManager() {return new FontManager();}

3
source/shared_lib/include/graphics/gl/model_gl.h
View File

@@ -22,6 +22,9 @@ namespace Shared{ namespace Graphics{ namespace Gl{
// =====================================================
class ModelGl: public Model{
friend class GraphicsFactoryGl;
protected:
ModelGl(const string &path,bool deletePixMapAfterLoad,std::map<string,vector<pair<string, string> > > *loadedFileList, string *sourceLoader);
public:
virtual void init(){}
virtual void end(){}

7
source/shared_lib/include/graphics/graphics_factory.h
View File

@@ -13,6 +13,11 @@
#define _SHARED_GRAPHICS_GRAPHICSFACTORY_H_
#include <cstdlib>
#include <string>
#include <map>
#include <vector>
using std::string;
#include "leak_dumper.h"
namespace Shared{ namespace Graphics{
@@ -64,7 +69,7 @@ public:
//models
virtual ModelManager *newModelManager() {return NULL;}
virtual ModelRenderer *newModelRenderer() {return NULL;}
virtual Model *newModel() {return NULL;}
virtual Model *newModel(const string &path,bool deletePixMapAfterLoad,std::map<string,std::vector<std::pair<string, string> > > *loadedFileList, string *sourceLoader) {return NULL;}
//text
virtual FontManager *newFontManager() {return NULL;}

2
source/shared_lib/include/graphics/graphics_interface.h
View File

@@ -35,7 +35,7 @@ enum ResourceScope {
class RendererInterface {
public:
virtual Texture2D *newTexture2D(ResourceScope rs) = 0;
virtual Model *newModel(ResourceScope rs) = 0;
virtual Model *newModel(ResourceScope rs,const string &path,bool deletePixMapAfterLoad=false,std::map<string,vector<pair<string, string> > > *loadedFileList=NULL, string *sourceLoader=NULL) = 0;
virtual ~RendererInterface() {}
};

7
source/shared_lib/include/graphics/model.h
View File

@@ -221,9 +221,7 @@ public:
uint32 getVertexCount() const;
//io
void load(const string &path,bool deletePixMapAfterLoad=false,std::map<string,vector<pair<string, string> > > *loadedFileList=NULL, string *sourceLoader=NULL);
void save(const string &path, string convertTextureToFormat,bool keepsmallest);
void loadG3d(const string &path,bool deletePixMapAfterLoad=false,std::map<string,vector<pair<string, string> > > *loadedFileList=NULL, string sourceLoader="");
void saveG3d(const string &path, string convertTextureToFormat,bool keepsmallest);
void setTextureManager(TextureManager *textureManager) {this->textureManager= textureManager;}
@@ -234,6 +232,11 @@ public:
void toEndian();
void fromEndian();
protected:
void load(const string &path,bool deletePixMapAfterLoad=false,std::map<string,vector<pair<string, string> > > *loadedFileList=NULL, string *sourceLoader=NULL);
void loadG3d(const string &path,bool deletePixMapAfterLoad=false,std::map<string,vector<pair<string, string> > > *loadedFileList=NULL, string sourceLoader="");
private:
void buildInterpolationData() const;
void autoJoinMeshFrames();

2
source/shared_lib/include/graphics/model_manager.h
View File

@@ -38,7 +38,7 @@ public:
ModelManager();
virtual ~ModelManager();
Model *newModel();
Model *newModel(const string &path,bool deletePixMapAfterLoad,std::map<string,vector<pair<string, string> > > *loadedFileList, string *sourceLoader);
void init();
void end();