Michael Ludwig avatar Michael Ludwig committed 4f2cb44

Rename VertexAttribute.getData() to getVBO().

Comments (0)

Files changed (3)

ferox-renderer/ferox-renderer-api/src/main/java/com/ferox/resource/VertexAttribute.java

      *         {@link BufferData#getDataType()} to determine the array type
      *         stored by the BufferData.
      */
-    public VertexBufferObject getData() {
+    public VertexBufferObject getVBO() {
         return buffer;
     }
 

ferox-renderer/ferox-renderer-impl/src/main/java/com/ferox/renderer/impl/AbstractFixedFunctionRenderer.java

         if (attr != null) {
             // We are setting a new vertex attribute
             boolean accessDiffers = (state.offset != attr.getOffset() || state.stride != attr.getStride() || state.elementSize != attr.getElementSize());
-            if (state.vbo != attr.getData() || accessDiffers) {
+            if (state.vbo != attr.getVBO() || accessDiffers) {
                 // The attributes will be different so must make a change
                 VertexBufferObject oldVbo = state.vbo;
                 boolean failTypeCheck = false;
 
-                if (state.vbo != null && oldVbo != attr.getData()) {
+                if (state.vbo != null && oldVbo != attr.getVBO()) {
                     // Unlock the old one
                     resourceManager.unlock(oldVbo);
                     state.vbo = null;
                 if (state.vbo == null) {
                     // Lock the new vbo
                     VertexBufferObjectHandle newHandle = (VertexBufferObjectHandle) resourceManager.lock(context,
-                                                                                                         attr.getData());
+                                                                                                         attr.getVBO());
                     if (newHandle != null && newHandle.dataType != DataType.FLOAT) {
-                        resourceManager.unlock(attr.getData());
+                        resourceManager.unlock(attr.getVBO());
                         failTypeCheck = true;
 
                         state.vbo = null;
                         handle = null;
                     } else {
                         // VBO is ready
-                        state.vbo = attr.getData();
+                        state.vbo = attr.getVBO();
                         handle = newHandle;
                     }
                 }
                     state.offset = attr.getOffset();
                     state.stride = attr.getStride();
 
-                    bindArrayVbo(attr.getData(), handle, oldVbo);
+                    bindArrayVbo(attr.getVBO(), handle, oldVbo);
 
                     if (oldVbo == null) {
                         glEnableAttribute(state.target, true);

ferox-renderer/ferox-renderer-impl/src/main/java/com/ferox/renderer/impl/AbstractGlslRenderer.java

 
             VertexAttributeBinding state = a.columnVBOs[column];
             boolean accessDiffers = (state.offset != attr.getOffset() || state.stride != attr.getStride() || state.elementSize != attr.getElementSize());
-            if (state.vbo != attr.getData() || accessDiffers) {
+            if (state.vbo != attr.getVBO() || accessDiffers) {
                 VertexBufferObject oldVbo = state.vbo;
-                if (state.vbo != null && oldVbo != attr.getData()) {
+                if (state.vbo != null && oldVbo != attr.getVBO()) {
                     // unlock the old vbo
                     resourceManager.unlock(state.vbo);
                     state.vbo = null;
                 if (state.vbo == null) {
                     // lock the new vbo
                     VertexBufferObjectHandle newHandle = (VertexBufferObjectHandle) resourceManager.lock(context,
-                                                                                                         attr.getData());
+                                                                                                         attr.getVBO());
                     if (newHandle != null) {
-                        state.vbo = attr.getData();
+                        state.vbo = attr.getVBO();
                         state.handle = newHandle;
                     }
                 }
                     state.offset = attr.getOffset();
                     state.stride = attr.getStride();
 
-                    bindArrayVbo(attr.getData(), state.handle, oldVbo);
+                    bindArrayVbo(attr.getVBO(), state.handle, oldVbo);
 
                     if (oldVbo == null) {
                         glEnableAttribute(state.attributeIndex, true);
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.