diff --git a/engine/src/core/com/jme3/renderer/Statistics.java b/engine/src/core/com/jme3/renderer/Statistics.java index ab47b331f..fb8f2a094 100644 --- a/engine/src/core/com/jme3/renderer/Statistics.java +++ b/engine/src/core/com/jme3/renderer/Statistics.java @@ -134,10 +134,10 @@ public class Statistics { * @param wasSwitched If true, the shader has required a state switch */ public void onShaderUse(Shader shader, boolean wasSwitched){ - assert shader.id >= 1; + assert shader.getId() >= 1; - if (!shadersUsed.contains(shader.id)) - shadersUsed.add(shader.id); + if (!shadersUsed.contains(shader.getId())) + shadersUsed.add(shader.getId()); if (wasSwitched) numShaderSwitches++; @@ -157,10 +157,10 @@ public class Statistics { * @param wasSwitched If true, the texture has required a state switch */ public void onTextureUse(Image image, boolean wasSwitched){ - assert image.id >= 1; + assert image.getId() >= 1; - if (!texturesUsed.contains(image.id)) - texturesUsed.add(image.id); + if (!texturesUsed.contains(image.getId())) + texturesUsed.add(image.getId()); if (wasSwitched) numTextureBinds ++; @@ -174,10 +174,10 @@ public class Statistics { */ public void onFrameBufferUse(FrameBuffer fb, boolean wasSwitched){ if (fb != null){ - assert fb.id >= 1; + assert fb.getId() >= 1; - if (!fbosUsed.contains(fb.id)) - fbosUsed.add(fb.id); + if (!fbosUsed.contains(fb.getId())) + fbosUsed.add(fb.getId()); } if (wasSwitched) diff --git a/engine/src/test/jme3test/stress/TestLeakingGL.java b/engine/src/test/jme3test/stress/TestLeakingGL.java index 809918c45..dba486394 100644 --- a/engine/src/test/jme3test/stress/TestLeakingGL.java +++ b/engine/src/test/jme3test/stress/TestLeakingGL.java @@ -35,12 +35,12 @@ package jme3test.stress; import com.jme3.app.SimpleApplication; import com.jme3.material.Material; import com.jme3.math.Vector3f; -import com.jme3.renderer.GLObjectManager; import com.jme3.scene.Geometry; import com.jme3.scene.Mesh; import com.jme3.scene.Node; import com.jme3.scene.Spatial.CullHint; import com.jme3.scene.shape.Sphere; +import com.jme3.util.NativeObjectManager; import java.util.logging.Level; import java.util.logging.Logger; @@ -71,7 +71,7 @@ public class TestLeakingGL extends SimpleApplication { cam.lookAt(Vector3f.ZERO, Vector3f.UNIT_Y); Logger.getLogger(Node.class.getName()).setLevel(Level.WARNING); - Logger.getLogger(GLObjectManager.class.getName()).setLevel(Level.WARNING); + Logger.getLogger(NativeObjectManager.class.getName()).setLevel(Level.WARNING); } @Override