peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge dev into test #33

Merged
j23f0712 merged 36 commits from development into dev/test 2024-12-02 17:37:00 +01:00
Conversation 2 Commits 36 Files Changed 60 +681 -535
32 changed files with 681 additions and 535 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a15d7932d4 - Show all commits

15
Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
View File

@@ -1,14 +1,11 @@
package pp.mdga.client; package pp.mdga.client;
import com.jme3.app.SimpleApplication; import com.jme3.app.SimpleApplication;
import com.jme3.system.JmeContext;
import com.simsilica.lemur.GuiGlobals; import com.simsilica.lemur.GuiGlobals;
import pp.mdga.client.acoustic.AcousticHandler; import pp.mdga.client.acoustic.AcousticHandler;
import pp.mdga.client.animation.AnimationHandler;
import com.jme3.system.AppSettings; import com.jme3.system.AppSettings;
import pp.mdga.client.dialog.JoinDialog; import pp.mdga.client.dialog.JoinDialog;
import pp.mdga.client.view.*; import pp.mdga.client.view.*;
import pp.mdga.message.server.ServerInterpreter;
import java.io.IOException; import java.io.IOException;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
@@ -23,9 +20,6 @@ public class MdgaApp extends SimpleApplication {
private static Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class); private static Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
/** Handles animations in the application. */
private AnimationHandler animationHandler;
/** Handles acoustic effects and state-based sounds. */ /** Handles acoustic effects and state-based sounds. */
private AcousticHandler acousticHandler; private AcousticHandler acousticHandler;
@@ -102,7 +96,6 @@ public void simpleInitApp() {
flyCam.setEnabled(false); flyCam.setEnabled(false);
animationHandler = new AnimationHandler(this);
acousticHandler = new AcousticHandler(this); acousticHandler = new AcousticHandler(this);
notificationSynchronizer = new NotificationSynchronizer(this); notificationSynchronizer = new NotificationSynchronizer(this);
inputSynchronizer = new InputSynchronizer(this); inputSynchronizer = new InputSynchronizer(this);
@@ -163,14 +156,6 @@ public void enter(MdgaState state) {
view.enter(); view.enter();
} }
/**
* Gets the animation handler.
*
* @return the {@link AnimationHandler} instance
*/
public AnimationHandler getAnimationHandler() {
return animationHandler;
}
/** /**
* Gets the acoustic handler. * Gets the acoustic handler.