From 3092b70c1ebf74283890961a2df600b89a0028e6 Mon Sep 17 00:00:00 2001 From: austin Date: Fri, 26 Jul 2024 19:16:06 -0400 Subject: [PATCH] third person block animation --- assets/Data/creatures/human.json | 2 +- .../client/scene/ClientSceneWrapper.java | 16 +++++++++++++++- src/main/java/electrosphere/engine/Main.java | 6 ++++-- .../ClientSynchronizationManager.java | 1 + 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json index d8c69955..afe0cf04 100644 --- a/assets/Data/creatures/human.json +++ b/assets/Data/creatures/human.json @@ -290,7 +290,7 @@ "variants": [ { "variantId": "blockWeaponRight", - "mainAnimation" : "Fall", + "mainAnimation" : "HoldItemR2HBlock", "mainFirstPersonAnimation" : "HoldItemR2HBlock", "defaults" : [ { diff --git a/src/main/java/electrosphere/client/scene/ClientSceneWrapper.java b/src/main/java/electrosphere/client/scene/ClientSceneWrapper.java index 9e8bc3be..4fd508bf 100644 --- a/src/main/java/electrosphere/client/scene/ClientSceneWrapper.java +++ b/src/main/java/electrosphere/client/scene/ClientSceneWrapper.java @@ -112,7 +112,21 @@ public class ClientSceneWrapper { LoggerInterface.loggerNetworking.WARNING(clientToServerIdMap.keySet() + ""); LoggerInterface.loggerNetworking.WARNING("Server -> Client keys"); LoggerInterface.loggerNetworking.WARNING(serverToClientIdMap.keySet() + ""); - LoggerInterface.loggerNetworking.WARNING("Debug here"); + } + + /** + * Dumps data about a given id + * @param id The id + */ + public void dumpIdData(int id){ + LoggerInterface.loggerNetworking.WARNING("Client->Server Map contains? " + clientToServerIdMap.containsKey(id)); + LoggerInterface.loggerNetworking.WARNING("Server->Client Map contains? " + serverToClientIdMap.containsKey(id)); + if(clientToServerIdMap.containsKey(id)){ + LoggerInterface.loggerNetworking.WARNING("Client->Server Map entity: " + clientToServerIdMap.get(id)); + } + if(clientToServerIdMap.containsKey(id)){ + LoggerInterface.loggerNetworking.WARNING("Server->Client Map entity: " + serverToClientIdMap.get(id)); + } } /** diff --git a/src/main/java/electrosphere/engine/Main.java b/src/main/java/electrosphere/engine/Main.java index 93e958fb..c6f9bda5 100644 --- a/src/main/java/electrosphere/engine/Main.java +++ b/src/main/java/electrosphere/engine/Main.java @@ -164,9 +164,11 @@ public class Main { //uncomment to test loading a model into engine // if(1==1){ - // Globals.assetManager.addModelPathToQueue("/Models/creatures/viewmodel.glb"); + // //Models/creatures/person2/person2_1.glb + // ///Models/creatures/viewmodel.glb + // Globals.assetManager.addModelPathToQueue("/Models/creatures/person2/person2_1.glb"); // Globals.assetManager.loadAssetsInQueue(); - // electrosphere.renderer.model.Model model = Globals.assetManager.fetchModel("/Models/creatures/viewmodel.glb"); + // electrosphere.renderer.model.Model model = Globals.assetManager.fetchModel("/Models/creatures/person2/person2_1.glb"); // // for(electrosphere.renderer.anim.Animation anim : model.getAnimations()){ // // if(anim.name.equals("Armature|Idle1")){ // // System.out.println(anim.duration); diff --git a/src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java b/src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java index 802cc1f5..69554c7c 100644 --- a/src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java +++ b/src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java @@ -77,6 +77,7 @@ public class ClientSynchronizationManager { "Entity id in network message: " + message.getentityId() ; Globals.clientSceneWrapper.dumpTranslationLayerStatus(); + Globals.clientSceneWrapper.dumpIdData(message.getentityId()); throw new IllegalStateException(errorMessage); } }