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

fix issue #762 (WireSphere generates parallels with wrong radii)

Browse Source
This commit is contained in:
Stephen Gold 2017-11-04 16:54:50 -07:00
parent 171007693b
commit 3328f2a3a7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jme3-core/src/main/java/com/jme3/scene/debug/WireSphere.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009-2012 jMonkeyEngine * Copyright (c) 2009-2017 jMonkeyEngine
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -106,6 +106,9 @@ public class WireSphere extends Mesh {
// pb.put(0).put(0).put(radius); // pb.put(0).put(0).put(radius);
// pb.put(0).put(0).put(-radius); // pb.put(0).put(0).put(-radius);
/*
* Update vertex positions for the great circle in the X-Y plane.
*/
float rate = FastMath.TWO_PI / (float) samples; float rate = FastMath.TWO_PI / (float) samples;
float angle = 0; float angle = 0;
for (int i = 0; i < samples; i++) { for (int i = 0; i < samples; i++) {
@ -114,7 +117,9 @@ public class WireSphere extends Mesh {
pb.put(x).put(y).put(0); pb.put(x).put(y).put(0);
angle += rate; angle += rate;
} }
/*
* Update vertex positions for the great circle in the Y-Z plane.
*/
angle = 0; angle = 0;
for (int i = 0; i < samples; i++) { for (int i = 0; i < samples; i++) {
float x = radius * FastMath.cos(angle); float x = radius * FastMath.cos(angle);
@ -122,23 +127,20 @@ public class WireSphere extends Mesh {
pb.put(0).put(x).put(y); pb.put(0).put(x).put(y);
angle += rate; angle += rate;
} }
/*
* Update vertex positions for 'zSamples' parallel circles.
*/
float zRate = (radius * 2) / (float) (zSamples); float zRate = (radius * 2) / (float) (zSamples);
float zHeight = -radius + (zRate / 2f); float zHeight = -radius + (zRate / 2f);
float rb = 1f / zSamples; float rb = 1f / zSamples;
float b = rb / 2f; float b = rb / 2f;
for (int k = 0; k < zSamples; k++) { for (int k = 0; k < zSamples; k++) {
angle = 0; angle = 0;
float scale = FastMath.sin(b * FastMath.PI); float scale = 2f * FastMath.sqrt(b - b * b);
for (int i = 0; i < samples; i++) { for (int i = 0; i < samples; i++) {
float x = radius * FastMath.cos(angle); float x = radius * FastMath.cos(angle);
float y = radius * FastMath.sin(angle); float y = radius * FastMath.sin(angle);
pb.put(x * scale).put(zHeight).put(y * scale); pb.put(x * scale).put(zHeight).put(y * scale);
angle += rate; angle += rate;
} }
zHeight += zRate; zHeight += zRate;