X-Git-Url: http://git.euphorik.ch/index.cgi?a=blobdiff_plain;f=WCudaMSE%2FBilatTools_Cuda_Image%2Fsrc%2Fcore%2FcudaImageTools%2Fbitmap%2Fheader%2FAnimable_I.h;h=e50d301da1fa8d2d36a625a755d8b020b59f25eb;hb=HEAD;hp=35686412878f4c17b29d9bf1963e2894ac3d7d6b;hpb=8d08c12b29c2a14684f35c023ee39e694bb80d25;p=GPU.git

diff --git a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/bitmap/header/Animable_I.h b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/bitmap/header/Animable_I.h
index 3568641..e50d301 100755
--- a/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/bitmap/header/Animable_I.h
+++ b/WCudaMSE/BilatTools_Cuda_Image/src/core/cudaImageTools/bitmap/header/Animable_I.h
@@ -1,10 +1,10 @@
 #ifndef ANIMABLE_I_H_
 #define ANIMABLE_I_H_
 
-#include <iostream>
-#include "cudaTools.h"
+#include <string>
+#include <vector>
 
-using std::string;
+#include "cudaTools.h"
 
 /*----------------------------------------------------------------------*\
  |*			Declaration 					*|
@@ -17,8 +17,7 @@ using std::string;
 class Animable_I
     {
     public:
-
-	//virtual ~Animable_I(void)=0;
+	virtual ~Animable_I(void) {};
 
 	virtual void runGPU(uchar4* ptrDevPixels)=0;
 	virtual void animationStep(void)=0;
@@ -26,13 +25,15 @@ class Animable_I
 	virtual int getW()=0;
 	virtual int getH()=0;
 
-	/**
-	 * getParaAnimation
-	 */
-	virtual float getT()=0;
+        /**
+         * Ancienne version de l'interface.
+         */
+	virtual float getT() { return 0.0; };
 
-	virtual string getTitle()=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() = 0;
     };
 
 #endif