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

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +3 -3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 904aa17358 - Show all commits

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

@@ -76,13 +76,13 @@ public void start() {
* Spawns the jet model at the designated spawn point, applying material, scaling, and rotation. * Spawns the jet model at the designated spawn point, applying material, scaling, and rotation.
*/ */
private void spawnJet() { private void spawnJet() {
jetModel = app.getAssetManager().loadModel(Asset.jet.getModelPath()); jetModel = app.getAssetManager().loadModel(Asset.jet_noGear.getModelPath());
jetModel.setLocalTranslation(spawnPoint); jetModel.setLocalTranslation(spawnPoint);
jetModel.scale(Asset.jet.getSize()); jetModel.scale(Asset.jet_noGear.getSize());
jetModel.rotate(FastMath.HALF_PI, 0, 0); jetModel.rotate(FastMath.HALF_PI, 0, 0);
jetModel.setShadowMode(RenderQueue.ShadowMode.CastAndReceive); jetModel.setShadowMode(RenderQueue.ShadowMode.CastAndReceive);
Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md"); Material mat = new Material(app.getAssetManager(), "Common/MatDefs/Light/Lighting.j3md");
mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(Asset.jet.getDiffPath())); mat.setTexture("DiffuseMap", app.getAssetManager().loadTexture(Asset.jet_noGear.getDiffPath()));
jetModel.setMaterial(mat); jetModel.setMaterial(mat);
rootNode.attachChild(jetModel); rootNode.attachChild(jetModel);