sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Fixed max components calculation for temp float array

Browse Source 
- Uncommented Normals transforms (doh!)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8553 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2011-10-30 22:10:34 +00:00
parent d2c88f2ba2
commit 02bcb358a3
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engine/src/core/com/jme3/scene/BatchNode.java
View File

@ -146,9 +146,9 @@ public class BatchNode extends Node implements Savable {
doTransformVerts(buf, bg.startIndex, bg.startIndex + bg.getVertexCount(), buf, bg.cachedOffsetMat); doTransformVerts(buf, bg.startIndex, bg.startIndex + bg.getVertexCount(), buf, bg.cachedOffsetMat);
mesh.getBuffer(VertexBuffer.Type.Position).updateData(buf); mesh.getBuffer(VertexBuffer.Type.Position).updateData(buf);
// buf = (FloatBuffer) mesh.getBuffer(VertexBuffer.Type.Normal).getData(); buf = (FloatBuffer) mesh.getBuffer(VertexBuffer.Type.Normal).getData();
// doTransformNorm(buf, 0, bg.startIndex, bg.startIndex + bg.getVertexCount(), buf, bg.cachedOffsetMat); doTransformNorm(buf, bg.startIndex, bg.startIndex + bg.getVertexCount(), buf, bg.cachedOffsetMat);
// mesh.getBuffer(VertexBuffer.Type.Normal).updateData(buf); mesh.getBuffer(VertexBuffer.Type.Normal).updateData(buf);
if (mesh.getBuffer(VertexBuffer.Type.Tangent) != null) { if (mesh.getBuffer(VertexBuffer.Type.Tangent) != null) {
@ -403,6 +403,8 @@ public class BatchNode extends Node implements Savable {
formatForBuf[VertexBuffer.Type.Index.ordinal()] = VertexBuffer.Format.UnsignedShort; formatForBuf[VertexBuffer.Type.Index.ordinal()] = VertexBuffer.Format.UnsignedShort;
} }
int maxElemCount = 0;
int elements = 0;
// generate output buffers based on retrieved info // generate output buffers based on retrieved info
for (int i = 0; i < compsForBuf.length; i++) { for (int i = 0; i < compsForBuf.length; i++) {
if (compsForBuf[i] == 0) { if (compsForBuf[i] == 0) {
@ -412,10 +414,15 @@ public class BatchNode extends Node implements Savable {
Buffer data; Buffer data;
if (i == VertexBuffer.Type.Index.ordinal()) { if (i == VertexBuffer.Type.Index.ordinal()) {
data = VertexBuffer.createBuffer(formatForBuf[i], compsForBuf[i], totalTris); data = VertexBuffer.createBuffer(formatForBuf[i], compsForBuf[i], totalTris);
elements = compsForBuf[i]* totalTris;
} else { } else {
data = VertexBuffer.createBuffer(formatForBuf[i], compsForBuf[i], totalVerts); data = VertexBuffer.createBuffer(formatForBuf[i], compsForBuf[i], totalVerts);
elements = compsForBuf[i]* totalVerts;
} }
if(maxElemCount<elements){
maxElemCount = elements;
}
VertexBuffer vb = new VertexBuffer(VertexBuffer.Type.values()[i]); VertexBuffer vb = new VertexBuffer(VertexBuffer.Type.values()[i]);
vb.setupData(VertexBuffer.Usage.Dynamic, compsForBuf[i], formatForBuf[i], data); vb.setupData(VertexBuffer.Usage.Dynamic, compsForBuf[i], formatForBuf[i], data);
outMesh.setBuffer(vb); outMesh.setBuffer(vb);
@ -423,20 +430,17 @@ public class BatchNode extends Node implements Savable {
int globalVertIndex = 0; int globalVertIndex = 0;
int globalTriIndex = 0; int globalTriIndex = 0;
int maxVertCount = 0;
for (Geometry geom : geometries) { for (Geometry geom : geometries) {
Mesh inMesh = geom.getMesh(); Mesh inMesh = geom.getMesh();
geom.batch(this, globalVertIndex); geom.batch(this, globalVertIndex);
int geomVertCount = inMesh.getVertexCount(); int geomVertCount = inMesh.getVertexCount();
if (maxVertCount < geomVertCount) {
maxVertCount = geomVertCount;
}
int geomTriCount = inMesh.getTriangleCount(); int geomTriCount = inMesh.getTriangleCount();
for (int bufType = 0; bufType < compsForBuf.length; bufType++) { for (int bufType = 0; bufType < compsForBuf.length; bufType++) {
VertexBuffer inBuf = inMesh.getBuffer(VertexBuffer.Type.values()[bufType]); VertexBuffer inBuf = inMesh.getBuffer(VertexBuffer.Type.values()[bufType]);
VertexBuffer outBuf = outMesh.getBuffer(VertexBuffer.Type.values()[bufType]); VertexBuffer outBuf = outMesh.getBuffer(VertexBuffer.Type.values()[bufType]);
if (outBuf == null) { if (outBuf == null) {
@ -474,7 +478,7 @@ public class BatchNode extends Node implements Savable {
globalVertIndex += geomVertCount; globalVertIndex += geomVertCount;
globalTriIndex += geomTriCount; globalTriIndex += geomTriCount;
} }
tmpFloat = new float[maxVertCount*3]; tmpFloat = new float[maxElemCount];
} }