projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TP Saucisson.
[GPU.git]
/
WCudaMSE
/
Student_Cuda_Image
/
src
/
cpp
/
core
/
04_RayTracing
/
moo
/
host
/
RayTracing.h
diff --git
a/WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/host/RayTracing.h
b/WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/host/RayTracing.h
index
5c0e77d
..
313fa6b
100644
(file)
--- a/
WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/host/RayTracing.h
+++ b/
WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/host/RayTracing.h
@@
-4,7
+4,7
@@
#include "cudaTools.h"
#include "Animable_I.h"
#include "MathTools.h"
#include "cudaTools.h"
#include "Animable_I.h"
#include "MathTools.h"
-#include "
cudaType_CPU
.h"
+#include "
AleaTools
.h"
#include "Sphere.h"
#include "Sphere.h"
@@
-22,7
+22,7
@@
class RayTracing : public Animable_I
float getT() /*override*/;
float getT() /*override*/;
- string getTitle(void) /*override*/;
+ st
d::st
ring getTitle(void) /*override*/;
private:
Sphere* createSpheres(int n);
private:
Sphere* createSpheres(int n);
@@
-37,7
+37,7
@@
class RayTracing : public Animable_I
const dim3 dg;
const dim3 db;
const dim3 dg;
const dim3 db;
- const string title;
+ const st
d::st
ring title;
};
#endif
};
#endif