projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Début du TP convolution. Pour l'instant uniquement lecture d'une vidéo.
[GPU.git]
/
WCudaMSE
/
BilatTools_Cuda_Image
/
src
/
core
/
cudaImageTools
/
bitmap
/
header
/
Animable_I.h
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
(executable)
--- 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_
\r
#define ANIMABLE_I_H_
\r
\r
#ifndef ANIMABLE_I_H_
\r
#define ANIMABLE_I_H_
\r
\r
-#include <
iostream
>
\r
-#include
"cudaTools.h"
\r
+#include <
string
>
\r
+#include
<vector>
\r
\r
\r
-using std::string;
\r
+#include "cudaTools.h"
\r
\r
/*----------------------------------------------------------------------*\
\r
|* Declaration *|
\r
\r
/*----------------------------------------------------------------------*\
\r
|* Declaration *|
\r
@@
-17,8
+17,7
@@
using std::string;
class Animable_I
\r
{
\r
public:
\r
class Animable_I
\r
{
\r
public:
\r
-
\r
- //virtual ~Animable_I(void)=0;
\r
+ virtual ~Animable_I(void) {};
\r
\r
virtual void runGPU(uchar4* ptrDevPixels)=0;
\r
virtual void animationStep(void)=0;
\r
\r
virtual void runGPU(uchar4* ptrDevPixels)=0;
\r
virtual void animationStep(void)=0;
\r
@@
-26,13
+25,15
@@
class Animable_I
virtual int getW()=0;
\r
virtual int getH()=0;
\r
\r
virtual int getW()=0;
\r
virtual int getH()=0;
\r
\r
- /**
\r
- * getParaAnimation
\r
- */
\r
- virtual float getT()
=0
;
\r
+
/**
\r
+ * Ancienne version de l'interface.
\r
+
*/
\r
+ virtual float getT()
{ return 0.0; }
;
\r
\r
\r
- virtual string getTitle()=0;
\r
+ virtual std::vector<std::string> getNames() { std::vector<std::string> def; def.push_back("t = "); return def; }
\r
+ virtual void getValues(float* values) { values[0] = this->getT(); }
\r
\r
\r
+ virtual std::string getTitle() = 0;
\r
};
\r
\r
#endif
\r
};
\r
\r
#endif
\r