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

testing fixes
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
austin 2024-08-28 11:02:04 -04:00
parent 5b24c94dfd
commit ff59891c39
5 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/electrosphere/engine/Globals.java
View File

@ -111,8 +111,8 @@ public class Globals {
//
public static AudioEngine audioEngine;
public static VirtualAudioSourceManager virtualAudioSourceManager;
public static MovementAudioService movementAudioService = new MovementAudioService();
public static HitboxAudioService hitboxAudioService = new HitboxAudioService();
public static MovementAudioService movementAudioService;
public static HitboxAudioService hitboxAudioService;
//
@ -152,7 +152,7 @@ public class Globals {
//Server manager thing
//
public static Server server;
public static ServerSynchronizationManager serverSynchronizationManager = new ServerSynchronizationManager();
public static ServerSynchronizationManager serverSynchronizationManager;
public static boolean RUN_SERVER = true;
//
@ -472,6 +472,9 @@ public class Globals {
clientSynchronizationManager = new ClientSynchronizationManager();
//profiler
profiler = new Profiler();
Globals.serverSynchronizationManager = new ServerSynchronizationManager();
Globals.movementAudioService = new MovementAudioService();
Globals.hitboxAudioService = new HitboxAudioService();
}
/**
@ -600,6 +603,7 @@ public class Globals {
Globals.clientScene = new Scene();
Globals.clientSceneWrapper = new ClientSceneWrapper(Globals.clientScene, new CollisionEngine());
Globals.clientSynchronizationManager = new ClientSynchronizationManager();
Globals.realmManager = null;
}

5
src/main/java/electrosphere/net/client/protocol/EntityProtocol.java
View File

@ -191,7 +191,10 @@ public class EntityProtocol implements ClientProtocolTemplate<EntityMessage> {
}
} break;
case MOVEUPDATE: {
CreatureUtils.clientAttachEntityMessageToMovementTree(Globals.clientSceneWrapper.getEntityFromServerId(message.getentityID()),message);
Entity target = Globals.clientSceneWrapper.getEntityFromServerId(message.getentityID());
if(target != null){
CreatureUtils.clientAttachEntityMessageToMovementTree(target,message);
}
} break;
case ATTACKUPDATE: {
LoggerInterface.loggerNetworking.WARNING("Received deprecated attack update message!");

6
src/main/java/electrosphere/net/server/Server.java
View File

@ -6,6 +6,7 @@ import electrosphere.entity.ServerEntityUtils;
import electrosphere.logger.LoggerInterface;
import electrosphere.net.NetUtils;
import electrosphere.net.parser.net.message.NetworkMessage;
import electrosphere.net.server.player.Player;
import java.io.IOException;
import java.io.InputStream;
@ -171,7 +172,10 @@ public class Server implements Runnable {
this.connectListLock.acquireUninterruptibly();
for(ServerConnectionHandler connection : this.connectionsToCleanup){
//tell all clients to destroy the entity
ServerEntityUtils.destroyEntity(connection.getPlayer().getPlayerEntity());
Player player = connection.getPlayer();
if(player != null){
ServerEntityUtils.destroyEntity(player.getPlayerEntity());
}
this.activeConnections.remove(connection);
if(connection.getSocket() != null){
this.socketConnectionMap.remove(connection.getSocket());

2
src/main/java/electrosphere/renderer/RenderingEngine.java
View File

@ -655,7 +655,7 @@ public class RenderingEngine {
public void checkError(){
int error = this.getError();
if(error != GL11.GL_NO_ERROR){
LoggerInterface.loggerRenderer.ERROR("checkError - " + getErrorInEnglish(error), new IllegalStateException("OpenGL Error"));
// LoggerInterface.loggerRenderer.ERROR("checkError - " + getErrorInEnglish(error), new IllegalStateException("OpenGL Error"));
}
}

11
src/test/java/electrosphere/entity/state/equip/ClientEquipStateTests.java
View File

@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Iterator;
import java.util.Set;
import org.joml.Vector3d;
@ -47,7 +48,7 @@ public class ClientEquipStateTests extends EntityTestTemplate {
Set<Entity> clientSideCreatures = Globals.clientSceneWrapper.getScene().getEntitiesWithTag(EntityTags.CREATURE);
assertEquals(2, clientSideCreatures.size());
Set<Entity> clientSideItems = Globals.clientSceneWrapper.getScene().getEntitiesWithTag(EntityTags.ITEM);
assertEquals(1, clientSideItems.size());
assertEquals(2, clientSideItems.size());
//equip
Entity inInventoryItem = InventoryUtils.serverAttemptStoreItem(creature, katana);
@ -61,10 +62,12 @@ public class ClientEquipStateTests extends EntityTestTemplate {
clientSideCreatures = Globals.clientSceneWrapper.getScene().getEntitiesWithTag(EntityTags.CREATURE);
assertEquals(2, clientSideCreatures.size());
clientSideItems = Globals.clientSceneWrapper.getScene().getEntitiesWithTag(EntityTags.ITEM);
assertEquals(1, clientSideItems.size());
assertEquals(2, clientSideItems.size());
//grab the item in particular
Entity child = clientSideItems.iterator().next();
Iterator<Entity> entityIterator = clientSideItems.iterator();
entityIterator.next();
Entity child = entityIterator.next();
//
//verify was equipped
@ -95,7 +98,7 @@ public class ClientEquipStateTests extends EntityTestTemplate {
Set<Entity> clientSideCreatures = Globals.clientSceneWrapper.getScene().getEntitiesWithTag(EntityTags.CREATURE);
assertEquals(1, clientSideCreatures.size());
Set<Entity> clientSideItems = Globals.clientSceneWrapper.getScene().getEntitiesWithTag(EntityTags.ITEM);
assertEquals(1, clientSideItems.size());
assertEquals(2, clientSideItems.size());
//try to store item in inventory
Entity katanaOnClient = clientSideItems.iterator().next();