X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fclipplane.cpp;h=fe784d256dbe5dfdf3c754fc3add92c458f96fd1;hb=3c0cbf0529aa06d9809ad3aa9e282400e8209b4d;hp=4adf2bf5a45d55b1707b85f40629cd7597189ee7;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git diff --git a/source/core/clipplane.cpp b/source/core/clipplane.cpp index 4adf2bf5..fe784d25 100644 --- a/source/core/clipplane.cpp +++ b/source/core/clipplane.cpp @@ -1,28 +1,29 @@ #include #include "clipplane.h" -#include "gl.h" -#include "matrix.h" -#include "misc.h" #include "programdata.h" namespace Msp { namespace GL { ClipPlane::ClipPlane(): - eq(0, 0, 0, 1) + eq(0, 0, 0, 1), + generation(0) { } ClipPlane::ClipPlane(const Vector4 &e): - eq(e) + eq(e), + generation(0) { } ClipPlane::ClipPlane(const Vector3 &p, const Vector3 &d): - eq(compose(d, -dot(p, d))) + eq(compose(d, -dot(p, d))), + generation(0) { } void ClipPlane::set_equation(const Vector4 &e) { eq = e; + ++generation; } void ClipPlane::set_plane(const Vector3 &p, const Vector3 &d) @@ -31,9 +32,9 @@ void ClipPlane::set_plane(const Vector3 &p, const Vector3 &d) set_equation(compose(nd, -dot(p, nd))); } -void ClipPlane::update_shader_data(ProgramData &shdata, const Matrix &view_inverse, unsigned i) const +void ClipPlane::update_shader_data(ProgramData &shdata, unsigned i) const { - shdata.uniform(format("clip_planes[%d].equation", i), eq*view_inverse); + shdata.uniform(format("clip_planes[%d].equation", i), eq); } } // namespace GL