X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=include%2Fibrush.h;h=ddc825596c7da5c900e8d9bb1e1891fbd3be829c;hb=8a61657fc4486b5bb14c9b60a2b5a4ef926f9c2c;hp=187ebcc4a02e7b2284b855616a192a0cb8663356;hpb=6ee91d153ea09f2dafa62ed2f022f4183c090168;p=xonotic%2Fnetradiant.git diff --git a/include/ibrush.h b/include/ibrush.h index 187ebcc4..ddc82559 100644 --- a/include/ibrush.h +++ b/include/ibrush.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "generic/constant.h" #include "generic/callback.h" -#include "math/vector.h" +#include "generic/vector.h" #include "itexdef.h" namespace scene @@ -83,7 +83,7 @@ public: class _QERFaceData { public: - _QERFaceData() : contents(0), flags(0), value(0), m_shader("") + _QERFaceData() : m_shader(""), contents(0), flags(0), value(0) { } Vector3 m_p0; @@ -105,8 +105,8 @@ public: STRING_CONSTANT(Name, "brush"); virtual scene::Node& createBrush() = 0; virtual bool useAlternativeTextureProjection() const = 0; - virtual void forEachBrushFace(scene::Node& brush, const BrushFaceDataCallback& callback) = 0; - virtual bool addBrushFace(scene::Node& brush, const _QERFaceData& faceData) = 0; + virtual void Brush_forEachFace(scene::Node& brush, const BrushFaceDataCallback& callback) = 0; + virtual bool Brush_addFace(scene::Node& brush, const _QERFaceData& faceData) = 0; }; #include "modulesystem.h"