X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d-demos.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Fexamples%2FOctreeDemo.java;h=f5a9d0855b8d5caaa71d5bb528e2b18923dd4210;hp=9e1f3ef5e975cac04dd941cee3528979941abe90;hb=335758c2678788d95da705b28dbebe4ba206c103;hpb=8699433dbd9238c4d926d78bd2e50f892fc51324

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/examples/OctreeDemo.java b/src/main/java/eu/svjatoslav/sixth/e3d/examples/OctreeDemo.java
index 9e1f3ef..f5a9d08 100755
--- a/src/main/java/eu/svjatoslav/sixth/e3d/examples/OctreeDemo.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/examples/OctreeDemo.java
@@ -1,7 +1,6 @@
 /*
- * Sixth - System for data storage, computation, exploration and interaction.
- * Copyright ©2012-2016, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Sixth 3D engine demos. 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
  * or later as published by the Free Software Foundation.
@@ -10,7 +9,7 @@
 package eu.svjatoslav.sixth.e3d.examples;
 
 import eu.svjatoslav.sixth.e3d.geometry.Point3D;
-import eu.svjatoslav.sixth.e3d.geometry.Transform;
+import eu.svjatoslav.sixth.e3d.math.Transform;
 import eu.svjatoslav.sixth.e3d.gui.ViewContext;
 import eu.svjatoslav.sixth.e3d.gui.ViewFrame;
 import eu.svjatoslav.sixth.e3d.gui.humaninput.WorldNavigationTracker;
@@ -28,7 +27,6 @@ import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.composite.textcanvas.TextC
 import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.composite.wireframe.Grid3D;
 
 import java.awt.event.KeyEvent;
-import java.io.IOException;
 import java.util.Vector;
 
 public class OctreeDemo extends WorldNavigationTracker {
@@ -41,7 +39,7 @@ public class OctreeDemo extends WorldNavigationTracker {
     private ShapeCollection shapeCollection;
     private ViewContext context;
 
-    public static void main(final String[] args) throws IOException {
+    public static void main(final String[] args) {
         new OctreeDemo().init();
     }
 
@@ -89,10 +87,10 @@ public class OctreeDemo extends WorldNavigationTracker {
         }
     }
 
-    private void init() throws IOException {
+    private void init() {
 
         final ViewFrame viewFrame = new ViewFrame();
-        context = viewFrame.getView().getContext();
+        context = viewFrame.getViewPanel().getContext();
 
         context.getAvatar().setLocation(new Point3D(0, -30, -300));
 
@@ -127,7 +125,7 @@ public class OctreeDemo extends WorldNavigationTracker {
         shapeCollection.addShape(message);
 
         context.getKeyboardFocusTracker().setFocusOwner(this);
-        context.getView().repaintDuringNextViewUpdate();
+        context.getViewPanel().repaintDuringNextViewUpdate();
     }
 
     @Override
@@ -166,7 +164,7 @@ public class OctreeDemo extends WorldNavigationTracker {
 
         // initialize and start Raytracer in a separate thread
         final RayTracer rayTracer = new RayTracer(camera.getTexture(),
-                octreeVolume, lights, camera, context.getView());
+                octreeVolume, lights, camera, context.getViewPanel());
         final Thread thread = new Thread(rayTracer);
         thread.start();
     }