feat: nui expirmental development

nui-core/build.gradle

@@ -0,0 +1,25 @@
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+}
+
+apply from: "$rootDir/gradle/common.gradle"
+
+dependencies {
+    api group: 'org.terasology.gestalt', name: 'gestalt-module', version: '7.0.3'
+    api group: 'org.terasology.gestalt', name: 'gestalt-asset-core', version: '7.0.3'
+
+    api ('org.joml:joml') {
+        version {
+            require jomlVersion
+        }
+    }
+
+    api ('org.terasology.joml-ext:joml-geometry') {
+        version {
+            require geomVersion
+        }
+    }
+
+    implementation group: 'com.google.guava', name: 'guava', version: '23.0'
+}

nui-core/src/main/java/org/terasology/nui/core/EventDispatcher.java

@@ -0,0 +1,49 @@
+package org.terasology.nui.core;
+
+import com.google.common.collect.Maps;
+import org.terasology.nui.core.bind.BindingPair;
+import org.terasology.nui.core.bind.BindingType;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.Queue;
+
+public class EventDispatcher {
+    Map<Long, Queue<Runnable>> threadQueue = Maps.newConcurrentMap();
+
+    private ThreadLocal<Queue<Runnable>> localQueue = new ThreadLocal<>();
+
+    public void dispatch(BindingPair pair, Runnable runnable) {
+        BindingType type = pair.getBindingType();
+        Optional<UIObject> slotWidgetOptional = pair.getSignalWidget();
+        Optional<UIObject> signalWidgetOptional = pair.getSignalWidget();
+        if (!slotWidgetOptional.isPresent() || !signalWidgetOptional.isPresent()) {
+            return;
+        }
+
+        UIObject signalWidget = signalWidgetOptional.get();
+
+
+        runnable.run();
+//
+//        switch (type) {
+//            case Auto:
+//                break;
+//            case Queue:
+//                break;
+//            case Direct:
+//                runnable.run();
+//                break;
+//            case BlockedQueue:
+//                break;
+//        }
+    }
+
+    public void dispatchQueue(Runnable runnable) {
+
+    }
+
+    public void dispatch() {
+
+    }
+}

nui-core/src/main/java/org/terasology/nui/core/UICore.java

@@ -0,0 +1,4 @@
+package org.terasology.nui.core;
+
+public class UICore {
+}

nui-core/src/main/java/org/terasology/nui/core/UIEngine.java

@@ -0,0 +1,5 @@
+package org.terasology.nui.core;
+
+public interface UIEngine {
+    EventDispatcher dispatcher();
+}

nui-core/src/main/java/org/terasology/nui/core/UIObject.java

@@ -0,0 +1,85 @@
+package org.terasology.nui.core;
+
+import org.joml.Vector2f;
+import org.terasology.nui.core.bind.Binding;
+import org.terasology.nui.core.bind.UIProperty;
+import org.terasology.nui.core.bind.UISignal;
+import org.terasology.nui.core.bind.UISlot;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+public abstract class UIObject implements AutoCloseable {
+    private UIObject parent;
+    private final List<UIObject> children = new ArrayList<>();
+    private boolean isFree = false;
+    private UIEngine uiEngine;
+
+    public static UIEngine getEngine(UIObject widget) {
+        return widget.uiEngine;
+    }
+
+
+    public final UISignal.UISignal0 destroy = new UISignal.UISignal0();
+
+
+    public UIObject(UIObject parent) {
+        // pass uiEngine to new widget
+        uiEngine = parent.uiEngine;
+
+        this.parent = parent;
+        this.parent.children.add(this);
+
+    }
+//
+//    public UIObject(UIObject parent) {
+//        this(parent);
+//
+//    }
+//
+//    public UIObject(UIObject parent, Vector2f pos) {
+//        this(parent);
+//        this.pos.set(pos);
+//    }
+//
+//    public UIObject(UIObject parent, Vector2f pos, Vector2f size) {
+//        this(parent);
+//        this.pos.set(pos);
+//        this.size.set(size);
+//    }
+
+
+    public Collection<UIObject> children() {
+        return Collections.unmodifiableList(children);
+    }
+
+    public boolean isDisposed() {
+        return isFree;
+    }
+
+    public void addChild(UIObject widget) {
+        if (widget.parent != null) {
+            widget.parent.removeChild(widget);
+        }
+        children.add(widget);
+        widget.parent = this;
+    }
+
+    public void removeChild(UIObject widget) {
+        children.remove(widget);
+        widget.parent = null;
+    }
+
+    public UIObject getParent() {
+        return parent;
+    }
+
+
+    @Override
+    public void close() {
+        this.isFree = true;
+        destroy.send();
+    }
+}

