sigonasr2/Rabi-bounce-bounce-rabi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added instanced player messaging. Correct Player Joining/Leaving bugs.

Browse Source
This commit is contained in:
Joshua Sigona 2020-07-01 15:57:40 +09:00
parent f7cf09ce4b
commit c028e94d2c
19 changed files with 202 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
*.j3o filter=lfs diff=lfs merge=lfs -text

27
assets/Materials/Generated/model2-Hair001_baked_006.j3m Normal file
View File

@ -0,0 +1,27 @@
Material MyMaterial : Common/MatDefs/Light/PBRLighting.j3md {
MaterialParameters {
Glossiness : 1.0
EmissivePower : 3.0
BaseColor : 1.0 1.0 1.0 1.0
ParallaxHeight : 0.05
Metallic : 0.0
BackfaceShadows : false
Roughness : 0.0
NormalType : -1.0
Emissive : 0.0 0.0 0.0 1.0
EmissiveIntensity : 2.0
BaseColorMap : Texture2D[name=image6.png, image=Image[size=1024x256, format=ABGR8, id=323]]:returned null key
Specular : 1.0 1.0 1.0 1.0
}
AdditionalRenderState {
PointSprite On
FaceCull Off
AlphaTestFalloff 0.0
DepthWrite On
ColorWrite On
PolyOffset 0.0 0.0
DepthTest On
Blend Off
Wireframe Off
}
}

23
assets/Materials/Generated/model2-Hair001_baked_2391.j3m Normal file
View File

@ -0,0 +1,23 @@
Material MyMaterial : Common/MatDefs/Light/Lighting.j3md {
MaterialParameters {
Diffuse : 0.64000005 0.64000005 0.64000005 1.0
UseMaterialColors : true
ParallaxHeight : 0.05
Ambient : 1.0 1.0 1.0 1.0
BackfaceShadows : false
DiffuseMap : Texture2D[name=Atlas_40637.png, image=Image[size=8192x4096, format=RGBA8, id=481]]:returned null key
Specular : 0.4 0.4 0.4 1.0
Shininess : 128.0
}
AdditionalRenderState {
PointSprite On
FaceCull Back
AlphaTestFalloff 0.0
DepthWrite On
ColorWrite On
PolyOffset 0.0 0.0
DepthTest On
Blend Off
Wireframe Off
}
}

9
assets/Materials/PinkHair.j3m Normal file
View File

@ -0,0 +1,9 @@
Material PinkHair : Common/MatDefs/Light/Lighting.j3md {
MaterialParameters {
Diffuse : 1.0 0.2 1.0 1.0
VertexLighting : false
UseMaterialColors : true
}
AdditionalRenderState {
}
}

BIN
assets/Models/Oto.mesh.j3o
View File

Binary file not shown.

3
assets/Models/model5/model5.j3o Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:176f45a93d4e1074dd77f53868dba0a1b05dbbd858a4f2a2b67311ec13308331
size 120792010

3
assets/Models/model5/model5.j3odata Normal file
View File

@ -0,0 +1,3 @@
#
#Sun Jun 28 15:49:26 KST 2020
ORIGINAL_PATH=Models/model5/model5.gltf

BIN
assets/Models/test ava/test ava.j3o
View File

Binary file not shown.

BIN
assets/Scenes/TestLevel.j3o
View File

Binary file not shown.

3
assets/Scenes/TestLevel2.j3o Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7a1e76295163b1d07e43a734e54c4e8ea440ebb6af63240eb015a095311d6765
size 155133

3
assets/Scenes/TestLevel2.j3odata Normal file
View File

@ -0,0 +1,3 @@
#
#Wed Jun 17 10:55:55 KST 2020
ORIGINAL_PATH=Scenes/TestLevel.j3o

BIN
build/classes/mygame/Main.class
View File

Binary file not shown.

2
nbproject/private/private.xml
View File

