From 59a7fdeb4ed36f0014ba1fdcc0ec144c04aaa2d5 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 21 Mar 2023 09:33:06 +0100 Subject: Graph: Cleanup Vertex.Factory referencing: Only bind to OutlineShape and use its default. GraphUI: Always use default. Graph RegionRenderer, its RenderState as well as GraphUI's Scene don't need to have knowledge of Vertex.Factory, which is only used within OutlineShape and its 'inner geom workings'. --- src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java') diff --git a/src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java b/src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java index 16e5c736f..24df8c80a 100644 --- a/src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java +++ b/src/graphui/classes/com/jogamp/graph/ui/gl/Scene.java @@ -46,8 +46,6 @@ import com.jogamp.common.nio.Buffers; import com.jogamp.graph.curve.Region; import com.jogamp.graph.curve.opengl.RegionRenderer; import com.jogamp.graph.curve.opengl.RenderState; -import com.jogamp.graph.geom.SVertex; -import com.jogamp.graph.geom.Vertex; import com.jogamp.newt.event.GestureHandler; import com.jogamp.newt.event.InputEvent; import com.jogamp.newt.event.MouseEvent; @@ -117,11 +115,8 @@ public final class Scene implements GLEventListener { private GLAutoDrawable cDrawable = null; - /** Returns the default Vertex.Factory. */ - public static Vertex.Factory getDefaultVertexFactory() { return SVertex.factory(); } - private static RegionRenderer createRenderer() { - return RegionRenderer.create(getDefaultVertexFactory(), RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable); + return RegionRenderer.create(RegionRenderer.defaultBlendEnable, RegionRenderer.defaultBlendDisable); } /** @@ -150,9 +145,6 @@ public final class Scene implements GLEventListener { /** Returns the associated RegionRenderer's RenderState. */ public RenderState getRenderState() { return renderer.getRenderState(); } - /** Returns the used Vertex.Factory, as used by Region and RegionRenderer. */ - public final Vertex.Factory getVertexFactory() { return renderer.getRenderState().getVertexFactory(); } - /** * Sets the clear parameter for {@link GL#glClearColor(float, float, float, float) glClearColor(..)} and {@link GL#glClear(int) glClear(..)} * to be issued at {@link #display(GLAutoDrawable)}. -- cgit v1.2.3