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
---
 .../util/GLFixedArrayHandlerInterleaved.java       | 87 ++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerInterleaved.java

(limited to 'src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerInterleaved.java')

diff --git a/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerInterleaved.java b/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerInterleaved.java
new file mode 100644
index 000000000..838032646
--- /dev/null
+++ b/src/jogl/classes/jogamp/opengl/util/GLFixedArrayHandlerInterleaved.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+package jogamp.opengl.util;
+
+import javax.media.opengl.*;
+import javax.media.opengl.fixedfunc.*;
+
+import com.jogamp.opengl.util.GLArrayDataEditable;
+import com.jogamp.opengl.util.GLArrayHandler;
+
+import java.nio.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Interleaved fixed function arrays, i.e. where this buffer data 
+ * represents many arrays. 
+ */
+public class GLFixedArrayHandlerInterleaved implements GLArrayHandler {
+  private GLArrayDataEditable ad;
+  private List<GLArrayHandler> subArrays = new ArrayList<GLArrayHandler>();
+
+  public GLFixedArrayHandlerInterleaved(GLArrayDataEditable ad) {
+    this.ad = ad;
+  }
+  
+  public final void addSubHandler(GLArrayHandler handler) {
+      subArrays.add(handler);
+  }
+
+  private final void enableSubBuffer(GL gl, boolean enable) {
+      for(int i=0; i<subArrays.size(); i++) {
+          subArrays.get(i).enableBuffer(gl, enable);
+      }      
+  }
+  
+  public final void enableBuffer(GL gl, boolean enable) {
+    if(enable) {
+        Buffer buffer = ad.getBuffer();
+
+        if(ad.isVBO()) {
+            // always bind and refresh the VBO mgr, 
+            // in case more than one gl*Pointer objects are in use
+            gl.glBindBuffer(ad.getVBOTarget(), ad.getVBOName());
+            if(!ad.isVBOWritten()) {
+                if(null!=buffer) {
+                    gl.glBufferData(ad.getVBOTarget(), buffer.limit() * ad.getComponentSizeInBytes(), buffer, ad.getVBOUsage());
+                }
+                ad.setVBOWritten(true);
+            }
+        }
+        enableSubBuffer(gl, true);
+    } else {
+        enableSubBuffer(gl, false);
+        if(ad.isVBO()) {
+            gl.glBindBuffer(ad.getVBOTarget(), 0);
+        }
+    }
+  }
+}
+
-- 
cgit v1.2.3