rusefi
/
jzy3d-api
mirror of https://github.com/rusefi/jzy3d-api.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

annotation with camera

This commit is contained in:
Martin Pernollet 2017-07-29 12:54:37 +02:00
parent ecbe5ef53d
commit 7eb12e8421
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jzy3d-api/.classpath
View File

@ -6,7 +6,12 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="src/tests"/>
<classpathentry kind="src" output="target/test-classes" path="src/tests">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="src/bridge">
<attributes>
<attribute name="optional" value="true"/>
@ -43,12 +48,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
<attributes>
<attribute name="maven.pomderived" value="true"/>

6
jzy3d-api/src/api/org/jzy3d/plot3d/rendering/view/View.java
View File

@ -867,7 +867,7 @@ public class View {
updateCamera(gl, glu, viewport, scaling);
renderAxeBox(gl, glu);
renderSceneGraph(gl, glu);
renderAnnotations(gl, glu);
renderAnnotations(gl, glu, cam);
}
public void updateQuality(GL gl) {
@ -1079,10 +1079,10 @@ public class View {
public void renderOverlay(GL gl, ViewportConfiguration viewportConfiguration) {
}
public void renderAnnotations(GL gl, GLU glu) {
public void renderAnnotations(GL gl, GLU glu, Camera camera) {
Transform transform = new Transform(new Scale(scaling));
annotations.getGraph().setTransform(transform);
annotations.getGraph().draw(gl, glu, null);
annotations.getGraph().draw(gl, glu, camera);
}
protected void correctCameraPositionForIncludingTextLabels(GL gl, GLU glu, ViewportConfiguration viewport) {