[cig-commits] commit: in lucSwarmSquares

[Mercurial]

changeset:   36:e5aa30342775
user:        RobertTurnbull
date:        Mon Oct 29 05:12:58 2007 +0000
files:       DrawingObjects/src/SwarmSquares.c DrawingObjects/tests/expected/testSwarmSquares2D.0of1.OpenGL.0.txt.expected DrawingObjects/tests/expected/testSwarmSquares3D.0of1.OpenGL.0.txt.expected
description:
in lucSwarmSquares
	Moving call to glEnable(GL_BLEND) to the BuildingDisplayList function from the PlotParticle function so that this function isn't called for every particle that is being plotted.
	Fixing the tests for the testSwarmSquares in serial now.

The only tests in the Drawing Objects that don't work now are for SwarmViewer objects (and children) in parallel
	I'm going to work on these now


diff -r 71d131292bb9 -r e5aa30342775 DrawingObjects/src/SwarmSquares.c
--- a/DrawingObjects/src/SwarmSquares.c	Mon Oct 29 05:00:51 2007 +0000
+++ b/DrawingObjects/src/SwarmSquares.c	Mon Oct 29 05:12:58 2007 +0000
@@ -39,7 +39,7 @@
 *+		Patrick Sunter
 *+		Greg Watson
 *+
-** $Id: SwarmSquares.c 740 2007-10-11 08:05:31Z SteveQuenette $
+** $Id: SwarmSquares.c 748 2007-10-29 05:12:58Z RobertTurnbull $
 ** 
 **~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 
@@ -275,6 +275,7 @@ void _lucSwarmSquares_BuildDisplayList( 
 		This isn't so great either ... it's hard to overlay darker colours on 
 		light with this choice of blending.
 	 */
+	glEnable(GL_BLEND);
 	
 	
 	_lucSwarmViewerBase_BuildDisplayList( self, _context );
@@ -298,7 +299,6 @@ void _lucSwarmSquares_PlotParticle( void
 	if ( lengthVariable )
 		SwarmVariable_ValueAt( lengthVariable, lParticle_I, &length );
 
-	glEnable(GL_BLEND);
 	
 	/*  The fat square has a pizza box shape ... i.e. edges and two faces 
 		which have opposite normals */
diff -r 71d131292bb9 -r e5aa30342775 DrawingObjects/tests/expected/testSwarmSquares2D.0of1.OpenGL.0.txt.expected
--- a/DrawingObjects/tests/expected/testSwarmSquares2D.0of1.OpenGL.0.txt.expected	Mon Oct 29 05:00:51 2007 +0000
+++ b/DrawingObjects/tests/expected/testSwarmSquares2D.0of1.OpenGL.0.txt.expected	Mon Oct 29 05:12:58 2007 +0000
@@ -37,6 +37,7 @@ glEnable( 16384 );
 glEnable( 16384 );
 glGenLists( 1 );
 glNewList( 0, 4864 );
+	glEnable( 3042 );
 	glColor4f( 0, 1, 0, 1 );
 	glDisable( 2896 );
 	glBegin( 1 );
diff -r 71d131292bb9 -r e5aa30342775 DrawingObjects/tests/expected/testSwarmSquares3D.0of1.OpenGL.0.txt.expected
--- a/DrawingObjects/tests/expected/testSwarmSquares3D.0of1.OpenGL.0.txt.expected	Mon Oct 29 05:00:51 2007 +0000
+++ b/DrawingObjects/tests/expected/testSwarmSquares3D.0of1.OpenGL.0.txt.expected	Mon Oct 29 05:12:58 2007 +0000
@@ -37,6 +37,7 @@ glEnable( 16384 );
 glEnable( 16384 );
 glGenLists( 1 );
 glNewList( 0, 4864 );
+	glEnable( 3042 );
 	glColor4f( 0, 1, 0, 1 );
 	glBegin( 7 );
 		glNormal3d( -0, -0, -0 );