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
/
04_RayTracing
/
moo
/
device
/
RayTracingDevice.cu
diff --git
a/WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/RayTracingDevice.cu
b/WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/RayTracingDevice.cu
index
97fc839
..
22d05d1
100644
(file)
--- a/
WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/RayTracingDevice.cu
+++ b/
WCudaMSE/Student_Cuda_Image/src/cpp/core/04_RayTracing/moo/device/RayTracingDevice.cu
@@
-68,7
+68,7
@@
ConstantMemoryLink constantMemorySpheresLink()
float brightness = 0;
float hue = 0;
float brightness = 0;
float hue = 0;
- // Sélectionne la sph
ere la plus proche, il peut ne pas y avoir de sphèr
e.
+ // Sélectionne la sph
ère la plus proche, il peut ne pas y avoir de sphère trouvé
e.
for (int i = 0; i < NB_SPHERES; ++i)
{
#if CURRENT_MEMORY_MODEL == MEMORY_MODEL_GLOBAL
for (int i = 0; i < NB_SPHERES; ++i)
{
#if CURRENT_MEMORY_MODEL == MEMORY_MODEL_GLOBAL
@@
-78,6
+78,7
@@
ConstantMemoryLink constantMemorySpheresLink()
#elif CURRENT_MEMORY_MODEL == MEMORY_MODEL_SHARED
const Sphere& sphere = tabSpheresSM[i];
#endif
#elif CURRENT_MEMORY_MODEL == MEMORY_MODEL_SHARED
const Sphere& sphere = tabSpheresSM[i];
#endif
+
const float hSquare = sphere.hSquare(pixel);
if (sphere.isBelow(hSquare))
const float hSquare = sphere.hSquare(pixel);
if (sphere.isBelow(hSquare))
@@
-94,7
+95,7
@@
ConstantMemoryLink constantMemorySpheresLink()
}
}
}
}
- // Si une sph
e
re a pu être trouvée.
+ // Si une sph
è
re a pu être trouvée.
if (selectedSphereDistance != FLT_MAX)
{
ColorTools::HSB_TO_RVB(hue, 1, brightness, &ptrDevPixels[s]);
if (selectedSphereDistance != FLT_MAX)
{
ColorTools::HSB_TO_RVB(hue, 1, brightness, &ptrDevPixels[s]);