[cig-commits] commit: Cleaned-up a lot of compile-warnings.
Mercurial
hg at geodynamics.org
Fri Feb 5 13:00:21 PST 2010
changeset: 211:212686600a1a
branch: 1.4.x
parent: 196:0ac3c6fb046d
user: JericoRevote
date: Thu Jan 14 17:41:43 2010 +1100
files: Base/src/Camera.c Base/src/ColourMap.c Base/src/CrossSection.c Base/src/DrawingObject.c Base/src/Finalise.c Base/src/Init.c Base/src/InputFormat.c Base/src/InputFormat_Register.c Base/src/Light.c Base/src/OutputFormat.c Base/src/RenderingEngine.c Base/src/Viewport.c Base/src/Window.c Base/src/WindowInteraction.c Base/tests/plugins/Others/lucTestColourMaps.c Base/tests/plugins/Others/lucTestPlottingObjects.c Base/tests/plugins/RenderingEngineTest.c Base/tests/plugins/lucTestCameras.c Base/tests/plugins/lucTestColourMaps.c DrawingObjects/src/Axis.c DrawingObjects/src/ColourBar.c DrawingObjects/src/Contour.c DrawingObjects/src/EigenvectorsCrossSection.c DrawingObjects/src/FeVariableSurface.c DrawingObjects/src/FieldVariableBorder.c DrawingObjects/src/Finalise.c DrawingObjects/src/HistoricalSwarmTrajectory.c DrawingObjects/src/Init.c DrawingObjects/src/Isosurface.c DrawingObjects/src/MeshViewer.c DrawingObjects/src/ScalarField.c DrawingObjects/src/ScalarFieldCrossSection.c DrawingObjects/src/ScalarFieldOnMesh.c DrawingObjects/src/ScalarFieldOnMeshCrossSection.c DrawingObjects/src/SwarmRGBColourViewer.c DrawingObjects/src/SwarmSquares.c DrawingObjects/src/SwarmVectors.c DrawingObjects/src/SwarmViewer.c DrawingObjects/src/SwarmViewerBase.c DrawingObjects/src/TextureMap.c DrawingObjects/src/TimeStep.c DrawingObjects/src/Title.c DrawingObjects/src/VectorArrowCrossSection.c DrawingObjects/tests/DummyFieldVariable/DummyFieldVariable.c DrawingObjects/tests/DummySwarmVariable/DummySwarmVariable.c DrawingObjects/tests/testDrawingObject.c InputFormats/src/Finalise.c InputFormats/src/Init.c InputFormats/tests/plugins/lucTestInputFormat.c OutputFormats/src/EncoderLibavcodec.c OutputFormats/src/EncoderLibfame.c OutputFormats/src/Finalise.c OutputFormats/src/Init.c OutputFormats/src/OutputJPEG.c OutputFormats/src/OutputVECTOR.c RenderingEngines/src/Finalise.c RenderingEngines/src/Init.c RenderingEngines/tests/DummyOpenGL/DummyOpenGL.c RenderingEngines/tests/testRenderingEngineGL.c WindowInteractions/src/Finalise.c WindowInteractions/src/Init.c Windowing/src/CarbonWindow.c Windowing/src/Finalise.c Windowing/src/Init.c Windowing/src/X11Window.c libglucifer/src/Finalise.c libglucifer/src/Init.c plugins/lucPlugin/lucPlugin.c src/main.c
description:
Cleaned-up a lot of compile-warnings.
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/Camera.c
--- a/Base/src/Camera.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/Camera.c Thu Jan 14 17:41:43 2010 +1100
@@ -226,33 +226,33 @@ void _lucCamera_AssignFromXML( void* cam
lucStereoType stereoType;
Name stereoTypeName;
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
#define DTOR 0.0174532925
- focalPoint[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "focalPointX", 0.0 );
- focalPoint[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "focalPointY", 0.0 );
- focalPoint[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "focalPointZ", 0.0 );
+ focalPoint[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"focalPointX", 0.0 );
+ focalPoint[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"focalPointY", 0.0 );
+ focalPoint[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"focalPointZ", 0.0 );
- rotationCentre[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "rotationCentreX", 0.0 );
- rotationCentre[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "rotationCentreY", 0.0 );
- rotationCentre[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "rotationCentreZ", 0.0 );
+ rotationCentre[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"rotationCentreX", 0.0 );
+ rotationCentre[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"rotationCentreY", 0.0 );
+ rotationCentre[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"rotationCentreZ", 0.0 );
- upDirection[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "upDirectionX", 0.0 );
- upDirection[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "upDirectionY", 1.0 );
- upDirection[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "upDirectionZ", 0.0 );
+ upDirection[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"upDirectionX", 0.0 );
+ upDirection[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"upDirectionY", 1.0 );
+ upDirection[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"upDirectionZ", 0.0 );
- focalLength = Stg_ComponentFactory_GetDouble( cf, self->name, "focalLength", 0.0 );
+ focalLength = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"focalLength", 0.0 );
- coord[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "coordX", 0.0 );
- coord[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "coordY", 0.0 );
- coord[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "coordZ", 1.0 );
+ coord[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"coordX", 0.0 );
+ coord[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"coordY", 0.0 );
+ coord[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"coordZ", 1.0 );
- aperture = Stg_ComponentFactory_GetDouble( cf, self->name, "aperture", 45.0 );
+ aperture = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"aperture", 45.0 );
/* Get Stereo Type */
- stereoTypeName = Stg_ComponentFactory_GetString( cf, self->name, "stereoType", "lucMono" );
+ stereoTypeName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"stereoType", "lucMono" );
if ( strcasecmp( stereoTypeName, "ToeIn" ) == 0 )
stereoType = lucStereoToeIn;
else if ( strcasecmp( stereoTypeName, "Asymmetric" ) == 0 )
@@ -260,9 +260,9 @@ void _lucCamera_AssignFromXML( void* cam
else
stereoType = lucMono;
- eyeSeparation = Stg_ComponentFactory_GetDouble( cf, self->name, "eyeSeparation", 0.2 );
+ eyeSeparation = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"eyeSeparation", 0.2 );
- centreFieldVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, "CentreFieldVariable", FieldVariable,False,data);
+ centreFieldVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"CentreFieldVariable", FieldVariable, False, data );
_lucCamera_Init( self, coord, focalPoint, rotationCentre, upDirection, focalLength, aperture, eyeSeparation, stereoType, centreFieldVariable );
}
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/ColourMap.c
--- a/Base/src/ColourMap.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/ColourMap.c Thu Jan 14 17:41:43 2010 +1100
@@ -265,22 +265,22 @@ void _lucColourMap_AssignFromXML( void*
void _lucColourMap_AssignFromXML( void* colourMap, Stg_ComponentFactory* cf, void* data ) {
lucColourMap* self = (lucColourMap*) colourMap;
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
_lucColourMap_Init(
self,
- Stg_ComponentFactory_GetString( cf, self->name, "colours", "Blue;White;Red"),
- Stg_ComponentFactory_GetDouble( cf, self->name, "minimum", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "maximum", 1.0 ),
- Stg_ComponentFactory_GetBool( cf, self->name, "logScale", False ),
- Stg_ComponentFactory_GetBool( cf, self->name, "dynamicRange", False ),
- Stg_ComponentFactory_GetBool( cf, self->name, "centreOnFixedValue", False ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "centringValue", 0.0 )
- );
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colours", "Blue;White;Red" ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minimum", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maximum", 1.0 ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"logScale", False ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"dynamicRange", False ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"centreOnFixedValue", False ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"centringValue", 0.0 )
+ );
- self->discrete = Stg_ComponentFactory_GetBool( cf, self->name, "discrete", False );
+ self->discrete = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"discrete", False );
}
void _lucColourMap_Build( void* colourMap, void* data ) { }
@@ -383,7 +383,7 @@ void lucColourMap_SetMinMax( void* colou
void lucColourMap_SetMinMax( void* colourMap, double min, double max ) {
lucColourMap* self = colourMap;
double tolerance = 1e-10;
- Stream* stream = Journal_Register( InfoStream_Type, self->type );
+ Stream* stream = Journal_Register( InfoStream_Type, (Name)self->type );
/* Shift max and min if they are too close */
if (fabs(min - max) < tolerance) {
max += tolerance;
@@ -394,7 +394,7 @@ void lucColourMap_SetMinMax( void* colou
self->minimum = min;
self->maximum = max;
if(self->logScale){
- if(self->minimum <= FLT_MIN ) {
+ if(self->minimum <= FLT_MIN ) {
self->minimum = FLT_MIN;
Journal_DPrintf( stream, "\n WARNING: Field used for logscale colourmap possibly contains non-positive values. \n" );
}
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/CrossSection.c
--- a/Base/src/CrossSection.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/CrossSection.c Thu Jan 14 17:41:43 2010 +1100
@@ -19,7 +19,7 @@ lucCrossSection* lucCrossSection_Read( S
self->interpolate = False;
/* Read the cross section string specification from xml */
- crossSectionStr = Stg_ComponentFactory_GetString( cf, component, "crossSection", "z=min");
+ crossSectionStr = Stg_ComponentFactory_GetString( cf, component, (Dictionary_Entry_Key)"crossSection", "z=min" );
/* axis=value : draw at this exact value on axis
* axis=min : draw at minimum of range on axis
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/DrawingObject.c
--- a/Base/src/DrawingObject.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/DrawingObject.c Thu Jan 14 17:41:43 2010 +1100
@@ -127,11 +127,11 @@ void _lucDrawingObject_AssignFromXML( vo
void _lucDrawingObject_AssignFromXML( void* drawingObject, Stg_ComponentFactory* cf, void* data ) {
lucDrawingObject* self = (lucDrawingObject*) drawingObject ;
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
- _lucDrawingObject_Init( self );
+ _lucDrawingObject_Init( self );
}
void _lucDrawingObject_Build( void* camera, void* data ) { }
@@ -195,10 +195,10 @@ void lucDrawingObjectMask_Construct( luc
void lucDrawingObjectMask_Construct( lucDrawingObjectMask* self, Name drawingObjectName, Stg_ComponentFactory* cf, void* mask ) {
Name maskTypeName;
- self->value = Stg_ComponentFactory_GetDouble( cf, drawingObjectName, "maskValue", 0.0 );
- self->tolerance = Stg_ComponentFactory_GetDouble( cf, drawingObjectName, "maskTolerance", 0.001 );
+ self->value = Stg_ComponentFactory_GetDouble( cf, drawingObjectName, (Dictionary_Entry_Key)"maskValue", 0.0 );
+ self->tolerance = Stg_ComponentFactory_GetDouble( cf, drawingObjectName, (Dictionary_Entry_Key)"maskTolerance", 0.001 );
- maskTypeName = Stg_ComponentFactory_GetString( cf, drawingObjectName, "maskType", "GreaterThan" );
+ maskTypeName = Stg_ComponentFactory_GetString( cf, drawingObjectName, (Dictionary_Entry_Key)"maskType", "GreaterThan" );
if ( strcasecmp( maskTypeName, "GreaterThan" ) == 0 )
self->type = GreaterThan;
else if ( strcasecmp( maskTypeName, "LesserThan" ) == 0 || strcasecmp( maskTypeName, "LessThan" ) == 0 )
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/Finalise.c
--- a/Base/src/Finalise.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/Finalise.c Thu Jan 14 17:41:43 2010 +1100
@@ -52,7 +52,7 @@
#include <stdio.h>
Bool lucBase_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/Init.c
--- a/Base/src/Init.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/Init.c Thu Jan 14 17:41:43 2010 +1100
@@ -57,19 +57,19 @@ Bool lucBase_Init() {
Bool lucBase_Init() {
Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
/* Set up streams */
- lucInfo = Journal_Register( InfoStream_Type, "lucInfo" );
- lucDebug = Journal_Register( DebugStream_Type, "lucDebug" );
- lucError = Journal_Register( ErrorStream_Type, "lucError" );
- lucInputFormat_Register_Singleton = lucInputFormat_Register_New();
+ lucInfo = Journal_Register( InfoStream_Type, (Name)"lucInfo" );
+ lucDebug = Journal_Register( DebugStream_Type, (Name)"lucDebug" );
+ lucError = Journal_Register( ErrorStream_Type, (Name)"lucError" );
+ lucInputFormat_Register_Singleton = lucInputFormat_Register_New( );
- Stg_ComponentRegister_Add( componentRegister, lucCamera_Type, "0", _lucCamera_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucColourMap_Type, "0", _lucColourMap_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucViewport_Type, "0", _lucViewport_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucWindow_Type, "0", _lucWindow_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucLight_Type, "0", _lucLight_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucCamera_Type, (Name)"0", _lucCamera_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucColourMap_Type, (Name)"0", _lucColourMap_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucViewport_Type, (Name)"0", _lucViewport_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucWindow_Type, (Name)"0", _lucWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucLight_Type, (Name)"0", _lucLight_DefaultNew );
/* Register Parents for type checking */
RegisterParent( lucCamera_Type, Stg_Component_Type );
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/InputFormat.c
--- a/Base/src/InputFormat.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/InputFormat.c Thu Jan 14 17:41:43 2010 +1100
@@ -132,9 +132,9 @@ void _lucInputFormat_AssignFromXML( void
void _lucInputFormat_AssignFromXML( void* inputFormat, Stg_ComponentFactory* cf, void* data ) {
lucInputFormat* self = (lucInputFormat*) inputFormat;
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
}
void _lucInputFormat_Build( void* inputFormat, void* data ) { }
void _lucInputFormat_Initialise( void* inputFormat, void* data ) { }
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/InputFormat_Register.c
--- a/Base/src/InputFormat_Register.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/InputFormat_Register.c Thu Jan 14 17:41:43 2010 +1100
@@ -121,7 +121,7 @@ lucInputFormat* lucInputFormat_Register_
lucInputFormat_Register* self = (lucInputFormat_Register*) inputFormat_Register;
Stg_Component_DefaultConstructorFunction* defaultNewFunctionPtr;
Name extension;
- Stream* errorStream = Journal_Register( Error_Type, lucInputFormat_Register_Type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)lucInputFormat_Register_Type );
Journal_Firewall( imageName != NULL, errorStream, "In func '%s for %s Image file name %s cannot be found \n",
__func__, self->type, imageName );
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/Light.c
--- a/Base/src/Light.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/Light.c Thu Jan 14 17:41:43 2010 +1100
@@ -231,27 +231,27 @@ void _lucLight_AssignFromXML( void* ligh
Name materialName;
float lmodel_ambient[4];
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
- glEnable(GL_LIGHTING);
+ glEnable(GL_LIGHTING );
/* Spot values */
- spotCutOff = Stg_ComponentFactory_GetDouble( cf, self->name, "spotCutOff", 180.0 );
- spotDirection[1] = Stg_ComponentFactory_GetDouble( cf, self->name, "spotDirectionX", 0.0 );
- spotDirection[2] = Stg_ComponentFactory_GetDouble( cf, self->name, "spotDirectionY", 0.0 );
- spotDirection[3] = Stg_ComponentFactory_GetDouble( cf, self->name, "spotDirectionZ", -1.0 );
+ spotCutOff = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"spotCutOff", 180.0 );
+ spotDirection[1] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"spotDirectionX", 0.0 );
+ spotDirection[2] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"spotDirectionY", 0.0 );
+ spotDirection[3] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"spotDirectionZ", -1.0 );
/* Ambient values*/
- lmodel_ambient[0] = Stg_ComponentFactory_GetDouble( cf, self->name, "ambR", 0.2 );
- lmodel_ambient[1] = Stg_ComponentFactory_GetDouble( cf, self->name, "ambG", 0.2 );
- lmodel_ambient[2] = Stg_ComponentFactory_GetDouble( cf, self->name, "ambB", 0.2 );
- lmodel_ambient[3] = Stg_ComponentFactory_GetDouble( cf, self->name, "ambA", 1.0 );
+ lmodel_ambient[0] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"ambR", 0.2 );
+ lmodel_ambient[1] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"ambG", 0.2 );
+ lmodel_ambient[2] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"ambB", 0.2 );
+ lmodel_ambient[3] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"ambA", 1.0 );
- modelName = Stg_ComponentFactory_GetString( cf, self->name, "model", "TwoSide" );
+ modelName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"model", "TwoSide" );
if ( strcasecmp( modelName, "Ambient" ) == 0 ) {
model = GL_LIGHT_MODEL_AMBIENT;
glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lmodel_ambient);
@@ -265,13 +265,13 @@ void _lucLight_AssignFromXML( void* ligh
glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE);
}
- position[0] = Stg_ComponentFactory_GetDouble( cf, self->name, "posX", LUC_LIGHT_DEFAULT_POS_X );
- position[1] = Stg_ComponentFactory_GetDouble( cf, self->name, "posY", LUC_LIGHT_DEFAULT_POS_Y );
- position[2] = Stg_ComponentFactory_GetDouble( cf, self->name, "posZ", LUC_LIGHT_DEFAULT_POS_Z );
- position[3] = Stg_ComponentFactory_GetDouble( cf, self->name, "posW", LUC_LIGHT_DEFAULT_POS_W );
+ position[0] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"posX", LUC_LIGHT_DEFAULT_POS_X );
+ position[1] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"posY", LUC_LIGHT_DEFAULT_POS_Y );
+ position[2] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"posZ", LUC_LIGHT_DEFAULT_POS_Z );
+ position[3] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"posW", LUC_LIGHT_DEFAULT_POS_W );
/*HACK - Got to retrieve */
- materialName = Stg_ComponentFactory_GetString( cf, self->name, "material", "lucMono" );
+ materialName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"material", "lucMono" );
lucLight_Init( self, index, model, material, position, lmodel_ambient, spotCutOff, spotDirection);
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/OutputFormat.c
--- a/Base/src/OutputFormat.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/OutputFormat.c Thu Jan 14 17:41:43 2010 +1100
@@ -133,9 +133,9 @@ void _lucOutputFormat_AssignFromXML( voi
void _lucOutputFormat_AssignFromXML( void* outputFormat, Stg_ComponentFactory* cf, void* data ) {
lucOutputFormat* self = outputFormat;
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
}
void _lucOutputFormat_Build( void* outputFormat, void* data ) { }
void _lucOutputFormat_Initialise( void* outputFormat, void* data ) { }
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/RenderingEngine.c
--- a/Base/src/RenderingEngine.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/RenderingEngine.c Thu Jan 14 17:41:43 2010 +1100
@@ -122,11 +122,11 @@ void _lucRenderingEngine_AssignFromXML(
void _lucRenderingEngine_AssignFromXML( void* renderingEngine, Stg_ComponentFactory* cf, void* data ) {
lucRenderingEngine* self = (lucRenderingEngine*) renderingEngine ;
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
- _lucRenderingEngine_Init( self );
+ _lucRenderingEngine_Init( self );
}
void _lucRenderingEngine_Build( void* camera, void* data ) { }
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/Viewport.c
--- a/Base/src/Viewport.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/Viewport.c Thu Jan 14 17:41:43 2010 +1100
@@ -257,32 +257,16 @@ void _lucViewport_AssignFromXML( void* v
/* TODO Construct Parent */
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
- camera = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Camera", lucCamera, True, data ) ;
+ camera = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Camera", lucCamera, True, data ) ;
- drawingObjectList = Stg_ComponentFactory_ConstructByList(
- cf,
- self->name,
- "DrawingObject",
- Stg_ComponentFactory_Unlimited,
- lucDrawingObject,
- True,
- &drawingObjectCount,
- data );
+ drawingObjectList = Stg_ComponentFactory_ConstructByList( cf, self->name, (Dictionary_Entry_Key)"DrawingObject", Stg_ComponentFactory_Unlimited, lucDrawingObject, True, &drawingObjectCount, data );
/* Grab a list of lights for this viewport */
- lightList = Stg_ComponentFactory_ConstructByList(
- cf,
- self->name,
- "Light",
- Stg_ComponentFactory_Unlimited,
- lucLight,
- False,
- &lightCount,
- data );
+ lightList = Stg_ComponentFactory_ConstructByList( cf, self->name, (Dictionary_Entry_Key)"Light", Stg_ComponentFactory_Unlimited, lucLight, False, &lightCount, data );
_lucViewport_Init(
self,
@@ -291,15 +275,15 @@ void _lucViewport_AssignFromXML( void* v
drawingObjectCount,
lightList,
lightCount,
- Stg_ComponentFactory_GetBool( cf, self->name, "drawTitle", True ),
- Stg_ComponentFactory_GetBool( cf, self->name, "drawTime", False ),
- Stg_ComponentFactory_GetBool( cf, self->name, "compositeEachObject", False ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "nearClipPlane", 0.1 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "farClipPlane", 40.0 ) );
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"drawTitle", True ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"drawTime", False ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"compositeEachObject", False ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"nearClipPlane", 0.1 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"farClipPlane", 40.0 ) );
Memory_Free( drawingObjectList );
if(lightList)
- Memory_Free( lightList );
+ Memory_Free( lightList );
}
void _lucViewport_Build( void* camera, void* data ) { }
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/Window.c
--- a/Base/src/Window.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/Window.c Thu Jan 14 17:41:43 2010 +1100
@@ -253,52 +253,36 @@ void _lucWindow_AssignFromXML( void* win
Bool continuousDefault;
Bool continuous;
- width = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "width", 400 );
- height = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "height", 400 );
+ width = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"width", 400 );
+ height = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"height", 400 );
/* Get information about whether this window is interactive or not
* All lucWindow objects will check in the root dictionary first to see if interactivity in general is turned on
* Specific lucWindow objects can override this parameter in their own component structs */
- interactiveDefault = Stg_ComponentFactory_GetRootDictBool( cf, "interactive", False );
- interactive = Stg_ComponentFactory_GetBool( cf, self->name, "interactive", interactiveDefault );
+ interactiveDefault = Stg_ComponentFactory_GetRootDictBool( cf, (Dictionary_Entry_Key)"interactive", False );
+ interactive = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"interactive", interactiveDefault );
/* Get information about whether this window is in continuous mode or not */
- continuousDefault = Stg_ComponentFactory_GetRootDictBool( cf, "continuous", False );
- continuous = Stg_ComponentFactory_GetBool( cf, self->name, "continuous", continuousDefault );
+ continuousDefault = Stg_ComponentFactory_GetRootDictBool( cf, (Dictionary_Entry_Key)"continuous", False );
+ continuous = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"continuous", continuousDefault );
/* Grab information about what viewports are going to be plotting in this window */
viewportInfoList = lucWindow_ConstructViewportInfoList( self, cf, width, height, &viewportCount, data );
/* Grab a list of different output formats for this window to be dumped in */
- outputFormatList = Stg_ComponentFactory_ConstructByList(
- cf,
- self->name,
- "OutputFormat",
- Stg_ComponentFactory_Unlimited,
- lucOutputFormat,
- False,
- &outputFormatCount,
- data );
+ outputFormatList = Stg_ComponentFactory_ConstructByList( cf, self->name, (Dictionary_Entry_Key)"OutputFormat", Stg_ComponentFactory_Unlimited, lucOutputFormat, False, &outputFormatCount, data );
/* Grab a list of interactions for the user to interact with this window */
- windowInteractionList = Stg_ComponentFactory_ConstructByList(
- cf,
- self->name,
- "WindowInteraction",
- Stg_ComponentFactory_Unlimited,
- lucWindowInteraction,
- False,
- &windowInteractionCount,
- data );
+ windowInteractionList = Stg_ComponentFactory_ConstructByList( cf, self->name, (Dictionary_Entry_Key)"WindowInteraction", Stg_ComponentFactory_Unlimited, lucWindowInteraction, False, &windowInteractionCount, data );
/* The window needs information about the context so that it can attach itself
* onto the AbstractContext_EP_DumpClass entry point. */
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
- renderingEngine = Stg_ComponentFactory_ConstructByKey( cf, self->name, "RenderingEngine", lucRenderingEngine, True, data );
+ renderingEngine = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"RenderingEngine", lucRenderingEngine, True, data );
_lucWindow_Init(
self,
@@ -312,11 +296,11 @@ void _lucWindow_AssignFromXML( void* win
self->context,
width,
height,
- Stg_ComponentFactory_GetString( cf, self->name, "backgroundColour", "white" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"backgroundColour", "white" ),
interactive,
continuous,
- Stg_ComponentFactory_GetBool( cf, self->name, "isTimedOut", True ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "maxIdleTime", 600.0 )
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"isTimedOut", True ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxIdleTime", 600.0 )
);
/* Free Memory */
@@ -324,7 +308,7 @@ void _lucWindow_AssignFromXML( void* win
if ( windowInteractionList )
Memory_Free(windowInteractionList);
if ( outputFormatList )
- Memory_Free(outputFormatList);
+ Memory_Free(outputFormatList );
}
@@ -766,7 +750,7 @@ lucViewportInfo* lucWindow_ConstructView
*viewportCount = 0;
- list = Dictionary_Get( dictionary, "Viewport" );
+ list = Dictionary_Get( dictionary, (Dictionary_Entry_Key)"Viewport" );
Journal_Firewall( list != NULL, lucError, "Cannot Find 'Viewport' for %s '%s'.\n", self->type, self->name );
self->verticalCount = Dictionary_Entry_Value_GetCount( list );
@@ -801,12 +785,12 @@ lucViewportInfo* lucWindow_ConstructView
/* Find viewport */
viewportName = StG_Strdup( charPtr );
- currViewportInfo->viewport = Stg_ComponentFactory_ConstructByName( cf, viewportName, lucViewport, True, data ) ;
+ currViewportInfo->viewport = Stg_ComponentFactory_ConstructByName( cf, (Name)viewportName, lucViewport, True, data ) ;
Memory_Free( viewportName );
/* Setup viewport dimensions */
currViewportInfo->startx = horizontal_I * viewportWidth;
- currViewportInfo->starty = (self->verticalCount - 1 - vertical_I) * viewportHeight;
+ currViewportInfo->starty = (self->verticalCount - 1 - vertical_I ) * viewportHeight;
currViewportInfo->width = viewportWidth;
currViewportInfo->height = viewportHeight;
diff -r 0ac3c6fb046d -r 212686600a1a Base/src/WindowInteraction.c
--- a/Base/src/WindowInteraction.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/src/WindowInteraction.c Thu Jan 14 17:41:43 2010 +1100
@@ -170,11 +170,11 @@ void _lucWindowInteraction_AssignFromXML
void _lucWindowInteraction_AssignFromXML( void* windowInteractor, Stg_ComponentFactory* cf, void* data ) {
lucWindowInteraction* self = windowInteractor;
- self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Context", AbstractContext, False, data );
- if( !self->context )
- self->context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ self->context = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Context", AbstractContext, False, data );
+ if( !self->context )
+ self->context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
- _lucWindowInteraction_Init( self );
+ _lucWindowInteraction_Init( self );
}
void _lucWindowInteraction_Build( void* windowInteractor, void* data ) { }
diff -r 0ac3c6fb046d -r 212686600a1a Base/tests/plugins/Others/lucTestColourMaps.c
--- a/Base/tests/plugins/Others/lucTestColourMaps.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/tests/plugins/Others/lucTestColourMaps.c Thu Jan 14 17:41:43 2010 +1100
@@ -51,7 +51,7 @@ void lucTestColourMaps( void* _context,
void lucTestColourMaps( void* _context, void* _buffer ) {
AbstractContext* context = (AbstractContext*) _context;
lucBaseContextExtension* contextExt = ExtensionManager_Get( context->extensionMgr, context, lucBaseContextExtensionHandle );
- Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
+ Stream* stream = Journal_Register( Info_Type, (Name)CURR_MODULE_NAME );
Stream_RedirectFile_WithPrependedPath( stream, context->outputPath, "colourMap.txt" );
diff -r 0ac3c6fb046d -r 212686600a1a Base/tests/plugins/Others/lucTestPlottingObjects.c
--- a/Base/tests/plugins/Others/lucTestPlottingObjects.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/tests/plugins/Others/lucTestPlottingObjects.c Thu Jan 14 17:41:43 2010 +1100
@@ -50,13 +50,13 @@
void lucTestCalculate( AbstractContext* context, lucWindow* window, lucViewport* viewport, lucPlottingObject* object ) {
- Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
+ Stream* stream = Journal_Register( Info_Type, (Name)CURR_MODULE_NAME );
Journal_Printf( stream, "In func '%s' for object %s\n", __func__, object->name );
}
void lucTestDraw( AbstractContext* context, lucWindow* window, lucViewport* viewport, lucPlottingObject* object ) {
- Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
+ Stream* stream = Journal_Register( Info_Type, (Name)CURR_MODULE_NAME );
Journal_Printf( stream, "In func '%s' for object %s\n", __func__, object->name );
}
@@ -65,7 +65,7 @@ void lucTestPlottingObjects( AbstractCon
lucBaseContextExtension* contextExt = ExtensionManager_Get( context->extensionMgr, context, lucBaseContextExtensionHandle );
lucPlottingObject* plottingObject;
PlottingObject_Index plottingObject_I;
- Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
+ Stream* stream = Journal_Register( Info_Type, (Name)CURR_MODULE_NAME );
Stream_RedirectFile_WithPrependedPath( stream, context->outputPath, "plottingObject.txt" );
lucPlottingObject_Register_PrintAllObjects( contextExt->plottingObject_Register, stream );
diff -r 0ac3c6fb046d -r 212686600a1a Base/tests/plugins/RenderingEngineTest.c
--- a/Base/tests/plugins/RenderingEngineTest.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/tests/plugins/RenderingEngineTest.c Thu Jan 14 17:41:43 2010 +1100
@@ -186,7 +186,7 @@ void _lucRenderingEngineTest_CompositeVi
void RenderingEngineTest_Register( AbstractContext* context ) {
Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Stg_ComponentRegister_Add( componentRegister, lucRenderingEngineTest_Type, "0", _lucRenderingEngineTest_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucRenderingEngineTest_Type, (Name)"0", _lucRenderingEngineTest_DefaultNew );
RegisterParent( lucRenderingEngineTest_Type, lucRenderingEngine_Type );
}
diff -r 0ac3c6fb046d -r 212686600a1a Base/tests/plugins/lucTestCameras.c
--- a/Base/tests/plugins/lucTestCameras.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/tests/plugins/lucTestCameras.c Thu Jan 14 17:41:43 2010 +1100
@@ -183,15 +183,15 @@ void lucTestAllCameras( AbstractContext*
void lucTestAllCameras( AbstractContext* context ) {
lucCamera* stereo;
lucCamera* frontOn;
- Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
+ Stream* stream = Journal_Register( Info_Type, (Name)CURR_MODULE_NAME );
- if ( context->rank == 0 )
+ if ( context->rank == 0 )
Stream_RedirectFile_WithPrependedPath( stream, context->outputPath, "camera.txt" );
Stream_SetPrintingRank( stream, 0 );
/* Note: this func gets added to construct extensions... may it should be changed to take in the tummy too? */
- frontOn = Stg_ComponentFactory_ConstructByName( context->CF, "frontOn", lucCamera, True, 0 /* dummy */ );
- stereo = Stg_ComponentFactory_ConstructByName( context->CF, "stereo", lucCamera, True, 0 /* dummy */ );
+ frontOn = Stg_ComponentFactory_ConstructByName( context->CF, (Name)"frontOn", lucCamera, True, 0 /* dummy */ );
+ stereo = Stg_ComponentFactory_ConstructByName( context->CF, (Name)"stereo", lucCamera, True, 0 /* dummy */ );
Stg_Class_Print( frontOn, stream );
Stg_Class_Print( stereo, stream );
lucTestThisCamera( context, frontOn, stream );
@@ -205,7 +205,7 @@ typedef struct {
void _lucTestCameras_AssignFromXML( void* components, Stg_ComponentFactory* cf, void* data ) {
AbstractContext* context;
- context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
ContextEP_Append( context, AbstractContext_EP_AssignFromXMLExtensions, lucTestAllCameras );
}
@@ -222,7 +222,7 @@ void* _lucTestCameras_DefaultNew( Name n
}
Index lucTestCameras_Register( PluginsManager* pluginsManager ) {
- return PluginsManager_Submit( pluginsManager, lucTestCameras_Type, "0", _lucTestCameras_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, lucTestCameras_Type, (Name)"0", _lucTestCameras_DefaultNew );
}
diff -r 0ac3c6fb046d -r 212686600a1a Base/tests/plugins/lucTestColourMaps.c
--- a/Base/tests/plugins/lucTestColourMaps.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Base/tests/plugins/lucTestColourMaps.c Thu Jan 14 17:41:43 2010 +1100
@@ -52,7 +52,7 @@ void lucTestColourMaps_Function( Abstrac
Index component_I;
Stg_ObjectList* componentList = context->CF->LCRegister->componentList;
Stg_Component* component;
- Stream* stream = Journal_Register( Info_Type, CURR_MODULE_NAME );
+ Stream* stream = Journal_Register( Info_Type, (Name)CURR_MODULE_NAME );
Stream_RedirectFile_WithPrependedPath( stream, context->outputPath, "colourMap.txt" );
@@ -72,7 +72,7 @@ typedef struct {
void _lucTestColourMaps_AssignFromXML( void* component, Stg_ComponentFactory* cf, void* data ) {
AbstractContext* context;
- context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data );
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data );
ContextEP_Append( context, AbstractContext_EP_AssignFromXMLExtensions, lucTestColourMaps_Function );
}
@@ -89,7 +89,7 @@ void* _lucTestColourMaps_DefaultNew( Nam
}
Index lucTestColourMaps_Register( PluginsManager* pluginsManager ) {
- return PluginsManager_Submit( pluginsManager, lucTestColourMaps_Type, "0", _lucTestColourMaps_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, lucTestColourMaps_Type, (Name)"0", _lucTestColourMaps_DefaultNew );
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/Axis.c
--- a/DrawingObjects/src/Axis.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/Axis.c Thu Jan 14 17:41:43 2010 +1100
@@ -192,21 +192,21 @@ void _lucAxis_AssignFromXML( void* axis,
/* Construct Parent */
_lucDrawingObject_AssignFromXML( self, cf, data );
- colourNameX = Stg_ComponentFactory_GetString( cf, self->name, "colourX", "Red") ;
- colourNameY = Stg_ComponentFactory_GetString( cf, self->name, "colourY", "Green") ;
- colourNameZ = Stg_ComponentFactory_GetString( cf, self->name, "colourZ", "Blue") ;
+ colourNameX = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colourX", "Red" ) ;
+ colourNameY = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colourY", "Green" ) ;
+ colourNameZ = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colourZ", "Blue" ) ;
lucColour_FromString( &self->colourX, colourNameX );
lucColour_FromString( &self->colourY, colourNameY );
lucColour_FromString( &self->colourZ, colourNameZ );
- origin[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "originX", -0.05 );
- origin[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "originY", -0.05 );
- origin[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "originZ", -0.05 );
+ origin[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"originX", -0.05 );
+ origin[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"originY", -0.05 );
+ origin[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"originZ", -0.05 );
lucAxis_InitAll( self,
origin,
- Stg_ComponentFactory_GetDouble( cf, self->name, "length", 0.2 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"length", 0.2 ),
self->colourX,
self->colourY,
self->colourZ);
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/ColourBar.c
--- a/DrawingObjects/src/ColourBar.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/ColourBar.c Thu Jan 14 17:41:43 2010 +1100
@@ -169,19 +169,19 @@ void _lucColourBar_AssignFromXML( void*
/* Construct Parent */
_lucDrawingObject_AssignFromXML( self, cf, data );
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, True, data ) ;
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, True, data ) ;
/* Default to 0 tick marks for linear, 1 for fixed centre, 2 for logarithmic scale */
defaultTicks = 0;
if (colourMap->centreOnFixedValue) defaultTicks = 1;
if (colourMap->logScale) defaultTicks = 2;
- ticks = Stg_ComponentFactory_GetUnsignedInt(cf, self->name, "ticks", defaultTicks );
+ ticks = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"ticks", defaultTicks );
if (ticks > 9) ticks = 9;
/* Load any provided intermediate tick values (tick1-9) */
- for (i = 1; i < ticks+1; i++) {
+ for (i = 1; i < ticks+1; i++ ) {
sprintf(tickLabel, "tick%d", i);
- tickValues[i] = Stg_ComponentFactory_GetDouble( cf, self->name, tickLabel, colourMap->maximum + 1);
+ tickValues[i] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)tickLabel, colourMap->maximum + 1 );
}
tickValues[0] = colourMap->minimum;
tickValues[ticks+1] = colourMap->maximum;
@@ -189,15 +189,15 @@ void _lucColourBar_AssignFromXML( void*
_lucColourBar_Init(
self,
colourMap,
- Stg_ComponentFactory_GetDouble( cf, self->name, "lengthFactor", 0.8 ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "height", 10 ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "margin", 16 ),
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "borderWidth", 1 ) ,
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "precision", 2 ) ,
- Stg_ComponentFactory_GetBool(cf, self->name, "scientific", False ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lengthFactor", 0.8 ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"height", 10 ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"margin", 16 ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"borderWidth", 1 ) ,
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"precision", 2 ) ,
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"scientific", False ),
ticks,
- Stg_ComponentFactory_GetBool(cf, self->name, "printTickValue", True ),
- (float) Stg_ComponentFactory_GetDouble(cf, self->name, "scaleValue", 1.0 ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"printTickValue", True ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"scaleValue", 1.0 ),
tickValues
);
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/Contour.c
--- a/DrawingObjects/src/Contour.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/Contour.c Thu Jan 14 17:41:43 2010 +1100
@@ -158,24 +158,24 @@ void _lucContour_AssignFromXML( void* dr
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- fieldVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, "FieldVariable", FieldVariable, True, data );
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, False, data );
+ fieldVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"FieldVariable", FieldVariable, True, data );
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, False, data );
- showValues = Stg_ComponentFactory_GetBool( cf, self->name, "showValues", True );
- defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolution", 8 );
- resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionX", defaultResolution );
- resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionY", defaultResolution );
- resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionZ", defaultResolution );
+ showValues = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"showValues", True );
+ defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolution", 8 );
+ resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionX", defaultResolution );
+ resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionY", defaultResolution );
+ resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionZ", defaultResolution );
_lucContour_Init(
self,
fieldVariable,
colourMap,
- Stg_ComponentFactory_GetString( cf, self->name, "colour", "black" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "black" ),
resolution,
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "lineWidth", 1.0 ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lineWidth", 1.0 ),
showValues,
- Stg_ComponentFactory_GetDouble( cf, self->name, "interval", 0.33 ) ) ;
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"interval", 0.33 ) ) ;
}
void _lucContour_Build( void* drawingObject, void* data ) {}
@@ -285,7 +285,7 @@ void lucContour_DrawContour(
dA = (max[ aAxis ] - min[ aAxis ])/(double) (resolutionA - 1);
dB = (max[ bAxis ] - min[ bAxis ])/(double) (resolutionB - 1);
- array = Memory_Alloc_2DArray( double , resolutionA, resolutionB, "Field Values");
+ array = Memory_Alloc_2DArray( double , resolutionA, resolutionB, (Name)"Field Values" );
for ( i = 0, pos[ aAxis ] = min[ aAxis ] ; i < resolutionA ; i++, pos[aAxis] += dA ) {
for ( j = 0, pos[bAxis] = min[ bAxis ] ; j < resolutionB ; j++, pos[bAxis] += dB ) {
if (pos[aAxis] > max[ aAxis ])
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/EigenvectorsCrossSection.c
--- a/DrawingObjects/src/EigenvectorsCrossSection.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/EigenvectorsCrossSection.c Thu Jan 14 17:41:43 2010 +1100
@@ -200,32 +200,32 @@ void _lucEigenvectorsCrossSection_Assign
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- tensorField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "TensorField", FieldVariable, True, data );
+ tensorField = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"TensorField", FieldVariable, True, data );
- defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolution", 8 );
- resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionX", defaultResolution );
- resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionY", defaultResolution );
- resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionZ", defaultResolution );
+ defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolution", 8 );
+ resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionX", defaultResolution );
+ resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionY", defaultResolution );
+ resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionZ", defaultResolution );
_lucEigenvectorsCrossSection_Init(
self,
tensorField,
- Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "dim", 2 ),
- Stg_ComponentFactory_GetString( cf, self->name, "leastColour", "black" ),
- Stg_ComponentFactory_GetString( cf, self->name, "middleColour", "black" ),
- Stg_ComponentFactory_GetString( cf, self->name, "greatestColour", "black" ),
+ Stg_ComponentFactory_GetRootDictUnsignedInt( cf, (Dictionary_Entry_Key)"dim", 2 ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"leastColour", "black" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"middleColour", "black" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"greatestColour", "black" ),
resolution,
- Stg_ComponentFactory_GetDouble( cf, self->name, "arrowHeadSize", 0.3 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "lengthScale", 0.3 ),
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "lineWidth", 1.0 ),
- Stg_ComponentFactory_GetBool( cf, self->name, "useEigenValue", True ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "notEigenValue", 0.3 ),
- Stg_ComponentFactory_GetBool( cf, self->name, "plotEigenVector", True ),
- Stg_ComponentFactory_GetBool( cf, self->name, "plotEigenValue", False ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "scaleEigenValue", 1.0 ),
- Stg_ComponentFactory_GetString( cf, self->name, "leastColourForNegative", "black" ),
- Stg_ComponentFactory_GetString( cf, self->name, "middleColourForNegative", "black" ),
- Stg_ComponentFactory_GetString( cf, self->name, "greatestColourForNegative", "black" ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"arrowHeadSize", 0.3 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lengthScale", 0.3 ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lineWidth", 1.0 ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"useEigenValue", True ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"notEigenValue", 0.3 ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"plotEigenVector", True ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"plotEigenValue", False ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"scaleEigenValue", 1.0 ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"leastColourForNegative", "black" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"middleColourForNegative", "black" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"greatestColourForNegative", "black" ),
lucCrossSection_Read(cf, self->name));
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/FeVariableSurface.c
--- a/DrawingObjects/src/FeVariableSurface.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/FeVariableSurface.c Thu Jan 14 17:41:43 2010 +1100
@@ -152,17 +152,17 @@ void _lucFeVariableSurface_AssignFromXML
/* Construct Parent */
_lucDrawingObject_AssignFromXML( self, cf, data );
- feVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, "FeVariable", FieldVariable, True, data );
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, False, data );
+ feVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"FeVariable", FieldVariable, True, data );
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, False, data );
_lucFeVariableSurface_Init(
self,
feVariable,
colourMap,
- Stg_ComponentFactory_GetString( cf, self->name, "colour", "black" ),
- Stg_ComponentFactory_GetBool( cf, self->name, "wireframe", False ),
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "lineWidth", 1.0 ),
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "scaleHeight", 0.0 ) );
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "black" ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"wireframe", False ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lineWidth", 1.0 ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"scaleHeight", 0.0 ) );
}
void _lucFeVariableSurface_Build( void* drawingObject, void* data ) {}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/FieldVariableBorder.c
--- a/DrawingObjects/src/FieldVariableBorder.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/FieldVariableBorder.c Thu Jan 14 17:41:43 2010 +1100
@@ -147,13 +147,13 @@ void _lucFieldVariableBorder_AssignFromX
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- fieldVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, "FieldVariable", FieldVariable, True, data );
+ fieldVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"FieldVariable", FieldVariable, True, data );
_lucFieldVariableBorder_Init(
self,
fieldVariable,
- Stg_ComponentFactory_GetString( cf, self->name, "colour", "Black" ),
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "lineWidth", 0.5 ) );
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "Black" ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lineWidth", 0.5 ) );
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/Finalise.c
--- a/DrawingObjects/src/Finalise.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/Finalise.c Thu Jan 14 17:41:43 2010 +1100
@@ -52,7 +52,7 @@
#include <stdio.h>
Bool lucDrawingObjects_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/HistoricalSwarmTrajectory.c
--- a/DrawingObjects/src/HistoricalSwarmTrajectory.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/HistoricalSwarmTrajectory.c Thu Jan 14 17:41:43 2010 +1100
@@ -90,10 +90,7 @@ void _lucHistoricalSwarmTrajectory_Init(
self->historySteps = historySteps;
self->historyTime = historyTime;
- self->particleExtHandle = ExtensionManager_Add(
- swarm->particleExtensionMgr,
- self->type,
- sizeof( lucHistoricalSwarmTrajectory_ParticleExt ) + ( historySteps+3 )*sizeof( Coord ) );
+ self->particleExtHandle = ExtensionManager_Add( swarm->particleExtensionMgr, (Name)self->type, sizeof( lucHistoricalSwarmTrajectory_ParticleExt ) + ( historySteps+3 )*sizeof( Coord ) );
lucColour_FromString( &self->colour, colourName );
@@ -159,11 +156,11 @@ void _lucHistoricalSwarmTrajectory_Assig
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", Swarm, True, data );
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, False, data );
+ swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Swarm", Swarm, True, data );
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, False, data );
- historySteps = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "historySteps", DEFAULT_STEPS );
- historyTime = Stg_ComponentFactory_GetDouble ( cf, self->name, "historyTime", 0 );
+ historySteps = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"historySteps", DEFAULT_STEPS );
+ historyTime = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"historyTime", 0 );
Journal_Firewall(
swarm->particleLayout->coordSystem == GlobalCoordSystem,
@@ -178,8 +175,8 @@ void _lucHistoricalSwarmTrajectory_Assig
self,
swarm,
colourMap,
- Stg_ComponentFactory_GetString( cf, self->name, "colour", "black" ),
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "lineWidth", 1.0 ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "black" ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lineWidth", 1.0 ),
historySteps,
historyTime );
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/Init.c
--- a/DrawingObjects/src/Init.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/Init.c Thu Jan 14 17:41:43 2010 +1100
@@ -54,32 +54,32 @@ Bool lucDrawingObjects_Init() {
Bool lucDrawingObjects_Init() {
Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentRegister, lucColourBar_Type, "0", _lucColourBar_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucFieldVariableBorder_Type, "0", _lucFieldVariableBorder_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucIsosurface_Type, "0", _lucIsosurface_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucScalarFieldCrossSection_Type, "0", _lucScalarFieldCrossSection_DefaultNew);
- Stg_ComponentRegister_Add( componentRegister, lucScalarField_Type, "0", _lucScalarField_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucVectorArrowCrossSection_Type, "0", _lucVectorArrowCrossSection_DefaultNew);
- Stg_ComponentRegister_Add( componentRegister, lucVectorArrows_Type, "0", _lucVectorArrows_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucTextureMap_Type, "0", _lucTextureMap_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucContour_Type, "0", _lucContour_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucFeVariableSurface_Type, "0", _lucFeVariableSurface_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucSwarmViewer_Type, "0", _lucSwarmViewer_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucSwarmVectors_Type, "0", _lucSwarmVectors_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucSwarmSquares_Type, "0", _lucSwarmSquares_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucHistoricalSwarmTrajectory_Type,"0", _lucHistoricalSwarmTrajectory_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucEigenvectorsCrossSection_Type, "0", _lucEigenvectorsCrossSection_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucEigenvectors_Type, "0", _lucEigenvectors_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucSwarmRGBColourViewer_Type, "0", _lucSwarmRGBColourViewer_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucMeshViewer_Type, "0", _lucMeshViewer_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucTitle_Type, "0", _lucTitle_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucAxis_Type, "0", _lucAxis_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucTimeStep_Type, "0", _lucTimeStep_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucScalarFieldOnMeshCrossSection_Type, "0", _lucScalarFieldOnMeshCrossSection_DefaultNew);
- Stg_ComponentRegister_Add( componentRegister, lucScalarFieldOnMesh_Type, "0", _lucScalarFieldOnMesh_DefaultNew);
+ Stg_ComponentRegister_Add( componentRegister, lucColourBar_Type, (Name)"0", _lucColourBar_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucFieldVariableBorder_Type, (Name)"0", _lucFieldVariableBorder_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucIsosurface_Type, (Name)"0", _lucIsosurface_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucScalarFieldCrossSection_Type, (Name)"0", _lucScalarFieldCrossSection_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucScalarField_Type, (Name)"0", _lucScalarField_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucVectorArrowCrossSection_Type, (Name)"0", _lucVectorArrowCrossSection_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucVectorArrows_Type, (Name)"0", _lucVectorArrows_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucTextureMap_Type, (Name)"0", _lucTextureMap_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucContour_Type, (Name)"0", _lucContour_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucFeVariableSurface_Type, (Name)"0", _lucFeVariableSurface_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucSwarmViewer_Type, (Name)"0", _lucSwarmViewer_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucSwarmVectors_Type, (Name)"0", _lucSwarmVectors_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucSwarmSquares_Type, (Name)"0", _lucSwarmSquares_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucHistoricalSwarmTrajectory_Type, (Name)"0", _lucHistoricalSwarmTrajectory_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucEigenvectorsCrossSection_Type, (Name)"0", _lucEigenvectorsCrossSection_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucEigenvectors_Type, (Name)"0", _lucEigenvectors_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucSwarmRGBColourViewer_Type, (Name)"0", _lucSwarmRGBColourViewer_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucMeshViewer_Type, (Name)"0", _lucMeshViewer_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucTitle_Type, (Name)"0", _lucTitle_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucAxis_Type, (Name)"0", _lucAxis_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucTimeStep_Type, (Name)"0", _lucTimeStep_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucScalarFieldOnMeshCrossSection_Type, (Name)"0", _lucScalarFieldOnMeshCrossSection_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucScalarFieldOnMesh_Type, (Name)"0", _lucScalarFieldOnMesh_DefaultNew );
/* Register Parents for type checking */
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/Isosurface.c
--- a/DrawingObjects/src/Isosurface.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/Isosurface.c Thu Jan 14 17:41:43 2010 +1100
@@ -177,30 +177,30 @@ void _lucIsosurface_AssignFromXML( void*
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- isosurfaceField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "IsosurfaceField", FieldVariable, True, data );
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, False, data );
- colourField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourField", FieldVariable, False, data );
- maskField = Stg_ComponentFactory_ConstructByKey( cf, self->name, "MaskField", FieldVariable, False, data );
+ isosurfaceField = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"IsosurfaceField", FieldVariable, True, data );
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, False, data );
+ colourField = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourField", FieldVariable, False, data );
+ maskField = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"MaskField", FieldVariable, False, data );
- defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolution", 64 );
- resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionX", defaultResolution );
- resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionY", defaultResolution );
- resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionZ", defaultResolution );
+ defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolution", 64 );
+ resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionX", defaultResolution );
+ resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionY", defaultResolution );
+ resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionZ", defaultResolution );
lucDrawingObjectMask_Construct( &mask, self->name, cf, data );
- isovalue = Stg_ComponentFactory_GetDouble( cf, self->name, "isovalue", 0.0 );
+ isovalue = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"isovalue", 0.0 );
_lucIsosurface_Init(
self,
isosurfaceField,
isovalue,
resolution,
- Stg_ComponentFactory_GetBool( cf, self->name, "drawWalls", False ),
- Stg_ComponentFactory_GetBool( cf, self->name, "wireframe", False ),
- Stg_ComponentFactory_GetBool( cf, self->name, "cullFrontFace", False ),
- Stg_ComponentFactory_GetBool( cf, self->name, "cullBackFace", False ),
- Stg_ComponentFactory_GetString( cf, self->name, "colour", "White" ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"drawWalls", False ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"wireframe", False ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"cullFrontFace", False ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"cullBackFace", False ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "White" ),
colourMap,
colourField,
maskField,
@@ -243,7 +243,7 @@ void _lucIsosurface_Setup( void* drawing
}
/* Call private constructor of parent - this will set virtual functions of parent and continue up the hierarchy tree. At the beginning of the tree it will allocate memory of the size of object and initialise all the memory to zero. */
- vertex = Memory_Alloc_3DArray( Vertex , nx, ny, nz , "Vertex array" );
+ vertex = Memory_Alloc_3DArray( Vertex , nx, ny, nz , (Name)"Vertex array" );
/* Sample Field in in regular grid */
for ( i = 0 ; i < nx ; i++ ) {
@@ -251,7 +251,7 @@ void _lucIsosurface_Setup( void* drawing
for ( k = 0 ; k < nz ; k++ ) {
pos[ I_AXIS ] = min[ I_AXIS ] + dx * (double) i;
pos[ J_AXIS ] = min[ J_AXIS ] + dy * (double) j;
- pos[ K_AXIS ] = min[ K_AXIS ] + dz * (double) k;
+ pos[ K_AXIS ] = min[ K_AXIS ] + dz * (double ) k;
memcpy( vertex[i][j][k].pos, pos, 3 * sizeof(double) );
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/MeshViewer.c
--- a/DrawingObjects/src/MeshViewer.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/MeshViewer.c Thu Jan 14 17:41:43 2010 +1100
@@ -165,20 +165,20 @@ void _lucMeshViewer_AssignFromXML( void*
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Mesh", Mesh, True, data );
+ mesh = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Mesh", Mesh, True, data );
- self->nodeNumbers = Stg_ComponentFactory_GetBool( cf, self->name, "nodeNumbers", False);
- self->elementNumbers = Stg_ComponentFactory_GetBool( cf, self->name, "elementNumbers", False);
- self->displayNodes = Stg_ComponentFactory_GetBool( cf, self->name, "displayNodes", False);
+ self->nodeNumbers = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"nodeNumbers", False );
+ self->elementNumbers = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"elementNumbers", False );
+ self->displayNodes = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"displayNodes", False );
_lucMeshViewer_Init(
self,
mesh,
- Stg_ComponentFactory_GetString( cf, self->name, "localColour", "black" ),
- Stg_ComponentFactory_GetString( cf, self->name, "shadowColour", "blue" ),
- Stg_ComponentFactory_GetString( cf, self->name, "vacantColour", "Grey" ),
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "lineWidth", 1.0 )
- );
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"localColour", "black" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"shadowColour", "blue" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"vacantColour", "Grey" ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lineWidth", 1.0 )
+ );
}
void _lucMeshViewer_Build( void* drawingObject, void* data ) {
@@ -561,14 +561,14 @@ void lucMeshViewer_BuildEdges( lucMeshVi
assert( self );
self->nEdges = Mesh_GetLocalSize( self->mesh, MT_EDGE );
- self->edges = Memory_Alloc_2DArray( unsigned, self->nEdges, 2, "edges" );
+ self->edges = Memory_Alloc_2DArray( unsigned, self->nEdges, 2, (Name)"edges" );
for( e_i = 0; e_i < self->nEdges; e_i++ ) {
/* Find node IDs for each edge */
}
- nVerts = Mesh_GetLocalSize( );
+ nVerts = Mesh_GetLocalSize( );
done = AllocArray( Bool, nVerts );
#endif
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/ScalarField.c
--- a/DrawingObjects/src/ScalarField.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/ScalarField.c Thu Jan 14 17:41:43 2010 +1100
@@ -146,9 +146,9 @@ void _lucScalarField_AssignFromXML( void
_lucScalarField_Init(
self,
- Stg_ComponentFactory_GetBool( cf, self->name, "cullFace", True ) );
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"cullFace", True ) );
- self->useMesh = Stg_ComponentFactory_GetBool( cf, self->name, "useMesh", False );
+ self->useMesh = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"useMesh", False );
}
void _lucScalarField_Build( void* drawingObject, void* data ) {
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/ScalarFieldCrossSection.c
--- a/DrawingObjects/src/ScalarFieldCrossSection.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/ScalarFieldCrossSection.c Thu Jan 14 17:41:43 2010 +1100
@@ -159,27 +159,27 @@ void _lucScalarFieldCrossSection_AssignF
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- fieldVariableName = Stg_ComponentFactory_GetString( cf, self->name, "FieldVariable", "defaultName" );
+ fieldVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"FieldVariable", "defaultName" );
/* This variable is now construct in build phase.
fieldVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, "FieldVariable", FieldVariable, True ) ;
*/
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, True, data ) ;
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, True, data ) ;
- defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolution", 128 );
- resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionX", defaultResolution );
- resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionY", defaultResolution );
- resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionZ", defaultResolution );
+ defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolution", 128 );
+ resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionX", defaultResolution );
+ resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionY", defaultResolution );
+ resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionZ", defaultResolution );
/* Get Values with which to crop the cross section */
- minCropValues[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "minCropX", -HUGE_VAL );
- minCropValues[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "minCropY", -HUGE_VAL );
- minCropValues[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "minCropZ", -HUGE_VAL );
- maxCropValues[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxCropX", +HUGE_VAL );
- maxCropValues[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxCropY", +HUGE_VAL );
- maxCropValues[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxCropZ", +HUGE_VAL );
+ minCropValues[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minCropX", -HUGE_VAL );
+ minCropValues[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minCropY", -HUGE_VAL );
+ minCropValues[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minCropZ", -HUGE_VAL );
+ maxCropValues[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxCropX", +HUGE_VAL );
+ maxCropValues[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxCropY", +HUGE_VAL );
+ maxCropValues[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxCropZ", +HUGE_VAL );
_lucScalarFieldCrossSection_Init(
self,
@@ -195,10 +195,10 @@ void _lucScalarFieldCrossSection_Build(
lucScalarFieldCrossSection* self = (lucScalarFieldCrossSection*)drawingObject;
AbstractContext* context = self->context;
Stg_ComponentFactory* cf = context->CF;
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
/* HACK - Get pointer to FieldVariable in build phase just to let FieldVariables be created in plugins */
- self->fieldVariable = Stg_ComponentFactory_ConstructByName( cf, self->fieldVariableName, FieldVariable, True, data );
+ self->fieldVariable = Stg_ComponentFactory_ConstructByName( cf, (Name)self->fieldVariableName, FieldVariable, True, data );
Journal_Firewall( self->fieldVariable->fieldComponentCount == 1, errorStream,
"Error - in %s(): provided FieldVariable \"%s\" has %u components - but %s Component "
"can only visualise FieldVariables with 1 component. Did you mean to visualise the "
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/ScalarFieldOnMesh.c
--- a/DrawingObjects/src/ScalarFieldOnMesh.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/ScalarFieldOnMesh.c Thu Jan 14 17:41:43 2010 +1100
@@ -142,7 +142,7 @@ void _lucScalarFieldOnMesh_AssignFromXML
_lucScalarFieldOnMesh_Init(
self,
- Stg_ComponentFactory_GetBool( cf, self->name, "cullFace", True ) );
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"cullFace", True ) );
}
void _lucScalarFieldOnMesh_Build( void* drawingObject, void* data ) {
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/ScalarFieldOnMeshCrossSection.c
--- a/DrawingObjects/src/ScalarFieldOnMeshCrossSection.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/ScalarFieldOnMeshCrossSection.c Thu Jan 14 17:41:43 2010 +1100
@@ -163,27 +163,27 @@ void _lucScalarFieldOnMeshCrossSection_A
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- fieldVariableName = Stg_ComponentFactory_GetString( cf, self->name, "FieldVariable", "defaultName" );
+ fieldVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"FieldVariable", "defaultName" );
/* This variable is now constructed in the build phase
fieldVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, "FieldVariable", FieldVariable, True ) ;
*/
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, True, data );
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, True, data );
- crossSectionName = Stg_ComponentFactory_GetString( cf, self->name, "crossSection", "" );
+ crossSectionName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"crossSection", "" );
if ( sscanf( crossSectionName, "%c=%d", &axisChar, &value ) == 2 ) {
if ( toupper( axisChar ) >= 'X' )
axis = toupper( axisChar ) - 'X';
}
/* Get Values with which to crop the cross section */
- minCropValues[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "minCropX", -HUGE_VAL );
- minCropValues[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "minCropY", -HUGE_VAL );
- minCropValues[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "minCropZ", -HUGE_VAL );
- maxCropValues[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxCropX", +HUGE_VAL );
- maxCropValues[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxCropY", +HUGE_VAL );
- maxCropValues[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxCropZ", +HUGE_VAL );
+ minCropValues[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minCropX", -HUGE_VAL );
+ minCropValues[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minCropY", -HUGE_VAL );
+ minCropValues[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minCropZ", -HUGE_VAL );
+ maxCropValues[ I_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxCropX", +HUGE_VAL );
+ maxCropValues[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxCropY", +HUGE_VAL );
+ maxCropValues[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxCropZ", +HUGE_VAL );
_lucScalarFieldOnMeshCrossSection_Init(
self,
@@ -199,12 +199,12 @@ void _lucScalarFieldOnMeshCrossSection_B
lucScalarFieldOnMeshCrossSection* self = (lucScalarFieldOnMeshCrossSection*)drawingObject;
FeVariable* feVariable;
Mesh* mesh;
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
/* HACK - Get pointer to FieldVariable in build phase just to let FieldVariables be created in plugins */
- feVariable = Stg_ComponentFactory_ConstructByName( self->context->CF, self->fieldVariableName, FeVariable, True, 0 /* dummy */ );
- self->fieldVariable = (FieldVariable*) feVariable;
+ feVariable = Stg_ComponentFactory_ConstructByName( self->context->CF, (Name)self->fieldVariableName, FeVariable, True, 0 /* dummy */ );
+ self->fieldVariable = (FieldVariable* ) feVariable;
Journal_Firewall( self->fieldVariable->fieldComponentCount == 1, errorStream,
"Error - in %s(): provided FieldVariable \"%s\" has %u components - but %s Component "
@@ -216,10 +216,10 @@ void _lucScalarFieldOnMeshCrossSection_B
mesh = (Mesh*) feVariable->feMesh;
/* Store the Vertex Grid */
- self->vertexGridHandle = ExtensionManager_GetHandle( mesh->info, "vertexGrid" );
+ self->vertexGridHandle = ExtensionManager_GetHandle( mesh->info, (Name)"vertexGrid" );
if ( self->vertexGridHandle == (ExtensionInfo_Index)-1 )
- Journal_Firewall( self->vertexGridHandle != (ExtensionInfo_Index)-1, errorStream,
+ Journal_Firewall( self->vertexGridHandle != (ExtensionInfo_Index )-1, errorStream,
"Error - in %s(): provided FieldVariable \"%s\" doesn't have a Vertex Grid.\n"
"Try visualising with lucScalarField instead.\n", __func__, self->fieldVariable->name );
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/SwarmRGBColourViewer.c
--- a/DrawingObjects/src/SwarmRGBColourViewer.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/SwarmRGBColourViewer.c Thu Jan 14 17:41:43 2010 +1100
@@ -148,9 +148,9 @@ void _lucSwarmRGBColourViewer_AssignFrom
/* Construct Parent */
_lucSwarmViewer_AssignFromXML( self, cf, data );
- colourRedVariableName = Stg_ComponentFactory_GetString( cf, self->name, "ColourRedVariable", "" );
- colourGreenVariableName = Stg_ComponentFactory_GetString( cf, self->name, "ColourGreenVariable", "" );
- colourBlueVariableName = Stg_ComponentFactory_GetString( cf, self->name, "ColourBlueVariable", "" );
+ colourRedVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"ColourRedVariable", "" );
+ colourGreenVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"ColourGreenVariable", "" );
+ colourBlueVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"ColourBlueVariable", "" );
_lucSwarmRGBColourViewer_Init(
self,
@@ -164,7 +164,7 @@ void _lucSwarmRGBColourViewer_Initialise
void _lucSwarmRGBColourViewer_Initialise( void* drawingObject, void* data ) {
lucSwarmRGBColourViewer* self = (lucSwarmRGBColourViewer*)drawingObject;
SwarmVariable_Register* swarmVariable_Register = self->swarm->swarmVariable_Register;
- Stream* errorStr = Journal_Register( Error_Type, self->type );
+ Stream* errorStr = Journal_Register( Error_Type, (Name)self->type );
_lucSwarmViewer_Initialise( self, data );
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/SwarmSquares.c
--- a/DrawingObjects/src/SwarmSquares.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/SwarmSquares.c Thu Jan 14 17:41:43 2010 +1100
@@ -153,17 +153,17 @@ void _lucSwarmSquares_AssignFromXML( voi
/* Construct Parent */
_lucSwarmViewerBase_AssignFromXML( self, cf, data );
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, False, data ) ;
- colourVariableName = Stg_ComponentFactory_GetString( cf, self->name, "ColourVariable", "" );
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, False, data ) ;
+ colourVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"ColourVariable", "" );
_lucSwarmSquares_Init(
self,
colourVariableName,
colourMap,
- Stg_ComponentFactory_GetString( cf, self->name, "NormalVariable", "" ),
- Stg_ComponentFactory_GetString( cf, self->name, "PlaneVectorVariable", "" ),
- Stg_ComponentFactory_GetString( cf, self->name, "LengthVariable", "" ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "length", 0.2 ) );
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"NormalVariable", "" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"PlaneVectorVariable", "" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"LengthVariable", "" ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"length", 0.2 ) );
}
void _lucSwarmSquares_Build( void* drawingObject, void* data ) {}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/SwarmVectors.c
--- a/DrawingObjects/src/SwarmVectors.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/SwarmVectors.c Thu Jan 14 17:41:43 2010 +1100
@@ -158,12 +158,12 @@ void _lucSwarmVectors_AssignFromXML( voi
_lucSwarmVectors_Init(
self,
- Stg_ComponentFactory_GetString( cf, self->name, "DirectionVariable", "" ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "arrowHeadSize", 0.5 ),
- Stg_ComponentFactory_GetString( cf, self->name, "ThicknessVariable", "" ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "thickness", 1.0 ),
- Stg_ComponentFactory_GetString( cf, self->name, "LengthVariable", "" ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "length", 0.2 ) );
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"DirectionVariable", "" ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"arrowHeadSize", 0.5 ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"ThicknessVariable", "" ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"thickness", 1.0 ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"LengthVariable", "" ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"length", 0.2 ) );
}
void _lucSwarmVectors_Build( void* drawingObject, void* data ) {
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/SwarmViewer.c
--- a/DrawingObjects/src/SwarmViewer.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/SwarmViewer.c Thu Jan 14 17:41:43 2010 +1100
@@ -149,9 +149,9 @@ void _lucSwarmViewer_AssignFromXML( void
_lucSwarmViewer_Init(
self,
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "pointSize", 1.0 ),
- (Bool ) Stg_ComponentFactory_GetBool( cf, self->name, "pointSmoothing", 0 )
- );
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"pointSize", 1.0 ),
+ (Bool ) Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"pointSmoothing", 0 )
+ );
}
void _lucSwarmViewer_Build( void* drawingObject, void* data ) {
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/SwarmViewerBase.c
--- a/DrawingObjects/src/SwarmViewerBase.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/SwarmViewerBase.c Thu Jan 14 17:41:43 2010 +1100
@@ -165,7 +165,7 @@ void _lucSwarmViewerBase_AssignFromXML(
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Swarm", Swarm, True, data ) ;
+ swarm = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Swarm", Swarm, True, data ) ;
/* 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 */
@@ -178,25 +178,25 @@ void _lucSwarmViewerBase_AssignFromXML(
swarm->particleLayout->name,
swarm->particleLayout->type );
- colourVariableName = Stg_ComponentFactory_GetString( cf, self->name, "ColourVariable", "" );
- colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, "ColourMap", lucColourMap, False, data );
- opacityVariableName = Stg_ComponentFactory_GetString( cf, self->name, "OpacityVariable", "" );
- maskVariableName = Stg_ComponentFactory_GetString( cf, self->name, "MaskVariable", "" );
+ colourVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"ColourVariable", "" );
+ colourMap = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"ColourMap", lucColourMap, False, data );
+ opacityVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"OpacityVariable", "" );
+ maskVariableName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"MaskVariable", "" );
- drawParticleNumber = Stg_ComponentFactory_GetBool( cf, self->name, "drawParticleNumber", False );
- sameParticleColour = Stg_ComponentFactory_GetBool( cf, self->name, "sameParticleColour", False );
+ drawParticleNumber = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"drawParticleNumber", False );
+ sameParticleColour = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"sameParticleColour", False );
- subSetEvery = Stg_ComponentFactory_GetInt( cf, self->name, "subSetEvery", 1 );
- positionRange = Stg_ComponentFactory_GetBool( cf, self->name, "positionRange", False );
+ subSetEvery = Stg_ComponentFactory_GetInt( cf, self->name, (Dictionary_Entry_Key)"subSetEvery", 1 );
+ positionRange = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"positionRange", False );
/* Memory allocation */
- minPosition[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "minPositionX", -100000.0 );
- minPosition[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "minPositionY", -100000.0 );
- minPosition[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "minPositionZ", -100000.0 );
+ minPosition[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minPositionX", -100000.0 );
+ minPosition[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minPositionY", -100000.0 );
+ minPosition[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"minPositionZ", -100000.0 );
- maxPosition[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxPositionX", 100000.0 );
- maxPosition[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxPositionY", 100000.0 );
- maxPosition[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, "maxPositionZ", 100000.0 );
+ maxPosition[I_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxPositionX", 100000.0 );
+ maxPosition[J_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxPositionY", 100000.0 );
+ maxPosition[K_AXIS] = Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxPositionZ", 100000.0 );
lucDrawingObjectMask_Construct( &mask, self->name, cf, data );
@@ -204,7 +204,7 @@ void _lucSwarmViewerBase_AssignFromXML(
_lucSwarmViewerBase_Init(
self,
swarm,
- Stg_ComponentFactory_GetString( cf, self->name, "colour", "black" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "black" ),
colourVariableName,
colourMap,
opacityVariableName,
@@ -227,7 +227,7 @@ void _lucSwarmViewerBase_Initialise( voi
void _lucSwarmViewerBase_Initialise( void* drawingObject, void* data ) {
lucSwarmViewerBase* self = (lucSwarmViewerBase*)drawingObject;
SwarmVariable_Register* swarmVariable_Register = self->swarm->swarmVariable_Register;
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
/* Initialise Parent */
_lucOpenGLDrawingObject_Initialise( self, data );
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/TextureMap.c
--- a/DrawingObjects/src/TextureMap.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/TextureMap.c Thu Jan 14 17:41:43 2010 +1100
@@ -218,20 +218,20 @@ void _lucTextureMap_AssignFromXML( void*
_lucTextureMap_Init(
self,
- Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "rank", (unsigned)-1 ) == MASTER,
- Stg_ComponentFactory_GetString( cf, self->name, "image", "" ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "bottomLeftX", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "bottomLeftY", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "bottomLeftZ", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "bottomRightX", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "bottomRightY", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "bottomRightZ", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "topRightX", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "topRightY", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "topRightZ", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "topLeftX", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "topLeftY", 0.0 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "topLeftZ", 0.0 ) );
+ Stg_ComponentFactory_GetRootDictUnsignedInt( cf, (Dictionary_Entry_Key)"rank", (unsigned)-1 ) == MASTER,
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"image", "" ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"bottomLeftX", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"bottomLeftY", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"bottomLeftZ", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"bottomRightX", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"bottomRightY", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"bottomRightZ", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"topRightX", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"topRightY", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"topRightZ", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"topLeftX", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"topLeftY", 0.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"topLeftZ", 0.0 ) );
}
void _lucTextureMap_Build( void* drawingObject, void* data ) {}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/TimeStep.c
--- a/DrawingObjects/src/TimeStep.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/TimeStep.c Thu Jan 14 17:41:43 2010 +1100
@@ -175,9 +175,9 @@ void _lucTimeStep_AssignFromXML( void* t
Bool frame;
Bool currentTime;
- colourName = Stg_ComponentFactory_GetString( cf, self->name, "colour", "Black") ;
- frame = Stg_ComponentFactory_GetBool( cf, self->name, "frame", True) ;
- currentTime = Stg_ComponentFactory_GetBool( cf, self->name, "time", False) ;
+ colourName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "Black" ) ;
+ frame = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"frame", True ) ;
+ currentTime = Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"time", False ) ;
lucColour_FromString( &self->colour, colourName );
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/Title.c
--- a/DrawingObjects/src/Title.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/Title.c Thu Jan 14 17:41:43 2010 +1100
@@ -181,14 +181,14 @@ void _lucTitle_AssignFromXML( void* titl
/* Construct Parent */
_lucDrawingObject_AssignFromXML( self, cf, data );
- colourName = Stg_ComponentFactory_GetString( cf, self->name, "colour", "Black") ;
+ colourName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "Black" ) ;
lucColour_FromString( &self->colour, colourName );
lucTitle_InitAll( self,
- Stg_ComponentFactory_GetString( cf, self->name, "string", "" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"string", "" ),
self->colour,
- Stg_ComponentFactory_GetInt( cf, self->name, "yPos", 20 ) );
+ Stg_ComponentFactory_GetInt( cf, self->name, (Dictionary_Entry_Key)"yPos", 20 ) );
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/src/VectorArrowCrossSection.c
--- a/DrawingObjects/src/VectorArrowCrossSection.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/src/VectorArrowCrossSection.c Thu Jan 14 17:41:43 2010 +1100
@@ -169,22 +169,22 @@ void _lucVectorArrowCrossSection_AssignF
/* Construct Parent */
_lucOpenGLDrawingObject_AssignFromXML( self, cf, data );
- vectorVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, "VectorVariable", FieldVariable, True, data );
- defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolution", 8 );
- resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionX", defaultResolution );
- resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionY", defaultResolution );
- resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "resolutionZ", defaultResolution );
+ vectorVariable = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"VectorVariable", FieldVariable, True, data );
+ defaultResolution = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolution", 8 );
+ resolution[ I_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionX", defaultResolution );
+ resolution[ J_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionY", defaultResolution );
+ resolution[ K_AXIS ] = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"resolutionZ", defaultResolution );
_lucVectorArrowCrossSection_Init(
self,
vectorVariable,
- Stg_ComponentFactory_GetString( cf, self->name, "colour", "black" ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"colour", "black" ),
resolution,
- Stg_ComponentFactory_GetDouble( cf, self->name, "arrowHeadSize", 0.3 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "maximum", 1.0 ),
- Stg_ComponentFactory_GetBool( cf, self->name, "dynamicRange", True ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "lengthScale", 0.3 ),
- (float) Stg_ComponentFactory_GetDouble( cf, self->name, "lineWidth", 1.0 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"arrowHeadSize", 0.3 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maximum", 1.0 ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"dynamicRange", True ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lengthScale", 0.3 ),
+ (float) Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"lineWidth", 1.0 ),
lucCrossSection_Read(cf, self->name));
@@ -235,7 +235,7 @@ void _lucVectorArrowCrossSection_DrawCro
Coord localMax;
double dA, dB;
double scaleValue;
- Stream* errorStream = Journal_Register( Error_Type, self->type );
+ Stream* errorStream = Journal_Register( Error_Type, (Name)self->type );
Journal_DPrintf( self->debugStream, "In %s():\n", __func__ );
Stream_Indent( self->debugStream );
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/tests/DummyFieldVariable/DummyFieldVariable.c
--- a/DrawingObjects/tests/DummyFieldVariable/DummyFieldVariable.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/tests/DummyFieldVariable/DummyFieldVariable.c Thu Jan 14 17:41:43 2010 +1100
@@ -115,8 +115,8 @@ void _DummyFieldVariable_AssignFromXML(
void _DummyFieldVariable_AssignFromXML( void* fieldVariable, Stg_ComponentFactory* cf, void* data ) {
FieldVariable* self = (FieldVariable*) fieldVariable;
- self->fieldComponentCount = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "fieldComponentCount", 1 );
- self->dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "dim", 0 );
+ self->fieldComponentCount = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, (Dictionary_Entry_Key)"fieldComponentCount", 1 );
+ self->dim = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, (Dictionary_Entry_Key)"dim", 0 );
self->communicator = MPI_COMM_WORLD;
}
@@ -143,9 +143,9 @@ void* _DummyFieldVariable_DefaultNew( Na
return _FieldVariable_New( FIELDVARIABLE_PASSARGS );
}
-Index DummyFieldVariable_Register( PluginsManager* pluginsManager ) {
+Index DummyFieldVariable_Register( PluginsManager* pluginsManager ) {
RegisterParent( DummyFieldVariable_Type, FieldVariable_Type );
- return PluginsManager_Submit( pluginsManager, DummyFieldVariable_Type, "0", _DummyFieldVariable_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, DummyFieldVariable_Type, (Name)"0", _DummyFieldVariable_DefaultNew );
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/tests/DummySwarmVariable/DummySwarmVariable.c
--- a/DrawingObjects/tests/DummySwarmVariable/DummySwarmVariable.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/tests/DummySwarmVariable/DummySwarmVariable.c Thu Jan 14 17:41:43 2010 +1100
@@ -116,16 +116,16 @@ void _DummySwarmVariable_AssignFromXML(
Variable* variable;
Index dofCount;
- swarm = Stg_ComponentFactory_ConstructByName( cf, "swarm", Swarm, True, data ) ;
- variable = Stg_ComponentFactory_ConstructByName( cf, "variable", Variable, False, data ) ;
+ swarm = Stg_ComponentFactory_ConstructByName( cf, (Name)"swarm", Swarm, True, data ) ;
+ variable = Stg_ComponentFactory_ConstructByName( cf, (Name)"variable", Variable, False, data ) ;
/* Check if this component has it's own component dictionary */
if ( Dictionary_GetDictionary( cf->componentDict, self->name ) ) {
- dofCount = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "dofCount", 0 );
+ dofCount = Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"dofCount", 0 );
}
/* if it doesn't, then just get the value from the root dictionary */
else {
- dofCount = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, "dofCount", 0 );
+ dofCount = Stg_ComponentFactory_GetRootDictUnsignedInt( cf, (Dictionary_Entry_Key)"dofCount", 0 );
}
DummySwarmVariable_Init( self, swarm, variable, dofCount );
@@ -154,7 +154,7 @@ void* _DummySwarmVariable_DefaultNew( Na
Index DummySwarmVariable_Register( PluginsManager* pluginsManager ) {
RegisterParent( DummySwarmVariable_Type, SwarmVariable_Type );
- return PluginsManager_Submit( pluginsManager, DummySwarmVariable_Type, "0", _DummySwarmVariable_DefaultNew );
+ return PluginsManager_Submit( pluginsManager, DummySwarmVariable_Type, (Name)"0", _DummySwarmVariable_DefaultNew );
}
diff -r 0ac3c6fb046d -r 212686600a1a DrawingObjects/tests/testDrawingObject.c
--- a/DrawingObjects/tests/testDrawingObject.c Wed Jan 06 14:36:21 2010 +1100
+++ b/DrawingObjects/tests/testDrawingObject.c Thu Jan 14 17:41:43 2010 +1100
@@ -83,7 +83,7 @@ int main( int argc, char* argv[] ) {
StGermain_Init( &argc, &argv );
lucBase_Init();
/* Add lucWindow as default window for this test */
- Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), lucDefaultWindow_Type, "0", _lucWindow_DefaultNew );
+ Stg_ComponentRegister_Add( Stg_ComponentRegister_Get_ComponentRegister(), lucDefaultWindow_Type, (Name)"0", _lucWindow_DefaultNew );
lucWindowing_Init();
lucRenderingEngines_Init();
lucOutputFormats_Init();
@@ -99,7 +99,7 @@ int main( int argc, char* argv[] ) {
dictionary = Dictionary_New();
/* Read input */
- ioHandler = XML_IO_Handler_New();
+ ioHandler = XML_IO_Handler_New( );
IO_Handler_ReadAllFromCommandLine( ioHandler, argc, argv, dictionary );
Journal_ReadFromDictionary( dictionary );
@@ -112,7 +112,7 @@ int main( int argc, char* argv[] ) {
/* Redirect OpenGL stream */
sprintf( filename, "OpenGL.%d.txt", rank );
- dummyOpenGLStream = Journal_Register( Info_Type, "DummyOpenGL" );
+ dummyOpenGLStream = Journal_Register( Info_Type, (Name)"DummyOpenGL" );
Stream_RedirectFile_WithPrependedPath( dummyOpenGLStream, context->outputPath, filename );
/* Building phase ---------------------------------------------------------------------------------------------------*/
diff -r 0ac3c6fb046d -r 212686600a1a InputFormats/src/Finalise.c
--- a/InputFormats/src/Finalise.c Wed Jan 06 14:36:21 2010 +1100
+++ b/InputFormats/src/Finalise.c Thu Jan 14 17:41:43 2010 +1100
@@ -52,7 +52,7 @@
#include <stdio.h>
Bool lucInputFormats_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 0ac3c6fb046d -r 212686600a1a InputFormats/src/Init.c
--- a/InputFormats/src/Init.c Wed Jan 06 14:36:21 2010 +1100
+++ b/InputFormats/src/Init.c Thu Jan 14 17:41:43 2010 +1100
@@ -53,7 +53,7 @@ Bool lucInputFormats_Init() {
Bool lucInputFormats_Init() {
/*Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();*/
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
lucInputFormat_Register_Add( lucInputFormat_Register_Singleton, ".ppm", lucInputPPM_Type, "0", _lucInputPPM_DefaultNew );
RegisterParent( lucInputPPM_Type, lucInputFormat_Type );
diff -r 0ac3c6fb046d -r 212686600a1a InputFormats/tests/plugins/lucTestInputFormat.c
--- a/InputFormats/tests/plugins/lucTestInputFormat.c Wed Jan 06 14:36:21 2010 +1100
+++ b/InputFormats/tests/plugins/lucTestInputFormat.c Thu Jan 14 17:41:43 2010 +1100
@@ -63,7 +63,7 @@ void glucifer_lucTestInputFormat( Domain
FILE* file;
int i, j;
- imageName = Dictionary_GetString( context->dictionary, "imageName" );
+ imageName = Dictionary_GetString( context->dictionary, (Dictionary_Entry_Key)"imageName" );
inputFormat = lucInputFormat_Register_CreateFromFileName( lucInputFormat_Register_Singleton, imageName );
pixelData = lucInputFormat_Input( inputFormat, imageName, &width, &height );
@@ -81,7 +81,7 @@ void glucifer_lucTestInputFormat( Domain
void _lucTestInputFormat_AssignFromXML( void* component, Stg_ComponentFactory* cf, void* data ) {
DomainContext* context;
- context = Stg_ComponentFactory_ConstructByName( cf, "context", DomainContext, True, data );
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", DomainContext, True, data );
ContextEP_ReplaceAll( context, AbstractContext_EP_Initialise, glucifer_lucTestInputFormat );
}
@@ -110,8 +110,7 @@ Index lucTestInputFormat_Register( Plugi
Index lucTestInputFormat_Register( PluginsManager* pluginsManager ) {
Index result;
- result = PluginsManager_Submit( pluginsManager, TestInputFormat_Type, "0",
- _lucTestInputFormat_DefaultNew );
+ result = PluginsManager_Submit( pluginsManager, TestInputFormat_Type, (Name)"0", _lucTestInputFormat_DefaultNew );
return result;
}
diff -r 0ac3c6fb046d -r 212686600a1a OutputFormats/src/EncoderLibavcodec.c
--- a/OutputFormats/src/EncoderLibavcodec.c Wed Jan 06 14:36:21 2010 +1100
+++ b/OutputFormats/src/EncoderLibavcodec.c Thu Jan 14 17:41:43 2010 +1100
@@ -245,19 +245,19 @@ void _lucEncoderLibavcodec_AssignFromXML
/* Construct Parent */
lucOutputFormat_InitAll( self, "mpeg" );
- window = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Window", lucWindow, True, data ) ;
- context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data ) ;
+ window = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Window", lucWindow, True, data ) ;
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data ) ;
_lucEncoderLibavcodec_Init(
self,
window,
context->outputPath,
context->loadFromCheckPoint,
- Stg_ComponentFactory_GetString( cf, self->name, "codec", "mpeg1video" ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "frameRate", 25 ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "bitRate", 400000),
- Stg_ComponentFactory_GetBool( cf, self->name, "includeFrame0", False)
- );
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"codec", "mpeg1video" ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"frameRate", 25 ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"bitRate", 400000 ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"includeFrame0", False)
+ );
}
void _lucEncoderLibavcodec_Build( void* outputFormat, void* data ) {}
diff -r 0ac3c6fb046d -r 212686600a1a OutputFormats/src/EncoderLibfame.c
--- a/OutputFormats/src/EncoderLibfame.c Wed Jan 06 14:36:21 2010 +1100
+++ b/OutputFormats/src/EncoderLibfame.c Thu Jan 14 17:41:43 2010 +1100
@@ -243,19 +243,19 @@ void _lucEncoderLibfame_AssignFromXML( v
/* Construct Parent */
lucOutputFormat_InitAll( self, "mpeg" );
- window = Stg_ComponentFactory_ConstructByKey( cf, self->name, "Window", lucWindow, True, data ) ;
- context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data ) ;
+ window = Stg_ComponentFactory_ConstructByKey( cf, self->name, (Dictionary_Entry_Key)"Window", lucWindow, True, data ) ;
+ context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data ) ;
_lucEncoderLibfame_Init(
self,
window,
context->outputPath,
context->loadFromCheckPoint,
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "keyframe", 4 ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "quality", 93 ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "framesPerSecond", 30 ),
- Stg_ComponentFactory_GetString( cf, self->name, "profile", "profile/mpeg1" ),
- Stg_ComponentFactory_GetBool( cf, self->name, "includeFrame0", False) );
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"keyframe", 4 ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"quality", 93 ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"framesPerSecond", 30 ),
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"profile", "profile/mpeg1" ),
+ Stg_ComponentFactory_GetBool( cf, self->name, (Dictionary_Entry_Key)"includeFrame0", False) );
}
void _lucEncoderLibfame_Build( void* outputFormat, void* data ) {}
diff -r 0ac3c6fb046d -r 212686600a1a OutputFormats/src/Finalise.c
--- a/OutputFormats/src/Finalise.c Wed Jan 06 14:36:21 2010 +1100
+++ b/OutputFormats/src/Finalise.c Thu Jan 14 17:41:43 2010 +1100
@@ -52,7 +52,7 @@
#include <stdio.h>
Bool lucOutputFormats_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 0ac3c6fb046d -r 212686600a1a OutputFormats/src/Init.c
--- a/OutputFormats/src/Init.c Wed Jan 06 14:36:21 2010 +1100
+++ b/OutputFormats/src/Init.c Thu Jan 14 17:41:43 2010 +1100
@@ -56,38 +56,38 @@ Bool lucOutputFormats_Init() {
Bool lucOutputFormats_Init() {
Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentRegister, lucOutputPPM_Type, "0", _lucOutputPPM_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucOutputPPM_Type, (Name)"0", _lucOutputPPM_DefaultNew );
RegisterParent( lucOutputPPM_Type, lucOutputFormat_Type );
#ifdef HAVE_GL2PS
- Stg_ComponentRegister_Add( componentRegister, lucOutputVECTOR_Type, "0", _lucOutputVECTOR_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucOutputVECTOR_Type, (Name)"0", _lucOutputVECTOR_DefaultNew );
RegisterParent( lucOutputVECTOR_Type, lucOutputFormat_Type );
#endif
#ifdef HAVE_LIBPNG
- Stg_ComponentRegister_Add( componentRegister, lucOutputPNG_Type, "0", _lucOutputPNG_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucOutputPNG_Type, (Name)"0", _lucOutputPNG_DefaultNew );
RegisterParent( lucOutputPNG_Type, lucOutputFormat_Type );
#endif
#ifdef HAVE_LIBJPEG
- Stg_ComponentRegister_Add( componentRegister, lucOutputJPEG_Type, "0", _lucOutputJPEG_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucOutputJPEG_Type, (Name)"0", _lucOutputJPEG_DefaultNew );
RegisterParent( lucOutputJPEG_Type, lucOutputFormat_Type );
#endif
#ifdef HAVE_TIFF
- Stg_ComponentRegister_Add( componentRegister, lucOutputTIFF_Type, "0", _lucOutputTIFF_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucOutputTIFF_Type, (Name)"0", _lucOutputTIFF_DefaultNew );
RegisterParent( lucOutputTIFF_Type, lucOutputFormat_Type );
#endif
#ifdef HAVE_LIBFAME
- Stg_ComponentRegister_Add( componentRegister, lucEncoderLibfame_Type, "0", _lucEncoderLibfame_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucEncoderLibfame_Type, (Name)"0", _lucEncoderLibfame_DefaultNew );
RegisterParent( lucEncoderLibfame_Type, lucOutputFormat_Type );
#endif
#ifdef HAVE_LIBAVCODEC
- Stg_ComponentRegister_Add( componentRegister, lucEncoderLibavcodec_Type, "0", _lucEncoderLibavcodec_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucEncoderLibavcodec_Type, (Name)"0", _lucEncoderLibavcodec_DefaultNew );
RegisterParent( lucEncoderLibavcodec_Type, lucOutputFormat_Type );
avcodec_init();
avcodec_register_all();
diff -r 0ac3c6fb046d -r 212686600a1a OutputFormats/src/OutputJPEG.c
--- a/OutputFormats/src/OutputJPEG.c Wed Jan 06 14:36:21 2010 +1100
+++ b/OutputFormats/src/OutputJPEG.c Thu Jan 14 17:41:43 2010 +1100
@@ -137,7 +137,7 @@ void _lucOutputJPEG_AssignFromXML( void*
_lucOutputJPEG_Init(
self,
- Stg_ComponentFactory_GetInt( cf, self->name, "quality", 93 ) );
+ Stg_ComponentFactory_GetInt( cf, self->name, (Dictionary_Entry_Key)"quality", 93 ) );
}
void _lucOutputJPEG_Build( void* outputFormat, void* data ) {}
diff -r 0ac3c6fb046d -r 212686600a1a OutputFormats/src/OutputVECTOR.c
--- a/OutputFormats/src/OutputVECTOR.c Wed Jan 06 14:36:21 2010 +1100
+++ b/OutputFormats/src/OutputVECTOR.c Thu Jan 14 17:41:43 2010 +1100
@@ -81,7 +81,7 @@ void _lucOutputVECTOR_Init( lucOutputVEC
Name formatName;
Index buffersize;
- formatName = Stg_ComponentFactory_GetString( cf, self->name, "Format", "ps" );
+ formatName = Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"Format", "ps" );
if ( strcasecmp( formatName, "ps" ) == 0 ) {
self->format = "ps";
@@ -111,14 +111,14 @@ void _lucOutputVECTOR_Init( lucOutputVEC
pdf - portable document format \n \n", \
formatName);
- buffersize = Stg_ComponentFactory_GetInt( cf, self->name, "Buffersize", 4096*4096 );
+ buffersize = Stg_ComponentFactory_GetInt( cf, self->name, (Dictionary_Entry_Key)"Buffersize", 4096*4096 );
self->buffersize = buffersize;
}
void _lucOutputVECTOR_Delete( void* outputFormat ) {
lucOutputVECTOR* self = (lucOutputVECTOR*)outputFormat;
- _lucOutputFormat_Delete( self );
+ _lucOutputFormat_Delete( self );
}
void _lucOutputVECTOR_Print( void* outputFormat, Stream* stream ) {
@@ -163,9 +163,9 @@ void* _lucOutputVECTOR_DefaultNew( Name
void _lucOutputVECTOR_AssignFromXML( void* outputFormat, Stg_ComponentFactory* cf, void* data ){
lucOutputVECTOR* self = (lucOutputVECTOR*)outputFormat;
- AbstractContext* context = Stg_ComponentFactory_ConstructByName( cf, "context", AbstractContext, True, data ) ;
+ AbstractContext* context = Stg_ComponentFactory_ConstructByName( cf, (Name)"context", AbstractContext, True, data ) ;
- if(context->rank == MASTER)
+ if(context->rank == MASTER )
Journal_Firewall( context->nproc == 1, Journal_MyStream( Error_Type, self ), "\n \n Vector outputting is not supported in parallel.\n Please choose an alternate output format.\n\n");
_lucOutputVECTOR_Init( self, cf );
diff -r 0ac3c6fb046d -r 212686600a1a RenderingEngines/src/Finalise.c
--- a/RenderingEngines/src/Finalise.c Wed Jan 06 14:36:21 2010 +1100
+++ b/RenderingEngines/src/Finalise.c Thu Jan 14 17:41:43 2010 +1100
@@ -52,7 +52,7 @@
#include <stdio.h>
Bool lucRenderingEngines_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 0ac3c6fb046d -r 212686600a1a RenderingEngines/src/Init.c
--- a/RenderingEngines/src/Init.c Wed Jan 06 14:36:21 2010 +1100
+++ b/RenderingEngines/src/Init.c Thu Jan 14 17:41:43 2010 +1100
@@ -53,15 +53,15 @@ Bool lucRenderingEngines_Init() {
Bool lucRenderingEngines_Init() {
Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentRegister, lucRenderingEngineGL_Type, "0", _lucRenderingEngineGL_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucRenderingEngineGL_Type, (Name)"0", _lucRenderingEngineGL_DefaultNew );
/* Register Parents for type checking */
RegisterParent( lucRenderingEngineGL_Type, lucRenderingEngine_Type );
#ifdef HAVE_VTK
- Stg_ComponentRegister_Add( componentRegister, lucRenderingEngineVTK_Type, "0", _lucRenderingEngineVTK_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucRenderingEngineVTK_Type, (Name)"0", _lucRenderingEngineVTK_DefaultNew );
/* Register Parents for type checking */
RegisterParent( lucRenderingEngineVTK_Type, lucRenderingEngine_Type );
diff -r 0ac3c6fb046d -r 212686600a1a RenderingEngines/tests/DummyOpenGL/DummyOpenGL.c
--- a/RenderingEngines/tests/DummyOpenGL/DummyOpenGL.c Wed Jan 06 14:36:21 2010 +1100
+++ b/RenderingEngines/tests/DummyOpenGL/DummyOpenGL.c Thu Jan 14 17:41:43 2010 +1100
@@ -53,1514 +53,1514 @@ const Type DummyOpenGL_Type = "DummyOpen
const Type DummyOpenGL_Type = "DummyOpenGL";
void glAccum (GLenum op, GLfloat value){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) op, (double) value );
}
void glAlphaFunc (GLenum func, GLclampf ref){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) func, (double) ref );
}
GLboolean glAreTexturesResident (GLsizei n, const GLuint *textures, GLboolean *residences){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr, ptr );\n", __func__, (double) n );
return 0;
}
void glArrayElement (GLint i){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) i );
}
void glBegin (GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) mode );
Stream_Indent( stream );
}
void glBindTexture (GLenum target, GLuint texture){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) target, (double) texture );
}
void glBitmap (GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) width, (double) height, (double) xorig, (double) yorig, (double) xmove, (double) ymove );
}
void glBlendFunc (GLenum sfactor, GLenum dfactor){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d );\n", __func__, (int) sfactor, (int) dfactor );
}
void glCallList (GLuint list){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) list );
}
void glCallLists (GLsizei n, GLenum type, const GLvoid *lists){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, ptr );\n", __func__, (int) n, (int) type );
}
void glClear (GLbitfield mask){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %u );\n", __func__, (unsigned) mask );
}
void glClearAccum (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glClearColor (GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glClearDepth (GLclampd depth){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) depth );
}
void glClearIndex (GLfloat c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) c );
}
void glClearStencil (GLint s){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) s );
}
void glClipPlane (GLenum plane, const GLdouble *equation){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, ptr );\n", __func__, (int) plane );
}
void glColor3b (GLbyte red, GLbyte green, GLbyte blue){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue );
}
void glColor3bv (const GLbyte *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor3d (GLdouble red, GLdouble green, GLdouble blue){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue );
}
void glColor3dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor3f (GLfloat red, GLfloat green, GLfloat blue){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue );
}
void glColor3fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor3i (GLint red, GLint green, GLint blue){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue );
}
void glColor3iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor3s (GLshort red, GLshort green, GLshort blue){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue );
}
void glColor3sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor3ub (GLubyte red, GLubyte green, GLubyte blue){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue );
}
void glColor3ubv (const GLubyte *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor3ui (GLuint red, GLuint green, GLuint blue){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue );
}
void glColor3uiv (const GLuint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor3us (GLushort red, GLushort green, GLushort blue){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue );
}
void glColor3usv (const GLushort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor4b (GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColor4bv (const GLbyte *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor4d (GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColor4dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor4f (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColor4fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor4i (GLint red, GLint green, GLint blue, GLint alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColor4iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor4s (GLshort red, GLshort green, GLshort blue, GLshort alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColor4sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor4ub (GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColor4ubv (const GLubyte *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor4ui (GLuint red, GLuint green, GLuint blue, GLuint alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColor4uiv (const GLuint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColor4us (GLushort red, GLushort green, GLushort blue, GLushort alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColor4usv (const GLushort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glColorMask (GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) red, (double) green, (double) blue, (double) alpha );
}
void glColorMaterial (GLenum face, GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d );\n", __func__, (int) face, (int) mode );
}
void glColorPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, ptr );\n", __func__, (double) size, (double) type, (double) stride );
}
void glCopyPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum type){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) width, (double) height, (double) type );
}
void glCopyTexImage1D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLint border){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) target, (double) level, (double) internalFormat, (double) x, (double) y, (double) width, (double) border );
}
void glCopyTexImage2D (GLenum target, GLint level, GLenum internalFormat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) target, (double) level, (double) internalFormat, (double) x, (double) y, (double) width, (double) height, (double) border );
}
void glCopyTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) target, (double) level, (double) xoffset, (double) x, (double) y, (double) width );
}
void glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) target, (double) level, (double) xoffset, (double) yoffset, (double) x, (double) y, (double) width, (double) height );
}
void glCullFace (GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) mode );
}
void glDeleteLists (GLuint list, GLsizei range){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) list, (double) range );
}
void glDeleteTextures (GLsizei n, const GLuint *textures){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) n );
}
void glDepthFunc (GLenum func){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) func );
}
void glDepthMask (GLboolean flag){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) flag );
}
void glDepthRange (GLclampd zNear, GLclampd zFar){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) zNear, (double) zFar );
}
void glDisable (GLenum cap){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) cap );
}
void glDisableClientState (GLenum array){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) array );
}
void glDrawArrays (GLenum mode, GLint first, GLsizei count){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) mode, (double) first, (double) count );
}
void glDrawBuffer (GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) mode );
}
void glDrawElements (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, ptr );\n", __func__, (double) mode, (double) count, (double) type );
}
void glDrawPixels (GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %d, %d, ptr );\n", __func__, (int) width, (int) height, (int) format, (int) type );
}
void glEdgeFlag (GLboolean flag){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) flag );
}
void glEdgeFlagPointer (GLsizei stride, const GLvoid *pointer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) stride );
}
void glEdgeFlagv (const GLboolean *flag){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glEnable (GLenum cap){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) cap );
}
void glEnableClientState (GLenum array){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) array );
}
void glEnd (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
- Stream_UnIndent( stream );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
+ Stream_UnIndent( stream );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glEndList (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
- Stream_UnIndent( stream );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
+ Stream_UnIndent( stream );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glEvalCoord1d (GLdouble u){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) u );
}
void glEvalCoord1dv (const GLdouble *u){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glEvalCoord1f (GLfloat u){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) u );
}
void glEvalCoord1fv (const GLfloat *u){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glEvalCoord2d (GLdouble u, GLdouble v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) u, (double) v );
}
void glEvalCoord2dv (const GLdouble *u){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glEvalCoord2f (GLfloat u, GLfloat v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) u, (double) v );
}
void glEvalCoord2fv (const GLfloat *u){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glEvalMesh1 (GLenum mode, GLint i1, GLint i2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) mode, (double) i1, (double) i2 );
}
void glEvalMesh2 (GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) mode, (double) i1, (double) i2, (double) j1, (double) j2 );
}
void glEvalPoint1 (GLint i){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) i );
}
void glEvalPoint2 (GLint i, GLint j){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) i, (double) j );
}
void glFeedbackBuffer (GLsizei size, GLenum type, GLfloat *buffer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) size, (double) type );
}
void glFinish (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glFlush (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glFogf (GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) pname, (double) param );
}
void glFogfv (GLenum pname, const GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
void glFogi (GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) pname, (double) param );
}
void glFogiv (GLenum pname, const GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
void glFrontFace (GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) mode );
}
void glFrustum (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) left, (double) right, (double) bottom, (double) top, (double) zNear, (double) zFar );
}
GLuint glGenLists (GLsizei range){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) range );
return 0;
}
void glGenTextures (GLsizei n, GLuint *textures){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) n );
}
void glGetBooleanv (GLenum pname, GLboolean *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
void glGetClipPlane (GLenum plane, GLdouble *equation){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) plane );
}
void glGetDoublev (GLenum pname, GLdouble *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
GLenum glGetError (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
return 0;
}
void glGetFloatv (GLenum pname, GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
void glGetIntegerv (GLenum pname, GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
void glGetLightfv (GLenum light, GLenum pname, GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) light, (double) pname );
}
void glGetLightiv (GLenum light, GLenum pname, GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) light, (double) pname );
}
void glGetMapdv (GLenum target, GLenum query, GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) query );
}
void glGetMapfv (GLenum target, GLenum query, GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) query );
}
void glGetMapiv (GLenum target, GLenum query, GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) query );
}
void glGetMaterialfv (GLenum face, GLenum pname, GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) face, (double) pname );
}
void glGetMaterialiv (GLenum face, GLenum pname, GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) face, (double) pname );
}
void glGetPixelMapfv (GLenum map, GLfloat *values){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) map );
}
void glGetPixelMapuiv (GLenum map, GLuint *values){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) map );
}
void glGetPixelMapusv (GLenum map, GLushort *values){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) map );
}
void glGetPointerv (GLenum pname, GLvoid* *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
void glGetPolygonStipple (GLubyte *mask){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
const GLubyte * glGetString (GLenum name){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) name );
return 0;
}
void glGetTexEnvfv (GLenum target, GLenum pname, GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) pname );
}
void glGetTexEnviv (GLenum target, GLenum pname, GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) pname );
}
void glGetTexGendv (GLenum coord, GLenum pname, GLdouble *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) coord, (double) pname );
}
void glGetTexGenfv (GLenum coord, GLenum pname, GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) coord, (double) pname );
}
void glGetTexGeniv (GLenum coord, GLenum pname, GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) coord, (double) pname );
}
void glGetTexImage (GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) level, (double) format, (double) type );
}
void glGetTexLevelParameterfv (GLenum target, GLint level, GLenum pname, GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) level, (double) pname );
}
void glGetTexLevelParameteriv (GLenum target, GLint level, GLenum pname, GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) level, (double) pname );
}
void glGetTexParameterfv (GLenum target, GLenum pname, GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) pname );
}
void glGetTexParameteriv (GLenum target, GLenum pname, GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) pname );
}
void glHint (GLenum target, GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) target, (double) mode );
}
void glIndexMask (GLuint mask){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) mask );
}
void glIndexPointer (GLenum type, GLsizei stride, const GLvoid *pointer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) type, (double) stride );
}
void glIndexd (GLdouble c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) c );
}
void glIndexdv (const GLdouble *c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glIndexf (GLfloat c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) c );
}
void glIndexfv (const GLfloat *c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glIndexi (GLint c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) c );
}
void glIndexiv (const GLint *c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glIndexs (GLshort c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) c );
}
void glIndexsv (const GLshort *c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glIndexub (GLubyte c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) c );
}
void glIndexubv (const GLubyte *c){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glInitNames (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glInterleavedArrays (GLenum format, GLsizei stride, const GLvoid *pointer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) format, (double) stride );
}
GLboolean glIsEnabled (GLenum cap){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) cap );
return 0;
}
GLboolean glIsList (GLuint list){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) list );
return 0;
}
GLboolean glIsTexture (GLuint texture){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) texture );
return 0;
}
void glLightModelf (GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) pname, (double) param );
}
void glLightModelfv (GLenum pname, const GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
void glLightModeli (GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d );\n", __func__, (int) pname, (int) param );
}
void glLightModeliv (GLenum pname, const GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr );\n", __func__, (double) pname );
}
void glLightf (GLenum light, GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) light, (double) pname, (double) param );
}
void glLightfv (GLenum light, GLenum pname, const GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) light, (double) pname );
}
void glLighti (GLenum light, GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) light, (double) pname, (double) param );
}
void glLightiv (GLenum light, GLenum pname, const GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) light, (double) pname );
}
void glLineStipple (GLint factor, GLushort pattern){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) factor, (double) pattern );
}
void glLineWidth (GLfloat width){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) width );
}
void glListBase (GLuint base){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) base );
}
void glLoadIdentity (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glLoadMatrixd (const GLdouble *m){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glLoadMatrixf (const GLfloat *m){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glLoadName (GLuint name){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) name );
}
void glLogicOp (GLenum opcode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) opcode );
}
void glMap1d (GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) u1, (double) u2, (double) stride, (double) order );
}
void glMap1f (GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) u1, (double) u2, (double) stride, (double) order );
}
void glMap2d (GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) u1, (double) u2, (double) ustride, (double) uorder, (double) v1, (double) v2, (double) vstride, (double) vorder );
}
void glMap2f (GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) u1, (double) u2, (double) ustride, (double) uorder, (double) v1, (double) v2, (double) vstride, (double) vorder );
}
void glMapGrid1d (GLint un, GLdouble u1, GLdouble u2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) un, (double) u1, (double) u2 );
}
void glMapGrid1f (GLint un, GLfloat u1, GLfloat u2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) un, (double) u1, (double) u2 );
}
void glMapGrid2d (GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) un, (double) u1, (double) u2, (double) vn, (double) v1, (double) v2 );
}
void glMapGrid2f (GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) un, (double) u1, (double) u2, (double) vn, (double) v1, (double) v2 );
}
void glMaterialf (GLenum face, GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) face, (double) pname, (double) param );
}
void glMaterialfv (GLenum face, GLenum pname, const GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) face, (double) pname );
}
void glMateriali (GLenum face, GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) face, (double) pname, (double) param );
}
void glMaterialiv (GLenum face, GLenum pname, const GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) face, (double) pname );
}
void glMatrixMode (GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d );\n", __func__, (int) mode );
}
void glMultMatrixd (const GLdouble *m){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glMultMatrixf (const GLfloat *m){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glNewList (GLuint list, GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %u, %d );\n", __func__, (unsigned) list, (int) mode );
Stream_Indent( stream );
}
void glNormal3b (GLbyte nx, GLbyte ny, GLbyte nz){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) nx, (double) ny, (double) nz );
}
void glNormal3bv (const GLbyte *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glNormal3d (GLdouble nx, GLdouble ny, GLdouble nz){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) nx, (double) ny, (double) nz );
}
void glNormal3dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glNormal3f (GLfloat nx, GLfloat ny, GLfloat nz){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) nx, (double) ny, (double) nz );
}
void glNormal3fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glNormal3i (GLint nx, GLint ny, GLint nz){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) nx, (double) ny, (double) nz );
}
void glNormal3iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glNormal3s (GLshort nx, GLshort ny, GLshort nz){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) nx, (double) ny, (double) nz );
}
void glNormal3sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glNormalPointer (GLenum type, GLsizei stride, const GLvoid *pointer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) type, (double) stride );
}
void glOrtho (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) left, (double) right, (double) bottom, (double) top, (double) zNear, (double) zFar );
}
void glPassThrough (GLfloat token){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) token );
}
void glPixelMapfv (GLenum map, GLsizei mapsize, const GLfloat *values){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) map, (double) mapsize );
}
void glPixelMapuiv (GLenum map, GLsizei mapsize, const GLuint *values){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) map, (double) mapsize );
}
void glPixelMapusv (GLenum map, GLsizei mapsize, const GLushort *values){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) map, (double) mapsize );
}
void glPixelStoref (GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) pname, (double) param );
}
void glPixelStorei (GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d );\n", __func__, (int) pname, (int) param );
}
void glPixelTransferf (GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) pname, (double) param );
}
void glPixelTransferi (GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) pname, (double) param );
}
void glPixelZoom (GLfloat xfactor, GLfloat yfactor){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) xfactor, (double) yfactor );
}
void glPointSize (GLfloat size){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) size );
}
void glPolygonMode (GLenum face, GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d );\n", __func__, (int) face, (int) mode );
}
void glPolygonOffset (GLfloat factor, GLfloat units){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) factor, (double) units );
}
void glPolygonStipple (const GLubyte *mask){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glPopAttrib (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glPopClientAttrib (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glPopMatrix (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glPopName (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glPrioritizeTextures (GLsizei n, const GLuint *textures, const GLclampf *priorities){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, ptr, ptr );\n", __func__, (double) n );
}
void glPushAttrib (GLbitfield mask){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %u );\n", __func__, (unsigned int) mask );
}
void glPushClientAttrib (GLbitfield mask){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %u );\n", __func__, (unsigned int) mask );
}
void glPushMatrix (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
}
void glPushName (GLuint name){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) name );
}
void glRasterPos2d (GLdouble x, GLdouble y){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) x, (double) y );
}
void glRasterPos2dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos2f (GLfloat x, GLfloat y){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) x, (double) y );
}
void glRasterPos2fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos2i (GLint x, GLint y){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d );\n", __func__, (int) x, (int) y );
}
void glRasterPos2iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos2s (GLshort x, GLshort y){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) x, (double) y );
}
void glRasterPos2sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos3d (GLdouble x, GLdouble y, GLdouble z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glRasterPos3dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos3f (GLfloat x, GLfloat y, GLfloat z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glRasterPos3fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos3i (GLint x, GLint y, GLint z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glRasterPos3iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos3s (GLshort x, GLshort y, GLshort z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glRasterPos3sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z, (double) w );
}
void glRasterPos4dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z, (double) w );
}
void glRasterPos4fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos4i (GLint x, GLint y, GLint z, GLint w){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z, (double) w );
}
void glRasterPos4iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glRasterPos4s (GLshort x, GLshort y, GLshort z, GLshort w){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z, (double) w );
}
void glRasterPos4sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glReadBuffer (GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) mode );
}
void glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %d, %d, %d, %d, ptr );\n", __func__, (int) x, (int) y, (int) width, (int) height, (int) format, (int) type );
}
void glRectd (GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x1, (double) y1, (double) x2, (double) y2 );
}
void glRectdv (const GLdouble *v1, const GLdouble *v2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr );\n", __func__ );
}
void glRectf (GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x1, (double) y1, (double) x2, (double) y2 );
}
void glRectfv (const GLfloat *v1, const GLfloat *v2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr );\n", __func__ );
}
void glRecti (GLint x1, GLint y1, GLint x2, GLint y2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %d, %d );\n", __func__, (int) x1, (int) y1, (int) x2, (int) y2 );
}
void glRectiv (const GLint *v1, const GLint *v2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr );\n", __func__ );
}
void glRects (GLshort x1, GLshort y1, GLshort x2, GLshort y2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x1, (double) y1, (double) x2, (double) y2 );
}
void glRectsv (const GLshort *v1, const GLshort *v2){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr );\n", __func__ );
}
GLint glRenderMode (GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) mode );
return 0;
}
void glRotated (GLdouble angle, GLdouble x, GLdouble y, GLdouble z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) angle, (double) x, (double) y, (double) z );
}
void glRotatef (GLfloat angle, GLfloat x, GLfloat y, GLfloat z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) angle, (double) x, (double) y, (double) z );
}
void glScaled (GLdouble x, GLdouble y, GLdouble z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glScalef (GLfloat x, GLfloat y, GLfloat z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glScissor (GLint x, GLint y, GLsizei width, GLsizei height){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %d, %d );\n", __func__, (int) x, (int) y, (int) width, (int) height );
}
void glSelectBuffer (GLsizei size, GLuint *buffer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, ptr );\n", __func__, (int) size );
}
void glShadeModel (GLenum mode){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) mode );
}
void glStencilFunc (GLenum func, GLint ref, GLuint mask){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) func, (double) ref, (double) mask );
}
void glStencilMask (GLuint mask){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) mask );
}
void glStencilOp (GLenum fail, GLenum zfail, GLenum zpass){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) fail, (double) zfail, (double) zpass );
}
void glTexCoord1d (GLdouble s){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) s );
}
void glTexCoord1dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord1f (GLfloat s){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) s );
}
void glTexCoord1fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord1i (GLint s){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) s );
}
void glTexCoord1iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord1s (GLshort s){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) s );
}
void glTexCoord1sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord2d (GLdouble s, GLdouble t){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) s, (double) t );
}
void glTexCoord2dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord2f (GLfloat s, GLfloat t){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) s, (double) t );
}
void glTexCoord2fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord2i (GLint s, GLint t){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) s, (double) t );
}
void glTexCoord2iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord2s (GLshort s, GLshort t){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) s, (double) t );
}
void glTexCoord2sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord3d (GLdouble s, GLdouble t, GLdouble r){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) s, (double) t, (double) r );
}
void glTexCoord3dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord3f (GLfloat s, GLfloat t, GLfloat r){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) s, (double) t, (double) r );
}
void glTexCoord3fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord3i (GLint s, GLint t, GLint r){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) s, (double) t, (double) r );
}
void glTexCoord3iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord3s (GLshort s, GLshort t, GLshort r){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) s, (double) t, (double) r );
}
void glTexCoord3sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord4d (GLdouble s, GLdouble t, GLdouble r, GLdouble q){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) s, (double) t, (double) r, (double) q );
}
void glTexCoord4dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord4f (GLfloat s, GLfloat t, GLfloat r, GLfloat q){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) s, (double) t, (double) r, (double) q );
}
void glTexCoord4fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord4i (GLint s, GLint t, GLint r, GLint q){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) s, (double) t, (double) r, (double) q );
}
void glTexCoord4iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoord4s (GLshort s, GLshort t, GLshort r, GLshort q){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) s, (double) t, (double) r, (double) q );
}
void glTexCoord4sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void glTexCoordPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, ptr );\n", __func__, (double) size, (double) type, (double) stride );
}
void glTexEnvf (GLenum target, GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) target, (double) pname, (double) param );
}
void glTexEnvfv (GLenum target, GLenum pname, const GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) pname );
}
void glTexEnvi (GLenum target, GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) target, (double) pname, (double) param );
}
void glTexEnviv (GLenum target, GLenum pname, const GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) target, (double) pname );
}
void glTexGend (GLenum coord, GLenum pname, GLdouble param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) coord, (double) pname, (double) param );
}
void glTexGendv (GLenum coord, GLenum pname, const GLdouble *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) coord, (double) pname );
}
void glTexGenf (GLenum coord, GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) coord, (double) pname, (double) param );
}
void glTexGenfv (GLenum coord, GLenum pname, const GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) coord, (double) pname );
}
void glTexGeni (GLenum coord, GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) coord, (double) pname, (double) param );
}
void glTexGeniv (GLenum coord, GLenum pname, const GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, ptr );\n", __func__, (double) coord, (double) pname );
}
@@ -1569,7 +1569,7 @@ void glTexImage1D (GLenum target, GLint
#else
void glTexImage1D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels){
#endif
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %d, %d, %d, %d, %d, ptr );\n", __func__, (int) target, (int) level, (int) internalformat, (int) width, (int) border, (int) format, (int) type );
}
@@ -1578,177 +1578,177 @@ void glTexImage2D (GLenum target, GLint
#else
void glTexImage2D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels){
#endif
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %d, %d, %d, %d, %d, %d, ptr );\n", __func__, (int) target, (int) level, (int) internalformat, (int) width, (int) height, (int) border, (int) format, (int) type );
}
void glTexParameterf (GLenum target, GLenum pname, GLfloat param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %.6g );\n", __func__, (int) target, (int) pname, (double) param );
}
void glTexParameterfv (GLenum target, GLenum pname, const GLfloat *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, ptr );\n", __func__, (int) target, (int) pname );
}
void glTexParameteri (GLenum target, GLenum pname, GLint param){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %d );\n", __func__, (int) target, (int) pname, (int) param );
}
void glTexParameteriv (GLenum target, GLenum pname, const GLint *params){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, ptr );\n", __func__, (int) target, (int) pname );
}
void glTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) level, (double) xoffset, (double) width, (double) format, (double) type );
}
void glTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) level, (double) xoffset, (double) yoffset, (double) width, (double) height, (double) format, (double) type );
}
void glTranslated (GLdouble x, GLdouble y, GLdouble z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glTranslatef (GLfloat x, GLfloat y, GLfloat z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glVertex2d (GLdouble x, GLdouble y){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) x, (double) y );
}
void glVertex2dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1] );
}
void glVertex2f (GLfloat x, GLfloat y){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) x, (double) y );
}
void glVertex2fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1] );
}
void glVertex2i (GLint x, GLint y){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) x, (double) y );
}
void glVertex2iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1] );
}
void glVertex2s (GLshort x, GLshort y){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g );\n", __func__, (double) x, (double) y );
}
void glVertex2sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1] );
}
void glVertex3d (GLdouble x, GLdouble y, GLdouble z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glVertex3dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glVertex3f (GLfloat x, GLfloat y, GLfloat z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glVertex3fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glVertex3i (GLint x, GLint y, GLint z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glVertex3iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glVertex3s (GLshort x, GLshort y, GLshort z){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z );
}
void glVertex3sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2] );
}
void glVertex4d (GLdouble x, GLdouble y, GLdouble z, GLdouble w){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z, (double) w );
}
void glVertex4dv (const GLdouble *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2], (double) v[3] );
}
void glVertex4f (GLfloat x, GLfloat y, GLfloat z, GLfloat w){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z, (double) w );
}
void glVertex4fv (const GLfloat *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2], (double) v[3] );
}
void glVertex4i (GLint x, GLint y, GLint z, GLint w){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z, (double) w );
}
void glVertex4iv (const GLint *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2], (double) v[3] );
}
void glVertex4s (GLshort x, GLshort y, GLshort z, GLshort w){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) x, (double) y, (double) z, (double) w );
}
void glVertex4sv (const GLshort *v){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( (pointer argument - %.6g, %.6g, %.6g, %.6g) );\n", __func__, (double) v[0], (double) v[1], (double) v[2], (double) v[3] );
}
void glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, ptr );\n", __func__, (double) size, (double) type, (double) stride );
}
void glViewport (GLint x, GLint y, GLsizei width, GLsizei height){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %d, %d, %d, %d );\n", __func__, (int) x, (int) y, (int) width, (int) height );
}
@@ -1756,297 +1756,297 @@ void glViewport (GLint x, GLint y, GLsiz
void gluBeginCurve (GLUnurbs* nurb){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluBeginPolygon (GLUtesselator* tess){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluBeginSurface (GLUnurbs* nurb){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluBeginTrim (GLUnurbs* nurb){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
GLint gluBuild1DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) internalFormat, (double) width, (double) format, (double) type, (double) level, (double) base, (double) max );
return 0;
}
GLint gluBuild1DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLenum format, GLenum type, const void *data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) internalFormat, (double) width, (double) format, (double) type );
return 0;
}
GLint gluBuild2DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) internalFormat, (double) width, (double) height, (double) format, (double) type, (double) level, (double) base, (double) max );
return 0;
}
GLint gluBuild2DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLenum format, GLenum type, const void *data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) internalFormat, (double) width, (double) height, (double) format, (double) type );
return 0;
}
GLint gluBuild3DMipmapLevels (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, GLint level, GLint base, GLint max, const void *data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) internalFormat, (double) width, (double) height, (double) depth, (double) format, (double) type, (double) level, (double) base, (double) max );
return 0;
}
GLint gluBuild3DMipmaps (GLenum target, GLint internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const void *data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) target, (double) internalFormat, (double) width, (double) height, (double) depth, (double) format, (double) type );
return 0;
}
GLboolean gluCheckExtension (const GLubyte *extName, const GLubyte *extString){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr );\n", __func__ );
return 0;
}
void gluCylinder (GLUquadric* quad, GLdouble base, GLdouble top, GLdouble height, GLint slices, GLint stacks){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) base, (double) top, (double) height, (double) slices, (double) stacks );
}
void gluDeleteNurbsRenderer (GLUnurbs* nurb){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluDeleteQuadric (GLUquadric* quad){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluDeleteTess (GLUtesselator* tess){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) inner, (double) outer, (double) slices, (double) loops );
}
void gluEndCurve (GLUnurbs* nurb){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluEndPolygon (GLUtesselator* tess){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluEndSurface (GLUnurbs* nurb){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluEndTrim (GLUnurbs* nurb){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
const GLubyte * gluErrorString (GLenum error){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) error );
return 0;
}
void gluGetNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat* data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, ptr );\n", __func__, (double) property );
}
const GLubyte * gluGetString (GLenum name){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g );\n", __func__, (double) name );
return 0;
}
void gluGetTessProperty (GLUtesselator* tess, GLenum which, GLdouble* data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, ptr );\n", __func__, (double) which );
}
void gluLoadSamplingMatrices (GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr, ptr, ptr );\n", __func__ );
}
void gluLookAt (GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) eyeX, (double) eyeY, (double) eyeZ, (double) centerX, (double) centerY, (double) centerZ, (double) upX, (double) upY, (double) upZ );
}
GLUnurbs* gluNewNurbsRenderer (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
return 0;
}
GLUquadric* gluNewQuadric (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
return 0;
}
GLUtesselator* gluNewTess (){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( );\n", __func__ );
return 0;
}
void gluNextContour (GLUtesselator* tess, GLenum type){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g );\n", __func__, (double) type );
}
void gluNurbsCallbackData (GLUnurbs* nurb, GLvoid* userData){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr );\n", __func__ );
}
void gluNurbsCallbackDataEXT (GLUnurbs* nurb, GLvoid* userData){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr );\n", __func__ );
}
void gluNurbsCurve (GLUnurbs* nurb, GLint knotCount, GLfloat *knots, GLint stride, GLfloat *control, GLint order, GLenum type){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, ptr, %.6g, ptr, %.6g, %.6g );\n", __func__, (double) knotCount, (double) stride, (double) order, (double) type );
}
void gluNurbsProperty (GLUnurbs* nurb, GLenum property, GLfloat value){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, %.6g );\n", __func__, (double) property, (double) value );
}
void gluNurbsSurface (GLUnurbs* nurb, GLint sKnotCount, GLfloat* sKnots, GLint tKnotCount, GLfloat* tKnots, GLint sStride, GLint tStride, GLfloat* control, GLint sOrder, GLint tOrder, GLenum type){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, ptr, %.6g, ptr, %.6g, %.6g, ptr, %.6g, %.6g, %.6g );\n", __func__, (double) sKnotCount, (double) tKnotCount, (double) sStride, (double) tStride, (double) sOrder, (double) tOrder, (double) type );
}
void gluOrtho2D (GLdouble left, GLdouble right, GLdouble bottom, GLdouble top){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) left, (double) right, (double) bottom, (double) top );
}
void gluPartialDisk (GLUquadric* quad, GLdouble inner, GLdouble outer, GLint slices, GLint loops, GLdouble start, GLdouble sweep){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, %.6g, %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) inner, (double) outer, (double) slices, (double) loops, (double) start, (double) sweep );
}
void gluPerspective (GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g );\n", __func__, (double) fovy, (double) aspect, (double) zNear, (double) zFar );
}
void gluPickMatrix (GLdouble x, GLdouble y, GLdouble delX, GLdouble delY, GLint *viewport){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) x, (double) y, (double) delX, (double) delY );
}
GLint gluProject (GLdouble objX, GLdouble objY, GLdouble objZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* winX, GLdouble* winY, GLdouble* winZ){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, ptr, ptr, ptr, ptr, ptr, ptr );\n", __func__, (double) objX, (double) objY, (double) objZ );
return 0;
}
void gluPwlCurve (GLUnurbs* nurb, GLint count, GLfloat* data, GLint stride, GLenum type){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, ptr, %.6g, %.6g );\n", __func__, (double) count, (double) stride, (double) type );
}
void gluQuadricDrawStyle (GLUquadric* quad, GLenum draw){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g );\n", __func__, (double) draw );
}
void gluQuadricNormals (GLUquadric* quad, GLenum normal){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g );\n", __func__, (double) normal );
}
void gluQuadricOrientation (GLUquadric* quad, GLenum orientation){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g );\n", __func__, (double) orientation );
}
void gluQuadricTexture (GLUquadric* quad, GLboolean texture){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g );\n", __func__, (double) texture );
}
GLint gluScaleImage (GLenum format, GLsizei wIn, GLsizei hIn, GLenum typeIn, const void *dataIn, GLsizei wOut, GLsizei hOut, GLenum typeOut, GLvoid* dataOut){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, ptr, %.6g, %.6g, %.6g, ptr );\n", __func__, (double) format, (double) wIn, (double) hIn, (double) typeIn, (double) wOut, (double) hOut, (double) typeOut );
return 0;
}
void gluSphere (GLUquadric* quad, GLdouble radius, GLint slices, GLint stacks){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, %.6g, %.6g );\n", __func__, (double) radius, (double) slices, (double) stacks );
}
void gluTessBeginContour (GLUtesselator* tess){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluTessBeginPolygon (GLUtesselator* tess, GLvoid* data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr );\n", __func__ );
}
void gluTessEndContour (GLUtesselator* tess){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluTessEndPolygon (GLUtesselator* tess){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr );\n", __func__ );
}
void gluTessNormal (GLUtesselator* tess, GLdouble valueX, GLdouble valueY, GLdouble valueZ){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, %.6g, %.6g );\n", __func__, (double) valueX, (double) valueY, (double) valueZ );
}
void gluTessProperty (GLUtesselator* tess, GLenum which, GLdouble data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, %.6g, %.6g );\n", __func__, (double) which, (double) data );
}
void gluTessVertex (GLUtesselator* tess, GLdouble *location, GLvoid* data){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr, ptr, ptr );\n", __func__ );
}
GLint gluUnProject (GLdouble winX, GLdouble winY, GLdouble winZ, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble* objX, GLdouble* objY, GLdouble* objZ){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, ptr, ptr, ptr, ptr, ptr, ptr );\n", __func__, (double) winX, (double) winY, (double) winZ );
return 0;
}
GLint gluUnProject4 (GLdouble winX, GLdouble winY, GLdouble winZ, GLdouble clipW, const GLdouble *model, const GLdouble *proj, const GLint *view, GLdouble near, GLdouble far, GLdouble* objX, GLdouble* objY, GLdouble* objZ, GLdouble* objW){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( %.6g, %.6g, %.6g, %.6g, ptr, ptr, ptr, %.6g, %.6g, ptr, ptr, ptr, ptr );\n", __func__, (double) winX, (double) winY, (double) winZ, (double) clipW, (double) near, (double) far );
return 0;
}
@@ -2055,17 +2055,17 @@ GLint gluUnProject4 (GLdouble winX, GLdo
#if 0
/* These lines are commented out because it wont compile on the mac otherwise */
void gluTessCallback (GLUtesselator* tess, GLenum which, _GLUfuncptr CallBackFunc){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr %.6g );\n", __func__, (double) which );
}
void gluNurbsCallback (GLUnurbs* nurb, GLenum which, _GLUfuncptr CallBackFunc){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr %.6g );\n", __func__, (double) which );
}
void gluQuadricCallback (GLUquadric* quad, GLenum which, _GLUfuncptr CallBackFunc){
- Stream* stream = Journal_Register( Info_Type, DummyOpenGL_Type );
+ Stream* stream = Journal_Register( Info_Type, (Name)DummyOpenGL_Type );
Journal_Printf( stream, "%s( ptr %.6g );\n", __func__, (double) which );
}
#endif
diff -r 0ac3c6fb046d -r 212686600a1a RenderingEngines/tests/testRenderingEngineGL.c
--- a/RenderingEngines/tests/testRenderingEngineGL.c Wed Jan 06 14:36:21 2010 +1100
+++ b/RenderingEngines/tests/testRenderingEngineGL.c Thu Jan 14 17:41:43 2010 +1100
@@ -115,7 +115,7 @@ int main( int argc, char* argv[] ) {
Context_PrintConcise( context, context->verbose );
/* Redirect OpenGL stream */
- dummyOpenGLStream = Journal_Register( Info_Type, "DummyOpenGL" );
+ dummyOpenGLStream = Journal_Register( Info_Type, (Name)"DummyOpenGL" );
Stream_RedirectFile_WithPrependedPath( dummyOpenGLStream, context->outputPath, "OpenGL.txt" );
/* Building phase ---------------------------------------------------------------------------------------------------*/
diff -r 0ac3c6fb046d -r 212686600a1a WindowInteractions/src/Finalise.c
--- a/WindowInteractions/src/Finalise.c Wed Jan 06 14:36:21 2010 +1100
+++ b/WindowInteractions/src/Finalise.c Thu Jan 14 17:41:43 2010 +1100
@@ -52,7 +52,7 @@
#include <stdio.h>
Bool lucWindowInteractions_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 0ac3c6fb046d -r 212686600a1a WindowInteractions/src/Init.c
--- a/WindowInteractions/src/Init.c Wed Jan 06 14:36:21 2010 +1100
+++ b/WindowInteractions/src/Init.c Thu Jan 14 17:41:43 2010 +1100
@@ -53,13 +53,13 @@ Bool lucWindowInteractions_Init() {
Bool lucWindowInteractions_Init() {
Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- Stg_ComponentRegister_Add( componentRegister, lucFieldValueInteraction_Type, "0", _lucFieldValueInteraction_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucMeshViewerInteraction_Type, "0", _lucMeshViewerInteraction_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucSwarmViewerInteraction_Type, "0", _lucSwarmViewerInteraction_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucColourBarInteraction_Type, "0", _lucColourBarInteraction_DefaultNew );
- Stg_ComponentRegister_Add( componentRegister, lucLightInteraction_Type, "0", _lucLightInteraction_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucFieldValueInteraction_Type, (Name)"0", _lucFieldValueInteraction_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucMeshViewerInteraction_Type, (Name)"0", _lucMeshViewerInteraction_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucSwarmViewerInteraction_Type, (Name)"0", _lucSwarmViewerInteraction_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucColourBarInteraction_Type, (Name)"0", _lucColourBarInteraction_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucLightInteraction_Type, (Name)"0", _lucLightInteraction_DefaultNew );
diff -r 0ac3c6fb046d -r 212686600a1a Windowing/src/CarbonWindow.c
--- a/Windowing/src/CarbonWindow.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Windowing/src/CarbonWindow.c Thu Jan 14 17:41:43 2010 +1100
@@ -145,9 +145,9 @@ void _lucCarbonWindow_AssignFromXML( voi
_lucCarbonWindow_Init(
self,
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "offsetX", 50 ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "offsetY", 50 ),
- Stg_ComponentFactory_GetDouble( cf, self->name, "maxIdleTime", 600.0 ) );
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"offsetX", 50 ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"offsetY", 50 ),
+ Stg_ComponentFactory_GetDouble( cf, self->name, (Dictionary_Entry_Key)"maxIdleTime", 600.0 ) );
}
void _lucCarbonWindow_Build( void* window, void* data ) {
diff -r 0ac3c6fb046d -r 212686600a1a Windowing/src/Finalise.c
--- a/Windowing/src/Finalise.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Windowing/src/Finalise.c Thu Jan 14 17:41:43 2010 +1100
@@ -52,7 +52,7 @@
#include <stdio.h>
Bool lucWindowing_Finalise( void ) {
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 0ac3c6fb046d -r 212686600a1a Windowing/src/Init.c
--- a/Windowing/src/Init.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Windowing/src/Init.c Thu Jan 14 17:41:43 2010 +1100
@@ -65,7 +65,7 @@ Bool lucWindowing_Init() {
Bool lucWindowing_Init() {
Stg_ComponentRegister* componentRegister = Stg_ComponentRegister_Get_ComponentRegister();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
/* Order of priority for default output window: SDL, OSMesa, X11, Carbon, VTK */
/* SDL will work with OSMesa to allow on/off-screen rendering so if present is first choice */
@@ -73,39 +73,39 @@ Bool lucWindowing_Init() {
/* library, which OSMesa replaces. */
#ifdef HAVE_SDL
- Stg_ComponentRegister_Add( componentRegister, lucSDLWindow_Type, "0", _lucSDLWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucSDLWindow_Type, (Name)"0", _lucSDLWindow_DefaultNew );
RegisterParent( lucSDLWindow_Type, lucWindow_Type );
if ( !Stg_ComponentRegister_Get( componentRegister, lucDefaultWindow_Type, "0" ) )
- Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, "0", _lucSDLWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, (Name)"0", _lucSDLWindow_DefaultNew );
#endif
#ifdef HAVE_OSMESA
- Stg_ComponentRegister_Add( componentRegister, lucOSMesaWindow_Type, "0", _lucOSMesaWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucOSMesaWindow_Type, (Name)"0", _lucOSMesaWindow_DefaultNew );
RegisterParent( lucOSMesaWindow_Type, lucWindow_Type );
if ( !Stg_ComponentRegister_Get( componentRegister, lucDefaultWindow_Type, "0" ) )
- Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, "0", _lucOSMesaWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, (Name)"0", _lucOSMesaWindow_DefaultNew );
#endif
#ifdef HAVE_X11
- Stg_ComponentRegister_Add( componentRegister, lucX11Window_Type, "0", _lucX11Window_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucX11Window_Type, (Name)"0", _lucX11Window_DefaultNew );
RegisterParent( lucX11Window_Type, lucWindow_Type );
if ( !Stg_ComponentRegister_Get( componentRegister, lucDefaultWindow_Type, "0" ) )
- Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, "0", _lucX11Window_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, (Name)"0", _lucX11Window_DefaultNew );
#endif
#ifdef HAVE_CARBON
- Stg_ComponentRegister_Add( componentRegister, lucCarbonWindow_Type, "0", _lucCarbonWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucCarbonWindow_Type, (Name)"0", _lucCarbonWindow_DefaultNew );
RegisterParent( lucCarbonWindow_Type, lucWindow_Type );
if ( !Stg_ComponentRegister_Get( componentRegister, lucDefaultWindow_Type, "0" ) )
- Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, "0", _lucCarbonWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, (Name)"0", _lucCarbonWindow_DefaultNew );
#endif
#ifdef HAVE_VTK
- Stg_ComponentRegister_Add( componentRegister, lucVTKWindow_Type, "0", _lucVTKWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucVTKWindow_Type, (Name)"0", _lucVTKWindow_DefaultNew );
RegisterParent( lucVTKWindow_Type, lucWindow_Type );
if ( !Stg_ComponentRegister_Get( componentRegister, lucDefaultWindow_Type, "0" ) )
- Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, "0", _lucVTKWindow_DefaultNew );
+ Stg_ComponentRegister_Add( componentRegister, lucDefaultWindow_Type, (Name)"0", _lucVTKWindow_DefaultNew );
#endif
return True;
diff -r 0ac3c6fb046d -r 212686600a1a Windowing/src/X11Window.c
--- a/Windowing/src/X11Window.c Wed Jan 06 14:36:21 2010 +1100
+++ b/Windowing/src/X11Window.c Thu Jan 14 17:41:43 2010 +1100
@@ -151,9 +151,9 @@ void _lucX11Window_AssignFromXML( void*
_lucX11Window_Init(
self,
- Stg_ComponentFactory_GetString( cf, self->name, "host", "localhost" ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "displayNumber", 0 ),
- Stg_ComponentFactory_GetUnsignedInt( cf, self->name, "displayScreen", 0 ) );
+ Stg_ComponentFactory_GetString( cf, self->name, (Dictionary_Entry_Key)"host", "localhost" ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"displayNumber", 0 ),
+ Stg_ComponentFactory_GetUnsignedInt( cf, self->name, (Dictionary_Entry_Key)"displayScreen", 0 ) );
}
diff -r 0ac3c6fb046d -r 212686600a1a libglucifer/src/Finalise.c
--- a/libglucifer/src/Finalise.c Wed Jan 06 14:36:21 2010 +1100
+++ b/libglucifer/src/Finalise.c Thu Jan 14 17:41:43 2010 +1100
@@ -62,7 +62,7 @@ Bool glucifer_Finalise( ) {
lucWindowing_Finalise();
lucBase_Finalise();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
return True;
}
diff -r 0ac3c6fb046d -r 212686600a1a libglucifer/src/Init.c
--- a/libglucifer/src/Init.c Wed Jan 06 14:36:21 2010 +1100
+++ b/libglucifer/src/Init.c Thu Jan 14 17:41:43 2010 +1100
@@ -64,14 +64,14 @@ Bool glucifer_Init() {
lucInputFormats_Init();
lucWindowInteractions_Init();
- Journal_Printf( Journal_Register( DebugStream_Type, "Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
- tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), 0 );
+ Journal_Printf( Journal_Register( DebugStream_Type, (Name)"Context" ), "In: %s\n", __func__ ); /* DO NOT CHANGE OR REMOVE */
+ tmp = Stream_GetPrintingRank( Journal_Register( InfoStream_Type, (Name)"Context" ) );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, (Name)"Context" ), 0 );
Journal_Printf( /* DO NOT CHANGE OR REMOVE */
- Journal_Register( InfoStream_Type, "Context" ),
+ Journal_Register( InfoStream_Type, (Name)"Context" ),
"glucifer (Visualisation framework) revision %s. Copyright (C) 2005 Monash Cluster Computing.\n", VERSION );
- Stream_Flush( Journal_Register( InfoStream_Type, "Context" ) );
- Stream_SetPrintingRank( Journal_Register( InfoStream_Type, "Context" ), tmp );
+ Stream_Flush( Journal_Register( InfoStream_Type, (Name)"Context" ) );
+ Stream_SetPrintingRank( Journal_Register( InfoStream_Type, (Name)"Context" ), tmp );
/* Add the gLucifer path to the global xml path dictionary */
directory = Memory_Alloc_Array( char, 200, "xmlDirectory" ) ;
diff -r 0ac3c6fb046d -r 212686600a1a plugins/lucPlugin/lucPlugin.c
--- a/plugins/lucPlugin/lucPlugin.c Wed Jan 06 14:36:21 2010 +1100
+++ b/plugins/lucPlugin/lucPlugin.c Thu Jan 14 17:41:43 2010 +1100
@@ -109,10 +109,9 @@ void lucPlugin_VisualOnlyRun( Context* _
context->timeStep++;
context->restartTimestep++;
- Dictionary_Set( context->dictionary, "restartTimestep",
- Dictionary_Entry_Value_FromUnsignedInt( context->restartTimestep ) );
+ Dictionary_Set( context->dictionary, (Dictionary_Entry_Key)"restartTimestep", Dictionary_Entry_Value_FromUnsignedInt( context->restartTimestep ) );
- while (1) {
+ while (1 ) {
/* If this checkpoint actually exists for this timestep, load it & possibly vis. it */
if ( True == AbstractContext_CheckPointExists( context, context->timeStep ) ) {
/* Note : always load timeInfo (currentTime) from file as we aren't solving anything,
@@ -204,7 +203,7 @@ void _lucPlugin_AssignFromXML( void* com
AbstractContext* context;
- context = (AbstractContext*)Stg_ComponentFactory_ConstructByName( cf, Dictionary_GetString( pluginDict, "Context" ), AbstractContext, True, data );
+ context = (AbstractContext*)Stg_ComponentFactory_ConstructByName( cf, Dictionary_GetString( pluginDict, (Dictionary_Entry_Key)"Context" ), AbstractContext, True, data );
self->context = context;
//glucifer_Init();
@@ -236,14 +235,14 @@ void _lucPlugin_AssignFromXML( void* com
results.
TODO: assumes the gLucifer plugin is loaded last to a certain extent.
TODO: may want an option to only reload certain feVariables needed by visualisation */
- if ( True == Dictionary_GetBool_WithDefault( context->dictionary, "visualOnlyOneTimestep", False ) ) {
- Stream* errorStream = Journal_Register( Error_Type, LucPlugin_Type );
+ if ( True == Dictionary_GetBool_WithDefault( context->dictionary, (Dictionary_Entry_Key)"visualOnlyOneTimestep", False ) ) {
+ Stream* errorStream = Journal_Register( Error_Type, (Name)LucPlugin_Type );
Journal_Firewall( context->loadFromCheckPoint == True, errorStream,
"Error - in %s(): can only use gLucifer visualOnlyOneTimestep option if "
"loadFromCheckPoint mode enabled.\n", __func__ );
ContextEP_Purge( context, AbstractContext_EP_Execute );
}
- if ( True == Dictionary_GetBool_WithDefault( context->dictionary, "visualOnly", False ) ) {
+ if ( True == Dictionary_GetBool_WithDefault( context->dictionary, (Dictionary_Entry_Key)"visualOnly", False ) ) {
ContextEP_ReplaceAll( context, AbstractContext_EP_Execute, lucPlugin_VisualOnlyRun );
}
@@ -275,8 +274,7 @@ Index lucPlugin_Register( PluginsManager
Index result;
glucifer_Init();
- result = PluginsManager_Submit( pluginsManager, LucPlugin_Type, "0",
- _lucPlugin_DefaultNew );
+ result = PluginsManager_Submit( pluginsManager, LucPlugin_Type, (Name)"0", _lucPlugin_DefaultNew );
return result;
}
diff -r 0ac3c6fb046d -r 212686600a1a src/main.c
--- a/src/main.c Wed Jan 06 14:36:21 2010 +1100
+++ b/src/main.c Thu Jan 14 17:41:43 2010 +1100
@@ -96,8 +96,8 @@ int main( int argc, char* argv[] ) {
if( rank == 0 )
Context_PrintConcise( context, context->verbose );
- if ( True == Dictionary_GetBool_WithDefault( dictionary, "showJournalStatus", False ) ) {
- Journal_PrintConcise();
+ if ( True == Dictionary_GetBool_WithDefault( dictionary, (Dictionary_Entry_Key)"showJournalStatus", False ) ) {
+ Journal_PrintConcise( );
}
/* Building phase ---------------------------------------------------------------------------------------------------*/
More information about the CIG-COMMITS
mailing list