projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed ViewContext.
[sixth-3d.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
renderer
/
raster
/
ShapeCollection.java
diff --git
a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/ShapeCollection.java
b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/ShapeCollection.java
index
f563781
..
5210515
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/ShapeCollection.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/renderer/raster/ShapeCollection.java
@@
-1,5
+1,5
@@
/*
/*
- * Sixth 3D engine. Copyright ©2012-201
7
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Sixth 3D engine. Copyright ©2012-201
8
, 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
*
* 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
@@
-10,11
+10,11
@@
package eu.svjatoslav.sixth.e3d.renderer.raster;
import eu.svjatoslav.sixth.e3d.geometry.Point3D;
package eu.svjatoslav.sixth.e3d.renderer.raster;
import eu.svjatoslav.sixth.e3d.geometry.Point3D;
-import eu.svjatoslav.sixth.e3d.geometry.Transform;
-import eu.svjatoslav.sixth.e3d.geometry.TransformPipe;
import eu.svjatoslav.sixth.e3d.gui.Avatar;
import eu.svjatoslav.sixth.e3d.gui.RenderingContext;
import eu.svjatoslav.sixth.e3d.gui.Avatar;
import eu.svjatoslav.sixth.e3d.gui.RenderingContext;
-import eu.svjatoslav.sixth.e3d.gui.ViewContext;
+import eu.svjatoslav.sixth.e3d.gui.ViewPanel;
+import eu.svjatoslav.sixth.e3d.math.Transform;
+import eu.svjatoslav.sixth.e3d.math.TransformPipe;
import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractShape;
import java.util.ArrayList;
import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.AbstractShape;
import java.util.ArrayList;
@@
-39,7
+39,7
@@
public class ShapeCollection {
shapes.clear();
}
shapes.clear();
}
- public synchronized void paint(final View
Context viewContext
,
+ public synchronized void paint(final View
Panel viewPanel
,
final RenderingContext renderingContext) {
renderingContext.frameNumber++;
final RenderingContext renderingContext) {
renderingContext.frameNumber++;
@@
-47,8
+47,8
@@
public class ShapeCollection {
aggregator.reset();
transformPipe.clear();
aggregator.reset();
transformPipe.clear();
- // translate scene according to
avatar
current location
- final Avatar avatar = view
Context
.getAvatar();
+ // translate scene according to
camera
current location
+ final Avatar avatar = view
Panel
.getAvatar();
// rotate scene according to avatar looking direction
transformPipe.addTransform(new Transform(new Point3D(), avatar
// rotate scene according to avatar looking direction
transformPipe.addTransform(new Transform(new Point3D(), avatar