From 971759a6e7452309c6016d120203622d1eabfe4b Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 14 Oct 2018 22:32:08 +0200 Subject: [PATCH] Updated pom.xml --- Flow | 2 +- core/pom.xml | 15 +- .../warppi/extra/tetris/BlockColor.java | 22 +- .../warppi/extra/tetris/Tetromino.java | 252 +++++++++--------- .../warppi/extra/tetris/TetrominoICyan.java | 96 +++---- .../warppi/extra/tetris/TetrominoJBlue.java | 88 +++--- .../warppi/extra/tetris/TetrominoLOrange.java | 88 +++--- .../warppi/extra/tetris/TetrominoOYellow.java | 38 +-- .../warppi/extra/tetris/TetrominoSGreen.java | 88 +++--- .../warppi/extra/tetris/TetrominoTPurple.java | 88 +++--- .../warppi/extra/tetris/TetrominoType.java | 22 +- .../warppi/extra/tetris/TetrominoZRed.java | 88 +++--- desktop/pom.xml | 2 +- engine-jogl/pom.xml | 116 ++++---- hardware/pom.xml | 2 +- pom.xml | 3 +- rules/pom.xml | 2 +- teavm/pom.xml | 2 +- 18 files changed, 502 insertions(+), 512 deletions(-) diff --git a/Flow b/Flow index 4ec16b0e..9acbcc2e 160000 --- a/Flow +++ b/Flow @@ -1 +1 @@ -Subproject commit 4ec16b0e2d49da9771503e713604f5641ef6c414 +Subproject commit 9acbcc2e0af4961688490eb3447d990d157a46a8 diff --git a/core/pom.xml b/core/pom.xml index d163a214..3d996471 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,10 +6,9 @@ it.cavallium warppi - ${project.version} + 0.9.0a2 warppi-core - bundle WarpPI Calculator Core WarpPI Calculator core project @@ -46,16 +45,8 @@ - org.apache.felix - maven-bundle-plugin - true - - - * - it.cavallium.warppi.* - warppi-core - - + org.apache.maven.plugins + maven-compiler-plugin org.apache.maven.plugins diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/BlockColor.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/BlockColor.java index 903667cc..cc784d60 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/BlockColor.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/BlockColor.java @@ -1,11 +1,11 @@ -package it.cavallium.warppi.extra.tetris; - -public enum BlockColor { - RED, - GREEN, - BLUE, - YELLOW, - ORANGE, - PURPLE, - CYAN -} +package it.cavallium.warppi.extra.tetris; + +public enum BlockColor { + RED, + GREEN, + BLUE, + YELLOW, + ORANGE, + PURPLE, + CYAN +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/Tetromino.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/Tetromino.java index 3d54e370..0ca620c4 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/Tetromino.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/Tetromino.java @@ -1,126 +1,126 @@ -package it.cavallium.warppi.extra.tetris; - -public abstract class Tetromino { - private byte x, y, rotation; - private final TetrominoType type; - public final boolean o = false, w = true; - - public Tetromino(byte x, byte y, byte rotation, TetrominoType type) { - super(); - this.x = x; - this.y = y; - this.rotation = rotation; - this.type = type; - } - - public byte getX() { - return x; - } - - public void setX(byte x) { - this.x = x; - } - - public byte getY() { - return y; - } - - public void setY(byte y) { - this.y = y; - } - - public byte getRotation() { - return rotation; - } - - public void setRotation(byte rotation) { - this.rotation = rotation; - } - - public TetrominoType getType() { - return type; - } - - public BlockColor getColor() { - switch(type) { - case I_CYAN: - return BlockColor.CYAN; - case J_BLUE: - return BlockColor.BLUE; - case L_ORANGE: - return BlockColor.ORANGE; - case O_YELLOW: - return BlockColor.YELLOW; - case S_GREEN: - return BlockColor.GREEN; - case T_PURPLE: - return BlockColor.PURPLE; - case Z_RED: - return BlockColor.RED; - default: - return BlockColor.RED; - } - } - - public void draw(BlockColor[] grid, final int WIDTH) { - boolean[] blockGrid = getRenderedBlock(); - final int tetrominoGridSize = getTetrominoGridSize(); - final int centerOffset = (int) Math.floor((double)tetrominoGridSize/2d); - final BlockColor type = getColor(); - for (int bx = 0; bx < tetrominoGridSize; bx++) { - for (int by = 0; by < tetrominoGridSize; by++) { - if (blockGrid[bx+by*tetrominoGridSize] == w) { - final int index = x+bx-centerOffset + (y+by-centerOffset) * WIDTH; - if (index < grid.length && index >= 0) { - grid[index] = type; - } - } - } - } - } - - public void fixInitialPosition() { - this.y -= (byte) (this.getTetrominoGridSize()/2); - } - - public abstract int getTetrominoGridSize(); - protected abstract boolean[] getRenderedBlock(); - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + rotation; - result = prime * result + ((type == null) ? 0 : type.hashCode()); - result = prime * result + x; - result = prime * result + y; - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - Tetromino other = (Tetromino) obj; - if (rotation != other.rotation) - return false; - if (type != other.type) - return false; - if (x != other.x) - return false; - if (y != other.y) - return false; - return true; - } - - @Override - public String toString() { - return "Tetromino = {\n\t\"x\": \"" + x + "\",\n\ty\": \"" + y + "\",\n\trotation\": \"" + rotation + "\",\n\ttype\": \"" + type + "\"\n}"; - } - - -} +package it.cavallium.warppi.extra.tetris; + +public abstract class Tetromino { + private byte x, y, rotation; + private final TetrominoType type; + public final boolean o = false, w = true; + + public Tetromino(byte x, byte y, byte rotation, TetrominoType type) { + super(); + this.x = x; + this.y = y; + this.rotation = rotation; + this.type = type; + } + + public byte getX() { + return x; + } + + public void setX(byte x) { + this.x = x; + } + + public byte getY() { + return y; + } + + public void setY(byte y) { + this.y = y; + } + + public byte getRotation() { + return rotation; + } + + public void setRotation(byte rotation) { + this.rotation = rotation; + } + + public TetrominoType getType() { + return type; + } + + public BlockColor getColor() { + switch(type) { + case I_CYAN: + return BlockColor.CYAN; + case J_BLUE: + return BlockColor.BLUE; + case L_ORANGE: + return BlockColor.ORANGE; + case O_YELLOW: + return BlockColor.YELLOW; + case S_GREEN: + return BlockColor.GREEN; + case T_PURPLE: + return BlockColor.PURPLE; + case Z_RED: + return BlockColor.RED; + default: + return BlockColor.RED; + } + } + + public void draw(BlockColor[] grid, final int WIDTH) { + boolean[] blockGrid = getRenderedBlock(); + final int tetrominoGridSize = getTetrominoGridSize(); + final int centerOffset = (int) Math.floor((double)tetrominoGridSize/2d); + final BlockColor type = getColor(); + for (int bx = 0; bx < tetrominoGridSize; bx++) { + for (int by = 0; by < tetrominoGridSize; by++) { + if (blockGrid[bx+by*tetrominoGridSize] == w) { + final int index = x+bx-centerOffset + (y+by-centerOffset) * WIDTH; + if (index < grid.length && index >= 0) { + grid[index] = type; + } + } + } + } + } + + public void fixInitialPosition() { + this.y -= (byte) (this.getTetrominoGridSize()/2); + } + + public abstract int getTetrominoGridSize(); + protected abstract boolean[] getRenderedBlock(); + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + rotation; + result = prime * result + ((type == null) ? 0 : type.hashCode()); + result = prime * result + x; + result = prime * result + y; + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Tetromino other = (Tetromino) obj; + if (rotation != other.rotation) + return false; + if (type != other.type) + return false; + if (x != other.x) + return false; + if (y != other.y) + return false; + return true; + } + + @Override + public String toString() { + return "Tetromino = {\n\t\"x\": \"" + x + "\",\n\ty\": \"" + y + "\",\n\trotation\": \"" + rotation + "\",\n\ttype\": \"" + type + "\"\n}"; + } + + +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoICyan.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoICyan.java index a6eb84a4..4e908b6f 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoICyan.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoICyan.java @@ -1,48 +1,48 @@ -package it.cavallium.warppi.extra.tetris; - -public class TetrominoICyan extends Tetromino { - public TetrominoICyan(byte x, byte y, byte rotation) { - super(x, y, rotation, TetrominoType.I_CYAN); - } - - @Override - public int getTetrominoGridSize() { - return 4; - } - - @Override - public boolean[] getRenderedBlock() { - switch(getRotation()) { - case 0: - return new boolean[] { - o,o,o,o, - w,w,w,w, - o,o,o,o, - o,o,o,o - }; - case 1: - return new boolean[] { - o,o,w,o, - o,o,w,o, - o,o,w,o, - o,o,w,o - }; - case 2: - return new boolean[] { - o,o,o,o, - o,o,o,o, - w,w,w,w, - o,o,o,o - }; - case 3: - return new boolean[] { - o,w,o,o, - o,w,o,o, - o,w,o,o, - o,w,o,o - }; - default: - throw new NullPointerException(); - } - } -} +package it.cavallium.warppi.extra.tetris; + +public class TetrominoICyan extends Tetromino { + public TetrominoICyan(byte x, byte y, byte rotation) { + super(x, y, rotation, TetrominoType.I_CYAN); + } + + @Override + public int getTetrominoGridSize() { + return 4; + } + + @Override + public boolean[] getRenderedBlock() { + switch(getRotation()) { + case 0: + return new boolean[] { + o,o,o,o, + w,w,w,w, + o,o,o,o, + o,o,o,o + }; + case 1: + return new boolean[] { + o,o,w,o, + o,o,w,o, + o,o,w,o, + o,o,w,o + }; + case 2: + return new boolean[] { + o,o,o,o, + o,o,o,o, + w,w,w,w, + o,o,o,o + }; + case 3: + return new boolean[] { + o,w,o,o, + o,w,o,o, + o,w,o,o, + o,w,o,o + }; + default: + throw new NullPointerException(); + } + } +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoJBlue.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoJBlue.java index e1835e22..be8049e3 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoJBlue.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoJBlue.java @@ -1,44 +1,44 @@ -package it.cavallium.warppi.extra.tetris; - -public class TetrominoJBlue extends Tetromino { - public TetrominoJBlue(byte x, byte y, byte rotation) { - super(x, y, rotation, TetrominoType.J_BLUE); - } - - @Override - public int getTetrominoGridSize() { - return 3; - } - - @Override - public boolean[] getRenderedBlock() { - switch(getRotation()) { - case 0: - return new boolean[] { - w,o,o, - w,w,w, - o,o,o - }; - case 1: - return new boolean[] { - o,w,w, - o,w,o, - o,w,o - }; - case 2: - return new boolean[] { - o,o,o, - w,w,w, - o,o,w - }; - case 3: - return new boolean[] { - o,w,o, - o,w,o, - w,w,o - }; - default: - throw new NullPointerException(); - } - } -} +package it.cavallium.warppi.extra.tetris; + +public class TetrominoJBlue extends Tetromino { + public TetrominoJBlue(byte x, byte y, byte rotation) { + super(x, y, rotation, TetrominoType.J_BLUE); + } + + @Override + public int getTetrominoGridSize() { + return 3; + } + + @Override + public boolean[] getRenderedBlock() { + switch(getRotation()) { + case 0: + return new boolean[] { + w,o,o, + w,w,w, + o,o,o + }; + case 1: + return new boolean[] { + o,w,w, + o,w,o, + o,w,o + }; + case 2: + return new boolean[] { + o,o,o, + w,w,w, + o,o,w + }; + case 3: + return new boolean[] { + o,w,o, + o,w,o, + w,w,o + }; + default: + throw new NullPointerException(); + } + } +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoLOrange.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoLOrange.java index ec7ad80d..2d8911f0 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoLOrange.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoLOrange.java @@ -1,44 +1,44 @@ -package it.cavallium.warppi.extra.tetris; - -public class TetrominoLOrange extends Tetromino { - public TetrominoLOrange(byte x, byte y, byte rotation) { - super(x, y, rotation, TetrominoType.L_ORANGE); - } - - @Override - public int getTetrominoGridSize() { - return 3; - } - - @Override - public boolean[] getRenderedBlock() { - switch(getRotation()) { - case 0: - return new boolean[] { - o,o,w, - w,w,w, - o,o,o - }; - case 1: - return new boolean[] { - o,w,o, - o,w,o, - o,w,w - }; - case 2: - return new boolean[] { - o,o,o, - w,w,w, - w,o,o - }; - case 3: - return new boolean[] { - w,w,o, - o,w,o, - o,w,o - }; - default: - throw new NullPointerException(); - } - } -} +package it.cavallium.warppi.extra.tetris; + +public class TetrominoLOrange extends Tetromino { + public TetrominoLOrange(byte x, byte y, byte rotation) { + super(x, y, rotation, TetrominoType.L_ORANGE); + } + + @Override + public int getTetrominoGridSize() { + return 3; + } + + @Override + public boolean[] getRenderedBlock() { + switch(getRotation()) { + case 0: + return new boolean[] { + o,o,w, + w,w,w, + o,o,o + }; + case 1: + return new boolean[] { + o,w,o, + o,w,o, + o,w,w + }; + case 2: + return new boolean[] { + o,o,o, + w,w,w, + w,o,o + }; + case 3: + return new boolean[] { + w,w,o, + o,w,o, + o,w,o + }; + default: + throw new NullPointerException(); + } + } +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoOYellow.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoOYellow.java index 124c6c16..aa2d0602 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoOYellow.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoOYellow.java @@ -1,19 +1,19 @@ -package it.cavallium.warppi.extra.tetris; - -public class TetrominoOYellow extends Tetromino { - public TetrominoOYellow(byte x, byte y, byte rotation) { - super(x, y, rotation, TetrominoType.O_YELLOW); - } - @Override - public int getTetrominoGridSize() { - return 2; - } - - @Override - public boolean[] getRenderedBlock() { - return new boolean[] { - w,w, - w,w, - }; - } -} +package it.cavallium.warppi.extra.tetris; + +public class TetrominoOYellow extends Tetromino { + public TetrominoOYellow(byte x, byte y, byte rotation) { + super(x, y, rotation, TetrominoType.O_YELLOW); + } + @Override + public int getTetrominoGridSize() { + return 2; + } + + @Override + public boolean[] getRenderedBlock() { + return new boolean[] { + w,w, + w,w, + }; + } +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoSGreen.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoSGreen.java index 1bfb5354..10e59ba4 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoSGreen.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoSGreen.java @@ -1,44 +1,44 @@ -package it.cavallium.warppi.extra.tetris; - -public class TetrominoSGreen extends Tetromino { - public TetrominoSGreen(byte x, byte y, byte rotation) { - super(x, y, rotation, TetrominoType.S_GREEN); - } - - @Override - public int getTetrominoGridSize() { - return 3; - } - - @Override - public boolean[] getRenderedBlock() { - switch(getRotation()) { - case 0: - return new boolean[] { - o,w,w, - w,w,o, - o,o,o - }; - case 1: - return new boolean[] { - o,w,o, - o,w,w, - o,o,w - }; - case 2: - return new boolean[] { - o,o,o, - o,w,w, - w,w,o - }; - case 3: - return new boolean[] { - w,o,o, - w,w,o, - o,w,o - }; - default: - throw new NullPointerException(); - } - } -} +package it.cavallium.warppi.extra.tetris; + +public class TetrominoSGreen extends Tetromino { + public TetrominoSGreen(byte x, byte y, byte rotation) { + super(x, y, rotation, TetrominoType.S_GREEN); + } + + @Override + public int getTetrominoGridSize() { + return 3; + } + + @Override + public boolean[] getRenderedBlock() { + switch(getRotation()) { + case 0: + return new boolean[] { + o,w,w, + w,w,o, + o,o,o + }; + case 1: + return new boolean[] { + o,w,o, + o,w,w, + o,o,w + }; + case 2: + return new boolean[] { + o,o,o, + o,w,w, + w,w,o + }; + case 3: + return new boolean[] { + w,o,o, + w,w,o, + o,w,o + }; + default: + throw new NullPointerException(); + } + } +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoTPurple.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoTPurple.java index 9d56e4db..bd30e433 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoTPurple.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoTPurple.java @@ -1,44 +1,44 @@ -package it.cavallium.warppi.extra.tetris; - -public class TetrominoTPurple extends Tetromino { - public TetrominoTPurple(byte x, byte y, byte rotation) { - super(x, y, rotation, TetrominoType.I_CYAN); - } - - @Override - public int getTetrominoGridSize() { - return 3; - } - - @Override - public boolean[] getRenderedBlock() { - switch(getRotation()) { - case 0: - return new boolean[] { - o,w,o, - w,w,w, - o,o,o - }; - case 1: - return new boolean[] { - o,w,o, - o,w,w, - o,w,o - }; - case 2: - return new boolean[] { - o,o,o, - w,w,w, - o,w,o - }; - case 3: - return new boolean[] { - o,w,o, - w,w,o, - o,w,o - }; - default: - throw new NullPointerException(); - } - } -} +package it.cavallium.warppi.extra.tetris; + +public class TetrominoTPurple extends Tetromino { + public TetrominoTPurple(byte x, byte y, byte rotation) { + super(x, y, rotation, TetrominoType.I_CYAN); + } + + @Override + public int getTetrominoGridSize() { + return 3; + } + + @Override + public boolean[] getRenderedBlock() { + switch(getRotation()) { + case 0: + return new boolean[] { + o,w,o, + w,w,w, + o,o,o + }; + case 1: + return new boolean[] { + o,w,o, + o,w,w, + o,w,o + }; + case 2: + return new boolean[] { + o,o,o, + w,w,w, + o,w,o + }; + case 3: + return new boolean[] { + o,w,o, + w,w,o, + o,w,o + }; + default: + throw new NullPointerException(); + } + } +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoType.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoType.java index c6091e39..794fa4b9 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoType.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoType.java @@ -1,11 +1,11 @@ -package it.cavallium.warppi.extra.tetris; - -public enum TetrominoType { - I_CYAN, - O_YELLOW, - T_PURPLE, - S_GREEN, - Z_RED, - J_BLUE, - L_ORANGE -} +package it.cavallium.warppi.extra.tetris; + +public enum TetrominoType { + I_CYAN, + O_YELLOW, + T_PURPLE, + S_GREEN, + Z_RED, + J_BLUE, + L_ORANGE +} diff --git a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoZRed.java b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoZRed.java index 22daa3f9..0b7a70d5 100644 --- a/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoZRed.java +++ b/core/src/main/java/it/cavallium/warppi/extra/tetris/TetrominoZRed.java @@ -1,44 +1,44 @@ -package it.cavallium.warppi.extra.tetris; - -public class TetrominoZRed extends Tetromino { - public TetrominoZRed(byte x, byte y, byte rotation) { - super(x, y, rotation, TetrominoType.Z_RED); - } - - @Override - public int getTetrominoGridSize() { - return 3; - } - - @Override - public boolean[] getRenderedBlock() { - switch(getRotation()) { - case 0: - return new boolean[] { - w,w,o, - o,w,w, - o,o,o - }; - case 1: - return new boolean[] { - o,o,w, - o,w,w, - o,w,o - }; - case 2: - return new boolean[] { - o,o,o, - w,w,o, - o,w,w - }; - case 3: - return new boolean[] { - o,w,o, - w,w,o, - w,o,o - }; - default: - throw new NullPointerException(); - } - } -} +package it.cavallium.warppi.extra.tetris; + +public class TetrominoZRed extends Tetromino { + public TetrominoZRed(byte x, byte y, byte rotation) { + super(x, y, rotation, TetrominoType.Z_RED); + } + + @Override + public int getTetrominoGridSize() { + return 3; + } + + @Override + public boolean[] getRenderedBlock() { + switch(getRotation()) { + case 0: + return new boolean[] { + w,w,o, + o,w,w, + o,o,o + }; + case 1: + return new boolean[] { + o,o,w, + o,w,w, + o,w,o + }; + case 2: + return new boolean[] { + o,o,o, + w,w,o, + o,w,w + }; + case 3: + return new boolean[] { + o,w,o, + w,w,o, + w,o,o + }; + default: + throw new NullPointerException(); + } + } +} diff --git a/desktop/pom.xml b/desktop/pom.xml index b3c78995..58f9edd3 100644 --- a/desktop/pom.xml +++ b/desktop/pom.xml @@ -6,7 +6,7 @@ it.cavallium warppi - ${project.version} + 0.9.0a2 warppi-desktop diff --git a/engine-jogl/pom.xml b/engine-jogl/pom.xml index 76422426..c828b7a5 100644 --- a/engine-jogl/pom.xml +++ b/engine-jogl/pom.xml @@ -1,58 +1,58 @@ - - 4.0.0 - - - it.cavallium - warppi - ${project.version} - - warppi-engine-jogl - - bundle - - WarpPI Calculator JOGL Engine - WarpPI Calculator engine-jogl project - - - it.cavallium - warppi-core - ${project.version} - - - org.jogamp.jogl - jogl-all-main - 2.3.2 - - - org.jogamp.gluegen - gluegen-rt-main - 2.3.2 - - - ar.com.hjg - pngj - - - - - - org.apache.felix - maven-bundle-plugin - true - - - * - it.cavallium.warppi.* - warppi-engine-jogl - - - - - org.apache.maven.plugins - maven-source-plugin - - - - + + 4.0.0 + + + it.cavallium + warppi + 0.9.0a2 + + warppi-engine-jogl + + bundle + + WarpPI Calculator JOGL Engine + WarpPI Calculator engine-jogl project + + + it.cavallium + warppi-core + ${project.version} + + + org.jogamp.jogl + jogl-all-main + 2.3.2 + + + org.jogamp.gluegen + gluegen-rt-main + 2.3.2 + + + ar.com.hjg + pngj + + + + + + org.apache.felix + maven-bundle-plugin + true + + + * + it.cavallium.warppi.* + warppi-engine-jogl + + + + + org.apache.maven.plugins + maven-source-plugin + + + + diff --git a/hardware/pom.xml b/hardware/pom.xml index 22e5800f..1af4fd9b 100644 --- a/hardware/pom.xml +++ b/hardware/pom.xml @@ -6,7 +6,7 @@ it.cavallium warppi - ${project.version} + 0.9.0a2 warppi-hardware diff --git a/pom.xml b/pom.xml index 50ab7069..5bf95ad3 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ it.cavallium warppi - ${project.version} + 0.9.0a2 pom WarpPI Calculator @@ -27,7 +27,6 @@ - 0.9.0a0 UTF-8 1.8 1.8 diff --git a/rules/pom.xml b/rules/pom.xml index 85fdabb0..0e81bb93 100644 --- a/rules/pom.xml +++ b/rules/pom.xml @@ -6,7 +6,7 @@ it.cavallium warppi - ${project.version} + 0.9.0a2 warppi-rules bundle diff --git a/teavm/pom.xml b/teavm/pom.xml index 148a5f0a..1493dc03 100644 --- a/teavm/pom.xml +++ b/teavm/pom.xml @@ -6,7 +6,7 @@ it.cavallium warppi - ${project.version} + 0.9.0a2 warppi-teavm jar