X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fmesh.cpp;h=c5e73ebd2afd625cda3d1d4041e8b7bd03145ed5;hp=05be2c3745b8562b32f9c9b5a69e722fb4af5058;hb=f14435e58bfa0fa697a06ba9a454bb30cd37d9d8;hpb=25c81b4953dd38993250321b9407ce8b0139cbeb

diff --git a/source/mesh.cpp b/source/mesh.cpp
index 05be2c37..c5e73ebd 100644
--- a/source/mesh.cpp
+++ b/source/mesh.cpp
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007-2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include "buffer.h"
 #include "extension.h"
 #include "mesh.h"
@@ -18,13 +11,15 @@ namespace GL {
 Mesh::Mesh():
 	vertices(VERTEX3),
 	ibuf(0),
-	defer_ibuf(true)
+	defer_ibuf(true),
+	winding(0)
 { }
 
 Mesh::Mesh(const VertexFormat &f):
 	vertices(f),
 	ibuf(0),
-	defer_ibuf(true)
+	defer_ibuf(true),
+	winding(0)
 { }
 
 Mesh::~Mesh()
@@ -94,12 +89,18 @@ void Mesh::add_batch(const Batch &b)
 	}
 }
 
+void Mesh::set_winding(const WindingTest *w)
+{
+	winding = w;
+}
+
 void Mesh::draw() const
 {
 	vertices.apply();
 
 	if(ibuf)
 		ibuf->bind_to(ELEMENT_ARRAY_BUFFER);
+	Bind bind_winding(winding);
 
 	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
 		i->draw();
@@ -112,17 +113,21 @@ void Mesh::draw(Renderer &renderer) const
 {
 	renderer.set_vertex_array(&vertices);
 	renderer.set_element_buffer(ibuf);
+	renderer.set_winding_test(winding);
 
 	for(list<Batch>::const_iterator i=batches.begin(); i!=batches.end(); ++i)
 		renderer.draw(*i);
+
+	renderer.set_winding_test(0);
 }
 
 
 Mesh::Loader::Loader(Mesh &m):
 	DataFile::ObjectLoader<Mesh>(m)
 {
-	add("vertices", &Loader::vertices);
 	add("batch",    &Loader::batch);
+	add("vertices", &Loader::vertices);
+	add("winding",  &Loader::winding);
 }
 
 void Mesh::Loader::vertices(VertexFormat f)
@@ -138,5 +143,13 @@ void Mesh::Loader::batch(PrimitiveType p)
 	obj.add_batch(btc);
 }
 
+void Mesh::Loader::winding(FaceWinding w)
+{
+	if(w==CLOCKWISE)
+		obj.winding = &WindingTest::clockwise();
+	else if(w==COUNTERCLOCKWISE)
+		obj.winding = &WindingTest::counterclockwise();
+}
+
 } // namespace GL
 } // namespace Msp