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;h=35ec06bb52fefc2ae99042ea8c85bb80cf1a7561;hp=5137b5a0c18dcc03f567573658916d7145435141;hb=96f76bab30b47db83a1c9061b8916c69657f1e13;hpb=b1e8d7bd8c9d0905e9fe3c46fc84a11779b95982 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 5137b5a..35ec06b 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 @@ -1,5 +1,5 @@ /* - * Sixth 3D engine. Copyright ©2012-2017, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Sixth 3D engine. Copyright ©2012-2018, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu * * This program is free software; you can redistribute it and/or * modify it under the terms of version 3 of the GNU Lesser General Public License @@ -9,7 +9,7 @@ package eu.svjatoslav.sixth.e3d.renderer.octree.raytracer; -import eu.svjatoslav.sixth.e3d.gui.View; +import eu.svjatoslav.sixth.e3d.gui.ViewPanel; import eu.svjatoslav.sixth.e3d.renderer.octree.OctreeVolume; import eu.svjatoslav.sixth.e3d.renderer.raster.Color; import eu.svjatoslav.sixth.e3d.renderer.raster.texture.Texture; @@ -21,20 +21,20 @@ public class RayTracer implements Runnable { private static final int PROGRESS_UPDATE_FREQUENCY_MILLIS = 1000; private final Camera camera; private final Texture texture; - private final View view; + private final ViewPanel viewPanel; private OctreeVolume octreeVolume; private Vector lights; private int computedLights; public RayTracer(final Texture texture, final OctreeVolume octreeVolume, final Vector lights, final Camera camera, - final View view) { + final ViewPanel viewPanel) { this.texture = texture; this.octreeVolume = octreeVolume; this.lights = lights; this.camera = camera; - this.view = view; + this.viewPanel = viewPanel; } @Override @@ -101,12 +101,12 @@ public class RayTracer implements Runnable { nextBitmapUpdate = System.currentTimeMillis() + PROGRESS_UPDATE_FREQUENCY_MILLIS; texture.resetResampledBitmapCache(); - view.repaintDuringNextViewUpdate(); + viewPanel.repaintDuringNextViewUpdate(); } } texture.resetResampledBitmapCache(); - view.repaintDuringNextViewUpdate(); + viewPanel.repaintDuringNextViewUpdate(); // System.out.println("Raytracing done."); // System.out.println("New lights computed:" + computedLights); }