@ -5,8 +5,10 @@
<group>
<file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/Main.java</file>
<file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/appstate/RunLevel.java</file>
<file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/PhysicsControl.java</file>
<file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/PlayableCharacter.java</file>
<file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/server/ServerMain.java</file>
<file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/server/Instance.java</file>
<file>file:/E:/GameProjects/Rabi-Bounce-Bounce-R/src/mygame/control/NetworkPlayableCharacter.java</file>
</group>
</open-files>

4
nbproject/project.properties
View File

@ -51,8 +51,8 @@ javac.deprecation=false
javac.external.vm=false
javac.processorpath=\
${javac.classpath}
javac.source=1.7
javac.target=1.7
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}

8
src/mygame/Main.java
View File

@ -23,6 +23,7 @@ import mygame.server.ServerMain;
import mygame.server.ServerMain.EntityMessage;
import mygame.server.ServerMain.JoinMessage;
import mygame.server.ServerMain.PlayerActionMessage;
import mygame.server.ServerMain.PlayerLeaveMessage;
import mygame.server.ServerMain.PlayerPositionMessage;
import mygame.server.ServerMain.ServerMessage;
import mygame.server.ServerMain.SyncLevelMessage;
@ -44,6 +45,7 @@ public class Main extends SimpleApplication implements ClientStateListener{
client.addMessageListener(new ClientListener(), JoinMessage.class);
//client.addMessageListener(new ClientListener(), PlayerJoinMessage.class);
client.addMessageListener(new ClientListener(), PlayerActionMessage.class);
client.addMessageListener(new ClientListener(), PlayerLeaveMessage.class);
client.addClientStateListener(this);
client.start();
@ -68,8 +70,9 @@ public class Main extends SimpleApplication implements ClientStateListener{
public void simpleInitApp() {
flyCam.setEnabled(false);
//flyCam.setMoveSpeed(50);
level = new RunLevel("TestLevel");
level = new RunLevel("TestLevel2");
stateManager.attach(level);
//stateManager.detach(level);
}
@Override
@ -110,6 +113,9 @@ public class Main extends SimpleApplication implements ClientStateListener{
} else
if (message instanceof JoinMessage) {
level.getPlayerJoinMessage((JoinMessage)message);
} else
if (message instanceof PlayerLeaveMessage) {
level.getPlayerLeaveMessage((PlayerLeaveMessage)message);
}
}
}

42
src/mygame/appstate/RunLevel.java
View File

