merge the new developmentbranch into the test branch #39
2
.gitignore
vendored
@@ -1,3 +1,5 @@
|
||||
|
||||
.run/
|
||||
.gradle
|
||||
build/
|
||||
#!gradle/wrapper/gradle-wrapper.jar
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
<component name="ProjectRunConfigurationManager">
|
||||
<configuration default="false" name="MdgaApp" type="Application" factoryName="Application" singleton="false" nameIsGenerated="true">
|
||||
<option name="ALTERNATIVE_JRE_PATH" value="temurin-20" />
|
||||
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
|
||||
<option name="MAIN_CLASS_NAME" value="pp.mdga.client.MdgaApp" />
|
||||
<module name="Projekte.mdga.client.main" />
|
||||
<option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=logging.properties -ea" />
|
||||
<option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
|
||||
<extension name="coverage">
|
||||
<pattern>
|
||||
<option name="PATTERN" value="pp.mdga.client.board.outline.*" />
|
||||
<option name="ENABLED" value="true" />
|
||||
</pattern>
|
||||
</extension>
|
||||
<method v="2">
|
||||
<option name="Make" enabled="true" />
|
||||
</method>
|
||||
</configuration>
|
||||
</component>
|
||||
21
Projekte/mdga/client/hs_err_pid54211.log
Normal file
@@ -0,0 +1,21 @@
|
||||
#
|
||||
# A fatal error has been detected by the Java Runtime Environment:
|
||||
#
|
||||
# SIGSEGV (0xb) at pc=0x000070ba272e8104, pid=54211, tid=54346
|
||||
#
|
||||
# JRE version: OpenJDK Runtime Environment Temurin-20.0.2+9 (20.0.2+9) (build 20.0.2+9)
|
||||
# Java VM: OpenJDK 64-Bit Server VM Temurin-20.0.2+9 (20.0.2+9, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, linux-amd64)
|
||||
# Problematic frame:
|
||||
# V [libjvm.so+0xee8104] SystemDictionary::find_or_define_helper(Symbol*, Handle, InstanceKlass*, JavaThread*)+0x304
|
||||
#
|
||||
# Core dump will be written. Default location: Core dumps may be processed with "/usr/lib/systemd/systemd-coredump %P %u %g %s %t %c %h" (or dumping to /home/cedric/ProgProjekt/Gruppe-01/Projekte/mdga/client/core.54211)
|
||||
#
|
||||
# If you would like to submit a bug report, please visit:
|
||||
# https://github.com/adoptium/adoptium-support/issues
|
||||
#
|
||||
|
||||
--------------- S U M M A R Y ------------
|
||||
|
||||
Command Line: -Ddebugger.agent.enable.coroutines=true -Djava.util.logging.config.file=logging.properties -Dkotlinx.coroutines.debug.enable.creation.stack.trace=false -Dkotlinx.coroutines.debug.enable.flows.stack.trace=true -Dkotlinx.coroutines.debug.enable.mutable.state.flows.stack.trace=true -agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=127.0.0.1:40559 -javaagent:/usr/share/idea/plugins/java/lib/rt/debugger-agent.jar -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -ea pp.mdga.client.MdgaApp
|
||||
|
||||
Host: AMD Ryzen 5 8640HS w/ Radeon 760M Graphics, 12 cores, 14G,
|
||||
171
Projekte/mdga/client/hs_err_pid60653.log
Normal file
@@ -0,0 +1,171 @@
|
||||
#
|
||||
# A fatal error has been detected by the Java Runtime Environment:
|
||||
#
|
||||
# SIGSEGV (0xb) at pc=0x00007fc14e0eef41, pid=60653, tid=60689
|
||||
#
|
||||
# JRE version: OpenJDK Runtime Environment (21.0.5+11) (build 21.0.5+11)
|
||||
# Java VM: OpenJDK 64-Bit Server VM (21.0.5+11, mixed mode, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, linux-amd64)
|
||||
# Problematic frame:
|
||||
# C [libgallium-24.2.8-arch1.1.so+0x8eef41]
|
||||
#
|
||||
# Core dump will be written. Default location: Core dumps may be processed with "/usr/lib/systemd/systemd-coredump %P %u %g %s %t %c %h" (or dumping to /home/cedric/ProgProjekt/Gruppe-01/Projekte/mdga/client/core.60653)
|
||||
#
|
||||
# If you would like to submit a bug report, please visit:
|
||||
# https://bugreport.java.com/bugreport/crash.jsp
|
||||
# The crash happened outside the Java Virtual Machine in native code.
|
||||
# See problematic frame for where to report the bug.
|
||||
#
|
||||
|
||||
--------------- S U M M A R Y ------------
|
||||
|
||||
Command Line: -Ddebugger.agent.enable.coroutines=true -Djava.util.logging.config.file=logging.properties -Dkotlinx.coroutines.debug.enable.creation.stack.trace=false -Dkotlinx.coroutines.debug.enable.flows.stack.trace=true -Dkotlinx.coroutines.debug.enable.mutable.state.flows.stack.trace=true -agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=127.0.0.1:39131 -javaagent:/usr/share/idea/plugins/java/lib/rt/debugger-agent.jar -Dfile.encoding=UTF-8 -Duser.country=US -Duser.language=en -Duser.variant -ea pp.mdga.client.MdgaApp
|
||||
|
||||
Host: AMD Ryzen 5 8640HS w/ Radeon 760M Graphics, 12 cores, 14G, Manjaro Linux
|
||||
Time: Sun Dec 8 18:11:23 2024 CET elapsed time: 295.650309 seconds (0d 0h 4m 55s)
|
||||
|
||||
--------------- T H R E A D ---------------
|
||||
|
||||
Current thread (0x00007fc17ca803b0): JavaThread "jME3 Main" [_thread_in_native, id=60689, stack(0x00007fc159425000,0x00007fc159525000) (1024K)]
|
||||
|
||||
Stack: [0x00007fc159425000,0x00007fc159525000], sp=0x00007fc159522300, free space=1012k
|
||||
Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code)
|
||||
C [libgallium-24.2.8-arch1.1.so+0x8eef41]
|
||||
C [libgallium-24.2.8-arch1.1.so+0xf4a849]
|
||||
C [libgallium-24.2.8-arch1.1.so+0x6ccb71]
|
||||
C [libgallium-24.2.8-arch1.1.so+0x6c58ae]
|
||||
C [libgallium-24.2.8-arch1.1.so+0x6c6013]
|
||||
C [libgallium-24.2.8-arch1.1.so+0x6cddf8]
|
||||
C [libgallium-24.2.8-arch1.1.so+0x141327]
|
||||
C [libgallium-24.2.8-arch1.1.so+0x5fc8b]
|
||||
C [libGLX_mesa.so.0+0x4f2e0]
|
||||
C [libGLX_mesa.so.0+0x40496]
|
||||
C [libGLX_mesa.so.0+0x2efa5]
|
||||
J 2042 org.lwjgl.system.JNI.invokePV(JJ)V (0 bytes) @ 0x00007fc16c1abb6f [0x00007fc16c1abaa0+0x00000000000000cf]
|
||||
J 4039 c1 org.lwjgl.glfw.GLFW.glfwSwapBuffers(J)V (21 bytes) @ 0x00007fc164d8684c [0x00007fc164d86760+0x00000000000000ec]
|
||||
J 3912 c1 com.jme3.system.lwjgl.LwjglWindow.runLoop()V (177 bytes) @ 0x00007fc164d44b34 [0x00007fc164d442c0+0x0000000000000874]
|
||||
j com.jme3.system.lwjgl.LwjglWindow.run()V+54
|
||||
j java.lang.Thread.runWith(Ljava/lang/Object;Ljava/lang/Runnable;)V+5 java.base@21.0.5
|
||||
j java.lang.Thread.run()V+19 java.base@21.0.5
|
||||
v ~StubRoutines::call_stub 0x00007fc16bb37cc6
|
||||
V [libjvm.so+0x6d0894]
|
||||
V [libjvm.so+0x6d14fd]
|
||||
V [libjvm.so+0x79a7be]
|
||||
V [libjvm.so+0x6cac55]
|
||||
V [libjvm.so+0x9d62c1]
|
||||
C [libc.so.6+0x9439d]
|
||||
Java frames: (J=compiled Java code, j=interpreted, Vv=VM code)
|
||||
J 2042 org.lwjgl.system.JNI.invokePV(JJ)V (0 bytes) @ 0x00007fc16c1abafc [0x00007fc16c1abaa0+0x000000000000005c]
|
||||
J 4039 c1 org.lwjgl.glfw.GLFW.glfwSwapBuffers(J)V (21 bytes) @ 0x00007fc164d8684c [0x00007fc164d86760+0x00000000000000ec]
|
||||
J 3912 c1 com.jme3.system.lwjgl.LwjglWindow.runLoop()V (177 bytes) @ 0x00007fc164d44b34 [0x00007fc164d442c0+0x0000000000000874]
|
||||
j com.jme3.system.lwjgl.LwjglWindow.run()V+54
|
||||
j java.lang.Thread.runWith(Ljava/lang/Object;Ljava/lang/Runnable;)V+5 java.base@21.0.5
|
||||
j java.lang.Thread.run()V+19 java.base@21.0.5
|
||||
v ~StubRoutines::call_stub 0x00007fc16bb37cc6
|
||||
|
||||
siginfo: si_signo: 11 (SIGSEGV), si_code: 1 (SEGV_MAPERR), si_addr: 0x00000000000000c9
|
||||
|
||||
Registers:
|
||||
RAX=0x0000000000000000, RBX=0x00007fc09825b2a0, RCX=0x0000000000000006, RDX=0x0000000028200000
|
||||
RSP=0x00007fc159522300, RBP=0x00007fc159522310, RSI=0x00007fc0998d3604, RDI=0x00007fc09825b7a0
|
||||
R8 =0x0000000000000006, R9 =0x00000000aa959a6a, R10=0x0000000000000263, R11=0x00007fc099bc36c0
|
||||
R12=0x00007fc0998d35e0, R13=0x000000058bc5f100, R14=0x000000058bc5f140, R15=0x0000000000000040
|
||||
RIP=0x00007fc14e0eef41, EFLAGS=0x0000000000010202, CSGSFS=0x002b000000000033, ERR=0x0000000000000004
|
||||
TRAPNO=0x000000000000000e
|
||||
|
||||
|
||||
Register to memory mapping:
|
||||
|
||||
RAX=0x0 is null
|
||||
RBX=0x00007fc09825b2a0 points into unknown readable memory: 0x00007fc098239c40 | 40 9c 23 98 c0 7f 00 00
|
||||
RCX=0x0000000000000006 is an unknown value
|
||||
RDX=0x0000000028200000 is an unknown value
|
||||
RSP=0x00007fc159522300 is pointing into the stack for thread: 0x00007fc17ca803b0
|
||||
RBP=0x00007fc159522310 is pointing into the stack for thread: 0x00007fc17ca803b0
|
||||
RSI=0x00007fc0998d3604 points into unknown readable memory: 00 00 00 00
|
||||
RDI=0x00007fc09825b7a0 points into unknown readable memory: 0x00001c7c00000265 | 65 02 00 00 7c 1c 00 00
|
||||
R8 =0x0000000000000006 is an unknown value
|
||||
R9 =0x00000000aa959a6a is an unknown value
|
||||
R10=0x0000000000000263 is an unknown value
|
||||
R11=0x00007fc099bc36c0 points into unknown readable memory: 0x00007fc14e121570 | 70 15 12 4e c1 7f 00 00
|
||||
R12=0x00007fc0998d35e0 points into unknown readable memory: 0x0000000000000000 | 00 00 00 00 00 00 00 00
|
||||
R13=0x000000058bc5f100 is an unknown value
|
||||
R14=0x000000058bc5f140 is an unknown value
|
||||
R15=0x0000000000000040 is an unknown value
|
||||
|
||||
Top of Stack: (sp=0x00007fc159522300)
|
||||
0x00007fc159522300: 00007fc09825b2a0 ffffffffffffffff
|
||||
0x00007fc159522310: 00007fc1595223d0 00007fc14e74a849
|
||||
0x00007fc159522320: 0000000000000000 00000000cc0016c8
|
||||
0x00007fc159522330: 00007fc09920b000 00007fc100000004
|
||||
0x00007fc159522340: 00007fc100000001 00007fc100000000
|
||||
0x00007fc159522350: ffff800100000002 00007fc09825b7a0
|
||||
0x00007fc159522360: 00007fc1595223e0 0000000100000b02
|
||||
0x00007fc159522370: 0000000000000000 00007fc0983eca88
|
||||
0x00007fc159522380: 00007fc100000000 00007fc099e33780
|
||||
0x00007fc159522390: 00007fc159523170 b36c5690f9bb0900
|
||||
0x00007fc1595223a0: 00007fc15951fd20 00007fc0983eca80
|
||||
0x00007fc1595223b0: 00007fc09825b2a0 00007fc0983edb60
|
||||
0x00007fc1595223c0: 00007fc098415b10 00007fc0983ec850
|
||||
0x00007fc1595223d0: 00007fc159523280 00007fc14deccb71
|
||||
0x00007fc1595223e0: 00000bdc00000000 00007fc100000000
|
||||
0x00007fc1595223f0: 00007fc159523290 00007fc159523294
|
||||
0x00007fc159522400: 00007fc159523320 00007fc159523324
|
||||
0x00007fc159522410: 00007fc1595231b0 00007fc1595231b4
|
||||
0x00007fc159522420: 00007fc159522860 00007fc164c8401c
|
||||
0x00007fc159522430: 00007fc159523310 00007fc159523314
|
||||
0x00007fc159522440: 00007fc1595232a0 00007fc1595232a4
|
||||
0x00007fc159522450: 00007fc159522860 00007fc159523334
|
||||
0x00007fc159522460: 00007fc159523400 00007fc159523404
|
||||
0x00007fc159522470: 00007fc1595232d0 00007fc1595232d4
|
||||
0x00007fc159522480: 00007fc16bc61f10 00007fc0c80123d0
|
||||
0x00007fc159522490: 00007fc1595231f0 00007fc1595231f4
|
||||
0x00007fc1595224a0: 00007fc1595223e0 00000000e31c914f
|
||||
0x00007fc1595224b0: 00007fc159523350 00007fc159523354
|
||||
0x00007fc1595224c0: 00007fc1595232e0 00007fc1595232e4
|
||||
0x00007fc1595224d0: 00007f0000000000 00000000e3193478
|
||||
0x00007fc1595224e0: 00007fc159523440 00007fc159523444
|
||||
0x00007fc1595224f0: 00007fc159523310 00007fc159523314
|
||||
|
||||
Instructions: (pc=0x00007fc14e0eef41)
|
||||
0x00007fc14e0eee41: 0f 1e fa 55 48 83 c6 24 48 89 e5 41 55 41 54 53
|
||||
0x00007fc14e0eee51: 48 89 fb 48 83 ec 08 8b 97 00 05 00 00 44 0f b7
|
||||
0x00007fc14e0eee61: 6e f0 48 8b 87 08 05 00 00 49 89 d4 45 01 ec 48
|
||||
0x00007fc14e0eee71: 8d 3c 90 42 8d 14 ad 00 00 00 00 ff 15 ee 7e c3
|
||||
0x00007fc14e0eee81: 01 44 89 a3 00 05 00 00 48 83 c4 08 5b 41 5c 41
|
||||
0x00007fc14e0eee91: 5d 5d c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 f3
|
||||
0x00007fc14e0eeea1: 0f 1e fa 55 48 89 e5 41 57 41 56 41 55 41 54 41
|
||||
0x00007fc14e0eeeb1: 89 f4 53 48 89 fb 48 83 ec 08 4e 8b b4 e7 88 09
|
||||
0x00007fc14e0eeec1: 00 00 8b 97 00 05 00 00 48 8b 87 08 05 00 00 45
|
||||
0x00007fc14e0eeed1: 0f b7 7e 14 49 89 d5 49 8d 76 24 48 8d 3c 90 45
|
||||
0x00007fc14e0eeee1: 01 fd 42 8d 14 bd 00 00 00 00 ff 15 7f 7e c3 01
|
||||
0x00007fc14e0eeef1: 44 89 ab 00 05 00 00 4e 89 b4 e3 d8 09 00 00 48
|
||||
0x00007fc14e0eef01: 83 c4 08 5b 41 5c 41 5d 41 5e 41 5f 5d c3 90 f3
|
||||
0x00007fc14e0eef11: 0f 1e fa 55 89 f0 48 89 e5 41 54 53 4c 8b a4 c7
|
||||
0x00007fc14e0eef21: 88 09 00 00 48 89 fb e8 73 ff ff ff 49 8b 84 24
|
||||
0x00007fc14e0eef31: 80 01 00 00 ba 00 00 20 28 48 8d bb 00 05 00 00
|
||||
0x00007fc14e0eef41: 0f b6 88 c9 00 00 00 48 8b b0 b0 00 00 00 48 8b
|
||||
0x00007fc14e0eef51: 83 f0 04 00 00 ff 90 00 01 00 00 49 8b 04 24 48
|
||||
0x00007fc14e0eef61: 85 c0 74 13 48 89 df be ff ff ff ff 5b 41 5c 5d
|
||||
0x00007fc14e0eef71: ff e0 0f 1f 44 00 00 5b 41 5c 5d c3 0f 1f 00 f3
|
||||
0x00007fc14e0eef81: 0f 1e fa 66 0f ef c0 31 c9 ba 01 00 00 00 0f 11
|
||||
0x00007fc14e0eef91: 87 d8 09 00 00 0f 11 87 e8 09 00 00 0f 11 87 f8
|
||||
0x00007fc14e0eefa1: 09 00 00 0f 11 87 08 0a 00 00 0f 11 87 18 0a 00
|
||||
0x00007fc14e0eefb1: 00 66 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 48
|
||||
0x00007fc14e0eefc1: 83 bc cf 88 09 00 00 00 74 0d 48 89 d0 48 d3 e0
|
||||
0x00007fc14e0eefd1: 48 09 87 80 09 00 00 48 83 c1 01 48 83 f9 0a 75
|
||||
0x00007fc14e0eefe1: de c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 00 f3
|
||||
0x00007fc14e0eeff1: 0f 1e fa 55 48 89 e5 41 56 41 89 d6 41 55 41 89
|
||||
0x00007fc14e0ef001: f5 8d 34 b5 28 00 00 00 41 54 49 89 fc bf 01 00
|
||||
0x00007fc14e0ef011: 00 00 53 ff 15 7e 89 c3 01 48 89 c3 48 85 c0 74
|
||||
0x00007fc14e0ef021: 2a 66 44 89 68 1a 41 0f b6 ce 48 8d 78 08 41 0f
|
||||
0x00007fc14e0ef031: b6 94 24 97 08 00 00 49 8d b4 24 90 02 00 00 c0
|
||||
|
||||
|
||||
Stack slot to memory mapping:
|
||||
|
||||
stack at sp + 0 slots: 0x00007fc09825b2a0 points into unknown readable memory: 0x00007fc098239c40 | 40 9c 23 98 c0 7f 00 00
|
||||
stack at sp + 1 slots: 0xffffffffffffffff is an unknown value
|
||||
stack at sp + 2 slots: 0x00007fc1595223d0 is pointing into the stack for thread: 0x00007fc17ca803b0
|
||||
stack at sp + 3 slots: 0x00007fc14e74a849: <offset 0x0000000000f4a849> in /usr/lib/libgallium-24.2.8-arch1.1.so at 0x00007fc14d800000
|
||||
stack at sp + 4 slots: 0x0 is null
|
||||
stack at sp + 5 slots:
|
||||
@@ -11,6 +11,7 @@ public enum Asset {
|
||||
cir,
|
||||
heer,
|
||||
jet,
|
||||
jet_noGear("Models/jet/jet_noGear.j3o", "Models/jet/jet_diff.png"),
|
||||
lw,
|
||||
marine,
|
||||
node_home_blue("Models/node_home/node_home.j3o", "Models/node_home/node_home_blue_diff.png"),
|
||||
@@ -30,15 +31,21 @@ public enum Asset {
|
||||
tank,
|
||||
world(1.2f),
|
||||
shieldRing("Models/shieldRing/shieldRing.j3o", null),
|
||||
treeSmall,
|
||||
treeBig,
|
||||
treeSmall(1.2f),
|
||||
treeBig(1.2f),
|
||||
turboCard,
|
||||
turboSymbol("Models/turboCard/turboSymbol.j3o", "Models/turboCard/turboCard_diff.j3o"),
|
||||
turboSymbol("Models/turboCard/turboSymbol.j3o", "Models/turboCard/turboCard_diff.png"),
|
||||
swapCard,
|
||||
swapSymbol("Models/swapCard/swapSymbol.j3o", "Models/swapCard/swapCard_diff.j3o"),
|
||||
swapSymbol("Models/swapCard/swapSymbol.j3o", "Models/swapCard/swapCard_diff.png"),
|
||||
shieldCard,
|
||||
shieldSymbol("Models/shieldCard/shieldSymbol.j3o", "Models/shieldCard/shieldCard_diff.j3o"),
|
||||
dice
|
||||
shieldSymbol("Models/shieldCard/shieldSymbol.j3o", "Models/shieldCard/shieldCard_diff.png"),
|
||||
dice,
|
||||
missile("Models/missile/AVMT300.obj", "Models/missile/texture.jpg", 0.1f),
|
||||
tankShoot("Models/tank/tankShoot_bot.j3o", "Models/tank/tank_diff.png"),
|
||||
tankShootTop("Models/tank/tankShoot_top.j3o", "Models/tank/tank_diff.png"),
|
||||
treesSmallBackground("Models/treeSmall/treesSmallBackground.j3o", "Models/treeSmall/treeSmall_diff.png", 1.2f),
|
||||
treesBigBackground("Models/treeBig/treesBigBackground.j3o", "Models/treeBig/treeBig_diff.png", 1.2f),
|
||||
shell
|
||||
;
|
||||
|
||||
private final String modelPath;
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
import pp.mdga.notification.SelectableCardsNotification;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class InputSynchronizer {
|
||||
|
||||
@@ -39,6 +40,11 @@ public class InputSynchronizer {
|
||||
private CardControl hoverCard;
|
||||
private PieceControl hoverPiece;
|
||||
|
||||
private boolean clickAllowed = true;
|
||||
|
||||
private boolean isRotateLeft = false;
|
||||
private boolean isRotateRight = false;
|
||||
|
||||
/**
|
||||
* Constructor initializes the InputSynchronizer with the application context.
|
||||
* Sets up input mappings and listeners for user interactions.
|
||||
@@ -54,6 +60,18 @@ public class InputSynchronizer {
|
||||
setupInput();
|
||||
}
|
||||
|
||||
public void update(float tpf) {
|
||||
if(isRotateLeft && isRotateRight) {
|
||||
return;
|
||||
}
|
||||
if(isRotateLeft) {
|
||||
rotationAngle += 180 * tpf;
|
||||
}
|
||||
if(isRotateRight) {
|
||||
rotationAngle -= 180 * tpf;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Configures input mappings for various actions and binds them to listeners.
|
||||
*/
|
||||
@@ -61,22 +79,22 @@ private void setupInput() {
|
||||
inputManager.addMapping("Settings", new KeyTrigger(KeyInput.KEY_ESCAPE));
|
||||
inputManager.addMapping("Forward", new KeyTrigger(KeyInput.KEY_RETURN));
|
||||
|
||||
inputManager.addMapping("Left", new KeyTrigger(KeyInput.KEY_Q));
|
||||
inputManager.addMapping("Right", new KeyTrigger(KeyInput.KEY_E));
|
||||
|
||||
inputManager.addMapping("RotateRightMouse", new MouseButtonTrigger(MouseInput.BUTTON_RIGHT));
|
||||
inputManager.addMapping("MouseLeft", new MouseAxisTrigger(MouseInput.AXIS_X, false)); // Left movement
|
||||
inputManager.addMapping("MouseRight", new MouseAxisTrigger(MouseInput.AXIS_X, true)); // Right movement
|
||||
inputManager.addMapping("MouseVertical", new MouseAxisTrigger(MouseInput.AXIS_Y, false), new MouseAxisTrigger(MouseInput.AXIS_Y, true)); //Mouse Up Down movement
|
||||
inputManager.addMapping("MouseScrollUp", new MouseAxisTrigger(MouseInput.AXIS_WHEEL, false)); // Scroll up
|
||||
inputManager.addMapping("MouseScrollDown", new MouseAxisTrigger(MouseInput.AXIS_WHEEL, true)); // Scroll down
|
||||
inputManager.addMapping("Test", new KeyTrigger(KeyInput.KEY_J));
|
||||
inputManager.addMapping("Click", new MouseButtonTrigger(MouseInput.BUTTON_LEFT));
|
||||
|
||||
|
||||
inputManager.addListener(actionListener, "Settings", "Forward", "RotateRightMouse", "Click", "Test");
|
||||
inputManager.addListener(actionListener, "Settings", "Forward", "RotateRightMouse", "Click", "Left", "Right", "Test");
|
||||
inputManager.addListener(analogListener, "MouseLeft", "MouseRight", "MouseScrollUp", "MouseScrollDown");
|
||||
}
|
||||
|
||||
private boolean test = false;
|
||||
|
||||
UUID p = null;
|
||||
/**
|
||||
* Handles action-based input events such as key presses and mouse clicks.
|
||||
*/
|
||||
@@ -93,6 +111,10 @@ public void onAction(String name, boolean isPressed, float tpf) {
|
||||
rightMousePressed = isPressed;
|
||||
}
|
||||
if(name.equals("Click") && isPressed) {
|
||||
if(!clickAllowed) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (app.getView() instanceof GameView gameView) {
|
||||
DiceControl diceSelect = checkHover(gameView.getGuiHandler().getCardLayerCamera(), gameView.getGuiHandler().getCardLayerRootNode(), DiceControl.class);
|
||||
CardControl cardLayerSelect = checkHover(gameView.getGuiHandler().getCardLayerCamera(), gameView.getGuiHandler().getCardLayerRootNode(), CardControl.class);
|
||||
@@ -121,13 +143,41 @@ else if(boardSelect != null) {
|
||||
|
||||
|
||||
}
|
||||
if(name.equals("Test") &&isPressed){
|
||||
if (name.equals("Left")) {
|
||||
isRotateLeft = !isRotateLeft;
|
||||
}
|
||||
if (name.equals("Right")) {
|
||||
isRotateRight = !isRotateRight;
|
||||
}
|
||||
if(name.equals("Test2") &&isPressed){
|
||||
if(app.getView() instanceof GameView gameView){
|
||||
|
||||
if(p == null) {
|
||||
p = UUID.randomUUID();
|
||||
gameView.getBoardHandler().addPlayer(Color.AIRFORCE,List.of(p,UUID.randomUUID(),UUID.randomUUID(),UUID.randomUUID()));
|
||||
gameView.getBoardHandler().movePieceStartAnim(p,0);
|
||||
gameView.getBoardHandler().outlineMove(List.of(p),List.of(2),List.of(false));
|
||||
//gameView.getBoardHandler().movePieceAnim(p,0, 8);
|
||||
} else {
|
||||
gameView.getBoardHandler().throwPiece(p, Color.ARMY);
|
||||
//gameView.getBoardHandler().movePieceStartAnim(p,0);
|
||||
}
|
||||
|
||||
// gameView.getGuiHandler().rollRankingResult(Color.AIRFORCE, 1);
|
||||
// gameView.getGuiHandler().rollRankingResult(Color.ARMY, 2);
|
||||
// gameView.getGuiHandler().rollRankingResult(Color.NAVY, 3);
|
||||
// gameView.getGuiHandler().rollRankingResult(Color.CYBER, 4);
|
||||
gameView.getGuiHandler().showDice();
|
||||
// gameView.getGuiHandler().showDice();
|
||||
// UUID p1 = UUID.randomUUID();
|
||||
|
||||
// gameView.getBoardHandler().addPlayer(Color.AIRFORCE,List.of(p1,UUID.randomUUID(),UUID.randomUUID(),UUID.randomUUID()));
|
||||
// gameView.getBoardHandler().movePieceStartAnim(p1,0);
|
||||
//gameView.getGuiHandler().drawCard(Color.ARMY);
|
||||
//gameView.getGuiHandler().addCardOwn(BonusCard.SHIELD);
|
||||
//gameView.getGuiHandler().playCardOwn(BonusCard.SHIELD);
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -200,12 +250,13 @@ private void hoverPiece() {
|
||||
PieceControl control = checkPiece();
|
||||
if (control != null) {
|
||||
if (control != hoverPiece) {
|
||||
pieceOff();
|
||||
pieceOff(gameView);
|
||||
hoverPiece = control;
|
||||
hoverPiece.hover();
|
||||
// hoverPiece.hover();
|
||||
gameView.getBoardHandler().pieceHoverOn(hoverPiece);
|
||||
}
|
||||
} else {
|
||||
pieceOff();
|
||||
pieceOff(gameView);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -255,8 +306,11 @@ private CardControl checkCard(GameView gameView) {
|
||||
/**
|
||||
* Disables the hover effect on the currently hovered piece, if any.
|
||||
*/
|
||||
private void pieceOff() {
|
||||
if (hoverPiece != null) hoverPiece.hoverOff();
|
||||
private void pieceOff(GameView gameView) {
|
||||
if (hoverPiece != null) {
|
||||
gameView.getBoardHandler().pieceHoverOff(hoverPiece);
|
||||
// hoverPiece.hoverOff();
|
||||
}
|
||||
hoverPiece = null;
|
||||
}
|
||||
|
||||
@@ -302,4 +356,12 @@ public void setRotation(float rotationAngle){
|
||||
public int getScroll() {
|
||||
return scrollValue;
|
||||
}
|
||||
|
||||
public void setClickAllowed(boolean allowed) {
|
||||
clickAllowed = allowed;
|
||||
}
|
||||
|
||||
public boolean isClickAllowed() {
|
||||
return clickAllowed;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,13 +1,19 @@
|
||||
package pp.mdga.client;
|
||||
|
||||
import com.jme3.app.SimpleApplication;
|
||||
import com.jme3.system.AppSettings;
|
||||
import com.simsilica.lemur.GuiGlobals;
|
||||
import com.sun.tools.javac.Main;
|
||||
import pp.mdga.client.acoustic.AcousticHandler;
|
||||
import com.jme3.system.AppSettings;
|
||||
import pp.mdga.client.dialog.JoinDialog;
|
||||
import pp.mdga.client.view.*;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import java.awt.*;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.util.Objects;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.prefs.Preferences;
|
||||
@@ -39,19 +45,19 @@ public class MdgaApp extends SimpleApplication {
|
||||
private MdgaState state = null;
|
||||
|
||||
/** Scale for rendering images. */
|
||||
private float imageScale = prefs.getInt("scale", 1);
|
||||
private final float imageScale = prefs.getInt("scale", 1);
|
||||
|
||||
/** The main menu view. */
|
||||
private MdgaView mainView;
|
||||
private MainView mainView;
|
||||
|
||||
/** The lobby view. */
|
||||
private MdgaView lobbyView;
|
||||
private LobbyView lobbyView;
|
||||
|
||||
/** The game view. */
|
||||
private MdgaView gameView;
|
||||
private GameView gameView;
|
||||
|
||||
/** The ceremony view. */
|
||||
private MdgaView ceremonyView;
|
||||
private CeremonyView ceremonyView;
|
||||
|
||||
/** The client game logic. */
|
||||
private final ClientGameLogic clientGameLogic;
|
||||
@@ -60,7 +66,9 @@ public class MdgaApp extends SimpleApplication {
|
||||
|
||||
private ServerConnection networkConnection;
|
||||
|
||||
private MdgaApp() {
|
||||
public static final int DEBUG_MULTIPLIER = 0;
|
||||
|
||||
public MdgaApp() {
|
||||
networkConnection = new NetworkSupport(this);
|
||||
this.clientGameLogic = new ClientGameLogic(networkConnection);
|
||||
}
|
||||
@@ -74,15 +82,30 @@ private MdgaApp() {
|
||||
public static void main(String[] args) {
|
||||
AppSettings settings = new AppSettings(true);
|
||||
settings.setSamples(128);
|
||||
|
||||
if(prefs.getBoolean("fullscreen", false)) {
|
||||
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
|
||||
int screenWidth = (int) screenSize.getWidth();
|
||||
int screenHeight = (int) screenSize.getHeight();
|
||||
|
||||
settings.setResolution(screenWidth, screenHeight);
|
||||
|
||||
settings.setFullscreen(true);
|
||||
} else {
|
||||
settings.setWidth(prefs.getInt("width", 1280));
|
||||
settings.setHeight(prefs.getInt("height", 720));
|
||||
}
|
||||
|
||||
settings.setCenterWindow(true);
|
||||
settings.setVSync(false);
|
||||
|
||||
settings.setTitle("MDGA");
|
||||
settings.setVSync(true);
|
||||
MdgaApp app = new MdgaApp();
|
||||
app.setSettings(settings);
|
||||
app.setShowSettings(false);
|
||||
app.setPauseOnLostFocus(false);
|
||||
app.setDisplayStatView(false);
|
||||
|
||||
app.start();
|
||||
}
|
||||
|
||||
@@ -120,6 +143,7 @@ public void simpleUpdate(float tpf) {
|
||||
view.update(tpf);
|
||||
acousticHandler.update();
|
||||
notificationSynchronizer.update();
|
||||
inputSynchronizer.update(tpf);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -245,19 +269,33 @@ public ServerConnection getNetworkSupport(){
|
||||
return networkConnection;
|
||||
}
|
||||
|
||||
public void updateResolution(int width, int height, float imageFactor) {
|
||||
public void updateResolution(int width, int height, float imageFactor, boolean isFullscreen) {
|
||||
if(isFullscreen) {
|
||||
int baseWidth = 1280;
|
||||
int baseHeight = 720;
|
||||
float baseAspectRatio = (float) baseWidth / baseHeight;
|
||||
float newAspectRatio = (float) width / height;
|
||||
|
||||
float scaleFactor = Math.max((float) width / baseWidth, (float) height / baseHeight);
|
||||
|
||||
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
|
||||
int screenWidth = (int) screenSize.getWidth();
|
||||
int screenHeight = (int) screenSize.getHeight();
|
||||
settings.setResolution(screenWidth, screenHeight);
|
||||
settings.setFullscreen(true);
|
||||
|
||||
prefs.putFloat("scale", scaleFactor);
|
||||
prefs.putBoolean("fullscreen", true);
|
||||
} else {
|
||||
prefs.putInt("width", width);
|
||||
prefs.putInt("height", height);
|
||||
prefs.putFloat("scale", imageFactor);
|
||||
prefs.putBoolean("fullscreen", false);
|
||||
}
|
||||
}
|
||||
|
||||
public static void restartApp() {
|
||||
try {
|
||||
restartApp();
|
||||
} catch (Exception e) {
|
||||
//nothing
|
||||
}
|
||||
}
|
||||
|
||||
public static void restartApp() throws IOException {
|
||||
String javaBin = System.getProperty("java.home") + "/bin/java";
|
||||
String classPath = System.getProperty("java.class.path");
|
||||
String className = System.getProperty("sun.java.command");
|
||||
@@ -269,6 +307,22 @@ public static void restartApp() throws IOException {
|
||||
builder.start();
|
||||
|
||||
System.exit(0);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException("restart failed");
|
||||
}
|
||||
}
|
||||
|
||||
public void afterGameCleanup() {
|
||||
MainView main = (MainView) mainView;
|
||||
|
||||
main.getJoinDialog().disconnect();
|
||||
main.getHostDialog().shutdownServer();
|
||||
|
||||
ceremonyView.afterGameCleanup();
|
||||
}
|
||||
|
||||
public GameView getGameView(){
|
||||
return gameView;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,16 +1,8 @@
|
||||
package pp.mdga.client;
|
||||
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
import pp.mdga.client.server.MdgaServer;
|
||||
import pp.mdga.client.view.CeremonyView;
|
||||
import pp.mdga.client.view.GameView;
|
||||
import pp.mdga.client.view.LobbyView;
|
||||
import pp.mdga.game.BonusCard;
|
||||
import pp.mdga.game.Color;
|
||||
import pp.mdga.message.client.LobbyReadyMessage;
|
||||
import pp.mdga.notification.AcquireCardNotification;
|
||||
import pp.mdga.notification.DrawCardNotification;
|
||||
import pp.mdga.notification.TskSelectNotification;
|
||||
|
||||
import java.util.UUID;
|
||||
import java.util.logging.Level;
|
||||
@@ -31,8 +23,12 @@ public class ModelSynchronizer {
|
||||
}
|
||||
|
||||
public void animationEnd() {
|
||||
if(app.getNotificationSynchronizer().waitForAnimation) {
|
||||
app.getNotificationSynchronizer().waitForAnimation = false;
|
||||
} else {
|
||||
app.getGameLogic().selectAnimationEnd();
|
||||
}
|
||||
}
|
||||
|
||||
public void select(UUID a, UUID b){
|
||||
if(swap) selectSwap(a,b);
|
||||
@@ -74,10 +70,11 @@ public void selectCard(BonusCard card) {
|
||||
this.card = card;
|
||||
|
||||
GameView gameView = (GameView) app.getView();
|
||||
|
||||
if(card != null) {
|
||||
gameView.needConfirm();
|
||||
} else {
|
||||
gameView.noConfirm();
|
||||
gameView.showNoPower();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,21 +83,26 @@ public void confirm() {
|
||||
|
||||
GameView gameView = (GameView) app.getView();
|
||||
|
||||
gameView.getGuiHandler().hideText();
|
||||
|
||||
if(a != null && b != null) {
|
||||
selectPiece(a);
|
||||
selectPiece(b);
|
||||
app.getGameLogic().selectPiece(a);
|
||||
app.getGameLogic().selectPiece(b);
|
||||
gameView.getBoardHandler().clearSelectable();
|
||||
} else if (a != null) {
|
||||
selectPiece(a);
|
||||
app.getGameLogic().selectPiece(a);
|
||||
gameView.getBoardHandler().clearSelectable();
|
||||
} else if (card != null){
|
||||
selectCard(card);
|
||||
gameView.getGuiHandler().clearSelectableCards();
|
||||
} else {
|
||||
throw new RuntimeException("nothing to confirm");
|
||||
app.getGameLogic().selectCard(card);
|
||||
gameView.getGuiHandler().clearSelectableCards();
|
||||
}
|
||||
|
||||
a = null;
|
||||
b = null;
|
||||
card = null;
|
||||
|
||||
gameView.noConfirm();
|
||||
gameView.hideNoPower();
|
||||
}
|
||||
|
||||
public void selectTsk(Color color) {
|
||||
@@ -145,4 +147,8 @@ public void enter(MdgaState state) {
|
||||
public void setSwap(boolean swap){
|
||||
this.swap = swap;
|
||||
}
|
||||
|
||||
public void force() {
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,32 +1,58 @@
|
||||
package pp.mdga.client;
|
||||
|
||||
import com.jme3.system.NanoTimer;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
import pp.mdga.client.board.BoardHandler;
|
||||
import pp.mdga.client.gui.GuiHandler;
|
||||
import pp.mdga.client.view.CeremonyView;
|
||||
import pp.mdga.client.view.GameView;
|
||||
import pp.mdga.client.view.LobbyView;
|
||||
import pp.mdga.game.BonusCard;
|
||||
import pp.mdga.game.Color;
|
||||
import pp.mdga.notification.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
|
||||
public class NotificationSynchronizer {
|
||||
private final MdgaApp app;
|
||||
|
||||
private ArrayList<Notification> notifications = new ArrayList<>();
|
||||
|
||||
private NanoTimer timer = new NanoTimer();
|
||||
private float delay = 0;
|
||||
|
||||
private static final float STANDARD_DELAY = 2.5f;
|
||||
|
||||
public boolean waitForAnimation = false;
|
||||
|
||||
NotificationSynchronizer(MdgaApp app) {
|
||||
this.app = app;
|
||||
}
|
||||
|
||||
public void addTestNotification(Notification n) {
|
||||
notifications.add(n);
|
||||
handleGame(n);
|
||||
public void update() {
|
||||
while (timer.getTimeInSeconds() >= delay) {
|
||||
if(waitForAnimation) {
|
||||
return;
|
||||
}
|
||||
|
||||
public void update() {
|
||||
Notification n = app.getGameLogic().getNotification();
|
||||
|
||||
if(n == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
System.out.println("receive notification:" + n.getClass().getName());
|
||||
|
||||
timer.reset();
|
||||
delay = 0;
|
||||
|
||||
if(n instanceof InfoNotification infoNotification) {
|
||||
app.getView().showInfo(infoNotification.getMessage(), infoNotification.isError());
|
||||
return;
|
||||
}
|
||||
|
||||
if(n != null) {
|
||||
switch (app.getState()) {
|
||||
case MAIN:
|
||||
@@ -42,7 +68,12 @@ public void update() {
|
||||
handleCeremony(n);
|
||||
break;
|
||||
case NONE:
|
||||
throw new RuntimeException("no notification expected: " + n.toString());
|
||||
throw new RuntimeException("no notification expected: " + n.getClass().getName());
|
||||
}
|
||||
|
||||
if(0 == MdgaApp.DEBUG_MULTIPLIER) {
|
||||
delay = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -50,8 +81,10 @@ public void update() {
|
||||
private void handleMain(Notification notification) {
|
||||
if (notification instanceof LobbyDialogNotification) {
|
||||
app.enter(MdgaState.LOBBY);
|
||||
} else if (notification instanceof StartDialogNotification) {
|
||||
//nothing
|
||||
} else {
|
||||
throw new RuntimeException("notification not expected: ");
|
||||
throw new RuntimeException("notification not expected in main: "+ notification.getClass().getName());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,16 +94,17 @@ private void handleLobby(Notification notification) {
|
||||
if (notification instanceof TskSelectNotification n) {
|
||||
lobbyView.setTaken(n.getColor(), true, n.isSelf(), n.getName());
|
||||
} else if (notification instanceof StartDialogNotification) {
|
||||
app.afterGameCleanup();
|
||||
app.enter(MdgaState.MAIN);
|
||||
} else if (notification instanceof TskUnselectNotification n) {
|
||||
lobbyView.setTaken(n.getColor(), false, false, null);
|
||||
} else if(notification instanceof LobbyReadyNotification lobbyReadyNotification) {
|
||||
lobbyView.setReady(lobbyReadyNotification.getColor(), lobbyReadyNotification.isReady());
|
||||
} else if (notification instanceof GameNotification n) {
|
||||
app.getGameView().setOwnColor(n.getOwnColor());
|
||||
app.enter(MdgaState.GAME);
|
||||
((GameView) app.getView()).setOwnColor(n.getOwnColor());
|
||||
} else {
|
||||
throw new RuntimeException("notification not expected: " + notification.toString());
|
||||
throw new RuntimeException("notification not expected in lobby: " + notification.getClass().getName());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,12 +113,18 @@ private void handleGame(Notification notification) {
|
||||
GuiHandler guiHandler = gameView.getGuiHandler();
|
||||
BoardHandler boardHandler = gameView.getBoardHandler();
|
||||
ModelSynchronizer modelSynchronizer = app.getModelSynchronize();
|
||||
Color ownColor = gameView.getOwnColor();
|
||||
|
||||
if (notification instanceof AcquireCardNotification n) {
|
||||
guiHandler.addCard(n.getBonusCard());
|
||||
guiHandler.addCardOwn(n.getBonusCard());
|
||||
app.getAcousticHandler().playSound(MdgaSound.BONUS);
|
||||
delay = STANDARD_DELAY;
|
||||
} else if (notification instanceof ActivePlayerNotification n) {
|
||||
gameView.getGuiHandler().setActivePlayer(n.getColor());
|
||||
boardHandler.showDice(n.getColor());
|
||||
boardHandler.hideDice();
|
||||
if(n.getColor() != ownColor) boardHandler.showDice(n.getColor());
|
||||
app.getAcousticHandler().playSound(MdgaSound.UI90);
|
||||
delay = STANDARD_DELAY;
|
||||
} else if (notification instanceof CeremonyNotification ceremonyNotification) {
|
||||
app.enter(MdgaState.CEREMONY);
|
||||
CeremonyView ceremonyView = (CeremonyView) app.getView();
|
||||
@@ -116,60 +156,78 @@ private void handleGame(Notification notification) {
|
||||
guiHandler.showDice();
|
||||
} else if (notification instanceof DrawCardNotification n) {
|
||||
guiHandler.drawCard(n.getColor());
|
||||
delay = STANDARD_DELAY;
|
||||
} else if (notification instanceof HomeMoveNotification home) {
|
||||
boardHandler.movePieceHomeAnim(home.getPieceId(), home.getHomeIndex());
|
||||
guiHandler.hideText();
|
||||
} else if (notification instanceof InterruptNotification) {
|
||||
app.enter(MdgaState.LOBBY);
|
||||
waitForAnimation = true;
|
||||
} else if (notification instanceof InterruptNotification notification1) {
|
||||
gameView.enterInterrupt(notification1.getColor());
|
||||
} else if (notification instanceof MovePieceNotification n) {
|
||||
if(n.isMoveStart()) {
|
||||
//StartMove
|
||||
boardHandler.movePieceStartAnim(n.getPiece(), n.getMoveIndex());
|
||||
waitForAnimation = true;
|
||||
}
|
||||
else {
|
||||
//InfieldMove
|
||||
boardHandler.movePieceAnim(n.getPiece(), n.getStartIndex(), n.getMoveIndex());
|
||||
waitForAnimation = true;
|
||||
}
|
||||
guiHandler.hideText();
|
||||
} else if (notification instanceof ThrowPieceNotification n) {
|
||||
boardHandler.throwPieceAnim(n.getPieceId());
|
||||
} else if (notification instanceof NoShieldNotification n) {
|
||||
boardHandler.unshieldPiece(n.getPieceId());
|
||||
boardHandler.throwPiece(n.getPieceId(), n.getThrowColor());
|
||||
waitForAnimation = true;
|
||||
} else if (notification instanceof RemoveShieldNotification n) {
|
||||
boardHandler.unshieldPiece(n.getPieceUuid());
|
||||
} else if (notification instanceof PlayCardNotification n) {
|
||||
switch(n.getCard()){
|
||||
case SWAP -> guiHandler.swap();
|
||||
case TURBO -> guiHandler.turbo();
|
||||
case SHIELD -> guiHandler.shield();
|
||||
default -> throw new RuntimeException("invalid card");
|
||||
if(n.getCard() == BonusCard.TURBO) {
|
||||
app.getAcousticHandler().playSound(MdgaSound.TURBO);
|
||||
guiHandler.turbo();
|
||||
} else if(n.getCard() == BonusCard.SHIELD) {
|
||||
app.getAcousticHandler().playSound(MdgaSound.SHIELD);
|
||||
} else if(n.getCard() == BonusCard.SWAP) {
|
||||
app.getAcousticHandler().playSound(MdgaSound.SWAP);
|
||||
}
|
||||
if(n.getColor() == ownColor) guiHandler.playCardOwn(n.getCard());
|
||||
else guiHandler.playCardEnemy(n.getColor(), n.getCard());
|
||||
|
||||
new Timer().schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
app.getModelSynchronize().animationEnd();
|
||||
}
|
||||
}, 2200 * MdgaApp.DEBUG_MULTIPLIER);
|
||||
} else if (notification instanceof PlayerInGameNotification n) {
|
||||
boardHandler.addPlayer(n.getColor(),n.getPiecesList());
|
||||
guiHandler.addPlayer(n.getColor(),n.getName());
|
||||
} else if (notification instanceof ResumeNotification) {
|
||||
//TODO
|
||||
gameView.leaveInterrupt();
|
||||
} else if (notification instanceof RollDiceNotification n) {
|
||||
gameView.getGuiHandler().hideText();
|
||||
if(n.getColor() == gameView.getOwnColor()){
|
||||
if(n.getColor() == ownColor){
|
||||
guiHandler.rollDice(n.getEyes(), n.isTurbo() ? n.getMultiplier() : -1);
|
||||
waitForAnimation = true;
|
||||
}
|
||||
else {
|
||||
boardHandler.hideDice();
|
||||
if (n.isTurbo()) guiHandler.showRolledDiceMult(n.getEyes(), n.getMultiplier(), n.getColor());
|
||||
else guiHandler.showRolledDice(n.getEyes(), n.getColor());
|
||||
}
|
||||
} else if (notification instanceof SelectableCardsNotification n) {
|
||||
guiHandler.setSelectableCards(n.getCards());
|
||||
gameView.showNoPower();
|
||||
} else if (notification instanceof ShieldActiveNotification n) {
|
||||
boardHandler.shieldPiece(n.getPieceId());
|
||||
} else if (notification instanceof ShieldSuppressedNotification n) {
|
||||
boardHandler.suppressShield(n.getPieceId());
|
||||
} else if (notification instanceof StartDialogNotification) {
|
||||
app.afterGameCleanup();
|
||||
app.enter(MdgaState.MAIN);
|
||||
} else if (notification instanceof SwapPieceNotification n) {
|
||||
// boardHandler.swapPieces(n.getFirstPiece(), n.getSecondPiece());
|
||||
boardHandler.swapPieceAnim(n.getFirstPiece(), n.getSecondPiece());
|
||||
guiHandler.swap();
|
||||
} else if (notification instanceof WaitMoveNotification) {
|
||||
//TODO ???
|
||||
//nothing
|
||||
} else if (notification instanceof SelectableMoveNotification n) {
|
||||
boardHandler.outlineMove(n.getPieces(), n.getMoveIndices(), n.getHomeMoves());
|
||||
modelSynchronizer.setSwap(false);
|
||||
@@ -180,19 +238,20 @@ private void handleGame(Notification notification) {
|
||||
boardHandler.outlineShield(n.getPieces());
|
||||
modelSynchronizer.setSwap(false);
|
||||
} else if (notification instanceof TurboActiveNotification){
|
||||
guiHandler.turbo();
|
||||
//nothing
|
||||
} else if (notification instanceof FinishNotification n){
|
||||
guiHandler.finish(n.getColorFinished());
|
||||
} else {
|
||||
throw new RuntimeException("notification not expected: " + notification.toString());
|
||||
throw new RuntimeException("notification not expected in game: " + notification.getClass().getName());
|
||||
}
|
||||
}
|
||||
|
||||
private void handleCeremony(Notification notification) {
|
||||
if (notification instanceof StartDialogNotification) {
|
||||
app.afterGameCleanup();
|
||||
app.enter(MdgaState.MAIN);
|
||||
} else {
|
||||
throw new RuntimeException("notification not expected: " + notification.toString());
|
||||
throw new RuntimeException("notification not expected in ceremony: " + notification.getClass().getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
47
Projekte/mdga/client/src/main/java/pp/mdga/client/Util.java
Normal file
@@ -0,0 +1,47 @@
|
||||
package pp.mdga.client;
|
||||
|
||||
import com.jme3.math.Vector3f;
|
||||
|
||||
public class Util {
|
||||
private Util(){}
|
||||
|
||||
/**
|
||||
* Performs linear interpolation between two values.
|
||||
*
|
||||
* @param start The starting value.
|
||||
* @param end The ending value.
|
||||
* @param t A parameter between 0 and 1 representing the interpolation progress.
|
||||
* @return The interpolated value.
|
||||
*/
|
||||
public static float linInt(float start, float end, float t) {
|
||||
return start + t * (end - start);
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs quadratic interpolation between three points.
|
||||
*
|
||||
* @param p1 The initial point.
|
||||
* @param p2 The middle point.
|
||||
* @param p3 The final point.
|
||||
* @param t The interpolation parameter (0 <= t <= 1).
|
||||
* @return The interpolated point.
|
||||
*/
|
||||
public static Vector3f quadInt(Vector3f p1, Vector3f p2, Vector3f p3, float t) {
|
||||
// Quadratic interpolation: (1-t)^2 * p1 + 2 * (1-t) * t * p2 + t^2 * p3
|
||||
float oneMinusT = 1 - t;
|
||||
return p1.mult(oneMinusT * oneMinusT)
|
||||
.add(p2.mult(2 * oneMinusT * t))
|
||||
.add(p3.mult(t * t));
|
||||
}
|
||||
|
||||
/**
|
||||
* A smooth ease-in-out function for interpolation.
|
||||
* It accelerates and decelerates the interpolation for a smoother effect.
|
||||
*
|
||||
* @param x The interpolation parameter (0 <= x <= 1).
|
||||
* @return The adjusted interpolation value.
|
||||
*/
|
||||
public static float easeInOut(float x){
|
||||
return x < 0.5 ? 4 * x * x * x : (float) (1 - Math.pow(-2 * x + 2, 3) / 2);
|
||||
}
|
||||
}
|
||||
@@ -18,12 +18,14 @@ public class AcousticHandler {
|
||||
|
||||
private boolean fading = false; // Indicates if a fade is in progress
|
||||
private NanoTimer fadeTimer = new NanoTimer(); // Timer to track fade progress
|
||||
private static final float FADE_DURATION = 3.0f; // Duration for outfade
|
||||
private static final float FADE_DURATION = 2.0f; // Duration for outfade
|
||||
private static final float CROSSFADE_DURATION = 1.5f; // Duration for infade
|
||||
private GameMusic playing = null; // Currently playing track
|
||||
private GameMusic scheduled = null; // Scheduled track to play next
|
||||
private GameMusic old = null; // Old track being faded out
|
||||
|
||||
private GameMusic birds;
|
||||
|
||||
private float mainVolume = 0.0f;
|
||||
private float musicVolume = 1.0f;
|
||||
private float soundVolume = 1.0f;
|
||||
@@ -38,6 +40,8 @@ public AcousticHandler(MdgaApp app) {
|
||||
mainVolume = prefs.getFloat("mainVolume", 1.0f);
|
||||
musicVolume = prefs.getFloat("musicVolume", 1.0f);
|
||||
soundVolume = prefs.getFloat("soundVolume", 1.0f);
|
||||
|
||||
birds = new GameMusic(app, MusicAsset.BIRDS, getSoundVolumeTotal(), MusicAsset.BIRDS.getSubVolume(), MusicAsset.BIRDS.getLoop(), 0.0f);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -60,6 +64,8 @@ public void update() {
|
||||
iterator.remove();
|
||||
}
|
||||
}
|
||||
|
||||
birds.update(Math.min(getSoundVolumeTotal(), getMusicVolumeTotal() > 0 ? 0 : 1));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -109,6 +115,48 @@ public void playSound(MdgaSound sound) {
|
||||
case LEAVE:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.UI_SOUND2, 0.6f, 0.0f));
|
||||
break;
|
||||
case JET:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.JET, 1.0f, 0.0f));
|
||||
break;
|
||||
case EXPLOSION:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_1, 1.0f, 0f));
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_2, 1.0f, 0f));
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.THUNDER, 1.0f, 0f));
|
||||
break;
|
||||
case LOSE:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.LOSE, 1.0f, 0.0f));
|
||||
break;
|
||||
case BONUS:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.BONUS, 1.0f, 0.0f));
|
||||
break;
|
||||
case UI90:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.UI90, 1.0f, 0.0f));
|
||||
break;
|
||||
case MISSILE:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.MISSILE, 1.0f, 0.0f));
|
||||
break;
|
||||
case MATRIX:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.MATRIX, 1.0f, 0.0f));
|
||||
break;
|
||||
case TURRET_ROTATE:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.TURRET_ROTATE, 0.7f, 0f));
|
||||
break;
|
||||
case TANK_SHOOT:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.TANK_SHOOT, 0.7f, 0f));
|
||||
break;
|
||||
case TANK_EXPLOSION:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.EXPLOSION_1, 1.0f, 0f));
|
||||
break;
|
||||
case SHIELD:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.SHIELD, 1.0f, 0f));
|
||||
break;
|
||||
case TURBO:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.SPEED, 1.0f, 0.1f));
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.SPEED, 1.0f, 1.3f));
|
||||
break;
|
||||
case SWAP:
|
||||
assets.add(new SoundAssetDelayVolume(SoundAsset.SWAP, 1.0f, 0f));
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -130,6 +178,10 @@ public void playState(MdgaState state) {
|
||||
}
|
||||
MusicAsset asset = null;
|
||||
|
||||
birds.pause();
|
||||
|
||||
float pause = 0.0f;
|
||||
|
||||
switch (state) {
|
||||
case MAIN:
|
||||
playGame = false;
|
||||
@@ -140,10 +192,12 @@ public void playState(MdgaState state) {
|
||||
asset = MusicAsset.LOBBY;
|
||||
break;
|
||||
case GAME:
|
||||
birds.play();
|
||||
addGameTracks();
|
||||
playGame = true;
|
||||
assert (!gameTracks.isEmpty()) : "no more game music available";
|
||||
asset = gameTracks.remove(0);
|
||||
pause = 2.0f;
|
||||
break;
|
||||
case CEREMONY:
|
||||
playGame = false;
|
||||
@@ -155,7 +209,7 @@ public void playState(MdgaState state) {
|
||||
|
||||
assert (null != asset) : "music sceduling went wrong";
|
||||
|
||||
scheduled = new GameMusic(app, asset, getMusicVolumeTotal(), asset.getSubVolume(), asset.getLoop(), 0.0f);
|
||||
scheduled = new GameMusic(app, asset, getMusicVolumeTotal(), asset.getSubVolume(), asset.getLoop(), pause);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -431,7 +485,7 @@ public void setSoundVolume(float soundVolume) {
|
||||
*/
|
||||
float getMusicVolumeTotal() {
|
||||
|
||||
return getMusicVolume() * getMainVolume();
|
||||
return getMusicVolume() * getMainVolume() / 2;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -31,4 +31,17 @@ public enum MdgaSound {
|
||||
OTHER_CONNECTED,
|
||||
NOT_READY,
|
||||
LEAVE,
|
||||
JET,
|
||||
EXPLOSION,
|
||||
LOSE,
|
||||
BONUS,
|
||||
UI90,
|
||||
MISSILE,
|
||||
MATRIX,
|
||||
TURRET_ROTATE,
|
||||
TANK_SHOOT,
|
||||
TANK_EXPLOSION,
|
||||
SHIELD,
|
||||
TURBO,
|
||||
SWAP,
|
||||
}
|
||||
|
||||
@@ -10,12 +10,13 @@ enum MusicAsset {
|
||||
MAIN_MENU("Spaceship.wav", true, 1.0f),
|
||||
LOBBY("DeadPlanet.wav", true, 1.0f),
|
||||
CEREMONY("80s,Disco,Life.wav", true, 1.0f),
|
||||
GAME_1("NeonRoadTrip.wav", 1.0f),
|
||||
GAME_2("NoPressureTrance.wav", 1.0f),
|
||||
GAME_3("TheSynthRave.wav", 1.0f),
|
||||
GAME_4("LaserParty.wav", 1.0f),
|
||||
GAME_5("RetroNoir.wav", 1.0f),
|
||||
GAME_6("SpaceInvaders.wav", 1.0f);
|
||||
GAME_1("NeonRoadTrip.wav", 0.5f),
|
||||
GAME_2("NoPressureTrance.wav", 0.5f),
|
||||
GAME_3("TheSynthRave.wav", 0.5f),
|
||||
GAME_4("LaserParty.wav", 0.5f),
|
||||
GAME_5("RetroNoir.wav", 0.5f),
|
||||
GAME_6("SpaceInvaders.wav", 0.5f),
|
||||
BIRDS("nature-ambience.ogg", true, 1.0f);
|
||||
|
||||
private final String path;
|
||||
private final boolean loop;
|
||||
|
||||
@@ -28,7 +28,23 @@ enum SoundAsset {
|
||||
POWERUP("powerup.wav"),
|
||||
ROBOT_READY("robotReady.wav"),
|
||||
UNIT_READY("unitReady.wav"),
|
||||
CONNECTED("connected.wav");
|
||||
JET("jet-overhead.wav"),
|
||||
EXPLOSION_1("exp.ogg"),
|
||||
EXPLOSION_2("exp2.ogg"),
|
||||
THUNDER("thunder.ogg"),
|
||||
UI90("ui90.ogg"),
|
||||
BONUS("bonus.ogg"),
|
||||
LOSE("lose.ogg"),
|
||||
MISSILE("missile.ogg"),
|
||||
MATRIX("matrix.wav"),
|
||||
CONNECTED("connected.wav"),
|
||||
TURRET_ROTATE("turret_rotate.ogg"),
|
||||
TANK_SHOOT("tank_shoot.ogg"),
|
||||
SHIELD("shield.ogg"),
|
||||
SPEED("speed.ogg"),
|
||||
SWAP("swap.ogg"),
|
||||
;
|
||||
|
||||
|
||||
private final String path;
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import pp.mdga.client.InitControl;
|
||||
|
||||
public class ActionControl extends InitControl {
|
||||
private final Runnable runnable;
|
||||
|
||||
public ActionControl(Runnable runnable){
|
||||
this.runnable = runnable;
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected void action(){
|
||||
if(null != runnable) {
|
||||
runnable.run();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,134 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.effect.ParticleEmitter;
|
||||
import com.jme3.effect.ParticleMesh.Type;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.scene.Node;
|
||||
import com.jme3.scene.control.AbstractControl;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
|
||||
/**
|
||||
* The {@code Explosion} class represents an explosion effect in a 3D environment.
|
||||
* It manages the creation, configuration, and triggering of particle emitters for fire and smoke effects.
|
||||
*/
|
||||
public class Explosion {
|
||||
|
||||
private final Node rootNode;
|
||||
private final MdgaApp app;
|
||||
private final Vector3f location;
|
||||
private ParticleEmitter fire;
|
||||
private ParticleEmitter smoke;
|
||||
|
||||
private boolean triggered = false;
|
||||
|
||||
private final Material mat;
|
||||
|
||||
/**
|
||||
* Constructor for the {@code Explosion} class.
|
||||
*
|
||||
* @param app The main application managing the explosion.
|
||||
* @param rootNode The root node to which the explosion effects will be attached.
|
||||
* @param location The location of the explosion in world coordinates.
|
||||
*/
|
||||
public Explosion(MdgaApp app, Node rootNode, Vector3f location) {
|
||||
this.app = app;
|
||||
this.rootNode = rootNode;
|
||||
this.location = location;
|
||||
|
||||
this.mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||
mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/flame.png"));
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes the particle emitters for the explosion effect.
|
||||
* Configures the fire and smoke emitters with appearance, behavior, and lifespan.
|
||||
*/
|
||||
private void initializeEmitter() {
|
||||
fire = new ParticleEmitter("Effect", Type.Triangle,50);
|
||||
fire.setMaterial(mat);
|
||||
fire.setImagesX(2);
|
||||
fire.setImagesY(2);
|
||||
fire.setStartColor(ColorRGBA.Yellow);
|
||||
fire.setEndColor(ColorRGBA.Red);
|
||||
fire.getParticleInfluencer().setInitialVelocity(new Vector3f(0.2f,0.2f,4f));
|
||||
fire.getParticleInfluencer().setVelocityVariation(0.4f);
|
||||
fire.setStartSize(0.7f);
|
||||
fire.setEndSize(1.8f);
|
||||
fire.setGravity(0, 0, -0.1f);
|
||||
fire.setLowLife(0.5f);
|
||||
fire.setHighLife(2.2f);
|
||||
fire.setParticlesPerSec(0);
|
||||
|
||||
fire.setLocalTranslation(location);
|
||||
|
||||
smoke = new ParticleEmitter("Effect2", Type.Triangle,40);
|
||||
smoke.setMaterial(mat);
|
||||
smoke.setImagesX(3);
|
||||
smoke.setImagesY(3);
|
||||
smoke.setStartColor(ColorRGBA.DarkGray);
|
||||
smoke.setEndColor(new ColorRGBA(0.05f, 0.05f, 0.05f, 1));
|
||||
smoke.getParticleInfluencer().setInitialVelocity(new Vector3f(0.0f,0.0f,0.7f));
|
||||
smoke.getParticleInfluencer().setVelocityVariation(0.5f);
|
||||
smoke.setStartSize(0.8f);
|
||||
smoke.setEndSize(1.5f);
|
||||
smoke.setGravity(0, 0, -0.3f);
|
||||
smoke.setLowLife(1.2f);
|
||||
smoke.setHighLife(5.5f);
|
||||
smoke.setParticlesPerSec(0);
|
||||
|
||||
smoke.setLocalTranslation(location);
|
||||
|
||||
app.getAcousticHandler().playSound(MdgaSound.EXPLOSION);
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers the explosion effect by attaching and activating the particle emitters for fire and smoke.
|
||||
* Both emitters are automatically detached after a predefined duration.
|
||||
*/
|
||||
public void trigger() {
|
||||
if (!triggered) {
|
||||
triggered = true;
|
||||
initializeEmitter();
|
||||
}
|
||||
|
||||
rootNode.attachChild(fire);
|
||||
fire.emitAllParticles();
|
||||
fire.addControl(new AbstractControl() {
|
||||
private float elapsedTime = 0;
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
elapsedTime += tpf;
|
||||
if (elapsedTime > 10f) {
|
||||
rootNode.detachChild(fire);
|
||||
fire.removeControl(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {}
|
||||
});
|
||||
|
||||
rootNode.attachChild(smoke);
|
||||
smoke.emitAllParticles();
|
||||
smoke.addControl(new AbstractControl() {
|
||||
private float elapsedTime = 0;
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
elapsedTime += tpf;
|
||||
if (elapsedTime > 10f) {
|
||||
rootNode.detachChild(smoke);
|
||||
smoke.removeControl(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.renderer.queue.RenderQueue;
|
||||
import com.jme3.scene.Geometry;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import pp.mdga.client.InitControl;
|
||||
|
||||
import static pp.mdga.client.Util.linInt;
|
||||
|
||||
public class FadeControl extends ActionControl {
|
||||
private float duration; // Duration of the fade effect
|
||||
private float timeElapsed = 0;
|
||||
private boolean init = false;
|
||||
private float startAlpha;
|
||||
private float endAlpha;
|
||||
|
||||
public FadeControl(float duration, float startAlpha, float endAlpha, Runnable actionAfter) {
|
||||
super(actionAfter);
|
||||
this.duration = duration;
|
||||
this.startAlpha = startAlpha;
|
||||
this.endAlpha = endAlpha;
|
||||
}
|
||||
|
||||
public FadeControl(float duration, float startAlpha, float endAlpha) {
|
||||
this(duration, startAlpha, endAlpha, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initSpatial() {
|
||||
init = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
if (!init) return;
|
||||
|
||||
timeElapsed += tpf;
|
||||
float t = timeElapsed / duration; // Calculate progress (0 to 1)
|
||||
|
||||
if (t >= 1) {
|
||||
// Fade complete
|
||||
t = 1;
|
||||
init = false;
|
||||
spatial.removeControl(this);
|
||||
action();
|
||||
}
|
||||
|
||||
float alpha = linInt(startAlpha, endAlpha, t); // Interpolate alpha
|
||||
|
||||
// Update the material's alpha
|
||||
if (spatial instanceof Geometry geometry) {
|
||||
Material mat = geometry.getMaterial();
|
||||
if (mat != null) {
|
||||
ColorRGBA diffuse = (ColorRGBA) mat.getParam("Diffuse").getValue();
|
||||
mat.setColor("Diffuse", new ColorRGBA(diffuse.r, diffuse.g, diffuse.b, alpha));
|
||||
|
||||
ColorRGBA ambient = (ColorRGBA) mat.getParam("Ambient").getValue();
|
||||
mat.setColor("Ambient", new ColorRGBA(ambient.r, ambient.g, ambient.b, alpha));
|
||||
|
||||
// Disable shadows when the object is nearly invisible
|
||||
if (alpha <= 0.1f) {
|
||||
geometry.setShadowMode(RenderQueue.ShadowMode.Off);
|
||||
} else {
|
||||
geometry.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
|
||||
}
|
||||
} else throw new RuntimeException("Material is null");
|
||||
} else throw new RuntimeException("Spatial is not instance of Geometry");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,197 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.FastMath;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.renderer.RenderManager;
|
||||
import com.jme3.renderer.ViewPort;
|
||||
import com.jme3.renderer.queue.RenderQueue;
|
||||
import com.jme3.scene.Node;
|
||||
import com.jme3.scene.Spatial;
|
||||
import com.jme3.scene.control.AbstractControl;
|
||||
import pp.mdga.client.Asset;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
import pp.mdga.client.board.BoardHandler;
|
||||
import pp.mdga.client.view.GameView;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* The {@code JetAnimation} class handles the animation of a jet model in a 3D environment.
|
||||
* It creates a jet model, animates its movement along a curved path, triggers an explosion at a target point,
|
||||
* and performs additional actions upon animation completion.
|
||||
*/
|
||||
public class JetAnimation {
|
||||
|
||||
private final MdgaApp app;
|
||||
private final Node rootNode;
|
||||
private Spatial jetModel;
|
||||
private final Vector3f spawnPoint;
|
||||
private final Vector3f nodePoint;
|
||||
private final Vector3f despawnPoint;
|
||||
private final float curveHeight;
|
||||
private final float animationDuration;
|
||||
private Explosion explosion;
|
||||
private Runnable actionAfter;
|
||||
|
||||
/**
|
||||
* Constructor for the {@code JetAnimation} class.
|
||||
*
|
||||
* @param app The main application managing the jet animation.
|
||||
* @param rootNode The root node to which the jet model will be attached.
|
||||
* @param targetPoint The target point where the explosion will occur.
|
||||
* @param curveHeight The height of the curve for the jet's flight path.
|
||||
* @param animationDuration The total duration of the jet animation.
|
||||
*/
|
||||
public JetAnimation(MdgaApp app, Node rootNode, Vector3f targetPoint, float curveHeight, float animationDuration, Runnable actionAfter) {
|
||||
Vector3f spawnPoint = targetPoint.add(170, 50, 50);
|
||||
|
||||
Vector3f controlPoint = targetPoint.add(new Vector3f(0, 0, -45));
|
||||
|
||||
Vector3f despawnPoint = targetPoint.add(-100, -100, 40);
|
||||
|
||||
this.app = app;
|
||||
this.rootNode = rootNode;
|
||||
this.spawnPoint = spawnPoint;
|
||||
this.nodePoint = controlPoint;
|
||||
this.despawnPoint = despawnPoint;
|
||||
this.curveHeight = curveHeight;
|
||||
this.animationDuration = animationDuration;
|
||||
|
||||
explosion = new Explosion(app, rootNode, targetPoint);
|
||||
this.actionAfter = actionAfter;
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the jet animation by spawning the jet model and initiating its movement along the predefined path.
|
||||
*/
|
||||
public void start() {
|
||||
app.getAcousticHandler().playSound(MdgaSound.JET);
|
||||
spawnJet();
|
||||
animateJet();
|
||||
}
|
||||
|
||||
/**
|
||||
* Spawns the jet model at the designated spawn point, applying material, scaling, and rotation.
|
||||
*/
|
||||
private void spawnJet() {
|
||||
jetModel = app.getAssetManager().loadModel(Asset.jet_noGear.getModelPath());
|
||||
jetModel.setLocalTranslation(spawnPoint);
|
||||
jetModel.scale(Asset.jet_noGear.getSize());
|
||||
jetModel.rotate(FastMath.HALF_PI, 0, 0);
|
||||
jetModel.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
|
||||
Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
|
||||
mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(Asset.jet_noGear.getDiffPath()));
|
||||
jetModel.setMaterial(mat);
|
||||
|
||||
rootNode.attachChild(jetModel);
|
||||
}
|
||||
|
||||
/**actionAfter
|
||||
* Animates the jet along a Bezier curve path, triggers the explosion effect at the appropriate time,
|
||||
* and performs cleanup operations after the animation completes.
|
||||
*/
|
||||
private void animateJet() {
|
||||
Vector3f controlPoint1 = spawnPoint.add(0, curveHeight, 0);
|
||||
Vector3f controlPoint2 = nodePoint.add(0, curveHeight, 0);
|
||||
|
||||
BezierCurve3f curve = new BezierCurve3f(spawnPoint, controlPoint1, controlPoint2, despawnPoint);
|
||||
|
||||
app.getRootNode().addControl(new AbstractControl() {
|
||||
private float elapsedTime = 0;
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
elapsedTime += tpf;
|
||||
float progress = elapsedTime / animationDuration;
|
||||
|
||||
if(elapsedTime > 4.2f) {
|
||||
explosion.trigger();
|
||||
}
|
||||
|
||||
if (progress > 1) {
|
||||
rootNode.detachChild(jetModel);
|
||||
this.spatial.removeControl(this);
|
||||
} else {
|
||||
Vector3f currentPos = curve.interpolate(progress);
|
||||
Vector3f direction = curve.interpolateDerivative(progress).normalizeLocal();
|
||||
jetModel.setLocalTranslation(currentPos);
|
||||
jetModel.lookAt(currentPos.add(direction), Vector3f.UNIT_Z);
|
||||
jetModel.rotate(-FastMath.HALF_PI, 0, (float) Math.toRadians(-25));
|
||||
}
|
||||
|
||||
if (elapsedTime > 6.0f) {
|
||||
endAnim();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlRender(RenderManager rm, ViewPort vp) {}
|
||||
});
|
||||
}
|
||||
|
||||
private void endAnim(){
|
||||
actionAfter.run();
|
||||
}
|
||||
|
||||
/**
|
||||
* The {@code BezierCurve3f} class represents a 3D cubic Bezier curve.
|
||||
* It provides methods to interpolate positions and derivatives along the curve.
|
||||
*/
|
||||
private static class BezierCurve3f {
|
||||
private final Vector3f p0, p1, p2, p3;
|
||||
|
||||
/**
|
||||
* Constructor for the {@code BezierCurve3f} class.
|
||||
*
|
||||
* @param p0 The starting point of the curve.
|
||||
* @param p1 The first control point influencing the curve's shape.
|
||||
* @param p2 The second control point influencing the curve's shape.
|
||||
* @param p3 The endpoint of the curve.
|
||||
*/
|
||||
public BezierCurve3f(Vector3f p0, Vector3f p1, Vector3f p2, Vector3f p3) {
|
||||
this.p0 = p0;
|
||||
this.p1 = p1;
|
||||
this.p2 = p2;
|
||||
this.p3 = p3;
|
||||
}
|
||||
|
||||
/**
|
||||
* Interpolates a position along the curve at a given progress value {@code t}.
|
||||
*
|
||||
* @param t The progress value (0.0 to 1.0) along the curve.
|
||||
* @return The interpolated position on the curve.
|
||||
*/
|
||||
public Vector3f interpolate(float t) {
|
||||
float u = 1 - t;
|
||||
float tt = t * t;
|
||||
float uu = u * u;
|
||||
float uuu = uu * u;
|
||||
float ttt = tt * t;
|
||||
|
||||
Vector3f point = p0.mult(uuu);
|
||||
point = point.add(p1.mult(3 * uu * t));
|
||||
point = point.add(p2.mult(3 * u * tt));
|
||||
point = point.add(p3.mult(ttt));
|
||||
return point;
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes the derivative at a given progress value {@code t}, representing the direction along the curve.
|
||||
*
|
||||
* @param t The progress value (0.0 to 1.0) along the curve.
|
||||
* @return The derivative (direction vector) at the specified progress.
|
||||
*/
|
||||
public Vector3f interpolateDerivative(float t) {
|
||||
float u = 1 - t;
|
||||
float tt = t * t;
|
||||
|
||||
Vector3f derivative = p0.mult(-3 * u * u);
|
||||
derivative = derivative.add(p1.mult(3 * u * u - 6 * u * t));
|
||||
derivative = derivative.add(p2.mult(6 * u * t - 3 * tt));
|
||||
derivative = derivative.add(p3.mult(3 * tt));
|
||||
return derivative;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,200 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.effect.ParticleEmitter;
|
||||
import com.jme3.effect.ParticleMesh.Type;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.material.RenderState;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.Vector3f;
|
||||
import pp.mdga.client.InitControl;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
public class MatrixAnimation extends ActionControl {
|
||||
private MdgaApp app;
|
||||
private static final Random RANDOM = new Random();
|
||||
private Vector3f radarPos;
|
||||
private Runnable runnable;
|
||||
private boolean init = false;
|
||||
private List<ParticleEmitter> activeEmitter = new ArrayList<>();
|
||||
private ParticleEmitter radarEmitter = null;
|
||||
private float timeElapsed = 0f;
|
||||
|
||||
private enum MatrixState{
|
||||
RADAR_ON,
|
||||
RADAR_OFF,
|
||||
MATRIX_ON,
|
||||
MATRIX_OFF
|
||||
}
|
||||
|
||||
private MatrixState state;
|
||||
public MatrixAnimation(MdgaApp app, Vector3f radarPos, Runnable runnable){
|
||||
super(runnable);
|
||||
this.app = app;
|
||||
this.radarPos = radarPos;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initSpatial() {
|
||||
state = MatrixState.RADAR_ON;
|
||||
timeElapsed = 0;
|
||||
init = true;
|
||||
radar();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
if(!init) return;
|
||||
|
||||
timeElapsed += tpf;
|
||||
|
||||
switch(state){
|
||||
case RADAR_ON -> {
|
||||
if(timeElapsed >= 2f){
|
||||
state = MatrixState.RADAR_OFF;
|
||||
timeElapsed = 0;
|
||||
radarEmitter.setParticlesPerSec(0);
|
||||
new Timer().schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
app.getRootNode().detachChild(radarEmitter);
|
||||
}
|
||||
}, 3000);
|
||||
}
|
||||
}
|
||||
case RADAR_OFF -> {
|
||||
if(timeElapsed >= 0.1f){
|
||||
state = MatrixState.MATRIX_ON;
|
||||
timeElapsed = 0;
|
||||
matrix();
|
||||
}
|
||||
|
||||
}
|
||||
case MATRIX_ON -> {
|
||||
if(timeElapsed >= 3f){
|
||||
state = MatrixState.MATRIX_OFF;
|
||||
timeElapsed = 0;
|
||||
turnOff();
|
||||
new Timer().schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
for (ParticleEmitter particleEmitter : activeEmitter){
|
||||
app.getRootNode().detachChild(particleEmitter);
|
||||
}
|
||||
}
|
||||
}, 3000);
|
||||
}
|
||||
}
|
||||
case MATRIX_OFF -> {
|
||||
if(timeElapsed >= 0.5f){
|
||||
init = false;
|
||||
spatial.removeControl(this);
|
||||
action();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void turnOff(){
|
||||
for (ParticleEmitter particleEmitter : activeEmitter){
|
||||
particleEmitter.setParticlesPerSec(0f);
|
||||
}
|
||||
}
|
||||
|
||||
private void radar(){
|
||||
Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||
mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/radar_beam.png"));
|
||||
ParticleEmitter emitter = new ParticleEmitter("Effect", Type.Triangle, 50);
|
||||
emitter.setMaterial(mat);
|
||||
emitter.setImagesX(1); // columns
|
||||
emitter.setImagesY(1); // rows
|
||||
emitter.setSelectRandomImage(true);
|
||||
emitter.setStartColor(ColorRGBA.White);
|
||||
emitter.setEndColor(ColorRGBA.Black);
|
||||
emitter.getParticleInfluencer().setInitialVelocity(new Vector3f(0f, 0f, 2));
|
||||
emitter.getParticleInfluencer().setVelocityVariation(0f);
|
||||
emitter.setStartSize(0.1f);
|
||||
emitter.setEndSize(10);
|
||||
emitter.setGravity(0, 0, 0);
|
||||
float life = 2.6f;
|
||||
emitter.setLowLife(life);
|
||||
emitter.setHighLife(life);
|
||||
emitter.setLocalTranslation(radarPos.add(new Vector3f(0,0,5)));
|
||||
emitter.setParticlesPerSec(1.8f);
|
||||
app.getRootNode().attachChild(emitter);
|
||||
radarEmitter = emitter;
|
||||
}
|
||||
|
||||
private void matrix(){
|
||||
for(int i = 0; i < 5; i++){
|
||||
particleStream(
|
||||
generateMatrixColor(),
|
||||
generateMatrixColor(),
|
||||
getRandomFloat(0,1f),
|
||||
getRandomPosition(),
|
||||
getRandomFloat(1,2)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void particleStream(ColorRGBA start, ColorRGBA end, float speedVar, Vector3f pos, float spawnVar){
|
||||
Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||
mat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
|
||||
mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/particle_cir.png"));
|
||||
ParticleEmitter matrix = new ParticleEmitter("Effect", Type.Triangle, 50);
|
||||
matrix.setMaterial(mat);
|
||||
matrix.setImagesX(2); // columns
|
||||
matrix.setImagesY(1); // rows
|
||||
matrix.setSelectRandomImage(true);
|
||||
matrix.setStartColor(start);
|
||||
matrix.setEndColor(end);
|
||||
matrix.getParticleInfluencer().setInitialVelocity(new Vector3f(0f, 0f, -6f - speedVar));
|
||||
matrix.getParticleInfluencer().setVelocityVariation(0f);
|
||||
matrix.setStartSize(0.4f);
|
||||
matrix.setEndSize(0.6f);
|
||||
matrix.setGravity(0, 0, 2f);
|
||||
matrix.setLowLife(3f);
|
||||
matrix.setHighLife(3f);
|
||||
matrix.setLocalTranslation(spatial.getLocalTranslation().add(pos).add(new Vector3f(0,0,15)));
|
||||
matrix.setParticlesPerSec(spawnVar);
|
||||
app.getRootNode().attachChild(matrix);
|
||||
activeEmitter.add(matrix);
|
||||
}
|
||||
|
||||
public static Vector3f getRandomPosition() {
|
||||
// Generate a random angle in radians (0 to 2π)
|
||||
float angle = (float) (2 * Math.PI * RANDOM.nextDouble());
|
||||
|
||||
// Generate a random radius with uniform distribution
|
||||
float radius = (float) Math.sqrt(RANDOM.nextDouble());
|
||||
radius *= 1f;
|
||||
|
||||
// Convert polar coordinates to Cartesian
|
||||
float x = radius * (float) Math.cos(angle);
|
||||
float y = radius * (float) Math.sin(angle);
|
||||
|
||||
return new Vector3f(x,y,0);
|
||||
}
|
||||
|
||||
public static float getRandomFloat(float start, float end) {
|
||||
if (start > end) {
|
||||
throw new IllegalArgumentException("Start must be less than or equal to end.");
|
||||
}
|
||||
return start + RANDOM.nextFloat() * (end - start);
|
||||
}
|
||||
|
||||
public static ColorRGBA generateMatrixColor() {
|
||||
// Red is dominant
|
||||
float red = 0.8f + RANDOM.nextFloat() * 0.2f; // Red channel: 0.8 to 1.0
|
||||
// Green is moderately high
|
||||
float green = 0.4f + RANDOM.nextFloat() * 0.3f; // Green channel: 0.4 to 0.7
|
||||
// Blue is minimal
|
||||
float blue = RANDOM.nextFloat() * 0.2f; // Blue channel: 0.0 to 0.2
|
||||
float alpha = 1.0f; // Fully opaque
|
||||
|
||||
return new ColorRGBA(red, green, blue, alpha);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,185 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.effect.ParticleEmitter;
|
||||
import com.jme3.effect.ParticleMesh;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.FastMath;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.renderer.RenderManager;
|
||||
import com.jme3.renderer.ViewPort;
|
||||
import com.jme3.renderer.queue.RenderQueue;
|
||||
import com.jme3.scene.Node;
|
||||
import com.jme3.scene.Spatial;
|
||||
import com.jme3.scene.control.AbstractControl;
|
||||
import pp.mdga.client.Asset;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
import pp.mdga.client.board.BoardHandler;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* The {@code MissileAnimation} class handles the animation of a missile moving along a parabolic path
|
||||
* towards a target point in a 3D environment. It also triggers an explosion at the target upon impact.
|
||||
*/
|
||||
public class MissileAnimation {
|
||||
|
||||
private final Node rootNode;
|
||||
private final MdgaApp app;
|
||||
private final Vector3f start;
|
||||
private final Vector3f target;
|
||||
private final float flightTime;
|
||||
private Explosion explosion;
|
||||
private Spatial missileModel;
|
||||
private Runnable actionAfter;
|
||||
private ParticleEmitter smoke;
|
||||
|
||||
private Node missileNode = new Node();
|
||||
|
||||
private final Material mat;
|
||||
|
||||
/**
|
||||
* Constructor for the {@code MissileAnimation} class.
|
||||
*
|
||||
* @param app The main application managing the missile animation.
|
||||
* @param rootNode The root node to which the missile model will be attached.
|
||||
* @param target The target point where the missile will explode.
|
||||
* @param flightTime The total flight time of the missile.
|
||||
*/
|
||||
public MissileAnimation(MdgaApp app, Node rootNode, Vector3f target, float flightTime, Runnable actionAfter) {
|
||||
this.app = app;
|
||||
this.rootNode = rootNode;
|
||||
this.flightTime = flightTime;
|
||||
this.actionAfter = actionAfter;
|
||||
|
||||
explosion = new Explosion(app, rootNode, target);
|
||||
|
||||
this.target = target.add(new Vector3f(1.5f, -1, 0));
|
||||
|
||||
|
||||
start = BoardHandler.gridToWorld(12, 0);
|
||||
start.add(new Vector3f(0, 0, 0));
|
||||
|
||||
this.mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||
mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/vapor_cloud.png"));
|
||||
|
||||
smoke = new ParticleEmitter("Effect2", ParticleMesh.Type.Triangle,400);
|
||||
smoke.setMaterial(mat);
|
||||
smoke.setImagesX(3);
|
||||
smoke.setImagesY(3);
|
||||
smoke.setStartColor(ColorRGBA.DarkGray);
|
||||
smoke.setEndColor(new ColorRGBA(0.05f, 0.05f, 0.05f, 1));
|
||||
smoke.getParticleInfluencer().setInitialVelocity(new Vector3f(0.0f,0.0f,0.0f));
|
||||
smoke.getParticleInfluencer().setVelocityVariation(0.1f);
|
||||
smoke.setStartSize(0.8f);
|
||||
smoke.setEndSize(1.5f);
|
||||
smoke.setGravity(0, 0, -0.3f);
|
||||
smoke.setLowLife(1.2f);
|
||||
smoke.setHighLife(3.5f);
|
||||
smoke.setParticlesPerSec(100);
|
||||
missileNode.attachChild(smoke);
|
||||
smoke.move(1, 0.85f, 1.0f);
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the missile animation by loading the missile model and initiating its parabolic movement.
|
||||
*/
|
||||
public void start() {
|
||||
Smoke s = new Smoke(app, rootNode, start);
|
||||
s.trigger();
|
||||
loadMissile();
|
||||
app.getAcousticHandler().playSound(MdgaSound.MISSILE);
|
||||
animateMissile();
|
||||
}
|
||||
|
||||
/**
|
||||
* Loads the missile model into the scene, applies scaling, material, and sets its initial position.
|
||||
*/
|
||||
private void loadMissile() {
|
||||
missileModel = app.getAssetManager().loadModel(Asset.missile.getModelPath());
|
||||
missileModel.scale(Asset.missile.getSize());
|
||||
missileModel.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
|
||||
Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
|
||||
mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(Asset.missile.getDiffPath()));
|
||||
missileModel.setMaterial(mat);
|
||||
|
||||
missileNode.setLocalTranslation(start);
|
||||
missileNode.attachChild(missileModel);
|
||||
|
||||
rootNode.attachChild(missileNode);
|
||||
}
|
||||
|
||||
/**
|
||||
* Animates the missile along a parabolic path, triggers the explosion near the target,
|
||||
* and removes the missile model after the animation completes.
|
||||
*/
|
||||
private void animateMissile() {
|
||||
missileNode.addControl(new AbstractControl() {
|
||||
private float elapsedTime = 0;
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
if(elapsedTime > 6) {
|
||||
endAnim();
|
||||
rootNode.detachChild(missileNode);
|
||||
this.spatial.removeControl(this);
|
||||
}
|
||||
|
||||
elapsedTime += tpf;
|
||||
float progress = elapsedTime / flightTime;
|
||||
|
||||
if (progress >= 0.55) {
|
||||
smoke.setParticlesPerSec(30);
|
||||
}
|
||||
|
||||
if (progress >= 0.7) {
|
||||
smoke.setParticlesPerSec(0);
|
||||
}
|
||||
|
||||
if (progress >= 0.95f) {
|
||||
explosion.trigger();
|
||||
}
|
||||
|
||||
if (progress >= 1) {
|
||||
explosion.trigger();
|
||||
missileNode.detachChild(missileModel);
|
||||
}
|
||||
|
||||
Vector3f currentPosition = computeParabolicPath(start, target, progress);
|
||||
missileNode.setLocalTranslation(currentPosition);
|
||||
|
||||
Vector3f direction = computeParabolicPath(start, target, progress + 0.01f)
|
||||
.subtract(currentPosition)
|
||||
.normalizeLocal();
|
||||
missileModel.lookAt(currentPosition.add(direction), Vector3f.UNIT_Y);
|
||||
missileModel.rotate(0, FastMath.HALF_PI, 0);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlRender(RenderManager rm, ViewPort vp) {
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void endAnim(){
|
||||
actionAfter.run();
|
||||
}
|
||||
|
||||
/**
|
||||
* Computes a position along a parabolic path at a given progress value {@code t}.
|
||||
*
|
||||
* @param start The starting point of the missile's flight.
|
||||
* @param target The target point of the missile's flight.
|
||||
* @param t The progress value (0.0 to 1.0) along the flight path.
|
||||
* @return The interpolated position along the parabolic path.
|
||||
*/
|
||||
private Vector3f computeParabolicPath(Vector3f start, Vector3f target, float t) {
|
||||
Vector3f midPoint = start.add(target).multLocal(0.5f);
|
||||
midPoint.addLocal(0, 0, 20);
|
||||
|
||||
Vector3f startToMid = FastMath.interpolateLinear(t, start, midPoint);
|
||||
Vector3f midToTarget = FastMath.interpolateLinear(t, midPoint, target);
|
||||
return FastMath.interpolateLinear(t, startToMid, midToTarget);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,8 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.math.Vector3f;
|
||||
import pp.mdga.client.InitControl;
|
||||
|
||||
import static pp.mdga.client.Util.*;
|
||||
|
||||
/**
|
||||
* A control that smoothly moves a spatial from an initial position to an end position
|
||||
@@ -12,16 +13,16 @@
|
||||
* an ease-in-out curve to create a smooth start and stop effect.
|
||||
* </p>
|
||||
*/
|
||||
public class MoveControl extends InitControl {
|
||||
public class MoveControl extends ActionControl {
|
||||
|
||||
private boolean moving;
|
||||
private final Vector3f initPos;
|
||||
private final Vector3f endPos;
|
||||
private final Vector3f middlePos;
|
||||
private final static float HEIGHT = 2;
|
||||
private final static float MOVE_SPEED = 1f;
|
||||
private float progress = 0;
|
||||
private final Runnable actionAfter;
|
||||
private final float height;
|
||||
private final float duration;
|
||||
private float timer = 0;
|
||||
private boolean easing;
|
||||
|
||||
/**
|
||||
* Creates a new MoveControl with specified initial and end positions, and an action to run after the movement.
|
||||
@@ -32,15 +33,22 @@ public class MoveControl extends InitControl {
|
||||
* @param actionAfter A Runnable that will be executed after the movement finishes.
|
||||
*/
|
||||
public MoveControl(Vector3f initPos, Vector3f endPos, Runnable actionAfter){
|
||||
this(initPos, endPos, actionAfter, 2, 1, true);
|
||||
}
|
||||
|
||||
public MoveControl(Vector3f initPos, Vector3f endPos, Runnable actionAfter, float height, float duration, boolean easing){
|
||||
super(actionAfter);
|
||||
moving = false;
|
||||
this.initPos = initPos;
|
||||
this.endPos = endPos;
|
||||
this.height = height;
|
||||
this.duration = duration;
|
||||
this.easing = easing;
|
||||
middlePos = new Vector3f(
|
||||
(initPos.x + endPos.x) / 2,
|
||||
(initPos.y + endPos.y) / 2,
|
||||
HEIGHT
|
||||
height
|
||||
);
|
||||
this.actionAfter = actionAfter;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -50,7 +58,7 @@ public MoveControl(Vector3f initPos, Vector3f endPos, Runnable actionAfter){
|
||||
@Override
|
||||
protected void initSpatial() {
|
||||
moving = true;
|
||||
progress = 0;
|
||||
timer = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -63,10 +71,16 @@ protected void initSpatial() {
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
if(!moving) return;
|
||||
progress += tpf * MOVE_SPEED;
|
||||
if(progress > 1) progress = 1;
|
||||
spatial.setLocalTranslation(quadInt(initPos,middlePos,endPos, easeInOut(progress)));
|
||||
if(progress == 1) end();
|
||||
timer += tpf;
|
||||
|
||||
float t = timer / duration;
|
||||
if (t >= 1) t = 1;
|
||||
|
||||
float interpolated = easing ? easeInOut(t) : t;
|
||||
|
||||
spatial.setLocalTranslation(quadInt(initPos,middlePos,endPos, interpolated));
|
||||
|
||||
if(t >= 1) end();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -75,35 +89,11 @@ protected void controlUpdate(float tpf) {
|
||||
*/
|
||||
private void end(){
|
||||
moving = false;
|
||||
actionAfter.run();
|
||||
spatial.removeControl(this);
|
||||
action();
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs quadratic interpolation between three points.
|
||||
*
|
||||
* @param p1 The initial point.
|
||||
* @param p2 The middle point.
|
||||
* @param p3 The final point.
|
||||
* @param t The interpolation parameter (0 <= t <= 1).
|
||||
* @return The interpolated point.
|
||||
*/
|
||||
private Vector3f quadInt(Vector3f p1, Vector3f p2, Vector3f p3, float t) {
|
||||
// Quadratic interpolation: (1-t)^2 * p1 + 2 * (1-t) * t * p2 + t^2 * p3
|
||||
float oneMinusT = 1 - t;
|
||||
return p1.mult(oneMinusT * oneMinusT)
|
||||
.add(p2.mult(2 * oneMinusT * t))
|
||||
.add(p3.mult(t * t));
|
||||
}
|
||||
|
||||
/**
|
||||
* A smooth ease-in-out function for interpolation.
|
||||
* It accelerates and decelerates the interpolation for a smoother effect.
|
||||
*
|
||||
* @param x The interpolation parameter (0 <= x <= 1).
|
||||
* @return The adjusted interpolation value.
|
||||
*/
|
||||
private float easeInOut(float x){
|
||||
return x < 0.5 ? 4 * x * x * x : (float) (1 - Math.pow(-2 * x + 2, 3) / 2);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.effect.ParticleEmitter;
|
||||
import com.jme3.effect.ParticleMesh;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.material.RenderState;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.FastMath;
|
||||
import com.jme3.math.Quaternion;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.renderer.queue.RenderQueue;
|
||||
import com.jme3.scene.Geometry;
|
||||
import com.jme3.scene.Spatial;
|
||||
import com.jme3.scene.shape.Box;
|
||||
import pp.mdga.client.Asset;
|
||||
import pp.mdga.client.InitControl;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
import pp.mdga.client.board.TankTopControl;
|
||||
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
|
||||
import static com.jme3.material.Materials.LIGHTING;
|
||||
import static com.jme3.material.Materials.UNSHADED;
|
||||
|
||||
public class ShellAnimation extends ActionControl {
|
||||
private static final float FLYING_DURATION = 1.25f;
|
||||
private static final float FLYING_HEIGHT = 12f;
|
||||
private TankTopControl tankTopControl;
|
||||
private MdgaApp app;
|
||||
|
||||
public ShellAnimation(TankTopControl tankTopControl, MdgaApp app, Runnable actionAfter){
|
||||
super(actionAfter);
|
||||
this.tankTopControl = tankTopControl;
|
||||
this.app = app;
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initSpatial() {
|
||||
tankTopControl.rotate(spatial.getLocalTranslation(), this::shoot);
|
||||
app.getAcousticHandler().playSound(MdgaSound.TURRET_ROTATE);
|
||||
app.getRootNode().attachChild(createShell());
|
||||
}
|
||||
|
||||
private Vector3f getShootPos(){
|
||||
Vector3f localOffset = new Vector3f(0, -5.4f, 2.9f);
|
||||
Quaternion turretRotation = tankTopControl.getSpatial().getLocalRotation();
|
||||
Vector3f transformedOffset = turretRotation.mult(localOffset);
|
||||
return tankTopControl.getSpatial().getLocalTranslation().add(transformedOffset);
|
||||
}
|
||||
|
||||
private void shoot(){
|
||||
app.getAcousticHandler().playSound(MdgaSound.TANK_SHOOT);
|
||||
Vector3f shootPos = getShootPos();
|
||||
createEffect(
|
||||
shootPos,
|
||||
"Images/particle/flame.png",
|
||||
2, 2,
|
||||
1, 3,
|
||||
1f,
|
||||
0.3f, 0.7f,
|
||||
new ColorRGBA(1f, 0.8f, 0.4f, 0.5f),
|
||||
new ColorRGBA(1f, 0f, 0f, 0f)
|
||||
);
|
||||
createEffect(
|
||||
shootPos,
|
||||
"Images/particle/vapor_cloud.png",
|
||||
3, 3,
|
||||
0.3f, 0.8f,
|
||||
10,
|
||||
0.1f, 0.35f,
|
||||
new ColorRGBA(0.5f,0.5f,0.5f,0.5f),
|
||||
ColorRGBA.Black
|
||||
);
|
||||
|
||||
Spatial shell = createShell();
|
||||
app.getRootNode().attachChild(shell);
|
||||
shell.addControl(new ShellControl(this::hitExplosion, shootPos, spatial.getLocalTranslation(), FLYING_HEIGHT, FLYING_DURATION, app.getAssetManager()));
|
||||
}
|
||||
|
||||
private Spatial createShell(){
|
||||
Spatial model = app.getAssetManager().loadModel(Asset.shell.getModelPath());
|
||||
model.scale(.16f);
|
||||
model.setLocalTranslation(tankTopControl.getSpatial().getLocalTranslation());
|
||||
|
||||
Vector3f shootPos = tankTopControl.getSpatial().getLocalTranslation();
|
||||
Vector3f targetPos = spatial.getLocalTranslation();
|
||||
Vector3f direction = targetPos.subtract(shootPos).normalize();
|
||||
|
||||
Quaternion rotation = new Quaternion();
|
||||
rotation.lookAt(direction, new Vector3f(1,0,0)); // Assuming UNIT_Y is the up vector
|
||||
|
||||
model.setLocalRotation(rotation);
|
||||
model.rotate(FastMath.HALF_PI,0,0);
|
||||
|
||||
Material mat = new Material(app.getAssetManager(), LIGHTING);
|
||||
mat.setBoolean("UseMaterialColors", true);
|
||||
ColorRGBA color = ColorRGBA.fromRGBA255(143,117,0,255);
|
||||
mat.setColor("Diffuse", color);
|
||||
mat.setColor("Ambient", color);
|
||||
model.setMaterial(mat);
|
||||
return model;
|
||||
}
|
||||
|
||||
private void hitExplosion(){
|
||||
app.getAcousticHandler().playSound(MdgaSound.TANK_EXPLOSION);
|
||||
createEffect(
|
||||
spatial.getLocalTranslation().setZ(1),
|
||||
"Images/particle/flame.png",
|
||||
2, 2,
|
||||
1, 5,
|
||||
2f,
|
||||
0.3f, 0.7f,
|
||||
new ColorRGBA(1f, 0.8f, 0.4f, 0.5f),
|
||||
new ColorRGBA(1f, 0f, 0f, 0f)
|
||||
);
|
||||
new Timer().schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
action();
|
||||
}
|
||||
}, 800);
|
||||
}
|
||||
|
||||
private void createEffect(Vector3f shootPos,
|
||||
String image,
|
||||
int x, int y,
|
||||
float startSize, float endSize,
|
||||
float velocity,
|
||||
float lowLife, float highLife,
|
||||
ColorRGBA start, ColorRGBA end){
|
||||
// Create a particle emitter for the explosion
|
||||
ParticleEmitter explosionEmitter = new ParticleEmitter("Explosion", ParticleMesh.Type.Triangle, 100);
|
||||
Material explosionMat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||
explosionMat.setTexture("Texture", app.getAssetManager().loadTexture(image));
|
||||
explosionEmitter.setMaterial(explosionMat);
|
||||
|
||||
// Particle properties
|
||||
explosionEmitter.setImagesX(x); // Columns in the texture
|
||||
explosionEmitter.setImagesY(y); // Rows in the texture
|
||||
explosionEmitter.setSelectRandomImage(true); // Randomize images for variety
|
||||
|
||||
explosionEmitter.setStartColor(start); // Bright yellowish orange
|
||||
explosionEmitter.setEndColor(end); // Fade to transparent red
|
||||
|
||||
explosionEmitter.setStartSize(startSize); // Initial size
|
||||
explosionEmitter.setEndSize(endSize); // Final size
|
||||
explosionEmitter.setLowLife(lowLife); // Minimum lifetime of particles
|
||||
explosionEmitter.setHighLife(highLife); // Maximum lifetime of particles
|
||||
explosionEmitter.setGravity(0, 0, 1); // Gravity to pull particles down
|
||||
explosionEmitter.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 0, velocity));
|
||||
explosionEmitter.getParticleInfluencer().setVelocityVariation(1f); // Adds randomness to the initial velocity
|
||||
explosionEmitter.setFacingVelocity(true); // Particles face their velocity direction
|
||||
explosionEmitter.setLocalTranslation(shootPos);
|
||||
explosionEmitter.setParticlesPerSec(0);
|
||||
explosionEmitter.emitAllParticles();
|
||||
app.getRootNode().attachChild(explosionEmitter);
|
||||
new Timer().schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
app.getRootNode().detachChild(explosionEmitter);
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.asset.AssetManager;
|
||||
import com.jme3.effect.ParticleEmitter;
|
||||
import com.jme3.effect.ParticleMesh;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.FastMath;
|
||||
import com.jme3.math.Vector3f;
|
||||
import pp.mdga.client.InitControl;
|
||||
|
||||
public class ShellControl extends ActionControl {
|
||||
private final Vector3f shootPos;
|
||||
private final Vector3f endPos;
|
||||
private final float height;
|
||||
private final float duration;
|
||||
private Vector3f oldPos;
|
||||
private ParticleEmitter emitter;
|
||||
private AssetManager assetManager;
|
||||
|
||||
public ShellControl(Runnable runnable, Vector3f shootPos, Vector3f endPos, float height, float duration, AssetManager assetManager){
|
||||
super(runnable);
|
||||
this.shootPos = shootPos;
|
||||
this.endPos = endPos;
|
||||
this.height = height;
|
||||
this.duration = duration;
|
||||
this.assetManager = assetManager;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void initSpatial() {
|
||||
spatial.addControl(new MoveControl(
|
||||
shootPos,
|
||||
endPos,
|
||||
()->{
|
||||
emitter.killAllParticles();
|
||||
emitter.setParticlesPerSec(0);
|
||||
emitter.removeFromParent();
|
||||
spatial.removeControl(this);
|
||||
spatial.removeFromParent();
|
||||
action();
|
||||
},
|
||||
height,
|
||||
duration,
|
||||
false
|
||||
));
|
||||
oldPos = spatial.getLocalTranslation().clone();
|
||||
createEmitter();
|
||||
}
|
||||
|
||||
private void createEmitter() {
|
||||
emitter = new ParticleEmitter("ShellTrail", ParticleMesh.Type.Triangle, 200);
|
||||
Material mat = new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md");
|
||||
mat.setTexture("Texture", assetManager.loadTexture("Images/particle/line.png")); // Nutze eine schmale, linienartige Textur
|
||||
emitter.setMaterial(mat);
|
||||
|
||||
// Comic-Style Farben
|
||||
emitter.setStartColor(new ColorRGBA(1f, 1f, 1f, 1f)); // Reinweiß
|
||||
emitter.setEndColor(new ColorRGBA(1f, 1f, 1f, 0f)); // Transparent
|
||||
|
||||
// Partikelgröße und Lebensdauer
|
||||
emitter.setStartSize(0.15f); // Startgröße
|
||||
emitter.setEndSize(0.1f); // Endgröße
|
||||
emitter.setLowLife(0.14f); // Sehr kurze Lebensdauer
|
||||
emitter.setHighLife(0.14f);
|
||||
|
||||
emitter.setGravity(0, 0, 0); // Keine Gravitation
|
||||
emitter.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 0, 0));
|
||||
emitter.getParticleInfluencer().setVelocityVariation(0f); // Kein Variationsspielraum
|
||||
|
||||
// Hohe Dichte für eine glatte Spur
|
||||
emitter.setParticlesPerSec(500);
|
||||
|
||||
// Zur Shell hinzufügen
|
||||
spatial.getParent().attachChild(emitter);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
Vector3f direction = spatial.getLocalTranslation().subtract(oldPos).normalize();
|
||||
if (direction.lengthSquared() > 0) {
|
||||
spatial.getLocalRotation().lookAt(direction, Vector3f.UNIT_X);
|
||||
spatial.rotate(FastMath.HALF_PI,0,0);
|
||||
}
|
||||
oldPos = spatial.getLocalTranslation().clone();
|
||||
|
||||
emitter.setLocalTranslation(spatial.getLocalTranslation().clone());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
package pp.mdga.client.animation;
|
||||
|
||||
import com.jme3.effect.ParticleEmitter;
|
||||
import com.jme3.effect.ParticleMesh;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.scene.Node;
|
||||
import com.jme3.scene.control.AbstractControl;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
|
||||
public class Smoke {
|
||||
|
||||
private final Node rootNode;
|
||||
private final MdgaApp app;
|
||||
private final Vector3f location;
|
||||
private ParticleEmitter fire;
|
||||
private ParticleEmitter smoke;
|
||||
|
||||
private boolean triggered = false;
|
||||
|
||||
private final Material mat;
|
||||
|
||||
/**
|
||||
* Constructor for the {@code Explosion} class.
|
||||
*
|
||||
* @param app The main application managing the explosion.
|
||||
* @param rootNode The root node to which the explosion effects will be attached.
|
||||
* @param location The location of the explosion in world coordinates.
|
||||
*/
|
||||
public Smoke(MdgaApp app, Node rootNode, Vector3f location) {
|
||||
this.app = app;
|
||||
this.rootNode = rootNode;
|
||||
this.location = location;
|
||||
|
||||
this.mat = new Material(app.getAssetManager(), "Common/MatDefs/Misc/Particle.j3md");
|
||||
mat.setTexture("Texture", app.getAssetManager().loadTexture("Images/particle/vapor_cloud.png"));
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes the particle emitters for the explosion effect.
|
||||
* Configures the fire and smoke emitters with appearance, behavior, and lifespan.
|
||||
*/
|
||||
private void initializeEmitter() {
|
||||
fire = new ParticleEmitter("Effect", ParticleMesh.Type.Triangle,50);
|
||||
fire.setMaterial(mat);
|
||||
fire.setStartColor(ColorRGBA.DarkGray);
|
||||
fire.setEndColor(ColorRGBA.DarkGray);
|
||||
fire.getParticleInfluencer().setInitialVelocity(new Vector3f(0.2f,0.2f,4f));
|
||||
fire.getParticleInfluencer().setVelocityVariation(0.4f);
|
||||
fire.setStartSize(0.7f);
|
||||
fire.setEndSize(3.8f);
|
||||
fire.setGravity(0, 0, -0.1f);
|
||||
fire.setLowLife(0.5f);
|
||||
fire.setHighLife(1.2f);
|
||||
fire.setParticlesPerSec(0);
|
||||
|
||||
fire.setLocalTranslation(location);
|
||||
|
||||
smoke = new ParticleEmitter("Effect2", ParticleMesh.Type.Triangle,40);
|
||||
smoke.setMaterial(mat);
|
||||
smoke.setImagesX(2);
|
||||
smoke.setImagesY(2);
|
||||
smoke.setStartColor(ColorRGBA.DarkGray);
|
||||
smoke.setEndColor(new ColorRGBA(0.05f, 0.05f, 0.05f, 1));
|
||||
smoke.getParticleInfluencer().setInitialVelocity(new Vector3f(0.0f,0.0f,2f));
|
||||
smoke.getParticleInfluencer().setVelocityVariation(0.5f);
|
||||
smoke.setStartSize(0.5f);
|
||||
smoke.setEndSize(1.5f);
|
||||
smoke.setGravity(0, 0, -0.3f);
|
||||
smoke.setLowLife(1.2f);
|
||||
smoke.setHighLife(2.5f);
|
||||
smoke.setParticlesPerSec(0);
|
||||
|
||||
smoke.setLocalTranslation(location);
|
||||
|
||||
app.getAcousticHandler().playSound(MdgaSound.EXPLOSION);
|
||||
}
|
||||
|
||||
/**
|
||||
* Triggers the explosion effect by attaching and activating the particle emitters for fire and smoke.
|
||||
* Both emitters are automatically detached after a predefined duration.
|
||||
*/
|
||||
public void trigger() {
|
||||
if (!triggered) {
|
||||
triggered = true;
|
||||
initializeEmitter();
|
||||
}
|
||||
|
||||
rootNode.attachChild(fire);
|
||||
fire.emitAllParticles();
|
||||
fire.addControl(new AbstractControl() {
|
||||
private float elapsedTime = 0;
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
elapsedTime += tpf;
|
||||
if (elapsedTime > 10f) {
|
||||
rootNode.detachChild(fire);
|
||||
fire.removeControl(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {}
|
||||
});
|
||||
|
||||
rootNode.attachChild(smoke);
|
||||
smoke.emitAllParticles();
|
||||
smoke.addControl(new AbstractControl() {
|
||||
private float elapsedTime = 0;
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
elapsedTime += tpf;
|
||||
if (elapsedTime > 10f) {
|
||||
rootNode.detachChild(smoke);
|
||||
smoke.removeControl(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void controlRender(com.jme3.renderer.RenderManager rm, com.jme3.renderer.ViewPort vp) {}
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,9 @@
|
||||
package pp.mdga.client.board;
|
||||
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.material.RenderState;
|
||||
import com.jme3.material.RenderState.BlendMode;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.post.FilterPostProcessor;
|
||||
import com.jme3.renderer.queue.RenderQueue;
|
||||
@@ -9,10 +12,10 @@
|
||||
import com.jme3.scene.control.AbstractControl;
|
||||
import pp.mdga.client.Asset;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.animation.MoveControl;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
import pp.mdga.client.animation.*;
|
||||
import pp.mdga.client.gui.DiceControl;
|
||||
import pp.mdga.game.Color;
|
||||
import pp.mdga.game.Piece;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
@@ -50,10 +53,15 @@ public class BoardHandler {
|
||||
// Flags and lists for handling piece selection and movement
|
||||
private List<PieceControl> selectableOwnPieces;
|
||||
private List<PieceControl> selectableEnemyPieces;
|
||||
private Map<PieceControl, NodeControl> selectedPieceNodeMap;
|
||||
private List<NodeControl> outlineNodes;
|
||||
private PieceControl selectedOwnPiece;
|
||||
private PieceControl selectedEnemyPiece;
|
||||
private DiceControl diceControl;
|
||||
//Radar Position for Matrix animation
|
||||
private Vector3f radarPos;
|
||||
//TankTop for shellAnimation
|
||||
private TankTopControl tankTop;
|
||||
|
||||
/**
|
||||
* Creates a new BoardHandler.
|
||||
@@ -80,6 +88,7 @@ public void init() {
|
||||
isInitialised = true;
|
||||
selectableOwnPieces = new ArrayList<>();
|
||||
selectableEnemyPieces = new ArrayList<>();
|
||||
selectedPieceNodeMap = new HashMap<>();
|
||||
outlineNodes = new ArrayList<>();
|
||||
selectedOwnPiece = null;
|
||||
selectedEnemyPiece = null;
|
||||
@@ -146,12 +155,24 @@ private void initMap() {
|
||||
case node_wait_blue -> addHomeNode(waitingNodesMap, Color.NAVY, assetOnMap);
|
||||
case node_wait_green -> addHomeNode(waitingNodesMap, Color.ARMY, assetOnMap);
|
||||
case node_wait_yellow -> addHomeNode(waitingNodesMap, Color.CYBER, assetOnMap);
|
||||
case radar -> addRadar(assetOnMap);
|
||||
case tankShoot -> addTankShoot(assetOnMap);
|
||||
|
||||
default -> displayAsset(assetOnMap);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void addTankShoot(AssetOnMap assetOnMap) {
|
||||
displayAsset(assetOnMap);
|
||||
tankTop = displayAndControl(new AssetOnMap(Asset.tankShootTop, assetOnMap.x(), assetOnMap.y(), assetOnMap.rot()), new TankTopControl());
|
||||
}
|
||||
|
||||
private void addRadar(AssetOnMap assetOnMap) {
|
||||
radarPos = gridToWorld(assetOnMap.x(), assetOnMap.y());
|
||||
displayAsset(assetOnMap);
|
||||
}
|
||||
|
||||
/**
|
||||
* Converts an asset to its corresponding color.
|
||||
*
|
||||
@@ -185,11 +206,16 @@ private Spatial createModel(Asset asset, Vector3f pos, float rot) {
|
||||
model.rotate((float) Math.toRadians(0), 0, (float) Math.toRadians(rot));
|
||||
model.setLocalTranslation(pos);
|
||||
model.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
|
||||
|
||||
Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
|
||||
mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(texName));
|
||||
mat.setBoolean("UseMaterialColors", true); // Required for Material Colors
|
||||
mat.setColor("Diffuse", new ColorRGBA(1, 1, 1, 1)); // White color with full alpha
|
||||
mat.setColor("Ambient", new ColorRGBA(1, 1, 1, 1)); // Ambient color with full alpha
|
||||
mat.getAdditionalRenderState().setBlendMode(RenderState.BlendMode.Alpha);
|
||||
model.setMaterial(mat);
|
||||
rootNodeBoard.attachChild(model);
|
||||
|
||||
rootNodeBoard.attachChild(model);
|
||||
return model;
|
||||
}
|
||||
|
||||
@@ -200,7 +226,7 @@ private Spatial createModel(Asset asset, Vector3f pos, float rot) {
|
||||
* @param y The y-coordinate on the grid
|
||||
* @return The corresponding world position
|
||||
*/
|
||||
private static Vector3f gridToWorld(int x, int y) {
|
||||
public static Vector3f gridToWorld(int x, int y) {
|
||||
return new Vector3f(GRID_SIZE * x, GRID_SIZE * y, GRID_ELEVATION);
|
||||
}
|
||||
|
||||
@@ -216,16 +242,38 @@ private Spatial displayAsset(AssetOnMap assetOnMap) {
|
||||
return createModel(assetOnMap.asset(), gridToWorld(x, y), assetOnMap.rot());
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a visual representation of an asset to the scene, attaches a control to it, and returns the control.
|
||||
*
|
||||
* @param assetOnMap The asset to be displayed in the 3D environment.
|
||||
* @param control The control to be added to the spatial representing the asset.
|
||||
* @param <T> The type of control, extending {@code AbstractControl}.
|
||||
* @return The control that was added to the spatial.
|
||||
*/
|
||||
private <T extends AbstractControl> T displayAndControl(AssetOnMap assetOnMap, T control) {
|
||||
Spatial spatial = displayAsset(assetOnMap);
|
||||
spatial.addControl(control);
|
||||
return control;
|
||||
}
|
||||
|
||||
/**
|
||||
* Moves a piece in the 3D environment to the location of a specified node.
|
||||
*
|
||||
* @param pieceControl The control managing the piece to be moved.
|
||||
* @param nodeControl The control managing the target node to which the piece will move.
|
||||
*/
|
||||
private void movePieceToNode(PieceControl pieceControl, NodeControl nodeControl){
|
||||
pieceControl.setLocation(nodeControl.getLocation());
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a home node for a specific player color, attaching it to the map of home nodes.
|
||||
*
|
||||
* @param map The map storing lists of home nodes by player color.
|
||||
* @param color The color associated with the home nodes to be added.
|
||||
* @param assetOnMap The asset representing the home node in the 3D environment.
|
||||
* @throws RuntimeException if more than 4 home nodes are added for a single color.
|
||||
*/
|
||||
private void addHomeNode(Map<Color, List<NodeControl>> map, Color color, AssetOnMap assetOnMap){
|
||||
List<NodeControl> homeNodes = addItemToMapList(map, color, displayAndControl(assetOnMap, new NodeControl(app, fpp)));
|
||||
if (homeNodes.size() > 4) throw new RuntimeException("too many homeNodes for " + color);
|
||||
@@ -257,18 +305,30 @@ private float getRotationMove(Vector3f prev, Vector3f next) {
|
||||
private void movePieceRek(UUID uuid, int curIndex, int moveIndex){
|
||||
if (curIndex == moveIndex) return;
|
||||
|
||||
curIndex = (curIndex + 1) % infield.size();
|
||||
int nextIndex = (curIndex + 1) % infield.size();
|
||||
|
||||
PieceControl pieceControl = pieces.get(uuid);
|
||||
NodeControl nodeControl = infield.get(curIndex);
|
||||
NodeControl nodeCur = infield.get(curIndex);
|
||||
NodeControl nodeMove = infield.get(nextIndex);
|
||||
|
||||
pieceControl.setRotation(getRotationMove(pieceControl.getLocation(),nodeControl.getLocation()));
|
||||
pieceControl.setRotation(getRotationMove(nodeCur.getLocation(),nodeMove.getLocation()));
|
||||
|
||||
movePieceToNode(pieceControl, nodeControl);
|
||||
movePieceToNode(pieceControl, nodeMove);
|
||||
|
||||
movePieceRek(uuid, curIndex, moveIndex);
|
||||
|
||||
movePieceRek(uuid, nextIndex, moveIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds an item to a list in a map. If the key does not exist in the map, a new list is created.
|
||||
*
|
||||
* @param map The map containing lists of items.
|
||||
* @param key The key associated with the list in the map.
|
||||
* @param item The item to be added to the list.
|
||||
* @param <T> The type of items in the list.
|
||||
* @param <E> The type of the key in the map.
|
||||
* @return The updated list associated with the specified key.
|
||||
*/
|
||||
private <T, E> List<T> addItemToMapList(Map<E,List<T>> map, E key, T item){
|
||||
List<T> list = map.getOrDefault(key, new ArrayList<>());
|
||||
list.add(item);
|
||||
@@ -276,12 +336,27 @@ private <T, E> List<T> addItemToMapList(Map<E,List<T>> map, E key, T item){
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes an item from a list in a map. If the key does not exist in the map, a new list is created.
|
||||
*
|
||||
* @param map The map containing lists of items.
|
||||
* @param key The key associated with the list in the map.
|
||||
* @param item The item to be removed from the list.
|
||||
* @param <T> The type of items in the list.
|
||||
* @param <E> The type of the key in the map.
|
||||
*/
|
||||
private <T, E> void removeItemFromMapList(Map<E,List<T>> map, E key, T item){
|
||||
List<T> list = map.getOrDefault(key, new ArrayList<>());
|
||||
list.remove(item);
|
||||
map.put(key, list);
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates the mean position of the waiting nodes for a specific color.
|
||||
*
|
||||
* @param color The color associated with the waiting nodes.
|
||||
* @return The mean position of the waiting nodes as a {@code Vector3f}.
|
||||
*/
|
||||
private Vector3f getWaitingPos(Color color){
|
||||
return getMeanPosition(waitingNodesMap.get(color).stream().map(NodeControl::getLocation).toList());
|
||||
}
|
||||
@@ -367,6 +442,7 @@ private void moveHomePiece(UUID uuid, int index){
|
||||
|
||||
pieceControl.setRotation(getRotationMove(firstHomeNode.getLocation(), lastHomeNode.getLocation()));
|
||||
app.getModelSynchronize().animationEnd();
|
||||
app.getModelSynchronize().animationEnd();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -398,6 +474,7 @@ private void movePieceStart(UUID uuid, int nodeIndex){
|
||||
removeItemFromMapList(waitingPiecesMap, color, pieceControl);
|
||||
waitingNodes.get(color).remove(uuid);
|
||||
app.getModelSynchronize().animationEnd();
|
||||
app.getModelSynchronize().animationEnd();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -411,6 +488,7 @@ private void movePiece(UUID uuid, int curIndex, int moveIndex){
|
||||
|
||||
movePieceRek(uuid, curIndex, moveIndex);
|
||||
app.getModelSynchronize().animationEnd();
|
||||
app.getModelSynchronize().animationEnd();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -443,6 +521,7 @@ private void throwPiece(UUID uuid){
|
||||
|
||||
// Synchronisation oder Animation
|
||||
pieceControl.rotateInit();
|
||||
app.getAcousticHandler().playSound(MdgaSound.LOSE);
|
||||
app.getModelSynchronize().animationEnd();
|
||||
}
|
||||
|
||||
@@ -453,7 +532,6 @@ private void throwPiece(UUID uuid){
|
||||
* @param uuid the UUID of the piece to shield
|
||||
*/
|
||||
public void shieldPiece(UUID uuid){
|
||||
|
||||
pieces.get(uuid).activateShield();
|
||||
}
|
||||
|
||||
@@ -463,7 +541,6 @@ public void shieldPiece(UUID uuid){
|
||||
* @param uuid the UUID of the piece to unshield
|
||||
*/
|
||||
public void unshieldPiece(UUID uuid){
|
||||
|
||||
pieces.get(uuid).deactivateShield();
|
||||
}
|
||||
|
||||
@@ -531,6 +608,7 @@ public void outlineMove(List<UUID> pieces, List<Integer> moveIndexe, List<Boolea
|
||||
pieceControl.setSelectable(true);
|
||||
outlineNodes.add(nodeControl);
|
||||
selectableOwnPieces.add(pieceControl);
|
||||
selectedPieceNodeMap.put(pieceControl, nodeControl);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -593,13 +671,16 @@ public void pieceSelect(PieceControl pieceSelected) {
|
||||
if(selectableOwnPieces.contains(pieceSelected)){
|
||||
for(PieceControl p : selectableOwnPieces) {
|
||||
p.unSelect();
|
||||
if(selectedPieceNodeMap.get(p) != null) selectedPieceNodeMap.get(p).unSelect();
|
||||
}
|
||||
if (!isSelected) {
|
||||
pieceSelected.select();
|
||||
if(selectedPieceNodeMap.get(pieceSelected) != null) selectedPieceNodeMap.get(pieceSelected).select();
|
||||
selectedOwnPiece = pieceSelected;
|
||||
}
|
||||
else {
|
||||
pieceSelected.unSelect();
|
||||
if(selectedPieceNodeMap.get(pieceSelected) != null) selectedPieceNodeMap.get(pieceSelected).unSelect();
|
||||
selectedOwnPiece = null;
|
||||
}
|
||||
}
|
||||
@@ -621,6 +702,16 @@ else if(selectableEnemyPieces.contains(pieceSelected)) {
|
||||
app.getModelSynchronize().select(getKeyByValue(pieces, selectedOwnPiece), getKeyByValue(pieces, selectedEnemyPiece));
|
||||
}
|
||||
|
||||
public void pieceHoverOn(PieceControl hoverPiece){
|
||||
hoverPiece.hover();
|
||||
if(selectedPieceNodeMap.get(hoverPiece) != null) selectedPieceNodeMap.get(hoverPiece).hover();
|
||||
}
|
||||
|
||||
public void pieceHoverOff(PieceControl hoverPiece){
|
||||
hoverPiece.hoverOff();
|
||||
if(selectedPieceNodeMap.get(hoverPiece) != null) selectedPieceNodeMap.get(hoverPiece).hoverOff();
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears all highlighted, selectable, and selected pieces and nodes.
|
||||
*/
|
||||
@@ -629,11 +720,15 @@ public void clearSelectable(){
|
||||
p.unSelect();
|
||||
p.unHighlight();
|
||||
p.setSelectable(false);
|
||||
p.setHoverable(false);
|
||||
if(selectedPieceNodeMap.get(p) != null) selectedPieceNodeMap.get(p).unSelect();
|
||||
if(selectedPieceNodeMap.get(p) != null) selectedPieceNodeMap.get(p).unHighlight();
|
||||
}
|
||||
for(PieceControl p : selectableOwnPieces) {
|
||||
p.unSelect();
|
||||
p.unHighlight();
|
||||
p.setSelectable(false);
|
||||
p.setHoverable(false);
|
||||
}
|
||||
for(NodeControl n : outlineNodes){
|
||||
n.deOutline();
|
||||
@@ -641,6 +736,7 @@ public void clearSelectable(){
|
||||
outlineNodes.clear();
|
||||
selectableEnemyPieces.clear();
|
||||
selectableOwnPieces.clear();
|
||||
selectedPieceNodeMap.clear();
|
||||
selectedEnemyPiece = null;
|
||||
selectedOwnPiece = null;
|
||||
}
|
||||
@@ -680,6 +776,7 @@ private <K, V> K getKeyByValue(Map<K, V> map, V value) {
|
||||
* @param moveIndex the target index to animate the piece to
|
||||
*/
|
||||
public void movePieceAnim(UUID uuid, int curIndex, int moveIndex){
|
||||
|
||||
pieces.get(uuid).getSpatial().addControl(new MoveControl(
|
||||
infield.get(curIndex).getLocation(),
|
||||
infield.get(moveIndex).getLocation(),
|
||||
@@ -720,10 +817,55 @@ public void movePieceStartAnim(UUID uuid, int moveIndex){
|
||||
*/
|
||||
public void throwPieceAnim(UUID uuid){
|
||||
pieces.get(uuid).getSpatial().addControl(new MoveControl(
|
||||
pieces.get(uuid).getLocation(),
|
||||
getNextWaitingNode(pieceColor.get(uuid)).getLocation(),
|
||||
()->throwPiece(uuid)
|
||||
pieces.get(uuid).getLocation(), getNextWaitingNode(pieceColor.get(uuid)).getLocation(),
|
||||
()->throwPiece(uuid))
|
||||
);
|
||||
}
|
||||
|
||||
public void throwPiece(UUID uuid, Color throwColor){
|
||||
switch(throwColor){
|
||||
case ARMY -> throwShell(uuid);
|
||||
case NAVY -> throwMissile(uuid);
|
||||
case CYBER -> throwMatrix(uuid);
|
||||
case AIRFORCE -> throwBomb(uuid);
|
||||
default -> throw new RuntimeException("invalid color");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Animates the throwing of a piece to the next available waiting node.
|
||||
*
|
||||
* @param uuid the UUID of the piece to animate
|
||||
*/
|
||||
private void throwBomb(UUID uuid) {
|
||||
Vector3f targetPoint = pieces.get(uuid).getLocation();
|
||||
|
||||
JetAnimation anim = new JetAnimation(app, rootNode, targetPoint, 40, 6, ()->throwPieceAnim(uuid));
|
||||
anim.start();
|
||||
}
|
||||
|
||||
private void throwMatrix(UUID uuid) {
|
||||
app.getAcousticHandler().playSound(MdgaSound.MATRIX);
|
||||
Spatial piece = pieces.get(uuid).getSpatial();
|
||||
piece.addControl(new MatrixAnimation(app, radarPos,()-> {
|
||||
piece.addControl(new FadeControl(1,1,0,
|
||||
() -> {
|
||||
throwPiece(uuid);
|
||||
piece.addControl(new FadeControl(1,0,1));
|
||||
}
|
||||
));
|
||||
}));
|
||||
}
|
||||
|
||||
private void throwMissile(UUID uuid) {
|
||||
Vector3f targetPoint = pieces.get(uuid).getLocation();
|
||||
|
||||
MissileAnimation anim = new MissileAnimation(app, rootNode, targetPoint, 2f, ()->throwPieceAnim(uuid));
|
||||
anim.start();
|
||||
}
|
||||
|
||||
private void throwShell(UUID uuid) {
|
||||
pieces.get(uuid).getSpatial().addControl(new ShellAnimation(tankTop, app, ()-> throwPieceAnim(uuid)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
import com.jme3.math.Quaternion;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.post.FilterPostProcessor;
|
||||
import com.jme3.post.filters.FXAAFilter;
|
||||
import com.jme3.post.ssao.SSAOFilter;
|
||||
import com.jme3.scene.Spatial;
|
||||
import com.jme3.shadow.DirectionalLightShadowFilter;
|
||||
import com.jme3.shadow.EdgeFilteringMode;
|
||||
@@ -37,6 +39,8 @@ public class CameraHandler {
|
||||
private Color ownColor;
|
||||
private boolean init;
|
||||
private boolean initRot;
|
||||
private SSAOFilter ssaoFilter;
|
||||
private FXAAFilter fxaaFilter;
|
||||
|
||||
/**
|
||||
* Constructor for the CameraHandler. Initializes the camera settings and lighting.
|
||||
@@ -65,6 +69,9 @@ public CameraHandler(MdgaApp app, FilterPostProcessor fpp) {
|
||||
dlsf.setEnabled(true);
|
||||
dlsf.setEdgeFilteringMode(EdgeFilteringMode.PCFPOISSON);
|
||||
dlsf.setShadowIntensity(0.7f);
|
||||
ssaoFilter = new SSAOFilter(6, 10f, 0.33f, 0.61f);
|
||||
// ssaoFilter = new SSAOFilter();
|
||||
fxaaFilter = new FXAAFilter();
|
||||
|
||||
sky = SkyFactory.createSky(app.getAssetManager(), "Images/sky/sky.dds", EnvMapType.EquirectMap).rotate(FastMath.HALF_PI*1,0,FastMath.HALF_PI*0.2f);
|
||||
|
||||
@@ -82,6 +89,8 @@ public void init(Color ownColor) {
|
||||
app.getRootNode().addLight(ambient);
|
||||
app.getRootNode().attachChild(sky);
|
||||
fpp.addFilter(dlsf);
|
||||
fpp.addFilter(ssaoFilter);
|
||||
fpp.addFilter(fxaaFilter);
|
||||
init = true;
|
||||
initRot = true;
|
||||
this.ownColor = ownColor;
|
||||
@@ -93,15 +102,18 @@ public void init(Color ownColor) {
|
||||
* and resets the camera position and rotation to its default state.
|
||||
*/
|
||||
public void shutdown() {
|
||||
app.getRootNode().removeLight(sun);
|
||||
app.getRootNode().removeLight(ambient);
|
||||
init = false;
|
||||
fpp.removeFilter(fxaaFilter);
|
||||
fpp.removeFilter(ssaoFilter);
|
||||
fpp.removeFilter(dlsf);
|
||||
app.getRootNode().detachChild(sky);
|
||||
app.getRootNode().removeLight(ambient);
|
||||
app.getRootNode().removeLight(sun);
|
||||
|
||||
|
||||
// Reset the camera to its default state
|
||||
app.getCamera().setLocation(defaultCameraPosition);
|
||||
app.getCamera().setRotation(defaultCameraRotation);
|
||||
|
||||
fpp.removeFilter(dlsf);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -107,8 +107,11 @@ private static Asset getLoadedAsset(String assetName) {
|
||||
case "radar" -> Asset.radar;
|
||||
case "ship" -> Asset.ship;
|
||||
case "tank" -> Asset.tank;
|
||||
case "tree_small" -> Asset.treeSmall;
|
||||
case "tree_big" -> Asset.treeBig;
|
||||
case "treeSmall" -> Asset.treeSmall;
|
||||
case "treeBig" -> Asset.treeBig;
|
||||
case "tank_shoot" -> Asset.tankShoot;
|
||||
case "treesBigBackground" -> Asset.treesBigBackground;
|
||||
case "treesSmallBackground" -> Asset.treesSmallBackground;
|
||||
default -> throw new IllegalStateException("Unexpected value: " + assetName);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -16,6 +16,12 @@ public class NodeControl extends OutlineControl {
|
||||
|
||||
private static final ColorRGBA OUTLINE_HIGHLIGHT_COLOR = ColorRGBA.White;
|
||||
private static final int OUTLINE_HIGHLIGHT_WIDTH = 6;
|
||||
private static final ColorRGBA OUTLINE_SELECT_COLOR = ColorRGBA.Cyan;
|
||||
private static final int OUTLINE_SELECT_WIDTH = 8;
|
||||
private static final ColorRGBA OUTLINE_HOVER_COLOR = ColorRGBA.Yellow;
|
||||
private static final int OUTLINE_HOVER_WIDTH = 6;
|
||||
private boolean select = false;
|
||||
private boolean highlight = false;
|
||||
|
||||
/**
|
||||
* Constructs a {@link NodeControl} with the specified application and post processor.
|
||||
@@ -38,11 +44,34 @@ public Vector3f getLocation(){
|
||||
return this.getSpatial().getLocalTranslation();
|
||||
}
|
||||
|
||||
/**
|
||||
* Highlights the node by applying an outline effect.
|
||||
* The outline color and width are predefined as white and 6, respectively.
|
||||
*/
|
||||
public void highlight() {
|
||||
public void highlight(){
|
||||
highlight = true;
|
||||
super.outline(OUTLINE_HIGHLIGHT_COLOR, OUTLINE_HIGHLIGHT_WIDTH);
|
||||
}
|
||||
|
||||
public void unHighlight(){
|
||||
highlight = false;
|
||||
deOutline();
|
||||
}
|
||||
|
||||
public void select(){
|
||||
select = true;
|
||||
super.outline(OUTLINE_SELECT_COLOR, OUTLINE_SELECT_WIDTH);
|
||||
}
|
||||
|
||||
public void unSelect(){
|
||||
select = false;
|
||||
if(highlight) highlight();
|
||||
else deOutline();
|
||||
}
|
||||
|
||||
public void hover(){
|
||||
super.outline(OUTLINE_HOVER_COLOR, OUTLINE_HOVER_WIDTH);
|
||||
}
|
||||
|
||||
public void hoverOff(){
|
||||
if(select) select();
|
||||
else if(highlight) highlight();
|
||||
else deOutline();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,17 +18,37 @@ public class OutlineControl extends InitControl {
|
||||
private static final int THICKNESS_DEFAULT = 6;
|
||||
private MdgaApp app;
|
||||
|
||||
|
||||
/**
|
||||
* Constructs an {@code OutlineControl} with default thickness for the object outline.
|
||||
*
|
||||
* @param app The main application managing the outline control.
|
||||
* @param fpp The {@code FilterPostProcessor} used for post-processing effects.
|
||||
*/
|
||||
public OutlineControl(MdgaApp app, FilterPostProcessor fpp){
|
||||
this.app = app;
|
||||
outlineOwn = new SelectObjectOutliner(THICKNESS_DEFAULT, fpp, app.getRenderManager(), app.getAssetManager(), app.getCamera(), app);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an {@code OutlineControl} with default thickness, allowing a custom camera to be specified.
|
||||
*
|
||||
* @param app The main application managing the outline control.
|
||||
* @param fpp The {@code FilterPostProcessor} used for post-processing effects.
|
||||
* @param cam The camera used for rendering the outlined objects.
|
||||
*/
|
||||
public OutlineControl(MdgaApp app, FilterPostProcessor fpp, Camera cam){
|
||||
this.app = app;
|
||||
outlineOwn = new SelectObjectOutliner(THICKNESS_DEFAULT, fpp, app.getRenderManager(), app.getAssetManager(), cam, app);
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructs an {@code OutlineControl} with a specified thickness and custom camera.
|
||||
*
|
||||
* @param app The main application managing the outline control.
|
||||
* @param fpp The {@code FilterPostProcessor} used for post-processing effects.
|
||||
* @param cam The camera used for rendering the outlined objects.
|
||||
* @param thickness The thickness of the outline.
|
||||
*/
|
||||
public OutlineControl(MdgaApp app, FilterPostProcessor fpp, Camera cam, int thickness){
|
||||
this.app = app;
|
||||
outlineOwn = new SelectObjectOutliner(thickness, fpp, app.getRenderManager(), app.getAssetManager(), cam, app);
|
||||
@@ -61,6 +81,11 @@ public void deOutline(){
|
||||
outlineOwn.deselect(spatial);
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the instance of the {@code MdgaApp} associated with this control.
|
||||
*
|
||||
* @return The {@code MdgaApp} instance.
|
||||
*/
|
||||
public MdgaApp getApp() {
|
||||
return app;
|
||||
}
|
||||
|
||||
@@ -113,6 +113,7 @@ public Vector3f getLocation(){
|
||||
protected void controlUpdate(float delta) {
|
||||
if(shieldRing != null){
|
||||
shieldRing.rotate(0, 0, delta * SHIELD_SPEED);
|
||||
shieldRing.setLocalTranslation(spatial.getLocalTranslation().add(new Vector3f(0,0,SHIELD_Z)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,7 +142,7 @@ public void initSpatial(){
|
||||
}
|
||||
|
||||
public void rotateInit() {
|
||||
// rotate(rotation - initRotation);
|
||||
setRotation(initRotation);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -149,6 +150,9 @@ public void rotateInit() {
|
||||
* This adds a visual shield effect in the form of a rotating ring.
|
||||
*/
|
||||
public void activateShield(){
|
||||
if(shieldRing != null){
|
||||
deactivateShield();
|
||||
}
|
||||
shieldRing = assetManager.loadModel(Asset.shieldRing.getModelPath());
|
||||
shieldRing.scale(1f);
|
||||
shieldRing.rotate((float) Math.toRadians(0), 0, (float) Math.toRadians(0));
|
||||
@@ -278,4 +282,5 @@ public boolean isSelectable() {
|
||||
public void setHoverable(boolean hoverable) {
|
||||
this.hoverable = hoverable;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
package pp.mdga.client.board;
|
||||
|
||||
import com.jme3.math.FastMath;
|
||||
import com.jme3.math.Quaternion;
|
||||
import com.jme3.math.Vector3f;
|
||||
import pp.mdga.client.InitControl;
|
||||
|
||||
import static pp.mdga.client.Util.linInt;
|
||||
|
||||
public class TankTopControl extends InitControl {
|
||||
|
||||
private float timer = 0; // Time elapsed
|
||||
private final static float DURATION = 1.5f; // Total rotation duration in seconds
|
||||
private boolean rotating = false; // Flag to track if rotation is active
|
||||
private float startAngle = 0;
|
||||
private float endAngle = 0;
|
||||
private Runnable actionAfter = null;
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
if (!rotating) return;
|
||||
|
||||
// Update the timer
|
||||
timer += tpf;
|
||||
|
||||
// Calculate interpolation factor (0 to 1)
|
||||
float t = timer / DURATION;
|
||||
|
||||
if (t >= 1) t = 1;
|
||||
|
||||
float curAngle = linInt(startAngle, endAngle, t);
|
||||
|
||||
// Interpolate the rotation
|
||||
Quaternion interpolatedRotation = new Quaternion();
|
||||
interpolatedRotation.fromAngleAxis((float) Math.toRadians(curAngle), Vector3f.UNIT_Z);
|
||||
|
||||
// Apply the interpolated rotation to the spatial
|
||||
spatial.setLocalRotation(interpolatedRotation);
|
||||
|
||||
if(t >= 1){
|
||||
rotating = false;
|
||||
if(actionAfter != null) actionAfter.run();
|
||||
}
|
||||
}
|
||||
|
||||
public void rotate(Vector3f enemyPos, Runnable actionAfter) {
|
||||
if (spatial == null) throw new RuntimeException("spatial is null");
|
||||
|
||||
startAngle = getOwnAngle();
|
||||
endAngle = getEnemyAngle(enemyPos);
|
||||
|
||||
// Adjust endAngle to ensure the shortest path
|
||||
float deltaAngle = endAngle - startAngle;
|
||||
if (deltaAngle > 180) {
|
||||
endAngle -= 360; // Rotate counterclockwise
|
||||
} else if (deltaAngle < -180) {
|
||||
endAngle += 360; // Rotate clockwise
|
||||
}
|
||||
|
||||
timer = 0;
|
||||
rotating = true;
|
||||
this.actionAfter = actionAfter; // Store the action to execute after rotation
|
||||
}
|
||||
|
||||
private float getEnemyAngle(Vector3f enemyPos){
|
||||
// Direction to the enemy in the XY plane
|
||||
Vector3f direction = enemyPos.subtract(spatial.getLocalTranslation());
|
||||
direction.z = 0; // Project to XY plane
|
||||
direction.normalizeLocal();
|
||||
|
||||
Vector3f reference = Vector3f.UNIT_Y.mult(-1);
|
||||
|
||||
// Calculate the angle between the direction vector and the reference vector
|
||||
float angle = FastMath.acos(reference.dot(direction));
|
||||
|
||||
// Determine rotation direction using the cross product
|
||||
Vector3f cross = reference.cross(direction);
|
||||
if (cross.z < 0) {
|
||||
angle = -angle;
|
||||
}
|
||||
|
||||
return (float) Math.toDegrees(angle); // Return the absolute angle in degrees
|
||||
}
|
||||
|
||||
private float getOwnAngle() {
|
||||
// Tank's forward direction in the XY plane
|
||||
Vector3f forward = spatial.getLocalRotation().mult(Vector3f.UNIT_Y);
|
||||
forward.z = 0; // Project to XY plane
|
||||
forward.normalizeLocal();
|
||||
|
||||
// Reference vector: Positive X-axis
|
||||
Vector3f reference = Vector3f.UNIT_Y;
|
||||
|
||||
// Calculate the angle between the forward vector and the reference vector
|
||||
float angle = FastMath.acos(reference.dot(forward));
|
||||
|
||||
// Determine rotation direction using the cross product
|
||||
Vector3f cross = reference.cross(forward);
|
||||
if (cross.z < 0) { // For Z-up, check the Z component of the cross product
|
||||
angle = -angle;
|
||||
}
|
||||
|
||||
return (float) Math.toDegrees(angle); // Return the absolute angle in radians
|
||||
}
|
||||
}
|
||||
@@ -77,12 +77,17 @@ public SliderButton(MdgaApp app, Node node, String label) {
|
||||
QuadBackgroundComponent background = new QuadBackgroundComponent(BUTTON_NORMAL);
|
||||
slider.setBackground(background);
|
||||
|
||||
// Set label background
|
||||
QuadBackgroundComponent labelBackground = new QuadBackgroundComponent(BUTTON_NORMAL);
|
||||
this.label.setBackground(labelBackground);
|
||||
|
||||
// Configure the label font
|
||||
this.label.setFont(font);
|
||||
this.label.setTextHAlignment(HAlignment.Center);
|
||||
|
||||
// Default position and size
|
||||
pos = new Vector2f(0, 0);
|
||||
size = new Vector2f(5.5f, 1);
|
||||
size = new Vector2f(6f, 1);
|
||||
|
||||
// Add label and slider to container
|
||||
container.addChild(this.label);
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
import pp.mdga.client.button.SliderButton;
|
||||
import pp.mdga.client.view.MdgaView;
|
||||
|
||||
/**
|
||||
* The {@code AudioSettingsDialog} class represents a dialog for adjusting audio settings in the application.
|
||||
* It provides controls for managing main volume, music volume, and sound effect volume, and includes
|
||||
* a button to return to the previous menu.
|
||||
*/
|
||||
public class AudioSettingsDialog extends Dialog {
|
||||
private final MdgaView view;
|
||||
|
||||
@@ -18,6 +23,13 @@ public class AudioSettingsDialog extends Dialog {
|
||||
|
||||
private boolean active = false;
|
||||
|
||||
/**
|
||||
* Constructs an {@code AudioSettingsDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
* @param view The current view, used for navigation and interaction with the dialog.
|
||||
*/
|
||||
public AudioSettingsDialog(MdgaApp app, Node node, MdgaView view) {
|
||||
super(app, node);
|
||||
|
||||
@@ -42,6 +54,9 @@ public AudioSettingsDialog(MdgaApp app, Node node, MdgaView view) {
|
||||
backButton.setPos(new Vector2f(0, 1.8f));
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Initializes and displays the volume controls and back button.
|
||||
*/
|
||||
@Override
|
||||
protected void onShow() {
|
||||
active = true;
|
||||
@@ -57,6 +72,9 @@ protected void onShow() {
|
||||
soundVolume.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Hides all volume controls and the back button.
|
||||
*/
|
||||
@Override
|
||||
protected void onHide() {
|
||||
active = false;
|
||||
@@ -68,6 +86,10 @@ protected void onHide() {
|
||||
soundVolume.hide();
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the application audio settings based on the current values of the sliders.
|
||||
* This method is called continuously while the dialog is active.
|
||||
*/
|
||||
public void update() {
|
||||
if(!active) {
|
||||
return;
|
||||
|
||||
@@ -10,17 +10,30 @@
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* The {@code CeremonyDialog} class displays a dialog containing statistical data in a tabular format.
|
||||
* It allows adding rows of statistics and manages their visibility when shown or hidden.
|
||||
*/
|
||||
public class CeremonyDialog extends Dialog {
|
||||
private ArrayList<ArrayList<LabelButton>> labels;
|
||||
|
||||
float offsetX;
|
||||
|
||||
/**
|
||||
* Constructs a {@code CeremonyDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
*/
|
||||
public CeremonyDialog(MdgaApp app, Node node) {
|
||||
super(app, node);
|
||||
|
||||
prepare();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Makes all label buttons in the table visible.
|
||||
*/
|
||||
@Override
|
||||
protected void onShow() {
|
||||
for (ArrayList<LabelButton> row : labels) {
|
||||
@@ -30,6 +43,9 @@ protected void onShow() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Hides all label buttons in the table.
|
||||
*/
|
||||
@Override
|
||||
protected void onHide() {
|
||||
for (ArrayList<LabelButton> row : labels) {
|
||||
@@ -39,6 +55,17 @@ protected void onHide() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a row of statistical data to the dialog.
|
||||
*
|
||||
* @param name The name of the player or category for the row.
|
||||
* @param v1 The value for the first column.
|
||||
* @param v2 The value for the second column.
|
||||
* @param v3 The value for the third column.
|
||||
* @param v4 The value for the fourth column.
|
||||
* @param v5 The value for the fifth column.
|
||||
* @param v6 The value for the sixth column.
|
||||
*/
|
||||
public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5, int v6) {
|
||||
float offsetYSmall = 0.5f;
|
||||
|
||||
@@ -76,6 +103,9 @@ public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5
|
||||
labels.add(row);
|
||||
}
|
||||
|
||||
/**
|
||||
* Prepares the initial layout of the dialog, including header labels.
|
||||
*/
|
||||
public void prepare() {
|
||||
offsetX = 0.5f;
|
||||
|
||||
|
||||
@@ -4,30 +4,53 @@
|
||||
import com.simsilica.lemur.Container;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
|
||||
/**
|
||||
* The {@code Dialog} class serves as an abstract base class for dialogs in the application.
|
||||
* It provides functionality for showing and hiding the dialog and defines abstract methods
|
||||
* for custom behavior when the dialog is shown or hidden.
|
||||
*/
|
||||
public abstract class Dialog {
|
||||
protected final MdgaApp app;
|
||||
protected final Node node = new Node();
|
||||
|
||||
private final Node root;
|
||||
|
||||
/**
|
||||
* Constructs a {@code Dialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node to which the dialog's node will be attached.
|
||||
*/
|
||||
Dialog(MdgaApp app, Node node) {
|
||||
this.app = app;
|
||||
this.root = node;
|
||||
}
|
||||
|
||||
/**
|
||||
* Shows the dialog by attaching its node to the root node and invoking the {@code onShow} method.
|
||||
*/
|
||||
public void show() {
|
||||
root.attachChild(node);
|
||||
|
||||
onShow();
|
||||
}
|
||||
|
||||
/**
|
||||
* Hides the dialog by detaching its node from the root node and invoking the {@code onHide} method.
|
||||
*/
|
||||
public void hide() {
|
||||
root.detachChild(node);
|
||||
|
||||
onHide();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Subclasses must implement this method to define custom behavior.
|
||||
*/
|
||||
protected abstract void onShow();
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Subclasses must implement this method to define custom behavior.
|
||||
*/
|
||||
protected abstract void onHide();
|
||||
}
|
||||
|
||||
@@ -12,6 +12,10 @@
|
||||
|
||||
import java.util.prefs.Preferences;
|
||||
|
||||
/**
|
||||
* The {@code HostDialog} class represents a dialog for hosting a network game session.
|
||||
* It allows users to input a port number, start hosting a server, and navigate back to the previous view.
|
||||
*/
|
||||
public class HostDialog extends NetworkDialog {
|
||||
private InputButton portInput;
|
||||
|
||||
@@ -22,6 +26,13 @@ public class HostDialog extends NetworkDialog {
|
||||
|
||||
private Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
|
||||
|
||||
/**
|
||||
* Constructs a {@code HostDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
* @param view The main view used for navigation and interaction with the dialog.
|
||||
*/
|
||||
public HostDialog(MdgaApp app, Node node, MainView view) {
|
||||
super(app, node, (NetworkSupport) app.getNetworkSupport());
|
||||
|
||||
@@ -39,6 +50,9 @@ public HostDialog(MdgaApp app, Node node, MainView view) {
|
||||
offset += 1.5f;
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Displays all input fields and buttons.
|
||||
*/
|
||||
@Override
|
||||
protected void onShow() {
|
||||
portInput.show();
|
||||
@@ -46,6 +60,9 @@ protected void onShow() {
|
||||
backButton.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Hides all input fields and buttons.
|
||||
*/
|
||||
@Override
|
||||
protected void onHide() {
|
||||
portInput.hide();
|
||||
@@ -53,27 +70,44 @@ protected void onHide() {
|
||||
backButton.hide();
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the state of the port input field.
|
||||
* This method is called periodically to synchronize the dialog state.
|
||||
*/
|
||||
public void update() {
|
||||
portInput.update();
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the currently entered port number, saves it to preferences, and sets it as the active port.
|
||||
*
|
||||
* @return The port number as a string.
|
||||
*/
|
||||
public String getPort() {
|
||||
prefs.put("hostPort", portInput.getString());
|
||||
setPortNumber(Integer.parseInt(portInput.getString()));
|
||||
return portInput.getString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Resets the port input field to its default value and updates preferences accordingly.
|
||||
*/
|
||||
public void resetPort() {
|
||||
portInput.reset();
|
||||
prefs.put("hostPort", "11111");
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the server to host a network game.
|
||||
*/
|
||||
public void hostServer() {
|
||||
startServer();
|
||||
}
|
||||
|
||||
/**
|
||||
* Connects to the server as a client.
|
||||
*/
|
||||
public void connectServerAsClient() {
|
||||
connectServer();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,4 +1,84 @@
|
||||
package pp.mdga.client.dialog;
|
||||
|
||||
public class InterruptDialog {
|
||||
import com.jme3.math.Vector2f;
|
||||
import com.jme3.scene.Node;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.button.AbstractButton;
|
||||
import pp.mdga.client.button.ButtonRight;
|
||||
import pp.mdga.client.button.LabelButton;
|
||||
import pp.mdga.client.button.MenuButton;
|
||||
import pp.mdga.client.view.MdgaView;
|
||||
import pp.mdga.game.Color;
|
||||
|
||||
/**
|
||||
* The {@code InterruptDialog} class represents a dialog that interrupts the game flow,
|
||||
* providing a message and the option to force an action if the user is a host.
|
||||
*/
|
||||
public class InterruptDialog extends Dialog {
|
||||
private ButtonRight forceButton;
|
||||
|
||||
private LabelButton label;
|
||||
|
||||
private String text = "";
|
||||
|
||||
/**
|
||||
* Constructs an {@code InterruptDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
*/
|
||||
public InterruptDialog(MdgaApp app, Node node) {
|
||||
super(app, node);
|
||||
|
||||
forceButton = new ButtonRight(app, node, () -> app.getModelSynchronize().force(), "Erzwingen", 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Displays the label and optionally the force button if the user is the host.
|
||||
*/
|
||||
|
||||
@Override
|
||||
protected void onShow() {
|
||||
if(app.getGameLogic().isHost()) {
|
||||
forceButton.show();
|
||||
}
|
||||
|
||||
label = new LabelButton(app, node, "Warte auf " + text + "...", new Vector2f(5.5f * 1.5f, 2), new Vector2f(0.5f, 0f), false);
|
||||
|
||||
float offset = 2.8f;
|
||||
label.setPos(new Vector2f(0, MenuButton.VERTICAL - offset));
|
||||
|
||||
label.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Hides the label and the force button.
|
||||
*/
|
||||
@Override
|
||||
protected void onHide() {
|
||||
forceButton.hide();
|
||||
label.hide();
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the displayed text based on the specified color.
|
||||
*
|
||||
* @param color The color used to determine the text (e.g., "Luftwaffe" for AIRFORCE).
|
||||
*/
|
||||
public void setColor(Color color) {
|
||||
switch (color) {
|
||||
case AIRFORCE:
|
||||
text = "Luftwaffe";
|
||||
break;
|
||||
case ARMY:
|
||||
text = "Heer";
|
||||
break;
|
||||
case NAVY:
|
||||
text = "Marine";
|
||||
break;
|
||||
case CYBER:
|
||||
text = "CIR";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,10 @@
|
||||
|
||||
import java.util.prefs.Preferences;
|
||||
|
||||
/**
|
||||
* The {@code JoinDialog} class represents a dialog for joining a network game.
|
||||
* It allows users to input an IP address and port number, connect to a server, or navigate back to the previous view.
|
||||
*/
|
||||
public class JoinDialog extends NetworkDialog {
|
||||
private InputButton ipInput;
|
||||
private InputButton portInput;
|
||||
@@ -24,6 +28,13 @@ public class JoinDialog extends NetworkDialog {
|
||||
|
||||
private Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
|
||||
|
||||
/**
|
||||
* Constructs a {@code JoinDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
* @param view The main view used for navigation and interaction with the dialog.
|
||||
*/
|
||||
public JoinDialog(MdgaApp app, Node node, MainView view) {
|
||||
super(app, node, (NetworkSupport) app.getNetworkSupport());
|
||||
|
||||
@@ -46,6 +57,9 @@ public JoinDialog(MdgaApp app, Node node, MainView view) {
|
||||
offset += 1.5f;
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Displays all input fields and buttons.
|
||||
*/
|
||||
@Override
|
||||
protected void onShow() {
|
||||
ipInput.show();
|
||||
@@ -54,6 +68,9 @@ protected void onShow() {
|
||||
backButton.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Hides all input fields and buttons.
|
||||
*/
|
||||
@Override
|
||||
protected void onHide() {
|
||||
ipInput.hide();
|
||||
@@ -62,34 +79,70 @@ protected void onHide() {
|
||||
backButton.hide();
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the state of the input fields. This method is called periodically to synchronize the dialog state.
|
||||
*/
|
||||
public void update() {
|
||||
ipInput.update();
|
||||
portInput.update();
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the currently entered IP address, saves it to preferences, and sets it as the hostname.
|
||||
*
|
||||
* @return The IP address as a string.
|
||||
*/
|
||||
public String getIpt() {
|
||||
prefs.put("joinIp", ipInput.getString());
|
||||
setHostname(ipInput.getString());
|
||||
return ipInput.getString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Resets the IP input field to its default value and updates preferences accordingly.
|
||||
*/
|
||||
public void resetIp() {
|
||||
ipInput.reset();
|
||||
prefs.put("joinIp", "");
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the currently entered port number, saves it to preferences, and sets it as the active port.
|
||||
*
|
||||
* @return The port number as a string.
|
||||
*/
|
||||
public String getPort() {
|
||||
prefs.put("joinPort", portInput.getString());
|
||||
setPortNumber(Integer.parseInt(portInput.getString()));
|
||||
return portInput.getString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Resets the port input field to its default value and updates preferences accordingly.
|
||||
*/
|
||||
public void resetPort() {
|
||||
portInput.reset();
|
||||
prefs.put("joinPort", "11111");
|
||||
}
|
||||
|
||||
/**
|
||||
* Connects to the server using the current IP address and port number.
|
||||
*/
|
||||
public void connectToServer() {
|
||||
connectServer();
|
||||
}
|
||||
|
||||
/**
|
||||
* Disconnects from the server if a network connection exists.
|
||||
*/
|
||||
public void disconnect() {
|
||||
NetworkSupport network = getNetwork();
|
||||
if (network != null) {
|
||||
try {
|
||||
network.disconnect();
|
||||
} catch (Exception e) {
|
||||
System.err.println("Error while disconnecting: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,27 +8,55 @@
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.Future;
|
||||
|
||||
/**
|
||||
* The {@code NetworkDialog} class serves as an abstract base class for dialogs
|
||||
* that involve network-related functionalities, such as connecting to a server or hosting a game.
|
||||
* It provides methods for initializing, connecting to, and managing a network server.
|
||||
*/
|
||||
public abstract class NetworkDialog extends Dialog {
|
||||
|
||||
private NetworkSupport network;
|
||||
private String hostname;
|
||||
private int portNumber;
|
||||
private Future<Object> connectionFuture;
|
||||
private MdgaServer serverInstance;
|
||||
private Thread serverThread;
|
||||
|
||||
/**
|
||||
* Constructs a {@code NetworkDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
* @param network The network support instance for managing network interactions.
|
||||
*/
|
||||
public NetworkDialog(MdgaApp app, Node node, NetworkSupport network) {
|
||||
super(app, node);
|
||||
this.network = network;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the hostname for the network connection.
|
||||
*
|
||||
* @param hostname The hostname or IP address of the server.
|
||||
*/
|
||||
public void setHostname(String hostname) {
|
||||
this.hostname = hostname;
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the port number for the network connection.
|
||||
*
|
||||
* @param portNumber The port number to use for the connection.
|
||||
*/
|
||||
public void setPortNumber(int portNumber) {
|
||||
this.portNumber = portNumber;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Initializes the network connection using the current hostname and port number.
|
||||
*
|
||||
* @return {@code null} if successful, otherwise throws an exception.
|
||||
*/
|
||||
protected Object initNetwork() {
|
||||
try {
|
||||
this.network.initNetwork(this.hostname, this.portNumber);
|
||||
@@ -38,41 +66,84 @@ protected Object initNetwork() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts the process of connecting to a server asynchronously.
|
||||
*/
|
||||
protected void connectServer() {
|
||||
|
||||
try {
|
||||
connectionFuture = this.network.getApp().getExecutor().submit(this::initNetwork);
|
||||
} catch (NumberFormatException var2) {
|
||||
throw new NumberFormatException("Port must be a number");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Starts hosting a server in a separate thread.
|
||||
*/
|
||||
protected void startServer() {
|
||||
(new Thread(() -> {
|
||||
serverThread = new Thread(() -> {
|
||||
try {
|
||||
MdgaServer mdgaServer = new MdgaServer(portNumber);
|
||||
mdgaServer.run();
|
||||
serverInstance = new MdgaServer(portNumber);
|
||||
serverInstance.run();
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
})).start();
|
||||
serverThread.start();
|
||||
}
|
||||
|
||||
/**
|
||||
* Shuts down the hosted server and cleans up resources.
|
||||
*/
|
||||
public void shutdownServer() {
|
||||
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
System.err.println("Thread was interrupted: " + e.getMessage());
|
||||
}
|
||||
|
||||
if (serverInstance != null) {
|
||||
serverInstance.shutdown();
|
||||
serverInstance = null;
|
||||
}
|
||||
|
||||
if (serverThread != null && serverThread.isAlive()) {
|
||||
serverThread.interrupt();
|
||||
try {
|
||||
serverThread.join();
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
serverThread = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the state of the connection process.
|
||||
*
|
||||
* @param delta The time elapsed since the last update call.
|
||||
*/
|
||||
public void update(float delta) {
|
||||
if (this.connectionFuture != null && this.connectionFuture.isDone()) {
|
||||
try {
|
||||
this.connectionFuture.get();
|
||||
} catch (ExecutionException ignored) {
|
||||
// todo: implement
|
||||
// TODO: implement
|
||||
} catch (InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public NetworkSupport getNetwork(){
|
||||
/**
|
||||
* Retrieves the {@code NetworkSupport} instance associated with this dialog.
|
||||
*
|
||||
* @return The {@code NetworkSupport} instance.
|
||||
*/
|
||||
public NetworkSupport getNetwork() {
|
||||
return network;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,10 @@
|
||||
import pp.mdga.client.view.MainView;
|
||||
import pp.mdga.client.view.MdgaView;
|
||||
|
||||
/**
|
||||
* The {@code SettingsDialog} class represents a dialog for navigating to various settings sections,
|
||||
* such as video and audio settings, or returning to the previous view.
|
||||
*/
|
||||
public class SettingsDialog extends Dialog {
|
||||
private MenuButton videoButton;
|
||||
private MenuButton audioButton;
|
||||
@@ -15,6 +19,13 @@ public class SettingsDialog extends Dialog {
|
||||
|
||||
private final MdgaView view;
|
||||
|
||||
/**
|
||||
* Constructs a {@code SettingsDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
* @param view The view managing navigation and interaction with the settings dialog.
|
||||
*/
|
||||
public SettingsDialog(MdgaApp app, Node node, MdgaView view) {
|
||||
super(app, node);
|
||||
|
||||
@@ -34,6 +45,9 @@ public SettingsDialog(MdgaApp app, Node node, MdgaView view) {
|
||||
backButton.setPos(new Vector2f(0, 1.8f));
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Displays all buttons for video settings, audio settings, and back navigation.
|
||||
*/
|
||||
@Override
|
||||
protected void onShow() {
|
||||
videoButton.show();
|
||||
@@ -41,6 +55,9 @@ protected void onShow() {
|
||||
backButton.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Hides all buttons for video settings, audio settings, and back navigation.
|
||||
*/
|
||||
@Override
|
||||
protected void onHide() {
|
||||
videoButton.hide();
|
||||
|
||||
@@ -14,6 +14,10 @@
|
||||
import java.util.Random;
|
||||
import java.util.random.RandomGenerator;
|
||||
|
||||
/**
|
||||
* The {@code StartDialog} class represents the initial dialog in the application,
|
||||
* allowing the user to input their name, host or join a game, or exit the application.
|
||||
*/
|
||||
public class StartDialog extends Dialog {
|
||||
private InputButton nameInput;
|
||||
|
||||
@@ -23,6 +27,13 @@ public class StartDialog extends Dialog {
|
||||
|
||||
private final MainView view;
|
||||
|
||||
/**
|
||||
* Constructs a {@code StartDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
* @param view The main view used for navigation and interaction with the dialog.
|
||||
*/
|
||||
public StartDialog(MdgaApp app, Node node, MainView view) {
|
||||
super(app, node);
|
||||
|
||||
@@ -48,6 +59,9 @@ public StartDialog(MdgaApp app, Node node, MainView view) {
|
||||
endButton.setPos(new Vector2f(0, 1.8f));
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Displays the name input field and all buttons.
|
||||
*/
|
||||
@Override
|
||||
protected void onShow() {
|
||||
nameInput.show();
|
||||
@@ -57,6 +71,9 @@ protected void onShow() {
|
||||
endButton.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Hides the name input field and all buttons.
|
||||
*/
|
||||
@Override
|
||||
protected void onHide ()
|
||||
{
|
||||
@@ -67,10 +84,18 @@ protected void onHide ()
|
||||
endButton.hide();
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the state of the name input field. This method is called periodically to synchronize the dialog state.
|
||||
*/
|
||||
public void update() {
|
||||
nameInput.update();
|
||||
}
|
||||
|
||||
/**
|
||||
* Retrieves the name entered by the user. If no name is provided, a random name is generated.
|
||||
*
|
||||
* @return The user's name or a randomly generated name.
|
||||
*/
|
||||
public String getName() {
|
||||
String name = nameInput.getString();
|
||||
|
||||
@@ -177,6 +202,109 @@ public String getName() {
|
||||
"CarryPro",
|
||||
"ProBaiter",
|
||||
"GameWarden",
|
||||
"KartoffelKönig",
|
||||
"SaufenderWolf",
|
||||
"WurstGriller",
|
||||
"Flitzekacke",
|
||||
"BratwurstBub",
|
||||
"Hoppeldoppels",
|
||||
"BananenMensch",
|
||||
"KlopapierGuru",
|
||||
"SchnitzelKing",
|
||||
"NerdNomade",
|
||||
"Dönertänzer",
|
||||
"GlitzerGurke",
|
||||
"SchinkenShrek",
|
||||
"KäseKalle",
|
||||
"SchokoSchnecke",
|
||||
"KeksKämpfer",
|
||||
"QuarkPiraten",
|
||||
"Müslimonster",
|
||||
"KnuddelNase",
|
||||
"FantaFighter",
|
||||
"SchnapsSaurier",
|
||||
"Wackelpudding",
|
||||
"ZitronenZock",
|
||||
"FettWurst",
|
||||
"PlüschPanda",
|
||||
"Zuckerschnur",
|
||||
"FluffiKopf",
|
||||
"DonutDöner",
|
||||
"VollpfostenX",
|
||||
"Waschlappen",
|
||||
"Witzepumper",
|
||||
"ToastTraum",
|
||||
"FroschFighter",
|
||||
"KrümelTiger",
|
||||
"RegenWolke",
|
||||
"PuddingPower",
|
||||
"KoffeinKrieger",
|
||||
"SpeckSchlumpf",
|
||||
"SuperSuppe",
|
||||
"BierBärchen",
|
||||
"FischBär",
|
||||
"Flauschi",
|
||||
"Schokomonster",
|
||||
"ChaosKäse",
|
||||
"FlitzLappen",
|
||||
"WurstWombat",
|
||||
"KrümelMensch",
|
||||
"PuddingBär",
|
||||
"ZickZack",
|
||||
"Schwabel",
|
||||
"Fluffi",
|
||||
"RülpsFrosch",
|
||||
"PommesPapa",
|
||||
"QuarkBär",
|
||||
"KnusperKönig",
|
||||
"ToastBrot",
|
||||
"Ploppster",
|
||||
"Schleimschwein",
|
||||
"Äpfelchen",
|
||||
"Knallbonbon",
|
||||
"KaffeeKopf",
|
||||
"WackelWurst",
|
||||
"RennKeks",
|
||||
"BröselBub",
|
||||
"ZockerBrot",
|
||||
"BierWurm",
|
||||
"StinkFlummi",
|
||||
"SchlumpfKing",
|
||||
"PurzelBär",
|
||||
"FlinkFluff",
|
||||
"PloppPudel",
|
||||
"Schnorchel",
|
||||
"FliegenKopf",
|
||||
"PixelPommes",
|
||||
"SchwipsWürst",
|
||||
"WutzBär",
|
||||
"KnuddelKeks",
|
||||
"FantaFlumm",
|
||||
"ZockerKäse",
|
||||
"LachHäufchen",
|
||||
"GurkenGuru",
|
||||
"PonySchnitzel",
|
||||
"NudelNinja",
|
||||
"VulkanKeks",
|
||||
"WasserToast",
|
||||
"MenschSalat",
|
||||
"KampfKohl",
|
||||
"SockenZirkus",
|
||||
"SchwimmBärchen",
|
||||
"TanzenderPudel",
|
||||
"PizzamarktMensch",
|
||||
"ZahnarztZocker",
|
||||
"RollerRudi",
|
||||
"PupsPilot",
|
||||
"WitzigeZwiebel",
|
||||
"Pillenschlucker",
|
||||
"ZwiebelReiter",
|
||||
"HüpfenderKaktus",
|
||||
"AsteroidenAlf",
|
||||
"ChaosKarotte",
|
||||
"WolkenFurz",
|
||||
"Krümelmonster",
|
||||
"WackelBiene",
|
||||
};
|
||||
|
||||
Random random = new Random();
|
||||
|
||||
@@ -3,13 +3,25 @@
|
||||
import com.jme3.math.Vector2f;
|
||||
import com.jme3.scene.Node;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.button.AbstractButton;
|
||||
import pp.mdga.client.button.ButtonLeft;
|
||||
import pp.mdga.client.button.ButtonRight;
|
||||
import pp.mdga.client.button.MenuButton;
|
||||
import pp.mdga.client.view.MdgaView;
|
||||
|
||||
import java.util.prefs.Preferences;
|
||||
|
||||
/**
|
||||
* The {@code VideoSettingsDialog} class represents a dialog for configuring video settings,
|
||||
* such as resolution and fullscreen mode. It also provides an option to restart the application
|
||||
* when certain settings are changed.
|
||||
*/
|
||||
public class VideoSettingsDialog extends Dialog {
|
||||
private static Preferences prefs = Preferences.userNodeForPackage(JoinDialog.class);
|
||||
|
||||
private ButtonRight fullscreenButton;
|
||||
private MenuButton backButton;
|
||||
private ButtonRight restartButton;
|
||||
|
||||
private ButtonLeft hdButton9;
|
||||
private ButtonLeft fullHdButton9;
|
||||
@@ -22,6 +34,13 @@ public class VideoSettingsDialog extends Dialog {
|
||||
|
||||
private boolean active = false;
|
||||
|
||||
/**
|
||||
* Constructs a {@code VideoSettingsDialog}.
|
||||
*
|
||||
* @param app The main application managing the dialog.
|
||||
* @param node The root node for attaching UI elements.
|
||||
* @param view The view managing navigation and interaction with the video settings dialog.
|
||||
*/
|
||||
public VideoSettingsDialog(MdgaApp app, Node node, MdgaView view) {
|
||||
super(app, node);
|
||||
|
||||
@@ -29,20 +48,24 @@ public VideoSettingsDialog(MdgaApp app, Node node, MdgaView view) {
|
||||
|
||||
backButton = new MenuButton(app, node, view::leaveVideoSettings, "Zurück");
|
||||
|
||||
// MenuButton für verschiedene Auflösungen erstellen
|
||||
hdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(1280, 720, 1.0f), "hd 16:9", 10);
|
||||
fullHdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(1920, 1080, 2.25f), "full hd 16:9", 10);
|
||||
wqhdButton9 = new ButtonLeft(app, node, () -> app.updateResolution(2560, 1440, 4.0f), "wqhd 16:9", 10);
|
||||
restartButton = new ButtonRight(app, node, MdgaApp::restartApp, "Neustart", 1);
|
||||
|
||||
fullscreenButton = new ButtonRight(app, node, () -> updateResolution(0, 0, 0, true), "Vollbild", 1);
|
||||
|
||||
hdButton9 = new ButtonLeft(app, node, () -> updateResolution(1280, 720, 1.0f, false), "hd 16:9", 10);
|
||||
fullHdButton9 = new ButtonLeft(app, node, () -> updateResolution(1920, 1080, 2.25f, false), "full hd 16:9", 10);
|
||||
wqhdButton9 = new ButtonLeft(app, node, () -> updateResolution(2560, 1440, 4.0f, false), "wqhd 16:9", 10);
|
||||
|
||||
|
||||
hdButton10 = new ButtonRight(app, node, () -> app.updateResolution(1280, 800, 1.0f), "hd 16:10", 10);
|
||||
fullHdButton10 = new ButtonRight(app, node, () -> app.updateResolution(1920, 1200, 2.25f), "full hd 16:10", 10);
|
||||
wqhdButton10 = new ButtonRight(app, node, () -> app.updateResolution(2560, 1600, 4.0f), "wqhd 16:10", 10);
|
||||
hdButton10 = new ButtonRight(app, node, () -> updateResolution(1280, 800, 1.0f, false), "hd 16:10", 10);
|
||||
fullHdButton10 = new ButtonRight(app, node, () -> updateResolution(1920, 1200, 2.25f, false), "full hd 16:10", 10);
|
||||
wqhdButton10 = new ButtonRight(app, node, () -> updateResolution(2560, 1600, 4.0f, false), "wqhd 16:10", 10);
|
||||
|
||||
float offset = 2.8f;
|
||||
|
||||
hdButton9.setPos(new Vector2f(hdButton9.getPos().x, MenuButton.VERTICAL - offset));
|
||||
hdButton10.setPos(new Vector2f(hdButton10.getPos().x, MenuButton.VERTICAL - offset));
|
||||
fullscreenButton.setPos(new Vector2f(fullscreenButton.getPos().x, MenuButton.VERTICAL - offset));
|
||||
offset += 1.5f;
|
||||
|
||||
fullHdButton9.setPos(new Vector2f(fullHdButton9.getPos().x, MenuButton.VERTICAL - offset));
|
||||
@@ -56,6 +79,9 @@ public VideoSettingsDialog(MdgaApp app, Node node, MdgaView view) {
|
||||
backButton.setPos(new Vector2f(0, 1.8f));
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is shown. Displays all buttons and marks the dialog as active.
|
||||
*/
|
||||
@Override
|
||||
protected void onShow() {
|
||||
active = true;
|
||||
@@ -68,9 +94,13 @@ protected void onShow() {
|
||||
fullHdButton10.show();
|
||||
wqhdButton10.show();
|
||||
|
||||
fullscreenButton.show();
|
||||
backButton.show();
|
||||
}
|
||||
|
||||
/**
|
||||
* Called when the dialog is hidden. Hides all buttons and marks the dialog as inactive.
|
||||
*/
|
||||
@Override
|
||||
protected void onHide() {
|
||||
active = false;
|
||||
@@ -83,12 +113,33 @@ protected void onHide() {
|
||||
fullHdButton10.hide();
|
||||
wqhdButton10.hide();
|
||||
|
||||
fullscreenButton.hide();
|
||||
backButton.hide();
|
||||
restartButton.hide();
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the dialog's state. This method can be used for periodic updates while the dialog is active.
|
||||
*/
|
||||
public void update() {
|
||||
if(!active) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the resolution settings and optionally triggers the restart button if changes are detected.
|
||||
*
|
||||
* @param width The width of the resolution.
|
||||
* @param height The height of the resolution.
|
||||
* @param imageFactor The scaling factor for the resolution.
|
||||
* @param isFullscreen {@code true} if fullscreen mode is enabled, {@code false} otherwise.
|
||||
*/
|
||||
public void updateResolution(int width, int height, float imageFactor, boolean isFullscreen) {
|
||||
if(width != prefs.getInt("width", 1280) || height != prefs.getInt("height", 720) || isFullscreen != prefs.getBoolean("fullscreen", false)) {
|
||||
restartButton.show();
|
||||
}
|
||||
|
||||
app.updateResolution(width, height, imageFactor, isFullscreen);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,12 +10,25 @@
|
||||
import pp.mdga.client.animation.ZoomControl;
|
||||
import pp.mdga.game.Color;
|
||||
|
||||
/**
|
||||
* The {@code ActionTextHandler} class manages the display of animated and stylized text messages in the game's UI.
|
||||
* It supports dynamic text creation with spacing, color, and effects, such as dice rolls, player actions, and rankings.
|
||||
*/
|
||||
class ActionTextHandler {
|
||||
private Node root;
|
||||
private BitmapFont font;
|
||||
private AppSettings appSettings;
|
||||
private int ranking;
|
||||
|
||||
float paddingRanked = 100;
|
||||
|
||||
/**
|
||||
* Constructs an {@code ActionTextHandler}.
|
||||
*
|
||||
* @param guiNode The GUI node where the text messages will be displayed.
|
||||
* @param assetManager The asset manager used to load fonts and other assets.
|
||||
* @param appSettings The application settings for positioning and sizing.
|
||||
*/
|
||||
ActionTextHandler(Node guiNode, AssetManager assetManager, AppSettings appSettings){
|
||||
root = new Node("actionTextRoot");
|
||||
guiNode.attachChild(root);
|
||||
@@ -26,6 +39,16 @@ class ActionTextHandler {
|
||||
ranking = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a {@code Node} containing text with specified spacing, size, and colors for each segment of the text.
|
||||
*
|
||||
* @param textArr An array of strings representing the text to be displayed.
|
||||
* @param spacing The spacing between individual characters.
|
||||
* @param size The size of the text.
|
||||
* @param colorArr An array of {@code ColorRGBA} representing the color for each string in {@code textArr}.
|
||||
* @return A {@code Node} containing the styled text with spacing and color applied.
|
||||
* @throws RuntimeException if the lengths of {@code textArr} and {@code colorArr} do not match.
|
||||
*/
|
||||
private Node createTextWithSpacing(String[] textArr, float spacing, float size, ColorRGBA[] colorArr) {
|
||||
if(textArr.length != colorArr.length) throw new RuntimeException("text and color are not the same length");
|
||||
|
||||
@@ -52,18 +75,55 @@ private Node createTextWithSpacing(String[] textArr, float spacing, float size,
|
||||
return textNode;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a {@code Node} containing text with specified spacing, size, and a single color.
|
||||
*
|
||||
* @param text The text to be displayed.
|
||||
* @param spacing The spacing between individual characters.
|
||||
* @param size The size of the text.
|
||||
* @param color The color of the text.
|
||||
* @return A {@code Node} containing the styled text.
|
||||
*/
|
||||
private Node createTextWithSpacing(String text, float spacing, float size, ColorRGBA color) {
|
||||
return createTextWithSpacing(new String[]{text}, spacing, size, new ColorRGBA[]{color});
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates the center position of a rectangle given its width, height, and an origin position.
|
||||
*
|
||||
* @param width The width of the rectangle.
|
||||
* @param height The height of the rectangle.
|
||||
* @param pos The origin position of the rectangle.
|
||||
* @return A {@code Vector3f} representing the center position.
|
||||
*/
|
||||
private Vector3f center(float width, float height, Vector3f pos){
|
||||
return new Vector3f(pos.x+width/2, pos.y+height/2,0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates and positions a single-line text at the top of the screen with a specified vertical offset.
|
||||
*
|
||||
* @param name The text to be displayed.
|
||||
* @param spacing The spacing between individual characters.
|
||||
* @param size The size of the text.
|
||||
* @param color The color of the text.
|
||||
* @param top The vertical offset from the top of the screen.
|
||||
* @return A {@code Node} containing the styled text positioned at the top.
|
||||
*/
|
||||
private Node createTopText(String name, float spacing, float size, ColorRGBA color, float top){
|
||||
return createTopText(new String[]{name}, spacing, size, new ColorRGBA[]{color}, top);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates and positions multi-line text at the top of the screen with specified vertical offset, spacing, and colors.
|
||||
*
|
||||
* @param name An array of strings representing the text to be displayed.
|
||||
* @param spacing The spacing between individual characters.
|
||||
* @param size The size of the text.
|
||||
* @param color An array of {@code ColorRGBA} representing the color for each string in {@code name}.
|
||||
* @param top The vertical offset from the top of the screen.
|
||||
* @return A {@code Node} containing the styled text positioned at the top.
|
||||
*/
|
||||
private Node createTopText(String[] name, float spacing, float size, ColorRGBA color[], float top){
|
||||
Node text = createTextWithSpacing(name, spacing, size, color);
|
||||
text.setLocalTranslation(0, (appSettings.getHeight()/2f)*0.8f-top,0);
|
||||
@@ -71,18 +131,44 @@ private Node createTopText(String[] name, float spacing, float size, ColorRGBA c
|
||||
return text;
|
||||
}
|
||||
|
||||
/**
|
||||
* Calculates the center position of a rectangle with negative width offset.
|
||||
*
|
||||
* @param width The negative width of the rectangle.
|
||||
* @param height The height of the rectangle.
|
||||
* @param pos The origin position of the rectangle.
|
||||
* @return A {@code Vector3f} representing the center position.
|
||||
*/
|
||||
private Vector3f centerText(float width, float height, Vector3f pos){
|
||||
return center(-width, height, pos);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a message indicating the active player.
|
||||
*
|
||||
* @param name The name of the active player.
|
||||
* @param color The color representing the player's team.
|
||||
*/
|
||||
void activePlayer(String name, Color color){
|
||||
createTopText(new String[]{name," ist dran"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a message indicating that the current player is active.
|
||||
*
|
||||
* @param color The color representing the player's team.
|
||||
*/
|
||||
void ownActive(Color color){
|
||||
createTopText(new String[]{"Du"," bist dran"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a dice roll result for a player.
|
||||
*
|
||||
* @param diceNum The number rolled on the dice.
|
||||
* @param name The name of the player.
|
||||
* @param color The color representing the player's team.
|
||||
*/
|
||||
void diceNum(int diceNum, String name, Color color){
|
||||
createTopText(new String[]{name," würfelt:"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0);
|
||||
|
||||
@@ -90,38 +176,84 @@ void diceNum(int diceNum, String name, Color color){
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a dice roll result with a multiplier for a player.
|
||||
*
|
||||
* @param diceNum The number rolled on the dice.
|
||||
* @param mult The multiplier applied to the dice result.
|
||||
* @param name The name of the player.
|
||||
* @param color The color representing the player's team.
|
||||
*/
|
||||
void diceNumMult(int diceNum,int mult, String name, Color color){
|
||||
createTopText(new String[]{name," würfelt:"}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0);
|
||||
|
||||
createTopText(new String[]{String.valueOf(diceNum), " x" + mult + " = " + (diceNum*mult)}, 20, 100, new ColorRGBA[]{ColorRGBA.White,ColorRGBA.Red}, 100);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays the dice roll result for the current player.
|
||||
*
|
||||
* @param diceNum The number rolled on the dice.
|
||||
*/
|
||||
void ownDice(int diceNum){
|
||||
createTopText(String.valueOf(diceNum), 10, 100, ColorRGBA.White, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays the dice roll result with a multiplier for the current player.
|
||||
*
|
||||
* @param diceNum The number rolled on the dice.
|
||||
* @param mult The multiplier applied to the dice result.
|
||||
*/
|
||||
void ownDiceMult(int diceNum, int mult){
|
||||
createTopText(new String[]{String.valueOf(diceNum), " x" + mult + " = " + (diceNum*mult)}, 20, 100, new ColorRGBA[]{ColorRGBA.White,ColorRGBA.Red}, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a message indicating that a specified player received a bonus card.
|
||||
*
|
||||
* @param name The name of the player who received the bonus card.
|
||||
* @param color The color representing the player's team.
|
||||
*/
|
||||
void drawCard(String name, Color color){
|
||||
createTopText(new String[]{name," erhält eine Bonuskarte"}, 7,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a message indicating that the current player received a bonus card.
|
||||
*
|
||||
* @param color The color representing the player's team.
|
||||
*/
|
||||
void drawCardOwn(Color color){
|
||||
createTopText(new String[]{"Du"," erhälst eine Bonuskarte"}, 5,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a message indicating that a specified player has completed their turn or action.
|
||||
*
|
||||
* @param name The name of the player who finished.
|
||||
* @param color The color representing the player's team.
|
||||
*/
|
||||
void finishText(String name, Color color){
|
||||
createTopText(new String[]{name," ist fertig!"}, 7,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a message indicating that the current player has completed their turn or action.
|
||||
*
|
||||
* @param color The color representing the player's team.
|
||||
*/
|
||||
void finishTextOwn(Color color){
|
||||
createTopText(new String[]{"Du", " bist fertig!"}, 7,70, new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, 0).addControl(new ZoomControl());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Converts a player's team color to a corresponding {@code ColorRGBA}.
|
||||
*
|
||||
* @param color The player's team color.
|
||||
* @return The corresponding {@code ColorRGBA}.
|
||||
* @throws RuntimeException if the color is invalid.
|
||||
*/
|
||||
private ColorRGBA playerColorToColorRGBA(Color color){
|
||||
return switch (color){
|
||||
case ARMY -> ColorRGBA.Green;
|
||||
@@ -132,25 +264,41 @@ private ColorRGBA playerColorToColorRGBA(Color color){
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Hides all text messages displayed by the handler and resets the ranking counter.
|
||||
*/
|
||||
void hide(){
|
||||
ranking = 0;
|
||||
root.detachAllChildren();
|
||||
}
|
||||
|
||||
float paddingRanked = 100;
|
||||
|
||||
/**
|
||||
* Displays a ranked dice roll result for a specified player.
|
||||
*
|
||||
* @param name The name of the player.
|
||||
* @param color The color representing the player's team.
|
||||
* @param eye The dice roll result.
|
||||
*/
|
||||
void rollRankingResult(String name, Color color, int eye){
|
||||
createTopText(new String[]{name,": "+eye}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, paddingRanked*ranking);
|
||||
ranking++;
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a ranked dice roll result for the current player.
|
||||
*
|
||||
* @param color The color representing the player's team.
|
||||
* @param eye The dice roll result.
|
||||
*/
|
||||
void rollRankingResultOwn(Color color, int eye){
|
||||
createTopText(new String[]{"Du",": "+eye}, 10,90,new ColorRGBA[]{playerColorToColorRGBA(color),ColorRGBA.White}, paddingRanked*ranking);
|
||||
ranking++;
|
||||
}
|
||||
|
||||
/**
|
||||
* Displays a message prompting the player to roll the dice.
|
||||
*/
|
||||
void diceNow(){
|
||||
createTopText("Klicke zum Würfeln", 5, 80, ColorRGBA.White, 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ private Node createNum(){
|
||||
Material mat = new Material(getApp().getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
|
||||
mat.setColor("Color", ColorRGBA.Black);
|
||||
circle.setMaterial(mat);
|
||||
root.attachChild(circle);
|
||||
// root.attachChild(circle);
|
||||
BitmapFont guiFont = getApp().getAssetManager().loadFont("Fonts/Gunplay.fnt");
|
||||
num = new BitmapText(guiFont);
|
||||
num.setSize(0.3f);
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.post.FilterPostProcessor;
|
||||
import com.jme3.post.filters.ComposeFilter;
|
||||
import com.jme3.post.filters.FXAAFilter;
|
||||
import com.jme3.renderer.Camera;
|
||||
import com.jme3.renderer.RenderManager;
|
||||
import com.jme3.renderer.ViewPort;
|
||||
@@ -31,35 +32,46 @@ public class CardLayer extends AbstractAppState {
|
||||
private List<Spatial> cardBuffer;
|
||||
private final FilterPostProcessor fpp;
|
||||
private final Camera overlayCam;
|
||||
Texture2D backTexture;
|
||||
private Texture2D backTexture;
|
||||
private FXAAFilter fxaaFilter;
|
||||
private ViewPort view;
|
||||
private DirectionalLightShadowFilter dlsf;
|
||||
DirectionalLight sun;
|
||||
ComposeFilter compose;
|
||||
|
||||
|
||||
public CardLayer(FilterPostProcessor fpp, Camera overlayCam, Texture2D backTexture) {
|
||||
this.overlayCam = overlayCam;
|
||||
this.fpp = fpp;
|
||||
this.cardBuffer = new ArrayList<>();
|
||||
init = false;
|
||||
this.backTexture = backTexture;
|
||||
cardBuffer = new ArrayList<>();
|
||||
init = false;
|
||||
fxaaFilter = new FXAAFilter();
|
||||
view = null;
|
||||
dlsf = null;
|
||||
|
||||
sun = new DirectionalLight();
|
||||
sun.setColor(ColorRGBA.White);
|
||||
sun.setDirection(new Vector3f(.5f, -.5f, -1));
|
||||
compose = new ComposeFilter(backTexture);
|
||||
root = new Node("Under gui viewport Root");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void initialize(AppStateManager stateManager, Application app) {
|
||||
this.app = app;
|
||||
root = new Node("Under gui viewport Root");
|
||||
|
||||
ViewPort view = app.getRenderManager().createMainView("Under gui ViewPort", overlayCam);
|
||||
view = app.getRenderManager().createMainView("Under gui ViewPort", overlayCam);
|
||||
view.setEnabled(true);
|
||||
view.setClearFlags(true, true, true);
|
||||
view.attachScene(root);
|
||||
fpp.setFrameBufferFormat(Image.Format.RGBA8);
|
||||
fpp.addFilter(new ComposeFilter(backTexture));
|
||||
fpp.addFilter(compose);
|
||||
fpp.addFilter(fxaaFilter);
|
||||
|
||||
|
||||
DirectionalLight sun = new DirectionalLight();
|
||||
sun.setColor(ColorRGBA.White);
|
||||
sun.setDirection(new Vector3f(.5f, -.5f, -1));
|
||||
root.addLight(sun);
|
||||
|
||||
DirectionalLightShadowFilter dlsf = new DirectionalLightShadowFilter(app.getAssetManager(), SHADOWMAP_SIZE, 3);
|
||||
dlsf = new DirectionalLightShadowFilter(app.getAssetManager(), SHADOWMAP_SIZE, 3);
|
||||
dlsf.setLight(sun);
|
||||
dlsf.setEnabled(true);
|
||||
dlsf.setEdgeFilteringMode(EdgeFilteringMode.PCFPOISSON);
|
||||
@@ -72,6 +84,15 @@ public void initialize(AppStateManager stateManager, Application app) {
|
||||
}
|
||||
|
||||
public void shutdown() {
|
||||
// view.clearProcessors();
|
||||
fpp.removeFilter(dlsf);
|
||||
dlsf = null;
|
||||
root.removeLight(sun);
|
||||
fpp.removeFilter(fxaaFilter);
|
||||
// fpp.removeFilter(compose);
|
||||
view.detachScene(root);
|
||||
// app.getRenderManager().removeMainView(view);
|
||||
|
||||
cardBuffer.clear();
|
||||
root.detachAllChildren();
|
||||
}
|
||||
@@ -94,7 +115,8 @@ public void update(float tpf) {
|
||||
}
|
||||
|
||||
public void addSpatial(Spatial card) {
|
||||
cardBuffer.add(card);
|
||||
if(root == null) cardBuffer.add(card);
|
||||
else root.attachChild(card);
|
||||
}
|
||||
|
||||
public void deleteSpatial(Spatial spatial) {
|
||||
|
||||
@@ -29,10 +29,12 @@ public class CardLayerHandler {
|
||||
private DiceControl diceControl;
|
||||
|
||||
private final Map<BonusCard, CardControl> bonusCardControlMap = new HashMap<>();
|
||||
private final List<BonusCard> cardOrder = new ArrayList<>();
|
||||
private final Map<BonusCard, Integer> bonusCardIntegerMap = new HashMap<>();
|
||||
private final Set<CardControl> selectableCards = new HashSet<>();
|
||||
|
||||
private BonusCard cardSelect = null;
|
||||
private boolean show = false;
|
||||
|
||||
public CardLayerHandler(MdgaApp app, Texture2D backTexture) {
|
||||
this.app = app;
|
||||
@@ -50,9 +52,10 @@ public void init() {
|
||||
}
|
||||
|
||||
public void shutdown() {
|
||||
clearSelectableCards();
|
||||
if (cardLayer != null) {
|
||||
cardLayer.shutdown();
|
||||
clearSelectableCards();
|
||||
app.getStateManager().detach(cardLayer);
|
||||
}
|
||||
cardLayer = null;
|
||||
}
|
||||
@@ -63,11 +66,14 @@ public void rollDice(int rollNum, Runnable actionAfter) {
|
||||
}
|
||||
|
||||
public void showDice() {
|
||||
if(show) return;
|
||||
show = true;
|
||||
cardLayer.addSpatial(diceControl.getSpatial());
|
||||
diceControl.spin();
|
||||
}
|
||||
|
||||
public void hideDice() {
|
||||
show = false;
|
||||
diceControl.hide();
|
||||
}
|
||||
|
||||
@@ -75,14 +81,25 @@ public void addCard(BonusCard card) {
|
||||
if (card == BonusCard.HIDDEN) throw new RuntimeException("Can't add hidden card to GUI");
|
||||
|
||||
if (!bonusCardControlMap.containsKey(card)) {
|
||||
CardControl control = createCard(bonusToAsset(card), nextPos());
|
||||
bonusCardControlMap.put(card, control);
|
||||
cardLayer.addSpatial(control.getRoot());
|
||||
cardOrder.add(card);
|
||||
}
|
||||
|
||||
int newNum = bonusCardIntegerMap.getOrDefault(card, 0) + 1;
|
||||
bonusCardIntegerMap.put(card, newNum);
|
||||
bonusCardControlMap.get(card).setNumCard(newNum);
|
||||
|
||||
updateCard();
|
||||
}
|
||||
|
||||
public void removeCard(BonusCard card){
|
||||
if(bonusCardControlMap.containsKey(card)){
|
||||
bonusCardIntegerMap.put(card, bonusCardIntegerMap.get(card) - 1);
|
||||
|
||||
if(bonusCardIntegerMap.get(card) <= 0){
|
||||
bonusCardIntegerMap.remove(card);
|
||||
cardOrder.remove(card);
|
||||
}
|
||||
updateCard();
|
||||
} else throw new RuntimeException("card is not in bonusCardControlMap");
|
||||
}
|
||||
|
||||
public void clearSelectableCards() {
|
||||
@@ -96,6 +113,22 @@ public void clearSelectableCards() {
|
||||
cardSelect = null;
|
||||
}
|
||||
|
||||
private void updateCard(){
|
||||
for(BonusCard card : bonusCardControlMap.keySet()){
|
||||
CardControl control = bonusCardControlMap.get(card);
|
||||
cardLayer.deleteSpatial(control.getRoot());
|
||||
}
|
||||
bonusCardControlMap.clear();
|
||||
|
||||
for(int i = 0; i < cardOrder.size(); i++){
|
||||
BonusCard card = cardOrder.get(i);
|
||||
CardControl control = createCard(bonusToAsset(card), nextPos(i));
|
||||
control.setNumCard(bonusCardIntegerMap.get(card));
|
||||
cardLayer.addSpatial(control.getRoot());
|
||||
bonusCardControlMap.put(card, control);
|
||||
}
|
||||
}
|
||||
|
||||
public void setSelectableCards(List<BonusCard> select) {
|
||||
for (BonusCard card : select) {
|
||||
selectableCards.add(bonusCardControlMap.get(card));
|
||||
@@ -118,6 +151,8 @@ public void selectCard(CardControl cardControl) {
|
||||
cardControl.select();
|
||||
cardSelect = getKeyByValue(bonusCardControlMap, cardControl);
|
||||
}
|
||||
|
||||
app.getModelSynchronize().selectCard(cardSelect);
|
||||
}
|
||||
|
||||
public Camera getCardLayerCamera() {
|
||||
@@ -151,8 +186,8 @@ private Asset bonusToAsset(BonusCard card) {
|
||||
};
|
||||
}
|
||||
|
||||
private Vector3f nextPos() {
|
||||
return START.add(MARGIN.mult(bonusCardControlMap.size()));
|
||||
private Vector3f nextPos(int i) {
|
||||
return START.add(MARGIN.mult(i));
|
||||
}
|
||||
|
||||
private Camera createOverlayCam() {
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
import com.jme3.scene.Spatial;
|
||||
import com.jme3.scene.control.AbstractControl;
|
||||
import pp.mdga.client.Asset;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -20,7 +21,7 @@
|
||||
public class DiceControl extends AbstractControl {
|
||||
private Quaternion targetRotation;
|
||||
private final Vector3f angularVelocity = new Vector3f();
|
||||
private float deceleration = 0.5f;
|
||||
private float deceleration = 1f;
|
||||
private float timeElapsed = 0.0f;
|
||||
private float rollDuration = 1f;
|
||||
private static final int ANGULAR_MIN = 5;
|
||||
@@ -39,23 +40,24 @@ public DiceControl(AssetManager assetManager){
|
||||
|
||||
@Override
|
||||
protected void controlUpdate(float tpf) {
|
||||
float clampedTpf = Math.min(tpf, 0.05f); // Max 50 ms per frame
|
||||
if (isRolling) {
|
||||
if(!slerp) {
|
||||
// Apply rotational velocity to the dice
|
||||
spinWithAngularVelocity(tpf);
|
||||
spinWithAngularVelocity(clampedTpf);
|
||||
|
||||
// Gradually reduce rotational velocity (simulate deceleration)
|
||||
angularVelocity.subtractLocal(
|
||||
angularVelocity.mult(deceleration * tpf)
|
||||
angularVelocity.mult(deceleration * clampedTpf)
|
||||
);
|
||||
|
||||
// Stop rolling when angular velocity is close to zero
|
||||
if (angularVelocity.lengthSquared() < 3f) {
|
||||
if (angularVelocity.lengthSquared() <= 3f || MdgaApp.DEBUG_MULTIPLIER == 0) {
|
||||
slerp = true;
|
||||
}
|
||||
}
|
||||
else {
|
||||
timeElapsed += tpf * rollDuration;
|
||||
timeElapsed += clampedTpf * rollDuration;
|
||||
|
||||
|
||||
if (timeElapsed > 1.0f) timeElapsed = 1.0f;
|
||||
@@ -64,14 +66,14 @@ protected void controlUpdate(float tpf) {
|
||||
spatial.setLocalRotation(interpolated);
|
||||
|
||||
// Stop rolling once duration is complete
|
||||
if (timeElapsed >= 1.0f) {
|
||||
if (timeElapsed >= 1.0f * MdgaApp.DEBUG_MULTIPLIER) {
|
||||
isRolling = false;
|
||||
slerp = false;
|
||||
actionAfter.run();
|
||||
}
|
||||
}
|
||||
}else if(spin){
|
||||
spinWithAngularVelocity(tpf);
|
||||
} else if(spin){
|
||||
spinWithAngularVelocity(clampedTpf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -95,6 +97,7 @@ public void rollDice(int diceNum, Runnable actionAfter) {
|
||||
if (isRolling) return;
|
||||
spin = false;
|
||||
slerp = false;
|
||||
timeElapsed = 0;
|
||||
this.actionAfter = actionAfter;
|
||||
angularVelocity.set(
|
||||
FastMath.nextRandomInt(ANGULAR_MIN,ANGULAR_MAX),
|
||||
|
||||
@@ -52,6 +52,7 @@ public void rollDice(int rollNum, int mult) {
|
||||
else actionTextHandler.ownDiceMult(rollNum, mult);
|
||||
hideDice();
|
||||
app.getModelSynchronize().animationEnd();
|
||||
app.getModelSynchronize().animationEnd();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -74,8 +75,31 @@ public void hideDice() {
|
||||
cardLayerHandler.hideDice();
|
||||
}
|
||||
|
||||
public void addCard(BonusCard card) {
|
||||
//add own handCard
|
||||
public void addCardOwn(BonusCard card) {
|
||||
cardLayerHandler.addCard(card);
|
||||
playerNameHandler.addCard(ownColor);
|
||||
actionTextHandler.drawCardOwn(ownColor);
|
||||
}
|
||||
|
||||
public void playCardOwn(BonusCard card){
|
||||
getEffectByCard(card);
|
||||
cardLayerHandler.removeCard(card);
|
||||
playerNameHandler.removeCard(ownColor);
|
||||
}
|
||||
|
||||
public void playCardEnemy(Color color, BonusCard card) {
|
||||
getEffectByCard(card);
|
||||
playerNameHandler.removeCard(color);
|
||||
}
|
||||
|
||||
private void getEffectByCard(BonusCard bonus){
|
||||
switch(bonus){
|
||||
case SWAP -> swap();
|
||||
case TURBO -> turbo();
|
||||
case SHIELD -> shield();
|
||||
default -> throw new RuntimeException("invalid card");
|
||||
}
|
||||
}
|
||||
|
||||
public void clearSelectableCards() {
|
||||
@@ -125,9 +149,11 @@ public void hideText(){
|
||||
actionTextHandler.hide();
|
||||
}
|
||||
|
||||
//addCard Enemy (DrawCardNotification)
|
||||
public void drawCard(Color color) {
|
||||
if (ownColor == color) actionTextHandler.drawCardOwn(color);
|
||||
else actionTextHandler.drawCard(playerNameHandler.getName(color), color);
|
||||
//Color != ownColor
|
||||
actionTextHandler.drawCard(playerNameHandler.getName(color), color);
|
||||
playerNameHandler.addCard(color);
|
||||
}
|
||||
|
||||
public void finish(Color color){
|
||||
@@ -141,4 +167,6 @@ public void rollRankingResult(Color color, int eye){
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -4,23 +4,27 @@
|
||||
import com.jme3.font.BitmapFont;
|
||||
import com.jme3.font.BitmapText;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.Vector3f;
|
||||
import com.jme3.scene.Node;
|
||||
import com.jme3.scene.Spatial;
|
||||
import com.jme3.system.AppSettings;
|
||||
import com.jme3.ui.Picture;
|
||||
import pp.mdga.game.BonusCard;
|
||||
import pp.mdga.game.Color;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import java.util.Vector;
|
||||
|
||||
public class PlayerNameHandler {
|
||||
private final BitmapFont playerFont;
|
||||
private final Node playerNameNode;
|
||||
private final List<Color> playerOrder;
|
||||
private final Map<Color, String> colorNameMap;
|
||||
private final Map<Color, Integer> colorCardMap;
|
||||
|
||||
private final AppSettings appSettings;
|
||||
private final AssetManager assetManager;
|
||||
private Color ownColor;
|
||||
@@ -43,6 +47,7 @@ public PlayerNameHandler(Node guiNode, AssetManager assetManager, AppSettings ap
|
||||
playerNameNode = new Node("player name node");
|
||||
playerOrder = new ArrayList<>();
|
||||
colorNameMap = new HashMap<>();
|
||||
colorCardMap = new HashMap<>();
|
||||
this.appSettings = appSettings;
|
||||
this.assetManager = assetManager;
|
||||
}
|
||||
@@ -64,13 +69,38 @@ private void drawPlayers(){
|
||||
if(!colorNameMap.containsKey(color)) throw new RuntimeException(color + " isn't mapped to a name");
|
||||
|
||||
Node nameParent = new Node("nameParent");
|
||||
nameParent.attachChild(createName(colorNameMap.get(color), i == 0, color == ownColor));
|
||||
nameParent.attachChild(createColor(color));
|
||||
BitmapText name = createName(colorNameMap.get(color), i == 0, color == ownColor);
|
||||
nameParent.attachChild(name);
|
||||
if(colorCardMap.getOrDefault(color, 0) > 0){
|
||||
Picture pic = createHandCard(name.getLineWidth());
|
||||
nameParent.attachChild(pic);
|
||||
nameParent.attachChild(createCardNum(colorCardMap.get(color), pic.getWidth(), pic.getLocalTranslation().getX()));
|
||||
}
|
||||
nameParent.setLocalTranslation(50,appSettings.getWindowHeight()-PADDING_TOP- MARGIN_NAMES *i,0);
|
||||
playerNameNode.attachChild(nameParent);
|
||||
}
|
||||
}
|
||||
|
||||
private Spatial createCardNum(int num, float lastWidth, float lastX ) {
|
||||
BitmapText hudText = new BitmapText(playerFont);
|
||||
//renderedSize = 45
|
||||
hudText.setSize(TEXT_SIZE);
|
||||
hudText.setColor(NORMAL_COLOR);
|
||||
hudText.setText(String.valueOf(num));
|
||||
hudText.setLocalTranslation(lastX + lastWidth + 20,hudText.getHeight()/2, 0);
|
||||
return hudText;
|
||||
}
|
||||
|
||||
private Picture createHandCard(float width) {
|
||||
Picture pic = new Picture("HUD Picture");
|
||||
pic.setImage(assetManager, "./Images/handcard.png", true);
|
||||
pic.setWidth(IMAGE_SIZE);
|
||||
pic.setHeight(IMAGE_SIZE);
|
||||
pic.setPosition(-pic.getWidth()/2 + width + PADDING_LEFT * 2 ,-pic.getHeight()/2);
|
||||
return pic;
|
||||
}
|
||||
|
||||
private String imagePath(Color color){
|
||||
String root = "./Images/name_pictures/";
|
||||
return switch(color){
|
||||
@@ -93,12 +123,12 @@ private Spatial createColor(Color color) {
|
||||
|
||||
|
||||
|
||||
private Spatial createName(String name, boolean first, boolean own){
|
||||
private BitmapText createName(String name, boolean first, boolean own){
|
||||
BitmapText hudText = new BitmapText(playerFont);
|
||||
//renderedSize = 45
|
||||
hudText.setSize(TEXT_SIZE);
|
||||
hudText.setColor(first ? ACTIVE_COLOR : own ? OWN_COLOR : NORMAL_COLOR);
|
||||
hudText.setText(name);
|
||||
hudText.setText(own ? name + " (Du)" : name);
|
||||
hudText.setLocalTranslation(PADDING_LEFT,hudText.getHeight()/2, 0);
|
||||
return hudText;
|
||||
}
|
||||
@@ -111,10 +141,11 @@ public void addPlayer(Color color, String name, boolean own){
|
||||
}
|
||||
|
||||
public void setActivePlayer(Color color) {
|
||||
Color lastFirst = playerOrder.remove(0);
|
||||
if(playerOrder.get(0) == color) return;
|
||||
Color oldFirst = playerOrder.remove(0);
|
||||
playerOrder.remove(color);
|
||||
playerOrder.add(0, color);
|
||||
playerOrder.add(lastFirst);
|
||||
playerOrder.add(oldFirst);
|
||||
|
||||
drawPlayers();
|
||||
}
|
||||
@@ -124,5 +155,18 @@ public String getName(Color color){
|
||||
return colorNameMap.get(color);
|
||||
}
|
||||
|
||||
public void addCard(Color color){
|
||||
colorCardMap.put(color, colorCardMap.getOrDefault(color, 0) + 1);
|
||||
drawPlayers();
|
||||
}
|
||||
|
||||
public void removeCard(Color color){
|
||||
if(colorCardMap.containsKey(color)){
|
||||
colorCardMap.put(color, colorCardMap.getOrDefault(color, 0) - 1);
|
||||
if(colorCardMap.get(color) <= 0) colorCardMap.remove(color);
|
||||
}
|
||||
drawPlayers();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
import com.jme3.asset.AssetManager;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.post.FilterPostProcessor;
|
||||
import com.jme3.post.filters.FXAAFilter;
|
||||
import com.jme3.renderer.Camera;
|
||||
import com.jme3.renderer.RenderManager;
|
||||
import com.jme3.renderer.ViewPort;
|
||||
@@ -54,7 +55,6 @@ public void select(Spatial model, ColorRGBA color, int width) {
|
||||
}
|
||||
|
||||
private void hideOutlineFilterEffect(Spatial model) {
|
||||
// app.enqueue(() -> {
|
||||
outlineFilter.setEnabled(false);
|
||||
outlineFilter.getOutlinePreFilter().setEnabled(false);
|
||||
fpp.removeFilter(outlineFilter);
|
||||
@@ -62,18 +62,14 @@ private void hideOutlineFilterEffect(Spatial model) {
|
||||
outlineViewport.clearProcessors();
|
||||
renderManager.removePreView(outlineViewport);
|
||||
outlineViewport = null;
|
||||
// return null;
|
||||
// });
|
||||
}
|
||||
|
||||
private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color) {
|
||||
// app.enqueue(() -> {
|
||||
outlineViewport = renderManager.createPreView("outlineViewport", cam);
|
||||
FilterPostProcessor outlineFpp = new FilterPostProcessor(assetManager);
|
||||
|
||||
OutlinePreFilter outlinePreFilter = new OutlinePreFilter();
|
||||
outlineFpp.addFilter(outlinePreFilter);
|
||||
|
||||
outlineViewport.attachScene(model);
|
||||
outlineViewport.addProcessor(outlineFpp);
|
||||
|
||||
@@ -82,7 +78,5 @@ private void showOutlineFilterEffect(Spatial model, int width, ColorRGBA color)
|
||||
outlineFilter.setOutlineWidth(width);
|
||||
|
||||
fpp.addFilter(outlineFilter);
|
||||
// return null;
|
||||
// });
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,9 @@
|
||||
import com.jme3.network.*;
|
||||
import com.jme3.network.serializing.Serializer;
|
||||
import com.jme3.network.serializing.serializers.EnumSerializer;
|
||||
import pp.mdga.Resources;
|
||||
import pp.mdga.game.*;
|
||||
import pp.mdga.game.card.*;
|
||||
import pp.mdga.message.client.*;
|
||||
import pp.mdga.message.server.*;
|
||||
import pp.mdga.server.ServerGameLogic;
|
||||
@@ -106,6 +108,7 @@ private void initializeSerializables() {
|
||||
Serializer.registerClass(RequestPlayCardMessage.class);
|
||||
Serializer.registerClass(SelectCardMessage.class);
|
||||
Serializer.registerClass(SelectedPiecesMessage.class);
|
||||
Serializer.registerClass(SelectPieceMessage.class);
|
||||
Serializer.registerClass(SelectTSKMessage.class);
|
||||
Serializer.registerClass(ActivePlayerMessage.class);
|
||||
Serializer.registerClass(AnyPieceMessage.class);
|
||||
@@ -123,7 +126,7 @@ private void initializeSerializables() {
|
||||
Serializer.registerClass(NoTurnMessage.class);
|
||||
Serializer.registerClass(PauseGameMessage.class);
|
||||
Serializer.registerClass(PlayCardMessage.class);
|
||||
Serializer.registerClass(PossibleCardMessage.class);
|
||||
Serializer.registerClass(PossibleCardsMessage.class);
|
||||
Serializer.registerClass(PossiblePieceMessage.class);
|
||||
Serializer.registerClass(RankingResponseMessage.class);
|
||||
Serializer.registerClass(RankingRollAgainMessage.class);
|
||||
@@ -135,6 +138,8 @@ private void initializeSerializables() {
|
||||
Serializer.registerClass(UpdateReadyMessage.class);
|
||||
Serializer.registerClass(UpdateTSKMessage.class);
|
||||
Serializer.registerClass(WaitPieceMessage.class);
|
||||
Serializer.registerClass(IncorrectRequestMessage.class);
|
||||
Serializer.registerClass(SpectatorMessage.class);
|
||||
Serializer.registerClass(Player.class);
|
||||
Serializer.registerClass(Statistic.class);
|
||||
Serializer.registerClass(Board.class);
|
||||
@@ -142,10 +147,19 @@ private void initializeSerializables() {
|
||||
Serializer.registerClass(Piece.class);
|
||||
Serializer.registerClass(BonusNode.class);
|
||||
Serializer.registerClass(StartNode.class);
|
||||
Serializer.registerClass(PlayerData.class);
|
||||
Serializer.registerClass(HomeNode.class);
|
||||
Serializer.registerClass(PlayerDataMessage.class);
|
||||
Serializer.registerClass(StartBriefingMessage.class);
|
||||
Serializer.registerClass(PowerCard.class);
|
||||
Serializer.registerClass(TurboCard.class);
|
||||
Serializer.registerClass(SwapCard.class);
|
||||
Serializer.registerClass(ShieldCard.class);
|
||||
Serializer.registerClass(HiddenCard.class);
|
||||
Serializer.registerClass(ChoosePieceStateMessage.class);
|
||||
Serializer.registerClass(DrawCardMessage.class);
|
||||
|
||||
Serializer.registerClass(Color.class, new EnumSerializer());
|
||||
Serializer.registerClass(PieceState.class, new EnumSerializer());
|
||||
Serializer.registerClass(ShieldState.class, new EnumSerializer());
|
||||
Serializer.registerClass(BonusCard.class, new EnumSerializer());
|
||||
}
|
||||
|
||||
private void registerListeners() {
|
||||
@@ -194,16 +208,35 @@ public void messageReceived(HostedConnection source, Message message) {
|
||||
* @param message as the received message as a Message object.
|
||||
*/
|
||||
private void messageReceived(HostedConnection source, ClientMessage message) {
|
||||
LOGGER.log(Level.INFO, "message received from {0}: {1}", source.getId(), message); //NON-NLS
|
||||
System.out.println("server received from: " + source.getId() + " " + message.getClass().getName());
|
||||
pendingMessages.add(new ReceivedMessage(message, source.getId()));
|
||||
}
|
||||
|
||||
/**
|
||||
* This method will be used to handle all connections which are connected to the server.
|
||||
* It will check if the maximum number of connected clients are already reached. If yes it will send a
|
||||
* LobbyDenyMessage to the given hostedConnection parameter and close it, otherwise it will send a
|
||||
* LobbyAcceptMessage to the given hostedConnection parameter. In Addition, if the number of connected clients is
|
||||
* equal to 1 it will set the host of the game to the id of the given hostedConnection parameter.
|
||||
*
|
||||
* @param server as the server which is contains all connections as a Server object.
|
||||
* @param hostedConnection as the connection which is added to the server as a HostedConnection object.
|
||||
*/
|
||||
@Override
|
||||
public void connectionAdded(Server server, HostedConnection hostedConnection) {
|
||||
System.out.println("new connection " + hostedConnection); //NON-NLS
|
||||
LOGGER.log(Level.DEBUG, "new connection {0}", hostedConnection); //NON-NLS
|
||||
if (this.myServer.getConnections().size() == 1) {
|
||||
|
||||
if (this.myServer.getConnections().size() > Resources.MAX_PLAYERS) {
|
||||
this.logic.getServerSender().send(hostedConnection.getId(), new LobbyDenyMessage());
|
||||
hostedConnection.close("");
|
||||
} else {
|
||||
if (hostedConnection.getAddress().contains("127.0.0.1") && this.logic.getGame().getHost() == -1) {
|
||||
this.logic.getGame().setHost(hostedConnection.getId());
|
||||
this.logic.getServerSender().send(hostedConnection.getId(), new LobbyAcceptMessage(hostedConnection.getId()));
|
||||
} else {
|
||||
this.logic.getServerSender().send(hostedConnection.getId(), new LobbyAcceptMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -250,10 +283,11 @@ public void send(int id, ServerMessage message) {
|
||||
return;
|
||||
}
|
||||
final HostedConnection connection = myServer.getConnection(id);
|
||||
if (connection != null)
|
||||
if (connection != null){
|
||||
System.out.println("server sends to: " + id + " " + message.getClass().getName());
|
||||
connection.send(message);
|
||||
else
|
||||
LOGGER.log(Level.ERROR, "there is no connection with id={0}", id); //NON-NLS
|
||||
}
|
||||
else LOGGER.log(Level.ERROR, "there is no connection with id={0}", id); //NON-NLS
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -278,4 +312,21 @@ public void broadcast(ServerMessage message) {
|
||||
public void disconnectClient(int id) {
|
||||
this.myServer.getConnection(id).close("");
|
||||
}
|
||||
|
||||
/**
|
||||
* This method will be used to shut down the server.
|
||||
* It will iterate threw all connections of myServer attribute and check if they are equal to null. If not they will
|
||||
* be closed. After that the myServer attribute will be closed and this program will be exited with the exit code 0.
|
||||
*/
|
||||
@Override
|
||||
public void shutdown() {
|
||||
for (HostedConnection client : this.myServer.getConnections()) {
|
||||
if (client != null) {
|
||||
client.close("Host closed the server.");
|
||||
}
|
||||
}
|
||||
|
||||
this.myServer.close();
|
||||
this.exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,13 +14,22 @@ public <T> T readObject(ByteBuffer data, Class<T> c) throws IOException
|
||||
byte[] uuid = new byte[36];
|
||||
data.get(uuid);
|
||||
|
||||
if(uuid.equals(new UUID(1, 1))) {
|
||||
return null;
|
||||
} else {
|
||||
return (T) UUID.fromString(new String(uuid));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeObject(ByteBuffer buffer, Object object) throws IOException
|
||||
{
|
||||
UUID uuid = (UUID) object;
|
||||
|
||||
if(uuid != null) {
|
||||
buffer.put(uuid.toString().getBytes());
|
||||
} else {
|
||||
buffer.put(new UUID(1, 1).toString().getBytes());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -206,11 +206,19 @@ public void addCeremonyParticipant(Color color, int pos, String name) {
|
||||
ceremonyButtons.add(button);
|
||||
|
||||
if(state.equals(SubState.AWARD_CEREMONY)) {
|
||||
button.hide();
|
||||
button.show();
|
||||
}
|
||||
}
|
||||
|
||||
public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5, int v6) {
|
||||
ceremonyDialog.addStatisticsRow(name, v1, v2, v3, v4, v5, v6);
|
||||
|
||||
ceremonyDialog.hide();
|
||||
ceremonyDialog.show();
|
||||
}
|
||||
|
||||
public void afterGameCleanup() {
|
||||
ceremonyDialog.prepare();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,31 +1,16 @@
|
||||
package pp.mdga.client.view;
|
||||
|
||||
import com.jme3.post.FilterPostProcessor;
|
||||
import pp.mdga.client.MdgaState;
|
||||
import com.jme3.scene.Node;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
import pp.mdga.client.board.BoardHandler;
|
||||
import pp.mdga.client.board.CameraHandler;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.button.ButtonLeft;
|
||||
import pp.mdga.client.button.ButtonRight;
|
||||
import pp.mdga.client.dialog.InterruptDialog;
|
||||
import pp.mdga.client.gui.GuiHandler;
|
||||
import pp.mdga.game.BonusCard;
|
||||
import pp.mdga.game.Color;
|
||||
import pp.mdga.notification.AcquireCardNotification;
|
||||
import pp.mdga.notification.ActivePlayerNotification;
|
||||
import pp.mdga.notification.DiceNowNotification;
|
||||
import pp.mdga.notification.GameNotification;
|
||||
import pp.mdga.notification.MovePieceNotification;
|
||||
import pp.mdga.notification.PlayerInGameNotification;
|
||||
import pp.mdga.notification.RollDiceNotification;
|
||||
import pp.mdga.notification.SelectableCardsNotification;
|
||||
import pp.mdga.notification.SelectableMoveNotification;
|
||||
import pp.mdga.notification.SelectableSwapNotification;
|
||||
import pp.mdga.notification.ShieldActiveNotification;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
|
||||
public class GameView extends MdgaView {
|
||||
private BoardHandler boardHandler;
|
||||
@@ -33,30 +18,43 @@ public class GameView extends MdgaView {
|
||||
private GuiHandler guiHandler;
|
||||
|
||||
private ButtonLeft leaveButton;
|
||||
private ButtonRight confirmButton;
|
||||
public ButtonRight confirmButton;
|
||||
|
||||
private ButtonRight noPowerButton;
|
||||
|
||||
private Color ownColor = null;
|
||||
|
||||
private InterruptDialog interruptDialog;
|
||||
|
||||
private FilterPostProcessor fpp;
|
||||
|
||||
public boolean needConfirm = false;
|
||||
public boolean needNoPower = false;
|
||||
|
||||
private Node guiHandlerNode = new Node();
|
||||
|
||||
public GameView(MdgaApp app) {
|
||||
super(app);
|
||||
|
||||
leaveButton = new ButtonLeft(app, overlayNode, () -> app.getModelSynchronize().leave(), "Spiel verlassen", 1);
|
||||
leaveButton = new ButtonLeft(app, settingsNode, () -> app.getModelSynchronize().leave(), "Spiel verlassen", 1);
|
||||
|
||||
confirmButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Bestätigen", 1);
|
||||
|
||||
noPowerButton = new ButtonRight(app, guiNode, () -> app.getModelSynchronize().confirm(), "Verzichten", 1);
|
||||
|
||||
interruptDialog = new InterruptDialog(app, guiNode);
|
||||
|
||||
fpp = new FilterPostProcessor(app.getAssetManager());
|
||||
this.camera = new CameraHandler(app, fpp);
|
||||
this.boardHandler = new BoardHandler(app, rootNode, fpp);
|
||||
|
||||
guiHandler = new GuiHandler(app, guiNode);
|
||||
guiHandler = new GuiHandler(app, guiHandlerNode);
|
||||
|
||||
guiNode.attachChild(guiHandlerNode);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEnter() {
|
||||
setOwnColor(Color.AIRFORCE);
|
||||
camera.init(ownColor);
|
||||
boardHandler.init();
|
||||
guiHandler.init(ownColor);
|
||||
@@ -64,13 +62,6 @@ public void onEnter() {
|
||||
app.getViewPort().addProcessor(fpp);
|
||||
|
||||
app.getAcousticHandler().playSound(MdgaSound.START);
|
||||
|
||||
// guiHandler.addPlayer(Color.AIRFORCE, "Cedric");
|
||||
// guiHandler.addPlayer(Color.ARMY, "Ben");
|
||||
// guiHandler.addPlayer(Color.CYBER, "Felix");
|
||||
// guiHandler.addPlayer(Color.NAVY, "Daniel");
|
||||
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -81,6 +72,7 @@ public void onLeave() {
|
||||
|
||||
|
||||
confirmButton.hide();
|
||||
noPowerButton.hide();
|
||||
|
||||
app.getViewPort().removeProcessor(fpp);
|
||||
}
|
||||
@@ -125,10 +117,52 @@ public Color getOwnColor() {
|
||||
}
|
||||
|
||||
public void needConfirm() {
|
||||
noPowerButton.hide();
|
||||
confirmButton.show();
|
||||
|
||||
needConfirm = true;
|
||||
}
|
||||
|
||||
public void noConfirm() {
|
||||
confirmButton.hide();
|
||||
|
||||
needConfirm = false;
|
||||
}
|
||||
|
||||
public void showNoPower() {
|
||||
confirmButton.hide();
|
||||
noPowerButton.show();
|
||||
|
||||
needNoPower = true;
|
||||
}
|
||||
|
||||
public void hideNoPower() {
|
||||
noPowerButton.hide();
|
||||
needNoPower = false;
|
||||
}
|
||||
|
||||
public void enterInterrupt(Color color) {
|
||||
enterOverlay(Overlay.INTERRUPT);
|
||||
|
||||
guiNode.detachChild(guiHandlerNode);
|
||||
app.getGuiNode().attachChild(guiNode);
|
||||
|
||||
app.getInputSynchronize().setClickAllowed(false);
|
||||
|
||||
interruptDialog.setColor(color);
|
||||
interruptDialog.show();
|
||||
}
|
||||
|
||||
public void leaveInterrupt() {
|
||||
leaveOverlay(Overlay.INTERRUPT);
|
||||
|
||||
app.getGuiNode().detachChild(guiNode);
|
||||
guiNode.attachChild(guiHandlerNode);
|
||||
|
||||
app.getInputSynchronize().setClickAllowed(true);
|
||||
|
||||
app.getAcousticHandler().playSound(MdgaSound.START);
|
||||
|
||||
interruptDialog.hide();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
import pp.mdga.client.button.LobbyButton;
|
||||
import pp.mdga.client.button.SettingsButton;
|
||||
import pp.mdga.game.Color;
|
||||
import pp.mdga.message.client.StartGameMessage;
|
||||
import pp.mdga.notification.GameNotification;
|
||||
|
||||
public class LobbyView extends MdgaView {
|
||||
@@ -25,6 +26,7 @@ public class LobbyView extends MdgaView {
|
||||
|
||||
private ButtonLeft leaveButton;
|
||||
private ButtonRight readyButton;
|
||||
private ButtonRight startButton;
|
||||
|
||||
private LobbyButton cyberButton;
|
||||
private LobbyButton airforceButton;
|
||||
@@ -42,6 +44,7 @@ public LobbyView(MdgaApp app) {
|
||||
|
||||
leaveButton = new ButtonLeft(app, guiNode, this::leaveLobby, "Verlassen", 1);
|
||||
readyButton = new ButtonRight(app, guiNode, this::ready, "Bereit", 1);
|
||||
startButton = new ButtonRight(app, guiNode, () -> app.getGameLogic().selectStart(), "Starten", 7);
|
||||
|
||||
cyberButton = new LobbyButton(app, guiNode, rootNode, () -> toggleTsk(Color.CYBER), Color.CYBER);
|
||||
airforceButton = new LobbyButton(app, guiNode, rootNode, () -> toggleTsk(Color.AIRFORCE), Color.AIRFORCE);
|
||||
@@ -61,6 +64,10 @@ public void onEnter() {
|
||||
leaveButton.show();
|
||||
readyButton.show();
|
||||
|
||||
if(app.getGameLogic().isHost()) {
|
||||
startButton.show();
|
||||
}
|
||||
|
||||
cyberButton.show();
|
||||
airforceButton.show();
|
||||
armyButton.show();
|
||||
@@ -95,6 +102,7 @@ public void onEnter() {
|
||||
public void onLeave() {
|
||||
leaveButton.hide();
|
||||
readyButton.hide();
|
||||
startButton.hide();
|
||||
|
||||
airforceButton.hide();
|
||||
armyButton.hide();
|
||||
@@ -223,6 +231,10 @@ private void toggleTsk(Color color) {
|
||||
break;
|
||||
}
|
||||
|
||||
if(isReady) {
|
||||
setReady(own, false);
|
||||
}
|
||||
|
||||
switch (taken) {
|
||||
case NOT:
|
||||
app.getModelSynchronize().selectTsk(color);
|
||||
|
||||
@@ -7,9 +7,6 @@
|
||||
import pp.mdga.client.dialog.JoinDialog;
|
||||
import pp.mdga.client.dialog.StartDialog;
|
||||
|
||||
import java.net.Inet4Address;
|
||||
import java.net.UnknownHostException;
|
||||
|
||||
public class MainView extends MdgaView {
|
||||
private enum SubState {
|
||||
HOST,
|
||||
@@ -63,12 +60,12 @@ public void onUpdate(float tpf) {
|
||||
@Override
|
||||
protected void onEnterOverlay(Overlay overlay) {
|
||||
guiNode.detachChild(background);
|
||||
overlayNode.attachChild(background);
|
||||
settingsNode.attachChild(background);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onLeaveOverlay(Overlay overlay) {
|
||||
overlayNode.detachChild(background);
|
||||
settingsNode.detachChild(background);
|
||||
guiNode.attachChild(background);
|
||||
}
|
||||
|
||||
@@ -96,6 +93,7 @@ private void mainMenu() {
|
||||
private void tryHost() {
|
||||
int port = 0;
|
||||
String text = hostDialog.getPort();
|
||||
app.getGameLogic().selectHost("");
|
||||
|
||||
try {
|
||||
port = Integer.parseInt(text);
|
||||
@@ -108,10 +106,6 @@ private void tryHost() {
|
||||
} catch (InterruptedException ignored) {
|
||||
}
|
||||
hostDialog.connectServerAsClient();
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException ignored) {
|
||||
}
|
||||
app.getModelSynchronize().setHost(port);
|
||||
//app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
|
||||
return;
|
||||
@@ -127,6 +121,7 @@ private void tryJoin() {
|
||||
int port = 0;
|
||||
String ip = joinDialog.getIpt();
|
||||
String portText = joinDialog.getPort();
|
||||
app.getGameLogic().selectJoin("");
|
||||
|
||||
try {
|
||||
// Validate the port
|
||||
@@ -140,11 +135,6 @@ private void tryJoin() {
|
||||
app.getModelSynchronize().setName(startDialog.getName());
|
||||
joinDialog.setHostname(ip);
|
||||
joinDialog.connectToServer();
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException ignored) {
|
||||
}
|
||||
app.getModelSynchronize().setJoin(ip, port);
|
||||
return;
|
||||
}
|
||||
} catch (IllegalArgumentException e) {
|
||||
@@ -234,5 +224,13 @@ public void back() {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public JoinDialog getJoinDialog() {
|
||||
return joinDialog;
|
||||
}
|
||||
|
||||
public HostDialog getHostDialog() {
|
||||
return hostDialog;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2,9 +2,12 @@
|
||||
|
||||
import com.jme3.asset.TextureKey;
|
||||
import com.jme3.material.Material;
|
||||
import com.jme3.math.ColorRGBA;
|
||||
import com.jme3.math.Vector2f;
|
||||
import com.jme3.scene.Geometry;
|
||||
import com.jme3.scene.Node;
|
||||
import com.jme3.scene.shape.Quad;
|
||||
import com.jme3.system.NanoTimer;
|
||||
import com.jme3.texture.Texture;
|
||||
import pp.mdga.client.MdgaApp;
|
||||
import pp.mdga.client.acoustic.MdgaSound;
|
||||
@@ -22,7 +25,7 @@ public enum Overlay {
|
||||
protected MdgaApp app;
|
||||
protected Node rootNode = new Node("View Root");
|
||||
protected Node guiNode = new Node("View Root GUI");
|
||||
protected Node overlayNode = new Node("View Root Overlay");
|
||||
protected Node settingsNode = new Node("View Root Overlay");
|
||||
|
||||
private SettingsButton settingsButton;
|
||||
|
||||
@@ -30,15 +33,18 @@ public enum Overlay {
|
||||
private VideoSettingsDialog videoSettingsDialog;
|
||||
private AudioSettingsDialog audioSettingsDialog;
|
||||
|
||||
protected LabelButton infoLabel = null;
|
||||
protected NanoTimer infoTimer = new NanoTimer();
|
||||
|
||||
private int settingsDepth = 0;
|
||||
|
||||
public MdgaView(MdgaApp app) {
|
||||
this.app = app;
|
||||
settingsButton = new SettingsButton(app, guiNode, this::enterSettings);
|
||||
|
||||
settingsDialog = new SettingsDialog(app, overlayNode, this);
|
||||
videoSettingsDialog = new VideoSettingsDialog(app, overlayNode, this);
|
||||
audioSettingsDialog = new AudioSettingsDialog(app, overlayNode, this);
|
||||
settingsDialog = new SettingsDialog(app, settingsNode, this);
|
||||
videoSettingsDialog = new VideoSettingsDialog(app, settingsNode, this);
|
||||
audioSettingsDialog = new AudioSettingsDialog(app, settingsNode, this);
|
||||
}
|
||||
|
||||
public void enter() {
|
||||
@@ -53,7 +59,6 @@ public void enter() {
|
||||
public void leave() {
|
||||
onLeave();
|
||||
|
||||
|
||||
settingsButton.hide();
|
||||
|
||||
while (settingsDepth > 0) {
|
||||
@@ -80,6 +85,11 @@ public void update(float tpf) {
|
||||
videoSettingsDialog.update();
|
||||
audioSettingsDialog.update();
|
||||
|
||||
if (null != infoLabel && infoTimer.getTimeInSeconds() > 5) {
|
||||
infoLabel.hide();
|
||||
infoLabel = null;
|
||||
}
|
||||
|
||||
onUpdate(tpf);
|
||||
}
|
||||
|
||||
@@ -113,7 +123,7 @@ protected Geometry createBackground(String texturePath) {
|
||||
public void enterSettings() {
|
||||
enterOverlay(Overlay.SETTINGS);
|
||||
|
||||
app.getGuiNode().attachChild(overlayNode);
|
||||
app.getGuiNode().attachChild(settingsNode);
|
||||
|
||||
settingsDialog.show();
|
||||
|
||||
@@ -123,7 +133,7 @@ public void enterSettings() {
|
||||
public void leaveSettings() {
|
||||
leaveOverlay(Overlay.SETTINGS);
|
||||
|
||||
app.getGuiNode().detachChild(overlayNode);
|
||||
app.getGuiNode().detachChild(settingsNode);
|
||||
|
||||
settingsDialog.hide();
|
||||
|
||||
@@ -186,11 +196,37 @@ public void pressForward() {
|
||||
}
|
||||
|
||||
if (this instanceof GameView gameView) {
|
||||
if(gameView.needConfirm) {
|
||||
app.getModelSynchronize().confirm();
|
||||
} else if(gameView.needNoPower) {
|
||||
app.getModelSynchronize().confirm();
|
||||
} else {
|
||||
app.getAcousticHandler().playSound(MdgaSound.WRONG_INPUT);
|
||||
}
|
||||
}
|
||||
|
||||
if (this instanceof CeremonyView ceremonyView) {
|
||||
ceremonyView.forward();
|
||||
}
|
||||
}
|
||||
|
||||
public void showInfo(String error, boolean isError) {
|
||||
infoTimer.reset();
|
||||
|
||||
if(null != infoLabel) {
|
||||
infoLabel.hide();
|
||||
}
|
||||
|
||||
infoLabel = new LabelButton(app, guiNode, error, new Vector2f(5.5f, 2), new Vector2f(0.5f, AbstractButton.VERTICAL - 0.5f), false);
|
||||
|
||||
ColorRGBA color;
|
||||
|
||||
if(isError) {
|
||||
color = ColorRGBA.Red.clone();
|
||||
} else {
|
||||
color = ColorRGBA.Green.clone();
|
||||
}
|
||||
|
||||
infoLabel.setColor(ColorRGBA.Black, color);
|
||||
}
|
||||
}
|
||||
|
||||
|
Before Width: | Height: | Size: 216 KiB |
|
Before Width: | Height: | Size: 274 KiB |
BIN
Projekte/mdga/client/src/main/resources/Images/handcard.png
Normal file
|
After Width: | Height: | Size: 12 KiB |
|
After Width: | Height: | Size: 46 KiB |
BIN
Projekte/mdga/client/src/main/resources/Images/particle/line.png
Normal file
|
After Width: | Height: | Size: 140 B |
|
After Width: | Height: | Size: 6.2 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 18 KiB |
@@ -1,7 +1,7 @@
|
||||
world 0,0 90
|
||||
treesBigBackground 0,0 90
|
||||
treesSmallBackground 0,0 90
|
||||
|
||||
#tree_small 1,1 0
|
||||
#tree_big 0,0 0
|
||||
|
||||
#Marine Pos
|
||||
marine 4,-5 270
|
||||
@@ -58,7 +58,8 @@ big_tent -10,-9 130
|
||||
big_tent 9,-10 225
|
||||
radar 0,10 -20
|
||||
tank -1,-10 135
|
||||
tank 0,-18 180
|
||||
#tank 0,-18 180
|
||||
tank_shoot 0,-18 180
|
||||
tank 3,-18 180
|
||||
tank -3,-18 180
|
||||
|
||||
@@ -131,3 +132,145 @@ node_home_blue 4,0 0
|
||||
node_home_blue 3,0 0
|
||||
node_home_blue 2,0 0
|
||||
node_home_blue 1,0 0
|
||||
|
||||
# Randomly Distributed Trees within Radius 12 to 40
|
||||
|
||||
treeSmall 10,15 180
|
||||
treeBig -15,12 45
|
||||
treeSmall -8,-22 270
|
||||
treeBig 22,8 90
|
||||
treeSmall -18,-10 135
|
||||
treeBig 9,24 300
|
||||
treeSmall 17,-9 60
|
||||
treeBig -20,5 330
|
||||
treeSmall -14,18 200
|
||||
treeBig 25,-7 120
|
||||
treeBig -12,-18 150
|
||||
treeSmall 19,-16 45
|
||||
treeBig 7,10 90
|
||||
treeBig -19,-9 270
|
||||
treeSmall 21,4 110
|
||||
treeBig -11,17 300
|
||||
treeSmall 3,-21 360
|
||||
treeSmall -23,14 100
|
||||
treeBig 4,26 330
|
||||
treeSmall 12,13 270
|
||||
treeBig -18,8 45
|
||||
treeBig 11,-10 135
|
||||
treeSmall 16,5 180
|
||||
treeBig -13,-17 330
|
||||
treeSmall -2,14 270
|
||||
#treeBig 7,9 300
|
||||
treeSmall 23,-10 240
|
||||
treeBig -6,18 180
|
||||
treeSmall 5,27 270
|
||||
treeBig 14,-11 60
|
||||
treeSmall 9,-16 180
|
||||
treeBig -12,22 240
|
||||
treeBig 18,7 360
|
||||
treeSmall -24,-4 200
|
||||
treeBig -8,21 300
|
||||
treeSmall 12,-19 120
|
||||
treeBig 6,-12 180
|
||||
treeSmall -11,10 75
|
||||
treeBig 9,6 270
|
||||
treeSmall 8,-14 150
|
||||
treeBig 3,18 30
|
||||
treeSmall 17,13 100
|
||||
treeBig -9,20 90
|
||||
treeBig 6,-22 330
|
||||
treeSmall -20,7 45
|
||||
treeBig 21,11 150
|
||||
treeSmall 15,-18 270
|
||||
treeBig -3,-12 200
|
||||
treeBig 12,-28 330
|
||||
treeSmall -17,-7 120
|
||||
treeBig -10,9 300
|
||||
treeSmall 2,-14 240
|
||||
treeBig 24,2 360
|
||||
treeSmall 4,-13 300
|
||||
treeBig -19,20 90
|
||||
#treeSmall -11,5 45
|
||||
treeBig 15,9 180
|
||||
treeSmall -6,10 240
|
||||
treeBig 3,15 30
|
||||
treeSmall 9,-19 150
|
||||
treeBig -21,-4 330
|
||||
treeSmall 19,11 270
|
||||
treeSmall 12,24 110
|
||||
treeBig -13,15 45
|
||||
treeSmall 7,-15 240
|
||||
treeBig 26,-8 300
|
||||
treeSmall -16,14 120
|
||||
treeBig 14,18 360
|
||||
treeSmall 8,21 100
|
||||
treeBig -8,-18 240
|
||||
treeSmall 9,15 180
|
||||
treeBig 10,-20 270
|
||||
treeSmall 2,27 90
|
||||
treeBig 18,12 300
|
||||
treeSmall -10,-14 150
|
||||
treeBig -15,16 330
|
||||
treeSmall -9,19 45
|
||||
treeBig 17,-14 120
|
||||
treeSmall 5,-25 180
|
||||
treeBig 7,23 30
|
||||
treeSmall -14,-12 200
|
||||
treeBig 6,-16 300
|
||||
treeSmall -20,-8 100
|
||||
treeBig 4,11 240
|
||||
treeSmall 24,-15 90
|
||||
treeSmall -19,-19 360
|
||||
treeBig 20,8 45
|
||||
treeSmall 3,22 270
|
||||
treeBig 13,-9 180
|
||||
treeSmall -11,18 150
|
||||
treeBig -17,-4 300
|
||||
treeSmall 5,-14 240
|
||||
treeBig 9,17 330
|
||||
treeSmall 15,13 90
|
||||
treeBig -21,18 30
|
||||
treeSmall 6,20 100
|
||||
treeBig -16,22 180
|
||||
treeSmall -5,18 360
|
||||
treeBig 22,11 45
|
||||
treeSmall 10,-23 240
|
||||
treeBig -10,-16 300
|
||||
treeSmall -17,14 120
|
||||
treeBig 20,4 150
|
||||
treeSmall 11,-22 180
|
||||
treeBig -24,-11 200
|
||||
treeSmall 14,17 150
|
||||
treeBig -8,-12 300
|
||||
treeSmall 7,-18 100
|
||||
treeBig -5,16 330
|
||||
treeSmall 16,-14 200
|
||||
treeBig 18,-8 90
|
||||
treeSmall -23,-9 45
|
||||
treeBig 24,10 300
|
||||
treeSmall -4,19 180
|
||||
treeBig 12,-5 330
|
||||
treeSmall -19,16 100
|
||||
treeBig 14,20 150
|
||||
treeSmall 9,12 180
|
||||
treeBig -22,8 60
|
||||
treeSmall 6,18 360
|
||||
treeBig 25,-9 45
|
||||
treeBig -10,12 240
|
||||
treeSmall 19,-17 100
|
||||
treeSmall -13,19 90
|
||||
treeSmall 16,-12 120
|
||||
treeBig 22,-6 45
|
||||
treeSmall -18,15 200
|
||||
treeBig 14,-10 300
|
||||
treeBig 6,10 330
|
||||
treeSmall 17,18 90
|
||||
treeBig -20,4 180
|
||||
treeBig 19,-16 300
|
||||
treeSmall -15,9 270
|
||||
treeBig 12,22 360
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
// Samplers for textures
|
||||
uniform sampler2D m_Texture;
|
||||
uniform sampler2D m_OutlineDepthTexture;
|
||||
uniform sampler2D m_DepthTexture;
|
||||
|
||||
// Input texture coordinates from the vertex shader
|
||||
in vec2 texCoord;
|
||||
@@ -15,26 +14,25 @@ uniform float m_OutlineWidth;
|
||||
out vec4 fragColor;
|
||||
|
||||
void main() {
|
||||
// Sample depth textures
|
||||
// Sample depth textures at various offsets
|
||||
vec4 depth = texture(m_OutlineDepthTexture, texCoord);
|
||||
vec4 depth1 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth2 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth3 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(-m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth4 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(-m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth5 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(0.0, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth6 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(0.0, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth7 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(m_OutlineWidth, 0.0)) / m_Resolution);
|
||||
vec4 depth8 = texture(m_OutlineDepthTexture, ((texCoord * m_Resolution) + vec2(-m_OutlineWidth, 0.0)) / m_Resolution);
|
||||
vec4 depth1 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth2 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth3 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth4 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth5 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth6 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth7 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, 0.0)) / m_Resolution);
|
||||
vec4 depth8 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, 0.0)) / m_Resolution);
|
||||
|
||||
// Sample the main texture
|
||||
vec4 color = texture(m_Texture, texCoord);
|
||||
|
||||
// Determine whether to apply the outline color
|
||||
if (depth == vec4(0.0) &&
|
||||
// Check if an outline should be applied
|
||||
bool isEdge = (depth == vec4(0.0)) &&
|
||||
(depth1 != depth || depth2 != depth || depth3 != depth || depth4 != depth ||
|
||||
depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth)) {
|
||||
fragColor = m_OutlineColor; // Apply outline color
|
||||
} else {
|
||||
fragColor = color; // Use the original texture color
|
||||
}
|
||||
depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth);
|
||||
|
||||
// Output the final color
|
||||
fragColor = isEdge ? m_OutlineColor : color;
|
||||
}
|
||||
|
||||
@@ -1,11 +1,10 @@
|
||||
|
||||
// Use 'in' instead of 'varying' for inputs from the vertex shader
|
||||
// Input texture coordinates from the vertex shader
|
||||
in vec2 texCoord;
|
||||
|
||||
// Declare a custom output variable for the fragment color
|
||||
// Output variable for the fragment color
|
||||
out vec4 fragColor;
|
||||
|
||||
// Uniform samplers
|
||||
// Uniform samplers for textures
|
||||
uniform sampler2D m_Texture;
|
||||
uniform sampler2D m_NormalsTexture;
|
||||
uniform sampler2D m_DepthTexture;
|
||||
@@ -13,6 +12,7 @@ uniform sampler2D m_DepthTexture;
|
||||
void main() {
|
||||
// Sample the texture at the given texture coordinates
|
||||
vec4 color = texture(m_Texture, texCoord);
|
||||
|
||||
// Assign the color to the output variable
|
||||
fragColor = color;
|
||||
}
|
||||
|
||||
@@ -1,109 +1,78 @@
|
||||
// Uniform samplers
|
||||
uniform sampler2D m_Texture;
|
||||
uniform sampler2D m_OutlineDepthTexture;
|
||||
uniform sampler2D m_DepthTexture;
|
||||
varying vec2 texCoord;
|
||||
|
||||
// Input texture coordinates from the vertex shader
|
||||
in vec2 texCoord;
|
||||
|
||||
// Uniforms for resolution, outline color, and width
|
||||
uniform vec2 m_Resolution;
|
||||
uniform vec4 m_OutlineColor;
|
||||
uniform float m_OutlineWidth;
|
||||
|
||||
// Output variable for fragment color
|
||||
out vec4 fragColor;
|
||||
|
||||
void main() {
|
||||
vec4 depth = texture2D(m_OutlineDepthTexture, texCoord);
|
||||
vec4 depth1 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(m_OutlineWidth,m_OutlineWidth))/m_Resolution);
|
||||
vec4 depth2 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(m_OutlineWidth,-m_OutlineWidth))/m_Resolution);
|
||||
vec4 depth3 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-m_OutlineWidth,m_OutlineWidth))/m_Resolution);
|
||||
vec4 depth4 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-m_OutlineWidth,-m_OutlineWidth))/m_Resolution);
|
||||
vec4 depth5 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(0.,m_OutlineWidth))/m_Resolution);
|
||||
vec4 depth6 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(0.,-m_OutlineWidth))/m_Resolution);
|
||||
vec4 depth7 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(m_OutlineWidth,0.))/m_Resolution);
|
||||
vec4 depth8 = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-m_OutlineWidth,0.))/m_Resolution);
|
||||
vec4 color = texture2D(m_Texture, texCoord);
|
||||
//如果是背景
|
||||
float ratio=0.;
|
||||
if(depth==vec4(0.) && (depth1 != depth || depth2 != depth || depth3 != depth || depth4 != depth||depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth)){
|
||||
float dist=m_OutlineWidth;
|
||||
//距离边的像素
|
||||
vec4 depth = texture(m_OutlineDepthTexture, texCoord);
|
||||
vec4 depth1 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth2 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth3 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth4 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth5 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth6 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, -m_OutlineWidth)) / m_Resolution);
|
||||
vec4 depth7 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(m_OutlineWidth, 0.0)) / m_Resolution);
|
||||
vec4 depth8 = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-m_OutlineWidth, 0.0)) / m_Resolution);
|
||||
|
||||
vec4 color = texture(m_Texture, texCoord);
|
||||
|
||||
float ratio = 0.0;
|
||||
if (depth == vec4(0.0) &&
|
||||
(depth1 != depth || depth2 != depth || depth3 != depth || depth4 != depth ||
|
||||
depth5 != depth || depth6 != depth || depth7 != depth || depth8 != depth)) {
|
||||
float dist = m_OutlineWidth;
|
||||
vec4 nearDepth;
|
||||
if(depth1 != depth){
|
||||
for(float i=0.;i<m_OutlineWidth;i++){
|
||||
nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(i,i))/m_Resolution);
|
||||
if(nearDepth != depth){
|
||||
dist = i;
|
||||
break;
|
||||
|
||||
// Iterate to find the distance to the nearest edge
|
||||
for (float i = 0.0; i < m_OutlineWidth; i++) {
|
||||
if (depth1 != depth) {
|
||||
nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(i, i)) / m_Resolution);
|
||||
if (nearDepth != depth) { dist = i; break; }
|
||||
} else if (depth2 != depth) {
|
||||
nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(i, -i)) / m_Resolution);
|
||||
if (nearDepth != depth) { dist = i; break; }
|
||||
} else if (depth3 != depth) {
|
||||
nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-i, i)) / m_Resolution);
|
||||
if (nearDepth != depth) { dist = i; break; }
|
||||
} else if (depth4 != depth) {
|
||||
nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-i, -i)) / m_Resolution);
|
||||
if (nearDepth != depth) { dist = i; break; }
|
||||
} else if (depth5 != depth) {
|
||||
nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, i)) / m_Resolution);
|
||||
if (nearDepth != depth) { dist = i; break; }
|
||||
} else if (depth6 != depth) {
|
||||
nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(0.0, -i)) / m_Resolution);
|
||||
if (nearDepth != depth) { dist = i; break; }
|
||||
} else if (depth7 != depth) {
|
||||
nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(i, 0.0)) / m_Resolution);
|
||||
if (nearDepth != depth) { dist = i; break; }
|
||||
} else if (depth8 != depth) {
|
||||
nearDepth = texture(m_OutlineDepthTexture, (texCoord * m_Resolution + vec2(-i, 0.0)) / m_Resolution);
|
||||
if (nearDepth != depth) { dist = i; break; }
|
||||
}
|
||||
}
|
||||
}else
|
||||
if(depth2 != depth){
|
||||
for(float i=0.;i<m_OutlineWidth;i++){
|
||||
nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(i,-i))/m_Resolution);
|
||||
if(nearDepth != depth){
|
||||
dist = i;
|
||||
break;
|
||||
|
||||
// Calculate ratio for outline blending
|
||||
ratio = clamp(1.0 - dist / m_OutlineWidth, 0.0, 1.0);
|
||||
|
||||
// Blend the outline color with the base color
|
||||
fragColor = color * (1.0 - ratio) + m_OutlineColor * ratio;
|
||||
} else {
|
||||
// No outline, use the base texture color
|
||||
fragColor = color;
|
||||
}
|
||||
}
|
||||
}else
|
||||
if(depth3 != depth){
|
||||
for(float i=0.;i<m_OutlineWidth;i++){
|
||||
nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-i,i))/m_Resolution);
|
||||
if(nearDepth != depth){
|
||||
dist = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}else
|
||||
if(depth4 != depth){
|
||||
for(float i=0.;i<m_OutlineWidth;i++){
|
||||
nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-i,-i))/m_Resolution);
|
||||
if(nearDepth != depth){
|
||||
dist = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}else
|
||||
if(depth5 != depth){
|
||||
for(float i=0.;i<m_OutlineWidth;i++){
|
||||
nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(0.,i))/m_Resolution);
|
||||
if(nearDepth != depth){
|
||||
dist = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}else
|
||||
if(depth6 != depth){
|
||||
for(float i=0.;i<m_OutlineWidth;i++){
|
||||
nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(0.,-i))/m_Resolution);
|
||||
if(nearDepth != depth){
|
||||
dist = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}else
|
||||
if(depth7 != depth){
|
||||
for(float i=0.;i<m_OutlineWidth;i++){
|
||||
nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(i,0.))/m_Resolution);
|
||||
if(nearDepth != depth){
|
||||
dist = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}else
|
||||
if(depth8 != depth){
|
||||
for(float i=0.;i<m_OutlineWidth;i++){
|
||||
nearDepth = texture2D(m_OutlineDepthTexture, ((texCoord*m_Resolution)+vec2(-i,0.))/m_Resolution);
|
||||
if(nearDepth != depth){
|
||||
dist = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
//0:场景颜色 1:outline颜色
|
||||
ratio = clamp(1.- dist/m_OutlineWidth,0.,1.);
|
||||
//float off = (1.-ratio*ratio)*(1.-ratio*ratio);
|
||||
gl_FragColor = color*(1.-ratio) +m_OutlineColor*ratio;
|
||||
//gl_FragColor = m_OutlineColor;
|
||||
}else{
|
||||
gl_FragColor = color;
|
||||
}
|
||||
//debug
|
||||
//gl_FragColor = vec4(0.,(1.-ratio),0.,1.);
|
||||
|
||||
// Optional: Debugging outline visualization
|
||||
// fragColor = vec4(0.0, 1.0 - ratio, 0.0, 1.0);
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
// Use 'in' for vertex attributes
|
||||
// Vertex attributes
|
||||
in vec4 inPosition;
|
||||
in vec2 inTexCoord;
|
||||
|
||||
// Use 'out' for passing data to the fragment shader
|
||||
// Output to fragment shader
|
||||
out vec2 texCoord;
|
||||
|
||||
void main() {
|
||||
|
||||
3052
Projekte/mdga/client/src/main/resources/Models/missile/AVMT300.fbx
Normal file
@@ -0,0 +1,32 @@
|
||||
# Blender MTL File: 'untitled.blend'
|
||||
# Material Count: 3
|
||||
|
||||
newmtl Material.001
|
||||
Ns 96.078431
|
||||
Ka 0.000000 0.000000 0.000000
|
||||
Kd 0.640000 0.640000 0.640000
|
||||
Ks 0.500000 0.500000 0.500000
|
||||
Ni 1.000000
|
||||
d 1.000000
|
||||
illum 2
|
||||
map_Kd untiffftled.jpg
|
||||
|
||||
newmtl Material.002
|
||||
Ns 96.078431
|
||||
Ka 0.000000 0.000000 0.000000
|
||||
Kd 0.640000 0.640000 0.640000
|
||||
Ks 0.500000 0.500000 0.500000
|
||||
Ni 1.000000
|
||||
d 1.000000
|
||||
illum 2
|
||||
map_Kd untiffftled.jpg
|
||||
|
||||
newmtl Material.004
|
||||
Ns 96.078431
|
||||
Ka 0.000000 0.000000 0.000000
|
||||
Kd 0.640000 0.640000 0.640000
|
||||
Ks 0.500000 0.500000 0.500000
|
||||
Ni 1.000000
|
||||
d 1.000000
|
||||
illum 2
|
||||
map_Kd untiffftled.jpg
|
||||
2523
Projekte/mdga/client/src/main/resources/Models/missile/AVMT300.obj
Normal file
|
After Width: | Height: | Size: 42 KiB |
BIN
Projekte/mdga/client/src/main/resources/Models/shell/shell.j3o
Normal file
|
Before Width: | Height: | Size: 0 B After Width: | Height: | Size: 93 KiB |
|
Before Width: | Height: | Size: 0 B After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 10 MiB After Width: | Height: | Size: 13 MiB |
|
After Width: | Height: | Size: 10 MiB |