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

Merge branch 'BorealFeast-master'

Browse Source
This commit is contained in:
Kirill Vainer 2016-03-04 19:52:52 -05:00
commit 18dc729d6a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jme3-core/src/main/java/com/jme3/scene/shape/Cylinder.java
View File

@ -211,7 +211,7 @@ public class Cylinder extends Mesh {
*/ */
public void updateGeometry(int axisSamples, int radialSamples, public void updateGeometry(int axisSamples, int radialSamples,
float radius, float radius2, float height, boolean closed, boolean inverted) { float radius, float radius2, float height, boolean closed, boolean inverted) {
this.axisSamples = axisSamples + (closed ? 2 : 0); this.axisSamples = axisSamples;
this.radialSamples = radialSamples; this.radialSamples = radialSamples;
this.radius = radius; this.radius = radius;
this.radius2 = radius2; this.radius2 = radius2;
@ -222,6 +222,7 @@ public class Cylinder extends Mesh {
// VertexBuffer pvb = getBuffer(Type.Position); // VertexBuffer pvb = getBuffer(Type.Position);
// VertexBuffer nvb = getBuffer(Type.Normal); // VertexBuffer nvb = getBuffer(Type.Normal);
// VertexBuffer tvb = getBuffer(Type.TexCoord); // VertexBuffer tvb = getBuffer(Type.TexCoord);
axisSamples += (closed ? 2 : 0);
// Vertices // Vertices
int vertCount = axisSamples * (radialSamples + 1) + (closed ? 2 : 0); int vertCount = axisSamples * (radialSamples + 1) + (closed ? 2 : 0);