projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing parameters file.
[GPU.git]
/
WCudaMSE
/
Student_Cuda_Image
/
src
/
cpp
/
core
/
01_Rippling
/
moo
/
host
/
Rippling.h
diff --git
a/WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/host/Rippling.h
b/WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/host/Rippling.h
index
0eb853e
..
b9ea8f4
100755
(executable)
--- a/
WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/host/Rippling.h
+++ b/
WCudaMSE/Student_Cuda_Image/src/cpp/core/01_Rippling/moo/host/Rippling.h
@@
-1,8
+1,8
@@
#ifndef RIPPLING_H_
\r
#define RIPPLING_H_
\r
\r
#ifndef RIPPLING_H_
\r
#define RIPPLING_H_
\r
\r
-#include "cudaTools.h"
\r
#include "Animable_I.h"
\r
#include "Animable_I.h"
\r
+#include "cudaTools.h"
\r
#include "MathTools.h"
\r
\r
/*----------------------------------------------------------------------*\
\r
#include "MathTools.h"
\r
\r
/*----------------------------------------------------------------------*\
\r
@@
-41,7
+41,7
@@
class Rippling: public Animable_I
virtual int getW(void);
\r
virtual int getH(void);
\r
\r
virtual int getW(void);
\r
virtual int getH(void);
\r
\r
- virtual string getTitle(void);
\r
+ virtual st
d::st
ring getTitle(void);
\r
\r
private:
\r
\r
\r
private:
\r
\r
@@
-62,7
+62,7
@@
class Rippling: public Animable_I
float t;
\r
\r
//Outputs
\r
float t;
\r
\r
//Outputs
\r
- string title;
\r
+ st
d::st
ring title;
\r
};
\r
\r
#endif
\r
};
\r
\r
#endif
\r