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

fixed some changes.

Browse Source
This commit is contained in:
javasabr 2017-08-06 18:12:10 +03:00 committed by Rémy Bouquet
parent bc1584d239
commit 69b7f7e655
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jme3-terrain/src/main/java/com/jme3/terrain/executor/TerrainExecutorService.java
View File

@ -4,7 +4,7 @@ import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
/** /**
* The class to provide single executor service to run background tasks of terrain staff. * The class to provide single executor service to run background tasks of terrain stuff.
* *
* @author JavaSaBr * @author JavaSaBr
*/ */

4
jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/MultiTerrainLodControl.java
View File

@ -107,7 +107,7 @@ public class MultiTerrainLodControl extends TerrainLodControl {
} }
@Override @Override
protected UpdateLOD createLodUpdateTask(final SafeArrayList<Vector3f> locations, protected UpdateLOD createLodUpdateTask(final List<Vector3f> locations,
final LodCalculator lodCalculator) { final LodCalculator lodCalculator) {
return new UpdateMultiLOD(locations, lodCalculator); return new UpdateMultiLOD(locations, lodCalculator);
} }
@ -140,7 +140,7 @@ public class MultiTerrainLodControl extends TerrainLodControl {
*/ */
protected class UpdateMultiLOD extends UpdateLOD { protected class UpdateMultiLOD extends UpdateLOD {
protected UpdateMultiLOD(final SafeArrayList<Vector3f> camLocations, final LodCalculator lodCalculator) { protected UpdateMultiLOD(final List<Vector3f> camLocations, final LodCalculator lodCalculator) {
super(camLocations, lodCalculator); super(camLocations, lodCalculator);
} }

16
jme3-terrain/src/main/java/com/jme3/terrain/geomipmap/TerrainLodControl.java
View File

@ -31,6 +31,7 @@
*/ */
package com.jme3.terrain.geomipmap; package com.jme3.terrain.geomipmap;
import static java.util.Collections.singletonList;
import com.jme3.export.InputCapsule; import com.jme3.export.InputCapsule;
import com.jme3.export.JmeExporter; import com.jme3.export.JmeExporter;
import com.jme3.export.JmeImporter; import com.jme3.export.JmeImporter;
@ -267,11 +268,8 @@ public class TerrainLodControl extends AbstractControl {
prepareTerrain(); prepareTerrain();
final SafeArrayList<Vector3f> locations = new SafeArrayList<>(Vector3f.class, 1);
locations.add(currentLocation);
final TerrainExecutorService executorService = TerrainExecutorService.getInstance(); final TerrainExecutorService executorService = TerrainExecutorService.getInstance();
indexer = executorService.submit(createLodUpdateTask(locations, lodCalculator)); indexer = executorService.submit(createLodUpdateTask(singletonList(currentLocation), lodCalculator));
} }
// do all of the LOD calculations // do all of the LOD calculations
@ -348,7 +346,7 @@ public class TerrainLodControl extends AbstractControl {
terrain.cacheTerrainTransforms(); terrain.cacheTerrainTransforms();
} }
protected UpdateLOD createLodUpdateTask(final SafeArrayList<Vector3f> locations, final LodCalculator lodCalculator) { protected UpdateLOD createLodUpdateTask(final List<Vector3f> locations, final LodCalculator lodCalculator) {
return new UpdateLOD(locations, lodCalculator); return new UpdateLOD(locations, lodCalculator);
} }
@ -378,9 +376,9 @@ public class TerrainLodControl extends AbstractControl {
} }
} }
private SafeArrayList<Vector3f> cloneVectorList(SafeArrayList<Vector3f> locations) { private List<Vector3f> cloneVectorList(SafeArrayList<Vector3f> locations) {
final SafeArrayList<Vector3f> cloned = new SafeArrayList<>(Vector3f.class, locations.size()); final List<Vector3f> cloned = new ArrayList<>(locations.size());
for (final Vector3f location : locations.getArray()) { for (final Vector3f location : locations.getArray()) {
cloned.add(location.clone()); cloned.add(location.clone());
@ -468,10 +466,10 @@ public class TerrainLodControl extends AbstractControl {
*/ */
protected class UpdateLOD implements Callable<HashMap<String, UpdatedTerrainPatch>> { protected class UpdateLOD implements Callable<HashMap<String, UpdatedTerrainPatch>> {
protected final SafeArrayList<Vector3f> camLocations; protected final List<Vector3f> camLocations;
protected final LodCalculator lodCalculator; protected final LodCalculator lodCalculator;
protected UpdateLOD(final SafeArrayList<Vector3f> camLocations, final LodCalculator lodCalculator) { protected UpdateLOD(final List<Vector3f> camLocations, final LodCalculator lodCalculator) {
this.camLocations = camLocations; this.camLocations = camLocations;
this.lodCalculator = lodCalculator; this.lodCalculator = lodCalculator;
} }