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

Testmerge #5

Merged
j23f0712 merged 59 commits from development into dev/test 2024-11-17 15:20:54 +01:00
Conversation 4 Commits 59 Files Changed 119 +3 -5
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 499da6a7ad - Show all commits

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

@@ -14,7 +14,7 @@
public class MdgaApp extends SimpleApplication { public class MdgaApp extends SimpleApplication {
public static void main(String[] args) { public static void main(String[] args) {
ModelConverter app = new ModelConverter(); MdgaApp app = new MdgaApp();
AppSettings settings = new AppSettings(true); AppSettings settings = new AppSettings(true);
settings.setSamples(128); settings.setSamples(128);
settings.setCenterWindow(true); settings.setCenterWindow(true);
@@ -32,7 +32,6 @@ public void simpleInitApp() {
cam.setLocation(new Vector3f(zoom,0,zoom)); cam.setLocation(new Vector3f(zoom,0,zoom));
cam.lookAt(new Vector3f(0,0,0), new Vector3f(0,0,1)); cam.lookAt(new Vector3f(0,0,0), new Vector3f(0,0,1));
DirectionalLight sun = new DirectionalLight(); DirectionalLight sun = new DirectionalLight();
sun.setColor(ColorRGBA.White); sun.setColor(ColorRGBA.White);
sun.setDirection(new Vector3f(-1,0,-1)); sun.setDirection(new Vector3f(-1,0,-1));
@@ -41,7 +40,6 @@ public void simpleInitApp() {
ambient.setColor(new ColorRGBA(0.3f,0.3f,0.3f,1)); ambient.setColor(new ColorRGBA(0.3f,0.3f,0.3f,1));
rootNode.addLight(ambient); rootNode.addLight(ambient);
final int SHADOWMAP_SIZE=1024*8; final int SHADOWMAP_SIZE=1024*8;
DirectionalLightShadowRenderer dlsr = new DirectionalLightShadowRenderer(assetManager, SHADOWMAP_SIZE, 4); DirectionalLightShadowRenderer dlsr = new DirectionalLightShadowRenderer(assetManager, SHADOWMAP_SIZE, 4);
dlsr.setLight(sun); dlsr.setLight(sun);
@@ -89,4 +87,4 @@ public void simpleUpdate(float tpf) {
public void simpleRender(RenderManager rm) { public void simpleRender(RenderManager rm) {
//add render code here (if any) //add render code here (if any)
} }
} }

2
Projekte/settings.gradle
View File

@@ -7,7 +7,7 @@
dependencyResolutionManagement { dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
libs { libs {
version('jme', '3.6.1-stable') version('jme', '3.7.0-stable')
library('jme3-core', 'org.jmonkeyengine', 'jme3-core').versionRef('jme') library('jme3-core', 'org.jmonkeyengine', 'jme3-core').versionRef('jme')
library('jme3-desktop', 'org.jmonkeyengine', 'jme3-desktop').versionRef('jme') library('jme3-desktop', 'org.jmonkeyengine', 'jme3-desktop').versionRef('jme')