aboutsummaryrefslogtreecommitdiffstats
path: root/make/config
diff options
context:
space:
mode:
Diffstat (limited to 'make/config')
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java6
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java22
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gles1.java22
3 files changed, 25 insertions, 25 deletions
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
index bc2af092b..b31a087e7 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java
@@ -1,10 +1,10 @@
public void glVertexAttribPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
+ if(array.getComponentCount()==0) return;
if(array.isVBO()) {
- glVertexAttribPointer(array.getLocation(), array.getComponentNumber(), array.getComponentType(),
+ glVertexAttribPointer(array.getLocation(), array.getComponentCount(), array.getComponentType(),
array.getNormalized(), array.getStride(), array.getVBOOffset());
} else {
- glVertexAttribPointer(array.getLocation(), array.getComponentNumber(), array.getComponentType(),
+ glVertexAttribPointer(array.getLocation(), array.getComponentCount(), array.getComponentType(),
array.getNormalized(), array.getStride(), array.getBuffer());
}
}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
index e977204e3..d83ccd8de 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl4bc.java
@@ -264,25 +264,25 @@ private native long dispatch_glMapNamedBufferEXT(int buffer, int access, long pr
native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
public void glVertexPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
+ if(array.getComponentCount()==0) return;
if(array.isVBO()) {
- glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
- glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
}
}
public void glColorPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
+ if(array.getComponentCount()==0) return;
if(array.isVBO()) {
- glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
- glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
}
}
public void glNormalPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
- if(array.getComponentNumber()!=3) {
+ if(array.getComponentCount()==0) return;
+ if(array.getComponentCount()!=3) {
throw new GLException("Only 3 components per normal allowed");
}
if(array.isVBO()) {
@@ -292,11 +292,11 @@ native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
}
}
public void glTexCoordPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
+ if(array.getComponentCount()==0) return;
if(array.isVBO()) {
- glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
- glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
}
}
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
index 8b6d1dadc..54bb37ce8 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gles1.java
@@ -243,25 +243,25 @@ native private long dispatch_glMapBuffer(int target, int access, long glProcAddr
native private ByteBuffer newDirectByteBuffer(long addr, long capacity);
public void glVertexPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
+ if(array.getComponentCount()==0) return;
if(array.isVBO()) {
- glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
- glVertexPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glVertexPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
}
}
public void glColorPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
+ if(array.getComponentCount()==0) return;
if(array.isVBO()) {
- glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
- glColorPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glColorPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
}
}
public void glNormalPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
- if(array.getComponentNumber()!=3) {
+ if(array.getComponentCount()==0) return;
+ if(array.getComponentCount()!=3) {
throw new GLException("Only 3 components per normal allowed");
}
if(array.isVBO()) {
@@ -271,11 +271,11 @@ public void glNormalPointer(GLArrayData array) {
}
}
public void glTexCoordPointer(GLArrayData array) {
- if(array.getComponentNumber()==0) return;
+ if(array.getComponentCount()==0) return;
if(array.isVBO()) {
- glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getVBOOffset());
+ glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getVBOOffset());
} else {
- glTexCoordPointer(array.getComponentNumber(), array.getComponentType(), array.getStride(), array.getBuffer());
+ glTexCoordPointer(array.getComponentCount(), array.getComponentType(), array.getStride(), array.getBuffer());
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-01 10:11:22 +0000