X-Git-Url: http://git.euphorik.ch/?p=GPU.git;a=blobdiff_plain;f=WCudaMSE%2FStudent_Cuda_Image%2Fsrc%2Fcpp%2Fcore%2F04_RayTracing%2Fmoo%2Fdevice%2FSphere.h;h=0567fb8a389d70271c09af289856206cdee21ce0;hp=566b4ab78ea8df10b24a99976f4fa8160e5a57db;hb=f2c6a4fc79746e2d5c6678699bd2ca93ffc49bcc;hpb=ebdad7dc732d4742d09fd72d312175cb07d27a59

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
--- 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 "mathTools.h"
+#include "MathTools.h"
 
-#endif
 class Sphere
     {
     public:
         __host__
-        Sphere(float3 centre, float r, float hue) :
+        Sphere(cpu::float3 centre, float r, float hue) :
             centre(centre),
             hueInitial(hue)
             {
@@ -23,7 +22,7 @@ class Sphere
             }
 
         __host__
-        void setCentre(float3 centre)
+        void setCentre(const cpu::float3& centre)
             {
             this->centre = centre;
             }
@@ -42,7 +41,7 @@ class Sphere
             }
 
         __device__
-        float hCarre(float2 xySol)
+        float hCarre(cpu::float2 xySol)
             {
             float a = (centre.x - xySol.x);
             float b = (centre.y - xySol.y);
@@ -87,7 +86,7 @@ class Sphere
 
     private:
         float r;
-        float3 centre;
+        cpu::float3 centre;
         float hueInitial;
         float rCarre;