[cig-commits] r3971 - in long/3D/Gale/trunk/src/gLucifer: . Base/tests DrawingObjects/tests RenderingEngines/tests src

[walter at geodynamics.org]

Author: walter
Date: 2006-07-06 02:11:56 -0700 (Thu, 06 Jul 2006)
New Revision: 3971

Modified:
   long/3D/Gale/trunk/src/gLucifer/
   long/3D/Gale/trunk/src/gLucifer/Base/tests/testlucBase.c
   long/3D/Gale/trunk/src/gLucifer/DrawingObjects/tests/testDrawingObject.c
   long/3D/Gale/trunk/src/gLucifer/RenderingEngines/tests/testRenderingEngineGL.c
   long/3D/Gale/trunk/src/gLucifer/src/main.c
Log:
 r53 at earth (orig r588):  SteveQuenette | 2006-06-27 23:07:06 -0700
 Context_Run changed to Component_Execute in line with my last series of commits
 



Property changes on: long/3D/Gale/trunk/src/gLucifer
___________________________________________________________________
Name: svk:merge
   - 3433ad49-13df-0310-980d-a6a68cf0952a:/trunk:587
d11c8794-cf10-0410-8271-cb625e597d60:/cig:218
   + 3433ad49-13df-0310-980d-a6a68cf0952a:/trunk:588
d11c8794-cf10-0410-8271-cb625e597d60:/cig:218

Modified: long/3D/Gale/trunk/src/gLucifer/Base/tests/testlucBase.c
===================================================================
--- long/3D/Gale/trunk/src/gLucifer/Base/tests/testlucBase.c	2006-07-06 09:11:53 UTC (rev 3970)
+++ long/3D/Gale/trunk/src/gLucifer/Base/tests/testlucBase.c	2006-07-06 09:11:56 UTC (rev 3971)
@@ -117,8 +117,8 @@
 	AbstractContext_Dump( context );
 	
 	/* Destruct phase ---------------------------------------------------------------------------------------------------*/
-	
 	Stg_Component_Destroy( context, 0 /* dummy */, False );
+	Stg_Component_Destroy( context, 0 /* dummy */, False );
 	Stg_Class_Delete( context );
 	Stg_Class_Delete( dictionary );
 

Modified: long/3D/Gale/trunk/src/gLucifer/DrawingObjects/tests/testDrawingObject.c
===================================================================
--- long/3D/Gale/trunk/src/gLucifer/DrawingObjects/tests/testDrawingObject.c	2006-07-06 09:11:53 UTC (rev 3970)
+++ long/3D/Gale/trunk/src/gLucifer/DrawingObjects/tests/testDrawingObject.c	2006-07-06 09:11:56 UTC (rev 3971)
@@ -129,13 +129,11 @@
 	Stream_RedirectFile_WithPrependedPath( dummyOpenGLStream, context->outputPath, filename );
 
 	/* Building phase ---------------------------------------------------------------------------------------------------*/
-	//KeyCall( context, context->buildK, EntryPoint_VoidPtr_CallCast* )( KeyHandle(context,context->buildK), context );
 	Stg_Component_Build( context, 0 /* dummy */, False );
-	LiveComponentRegister_BuildAll( context->CF->LCRegister, context );
 	
 	/* Initialisaton phase ----------------------------------------------------------------------------------------------*/
 	Stg_Component_Initialise( context, 0 /* dummy */, False );
-
+	
 	/* Run (Solve) phase ------------------------------------------------------------------------------------------------*/
 	AbstractContext_Dump( context );
 	

Modified: long/3D/Gale/trunk/src/gLucifer/RenderingEngines/tests/testRenderingEngineGL.c
===================================================================
--- long/3D/Gale/trunk/src/gLucifer/RenderingEngines/tests/testRenderingEngineGL.c	2006-07-06 09:11:53 UTC (rev 3970)
+++ long/3D/Gale/trunk/src/gLucifer/RenderingEngines/tests/testRenderingEngineGL.c	2006-07-06 09:11:56 UTC (rev 3971)
@@ -115,7 +115,6 @@
 	Stream_RedirectFile_WithPrependedPath( dummyOpenGLStream, context->outputPath, "OpenGL.txt" );
 
 	/* Building phase ---------------------------------------------------------------------------------------------------*/
-	//KeyCall( context, context->buildK, EntryPoint_VoidPtr_CallCast* )( KeyHandle(context,context->buildK), context );
 	Stg_Component_Build( context, 0 /* dummy */, False );
 	
 	/* Initialisaton phase ----------------------------------------------------------------------------------------------*/
@@ -125,7 +124,7 @@
 	AbstractContext_Dump( context );
 	
 	/* Destruct phase ---------------------------------------------------------------------------------------------------*/
-	Stg_Component_Destroy( context, 0 /* dummy */, False );	
+	Stg_Component_Destroy( context, 0 /* dummy */, False );
 	Stg_Class_Delete( context );
 	Stg_Class_Delete( dictionary );
 

Modified: long/3D/Gale/trunk/src/gLucifer/src/main.c
===================================================================
--- long/3D/Gale/trunk/src/gLucifer/src/main.c	2006-07-06 09:11:53 UTC (rev 3970)
+++ long/3D/Gale/trunk/src/gLucifer/src/main.c	2006-07-06 09:11:56 UTC (rev 3971)
@@ -117,11 +117,10 @@
 	}			
 
 	/* Building phase ---------------------------------------------------------------------------------------------------*/
-	//KeyCall( context, context->buildK, EntryPoint_VoidPtr_CallCast* )( KeyHandle(context,context->buildK), context );
 	Stg_Component_Build( context, 0 /* dummy */, False );
 	
 	/* Initialisaton phase ----------------------------------------------------------------------------------------------*/
-	Stg_Component_Initialise( context, 0 , False );
+	Stg_Component_Initialise( context, 0 /* dummy */, False );
 	
 	/* Run (Solve) phase ------------------------------------------------------------------------------------------------*/
 	AbstractContext_Dump( context );