From: Peter Schaefer <schaeferpm@gmail.com>
Date: Tue, 14 Apr 2015 23:24:52 +0000 (+0200)
Subject: marked some functions as [deprecated]
X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=e7d4f62ad0e470a6a4f97042c69b8b8a4c4c1fdb;p=cgue_weave.git

marked some functions as [deprecated]
---

diff --git a/Weave/Game.h b/Weave/Game.h
index 732ad76..ee6b8c5 100644
--- 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 82bb41e..cdf6c91 100644
--- 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 1556ee1..0d623c6 100644
--- 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 89b815c..6f80285 100644
--- 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;