Canvas integration

pom.xml

@@ -44,6 +44,18 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>com.lemms.Lemms</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>

src/main/java/com/lemms/Canvas/Canvas.java

@@ -1,68 +1,180 @@
 package com.lemms.Canvas;
 
+import com.lemms.api.LemmsAPI;
+import com.lemms.interpreter.StatementVisitor;
+import com.lemms.interpreter.object.*;
+
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 public class Canvas implements ActionListener {
 
-    public ScriptCallback update;
+    private static Canvas instance;
+    private final StatementVisitor statementVisitor;
+
+    public static void init(int width, int height, int tickRate, StatementVisitor visitor) {
+        if (instance != null) {
+            throw new IllegalStateException("Canvas already initialized");
+        }
+        instance = new Canvas(width, height, tickRate, visitor);
+    }
+
+    public static Canvas get() {
+        if (instance == null) {
+            throw new IllegalStateException("Canvas not initialized. Call Canvas.init(...) first.");
+        }
+        return instance;
+    }
+
+    public static void run()       { get().runInstance(); }
+    public static void quit()      { get().quitInstance(); }
+    public static int getWidth()   { return get().frame.getWidth(); }
+    public static int getHeight()  { return get().frame.getHeight(); }
+    public static CanvasObject getElement(String id) {return get().panel.getElement(id);}
+    public static void add(String id, CanvasObject o)        { get().panel.addElement(id, o); }
+    public static void move(String id, int x, int y) {get().panel.moveElement(id, x, y);}
+    public static void move(String id, int x, int y, int w, int h) {get().panel.moveElement(id, x, y, w, h);}
+    public static void remove(String id)     { get().panel.removeElement(id); }
+    public static void clear()                { get().panel.clearElements(); }
+    public static void repaint()              { get().panel.repaint(); }
+    public static void onKeyPress(int key, ScriptCallback cb) {
+        get().panel.addKeyEvent(key, cb);
+    }
+    public static void onTick(ScriptCallback cb) {
+        get().update = cb;
+    }
+    public static void addPrimitives(LemmsAPI api, StatementVisitor visitor) {
+        api.registerFunction("init_canvas", params -> {
+            LemmsInt width = (LemmsInt) params.get(0);
+            LemmsInt height = (LemmsInt) params.get(1);
+            LemmsInt tickRate = (LemmsInt) params.get(2);
+            init(width.value, height.value, tickRate.value, visitor);
+            return null;
+        });
+        api.registerFunction("start_canvas", params -> {run(); return null;});
+        api.registerFunction("quit_canvas", params -> {quit(); return null;});
+        api.registerFunction("canvas_width", params -> new LemmsInt(getWidth()));
+        api.registerFunction("canvas_height", params -> new LemmsInt(getHeight()));
+        api.registerFunction("add_rectangle", params -> {
+            LemmsString id = (LemmsString) params.get(0);
+            LemmsInt x = (LemmsInt) params.get(1);
+            LemmsInt y = (LemmsInt) params.get(2);
+            LemmsInt width = (LemmsInt) params.get(3);
+            LemmsInt height = (LemmsInt) params.get(4);
+            LemmsString color = (LemmsString) params.get(5);
+            Color c = getColor(color.value);
+            Rect rect = new Rect(x.value, y.value, width.value, height.value, c);
+            add(id.value, rect); return null;});
+        api.registerFunction("add_pixel", params -> {
+            LemmsString id = (LemmsString) params.get(0);
+            LemmsInt x = (LemmsInt) params.get(1);
+            LemmsInt y = (LemmsInt) params.get(2);
+            LemmsString color = (LemmsString) params.get(3);
+            Color c = getColor(color.value);
+            Pixel pixel = new Pixel(x.value, y.value, c);
+            add(id.value, pixel); return null;});
+        api.registerFunction("add_text", params -> {
+            LemmsString id = (LemmsString) params.get(0);
+            LemmsString text = (LemmsString) params.get(1);
+            LemmsInt x = (LemmsInt) params.get(2);
+            LemmsInt y = (LemmsInt) params.get(3);
+            LemmsInt size = (LemmsInt) params.get(4);
+            LemmsString color = (LemmsString) params.get(5);
+            Color c = getColor(color.value);
+            Text t = new Text(text.value, x.value, y.value, size.value, c);
+            add(id.value, t); return null;});
+        api.registerFunction("remove_canvas_element", params -> {
+            LemmsString id = (LemmsString) params.get(0);
+            remove(id.value);
+            return null;});
+        api.registerFunction("move_canvas_element", params -> {
+            LemmsString id = (LemmsString) params.get(0);
+            LemmsInt x = (LemmsInt) params.get(1);
+            LemmsInt y = (LemmsInt) params.get(2);
+            if(params.size() == 5) {
+                LemmsInt width = (LemmsInt) params.get(3);
+                LemmsInt height = (LemmsInt) params.get(4);
+                move(id.value, x.value, y.value, width.value, height.value);
+            }else{
+                move(id.value, x.value, y.value);
+            }
+            return null;
+        });
+        api.registerFunction("clear_canvas", params -> {clear(); return null;});
+        api.registerFunction("repaint_canvas", params -> {repaint(); return null;});
+        api.registerFunction("on_key_press", params -> {
+            LemmsInt key = (LemmsInt) params.get(0);
+            LemmsFunction function = (LemmsFunction) params.get(1);
+            ScriptCallback cv = function.functionDeclaration.functionBody::accept;
+            onKeyPress(key.value, cv); return null;
+        });
+        api.registerFunction("on_tick", params -> {
+            LemmsFunction function = (LemmsFunction) params.get(0);
+            ScriptCallback cv = function.functionDeclaration.functionBody::accept;
+            onTick(cv); return null;
+        });
+        api.registerFunction("elements_collide", params -> {
+            LemmsString id_1 = (LemmsString) params.get(0);
+            LemmsString id_2 = (LemmsString) params.get(1);
+            CanvasObject a = getElement(id_1.value);
+            CanvasObject b = getElement(id_2.value);
+            return new LemmsBool(a.intersects(b));
+        });
+        api.registerFunction("element_contains", params -> {
+            LemmsString id_1 = (LemmsString) params.get(0);
+            LemmsString id_2 = (LemmsString) params.get(1);
+            CanvasObject a = getElement(id_1.value);
+            CanvasObject b = getElement(id_2.value);
+            return new LemmsBool(a.contains(b));
+        });
+    }
+
+    private static Color getColor(String color) {
+        Color c = Color.BLACK;
+        try {
+            c = (Color) Color.class.getField(color.toUpperCase()).get(null);
+        } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException ignored) {
+            System.err.println("Can't get color: " + color.toUpperCase());
+        }
+        return c;
+    }
 
