projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ajout du TP HeatTransfert.
[GPU.git]
/
WCudaMSE
/
Student_Cuda_Image
/
src
/
cpp
/
core
/
00_Rippling_warmup
/
01_imageAPI
/
Rippling0Image.cpp
diff --git
a/WCudaMSE/Student_Cuda_Image/src/cpp/core/00_Rippling_warmup/01_imageAPI/Rippling0Image.cpp
b/WCudaMSE/Student_Cuda_Image/src/cpp/core/00_Rippling_warmup/01_imageAPI/Rippling0Image.cpp
index
dc9e211
..
310fad7
100755
(executable)
--- a/
WCudaMSE/Student_Cuda_Image/src/cpp/core/00_Rippling_warmup/01_imageAPI/Rippling0Image.cpp
+++ b/
WCudaMSE/Student_Cuda_Image/src/cpp/core/00_Rippling_warmup/01_imageAPI/Rippling0Image.cpp
@@
-37,15
+37,8
@@
extern void launchKernelRippling0(uchar4* ptrDevPixels, int w, int h, float t);
\*-------------------------------------*/
\r
\r
Rippling0Image::Rippling0Image(unsigned int w, unsigned int h, float dt) :
\r
\*-------------------------------------*/
\r
\r
Rippling0Image::Rippling0Image(unsigned int w, unsigned int h, float dt) :
\r
- ImageMOOs_A(w, h)
\r
+ ImageMOOs_A(w, h)
, dt(dt), t(0)
\r
{
\r
{
\r
- assert(getW() == getH()); // image carrer
\r
-
\r
- // Input
\r
- this->dt = dt;
\r
-
\r
- // Tools
\r
- this->t = 0;
\r
}
\r
\r
Rippling0Image::~Rippling0Image(void)
\r
}
\r
\r
Rippling0Image::~Rippling0Image(void)
\r
@@
-71,7
+64,7
@@
void Rippling0Image::animationStep(bool& isNeedUpdateView) // Override
*/
\r
void Rippling0Image::fillImageGL(uchar4* ptrDevImageGL, int w, int h) // Override
\r
{
\r
*/
\r
void Rippling0Image::fillImageGL(uchar4* ptrDevImageGL, int w, int h) // Override
\r
{
\r
- launchKernelRippling0(ptrDevImageGL, w, h, t);
\r
+ launchKernelRippling0(ptrDevImageGL, w, h, t
his->t
);
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r