aboutsummaryrefslogtreecommitdiffstats
path: root/src/jogl
diff options
context:
space:
mode:
Diffstat (limited to 'src/jogl')
-rw-r--r--src/jogl/classes/com/jogamp/graph/curve/Region.java36
-rw-r--r--src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java22
2 files changed, 26 insertions, 32 deletions
diff --git a/src/jogl/classes/com/jogamp/graph/curve/Region.java b/src/jogl/classes/com/jogamp/graph/curve/Region.java
index 068e0aabd..70f30a193 100644
--- a/src/jogl/classes/com/jogamp/graph/curve/Region.java
+++ b/src/jogl/classes/com/jogamp/graph/curve/Region.java
@@ -28,8 +28,6 @@
package com.jogamp.graph.curve;
import java.io.PrintStream;
-import java.time.Duration;
-import java.time.Instant;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -338,7 +336,7 @@ public abstract class Region {
protected static final int GL_INT32_MAX = 0x7fffffff; // 2,147,483,647
static class Perf {
- Instant t0 = null, t1 = null, t2 = null;
+ long t0 = 0, t1 = 0, t2 = 0;
// all td_ values are in [ns]
long td_vertices = 0;
long td_tri_push_idx = 0;
@@ -362,7 +360,7 @@ public abstract class Region {
}
public void clear() {
- t0 = null; t1 = null; t2 = null;
+ t0 = 0; t1 = 0; t2 = 0;
td_vertices = 0;
td_tri_push_idx = 0;
td_tri_push_vertidx = 0;
@@ -396,11 +394,11 @@ public abstract class Region {
}
@Override
- public Duration getTotalDuration() {
+ public long getTotalDuration() {
if( null != perf ) {
- return Duration.ofNanos(perf.td_total);
+ return perf.td_total;
} else {
- return Duration.ZERO;
+ return 0;
}
}
@@ -424,7 +422,7 @@ public abstract class Region {
public final void addOutlineShape(final OutlineShape shape, final AffineTransform t, final float[] rgbaColor) {
if( null != perf ) {
++perf.count;
- perf.t0 = Clock.getMonotonicTime();
+ perf.t0 = Clock.currentNanos();
}
if( null != frustum ) {
final AABBox shapeBox = shape.getBounds();
@@ -468,15 +466,15 @@ public abstract class Region {
vertsVNewIdxCount++;
}
if( null != perf ) {
- perf.t1 = Clock.getMonotonicTime();
- perf.td_vertices += Duration.between(perf.t0, perf.t1).toNanos();
+ perf.t1 = Clock.currentNanos();
+ perf.td_vertices += perf.t1 - perf.t0;
}
if(DEBUG_INSTANCE) {
System.err.println("Region.addOutlineShape(): Processing Triangles");
}
for(final Triangle triIn : trisIn) {
if( null != perf ) {
- perf.t2 = Clock.getMonotonicTime();
+ perf.t2 = Clock.currentNanos();
}
// if(Region.DEBUG_INSTANCE) {
// System.err.println("T["+i+"]: "+triIn);
@@ -487,7 +485,7 @@ public abstract class Region {
final int tv0Idx = triInVertices[0].getId();
if( null != perf ) {
- perf.td_tri_misc += Duration.between(perf.t2, Clock.getMonotonicTime()).toNanos();
+ perf.td_tri_misc += Clock.currentNanos() - perf.t2;
}
if ( max_indices - idxOffset > tv0Idx ) {
// valid 'known' idx - move by offset
@@ -495,11 +493,11 @@ public abstract class Region {
// System.err.println("T["+i+"]: Moved "+tv0Idx+" + "+idxOffset+" -> "+(tv0Idx+idxOffset));
// }
if( null != perf ) {
- final Instant tpi = Clock.getMonotonicTime();
+ final long tpi = Clock.currentNanos();
pushIndices(tv0Idx+idxOffset,
triInVertices[1].getId()+idxOffset,
triInVertices[2].getId()+idxOffset);
- perf.td_tri_push_idx += Duration.between(tpi, Clock.getMonotonicTime()).toNanos();
+ perf.td_tri_push_idx += Clock.currentNanos() - tpi;
} else {
pushIndices(tv0Idx+idxOffset,
triInVertices[1].getId()+idxOffset,
@@ -512,9 +510,9 @@ public abstract class Region {
// System.err.println("T["+i+"]: New Idx "+numVertices);
// }
if( null != perf ) {
- final Instant tpvi = Clock.getMonotonicTime();
+ final long tpvi = Clock.currentNanos();
pushNewVerticesIdxImpl(triInVertices[0], triInVertices[1], triInVertices[2], t, rgbaColor);
- perf.td_tri_push_vertidx += Duration.between(tpvi, Clock.getMonotonicTime()).toNanos();
+ perf.td_tri_push_vertidx += Clock.currentNanos() - tpvi;
} else {
pushNewVerticesIdxImpl(triInVertices[0], triInVertices[1], triInVertices[2], t, rgbaColor);
}
@@ -523,9 +521,9 @@ public abstract class Region {
tris++;
}
if( null != perf ) {
- final Instant ttriX = Clock.getMonotonicTime();
- perf.td_tri_total += Duration.between(perf.t1, ttriX).toNanos();
- perf.td_total += Duration.between(perf.t0, ttriX).toNanos();
+ final long ttriX = Clock.currentNanos();
+ perf.td_tri_total += ttriX - perf.t1;
+ perf.td_total += ttriX - perf.t0;
}
}
if(DEBUG_INSTANCE) {
diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
index ebc3eeacc..aba7d6807 100644
--- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
+++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java
@@ -43,8 +43,6 @@ import jogamp.graph.font.typecast.ot.table.KerningPair;
import jogamp.graph.font.typecast.ot.table.PostTable;
import java.io.PrintStream;
-import java.time.Duration;
-import java.time.Instant;
import java.util.concurrent.TimeUnit;
import com.jogamp.common.os.Clock;
@@ -368,7 +366,7 @@ class TypecastFont implements Font {
}
static class Perf {
- Instant t0 = null;
+ long t0 = 0;
// all td_ values are in [ns]
long td_visitor = 0;
long td_total = 0;
@@ -382,7 +380,7 @@ class TypecastFont implements Font {
}
public void clear() {
- t0 = null;
+ t0 = 0;
td_visitor = 0;
td_total = 0;
count = 0;
@@ -412,11 +410,11 @@ class TypecastFont implements Font {
}
@Override
- public Duration getTotalDuration() {
+ public long getTotalDuration() {
if( null != perf ) {
- return Duration.ofNanos(perf.td_total);
+ return perf.td_total;
} else {
- return Duration.ZERO;
+ return 0;
}
}
@@ -438,7 +436,7 @@ class TypecastFont implements Font {
}
if( null != perf ) {
++perf.count;
- perf.t0 = Clock.getMonotonicTime();
+ perf.t0 = Clock.currentNanos();
}
final AABBox res = new AABBox();
final int charCount = string.length();
@@ -480,10 +478,9 @@ class TypecastFont implements Font {
temp1.translate(advanceTotal, y, temp2);
res.resize(temp1.transform(glyphShape.getBounds(), temp_box));
if( null != perf ) {
- final Instant t1 = Clock.getMonotonicTime();
+ final long t1 = Clock.currentNanos();
visitor.visit(glyphShape, temp1);
- final Instant t2 = Clock.getMonotonicTime();
- perf.td_visitor += Duration.between(t1, t2).toNanos();
+ perf.td_visitor += Clock.currentNanos() - t1;
} else {
visitor.visit(glyphShape, temp1);
}
@@ -492,8 +489,7 @@ class TypecastFont implements Font {
}
}
if( null != perf ) {
- final Instant tX = Clock.getMonotonicTime();
- perf.td_total += Duration.between(perf.t0, tX).toNanos();
+ perf.td_total += Clock.currentNanos() - perf.t0;
}
return res;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-03 11:00:12 +0000