Skip to content

Commit 91cc4af

Browse files
committed
Different package name, package contains TextureData
1 parent 6cd60f5 commit 91cc4af

File tree

9 files changed

+14
-1158
lines changed

9 files changed

+14
-1158
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
<version>${jogl.version}</version>
6969
</dependency>
7070
<dependency>
71-
<groupId>com.github.opengrabeso</groupId>
71+
<groupId>net.opengrabeso</groupId>
7272
<artifactId>text-renderer</artifactId>
73-
<version>0.1.11</version>
73+
<version>0.1.14-SNAPSHOT</version>
7474

7575
</dependency>
7676
<dependency>

src/main/java/net/opengrabeso/glg2d/GLG2DSimpleEventListener.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height
117117
* calls.
118118
*/
119119
protected GLGraphics2D createGraphics2D(GLAutoDrawable drawable) {
120-
return new GLShaderGraphics2D(JoGL.wrap(drawable.getContext().getGL().getGL3()));
121-
//return new GLGraphics2D(JoGL.wrap(drawable.getContext().getGL().getGL2()));
120+
//return new GLShaderGraphics2D(JoGL.wrap(drawable.getContext().getGL().getGL3()));
121+
return new GLGraphics2D(JoGL.wrap(drawable.getContext().getGL().getGL2()));
122122
}
123123

124124
@Override

src/main/java/net/opengrabeso/glg2d/impl/AbstractImageHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import net.opengrabeso.glg2d.GLGraphics2D;
4545

4646
import net.opengrabeso.opengl.util.texture.Texture;
47-
import com.github.opengrabeso.ogltext.util.texture.TextureCoords;
47+
import net.opengrabeso.opengl.util.texture.TextureCoords;
4848
import net.opengrabeso.opengl.util.texture.TextureData;
4949

5050
public abstract class AbstractImageHelper implements GLG2DImageHelper {

src/main/java/net/opengrabeso/glg2d/impl/gl2/GL2StringDrawer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import net.opengrabeso.glg2d.impl.AbstractTextDrawer;
2626

27-
import com.github.opengrabeso.ogltext.util.awt.TextRenderer;
27+
import net.opengrabeso.opengl.util.awt.TextRenderer;
2828

2929
/**
3030
* Draws text for the {@code GLGraphics2D} class.
@@ -65,9 +65,9 @@ public void drawString(String string, int x, int y) {
6565

6666
begin(renderer);
6767
if (useVerticalFlip()) {
68-
renderer.draw3D(string, x, y, 0, 1, true);
68+
renderer.draw3D(string, x, y, 0, 1);
6969
} else {
70-
renderer.draw3D(string, x, g2d.getCanvasHeight() - y, 0, 1, false);
70+
renderer.draw3D(string, x, g2d.getCanvasHeight() - y, 0, 1);
7171
}
7272
end(renderer);
7373
}

src/main/java/net/opengrabeso/glg2d/impl/gl2/GL2StringDrawerImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package net.opengrabeso.glg2d.impl.gl2;
22

33
import com.github.opengrabeso.jaagl.GL2;
4-
import com.github.opengrabeso.ogltext.util.awt.TextRenderer;
4+
import net.opengrabeso.opengl.util.awt.TextRenderer;
55
import com.jogamp.opengl.fixedfunc.GLMatrixFunc;
66

77
import java.awt.*;
@@ -16,7 +16,7 @@ public GL2StringDrawerImpl(GL2 gl) {
1616

1717
@Override
1818
protected TextRenderer createTextRenderer(Font font, boolean antialias) {
19-
return new TextRenderer(font, antialias, false, gl);
19+
return new TextRenderer(gl, font, antialias, false);
2020
}
2121

2222
@Override

src/main/java/net/opengrabeso/glg2d/impl/shader/GL3StringDrawer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package net.opengrabeso.glg2d.impl.shader;
1717

1818
import com.github.opengrabeso.jaagl.GL2GL3;
19-
import com.github.opengrabeso.ogltext.util.awt.TextRenderer;
19+
import net.opengrabeso.opengl.util.awt.TextRenderer;
2020
import net.opengrabeso.glg2d.impl.gl2.GL2StringDrawer;
2121

2222
import java.awt.*;
@@ -34,7 +34,7 @@ public GL3StringDrawer(GL2GL3 gl) {
3434

3535
@Override
3636
protected TextRenderer createTextRenderer(Font font, boolean antialias) {
37-
return new TextRenderer(font, antialias, false, gl);
37+
return new TextRenderer(null, font, antialias, false);
3838
}
3939

4040
@Override
@@ -45,7 +45,7 @@ protected void setupMatrix(TextRenderer renderer) {
4545
setTextColorRespectComposite(renderer);
4646

4747
float[] matrix = ((GLShaderGraphics2D) g2d).getUniformsObject().transformHook.getGLMatrixData();
48-
renderer.setTransform(gl, matrix);
48+
//renderer.setTransform(gl, matrix);
4949
}
5050

5151
@Override

0 commit comments

Comments
 (0)