aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-04-13 00:32:51 +0200
committerSven Gothel <[email protected]>2023-04-13 00:32:51 +0200
commiteabb01bcf5ea4b10431d9b2b58e35bb5ed49b1e6 (patch)
tree6ec7993a034202d5284e717ec81a3d6f0dc81446
parent6a0ac90182efba40b0e6dab8f6390898aced70e8 (diff)
GraphUI Demos: Fix var-name typo, its velocity
.. or how to propagate a typo from an initial test case to all of 'em ;-)
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java6
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java6
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java6
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java6
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java4
-rw-r--r--src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java4
6 files changed, 16 insertions, 16 deletions
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java
index f7e3e5005..ea64bd89e 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo00.java
@@ -134,7 +134,7 @@ public class UISceneDemo00 {
final float dist_m = dist_px/pixPerMM/1e3f; // [m]
final float velocity = 50/1e3f; // [m]/[s]
final float velocity_px = velocity * 1e3f * pixPerMM; // [px]/[s]
- final float velovity_obj = velocity_px / pixPerShapeUnit[0]; // [shapeUnit]/[s]
+ final float velocity_obj = velocity_px / pixPerShapeUnit[0]; // [shapeUnit]/[s]
final float exp_dur_s = dist_m / velocity; // [s]
System.err.println();
@@ -143,7 +143,7 @@ public class UISceneDemo00 {
System.err.println();
System.err.printf("Distance: %.0f pixel @ %.3f px/mm, %.3f mm%n", dist_px, pixPerMM, dist_m*1e3f);
System.err.printf("Velocity: %.3f mm/s, %.3f px/s, %.6f obj/s, expected travel-duration %.3f s%n",
- velocity*1e3f, velocity_px, velovity_obj, exp_dur_s);
+ velocity*1e3f, velocity_px, velocity_obj, exp_dur_s);
final long t0_us = Clock.currentNanos() / 1000; // [us]
long t1_us = t0_us;
@@ -153,7 +153,7 @@ public class UISceneDemo00 {
final float dt_s = ( t2_us - t1_us ) / 1e6f;
t1_us = t2_us;
- final float dx = velovity_obj * dt_s; // [shapeUnit]
+ final float dx = velocity_obj * dt_s; // [shapeUnit]
// System.err.println("move ")
// Move on GL thread to have vsync for free
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java
index a06c4b29e..153dd5b51 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01.java
@@ -145,7 +145,7 @@ public class UISceneDemo01 {
final float dist_m = dist_px/pixPerMM/1e3f; // [m]
final float velocity = 50/1e3f; // [m]/[s]
final float velocity_px = velocity * 1e3f * pixPerMM; // [px]/[s]
- final float velovity_obj = velocity_px / pixPerShapeUnit[0]; // [shapeUnit]/[s]
+ final float velocity_obj = velocity_px / pixPerShapeUnit[0]; // [shapeUnit]/[s]
final float exp_dur_s = dist_m / velocity; // [s]
System.err.println();
@@ -154,7 +154,7 @@ public class UISceneDemo01 {
System.err.println();
System.err.printf("Distance: %.0f pixel @ %.3f px/mm, %.3f mm%n", dist_px, pixPerMM, dist_m*1e3f);
System.err.printf("Velocity: %.3f mm/s, %.3f px/s, %.6f obj/s, expected travel-duration %.3f s%n",
- velocity*1e3f, velocity_px, velovity_obj, exp_dur_s);
+ velocity*1e3f, velocity_px, velocity_obj, exp_dur_s);
final long t0_us = Clock.currentNanos() / 1000; // [us]
long t1_us = t0_us;
@@ -164,7 +164,7 @@ public class UISceneDemo01 {
final float dt_s = ( t2_us - t1_us ) / 1e6f;
t1_us = t2_us;
- final float dx = velovity_obj * dt_s; // [shapeUnit]
+ final float dx = velocity_obj * dt_s; // [shapeUnit]
// System.err.println("move ")
// Move on GL thread to have vsync for free
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java
index 1e0fddb2b..568a5059c 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java
@@ -156,7 +156,7 @@ public class UISceneDemo01b {
final float dist_m = dist_px/pixPerMM/1e3f; // [m]
final float velocity = 50/1e3f; // [m]/[s]
final float velocity_px = velocity * 1e3f * pixPerMM; // [px]/[s]
- final float velovity_obj = velocity_px / pixPerShapeUnit[0]; // [shapeUnit]/[s]
+ final float velocity_obj = velocity_px / pixPerShapeUnit[0]; // [shapeUnit]/[s]
final float exp_dur_s = dist_m / velocity; // [s]
System.err.println();
@@ -165,7 +165,7 @@ public class UISceneDemo01b {
System.err.println();
System.err.printf("Distance: %.0f pixel @ %.3f px/mm, %.3f mm%n", dist_px, pixPerMM, dist_m*1e3f);
System.err.printf("Velocity: %.3f mm/s, %.3f px/s, %.6f obj/s, expected travel-duration %.3f s%n",
- velocity*1e3f, velocity_px, velovity_obj, exp_dur_s);
+ velocity*1e3f, velocity_px, velocity_obj, exp_dur_s);
shape.addMouseListener( new Shape.MouseGestureAdapter() {
@Override
@@ -204,7 +204,7 @@ public class UISceneDemo01b {
final float dt_s = ( t2_us - t1_us ) / 1e6f;
t1_us = t2_us;
- final float dx = velovity_obj * dt_s; // [shapeUnit]
+ final float dx = velocity_obj * dt_s; // [shapeUnit]
// System.err.println("move ")
// Move on GL thread to have vsync for free
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java
index 77827656f..7e74f1db5 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo02.java
@@ -231,7 +231,7 @@ public class UISceneDemo02 {
// req_velocity = init_velocity;
}
final float velocity_px = req_velocity * 1e3f * pixPerMM; // [px]/[s]
- final float velovity_obj = velocity_px / movingGlyphPixPerShapeUnit[0]; // [shapeUnit]/[s]
+ final float velocity_obj = velocity_px / movingGlyphPixPerShapeUnit[0]; // [shapeUnit]/[s]
if( 0 == idx ) {
System.err.println();
@@ -241,7 +241,7 @@ public class UISceneDemo02 {
System.err.println();
System.err.printf("Distance: %.0f pixel @ %.3f px/mm, %.3f mm%n", dist_px, pixPerMM, dist_m*1e3f);
System.err.printf("Velocity: init %.3f mm/s, req %.3f mm/s, %.3f px/s, %.6f obj/s, duration exp %.3f s, req %.3f s%n",
- init_velocity*1e3f, req_velocity*1e3f, velocity_px, velovity_obj, exp_dur_s, req_dur_s);
+ init_velocity*1e3f, req_velocity*1e3f, velocity_px, velocity_obj, exp_dur_s, req_dur_s);
// System.err.println();
// System.err.printf("Path: start %.4f, end %.4f, pos %.5f%n", start_pos, end_pos, movingGlyph.getPosition()[0]);
}
@@ -255,7 +255,7 @@ public class UISceneDemo02 {
window.invoke(true, (drawable) -> {
t3_us[0] = Clock.currentNanos() / 1000;
final float dt_s = ( t3_us[0] - t2_us[0] ) / 1e6f;
- final float dx = -1f * velovity_obj * dt_s; // [shapeUnit]
+ final float dx = -1f * velocity_obj * dt_s; // [shapeUnit]
movingGlyph.move(dx, 0f, 0f);
final String text = String.format("%s, anim-duration %.1f s",
scene.getStatusText(drawable, renderModes, 0, dpiV), req_total_dur_s);
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java
index 35f925f82..16c0364a7 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03.java
@@ -322,8 +322,8 @@ public class UISceneDemo03 {
t2_us[0] = t3_us;
final float velocity_px = velocity * 1e3f * pixPerMM; // [px]/[s]
- final float velovity_obj = velocity_px / movingGlyphPixPerShapeUnit[0]; // [shapeUnit]/[s]
- final float dxy = velovity_obj * dt_s; // [shapeUnit]
+ final float velocity_obj = velocity_px / movingGlyphPixPerShapeUnit[0]; // [shapeUnit]/[s]
+ final float dxy = velocity_obj * dt_s; // [shapeUnit]
for (int idx = glyphShapes.size() - 1; 0 <= idx; --idx) {
final GlyphShape glyph = glyphShapes.get(idx);
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java
index 27377d202..c5488de75 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo03b.java
@@ -412,8 +412,8 @@ public class UISceneDemo03b {
t2_us[0] = t3_us;
final float velocity_px = velocity * 1e3f * pixPerMM; // [px]/[s]
- final float velovity_obj = velocity_px / movingGlyphPixPerShapeUnit[0]; // [shapeUnit]/[s]
- final float dxy = velovity_obj * dt_s; // [shapeUnit]
+ final float velocity_obj = velocity_px / movingGlyphPixPerShapeUnit[0]; // [shapeUnit]/[s]
+ final float dxy = velocity_obj * dt_s; // [shapeUnit]
for (int idx = glyphShapes.size() - 1; 0 <= idx; --idx) {
final GlyphShape glyph = glyphShapes.get(idx);