From 6c346d98f04e2355210960fe9ffde47432f04d62 Mon Sep 17 00:00:00 2001 From: Sven Gothel 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 --- make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'make/config/jogl/gl-impl-CustomJavaCode-gl2_es2.java') 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()); } } -- cgit v1.2.3