X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fclipping.cpp;h=644a2434c6b783bda0f806012f23e841e9acd5b8;hb=2d3113a7dbbe4be2f1d1e8980c1c4e42175163da;hp=c286b7e57677e7880a56908e3dda0f3ff90a15be;hpb=a77629d781eeb789870470c5ebdbd4b691e1b138;p=libs%2Fgl.git

diff --git a/source/core/clipping.cpp b/source/core/clipping.cpp
index c286b7e5..644a2434 100644
--- a/source/core/clipping.cpp
+++ b/source/core/clipping.cpp
@@ -2,6 +2,7 @@
 #include <msp/gl/extensions/msp_clipping.h>
 #include "clipping.h"
 #include "clipplane.h"
+#include "deviceinfo.h"
 #include "error.h"
 #include "matrix.h"
 #include "misc.h"
@@ -13,16 +14,14 @@ namespace GL {
 
 unsigned Clipping::get_n_attach_points()
 {
-	static Require _req(MSP_clipping);
-	static int count = get_i(GL_MAX_CLIP_PLANES);
-	return count;
+	return Limits::get_global().max_clip_planes;
 }
 
 void Clipping::attach(const ClipPlane &p)
 {
-	if(find(planes, &p)!=planes.end())
+	if(find_member(planes, &p, &AttachedPlane::plane)!=planes.end())
 		return;
-	if(planes.size()>=get_n_attach_points())
+	if(planes.size()>=Limits::get_global().max_clip_planes)
 		throw invalid_operation("Clipping::attach");
 
 	planes.push_back(&p);
@@ -32,7 +31,7 @@ void Clipping::attach(const ClipPlane &p)
 
 void Clipping::detach(const ClipPlane &p)
 {
-	vector<const ClipPlane *>::iterator i = find(planes, &p);
+	vector<AttachedPlane>::iterator i = find_member(planes, &p, &AttachedPlane::plane);
 	if(i!=planes.end())
 	{
 		planes.erase(i);
@@ -45,14 +44,19 @@ void Clipping::detach(const ClipPlane &p)
 void Clipping::detach(unsigned i)
 {
 	if(i<planes.size())
-		detach(*planes[i]);
+		detach(*planes[i].plane);
 }
 
-void Clipping::update_shader_data(ProgramData &shdata, const Matrix &view_matrix) const
+const ProgramData &Clipping::get_shader_data() const
 {
-	Matrix view_inverse = invert(view_matrix);
 	for(unsigned i=0; i<planes.size(); ++i)
-		planes[i]->update_shader_data(shdata, view_inverse, i);
+		if(planes[i].plane->get_generation()!=planes[i].generation)
+		{
+			planes[i].plane->update_shader_data(shdata, i);
+			planes[i].generation = planes[i].plane->get_generation();
+		}
+
+	return shdata;
 }
 
 void Clipping::bind() const