projects
/
sixth-3d-demos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed ViewListener interface. Renamed View to ViewPanel.
[sixth-3d-demos.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
examples
/
OctreeDemo.java
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
(executable)
--- 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.
* 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;
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;
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 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 {
import java.util.Vector;
public class OctreeDemo extends WorldNavigationTracker {
@@
-41,7
+39,7
@@
public class OctreeDemo extends WorldNavigationTracker {
private ShapeCollection shapeCollection;
private ViewContext context;
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();
}
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();
final ViewFrame viewFrame = new ViewFrame();
- context = viewFrame.getView().getContext();
+ context = viewFrame.getView
Panel
().getContext();
context.getAvatar().setLocation(new Point3D(0, -30, -300));
context.getAvatar().setLocation(new Point3D(0, -30, -300));
@@
-127,7
+125,7
@@
public class OctreeDemo extends WorldNavigationTracker {
shapeCollection.addShape(message);
context.getKeyboardFocusTracker().setFocusOwner(this);
shapeCollection.addShape(message);
context.getKeyboardFocusTracker().setFocusOwner(this);
- context.getView().repaintDuringNextViewUpdate();
+ context.getView
Panel
().repaintDuringNextViewUpdate();
}
@Override
}
@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(),
// initialize and start Raytracer in a separate thread
final RayTracer rayTracer = new RayTracer(camera.getTexture(),
- octreeVolume, lights, camera, context.getView());
+ octreeVolume, lights, camera, context.getView
Panel
());
final Thread thread = new Thread(rayTracer);
thread.start();
}
final Thread thread = new Thread(rayTracer);
thread.start();
}