reformat BatchNode before change
This commit is contained in:
parent
2b014d194c
commit
c1c67f58cf
@ -62,9 +62,10 @@ import com.jme3.util.clone.JmeCloneable;
|
||||
* Sub geoms can be removed but it may be slower than the normal spatial removing
|
||||
* Sub geoms can be added after the batch() method has been called but won't be batched and will just be rendered as normal geometries.
|
||||
* To integrate them in the batch you have to call the batch() method again on the batchNode.
|
||||
*
|
||||
* <p>
|
||||
* TODO normal or tangents or both looks a bit weird
|
||||
* TODO more automagic (batch when needed in the updateLogicalState)
|
||||
*
|
||||
* @author Nehon
|
||||
*/
|
||||
public class BatchNode extends GeometryGroupNode {
|
||||
@ -257,6 +258,7 @@ public class BatchNode extends GeometryGroupNode {
|
||||
|
||||
/**
|
||||
* recursively visit the subgraph and unbatch geometries
|
||||
*
|
||||
* @param s
|
||||
*/
|
||||
private void unbatchSubGraph(Spatial s) {
|
||||
@ -343,11 +345,10 @@ public class BatchNode extends GeometryGroupNode {
|
||||
|
||||
/**
|
||||
* Returns the material that is used for the first batch of this BatchNode
|
||||
*
|
||||
* <p>
|
||||
* use getMaterial(Material material,int batchIndex) to get a material from a specific batch
|
||||
*
|
||||
* @return the material that is used for the first batch of this BatchNode
|
||||
*
|
||||
* @see #setMaterial(com.jme3.material.Material)
|
||||
*/
|
||||
public Material getMaterial() {
|
||||
@ -428,14 +429,6 @@ public class BatchNode extends GeometryGroupNode {
|
||||
+ " primitive types: " + mode + " != " + listMode);
|
||||
}
|
||||
mode = listMode;
|
||||
//Not needed anymore as lineWidth is now in RenderState and will be taken into account when merging according to the material
|
||||
// if (mode == Mesh.Mode.Lines) {
|
||||
// if (lineWidth != 1f && listLineWidth != lineWidth) {
|
||||
// throw new UnsupportedOperationException("When using Mesh Line mode, cannot combine meshes with different line width "
|
||||
// + lineWidth + " != " + listLineWidth);
|
||||
// }
|
||||
// lineWidth = listLineWidth;
|
||||
// }
|
||||
compsForBuf[VertexBuffer.Type.Index.ordinal()] = components;
|
||||
}
|
||||
|
||||
@ -667,6 +660,7 @@ public class BatchNode extends GeometryGroupNode {
|
||||
protected class Batch implements JmeCloneable {
|
||||
/**
|
||||
* update the batchesByGeom map for this batch with the given List of geometries
|
||||
*
|
||||
* @param list
|
||||
*/
|
||||
void updateGeomList(List<Geometry> list) {
|
||||
@ -676,6 +670,7 @@ public class BatchNode extends GeometryGroupNode {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Geometry geometry;
|
||||
|
||||
public final Geometry getGeometry() {
|
||||
|
Loading…
x
Reference in New Issue
Block a user