From 5d6e8a367c03644740187e500c6de5d3ac039d5e Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 20 Sep 2023 19:51:55 +0200 Subject: Bug 1452 - Decouple math functionality to 'com.jogamp.math' to be toolkit agnostic (PMVMatrix, Matrix4f, Vec4f, ..) Math functionality (PMVMatrix, Matrix4f, Vec4f, ..) - shall be used toolkit agnostic, e.g. independent from OpenGL - shall be reused within our upcoming Vulkan implementation - may also move outside of JOGL, i.e. GlueGen or within its own package to be reused for other purposed. The 'com.jogamp.opengl.util.PMVMatrix' currently also used to feed in GLUniformData via the toolkit agnostic SyncAction and SyncBuffer shall also be split to a toolkit agnostic variant. An OpenGL PMVMatrix specialization implementing GLMatrixFunc can still exist, being derived from the toolkit agnostic base implementation. +++ Initial commit .. compile clean, passing most unit tests. --- src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java | 4 ++-- src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java | 2 +- src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java | 2 +- src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java | 2 +- src/jogl/classes/jogamp/graph/font/typecast/ot/Glyph.java | 2 +- src/jogl/classes/jogamp/graph/font/typecast/ot/T2Glyph.java | 2 +- src/jogl/classes/jogamp/graph/font/typecast/ot/TTGlyph.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/jogl/classes/jogamp/graph/font') diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java index b153b813e..a8651389c 100644 --- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java +++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastFont.java @@ -31,8 +31,8 @@ import com.jogamp.common.util.IntObjectHashMap; import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.font.Font; import com.jogamp.graph.font.FontFactory; -import com.jogamp.graph.geom.plane.AffineTransform; -import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.math.geom.AABBox; +import com.jogamp.math.geom.plane.AffineTransform; import jogamp.graph.font.typecast.ot.OTFontCollection; import jogamp.graph.font.typecast.ot.TTFont; diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java index 3ace5c480..fa8271088 100644 --- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java +++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastGlyph.java @@ -29,7 +29,7 @@ package jogamp.graph.font.typecast; import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.font.Font; -import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.math.geom.AABBox; import jogamp.graph.font.typecast.ot.table.KernSubtable; import jogamp.graph.font.typecast.ot.table.KerningPair; diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java index 11f1ce7c7..900747f01 100644 --- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java +++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastHMetrics.java @@ -31,7 +31,7 @@ import jogamp.graph.font.typecast.ot.table.HeadTable; import jogamp.graph.font.typecast.ot.table.HheaTable; import com.jogamp.graph.font.Font.Metrics; -import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.math.geom.AABBox; final class TypecastHMetrics implements Metrics { private final TypecastFont fontImpl; diff --git a/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java b/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java index 816be92b2..248e023ed 100644 --- a/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java +++ b/src/jogl/classes/jogamp/graph/font/typecast/TypecastRenderer.java @@ -34,7 +34,7 @@ import jogamp.opengl.Debug; import com.jogamp.graph.curve.OutlineShape; import com.jogamp.graph.geom.Vertex; -import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.math.geom.AABBox; /** * Factory to build an {@link OutlineShape} from diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/Glyph.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/Glyph.java index 5bb610a1c..2c4394317 100644 --- a/src/jogl/classes/jogamp/graph/font/typecast/ot/Glyph.java +++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/Glyph.java @@ -18,7 +18,7 @@ package jogamp.graph.font.typecast.ot; -import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.math.geom.AABBox; /** * An individual glyph within a font. diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/T2Glyph.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/T2Glyph.java index 9df937121..b8c0c4900 100644 --- a/src/jogl/classes/jogamp/graph/font/typecast/ot/T2Glyph.java +++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/T2Glyph.java @@ -17,7 +17,7 @@ */ package jogamp.graph.font.typecast.ot; -import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.math.geom.AABBox; import jogamp.graph.font.typecast.cff.CharstringType2; import jogamp.graph.font.typecast.cff.T2Interpreter; diff --git a/src/jogl/classes/jogamp/graph/font/typecast/ot/TTGlyph.java b/src/jogl/classes/jogamp/graph/font/typecast/ot/TTGlyph.java index 5e0f83a33..d5f9eedc5 100644 --- a/src/jogl/classes/jogamp/graph/font/typecast/ot/TTGlyph.java +++ b/src/jogl/classes/jogamp/graph/font/typecast/ot/TTGlyph.java @@ -17,7 +17,7 @@ */ package jogamp.graph.font.typecast.ot; -import com.jogamp.opengl.math.geom.AABBox; +import com.jogamp.math.geom.AABBox; import jogamp.graph.font.typecast.ot.table.GlyfDescript; import jogamp.graph.font.typecast.ot.table.GlyphDescription; -- cgit v1.2.3