diff options
author | Sven Gothel <[email protected]> | 2011-08-22 01:59:00 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-08-22 01:59:00 +0200 |
commit | 6c346d98f04e2355210960fe9ffde47432f04d62 (patch) | |
tree | 938536365abee309d5acf9ada1ac75bc1a49e939 /src/nativewindow/classes/javax/media | |
parent | 47b0d317df3c860b6cf3ea10196dfee82b3b3dc1 (diff) |
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
Diffstat (limited to 'src/nativewindow/classes/javax/media')
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java | 2 | ||||
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/util/DimensionImmutable.java (renamed from src/nativewindow/classes/javax/media/nativewindow/util/DimensionReadOnly.java) | 2 | ||||
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/util/Point.java | 2 | ||||
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/util/PointImmutable.java (renamed from src/nativewindow/classes/javax/media/nativewindow/util/PointReadOnly.java) | 2 | ||||
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java | 2 | ||||
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/util/RectangleImmutable.java (renamed from src/nativewindow/classes/javax/media/nativewindow/util/RectangleReadOnly.java) | 2 | ||||
-rw-r--r-- | src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java | 8 |
7 files changed, 10 insertions, 10 deletions
diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java b/src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java index 4151c1537..ebf5b9e81 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java +++ b/src/nativewindow/classes/javax/media/nativewindow/util/Dimension.java @@ -29,7 +29,7 @@ package javax.media.nativewindow.util; -public class Dimension implements Cloneable, DimensionReadOnly { +public class Dimension implements Cloneable, DimensionImmutable { int width; int height; diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/DimensionReadOnly.java b/src/nativewindow/classes/javax/media/nativewindow/util/DimensionImmutable.java index 442afd4ba..262086ba3 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/util/DimensionReadOnly.java +++ b/src/nativewindow/classes/javax/media/nativewindow/util/DimensionImmutable.java @@ -35,7 +35,7 @@ package javax.media.nativewindow.util; * <li><code>height</code></li> * </ul> */ -public interface DimensionReadOnly extends Cloneable { +public interface DimensionImmutable extends Cloneable { int getHeight(); diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/Point.java b/src/nativewindow/classes/javax/media/nativewindow/util/Point.java index 6db0ecfe2..89a87541e 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/util/Point.java +++ b/src/nativewindow/classes/javax/media/nativewindow/util/Point.java @@ -29,7 +29,7 @@ package javax.media.nativewindow.util; -public class Point implements Cloneable, PointReadOnly { +public class Point implements Cloneable, PointImmutable { int x; int y; diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/PointReadOnly.java b/src/nativewindow/classes/javax/media/nativewindow/util/PointImmutable.java index 9caaf7fee..7f42138eb 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/util/PointReadOnly.java +++ b/src/nativewindow/classes/javax/media/nativewindow/util/PointImmutable.java @@ -30,7 +30,7 @@ package javax.media.nativewindow.util; /** Immutable Point interface */ -public interface PointReadOnly extends Cloneable { +public interface PointImmutable extends Cloneable { int getX(); diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java b/src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java index ba24bc64e..67bdcbfc7 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java +++ b/src/nativewindow/classes/javax/media/nativewindow/util/Rectangle.java @@ -28,7 +28,7 @@ package javax.media.nativewindow.util; -public class Rectangle implements Cloneable, RectangleReadOnly { +public class Rectangle implements Cloneable, RectangleImmutable { int x; int y; int width; diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/RectangleReadOnly.java b/src/nativewindow/classes/javax/media/nativewindow/util/RectangleImmutable.java index 81a5a9f86..ede8ba9c5 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/util/RectangleReadOnly.java +++ b/src/nativewindow/classes/javax/media/nativewindow/util/RectangleImmutable.java @@ -29,7 +29,7 @@ package javax.media.nativewindow.util; /** Immutable Rectangle interface */ -public interface RectangleReadOnly extends Cloneable { +public interface RectangleImmutable extends Cloneable { int getHeight(); diff --git a/src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java b/src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java index ea098b967..19786af2a 100644 --- a/src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java +++ b/src/nativewindow/classes/javax/media/nativewindow/util/SurfaceSize.java @@ -31,15 +31,15 @@ package javax.media.nativewindow.util; /** Immutable SurfaceSize Class, consisting of it's read only components:<br> * <ul> - * <li>{@link javax.media.nativewindow.util.DimensionReadOnly} size in pixels</li> + * <li>{@link javax.media.nativewindow.util.DimensionImmutable} size in pixels</li> * <li><code>bits per pixel</code></li> * </ul> */ public class SurfaceSize implements Cloneable { - DimensionReadOnly resolution; + DimensionImmutable resolution; int bitsPerPixel; - public SurfaceSize(DimensionReadOnly resolution, int bitsPerPixel) { + public SurfaceSize(DimensionImmutable resolution, int bitsPerPixel) { if(null==resolution || bitsPerPixel<=0) { throw new IllegalArgumentException("resolution must be set and bitsPerPixel greater 0"); } @@ -55,7 +55,7 @@ public class SurfaceSize implements Cloneable { } } - public final DimensionReadOnly getResolution() { + public final DimensionImmutable getResolution() { return resolution; } |