diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java index 38a25b0b..0a1a6629 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/InputSynchronizer.java @@ -65,8 +65,6 @@ public void onAction(String name, boolean isPressed, float tpf) { rightMousePressed = isPressed; } if(name.equals("Click") && isPressed) { - //check Hover cardLayer - //check Hover board if (app.getView() instanceof GameView gameView) { CardControl cardLayerSelect = checkHover(gameView.getGuiHandler().getCardLayerCamera(), gameView.getGuiHandler().getCardLayer().getRootNode(), CardControl.class); OutlineControl boardSelect = checkHover(app.getCamera(), app.getRootNode(), OutlineControl.class); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/OutlineProFilter.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/OutlineProFilter.java index 79b14835..76a4465f 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/OutlineProFilter.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/Outline/OutlineProFilter.java @@ -23,7 +23,7 @@ public OutlineProFilter(OutlinePreFilter outlinePreFilter) { @Override 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.setVector2("Resolution", new Vector2f(w, h)); material.setColor("OutlineColor", outlineColor); diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardControl.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardControl.java index 076da299..1568e2fd 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardControl.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/gui/CardControl.java @@ -12,7 +12,7 @@ public class CardControl extends OutlineControl { 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){ super(app, fpp, cam, OUTLINE_THICKNESS); diff --git a/Projekte/mdga/client/src/main/resources/MatDefs/OutlinePro.frag b/Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.frag similarity index 100% rename from Projekte/mdga/client/src/main/resources/MatDefs/OutlinePro.frag rename to Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.frag diff --git a/Projekte/mdga/client/src/main/resources/MatDefs/OutlinePro.j3md b/Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.j3md similarity index 83% rename from Projekte/mdga/client/src/main/resources/MatDefs/OutlinePro.j3md rename to Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.j3md index 9a4e00ba..7ead9c11 100644 --- a/Projekte/mdga/client/src/main/resources/MatDefs/OutlinePro.j3md +++ b/Projekte/mdga/client/src/main/resources/MatDefs/SelectObjectOutliner/OutlinePro.j3md @@ -13,7 +13,7 @@ MaterialDef Cartoon Edge { Technique { VertexShader GLSL100: MatDefs/SelectObjectOutliner/Post15.vert - FragmentShader GLSL100: MatDefs/OutlinePro.frag + FragmentShader GLSL100: MatDefs/SelectObjectOutliner/OutlinePro.frag WorldParameters { }