X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fclipping.cpp;h=18b706e78b1b34e9205879acd51cf83d10ad9cbb;hb=a275d25eccad43716c5dcf91f8bc4af2a53c0445;hp=3bdeee3ca8b3367624504f9815338f1810c4dcb9;hpb=7aaec9a70b8d7733429bec043f8e33e02956f266;p=libs%2Fgl.git

diff --git a/source/core/clipping.cpp b/source/core/clipping.cpp
index 3bdeee3c..18b706e7 100644
--- a/source/core/clipping.cpp
+++ b/source/core/clipping.cpp
@@ -1,6 +1,8 @@
+#include <msp/core/algorithm.h>
 #include <msp/gl/extensions/msp_clipping.h>
 #include "clipping.h"
 #include "clipplane.h"
+#include "error.h"
 #include "matrix.h"
 #include "misc.h"
 
@@ -16,35 +18,46 @@ unsigned Clipping::get_n_attach_points()
 	return count;
 }
 
-void Clipping::attach(unsigned i, const ClipPlane &p)
+void Clipping::attach(const ClipPlane &p)
 {
-	if(i>=get_n_attach_points())
-		throw out_of_range("Clipping::attach");
-
-	if(i>=planes.size())
-		planes.resize(i+1);
+	if(find_member(planes, &p, &AttachedPlane::plane)!=planes.end())
+		return;
+	if(planes.size()>=get_n_attach_points())
+		throw invalid_operation("Clipping::attach");
 
-	planes[i] = &p;
+	planes.push_back(&p);
 	if(current()==this)
-		glEnable(GL_CLIP_PLANE0+i);
+		glEnable(GL_CLIP_PLANE0+planes.size()-1);
 }
 
-void Clipping::detach(unsigned i)
+void Clipping::detach(const ClipPlane &p)
 {
-	if(i>=planes.size())
-		return;
+	vector<AttachedPlane>::iterator i = find_member(planes, &p, &AttachedPlane::plane);
+	if(i!=planes.end())
+	{
+		planes.erase(i);
+		if(current()==this)
+			disable(GL_CLIP_PLANE0+planes.size());
 
-	planes[i] = 0;
-	if(current()==this)
-		disable(GL_CLIP_PLANE0+i);
+	}
+}
+
+void Clipping::detach(unsigned i)
+{
+	if(i<planes.size())
+		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)
-		if(planes[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
@@ -56,12 +69,7 @@ void Clipping::bind() const
 		return;
 
 	for(unsigned i=0; i<planes.size(); ++i)
-	{
-		if(planes[i])
-			enable(GL_CLIP_PLANE0+i);
-		else
-			disable(GL_CLIP_PLANE0+i);
-	}
+		enable(GL_CLIP_PLANE0+i);
 
 	if(old)
 	{
@@ -77,8 +85,7 @@ void Clipping::unbind()
 		return;
 
 	for(unsigned i=0; i<old->planes.size(); ++i)
-		if(old->planes[i])
-			disable(GL_CLIP_PLANE0+i);
+		disable(GL_CLIP_PLANE0+i);
 }
 
 } // namespace GL