-    private final CanvasPanel panel;
+    public ScriptCallback update;
+    private final Panel panel;
     private final JFrame frame;
     private final Timer timer;
 
-    public Canvas(int tickRate, int width, int height) {
+    private Canvas(int width, int height, int tickRate, StatementVisitor visitor) {
         frame = new JFrame();
-        panel = new CanvasPanel();
+        panel = new Panel(visitor);
         frame.add(panel);
         frame.pack();
         frame.setLocationRelativeTo(null);
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setSize(width, height);
         frame.setVisible(true);
-        update = panel::repaint;
-        timer = new Timer(tickRate, this);
-    }
-
-    public int getWidth() {
-        return frame.getWidth();
-    }
+        statementVisitor = visitor;
 
-    public int getHeight() {
-        return frame.getHeight();
+        // default tick → repaint
+        update = (v) -> panel.repaint();
+        timer = new Timer(tickRate, this);
     }
 
-    public Rect getBounds() {return new Rect(0,0, getWidth(), getHeight(), null);}
-
-    public void run() {
+    // ─── private instance methods ─────────────────────────────────────────────────
+    private void runInstance() {
         timer.start();
     }
 
-    public void quit() {
+    private void quitInstance() {
         timer.stop();
     }
 
-    public void add(Drawable drawable) {
-        panel.addElement(drawable);
-    }
-
-    public void remove(Drawable drawable) {panel.removeElement(drawable);}
-
-    public void clear() {panel.clearElements();}
-
-    public void repaint() {panel.repaint();}
-
-    public void onKeyPress(int key, ScriptCallback callback) {
-        panel.addKeyEvent(key, callback);
-    }
-
     @Override
     public void actionPerformed(ActionEvent e) {
-        if ( e.getSource() == timer)
-        {
-            update.call();
+        if (e.getSource() == timer) {
+            update.call(statementVisitor);
         }
     }
-
-}
+}

src/main/java/com/lemms/Canvas/CanvasObject.java

@@ -0,0 +1,42 @@
+package com.lemms.Canvas;
+
+public abstract class CanvasObject implements Drawable {
+    private int x, y, width, height;
+
+    public CanvasObject(int x, int y, int width, int height) {
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        this.height = height;
+    }
+
+    public int getX() {return x;}
+    public int getY() {return y;}
+    public int getWidth() {return width;}
+    public int getHeight() {return height;}
+
+    public void setX(int x) {this.x = x;}
+    public void setY(int y) {this.y = y;}
+    public void setWidth(int width) {this.width = width;}
+    public void setHeight(int height) {this.height = height;}
+
+    public boolean intersects(CanvasObject other){
+        if (other == null) {
+            return false;
+        }
+        return this.x < other.getX() + other.getWidth()
+                && this.x + this.width > other.getX()
+                && this.y < other.getY() + other.getHeight()
+                && this.y + this.height > other.getY();
+    }
+    public boolean contains(CanvasObject other){
+        if (other == null) {
+            return false;
+        }
+        return other.getX() >= this.x
+                && other.getY() >= this.y
+                && other.getX() + other.getWidth() <= this.x + this.width
+                && other.getY() + other.getWidth() <= this.y + this.height;
+    }
+
+}