added noncopyable

include/lol/Camera.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
 #include <memory>
-#include "Transformable.hpp"
-#include "Drawable.hpp"
+#include <lol/Transformable.hpp>
+#include <lol/Drawable.hpp>
 
 namespace lol
 {

include/lol/Drawable.hpp

@@ -1,8 +1,9 @@
 #pragma once
 
 #include <glad/glad.h>
-#include "VertexArrayObject.hpp"
-#include "Shader.hpp"
+
+#include <lol/NonCopyable.hpp>
+#include <lol/Shader.hpp>
 
 namespace lol
 {
@@ -23,9 +24,6 @@ namespace lol
 	class Drawable
 	{
 	public:
-		Drawable(const Drawable& other) = delete;
-		void operator=(const Drawable& other) = delete;
-
 		virtual void PreRender(const CameraBase& camera) const { };
 		void Draw(const CameraBase& camera) const;
 		void SetPrimitiveType(PrimitiveType type);

include/lol/ObjectManager.hpp

@@ -18,7 +18,7 @@ namespace lol
 	 * exist.
 	 */
 	template<typename Type>
-	class ObjectManager
+	class ObjectManager : public NonCopyable
 	{
 	public:
 		static ObjectManager<Type>& GetInstance()
@@ -27,10 +27,6 @@ namespace lol
 			return instance;
 		}
 
-	public:
-		ObjectManager(const ObjectManager<Type>&) = delete;
-		void operator=(const ObjectManager<Type>&) = delete;
-
 		/**
 		 * Add new (existing) object to manager
 		 */

include/lol/Shader.hpp

@@ -6,16 +6,17 @@
 
 #include <glm/glm.hpp>
 
+#include <lol/NonCopyable.hpp>
+
 namespace lol
 {
 
-	class AbstractShader
+	class AbstractShader : public NonCopyable
 	{
 		friend class ShaderFactory;
 
 	public:
 		AbstractShader(const std::string& vertexShader, const std::string& fragmentShader);
-		AbstractShader(const AbstractShader& other) = delete;
 		~AbstractShader();
 
 		inline bool Good() { return id != 0; }

include/lol/VertexArrayObject.hpp

@@ -3,6 +3,8 @@
 #include <vector>
 #include <memory>
 
+#include <lol/NonCopyable.hpp>
+
 namespace lol
 {
 
@@ -13,7 +15,7 @@ namespace lol
 		unsigned int	type;
 		bool			normalized;
 		unsigned int	stride;
-		const void* pointer;
+		const void*		pointer;
 	};
 
 	// Useful abbreviations
@@ -28,7 +30,7 @@ namespace lol
 	};
 
 	// VAO structure that sets up the buffers and deletes them at the end of the lifecycle
-	class AbstractVertexArrayObject
+	class AbstractVertexArrayObject : public NonCopyable
 	{
 		friend class VAOFactory;