aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarvey Harrison <[email protected]>2014-08-07 13:52:42 -0700
committerHarvey Harrison <[email protected]>2014-08-07 14:02:19 -0700
commit8c020c06a4f552bb66edc72afdf2becba01df89c (patch)
treec186ef749acdba974799907c2bd3c391703e6dd3
parentf5ddb290db27cda63c78510ec8b8fdbdf4bc2bf4 (diff)
j3dcore: fix up compile to build with JOGL release 2.2.0
setSize became setSurfaceSize. Signed-off-by: Harvey Harrison <[email protected]>
-rw-r--r--build.xml4
-rw-r--r--src/classes/share/javax/media/j3d/JoglPipeline.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/build.xml b/build.xml
index e1c7f4c..0ad31c5 100644
--- a/build.xml
+++ b/build.xml
@@ -11,8 +11,8 @@
<property name="j3dtools.src.dir" location="${j3dtools.dir}/src"/>
<property name="vecmath.lib" location="../vecmath/build/jars/vecmath.jar"/>
- <property name="jogl.lib" location="../../jogl-v2.0.2/jogl-all.jar"/>
- <property name="gluegen.lib" location="../../jogl-v2.0.2/gluegen-rt.jar"/>
+ <property name="jogl.lib" location="../../jogl-v2.2.0/jogl-all.jar"/>
+ <property name="gluegen.lib" location="../../jogl-v2.2.0/gluegen-rt.jar"/>
<property name="version_base" value="1.6.0"/>
<property name="build.spec.title" value="3D Graphics API for the Java Platform"/>
diff --git a/src/classes/share/javax/media/j3d/JoglPipeline.java b/src/classes/share/javax/media/j3d/JoglPipeline.java
index dedf39a..a60a73f 100644
--- a/src/classes/share/javax/media/j3d/JoglPipeline.java
+++ b/src/classes/share/javax/media/j3d/JoglPipeline.java
@@ -6267,7 +6267,7 @@ class JoglPipeline extends Pipeline {
if (proxySurface != null) {
final UpstreamSurfaceHook ush = proxySurface.getUpstreamSurfaceHook();
if (ush instanceof UpstreamSurfaceHook.MutableSize) {
- ((UpstreamSurfaceHook.MutableSize)ush).setSize(newWidth, newHeight);
+ ((UpstreamSurfaceHook.MutableSize)ush).setSurfaceSize(newWidth, newHeight);
}
}
/*else if(DEBUG) { // we have to assume surface contains the new size already, hence size check @ bottom