Merge branch 'q3map2help' into 'master'

[xonotic/netradiant.git] / include / irender.h

diff --git a/include/irender.h b/include/irender.h
index 5199454287cb9081797c61cfddc7a96461df0baf..169d881a9c59e0c1cadcc8f85d291edb64e5fc16 100644 (file)
--- a/include/irender.h
+++ b/include/irender.h
@@ -23,7 +23,7 @@
 #define INCLUDED_IRENDER_H
 
 #include "generic/constant.h"
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 
 
 // Rendering states to sort by.
@@ -88,9 +88,9 @@ virtual void clearLights(){
 };
 
 class Renderable;
-typedef Callback1<const Renderable&> RenderableCallback;
+typedef Callback<void(const Renderable&)> RenderableCallback;
 
-typedef Callback1<const RendererLight&> RendererLightCallback;
+typedef Callback<void(const RendererLight&)> RendererLightCallback;
 
 class LightList
 {
@@ -107,6 +107,7 @@ const int c_attr_Binormal = 4;
 class OpenGLRenderable
 {
 public:
+virtual ~OpenGLRenderable() = default;
 virtual void render( RenderStateFlags state ) const = 0;
 };
 
@@ -119,6 +120,7 @@ class ModuleObserver;
 class Shader
 {
 public:
+virtual ~Shader() = default;
 virtual void addRenderable( const OpenGLRenderable& renderable, const Matrix4& modelview, const LightList* lights = 0 ) = 0;
 virtual void incrementUsed() = 0;
 virtual void decrementUsed() = 0;