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

fixed BoundingBox merge method javadoc

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9282 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-04-09 08:24:08 +00:00
parent e5b99b5035
commit 732955a56c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/src/core/com/jme3/bounding/BoundingBox.java
View File

@ -357,12 +357,12 @@ public class BoundingBox extends BoundingVolume {
} }
/** /**
* <code>merge</code> combines this sphere with a second bounding sphere. * <code>merge</code> combines this bounding box with a second bounding box.
* This new sphere contains both bounding spheres and is returned. * This new box contains both bounding box and is returned.
* *
* @param volume * @param volume
* the sphere to combine with this sphere. * the bounding box to combine with this bounding box.
* @return the new sphere * @return the new bounding box
*/ */
public BoundingVolume merge(BoundingVolume volume) { public BoundingVolume merge(BoundingVolume volume) {
if (volume == null) { if (volume == null) {