[cig-commits] r3970 - in long/3D/Gale/trunk/src/gLucifer: .
DrawingObjects/src
walter at geodynamics.org
walter at geodynamics.org
Thu Jul 6 02:11:53 PDT 2006
Author: walter
Date: 2006-07-06 02:11:53 -0700 (Thu, 06 Jul 2006)
New Revision: 3970
Modified:
long/3D/Gale/trunk/src/gLucifer/
long/3D/Gale/trunk/src/gLucifer/DrawingObjects/src/SwarmViewer.c
Log:
r52 at earth (orig r587): WendySharples | 2006-06-27 22:26:37 -0700
this allows the swarm to visualise gauss points as well as material points
Rob and Wendy
Property changes on: long/3D/Gale/trunk/src/gLucifer
___________________________________________________________________
Name: svk:merge
- 3433ad49-13df-0310-980d-a6a68cf0952a:/trunk:586
d11c8794-cf10-0410-8271-cb625e597d60:/cig:218
+ 3433ad49-13df-0310-980d-a6a68cf0952a:/trunk:587
d11c8794-cf10-0410-8271-cb625e597d60:/cig:218
Modified: long/3D/Gale/trunk/src/gLucifer/DrawingObjects/src/SwarmViewer.c
===================================================================
--- long/3D/Gale/trunk/src/gLucifer/DrawingObjects/src/SwarmViewer.c 2006-07-06 09:11:17 UTC (rev 3969)
+++ long/3D/Gale/trunk/src/gLucifer/DrawingObjects/src/SwarmViewer.c 2006-07-06 09:11:53 UTC (rev 3970)
@@ -208,9 +208,11 @@
_lucOpenGLDrawingObject_Construct( self, cf );
swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", Swarm, True ) ;
-
+
+ /* This drawing object will only work for swarms with Global Particle Layouts
+ * HACK - Adding in check for Gauss particle Layout here because this can be global too */
Journal_Firewall(
- swarm->particleLayout->coordSystem == GlobalCoordSystem,
+ swarm->particleLayout->coordSystem == GlobalCoordSystem || Stg_Class_IsInstance( swarm->particleLayout, GaussParticleLayout_Type ),
Journal_MyStream( Error_Type, self ),
"In func %s, unable to visualise swarm %s because it uses a local coord system layout %s of type %s.\n",
__func__,
More information about the cig-commits
mailing list