X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Foctree%2Fraytracer%2FRayTracer.java;fp=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Foctree%2Fraytracer%2FRayTracer.java;h=52bec7d6c677f780a92ae820b2a18f8c344c7f21;hp=daeb417d5123af95c0e8795b586a238ce2fab627;hb=163f1c4b65973edd8528f8619e88db7da2de5c47;hpb=a3ff3683bd0a025061667b26b6fcf56fe20f0afc diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/RayTracer.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/RayTracer.java index daeb417..52bec7d 100755 --- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/RayTracer.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/RayTracer.java @@ -116,7 +116,7 @@ public class RayTracer implements Runnable { if (intersectingCell != -1) { // if lightening not computed, compute it - if (octreeVolume.ce3[intersectingCell] == -1) + if (octreeVolume.cell3[intersectingCell] == -1) // if cell is larger than 1 if (ray.hitCellSize > 1) { // break it up @@ -294,7 +294,7 @@ public class RayTracer implements Runnable { } - final int cellColor = octreeVolume.ce2[intersectingCell]; + final int cellColor = octreeVolume.cell2[intersectingCell]; red = (red * ((cellColor & 0xFF0000) >> 16)) / 255; green = (green * ((cellColor & 0xFF00) >> 8)) / 255; @@ -307,13 +307,13 @@ public class RayTracer implements Runnable { if (blue > 255) blue = 255; - octreeVolume.ce3[intersectingCell] = (((int) red) << 16) + octreeVolume.cell3[intersectingCell] = (((int) red) << 16) + (((int) green) << 8) + ((int) blue); } - if (octreeVolume.ce3[intersectingCell] == 0) - return octreeVolume.ce2[intersectingCell]; - return octreeVolume.ce3[intersectingCell]; + if (octreeVolume.cell3[intersectingCell] == 0) + return octreeVolume.cell2[intersectingCell]; + return octreeVolume.cell3[intersectingCell]; } // return (200 << 16) + (200 << 8) + 255;