projects
/
GPU.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Correction de probl?me de compilation li? a RayTracing.
[GPU.git]
/
WCudaMSE
/
Student_Cuda_Image
/
src
/
cpp
/
core
/
04_RayTracing
/
moo
/
device
/
Sphere.h
diff --git
a/WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/Sphere.h
b/WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/Sphere.h
index
566b4ab
..
0567fb8
100644
(file)
--- a/
WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/Sphere.h
+++ b/
WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/Sphere.h
@@
-3,14
+3,13
@@
#include "cudaTools.h"
#include "cudaType_CPU.h"
#include "cudaTools.h"
#include "cudaType_CPU.h"
-#include "
m
athTools.h"
+#include "
M
athTools.h"
-#endif
class Sphere
{
public:
__host__
class Sphere
{
public:
__host__
- Sphere(float3 centre, float r, float hue) :
+ Sphere(
cpu::
float3 centre, float r, float hue) :
centre(centre),
hueInitial(hue)
{
centre(centre),
hueInitial(hue)
{
@@
-23,7
+22,7
@@
class Sphere
}
__host__
}
__host__
- void setCentre(
float3
centre)
+ void setCentre(
const cpu::float3&
centre)
{
this->centre = centre;
}
{
this->centre = centre;
}
@@
-42,7
+41,7
@@
class Sphere
}
__device__
}
__device__
- float hCarre(float2 xySol)
+ float hCarre(
cpu::
float2 xySol)
{
float a = (centre.x - xySol.x);
float b = (centre.y - xySol.y);
{
float a = (centre.x - xySol.x);
float b = (centre.y - xySol.y);
@@
-87,7
+86,7
@@
class Sphere
private:
float r;
private:
float r;
- float3 centre;
+
cpu::
float3 centre;
float hueInitial;
float rCarre;
float hueInitial;
float rCarre;