@ -34,7 +34,9 @@ import mygame.control.PlayableCharacter;
import mygame.server.ServerMain.JoinMessage;
import mygame.server.ServerMain.SyncLevelMessage;
import mygame.server.Entity;
import mygame.server.ServerMain;
import mygame.server.ServerMain.PlayerActionMessage;
import mygame.server.ServerMain.PlayerLeaveMessage;
public class RunLevel extends BaseAppState
@ -50,10 +52,13 @@ public class RunLevel extends BaseAppState
private List<Integer> players = new ArrayList<>();
private Vector3f[] player_locations;
public static List<PlayerActionMessage> queuedPlayerActionMessages = new ArrayList<>();
public static List<JoinMessage> queuedPlayerJoinMessages = new ArrayList<>();
public static List<PlayerLeaveMessage> queuedPlayerLeaveMessages = new ArrayList<>();
public static List<SyncLevelMessage> queuedSyncLevelMessages = new ArrayList<>();
public static Node world;
Node entityNode;
public static Node networkedPlayersNode;
float timer;
public RunLevel(String levelName) {
//System.out.println("In here. Initialize");
@ -94,7 +99,7 @@ public class RunLevel extends BaseAppState
//DirectionalLight sceneLight = (DirectionalLight)world.getLocalLightList().get(0);
Node player = (Node)assetManager.loadModel("Models/Oto/Oto.mesh.xml");
Node playerNode = new Node();
Node playerNode = new Node("Player");
playerNode.attachChild(player);
playerNode.addControl(new PlayableCharacter());
@ -202,6 +207,8 @@ public class RunLevel extends BaseAppState
protected void cleanup(Application app) {
//TODO: clean up what you initialized in the initialize method,
//e.g. remove all spatials from rootNode
//((Node)rootNode.getChild("Player")).removeControl(PlayableCharacter.class);
((Node)rootNode.getChild("Reflected Scene")).detachAllChildren();
}
//onEnable()/onDisable() can be used for managing things that should
@ -230,6 +237,30 @@ public class RunLevel extends BaseAppState
createPlayers();
}
queuedSyncLevelMessages.clear();
for (JoinMessage msg : queuedPlayerJoinMessages) {
MakeNetworkPlayer(msg.getEntity().id,msg.getEntity().position);
players.add(msg.getEntity().id);
createPlayers();
System.out.println(msg);
}
queuedPlayerJoinMessages.clear();
for (PlayerLeaveMessage msg : queuedPlayerLeaveMessages) {
for (int i=0;i<networkedPlayersNode.getChildren().size();i++) {
Spatial s = networkedPlayersNode.getChildren().get(i);
if (s.getName().equalsIgnoreCase(Integer.toString(msg.getId()))) {
System.out.println("Removed "+s);
networkedPlayersNode.detachChild(s);
players.remove((Integer)msg.getId());
i--;
}
}
}
queuedPlayerLeaveMessages.clear();
/*timer+=tpf;
if (timer>5) {
main.getStateManager().detach(this);
this.setEnabled(false);
}*/
}
@Override
@ -259,9 +290,7 @@ public class RunLevel extends BaseAppState
public void getPlayerJoinMessage(JoinMessage playerJoinMessage) {
JoinMessage msg = playerJoinMessage;
MakeNetworkPlayer(msg.getEntity().id,msg.getEntity().position);
players.add(msg.getEntity().id);
createPlayers();
queuedPlayerJoinMessages.add(msg);
}
private void MakeNetworkPlayer(int id, Vector3f pos) {
@ -290,4 +319,9 @@ public class RunLevel extends BaseAppState
networkPlayer.setUserData("lastCamLeftDir", playerActionMessage.getCameraLeft());
}
public void getPlayerLeaveMessage(PlayerLeaveMessage playerLeaveMessage) {
PlayerLeaveMessage msg = playerLeaveMessage;
queuedPlayerLeaveMessages.add(msg);
}
}

58
src/mygame/control/PlayableCharacter.java
View File

