summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300>2006-03-08 23:58:35 +0000
committerkcr <kcr@28c7f869-5b4e-e670-f602-82bfaf57f300>2006-03-08 23:58:35 +0000
commite91f424c2f3dd2619a6774551e5a84d040db02be (patch)
tree6aaefa2eb4a30d355417fb20decfd6f924bff06e
parent90d0d3acb6dc4be05e78de6fd08f0ae121277c6d (diff)
1. Allow "ant compile" to work even if Java 3D is not in CLASSPATH
2. Remove minimumFrameCycleTime from FPSCounterDemo
-rw-r--r--build.xml11
-rw-r--r--src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java3
2 files changed, 10 insertions, 4 deletions
diff --git a/build.xml b/build.xml
index f0e1808..ab792c2 100644
--- a/build.xml
+++ b/build.xml
@@ -63,7 +63,7 @@
<property name="native.dir" location="${j3ddir}/native"/>
</target>
- <target name="compile" depends="init">
+ <target name="compile" depends="init-compile">
<!-- Create the build directory -->
<mkdir dir="${build}/classes"/>
@@ -74,6 +74,7 @@
target="1.5"
debug="true"
deprecation="off">
+ <classpath refid="comp.classpath"/>
</javac>
<!-- Copy resources to build in preparation for jarring -->
@@ -123,6 +124,14 @@
<delete dir="${dist}"/>
</target>
+ <target name="init-compile" depends="init">
+ <path id="comp.classpath">
+ <pathelement location="${j3dcore.jar}"/>
+ <pathelement location="${j3dutils.jar}"/>
+ <pathelement location="${vecmath.jar}"/>
+ </path>
+ </target>
+
<target name="init-run" depends="init,jar">
<path id="run.classpath">
<pathelement location="${output.jar}"/>
diff --git a/src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java b/src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java
index d7f8ee9..88ca026 100644
--- a/src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java
+++ b/src/classes/org/jdesktop/j3d/examples/fps_counter/FPSCounterDemo.java
@@ -118,9 +118,6 @@ public class FPSCounterDemo extends javax.swing.JFrame {
// objects in the scene can be viewed.
univ.getViewingPlatform().setNominalViewingTransform();
- // Ensure at least 5 msec per frame (i.e., < 200Hz)
- univ.getViewer().getView().setMinimumFrameCycleTime(5);
-
return c;
}