From 6c97c5fa201d221a37773db54994d27e34ba86c3 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sat, 23 Sep 2023 03:11:57 +0200
Subject: Bug 1452: GraphUI Shape: Rename setMvTransform(..) ->
setTransformMv(..), aligning w/ PMVMatrix4f naming ..
Original name was simply setTransform(..), so now let's keep using the suffix denominating the matrix
while keep the main subject/verb upfront. Was an off reading ..
---
src/demos/com/jogamp/opengl/demos/graph/ui/UIGraphDemoU01a.java | 2 +-
src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java | 2 +-
src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java | 6 +++---
src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'src/demos/com/jogamp/opengl')
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UIGraphDemoU01a.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UIGraphDemoU01a.java
index f22177a18..e495186c3 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UIGraphDemoU01a.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UIGraphDemoU01a.java
@@ -311,7 +311,7 @@ public class UIGraphDemoU01a {
}
if( !textOnly ) {
pmv.pushMv();
- shape.setMvTransform(pmv);
+ shape.setTransformMv(pmv);
shape.draw(gl, renderer, sampleCount);
if( onceAtDisplay ) {
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 c6e09fa5c..987908624 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UISceneDemo01b.java
@@ -174,7 +174,7 @@ public class UISceneDemo01b {
}
System.err.println("Shape "+shape);
final PMVMatrix4f pmv = new PMVMatrix4f();
- shape.setMvTransform(pmv);
+ shape.setTransformMv(pmv);
System.err.println("Shape "+pmv);
}
}
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java
index e34e2dec7..124a9aeda 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UIShapeDemo01.java
@@ -237,7 +237,7 @@ public class UIShapeDemo01 implements GLEventListener {
private void drawShape(final GL2ES2 gl, final RegionRenderer renderer, final Shape shape) {
final PMVMatrix4f pmv = renderer.getMatrix();
pmv.pushMv();
- shape.setMvTransform(pmv);
+ shape.setTransformMv(pmv);
shape.draw(gl, renderer, sampleCount);
if( once ) {
System.err.println("draw.0: "+shape);
@@ -393,7 +393,7 @@ public class UIShapeDemo01 implements GLEventListener {
{
pmv.pushMv();
- button.setMvTransform(pmv);
+ button.setTransformMv(pmv);
System.err.println("\n\nButton: "+button);
final Vec3f objPos = button.winToShapeCoord(pmv, viewport, glWinX, glWinY, new Vec3f());
@@ -410,7 +410,7 @@ public class UIShapeDemo01 implements GLEventListener {
}
{
pmv.pushMv();
- crossHair.setMvTransform(pmv);
+ crossHair.setTransformMv(pmv);
final Vec3f objPosC = crossHair.getBounds().getCenter();
System.err.println("\n\nCrossHair: "+crossHair);
diff --git a/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java b/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java
index b89082d6d..38181cc83 100644
--- a/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java
+++ b/src/demos/com/jogamp/opengl/demos/graph/ui/UITypeDemo01.java
@@ -258,7 +258,7 @@ public class UITypeDemo01 implements GLEventListener {
private void drawShape(final GL2ES2 gl, final PMVMatrix4f pmv, final RegionRenderer renderer, final Shape shape) {
pmv.pushMv();
- shape.setMvTransform(pmv);
+ shape.setTransformMv(pmv);
shape.draw(gl, renderer, sampleCount);
pmv.popMv();
}
@@ -463,7 +463,7 @@ public class UITypeDemo01 implements GLEventListener {
{
pmv.pushMv();
- crossHair.setMvTransform(pmv);
+ crossHair.setTransformMv(pmv);
final Vec3f objPosC = crossHair.getBounds().getCenter();
System.err.println("\n\nCrossHair: "+crossHair);
--
cgit v1.2.3