From 6c346d98f04e2355210960fe9ffde47432f04d62 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 22 Aug 2011 01:59:00 +0200
Subject: Misc Rename/Reloc; GLArrayData*/PMVMatrix enhancments; Test
fixes/adds (GearsES1/ES2)
rename/reloc:
- javax.media.nativewindow.util:
DimensionReadOnly -> DimensionImmutable
PointReadOnly -> PointImmutable
RectangleReadOnly -> RectangleImmutable
unified 'immutable' name as used within jogamp already
- remove array handler from public API
com.jogamp.opengl.util.GL*ArrayHandler -> jogamp.opengl.util.GL*ArrayHandler
- GLArrayData: Clarify method names
getComponentNumber() -> getComponentCount()
getComponentSize() -> getComponentSizeInBytes()
getElementNumber() -> getElementCount()
getByteSize() -> getSizeInBytes()
- FixedFuncPipeline: Moved def. array names to GLPointerFuncUtil
enhancement:
- GLArrayDataServer: Add support for interleaved arrays/VBO
- GLArrayData*.createFixed(..) remove 'name' argument (non sense for fixed function)
- PMVMatrix:
- one nio buffer
- removed 'Pmv' multiplied matrix
- removed 2x2 cut down 'Mvi' normal matrix (use 4x4 Mvi)
-
tests:
- RedSquare -> RedSquareES1/RedSquareES2
- Gears ES1 fixed + ES2 added. Both work properly and share common Gears VBO construction
- Added TestMapBuffer01NEWT, testing glMapBuffer
---
src/jogl/classes/javax/media/opengl/GLArrayData.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
(limited to 'src/jogl/classes/javax/media/opengl/GLArrayData.java')
diff --git a/src/jogl/classes/javax/media/opengl/GLArrayData.java b/src/jogl/classes/javax/media/opengl/GLArrayData.java
index 4562c1c0b..26f0f6be2 100644
--- a/src/jogl/classes/javax/media/opengl/GLArrayData.java
+++ b/src/jogl/classes/javax/media/opengl/GLArrayData.java
@@ -116,7 +116,7 @@ public interface GLArrayData {
/**
* The number of components per element
*/
- public int getComponentNumber();
+ public int getComponentCount();
/**
* The component's GL data type, ie. GL_FLOAT
@@ -126,19 +126,19 @@ public interface GLArrayData {
/**
* The component's size in bytes
*/
- public int getComponentSize();
+ public int getComponentSizeInBytes();
/**
* The current number of used elements.<br>
* In case the buffer's position is 0 (sealed, flipped), it's based on it's limit instead of it's position.
*/
- public int getElementNumber();
+ public int getElementCount();
/**
- * The current number of used bytes.<br>
+ * The currently used size in bytes.<br>
* In case the buffer's position is 0 (sealed, flipped), it's based on it's limit instead of it's position.
*/
- public int getByteSize();
+ public int getSizeInBytes();
/**
* True, if GL shall normalize fixed point data while converting
@@ -146,10 +146,9 @@ public interface GLArrayData {
*/
public boolean getNormalized();
- /**
- * The distance to the next payload,
- * allowing interleaved arrays.
- */
+ /**
+ * @return the byte offset between consecutive components
+ */
public int getStride();
public String toString();
--
cgit v1.2.3