marked some functions as [deprecated]

diff --git a/Weave/Game.h b/Weave/Game.h
index 732ad768409c523eb503eac4a9ee64d87580866b..ee6b8c52ce4487f2fda4c118685d64604cdf3be6 100644 (file)
--- a/Weave/Game.h
+++ b/Weave/Game.h
@@ -33,7 +33,6 @@ private:
        map<int,Drawable*> layer;
        //Player player1;
 
-
        void update(float);
        void draw() const;
        //bool import(const string &path, Scene *scene, Shader* shader);

diff --git a/Weave/Graphix/Model.h b/Weave/Graphix/Model.h
index 82bb41ef1213ae2bb239b16ebb58ac2bbabc9b72..cdf6c91d351c6d3d6882e7d90a1da1e0d53d9aa9 100644 (file)
--- a/Weave/Graphix/Model.h
+++ b/Weave/Graphix/Model.h
@@ -18,6 +18,7 @@ struct aiMesh;
 class Model
 {
 public:
+       __declspec(deprecated)
        Model(const string& modelpath, unsigned int index=0);
        Model(const aiMesh* mesh);
        Model(unsigned int numvertices, unsigned int numfaces, float *vertex, float *uvs, float *normals, unsigned int *index);
@@ -25,9 +26,12 @@ public:
        virtual ~Model();
 
 //     void useModel(Shader* shader);
+
        void useModel(Shader* shader) const;
        void useTexture(Texture* texture, Shader* shader) const;
        void useMMatrix(const mat4& model,Shader* shader) const;
+
+       __declspec(deprecated)
        void drawModel() const;
        void drawModel(Shader* _shader, Texture* texture, const mat4& model) const;
        unsigned int bindShader(Shader* shader);
@@ -37,7 +41,7 @@ private:
        unsigned int vertexBuffer, normalBuffer, uvBuffer, indexBuffer;
 
        int2int_map shader_map;
-
+       __declspec(deprecated)
        bool import(const string& path, unsigned int& numvertices, unsigned int& numfaces, float*& vertex, float*& uvs, float*& normals, unsigned int*& index, unsigned int mindex = 0);
        bool import(const aiMesh* mesh, unsigned int& numvertices, unsigned int& numfaces, float*& vertex, float*& uvs, float*& normals, unsigned int*& index);
 

diff --git a/Weave/Graphix/Scene.h b/Weave/Graphix/Scene.h
index 1556ee11ded8d30081828f2be6d55ddec0bcba41..0d623c6c33b1a4784e0a3e6d23f78e374456570f 100644 (file)
--- a/Weave/Graphix/Scene.h
+++ b/Weave/Graphix/Scene.h
@@ -19,7 +19,9 @@ class Scene :
 public:
        //Scene();
        Scene(unsigned int x, unsigned int y, unsigned int width, unsigned int height, float fovy, float zNear, float zFar, vec3 pos, SceneObject* lookat = NULL);
+       __declspec(deprecated)
        Scene(Scene*);
+       __declspec(deprecated)
        Scene(Scene* _Scene, unsigned int x, unsigned int y, unsigned int width, unsigned int height, float fovy, float zNear, float zFar, vec3 pos, SceneObject* lookat = NULL);
        virtual ~Scene();
 

diff --git a/Weave/Graphix/SceneObject.h b/Weave/Graphix/SceneObject.h
index 89b815c18d76861747b76ffd05fc4a8d7e8ab276..6f80285facdd2592ae95005957cacf92880aa95e 100644 (file)
--- a/Weave/Graphix/SceneObject.h
+++ b/Weave/Graphix/SceneObject.h
@@ -34,7 +34,9 @@ public:
 
        virtual vec3 getPosition() const;
 
+       __declspec(deprecated)
        virtual void setModel(mat4&);
+       __declspec(deprecated)
        virtual void turn(float angle, vec3& axis);
        virtual void turnTo(vec3& direction, float speed = 1);
        virtual void move(vec3& dist);
@@ -47,7 +49,9 @@ public:
 
        Shader* getShader();
 
+       __declspec(deprecated)
        void setEnemy(bool isenemy);
+       __declspec(deprecated)
        bool isEnemy();
 
 protected:
@@ -55,6 +59,7 @@ protected:
        void setMatter(float);
 
        mat4 model;
+       __declspec(deprecated)
        unsigned int modelID;
 
        Shader* shader;