nui-core/src/main/java/org/terasology/nui/core/UIPaintable.java

@@ -0,0 +1,4 @@
+package org.terasology.nui.core;
+
+public interface UIPaintable {
+}

nui-core/src/main/java/org/terasology/nui/core/UIRenderable.java

@@ -0,0 +1,8 @@
+package org.terasology.nui.core;
+
+import java.util.Map;
+
+public class UIRenderable {
+
+
+}

nui-core/src/main/java/org/terasology/nui/core/UISlot.java

@@ -0,0 +1,18 @@
+package org.terasology.nui.core;
+
+import org.terasology.nui.core.bind.BindingFunction;
+
+import java.lang.ref.WeakReference;
+
+public class UISlot<T extends BindingFunction> {
+    private WeakReference<UIObject> reference;
+    private T handler;
+
+    public UISlot(T handler) {
+        this.handler = handler;
+    }
+
+    public Object invoke(Object[] entry) {
+        return null;
+    }
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Binding.java

@@ -0,0 +1,26 @@
+package org.terasology.nui.core.bind;
+
+import org.terasology.nui.core.UIObject;
+
+public class Binding {
+    private Binding() {
+    }
+
+    public static void bind(UIObject wid1, UISignal.UISignal0 signal, UIObject wid2, UISlot.UISlot0 slot) {
+        bind(wid1, signal, wid2, slot, BindingType.Auto);
+    }
+
+    public static void bind(UIObject wid1, UISignal.UISignal0 signal, UIObject wid2, UISlot.UISlot0 slot, BindingType type) {
+        BindingPair pair = new BindingPair(wid1, wid2, type);
+        signal.register(pair, slot);
+    }
+
+    public static <T1> void bind(UIObject wid1, UISignal.UISignal1<T1> signal, UIObject wid2, UISlot.UISlot1<T1> slot) {
+        bind(wid1, signal, wid2, slot, BindingType.Auto);
+    }
+
+    public static <T1> void bind(UIObject wid1, UISignal.UISignal1<T1> signal, UIObject wid2, UISlot.UISlot1<T1> slot, BindingType type) {
+        BindingPair pair = new BindingPair(wid1, wid2, type);
+        signal.register(pair, slot);
+    }
+}

nui-core/src/main/java/org/terasology/nui/core/bind/BindingFunction.java

@@ -0,0 +1,4 @@
+package org.terasology.nui.core.bind;
+
+public interface BindingFunction {
+}

nui-core/src/main/java/org/terasology/nui/core/bind/BindingPair.java

@@ -0,0 +1,55 @@
+package org.terasology.nui.core.bind;
+
+import org.terasology.nui.core.EventDispatcher;
+import org.terasology.nui.core.UIEngine;
+import org.terasology.nui.core.UIObject;
+
+import java.lang.ref.WeakReference;
+import java.util.Optional;
+
+public class BindingPair {
+    private WeakReference<UIObject> signalWidget;
+    private WeakReference<UIObject> slotWidget;
+    private BindingType type;
+
+    public BindingPair(UIObject signalWidget, UIObject slotWidget, BindingType type) {
+        this.signalWidget = new WeakReference<>(signalWidget);
+        this.slotWidget = new WeakReference<>(slotWidget);
+        this.type = type;
+    }
+
+    public Optional<UIObject> getSignalWidget() {
+        return Optional.ofNullable(signalWidget.get());
+    }
+
+
+    public Optional<UIObject> getSlotWidget() {
+        return Optional.ofNullable(slotWidget.get());
+    }
+
+    public BindingType getBindingType() {
+        return this.type;
+    }
+
+    public Optional<EventDispatcher> getSlotDispatcher() {
+        UIObject target = this.slotWidget.get();
+        if (target != null) {
+            UIEngine engine = UIObject.getEngine(target);
+            return Optional.ofNullable(engine.dispatcher());
+        }
+        return Optional.empty();
+    }
+
+    public boolean  isDisposed() {
+        UIObject slotWid = signalWidget.get();
+        UIObject targetWid = slotWidget.get();
+        if (slotWid == null || slotWid.isDisposed()) {
+            return true;
+        }
+        if (targetWid == null || targetWid.isDisposed()) {
+            return true;
+        }
+        return false;
+
+    }
+}

nui-core/src/main/java/org/terasology/nui/core/bind/BindingType.java

@@ -0,0 +1,8 @@
+package org.terasology.nui.core.bind;
+
+public enum BindingType {
+    Auto,
+    Direct,
+    Queue,
+    BlockedQueue
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function0.java

@@ -0,0 +1,7 @@
+package org.terasology.nui.core.bind;
+
+
+@FunctionalInterface
+public interface Function0 extends BindingFunction {
+    void apply();
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function1.java

@@ -0,0 +1,6 @@
+package org.terasology.nui.core.bind;
+
+@FunctionalInterface
+public interface Function1<T1> extends BindingFunction {
+    void apply(T1 t1);
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function2.java

@@ -0,0 +1,5 @@
+package org.terasology.nui.core.bind;
+
+public interface Function2<T1, T2> extends BindingFunction {
+    void apply(T1 t1, T2 t2);
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function3.java

@@ -0,0 +1,5 @@
+package org.terasology.nui.core.bind;
+
+public interface Function3<T1, T2, T3> extends BindingFunction {
+    void apply(T1 t1, T2 t2, T3 t3);
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function4.java

@@ -0,0 +1,5 @@
+package org.terasology.nui.core.bind;
+
+public interface Function4<T1, T2, T3, T4>extends BindingFunction {
+    void apply(T1 t1, T2 t2, T3 t3, T4 t4);
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function5.java

@@ -0,0 +1,5 @@
+package org.terasology.nui.core.bind;
+
+public interface Function5<T1, T2, T3, T4, T5> extends BindingFunction {
+    void apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5);
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function6.java

@@ -0,0 +1,5 @@
+package org.terasology.nui.core.bind;
+
+public interface Function6<T1, T2, T3, T4, T5, T6> extends BindingFunction {
+    void apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function7.java

@@ -0,0 +1,5 @@
+package org.terasology.nui.core.bind;
+
+public interface Function7<T1, T2, T3, T4, T5, T6, T7>extends BindingFunction {
+    void apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7);
+}

nui-core/src/main/java/org/terasology/nui/core/bind/Function8.java

@@ -0,0 +1,5 @@
+package org.terasology.nui.core.bind;
+
+public interface Function8<T1, T2, T3, T4, T5, T6, T7, T8>  extends BindingFunction {
+    void apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8);
+}

nui-core/src/main/java/org/terasology/nui/core/bind/UIFloatProperty.java

@@ -0,0 +1,19 @@
+package org.terasology.nui.core.bind;
+
+public class UIFloatProperty {
+    private float value;
+    public final UISignal.UISignal0 propertyChanged = new UISignal.UISignal0();
+
+    public UIFloatProperty(float initial) {
+        this.value = initial;
+    }
+
+    public void set(float value) {
+        propertyChanged.send();
+        this.value = value;
+    }
+
+    public float get() {
+        return value;
+    }
+}

nui-core/src/main/java/org/terasology/nui/core/bind/UIProperty.java

@@ -0,0 +1,19 @@
+package org.terasology.nui.core.bind;
+
+public class UIProperty<T1> {
+    private T1 value;
+    public final UISignal.UISignal0 propertyChanged = new UISignal.UISignal0();
+
+    public UIProperty(T1 initial) {
+        this.value = initial;
+    }
+
+    public void set(T1 value) {
+        propertyChanged.send();
+        this.value = value;
+    }
+
+    public T1 get() {
+        return value;
+    }
+}