X-Git-Url: http://git.euphorik.ch/?p=GPU.git;a=blobdiff_plain;f=WCudaMSE%2FBilatTools_Cuda_Image%2Fsrc%2Fcore%2FcudaImageTools%2Ffonctionel%2Fheader%2FAnimableFonctionel_I.h;h=d562b05a30acb1b4c81b0b1456bec0d678041ecb;hp=6fb67ce5f25bd3fd865567808249ca25cffa8006;hb=2fd5d915e8a9de4d957d6031d2d68088784eac3c;hpb=8d08c12b29c2a14684f35c023ee39e694bb80d25

diff --git a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/header/AnimableFonctionel_I.h b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/header/AnimableFonctionel_I.h
index 6fb67ce..d562b05 100755
--- a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/header/AnimableFonctionel_I.h
+++ b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/fonctionel/header/AnimableFonctionel_I.h
@@ -2,14 +2,12 @@
 #define ANIMABLE_FONCTIONEL_I_H_
 
 #include <iostream>
+#include <vector>
+#include <string>
 
 #include "cudaTools.h"
 #include "DomaineMath.h"
 
-using std::string;
-
-
-
 /*----------------------------------------------------------------------*\
  |*			Declaration 					*|
  \*---------------------------------------------------------------------*/
@@ -21,8 +19,7 @@ using std::string;
 class AnimableFonctionel_I
     {
     public:
-
-	//virtual ~Animable_I(void)=0;
+        virtual ~AnimableFonctionel_I() {}
 
 	virtual void runGPU(uchar4* ptrDevPixels,const DomaineMath& domaineMath)=0;
 	virtual void animationStep(void)=0;
@@ -32,12 +29,14 @@ class AnimableFonctionel_I
 	virtual DomaineMath* getDomaineMathInit(void)=0;
 
 	/**
-	 * getParaAnimation
+	 * Ancienne version de l'interface.
 	 */
-	virtual float getT(void)=0;
+	virtual float getT(void) { return 0.0; };
 
-	virtual string getTitle(void)=0;
+	virtual std::vector<std::string> getNames() { std::vector<std::string> def; def.push_back("t = "); return def; }
+	virtual void getValues(float* values) { values[0] = this->getT(); }
 
+	virtual std::string getTitle(void)=0;
     };
 
 #endif