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

third person block animation
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2024-07-26 19:16:06 -04:00
parent 6c3dcec01c
commit 3092b70c1e
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Data/creatures/human.json
View File

@ -290,7 +290,7 @@
"variants": [ "variants": [
{ {
"variantId": "blockWeaponRight", "variantId": "blockWeaponRight",
"mainAnimation" : "Fall", "mainAnimation" : "HoldItemR2HBlock",
"mainFirstPersonAnimation" : "HoldItemR2HBlock", "mainFirstPersonAnimation" : "HoldItemR2HBlock",
"defaults" : [ "defaults" : [
{ {

16
src/main/java/electrosphere/client/scene/ClientSceneWrapper.java
View File

@ -112,7 +112,21 @@ public class ClientSceneWrapper {
LoggerInterface.loggerNetworking.WARNING(clientToServerIdMap.keySet() + ""); LoggerInterface.loggerNetworking.WARNING(clientToServerIdMap.keySet() + "");
LoggerInterface.loggerNetworking.WARNING("Server -> Client keys"); LoggerInterface.loggerNetworking.WARNING("Server -> Client keys");
LoggerInterface.loggerNetworking.WARNING(serverToClientIdMap.keySet() + ""); 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));
}
} }
/** /**

6
src/main/java/electrosphere/engine/Main.java
View File

@ -164,9 +164,11 @@ public class Main {
//uncomment to test loading a model into engine //uncomment to test loading a model into engine
// if(1==1){ // 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(); // 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()){ // // for(electrosphere.renderer.anim.Animation anim : model.getAnimations()){
// // if(anim.name.equals("Armature|Idle1")){ // // if(anim.name.equals("Armature|Idle1")){
// // System.out.println(anim.duration); // // System.out.println(anim.duration);

1
src/main/java/electrosphere/net/synchronization/ClientSynchronizationManager.java
View File

@ -77,6 +77,7 @@ public class ClientSynchronizationManager {
"Entity id in network message: " + message.getentityId() "Entity id in network message: " + message.getentityId()
; ;
Globals.clientSceneWrapper.dumpTranslationLayerStatus(); Globals.clientSceneWrapper.dumpTranslationLayerStatus();
Globals.clientSceneWrapper.dumpIdData(message.getentityId());
throw new IllegalStateException(errorMessage); throw new IllegalStateException(errorMessage);
} }
} }