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

change shader folder structure

Browse Source
This commit is contained in:
Cedric Beck
2024-11-26 17:05:38 +01:00
parent d794ba9d03
commit c204a3a4cb
5 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java
View File

@@ -65,8 +65,6 @@ public void onAction(String name, boolean isPressed, float tpf) {
rightMousePressed = isPressed; rightMousePressed = isPressed;
} }
if(name.equals("Click") && isPressed) { if(name.equals("Click") && isPressed) {
//check Hover cardLayer
//check Hover board
if (app.getView() instanceof GameView gameView) { if (app.getView() instanceof GameView gameView) {
CardControl cardLayerSelect = checkHover(gameView.getGuiHandler().getCardLayerCamera(), gameView.getGuiHandler().getCardLayer().getRootNode(), CardControl.class); CardControl cardLayerSelect = checkHover(gameView.getGuiHandler().getCardLayerCamera(), gameView.getGuiHandler().getCardLayer().getRootNode(), CardControl.class);
OutlineControl boardSelect = checkHover(app.getCamera(), app.getRootNode(), OutlineControl.class); OutlineControl boardSelect = checkHover(app.getCamera(), app.getRootNode(), OutlineControl.class);

2
Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/OutlineProFilter.java
View File

@@ -23,7 +23,7 @@ public OutlineProFilter(OutlinePreFilter outlinePreFilter) {
@Override @Override
protected void initFilter(AssetManager assetManager, RenderManager renderManager, ViewPort vp, int w, int h) { protected void initFilter(AssetManager assetManager, RenderManager renderManager, ViewPort vp, int w, int h) {
MaterialDef matDef = (MaterialDef) assetManager.loadAsset("MatDefs/OutlinePro.j3md"); MaterialDef matDef = (MaterialDef) assetManager.loadAsset("MatDefs/SelectObjectOutliner/OutlinePro.j3md");
material = new Material(matDef); material = new Material(matDef);
material.setVector2("Resolution", new Vector2f(w, h)); material.setVector2("Resolution", new Vector2f(w, h));
material.setColor("OutlineColor", outlineColor); material.setColor("OutlineColor", outlineColor);

2
Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardControl.java
View File

@@ -12,7 +12,7 @@
public class CardControl extends OutlineControl { public class CardControl extends OutlineControl {
private static final ColorRGBA OUTLINE_COLOR = ColorRGBA.Yellow; private static final ColorRGBA OUTLINE_COLOR = ColorRGBA.Yellow;
private static final int OUTLINE_THICKNESS = 7; private static final int OUTLINE_THICKNESS = 9;
public CardControl(MdgaApp app, FilterPostProcessor fpp, Camera cam){ public CardControl(MdgaApp app, FilterPostProcessor fpp, Camera cam){
super(app, fpp, cam, OUTLINE_THICKNESS); super(app, fpp, cam, OUTLINE_THICKNESS);

0
Projekte/mdga/client/src/main/resources/MatDefs/OutlinePro.frag → Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.frag
View File

2
Projekte/mdga/client/src/main/resources/MatDefs/OutlinePro.j3md → Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.j3md
View File

@@ -13,7 +13,7 @@ MaterialDef Cartoon Edge {
Technique { Technique {
VertexShader GLSL100: MatDefs/SelectObjectOutliner/Post15.vert VertexShader GLSL100: MatDefs/SelectObjectOutliner/Post15.vert
FragmentShader GLSL100: MatDefs/OutlinePro.frag FragmentShader GLSL100: MatDefs/SelectObjectOutliner/OutlinePro.frag
WorldParameters { WorldParameters {
} }