studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chunk physics more reliable with sharp inclines

Browse Source
This commit is contained in:
austin 2021-11-07 17:10:23 -05:00
parent 39ba611af4
commit 863fd4b665
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/electrosphere/engine/LoadingThread.java
View File

@ -624,8 +624,8 @@ public class LoadingThread extends Thread {
// StructureUtils.spawnBasicStructure("building1", new Vector3f(5,2.4f,5), new Quaternionf()); // StructureUtils.spawnBasicStructure("building1", new Vector3f(5,2.4f,5), new Quaternionf());
Entity bow = ItemUtils.spawnBasicItem("Bow"); // Entity bow = ItemUtils.spawnBasicItem("Bow");
EntityUtils.getPosition(bow).set(1, 1, 2); // EntityUtils.getPosition(bow).set(1, 1, 2);
// NavMeshPathfinder.navigatePointToPointInMesh(G*lobals.navMeshManager.getMeshes().get(0), new Vector3d(10,0,5), new Vector3d(5,0,10)); // NavMeshPathfinder.navigatePointToPointInMesh(G*lobals.navMeshManager.getMeshes().get(0), new Vector3d(10,0,5), new Vector3d(5,0,10));

2
src/main/java/electrosphere/entity/state/GravityTree.java
View File

@ -107,7 +107,7 @@ public class GravityTree {
if(hadGroundCollision()){ if(hadGroundCollision()){
state = GravityTreeState.NOT_ACTIVE; state = GravityTreeState.NOT_ACTIVE;
if(!hadStructureCollision()){ if(!hadStructureCollision()){
position.set(new Vector3d(position.x,Globals.commonWorldData.getElevationAtPoint(position) + 0.0001f,position.z)); // position.set(new Vector3d(position.x,Globals.commonWorldData.getElevationAtPoint(position) + 0.0001f,position.z));
} }
gravityVelocity = 0; gravityVelocity = 0;
} else { } else {

12
src/main/java/electrosphere/game/collision/CollisionEngine.java
View File

@ -123,7 +123,11 @@ public class CollisionEngine {
// System.out.println(EntityUtils.getPosition(impactor.getParent()) + " " + EntityUtils.getPosition(receiver.getParent())); // System.out.println(EntityUtils.getPosition(impactor.getParent()) + " " + EntityUtils.getPosition(receiver.getParent()));
// System.out.println(); // System.out.println();
// System.out.println("Terrain-creature collision: " + normal + " mag:" + magnitude); // System.out.println("Terrain-creature collision: " + normal + " mag:" + magnitude);
receiver.addImpulse(new Impulse(new Vector3d(0,normal.y,0), magnitude*2, Collidable.TYPE_TERRAIN)); if(normal.y > normal.x + normal.z){
normal.x = 0;
normal.z = 0;
}
receiver.addImpulse(new Impulse(normal, magnitude * 2, Collidable.TYPE_TERRAIN));
break; break;
case Collidable.TYPE_CREATURE: case Collidable.TYPE_CREATURE:
receiver.addImpulse(new Impulse(normal, magnitude, Collidable.TYPE_CREATURE)); receiver.addImpulse(new Impulse(normal, magnitude, Collidable.TYPE_CREATURE));
@ -145,7 +149,11 @@ public class CollisionEngine {
// System.out.println(EntityUtils.getPosition(impactor.getParent()) + " " + EntityUtils.getPosition(receiver.getParent())); // System.out.println(EntityUtils.getPosition(impactor.getParent()) + " " + EntityUtils.getPosition(receiver.getParent()));
// System.out.println(); // System.out.println();
// System.out.println("Terrain-item collision: " + normal + " mag:" + magnitude); // System.out.println("Terrain-item collision: " + normal + " mag:" + magnitude);
receiver.addImpulse(new Impulse(new Vector3d(0,normal.y,0), magnitude*2, Collidable.TYPE_TERRAIN)); if(normal.y > normal.x + normal.z){
normal.x = 0;
normal.z = 0;
}
receiver.addImpulse(new Impulse(normal, magnitude * 2, Collidable.TYPE_TERRAIN));
break; break;
case Collidable.TYPE_CREATURE: case Collidable.TYPE_CREATURE:
receiver.addImpulse(new Impulse(normal, Math.min(magnitude * 0.5,0.5), Collidable.TYPE_CREATURE)); receiver.addImpulse(new Impulse(normal, Math.min(magnitude * 0.5,0.5), Collidable.TYPE_CREATURE));

1
src/main/java/electrosphere/game/server/terrain/manager/ServerTerrainChunk.java
View File

@ -29,6 +29,7 @@ public class ServerTerrainChunk {
long[][] randomizer = new long[5][5]; long[][] randomizer = new long[5][5];
float[][] heightmap = new float[width + 1][width + 1]; float[][] heightmap = new float[width + 1][width + 1];
ServerTerrainChunk rVal = new ServerTerrainChunk(x, y, heightmap, macroValues, randomizer); ServerTerrainChunk rVal = new ServerTerrainChunk(x, y, heightmap, macroValues, randomizer);
rVal.addModification(new TerrainModification(x, y, 3, 3, 5));
return rVal; return rVal;
} }