From 52e3da57f8b88fb310832f9a55d32d7280201735 Mon Sep 17 00:00:00 2001 From: "sha..rd" Date: Wed, 4 May 2011 00:39:07 +0000 Subject: [PATCH] * Added check in Mesh.setBuffer() for components argument to be between 1 and 4 git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7423 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/src/core/com/jme3/scene/Mesh.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/engine/src/core/com/jme3/scene/Mesh.java b/engine/src/core/com/jme3/scene/Mesh.java index d779926c9..f4583973e 100644 --- a/engine/src/core/com/jme3/scene/Mesh.java +++ b/engine/src/core/com/jme3/scene/Mesh.java @@ -525,11 +525,10 @@ public class Mesh implements Savable, Cloneable { return collisionTree.collideWith(other, worldMatrix, worldBound, results); } -// public void setLodData(ShortBuffer[] lodData){ -// this.lodData = lodData; -// } - public void setBuffer(Type type, int components, FloatBuffer buf) { + if (components < 1 || components > 4) + throw new IllegalArgumentException("components must be between 1 and 4"); + // VertexBuffer vb = buffers.get(type); VertexBuffer vb = buffers.get(type.ordinal()); if (vb == null){ @@ -551,6 +550,9 @@ public class Mesh implements Savable, Cloneable { } public void setBuffer(Type type, int components, IntBuffer buf) { + if (components < 1 || components > 4) + throw new IllegalArgumentException("components must be between 1 and 4"); + VertexBuffer vb = buffers.get(type.ordinal()); if (vb == null){ vb = new VertexBuffer(type); @@ -565,6 +567,9 @@ public class Mesh implements Savable, Cloneable { } public void setBuffer(Type type, int components, ShortBuffer buf) { + if (components < 1 || components > 4) + throw new IllegalArgumentException("components must be between 1 and 4"); + VertexBuffer vb = buffers.get(type.ordinal()); if (vb == null){ vb = new VertexBuffer(type); @@ -579,6 +584,9 @@ public class Mesh implements Savable, Cloneable { } public void setBuffer(Type type, int components, ByteBuffer buf) { + if (components < 1 || components > 4) + throw new IllegalArgumentException("components must be between 1 and 4"); + VertexBuffer vb = buffers.get(type.ordinal()); if (vb == null){ vb = new VertexBuffer(type);