diff --git a/.classpath b/.classpath
index 5d35e48..3e63f23 100644
--- a/.classpath
+++ b/.classpath
@@ -87,7 +87,7 @@
-
+
@@ -97,10 +97,5 @@
-
-
-
-
-
diff --git a/src/org/atriasoft/gale/resource/ResourceTextureFile.java b/src/org/atriasoft/gale/resource/ResourceTextureFile.java
index a7931a2..57b1b82 100644
--- a/src/org/atriasoft/gale/resource/ResourceTextureFile.java
+++ b/src/org/atriasoft/gale/resource/ResourceTextureFile.java
@@ -1,8 +1,3 @@
-/** @file
- * @author Edouard DUPIN
- * @copyright 2011, Edouard DUPIN, all right reserved
- * @license MPL v2.0 (see license file)
- */
package org.atriasoft.gale.resource;
import org.atriasoft.egami.ImageByte;
@@ -16,7 +11,7 @@ import org.atriasoft.iogami.IOgami;
public class ResourceTextureFile extends ResourceTexture2 {
public static Vector2i sizeAuto = new Vector2i(-1, -1);
- public static Vector2i sizeDefault = new Vector2i(0, 0);
+ public static Vector2i sizeDefault = Vector2i.ZERO;
public static ResourceTextureFile create(final Uri filename) {
return ResourceTextureFile.create(filename, ResourceTextureFile.sizeAuto);
diff --git a/src/org/atriasoft/gale/resource/ResourceVirtualArrayObject.java b/src/org/atriasoft/gale/resource/ResourceVirtualArrayObject.java
index f856cab..79bcd1e 100644
--- a/src/org/atriasoft/gale/resource/ResourceVirtualArrayObject.java
+++ b/src/org/atriasoft/gale/resource/ResourceVirtualArrayObject.java
@@ -366,7 +366,7 @@ public class ResourceVirtualArrayObject extends Resource {
usage = Usage.streamDraw;
}
// select the buffer to set data inside it ...
- if (data instanceof float[]buffer) {
+ if (data instanceof float[] buffer) {
OpenGL.bufferData(buffer, usage);
} else if (data instanceof int[]buffer) {
OpenGL.bufferData(buffer, usage);
diff --git a/src/org/atriasoft/gale/resource/ResourceVirtualBufferObject.java b/src/org/atriasoft/gale/resource/ResourceVirtualBufferObject.java
index ece9e68..eb29090 100644
--- a/src/org/atriasoft/gale/resource/ResourceVirtualBufferObject.java
+++ b/src/org/atriasoft/gale/resource/ResourceVirtualBufferObject.java
@@ -32,7 +32,6 @@ public class ResourceVirtualBufferObject extends Resource {
* @param accesMode Access mode : ???
*/
protected ResourceVirtualBufferObject(final int number) {
- super();
this.vbo = new int[number]; // 0
this.buffer = new Object[number];
Log.debug("OGL : load VBO count=\"" + number + "\"");
@@ -44,7 +43,8 @@ public class ResourceVirtualBufferObject extends Resource {
// select the buffer to set data inside it ...
if (this.buffer[vboidcoord] instanceof float[]) {
return ((float[]) (this.buffer[vboidcoord])).length;
- } else if (this.buffer[vboidcoord] instanceof int[]) {
+ }
+ if (this.buffer[vboidcoord] instanceof int[]) {
return ((int[]) (this.buffer[vboidcoord])).length;
} else if (this.buffer[vboidcoord] instanceof Vector2f[]) {
return ((Vector2f[]) (this.buffer[vboidcoord])).length;
@@ -78,7 +78,7 @@ public class ResourceVirtualBufferObject extends Resource {
*/
public synchronized void flush() {
// request to the manager to be call at the next update ...
- getManager().update(this);
+ Resource.getManager().update(this);
Log.verbose("Request flush of VBO: [" + getId() + "] '" + getName() + "'");
}
@@ -87,7 +87,8 @@ public class ResourceVirtualBufferObject extends Resource {
// select the buffer to set data inside it ...
if (this.buffer[index] instanceof float[]) {
return 1;
- } else if (this.buffer[index] instanceof int[]) {
+ }
+ if (this.buffer[index] instanceof int[]) {
return 1;
} else if (this.buffer[index] instanceof Vector2f[]) {
return 2;
@@ -172,7 +173,7 @@ public class ResourceVirtualBufferObject extends Resource {
*/
@Override
public synchronized boolean updateContext() {
- Log.warning("updateContext (VBO Start: [" + getId() + "] '" + getName() + "' (size=" + this.buffer.length + ")");
+ Log.verbose("updateContext (VBO Start: [" + getId() + "] '" + getName() + "' (size=" + this.buffer.length + ")");
/*
if (lock.tryLock() == false) {
//Lock error ==> try later ...