Argh! Bug still not found, but I've gotten a good start at finding it.
rarkenin
parent
881d948794
commit
c3bb8e9039
2
data
2
data
|
|
@ -1 +1 @@
|
|||
Subproject commit 0165613c8bab11e6c8ef24beb467dbdb630c97c1
|
||||
Subproject commit 0d424daccbd1d9659165475705d48ceda9615e5f
|
||||
|
|
@ -5,10 +5,14 @@ import net.mosstest.scripting.Position;
|
|||
|
||||
public interface IRenderPreparator {
|
||||
|
||||
public void setRenderProcessor(RenderProcessor rend);
|
||||
|
||||
public abstract MapChunk requestChunk(Position pos)
|
||||
throws MapGeneratorException, InterruptedException;
|
||||
|
||||
public abstract void recvOutstandingChunk(Position pos, MapChunk chk);
|
||||
|
||||
public abstract void shutdown();
|
||||
|
||||
public abstract void start();
|
||||
}
|
||||
|
|
@ -19,7 +19,7 @@ public class LocalRenderPreparator implements IRenderPreparator {
|
|||
MapChunk chk = LocalRenderPreparator.this.nc
|
||||
.getChunk(requested);
|
||||
chk.pos = requested;
|
||||
LocalRenderPreparator.this.rp.renderEventQueue
|
||||
LocalRenderPreparator.this.rend.renderEventQueue
|
||||
.put(new MossRenderChunkEvent(chk));
|
||||
} catch (InterruptedException e) {
|
||||
// pass
|
||||
|
|
@ -32,7 +32,7 @@ public class LocalRenderPreparator implements IRenderPreparator {
|
|||
|
||||
}
|
||||
|
||||
private RenderProcessor rp;
|
||||
private RenderProcessor rend;
|
||||
private NodeCache nc;
|
||||
private volatile boolean run = true;
|
||||
public ArrayBlockingQueue<Position> chunkRequests = new ArrayBlockingQueue<>(
|
||||
|
|
@ -59,9 +59,8 @@ public class LocalRenderPreparator implements IRenderPreparator {
|
|||
}
|
||||
|
||||
public LocalRenderPreparator(RenderProcessor rp, NodeCache nc) {
|
||||
this.rp = rp;
|
||||
this.rend = rp;
|
||||
this.nc = nc;
|
||||
this.lookupThread.start();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -71,8 +70,19 @@ public class LocalRenderPreparator implements IRenderPreparator {
|
|||
|
||||
@Override
|
||||
public void recvOutstandingChunk(Position pos, MapChunk chk) {
|
||||
// TODO Auto-generated method stub
|
||||
// pass
|
||||
}
|
||||
|
||||
@Override
|
||||
public void start() {
|
||||
System.out.println("<<< START LOCAL RENDER PREPARATOR >>>");
|
||||
this.lookupThread.start();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRenderProcessor(RenderProcessor rend) {
|
||||
this.rend = rend;
|
||||
}
|
||||
|
||||
// TODO: Handle player movement, other server->client events affecting
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ public class NodeManager {
|
|||
"sys:unknown", "An unknown piece of the world", 1);
|
||||
{
|
||||
this.unknownFallbackNode.setNodeId((short) -1);
|
||||
definedNodes.add(this.unknownFallbackNode);
|
||||
}
|
||||
|
||||
public MapNode getNode(short nodeId) {
|
||||
|
|
@ -35,6 +36,7 @@ public class NodeManager {
|
|||
node.setNodeId(this.pending.inverse().get(node.nodeName));
|
||||
this.definedNodes.set(this.pending.inverse().get(node.nodeName),
|
||||
node);
|
||||
this.defNodeByName.put(node.nodeName, node);
|
||||
} else {
|
||||
if (this.definedNodes.size() > 16384)
|
||||
throw new MossWorldLoadException("Too many nodedefs"); //$NON-NLS-1$
|
||||
|
|
@ -42,10 +44,11 @@ public class NodeManager {
|
|||
node.setNodeId((short) this.definedNodes.size());
|
||||
|
||||
this.definedNodes.add(node);
|
||||
this.defNodeByName.put(node.nodeName, node);
|
||||
this.nodeDb.put(new byte[] { (byte) (node.getNodeId() >>> 8),
|
||||
(byte) (node.getNodeId() & 0xFF) }, bytes(node.nodeName));
|
||||
}
|
||||
this.defNodeByName.put(node.nodeName, node);
|
||||
|
||||
|
||||
return node.getNodeId();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,427 +1,432 @@
|
|||
package net.mosstest.servercore;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.BrokenBarrierException;
|
||||
import java.util.concurrent.CyclicBarrier;
|
||||
|
||||
import jme3tools.optimize.GeometryBatchFactory;
|
||||
|
||||
import com.jme3.app.SimpleApplication;
|
||||
import com.jme3.input.KeyInput;
|
||||
import com.jme3.input.MouseInput;
|
||||
import com.jme3.input.controls.ActionListener;
|
||||
import com.jme3.input.controls.AnalogListener;
|
||||
import com.jme3.input.controls.KeyTrigger;
|
||||
import com.jme3.input.controls.MouseAxisTrigger;
|
||||
import com.jme3.light.DirectionalLight;
|
||||
import com.jme3.light.SpotLight;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.FastMath;
|
||||
import com.jme3.math.Matrix3f;
|
||||
import com.jme3.math.Quaternion;
|
||||
import com.jme3.math.Vector2f;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.scene.Node;
|
||||
import com.jme3.system.AppSettings;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import net.mosstest.scripting.INodeParams;
|
||||
import net.mosstest.scripting.MapChunk;
|
||||
import net.mosstest.scripting.MapNode;
|
||||
import net.mosstest.scripting.Position;
|
||||
|
||||
public class RenderProcessor extends SimpleApplication {
|
||||
|
||||
private final float speed = 3f;
|
||||
private final float playerHeight = 25;
|
||||
private final float blockSize = 10f;
|
||||
private final float rotationSpeed = 1f;
|
||||
private float[] locChanges = { 0, 0, 0 };
|
||||
private double lastTime;
|
||||
private boolean invertY = false;
|
||||
|
||||
private Vector3f initialUpVec;
|
||||
private Node worldNode;
|
||||
private SpotLight spot = new SpotLight();
|
||||
private DirectionalLight sun = new DirectionalLight();
|
||||
private HashMap<Position, RenderMapChunk> allChunks = new HashMap<Position, RenderMapChunk>();
|
||||
|
||||
public NodeManager nManager;
|
||||
public IRenderPreparator rPreparator;
|
||||
public ArrayBlockingQueue<MossRenderEvent> renderEventQueue = new ArrayBlockingQueue<>(
|
||||
24000, false);
|
||||
|
||||
public static RenderProcessor init(NodeManager manager,
|
||||
IRenderPreparator prep) {
|
||||
RenderProcessor app = new RenderProcessor();
|
||||
AppSettings settings = new AppSettings(true);
|
||||
settings.setResolution(800, 600);
|
||||
settings.setSamples(2);
|
||||
app.setSettings(settings);
|
||||
app.setShowSettings(false);
|
||||
app.initNodeThings(manager, prep);
|
||||
app.start();
|
||||
return app;
|
||||
}
|
||||
|
||||
private void initNodeThings(NodeManager manager, IRenderPreparator prep) {
|
||||
nManager = manager;
|
||||
rPreparator = prep;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void simpleInitApp() {
|
||||
lastTime = 0;
|
||||
worldNode = new Node("world");
|
||||
rootNode.attachChild(worldNode);
|
||||
spot.setSpotRange(150f);
|
||||
spot.setSpotInnerAngle(15f * FastMath.DEG_TO_RAD);
|
||||
spot.setSpotOuterAngle(35f * FastMath.DEG_TO_RAD);
|
||||
spot.setColor(ColorRGBA.White.mult(3f));
|
||||
spot.setPosition(cam.getLocation());
|
||||
spot.setDirection(cam.getDirection());
|
||||
|
||||
sun.setColor(ColorRGBA.White);
|
||||
sun.setDirection(new Vector3f(-.5f, -.5f, -.5f).normalizeLocal());
|
||||
rootNode.addLight(sun);
|
||||
rootNode.addLight(spot);
|
||||
// testChunkEvents();
|
||||
testLoadSurroundingChunks();
|
||||
flyCam.setEnabled(false);
|
||||
initialUpVec = cam.getUp().clone();
|
||||
initKeyBindings();
|
||||
}
|
||||
|
||||
@Override
|
||||
/**
|
||||
* Constant running loop that's built into SimpleApplication.
|
||||
* Looks for new events in the renderEventQueue, moves if necessary.
|
||||
*/
|
||||
public void simpleUpdate(float tpf) {
|
||||
if (lastTime + 10 < System.currentTimeMillis()) {
|
||||
moveWorld(locChanges[0], locChanges[1], locChanges[2]);
|
||||
lastTime = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
inputManager.setCursorVisible(false);
|
||||
MossRenderEvent myEvent = renderEventQueue.poll();
|
||||
if (myEvent instanceof MossRenderStopEvent) {
|
||||
System.out.println("Thread shutting down");
|
||||
} else if (myEvent instanceof MossRenderChunkEvent) {
|
||||
renderChunk(((MossRenderChunkEvent) myEvent).getChk(),
|
||||
((MossRenderChunkEvent) myEvent).getPos());
|
||||
}/*
|
||||
* else if (myEvent instanceof MossNodeAddEvent) { int x =
|
||||
* ((MossNodeAddEvent) myEvent).getX(); int y = ((MossNodeAddEvent)
|
||||
* myEvent).getY(); int z = ((MossNodeAddEvent) myEvent).getZ();
|
||||
* Position pos = ((MossNodeAddEvent) myEvent).getPosition();
|
||||
*
|
||||
* short defRef = ((MossNodeAddEvent) myEvent).getDef(); MapNode def =
|
||||
* /*NodeManager.getNode(defRef)null; Material mat =
|
||||
* getMaterial(defRef); allChunks.get(pos).addNode(def, mat, blockSize,
|
||||
* x, y, z); Vector3f loc = allChunks.get(pos).getNodeLoc(x, y, z,
|
||||
* blockSize); RenderNode geom = new RenderNode (mat, loc, blockSize,
|
||||
* def); worldNode.attachChild(geom);
|
||||
* System.out.println("ADDED A NODE"); } else if (myEvent instanceof
|
||||
* MossRenderAddAssetPath) { String path = ((MossRenderAddAssetPath)
|
||||
* myEvent).getPath(); assetManager.registerLocator(path,
|
||||
* com.jme3.asset.plugins.FileLocator.class); }
|
||||
*/
|
||||
}
|
||||
|
||||
public void renderChunk(MapChunk chk, Position pos) {
|
||||
if (chk == null) {
|
||||
return;
|
||||
}
|
||||
int x = pos.x;
|
||||
int y = pos.y;
|
||||
int z = pos.z;
|
||||
|
||||
double offset = 16 * blockSize - blockSize;
|
||||
RenderNode[][][] nodesInChunk = new RenderNode[16][16][16];
|
||||
|
||||
for (byte i = 0; i < 16; i++) {
|
||||
for (byte j = 0; j < 16; j++) {
|
||||
for (byte k = 0; k < 16; k++) {
|
||||
int nVal = chk.getNodeId(i, j, k);
|
||||
Material mat = getMaterial((short) nVal);
|
||||
switch (nVal) {
|
||||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
// if (k == 0 || k == 15 || j == 0 || j == 15 || i == 0
|
||||
// || i == 15) {
|
||||
float xLocation = (float) ((x + (32 * blockSize * pos.x))
|
||||
- offset + (i * 2 * blockSize));
|
||||
float yLocation = (float) ((y - playerHeight) - (j * 2 * blockSize));
|
||||
float zLocation = (float) ((z - offset + 32 * blockSize
|
||||
* pos.z) + (k * 2 * blockSize));
|
||||
Vector3f loc = new Vector3f(xLocation, yLocation,
|
||||
zLocation);
|
||||
RenderNode geom = new RenderNode(mat, loc, blockSize, /*
|
||||
* NodeManager
|
||||
* .
|
||||
* getNode
|
||||
* (
|
||||
* (
|
||||
* short
|
||||
* )
|
||||
* nVal
|
||||
* )
|
||||
*/
|
||||
null);
|
||||
nodesInChunk[i][j][k] = geom;
|
||||
worldNode.attachChild(geom);
|
||||
break;
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RenderMapChunk thisChunk = new RenderMapChunk(nodesInChunk, x, y, z);
|
||||
allChunks.put(pos, thisChunk);
|
||||
}
|
||||
|
||||
public void testLoadSurroundingChunks() {
|
||||
Position p1 = new Position(0, 0, 0, 0);
|
||||
Position p2 = new Position(1, 0, 0, 0);
|
||||
Position p3 = new Position(0, 0, 1, 0);
|
||||
Position p4 = new Position(1, 0, 1, 0);
|
||||
// Position p5 = new Position(-1,0,0,0);
|
||||
// Position p6 = new Position(0,0,-1,0);
|
||||
// Position p7 = new Position(-1,0,-1,0);
|
||||
|
||||
try {
|
||||
renderChunk(rPreparator.requestChunk(p1), p1);
|
||||
} catch (MapGeneratorException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (NullPointerException e) {
|
||||
System.out.println("oh well.");
|
||||
}
|
||||
|
||||
try {
|
||||
renderChunk(rPreparator.requestChunk(p2), p2);
|
||||
} catch (MapGeneratorException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (NullPointerException e) {
|
||||
System.out.println("oh well.");
|
||||
}
|
||||
try {
|
||||
renderChunk(rPreparator.requestChunk(p3), p3);
|
||||
} catch (MapGeneratorException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (NullPointerException e) {
|
||||
System.out.println("oh well.");
|
||||
}
|
||||
try {
|
||||
renderChunk(rPreparator.requestChunk(p4), p4);
|
||||
} catch (MapGeneratorException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (NullPointerException e) {
|
||||
System.out.println("oh well.");
|
||||
}
|
||||
// renderChunk(rPreparator.requestChunk(p5), p5);
|
||||
// renderChunk(rPreparator.requestChunk(p6), p6);
|
||||
// renderChunk(rPreparator.requestChunk(p7), p8);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* this is like the local testing, I make these chunks almost literally by
|
||||
* hand and then test with them so I don't have to rely on anything from
|
||||
* outside the preparator.
|
||||
*/
|
||||
/*
|
||||
* public void testChunkEvents () { Position pos = new Position(0, 0, 0, 0);
|
||||
* Position pos2 = new Position(-1,0,-1,0); boolean[][][] testModified = new
|
||||
* boolean[16][16][16]; boolean[][][] tM2 = new boolean[16][16][16];
|
||||
* for(boolean[][] l1 : testModified) {for(boolean[] l2 : l1)
|
||||
* {Arrays.fill(l2, false);}} for(boolean[][] l1 : tM2) {for(boolean[] l2 :
|
||||
* l1) {Arrays.fill(l2, false);}}
|
||||
*
|
||||
* int[][][] tN2 = new int[16][16][16]; int[][][] testNodes = new
|
||||
* int[16][16][16]; for(int[][] l1 : testNodes) {for(int[] l2 : l1)
|
||||
* {Arrays.fill(l2, 1);}} for(int[][] l1 : tN2) {for(int[] l2 : l1)
|
||||
* {Arrays.fill(l2, 1);}}
|
||||
*
|
||||
* MapChunk ch = new MapChunk(pos, testNodes, testModified); MapChunk ch2 =
|
||||
* new MapChunk(pos2, tN2, tM2); renderChunk(ch, pos); renderChunk(ch2,
|
||||
* pos2); GeometryBatchFactory.optimize(worldNode); }
|
||||
*/
|
||||
public Material getMaterial(short nVal) {
|
||||
Material mat = null;
|
||||
switch (nVal) {
|
||||
case 1:
|
||||
mat = new Material(assetManager,
|
||||
"Common/MatDefs/Light/Lighting.j3md");
|
||||
mat.setBoolean("UseMaterialColors", true);
|
||||
mat.setColor("Ambient", ColorRGBA.Green);
|
||||
mat.setColor("Diffuse", ColorRGBA.Green);
|
||||
}
|
||||
return mat;
|
||||
}
|
||||
|
||||
/**
|
||||
* Looks for changes in position, moves in direction of camera.
|
||||
*
|
||||
* @param cx
|
||||
* change in x
|
||||
* @param cy
|
||||
* change in y
|
||||
* @param cz
|
||||
* change in z
|
||||
*/
|
||||
private void moveWorld(float cx, float cy, float cz) {
|
||||
|
||||
Vector2f transVector = new Vector2f(cam.getDirection().x,
|
||||
cam.getDirection().z);
|
||||
|
||||
worldNode.setLocalTranslation(worldNode
|
||||
.getLocalTranslation()
|
||||
.addLocal(
|
||||
new Vector3f(-cz * transVector.x, 0f, -cz
|
||||
* transVector.y))
|
||||
.addLocal(-cx * transVector.y, 0f, cx * transVector.x)
|
||||
.addLocal(0f, -cy, 0f));
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs when the mouse moves to look around.
|
||||
*/
|
||||
private void rotateCamera(float value, Vector3f axis) {
|
||||
|
||||
Matrix3f mat = new Matrix3f();
|
||||
mat.fromAngleNormalAxis(rotationSpeed * value, axis);
|
||||
|
||||
Vector3f up = cam.getUp();
|
||||
Vector3f left = cam.getLeft();
|
||||
Vector3f dir = cam.getDirection();
|
||||
|
||||
mat.mult(up, up);
|
||||
mat.mult(left, left);
|
||||
mat.mult(dir, dir);
|
||||
|
||||
Quaternion q = new Quaternion();
|
||||
q.fromAxes(left, up, dir);
|
||||
q.normalizeLocal();
|
||||
|
||||
cam.setAxes(q);
|
||||
|
||||
spot.setDirection(cam.getDirection());
|
||||
}
|
||||
|
||||
/**
|
||||
* Set up key bindings and event listeners for key bindings
|
||||
*/
|
||||
private void initKeyBindings() {
|
||||
inputManager.addMapping("Jump", new KeyTrigger(KeyInput.KEY_SPACE));
|
||||
inputManager.addMapping("Down", new KeyTrigger(KeyInput.KEY_LSHIFT));
|
||||
inputManager.addMapping("Left", new KeyTrigger(KeyInput.KEY_A));
|
||||
inputManager.addMapping("Right", new KeyTrigger(KeyInput.KEY_D));
|
||||
inputManager.addMapping("Forward", new KeyTrigger(KeyInput.KEY_W));
|
||||
inputManager.addMapping("Back", new KeyTrigger(KeyInput.KEY_S));
|
||||
|
||||
inputManager.addMapping("CAM_Left", new MouseAxisTrigger(
|
||||
MouseInput.AXIS_X, true), new KeyTrigger(KeyInput.KEY_LEFT));
|
||||
|
||||
inputManager.addMapping("CAM_Right", new MouseAxisTrigger(
|
||||
MouseInput.AXIS_X, false), new KeyTrigger(KeyInput.KEY_RIGHT));
|
||||
|
||||
inputManager.addMapping("CAM_Up", new MouseAxisTrigger(
|
||||
MouseInput.AXIS_Y, false), new KeyTrigger(KeyInput.KEY_UP));
|
||||
|
||||
inputManager.addMapping("CAM_Down", new MouseAxisTrigger(
|
||||
MouseInput.AXIS_Y, true), new KeyTrigger(KeyInput.KEY_DOWN));
|
||||
|
||||
inputManager.addListener(actionListener, "Jump");
|
||||
inputManager.addListener(actionListener, "Down");
|
||||
inputManager.addListener(actionListener, "Left");
|
||||
inputManager.addListener(actionListener, "Right");
|
||||
inputManager.addListener(actionListener, "Forward");
|
||||
inputManager.addListener(actionListener, "Back");
|
||||
inputManager.addListener(analogListener, "CAM_Left");
|
||||
inputManager.addListener(analogListener, "CAM_Right");
|
||||
inputManager.addListener(analogListener, "CAM_Up");
|
||||
inputManager.addListener(analogListener, "CAM_Down");
|
||||
}
|
||||
|
||||
private AnalogListener analogListener = new AnalogListener() {
|
||||
|
||||
public void onAnalog(String name, float value, float tpf) {
|
||||
if (name.equals("CAM_Left")) {
|
||||
rotateCamera(value, initialUpVec);
|
||||
} else if (name.equals("CAM_Right")) {
|
||||
rotateCamera(-value, initialUpVec);
|
||||
} else if (name.equals("CAM_Up")) {
|
||||
rotateCamera(-value * (invertY ? -1 : 1), cam.getLeft());
|
||||
} else if (name.equals("CAM_Down")) {
|
||||
rotateCamera(value * (invertY ? -1 : 1), cam.getLeft());
|
||||
}
|
||||
}
|
||||
};
|
||||
private ActionListener actionListener = new ActionListener() {
|
||||
public void onAction(String name, boolean keyPressed, float tpf) {
|
||||
if (name.equals("Jump") && keyPressed/* && jumpSpeed == 0 */) {
|
||||
locChanges[1] = 2f;
|
||||
} else if (name.equals("Jump") && !keyPressed) {
|
||||
locChanges[1] = 0f;
|
||||
}
|
||||
|
||||
if (name.equals("Down") && keyPressed) {
|
||||
locChanges[1] = -2f;
|
||||
} else if (name.equals("Down") && !keyPressed) {
|
||||
locChanges[1] = 0f;
|
||||
}
|
||||
|
||||
if (name.equals("Left") && keyPressed) {
|
||||
locChanges[0] = speed;
|
||||
} else if (name.equals("Left") && !keyPressed
|
||||
&& locChanges[0] == speed) {
|
||||
locChanges[0] = 0;
|
||||
}
|
||||
|
||||
if (name.equals("Right") && keyPressed) {
|
||||
locChanges[0] = -speed;
|
||||
} else if (name.equals("Right") && !keyPressed
|
||||
&& locChanges[0] == -speed) {
|
||||
locChanges[0] = 0;
|
||||
}
|
||||
|
||||
if (name.equals("Forward") && keyPressed) {
|
||||
locChanges[2] = speed;
|
||||
} else if (name.equals("Forward") && !keyPressed
|
||||
&& locChanges[2] == speed) {
|
||||
locChanges[2] = 0;
|
||||
}
|
||||
|
||||
if (name.equals("Back") && keyPressed) {
|
||||
locChanges[2] = -speed;
|
||||
} else if (name.equals("Back") && !keyPressed
|
||||
&& locChanges[2] == -speed) {
|
||||
locChanges[2] = 0;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
package net.mosstest.servercore;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.concurrent.ArrayBlockingQueue;
|
||||
import java.util.concurrent.BrokenBarrierException;
|
||||
import java.util.concurrent.CyclicBarrier;
|
||||
|
||||
import jme3tools.optimize.GeometryBatchFactory;
|
||||
|
||||
import com.jme3.app.SimpleApplication;
|
||||
import com.jme3.input.KeyInput;
|
||||
import com.jme3.input.MouseInput;
|
||||
import com.jme3.input.controls.ActionListener;
|
||||
import com.jme3.input.controls.AnalogListener;
|
||||
import com.jme3.input.controls.KeyTrigger;
|
||||
import com.jme3.input.controls.MouseAxisTrigger;
|
||||
import com.jme3.light.DirectionalLight;
|
||||
import com.jme3.light.SpotLight;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.FastMath;
|
||||
import com.jme3.math.Matrix3f;
|
||||
import com.jme3.math.Quaternion;
|
||||
import com.jme3.math.Vector2f;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.scene.Node;
|
||||
import com.jme3.system.AppSettings;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
import net.mosstest.scripting.INodeParams;
|
||||
import net.mosstest.scripting.MapChunk;
|
||||
import net.mosstest.scripting.MapNode;
|
||||
import net.mosstest.scripting.Position;
|
||||
|
||||
public class RenderProcessor extends SimpleApplication {
|
||||
|
||||
private final float speed = 3f;
|
||||
private final float playerHeight = 25;
|
||||
private final float blockSize = 10f;
|
||||
private final float rotationSpeed = 1f;
|
||||
private float[] locChanges = { 0, 0, 0 };
|
||||
private double lastTime;
|
||||
private boolean invertY = false;
|
||||
|
||||
private Vector3f initialUpVec;
|
||||
private Node worldNode;
|
||||
private SpotLight spot = new SpotLight();
|
||||
private DirectionalLight sun = new DirectionalLight();
|
||||
private HashMap<Position, RenderMapChunk> allChunks = new HashMap<Position, RenderMapChunk>();
|
||||
|
||||
public NodeManager nManager;
|
||||
public IRenderPreparator rPreparator;
|
||||
public ArrayBlockingQueue<MossRenderEvent> renderEventQueue = new ArrayBlockingQueue<>(
|
||||
24000, false);
|
||||
|
||||
public static RenderProcessor init(NodeManager manager,
|
||||
IRenderPreparator prep) {
|
||||
RenderProcessor app = new RenderProcessor();
|
||||
prep.setRenderProcessor(app);
|
||||
prep.start();
|
||||
AppSettings settings = new AppSettings(true);
|
||||
settings.setResolution(800, 600);
|
||||
settings.setSamples(2);
|
||||
app.setSettings(settings);
|
||||
app.setShowSettings(false);
|
||||
app.initNodeThings(manager, prep);
|
||||
app.start();
|
||||
return app;
|
||||
}
|
||||
|
||||
private void initNodeThings(NodeManager manager, IRenderPreparator prep) {
|
||||
nManager = manager;
|
||||
rPreparator = prep;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void simpleInitApp() {
|
||||
lastTime = 0;
|
||||
worldNode = new Node("world");
|
||||
rootNode.attachChild(worldNode);
|
||||
spot.setSpotRange(150f);
|
||||
spot.setSpotInnerAngle(15f * FastMath.DEG_TO_RAD);
|
||||
spot.setSpotOuterAngle(35f * FastMath.DEG_TO_RAD);
|
||||
spot.setColor(ColorRGBA.White.mult(3f));
|
||||
spot.setPosition(cam.getLocation());
|
||||
spot.setDirection(cam.getDirection());
|
||||
|
||||
sun.setColor(ColorRGBA.White);
|
||||
sun.setDirection(new Vector3f(-.5f, -.5f, -.5f).normalizeLocal());
|
||||
rootNode.addLight(sun);
|
||||
rootNode.addLight(spot);
|
||||
// testChunkEvents();
|
||||
testLoadSurroundingChunks();
|
||||
flyCam.setEnabled(false);
|
||||
initialUpVec = cam.getUp().clone();
|
||||
initKeyBindings();
|
||||
}
|
||||
|
||||
@Override
|
||||
/**
|
||||
* Constant running loop that's built into SimpleApplication.
|
||||
* Looks for new events in the renderEventQueue, moves if necessary.
|
||||
*/
|
||||
public void simpleUpdate(float tpf) {
|
||||
if (lastTime + 10 < System.currentTimeMillis()) {
|
||||
moveWorld(locChanges[0], locChanges[1], locChanges[2]);
|
||||
lastTime = System.currentTimeMillis();
|
||||
}
|
||||
|
||||
inputManager.setCursorVisible(false);
|
||||
MossRenderEvent myEvent = renderEventQueue.poll();
|
||||
if (myEvent != null) {
|
||||
System.out.println("process event"+System.identityHashCode(myEvent));
|
||||
if (myEvent instanceof MossRenderStopEvent) {
|
||||
System.out.println("Thread shutting down");
|
||||
} else if (myEvent instanceof MossRenderChunkEvent) {
|
||||
renderChunk(((MossRenderChunkEvent) myEvent).getChk(),
|
||||
((MossRenderChunkEvent) myEvent).getPos());
|
||||
}
|
||||
}/*
|
||||
* else if (myEvent instanceof MossNodeAddEvent) { int x =
|
||||
* ((MossNodeAddEvent) myEvent).getX(); int y = ((MossNodeAddEvent)
|
||||
* myEvent).getY(); int z = ((MossNodeAddEvent) myEvent).getZ();
|
||||
* Position pos = ((MossNodeAddEvent) myEvent).getPosition();
|
||||
*
|
||||
* short defRef = ((MossNodeAddEvent) myEvent).getDef(); MapNode def =
|
||||
* /*NodeManager.getNode(defRef)null; Material mat =
|
||||
* getMaterial(defRef); allChunks.get(pos).addNode(def, mat, blockSize,
|
||||
* x, y, z); Vector3f loc = allChunks.get(pos).getNodeLoc(x, y, z,
|
||||
* blockSize); RenderNode geom = new RenderNode (mat, loc, blockSize,
|
||||
* def); worldNode.attachChild(geom);
|
||||
* System.out.println("ADDED A NODE"); } else if (myEvent instanceof
|
||||
* MossRenderAddAssetPath) { String path = ((MossRenderAddAssetPath)
|
||||
* myEvent).getPath(); assetManager.registerLocator(path,
|
||||
* com.jme3.asset.plugins.FileLocator.class); }
|
||||
*/
|
||||
}
|
||||
|
||||
public void renderChunk(MapChunk chk, Position pos) {
|
||||
if (chk == null) {
|
||||
return;
|
||||
}
|
||||
int x = pos.x;
|
||||
int y = pos.y;
|
||||
int z = pos.z;
|
||||
|
||||
double offset = 16 * blockSize - blockSize;
|
||||
RenderNode[][][] nodesInChunk = new RenderNode[16][16][16];
|
||||
|
||||
for (byte i = 0; i < 16; i++) {
|
||||
for (byte j = 0; j < 16; j++) {
|
||||
for (byte k = 0; k < 16; k++) {
|
||||
int nVal = chk.getNodeId(i, j, k);
|
||||
Material mat = getMaterial((short) nVal);
|
||||
switch (nVal) {
|
||||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
// if (k == 0 || k == 15 || j == 0 || j == 15 || i == 0
|
||||
// || i == 15) {
|
||||
float xLocation = (float) ((x + (32 * blockSize * pos.x))
|
||||
- offset + (i * 2 * blockSize));
|
||||
float yLocation = (float) ((y - playerHeight) - (j * 2 * blockSize));
|
||||
float zLocation = (float) ((z - offset + 32 * blockSize
|
||||
* pos.z) + (k * 2 * blockSize));
|
||||
Vector3f loc = new Vector3f(xLocation, yLocation,
|
||||
zLocation);
|
||||
RenderNode geom = new RenderNode(mat, loc, blockSize, /*
|
||||
* NodeManager
|
||||
* .
|
||||
* getNode
|
||||
* (
|
||||
* (
|
||||
* short
|
||||
* )
|
||||
* nVal
|
||||
* )
|
||||
*/
|
||||
null);
|
||||
nodesInChunk[i][j][k] = geom;
|
||||
worldNode.attachChild(geom);
|
||||
break;
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
RenderMapChunk thisChunk = new RenderMapChunk(nodesInChunk, x, y, z);
|
||||
allChunks.put(pos, thisChunk);
|
||||
}
|
||||
|
||||
public void testLoadSurroundingChunks() {
|
||||
Position p1 = new Position(0, 0, 0, 0);
|
||||
Position p2 = new Position(1, 0, 0, 0);
|
||||
Position p3 = new Position(0, 0, 1, 0);
|
||||
Position p4 = new Position(1, 0, 1, 0);
|
||||
// Position p5 = new Position(-1,0,0,0);
|
||||
// Position p6 = new Position(0,0,-1,0);
|
||||
// Position p7 = new Position(-1,0,-1,0);
|
||||
|
||||
try {
|
||||
renderChunk(rPreparator.requestChunk(p1), p1);
|
||||
} catch (MapGeneratorException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (NullPointerException e) {
|
||||
System.out.println("oh well.");
|
||||
}
|
||||
|
||||
try {
|
||||
renderChunk(rPreparator.requestChunk(p2), p2);
|
||||
} catch (MapGeneratorException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (NullPointerException e) {
|
||||
System.out.println("oh well.");
|
||||
}
|
||||
try {
|
||||
renderChunk(rPreparator.requestChunk(p3), p3);
|
||||
} catch (MapGeneratorException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (NullPointerException e) {
|
||||
System.out.println("oh well.");
|
||||
}
|
||||
try {
|
||||
renderChunk(rPreparator.requestChunk(p4), p4);
|
||||
} catch (MapGeneratorException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (InterruptedException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
} catch (NullPointerException e) {
|
||||
System.out.println("oh well.");
|
||||
}
|
||||
// renderChunk(rPreparator.requestChunk(p5), p5);
|
||||
// renderChunk(rPreparator.requestChunk(p6), p6);
|
||||
// renderChunk(rPreparator.requestChunk(p7), p8);
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* this is like the local testing, I make these chunks almost literally by
|
||||
* hand and then test with them so I don't have to rely on anything from
|
||||
* outside the preparator.
|
||||
*/
|
||||
/*
|
||||
* public void testChunkEvents () { Position pos = new Position(0, 0, 0, 0);
|
||||
* Position pos2 = new Position(-1,0,-1,0); boolean[][][] testModified = new
|
||||
* boolean[16][16][16]; boolean[][][] tM2 = new boolean[16][16][16];
|
||||
* for(boolean[][] l1 : testModified) {for(boolean[] l2 : l1)
|
||||
* {Arrays.fill(l2, false);}} for(boolean[][] l1 : tM2) {for(boolean[] l2 :
|
||||
* l1) {Arrays.fill(l2, false);}}
|
||||
*
|
||||
* int[][][] tN2 = new int[16][16][16]; int[][][] testNodes = new
|
||||
* int[16][16][16]; for(int[][] l1 : testNodes) {for(int[] l2 : l1)
|
||||
* {Arrays.fill(l2, 1);}} for(int[][] l1 : tN2) {for(int[] l2 : l1)
|
||||
* {Arrays.fill(l2, 1);}}
|
||||
*
|
||||
* MapChunk ch = new MapChunk(pos, testNodes, testModified); MapChunk ch2 =
|
||||
* new MapChunk(pos2, tN2, tM2); renderChunk(ch, pos); renderChunk(ch2,
|
||||
* pos2); GeometryBatchFactory.optimize(worldNode); }
|
||||
*/
|
||||
public Material getMaterial(short nVal) {
|
||||
Material mat = null;
|
||||
switch (nVal) { //FIXME thatnerd2 speak to me in person regarding this
|
||||
case 1:
|
||||
mat = new Material(assetManager,
|
||||
"Common/MatDefs/Light/Lighting.j3md");
|
||||
mat.setBoolean("UseMaterialColors", true);
|
||||
mat.setColor("Ambient", ColorRGBA.Green);
|
||||
mat.setColor("Diffuse", ColorRGBA.Green);
|
||||
}
|
||||
return mat;
|
||||
}
|
||||
|
||||
/**
|
||||
* Looks for changes in position, moves in direction of camera.
|
||||
*
|
||||
* @param cx
|
||||
* change in x
|
||||
* @param cy
|
||||
* change in y
|
||||
* @param cz
|
||||
* change in z
|
||||
*/
|
||||
private void moveWorld(float cx, float cy, float cz) {
|
||||
|
||||
Vector2f transVector = new Vector2f(cam.getDirection().x,
|
||||
cam.getDirection().z);
|
||||
|
||||
worldNode.setLocalTranslation(worldNode
|
||||
.getLocalTranslation()
|
||||
.addLocal(
|
||||
new Vector3f(-cz * transVector.x, 0f, -cz
|
||||
* transVector.y))
|
||||
.addLocal(-cx * transVector.y, 0f, cx * transVector.x)
|
||||
.addLocal(0f, -cy, 0f));
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs when the mouse moves to look around.
|
||||
*/
|
||||
private void rotateCamera(float value, Vector3f axis) {
|
||||
|
||||
Matrix3f mat = new Matrix3f();
|
||||
mat.fromAngleNormalAxis(rotationSpeed * value, axis);
|
||||
|
||||
Vector3f up = cam.getUp();
|
||||
Vector3f left = cam.getLeft();
|
||||
Vector3f dir = cam.getDirection();
|
||||
|
||||
mat.mult(up, up);
|
||||
mat.mult(left, left);
|
||||
mat.mult(dir, dir);
|
||||
|
||||
Quaternion q = new Quaternion();
|
||||
q.fromAxes(left, up, dir);
|
||||
q.normalizeLocal();
|
||||
|
||||
cam.setAxes(q);
|
||||
|
||||
spot.setDirection(cam.getDirection());
|
||||
}
|
||||
|
||||
/**
|
||||
* Set up key bindings and event listeners for key bindings
|
||||
*/
|
||||
private void initKeyBindings() {
|
||||
inputManager.addMapping("Jump", new KeyTrigger(KeyInput.KEY_SPACE));
|
||||
inputManager.addMapping("Down", new KeyTrigger(KeyInput.KEY_LSHIFT));
|
||||
inputManager.addMapping("Left", new KeyTrigger(KeyInput.KEY_A));
|
||||
inputManager.addMapping("Right", new KeyTrigger(KeyInput.KEY_D));
|
||||
inputManager.addMapping("Forward", new KeyTrigger(KeyInput.KEY_W));
|
||||
inputManager.addMapping("Back", new KeyTrigger(KeyInput.KEY_S));
|
||||
|
||||
inputManager.addMapping("CAM_Left", new MouseAxisTrigger(
|
||||
MouseInput.AXIS_X, true), new KeyTrigger(KeyInput.KEY_LEFT));
|
||||
|
||||
inputManager.addMapping("CAM_Right", new MouseAxisTrigger(
|
||||
MouseInput.AXIS_X, false), new KeyTrigger(KeyInput.KEY_RIGHT));
|
||||
|
||||
inputManager.addMapping("CAM_Up", new MouseAxisTrigger(
|
||||
MouseInput.AXIS_Y, false), new KeyTrigger(KeyInput.KEY_UP));
|
||||
|
||||
inputManager.addMapping("CAM_Down", new MouseAxisTrigger(
|
||||
MouseInput.AXIS_Y, true), new KeyTrigger(KeyInput.KEY_DOWN));
|
||||
|
||||
inputManager.addListener(actionListener, "Jump");
|
||||
inputManager.addListener(actionListener, "Down");
|
||||
inputManager.addListener(actionListener, "Left");
|
||||
inputManager.addListener(actionListener, "Right");
|
||||
inputManager.addListener(actionListener, "Forward");
|
||||
inputManager.addListener(actionListener, "Back");
|
||||
inputManager.addListener(analogListener, "CAM_Left");
|
||||
inputManager.addListener(analogListener, "CAM_Right");
|
||||
inputManager.addListener(analogListener, "CAM_Up");
|
||||
inputManager.addListener(analogListener, "CAM_Down");
|
||||
}
|
||||
|
||||
private AnalogListener analogListener = new AnalogListener() {
|
||||
|
||||
public void onAnalog(String name, float value, float tpf) {
|
||||
if (name.equals("CAM_Left")) {
|
||||
rotateCamera(value, initialUpVec);
|
||||
} else if (name.equals("CAM_Right")) {
|
||||
rotateCamera(-value, initialUpVec);
|
||||
} else if (name.equals("CAM_Up")) {
|
||||
rotateCamera(-value * (invertY ? -1 : 1), cam.getLeft());
|
||||
} else if (name.equals("CAM_Down")) {
|
||||
rotateCamera(value * (invertY ? -1 : 1), cam.getLeft());
|
||||
}
|
||||
}
|
||||
};
|
||||
private ActionListener actionListener = new ActionListener() {
|
||||
public void onAction(String name, boolean keyPressed, float tpf) {
|
||||
if (name.equals("Jump") && keyPressed/* && jumpSpeed == 0 */) {
|
||||
locChanges[1] = 2f;
|
||||
} else if (name.equals("Jump") && !keyPressed) {
|
||||
locChanges[1] = 0f;
|
||||
}
|
||||
|
||||
if (name.equals("Down") && keyPressed) {
|
||||
locChanges[1] = -2f;
|
||||
} else if (name.equals("Down") && !keyPressed) {
|
||||
locChanges[1] = 0f;
|
||||
}
|
||||
|
||||
if (name.equals("Left") && keyPressed) {
|
||||
locChanges[0] = speed;
|
||||
} else if (name.equals("Left") && !keyPressed
|
||||
&& locChanges[0] == speed) {
|
||||
locChanges[0] = 0;
|
||||
}
|
||||
|
||||
if (name.equals("Right") && keyPressed) {
|
||||
locChanges[0] = -speed;
|
||||
} else if (name.equals("Right") && !keyPressed
|
||||
&& locChanges[0] == -speed) {
|
||||
locChanges[0] = 0;
|
||||
}
|
||||
|
||||
if (name.equals("Forward") && keyPressed) {
|
||||
locChanges[2] = speed;
|
||||
} else if (name.equals("Forward") && !keyPressed
|
||||
&& locChanges[2] == speed) {
|
||||
locChanges[2] = 0;
|
||||
}
|
||||
|
||||
if (name.equals("Back") && keyPressed) {
|
||||
locChanges[2] = -speed;
|
||||
} else if (name.equals("Back") && !keyPressed
|
||||
&& locChanges[2] == -speed) {
|
||||
locChanges[2] = 0;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue