From f0eb83909fe86d378bd707e0f688e707289c229a Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 3 Oct 2022 23:44:49 +0200 Subject: [PATCH] [DEV] remove dependency with scenarium --- .../mapFactory/data/ToolMapHeight.xml | 25 ++++++---- .../atriasoft/ege/mapFactory/Ground.java | 4 +- .../sample/atriasoft/ege/mapFactory/Log.java | 4 +- .../atriasoft/ege/mapFactory/MainWindows.java | 24 +++------ .../mapFactory/tools/MapToolInterface.java | 3 ++ .../ege/mapFactory/tools/ToolMapHeight.java | 50 +++++++++++++++++++ src/org/atriasoft/eagle/internal/Log.java | 4 +- src/org/atriasoft/ege/internal/Log.java | 4 +- src/org/atriasoft/garoux/internal/Log.java | 4 +- src/org/atriasoft/phyligram/internal/Log.java | 4 +- test/src/test/atriasoft/ege/Log.java | 4 +- test/src/test/atriasoft/ege/Log2.java | 4 +- test/src/test/atriasoft/ege/TestBasicLog.java | 2 +- 13 files changed, 90 insertions(+), 46 deletions(-) diff --git a/samples/resources/mapFactory/data/ToolMapHeight.xml b/samples/resources/mapFactory/data/ToolMapHeight.xml index ab15a31..b35be64 100644 --- a/samples/resources/mapFactory/data/ToolMapHeight.xml +++ b/samples/resources/mapFactory/data/ToolMapHeight.xml @@ -1,29 +1,32 @@ - + - - + + + minimum="0.1" + maximum="40" /> - - + + + minimum="-128" + maximum="128" /> - - + + + minimum="-128" + maximum="128"/> - \ No newline at end of file + \ No newline at end of file diff --git a/samples/src/sample/atriasoft/ege/mapFactory/Ground.java b/samples/src/sample/atriasoft/ege/mapFactory/Ground.java index 2b700b2..034a1f5 100644 --- a/samples/src/sample/atriasoft/ege/mapFactory/Ground.java +++ b/samples/src/sample/atriasoft/ege/mapFactory/Ground.java @@ -13,8 +13,8 @@ import org.atriasoft.loader3d.resources.ResourceMeshHeightMap; import toolbox.Maths; public class Ground { - int sizeX = 16; - int sizeY = 16; + int sizeX = 64; + int sizeY = 64; float[][] heightMap = new float[this.sizeY][this.sizeX]; String[][] colorMap = new String[this.sizeY][this.sizeX * 2]; ResourceMeshHeightMap mesh = new ResourceMeshHeightMap(); diff --git a/samples/src/sample/atriasoft/ege/mapFactory/Log.java b/samples/src/sample/atriasoft/ege/mapFactory/Log.java index 7a4c466..a9be375 100644 --- a/samples/src/sample/atriasoft/ege/mapFactory/Log.java +++ b/samples/src/sample/atriasoft/ege/mapFactory/Log.java @@ -1,7 +1,7 @@ package sample.atriasoft.ege.mapFactory; -import io.scenarium.logger.LogLevel; -import io.scenarium.logger.Logger; +import org.atriasoft.reggol.LogLevel; +import org.atriasoft.reggol.Logger; public class Log { private static final boolean FORCE_ALL = false; diff --git a/samples/src/sample/atriasoft/ege/mapFactory/MainWindows.java b/samples/src/sample/atriasoft/ege/mapFactory/MainWindows.java index ef93f21..a253c9f 100644 --- a/samples/src/sample/atriasoft/ege/mapFactory/MainWindows.java +++ b/samples/src/sample/atriasoft/ege/mapFactory/MainWindows.java @@ -4,22 +4,14 @@ import org.atriasoft.etk.math.Vector3b; import org.atriasoft.ewol.widget.Button; import org.atriasoft.ewol.widget.Sizer; import org.atriasoft.ewol.widget.Sizer.DisplayMode; +import org.atriasoft.ewol.widget.Widget; import org.atriasoft.ewol.widget.Windows; +import sample.atriasoft.ege.mapFactory.tools.MapToolInterface; import sample.atriasoft.ege.mapFactory.tools.ToolMapHeight; public class MainWindows extends Windows { - public static void eventButtonIncrease(final MainWindows self, Boolean value) { - //Vector2b state = self.testWidget.getPropertyFill(); - //self.testWidget.setPropertyFill(state.withY(!state.y())); - // if (self.heightButton.getPropertyValue() == "Increase") { - // self.heightButton.setPropertyValue("Decrease"); - // } else { - // self.heightButton.setPropertyValue("Increase"); - // } - } - public static void eventButtonTool(final MainWindows self, Boolean value) { //Vector2b state = self.testWidget.getPropertyFill(); //self.testWidget.setPropertyFill(state.withY(!state.y())); @@ -60,15 +52,11 @@ public class MainWindows extends Windows { sizerMenu.subWidgetAdd(this.toolButton); this.toolButton.signalValue.connectAuto(this, MainWindows::eventButtonTool); - this.heightButton = Button.createToggleLabelButton("Increase", "Decrease"); - this.heightButton.setPropertyExpand(Vector3b.TRUE_FALSE_FALSE); - this.heightButton.setPropertyFill(Vector3b.TRUE); - sizerMenu.subWidgetAdd(this.heightButton); - this.heightButton.signalValue.connectAuto(this, MainWindows::eventButtonIncrease); - // set default tools: - this.scene.setCurrentTool(new ToolMapHeight()); - + MapToolInterface tool = new ToolMapHeight(); + this.scene.setCurrentTool(tool); + Widget toolDisplay = tool.getWidget(); + sizerMenu.subWidgetAdd(toolDisplay); } } \ No newline at end of file diff --git a/samples/src/sample/atriasoft/ege/mapFactory/tools/MapToolInterface.java b/samples/src/sample/atriasoft/ege/mapFactory/tools/MapToolInterface.java index e350430..8d2a562 100644 --- a/samples/src/sample/atriasoft/ege/mapFactory/tools/MapToolInterface.java +++ b/samples/src/sample/atriasoft/ege/mapFactory/tools/MapToolInterface.java @@ -2,11 +2,14 @@ package sample.atriasoft.ege.mapFactory.tools; import org.atriasoft.ewol.event.EventEntry; import org.atriasoft.ewol.event.EventInput; +import org.atriasoft.ewol.widget.Widget; import sample.atriasoft.ege.mapFactory.EgeScene; import sample.atriasoft.ege.mapFactory.model.Map; public interface MapToolInterface { + Widget getWidget(); + void onDraw(Map map); boolean onEventEntry(final EventEntry event, Map map, EgeScene widget); diff --git a/samples/src/sample/atriasoft/ege/mapFactory/tools/ToolMapHeight.java b/samples/src/sample/atriasoft/ege/mapFactory/tools/ToolMapHeight.java index 58d6cfd..0b2e60f 100644 --- a/samples/src/sample/atriasoft/ege/mapFactory/tools/ToolMapHeight.java +++ b/samples/src/sample/atriasoft/ege/mapFactory/tools/ToolMapHeight.java @@ -2,10 +2,14 @@ package sample.atriasoft.ege.mapFactory.tools; import org.atriasoft.ege.geometry.Ray; import org.atriasoft.etk.Color; +import org.atriasoft.etk.Uri; import org.atriasoft.etk.math.Transform3D; import org.atriasoft.etk.math.Vector3f; import org.atriasoft.ewol.event.EventEntry; import org.atriasoft.ewol.event.EventInput; +import org.atriasoft.ewol.widget.Composer; +import org.atriasoft.ewol.widget.Slider; +import org.atriasoft.ewol.widget.Widget; import org.atriasoft.gale.key.KeyStatus; import org.atriasoft.gale.resource.ResourceColored3DObject; @@ -15,7 +19,24 @@ import sample.atriasoft.ege.mapFactory.model.Map; import toolbox.Maths; public class ToolMapHeight implements MapToolInterface { + protected static void onCallbackMaxChange(final ToolMapHeight self, final float value) { + Log.warning("get new value {}", value); + self.onCallbackMax(value); + } + + protected static void onCallbackMinChange(final ToolMapHeight self, final float value) { + Log.warning("get new value {}", value); + self.onCallbackMin(value); + } + + protected static void onCallbackWidthChange(final ToolMapHeight self, final float value) { + Log.warning("get new value {}", value); + self.onCallbackValue(value); + } + + int uniqueID = 555245; Vector3f positionRay = null; + float widthBrush = 3.0f; float maxBrush = 10.0f; float minBrush = -10.0f; @@ -25,6 +46,35 @@ public class ToolMapHeight implements MapToolInterface { this.dynamicElement = ResourceColored3DObject.create(); } + @Override + public Widget getWidget() { + final Widget data = Composer.composerGenerateFile(new Uri("DATA", "ToolMapHeight.xml"), this.uniqueID); + + if (data.getSubObjectNamed("[" + Long.toString(this.uniqueID) + "]HeighMap:slider-width") instanceof final Slider tmp) { + tmp.signalValue.connectAuto(this, ToolMapHeight::onCallbackWidthChange); + } + if (data.getSubObjectNamed("[" + Long.toString(this.uniqueID) + "]HeighMap:slider-top") instanceof final Slider tmp) { + tmp.signalValue.connectAuto(this, ToolMapHeight::onCallbackMaxChange); + } + if (data.getSubObjectNamed("[" + Long.toString(this.uniqueID) + "]HeighMap:slider-bottom") instanceof final Slider tmp) { + tmp.signalValue.connectAuto(this, ToolMapHeight::onCallbackMinChange); + } + + return data; + } + + protected void onCallbackMax(final float value) { + this.maxBrush = value; + } + + protected void onCallbackMin(final float value) { + this.minBrush = value; + } + + protected void onCallbackValue(final float value) { + this.widthBrush = value; + } + @Override public void onDraw(Map map) { // TODO Auto-generated method stub diff --git a/src/org/atriasoft/eagle/internal/Log.java b/src/org/atriasoft/eagle/internal/Log.java index 92c007c..1e3189c 100644 --- a/src/org/atriasoft/eagle/internal/Log.java +++ b/src/org/atriasoft/eagle/internal/Log.java @@ -1,7 +1,7 @@ package org.atriasoft.eagle.internal; -import io.scenarium.logger.LogLevel; -import io.scenarium.logger.Logger; +import org.atriasoft.reggol.LogLevel; +import org.atriasoft.reggol.Logger; public class Log { private static final String LIB_NAME = "eagle"; diff --git a/src/org/atriasoft/ege/internal/Log.java b/src/org/atriasoft/ege/internal/Log.java index 57efaf4..5489cf6 100644 --- a/src/org/atriasoft/ege/internal/Log.java +++ b/src/org/atriasoft/ege/internal/Log.java @@ -1,7 +1,7 @@ package org.atriasoft.ege.internal; -import io.scenarium.logger.LogLevel; -import io.scenarium.logger.Logger; +import org.atriasoft.reggol.LogLevel; +import org.atriasoft.reggol.Logger; public class Log { private static final boolean FORCE_ALL = false; diff --git a/src/org/atriasoft/garoux/internal/Log.java b/src/org/atriasoft/garoux/internal/Log.java index 817fb2f..bc3576c 100644 --- a/src/org/atriasoft/garoux/internal/Log.java +++ b/src/org/atriasoft/garoux/internal/Log.java @@ -1,7 +1,7 @@ package org.atriasoft.garoux.internal; -import io.scenarium.logger.LogLevel; -import io.scenarium.logger.Logger; +import org.atriasoft.reggol.LogLevel; +import org.atriasoft.reggol.Logger; public class Log { private static final String LIB_NAME = "garoux"; diff --git a/src/org/atriasoft/phyligram/internal/Log.java b/src/org/atriasoft/phyligram/internal/Log.java index b501292..6d0f395 100644 --- a/src/org/atriasoft/phyligram/internal/Log.java +++ b/src/org/atriasoft/phyligram/internal/Log.java @@ -1,7 +1,7 @@ package org.atriasoft.phyligram.internal; -import io.scenarium.logger.LogLevel; -import io.scenarium.logger.Logger; +import org.atriasoft.reggol.LogLevel; +import org.atriasoft.reggol.Logger; public class Log { private static final String LIB_NAME = "phyligram"; diff --git a/test/src/test/atriasoft/ege/Log.java b/test/src/test/atriasoft/ege/Log.java index 747202c..7420ae8 100644 --- a/test/src/test/atriasoft/ege/Log.java +++ b/test/src/test/atriasoft/ege/Log.java @@ -1,7 +1,7 @@ package test.atriasoft.ege; -import io.scenarium.logger.LogLevel; -import io.scenarium.logger.Logger; +import org.atriasoft.reggol.LogLevel; +import org.atriasoft.reggol.Logger; public class Log { private static final String LIB_NAME = "ege-test"; diff --git a/test/src/test/atriasoft/ege/Log2.java b/test/src/test/atriasoft/ege/Log2.java index bc87ac6..37116ec 100644 --- a/test/src/test/atriasoft/ege/Log2.java +++ b/test/src/test/atriasoft/ege/Log2.java @@ -1,7 +1,7 @@ package test.atriasoft.ege; -import io.scenarium.logger.LogLevel; -import io.scenarium.logger.Logger; +import org.atriasoft.reggol.LogLevel; +import org.atriasoft.reggol.Logger; public class Log2 { private static final String LIB_NAME = "ege-test-2"; diff --git a/test/src/test/atriasoft/ege/TestBasicLog.java b/test/src/test/atriasoft/ege/TestBasicLog.java index 048d45b..7234738 100644 --- a/test/src/test/atriasoft/ege/TestBasicLog.java +++ b/test/src/test/atriasoft/ege/TestBasicLog.java @@ -11,7 +11,7 @@ package test.atriasoft.ege; import java.util.ArrayList; import java.util.List; -import io.scenarium.logger.Logger; +import org.atriasoft.reggol.Logger; import org.junit.Test; import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;