@ -25,6 +25,7 @@ import com.jme3.scene.Spatial;
import com.jme3.scene.control.AbstractControl;
import com.jme3.scene.control.Control;
import java.io.IOException;
import static mygame.Main.level;
import static mygame.Main.main;
import mygame.server.ServerMain.PlayerActionMessage;
import mygame.server.ServerMain.PlayerPositionMessage;
@ -60,34 +61,40 @@ public class PlayableCharacter extends AbstractControl implements Savable, Clone
@Override
public void setSpatial(Spatial spatial) {
super.setSpatial(spatial);
//control = spatial.getControl(BetterCharacterControl.class);
Node myNode = (Node)spatial;
if (spatial!=null) {
//control = spatial.getControl(BetterCharacterControl.class);
Node myNode = (Node)spatial;
physics = new PhysicsControl(
0.1f,
-0.25f,
5f
);
myNode.addControl(physics);
physics = new PhysicsControl(
0.1f,
-0.25f,
5f
);
myNode.addControl(physics);
control = ((Node)spatial).getChild(0).getControl(AnimControl.class);
control.addListener(this);
channel = control.createChannel();
channel.setAnim("stand");
/*channel_lowerbody = control.createChannel();
channel_lowerbody.addBone("hip.right");
channel_lowerbody.addBone("hip.left");*/ //There is no strafing animation
control = (((Node)spatial).getChild(0)).getControl(AnimControl.class);
//System.out.println(control.getAnimationNames());
control.addListener(this);
channel = control.createChannel();
channel.setAnim("stand");
channel.setLoopMode(LoopMode.Cycle);
/*channel_lowerbody = control.createChannel();
channel_lowerbody.addBone("hip.right");
channel_lowerbody.addBone("hip.left");*/ //There is no strafing animation
main.getInputManager().addMapping("WalkForward", new KeyTrigger(KeyInput.KEY_W));
main.getInputManager().addMapping("WalkBackward", new KeyTrigger(KeyInput.KEY_S));
main.getInputManager().addMapping("StrafeLeft", new KeyTrigger(KeyInput.KEY_A));
main.getInputManager().addMapping("StrafeRight", new KeyTrigger(KeyInput.KEY_D));
main.getInputManager().addMapping("Jump", new KeyTrigger(KeyInput.KEY_SPACE));
main.getInputManager().addListener(this, "WalkForward");
main.getInputManager().addListener(this, "WalkBackward");
main.getInputManager().addListener(this, "StrafeRight");
main.getInputManager().addListener(this, "StrafeLeft");
main.getInputManager().addListener(this, "Jump");
main.getInputManager().addMapping("WalkForward", new KeyTrigger(KeyInput.KEY_W));
main.getInputManager().addMapping("WalkBackward", new KeyTrigger(KeyInput.KEY_S));
main.getInputManager().addMapping("StrafeLeft", new KeyTrigger(KeyInput.KEY_A));
main.getInputManager().addMapping("StrafeRight", new KeyTrigger(KeyInput.KEY_D));
main.getInputManager().addMapping("Jump", new KeyTrigger(KeyInput.KEY_SPACE));
main.getInputManager().addListener(this, "WalkForward");
main.getInputManager().addListener(this, "WalkBackward");
main.getInputManager().addListener(this, "StrafeRight");
main.getInputManager().addListener(this, "StrafeLeft");
main.getInputManager().addListener(this, "Jump");
} else {
main.getInputManager().removeListener(this);
}
}
/** Implement your spatial's behaviour here.
@ -216,6 +223,7 @@ public class PlayableCharacter extends AbstractControl implements Savable, Clone
switch (name) {
case "Jump":{
if (isOnGround() || physics.airTime<=physics.walkOffTime) {
//System.out.println("Jump");
physics.jump();
if (!(this instanceof NetworkPlayableCharacter)) { //Only send if this is the source client.
PlayerActionMessage action = new PlayerActionMessage(name,"",main.client.getId(),spatial.getLocalTranslation(),spatial.getLocalRotation(),main.getCamera().getDirection(),main.getCamera().getLeft());

1
src/mygame/server/Instance.java
View File

@ -27,6 +27,7 @@ public class Instance {
protected HashMap<Integer,Vector3f> lastKnownPositions = new HashMap<>();
protected List<Entity> entities = new ArrayList<>(); //Entity data specific to this instance.
List<Integer> nullEntities = new ArrayList<>(); //A list of "null" entities. When adding new entities, these slots will be consumed first.
public int INSTANCE_ID = -1;
Instance(String levelName) {
this.levelName = levelName;
}

47
src/mygame/server/ServerMain.java
View File

@ -34,6 +34,7 @@ public class ServerMain extends SimpleApplication{
int clientIDMax = 0;
public static HashMap<String,Instance> instances = new HashMap<>();
public static HashMap<Integer,Instance> players = new HashMap<>(); //The last instance location this player was seen in.
public static int INSTANCE_UNIQUE_ID = 0;
ServerMain() {
try {
@ -51,7 +52,9 @@ public class ServerMain extends SimpleApplication{
if (players.containsKey(conn.getId())) {
Instance i = players.get(conn.getId());
i.removePlayer(conn);
server.broadcast(Filters.in(i.clients),new PlayerLeaveMessage(i.levelName,conn.getId()));
}
players.remove(conn.getId());
}
});
@ -61,6 +64,7 @@ public class ServerMain extends SimpleApplication{
Serializer.registerClass(JoinMessage.class);
Serializer.registerClass(SyncLevelMessage.class);
Serializer.registerClass(Entity.class);
Serializer.registerClass(PlayerLeaveMessage.class);
//Serializer.registerClass(PlayerJoinMessage.class);
Serializer.registerClass(PlayerActionMessage.class);
@ -71,6 +75,7 @@ public class ServerMain extends SimpleApplication{
server.addMessageListener(new ServerListener(), SyncLevelMessage.class);
//server.addMessageListener(new ServerListener(), PlayerJoinMessage.class);
server.addMessageListener(new ServerListener(), PlayerActionMessage.class);
server.addMessageListener(new ServerListener(), PlayerLeaveMessage.class);
server.start();
} catch (IOException ex) {
@ -123,8 +128,11 @@ public class ServerMain extends SimpleApplication{
} else
if (message instanceof PlayerPositionMessage) {
System.out.println("Position update for client "+source.getId()+". Broadcasting to others.");
server.broadcast(Filters.notEqualTo(source), message);
server.broadcast(Filters.in(source), new ServerMessage("Sent an update to other clients!"));
if (players.containsKey(source.getId())) {
Instance i = players.get(source.getId());
SendToAllButMe(i, source, message);
}
//server.broadcast(Filters.in(source), new ServerMessage("Sent an update to other clients!"));
} else
if (message instanceof JoinMessage) {
JoinMessage msg = (JoinMessage)message;
@ -139,6 +147,7 @@ public class ServerMain extends SimpleApplication{
instance = new Instance(msg.levelName);
System.out.println("Instance "+msg.levelName+" does not exist. Creating... "+instance);
CreateTestObj(instance);
instance.INSTANCE_ID=INSTANCE_UNIQUE_ID++;
System.out.println(instance);
instances.put(msg.levelName, instance);
}
@ -146,15 +155,15 @@ public class ServerMain extends SimpleApplication{
instance.addPlayer(source);
SyncLevelMessage sync = new SyncLevelMessage(instance.getEntities(),instance.getPlayers(),instance.getPlayerPositions());
server.broadcast(Filters.in(source),sync);
server.broadcast(Filters.notEqualTo(source),message);
SendToAllButMe(instance, source, message);
} else
if (message instanceof PlayerActionMessage) {
System.out.println("Received player action message: "+message);
server.broadcast(Filters.notEqualTo(source), message);
PlayerActionMessage msg = (PlayerActionMessage)message;
if (players.containsKey(source.getId())) {
Instance i = players.get(source.getId());
i.updatePosition(source.getId(),msg.getPosition());
SendToAllButMe(i, source, message);
}
} /*else
if (message instanceof PlayerJoinMessage) {
@ -162,6 +171,14 @@ public class ServerMain extends SimpleApplication{
server.broadcast(Filters.notEqualTo(source), message);
}*/
}
private void SendToAllButMe(Instance i, HostedConnection source, Message message) {
for (HostedConnection conn : i.clients) {
if (conn!=source) {
server.broadcast(Filters.in(conn),message);
}
}
}
}
public void CreateTestObj(Instance instance) {
@ -248,6 +265,28 @@ public class ServerMain extends SimpleApplication{
}
}
@Serializable
public static class PlayerLeaveMessage extends AbstractMessage {
String levelName;
int id;
public PlayerLeaveMessage() {
}
public PlayerLeaveMessage(String levelName, int id) {
this.levelName = levelName;
this.id=id;
}
@Override
public String toString() {
return "Client ID "+id+" left. In Instance "+levelName.toString();
}
public int getId() {
return id;
}
}
@Serializable
public static class SyncLevelMessage extends AbstractMessage {
Entity[] entities;
Integer[] clients;