Skip to content
Snippets Groups Projects
Commit 3a63b9db authored by LABOUREL Arnaud's avatar LABOUREL Arnaud
Browse files

Updated gradle config

parent 15916d65
No related branches found
No related tags found
No related merge requests found
Pipeline #5994 failed
image: gradle:jdk16
image: openjdk:17-alpine
variables:
GRADLE_OPTS: "-Dorg.gradle.daemon=false"
before_script:
- export GRADLE_USER_HOME=`pwd`/.gradle
......@@ -8,11 +11,30 @@ cache:
- .gradle/wrapper
- .gradle/caches
stages:
- build
- test
build:
stage: build
script: ./gradlew --build-cache assemble
cache:
key: "$CI_COMMIT_REF_NAME"
policy: push
paths:
- build
- .gradle
java:
stage: test
script:
- gradle test
script: ./gradlew test
artifacts:
when: always
reports:
junit: build/test-results/test/**/TEST-*.xml
cache:
key: "$CI_COMMIT_REF_NAME"
policy: pull
paths:
- build
- .gradle
\ No newline at end of file
......@@ -4,7 +4,6 @@
Ce projet est l'occasion de travailler sur les tuiles de Wang, qui sont une façon de paver le plan de façon colorée, et de générer des motifs à partir de contraintes locales.
## Membres du projet
## Membre du projet
- NOM prénom du premier participant
- NOM prénom du deuxième participant
- NOM prénom
plugins {
id 'application'
id "org.openjfx.javafxplugin" version "0.0.10"
id "org.openjfx.javafxplugin" version "0.0.13"
}
javafx {
version = "17"
version = "18.0.2"
modules = [ 'javafx.controls', 'javafx.fxml' ]
}
......@@ -13,15 +13,14 @@ repositories {
}
dependencies {
testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.1',
'org.assertj:assertj-core:3.21.0')
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
testImplementation('org.junit.jupiter:junit-jupiter-api:5.9.0',
'org.assertj:assertj-core:3.23.1')
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.9.0')
}
test {
useJUnitPlatform()
}
application {
mainClassName = "main.MainApp"
}
\ No newline at end of file
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
\ No newline at end of file
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MSYS* | MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
if %ERRORLEVEL% equ 0 goto mainEnd
:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega
......@@ -4,14 +4,13 @@ import javafx.scene.paint.Color;
import model.*;
import view.GridCanvas;
import java.util.List;
import java.util.Random;
public class GridController {
public static final Color COLOR_FIRST_NAME_ONE = Color.RED;
public static final Color COLOR_LAST_NAME_ONE = Color.BLUE;
public static final Color COLOR_FIRST_NAME_TWO = Color.GREEN;
public static final Color COLOR_LAST_NAME_TWO = Color.YELLOW;
public static final Color RED = Color.RED;
public static final Color BLUE = Color.BLUE;
public static final Color GREEN = Color.GREEN;
public static final Color YELLOW = Color.YELLOW;
Random random = new Random();
@FXML
public GridCanvas gridCanvas;
......@@ -44,57 +43,57 @@ public class GridController {
}
@FXML
public void updateFirstNameOneUniformTile(){
public void updateRed(){
// TODO : uncomment the code to test UniformTileGenerator
// updateGrid(new UniformTileGenerator(COLOR_FIRST_NAME_ONE));
// updateGrid(new UniformTileGenerator(RED));
}
@FXML
public void updateFirstNameTwoUniformTile() {
public void updateGreen() {
// TODO : uncomment the code to test UniformTileGenerator
// updateGrid(new UniformTileGenerator(COLOR_FIRST_NAME_TWO));
// updateGrid(new UniformTileGenerator(GREEN));
}
@FXML
public void updateLastNameOneUniformTile(){
public void updateBlue(){
// TODO : uncomment the code to test UniformTileGenerator
// updateGrid(new UniformTileGenerator(COLOR_LAST_NAME_ONE));
// updateGrid(new UniformTileGenerator(BLUE));
}
@FXML
public void updateLastNameTwoUniformTile() {
public void updateYellow() {
// TODO : uncomment the code to test UniformTileGenerator
// updateGrid(new UniformTileGenerator(COLOR_LAST_NAME_TWO));
// updateGrid(new UniformTileGenerator(YELLOW));
}
@FXML
public void updateRandomColorUniformTile(){
// TODO : uncomment the code to test RandomUniformTileGenerator
// updateGrid(new RandomUniformTileGenerator(List.of(COLOR_FIRST_NAME_ONE, COLOR_LAST_NAME_ONE, COLOR_LAST_NAME_TWO), random));
// updateGrid(new RandomUniformTileGenerator(List.of(RED, BLUE, YELLOW), random));
}
@FXML
public void updateRandomTruchetTile(){
// TODO : uncomment the code to test RandomRotatedTruchetTileGenerator
// updateGrid(new RandomRotatedTruchetTileGenerator(COLOR_FIRST_NAME_ONE, COLOR_LAST_NAME_ONE, random));
// updateGrid(new RandomRotatedTruchetTileGenerator(RED, BLUE, random));
}
@FXML
public void updateRandomWangTile() {
// TODO : uncomment the code to test RandomWangTileGenerator
// updateGrid(new RandomWangTileGenerator(List.of(COLOR_FIRST_NAME_ONE, COLOR_LAST_NAME_ONE, COLOR_FIRST_NAME_TWO, COLOR_LAST_NAME_TWO), random));
// updateGrid(new RandomWangTileGenerator(List.of(RED, BLUE, GREEN, YELLOW), random));
}
@FXML
public void updateRandomConstrainedWangTile() {
// TODO : uncomment the code to test RandomConstrainedWangTileGenerator
// updateGrid(new RandomConstrainedWangTileGenerator(List.of(COLOR_FIRST_NAME_ONE, COLOR_LAST_NAME_ONE, COLOR_FIRST_NAME_TWO, COLOR_LAST_NAME_TWO), random));
// updateGrid(new RandomConstrainedWangTileGenerator(List.of(RED, BLUE, GREEN, YELLOW), random));
}
@FXML
public void updateConstrainedTruchetTile() {
// TODO : uncomment the code to test ConstrainedRotatedTruchetTileGenerator
// updateGrid(new ConstrainedRotatedTruchetTileGenerator(COLOR_FIRST_NAME_ONE, COLOR_LAST_NAME_ONE, random));
// updateGrid(new ConstrainedRotatedTruchetTileGenerator(RED, BLUE, random));
}
@FXML
......@@ -102,14 +101,14 @@ public class GridController {
// TODO : uncomment the code to test RandomTileSetGenerator
/*
updateGrid(new RandomTileSetGenerator(List.of(
new WangTile(new Side[]{new ColoredSide(COLOR_LAST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_ONE)}),
new WangTile(new Side[]{new ColoredSide(COLOR_LAST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_ONE)}),
new WangTile(new Side[]{new ColoredSide(COLOR_LAST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_ONE), new ColoredSide(COLOR_LAST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_TWO)}),
new WangTile(new Side[]{new ColoredSide(COLOR_LAST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_ONE), new ColoredSide(COLOR_LAST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_TWO)}),
new WangTile(new Side[]{new ColoredSide(COLOR_FIRST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_TWO), new ColoredSide(COLOR_LAST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_ONE)}),
new WangTile(new Side[]{new ColoredSide(COLOR_FIRST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_TWO), new ColoredSide(COLOR_LAST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_ONE)}),
new WangTile(new Side[]{new ColoredSide(COLOR_FIRST_NAME_ONE), new ColoredSide(COLOR_FIRST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_TWO)}),
new WangTile(new Side[]{new ColoredSide(COLOR_FIRST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_TWO), new ColoredSide(COLOR_FIRST_NAME_TWO)})), random));
new WangTile(new Side[]{new ColoredSide(BLUE), new ColoredSide(RED), new ColoredSide(RED), new ColoredSide(RED)}),
new WangTile(new Side[]{new ColoredSide(YELLOW), new ColoredSide(RED), new ColoredSide(RED), new ColoredSide(RED)}),
new WangTile(new Side[]{new ColoredSide(BLUE), new ColoredSide(RED), new ColoredSide(BLUE), new ColoredSide(GREEN)}),
new WangTile(new Side[]{new ColoredSide(YELLOW), new ColoredSide(RED), new ColoredSide(BLUE), new ColoredSide(GREEN)}),
new WangTile(new Side[]{new ColoredSide(RED), new ColoredSide(GREEN), new ColoredSide(YELLOW), new ColoredSide(RED)}),
new WangTile(new Side[]{new ColoredSide(GREEN), new ColoredSide(GREEN), new ColoredSide(YELLOW), new ColoredSide(RED)}),
new WangTile(new Side[]{new ColoredSide(RED), new ColoredSide(GREEN), new ColoredSide(GREEN), new ColoredSide(GREEN)}),
new WangTile(new Side[]{new ColoredSide(GREEN), new ColoredSide(GREEN), new ColoredSide(GREEN), new ColoredSide(GREEN)})), random));
*/
}
......
......@@ -5,7 +5,6 @@ import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext;
import javafx.scene.paint.Color;
import model.*;
import java.util.List;
public class GridCanvas extends Canvas {
......@@ -50,7 +49,7 @@ public class GridCanvas extends Canvas {
public void draw(Grid tileGrid){
drawSquares(tileGrid);
strokeSquares(tileGrid);
strokeSquares();
}
private void drawSquares(Grid tileGrid) {
......@@ -61,16 +60,15 @@ public class GridCanvas extends Canvas {
}
}
private void strokeSquares(Grid tileGrid) {
private void strokeSquares() {
for(int row = 0; row < numberOfRows; row++)
for(int column = 0; column < numberOfColumns; column++){
Square square = tileGrid.getSquare(row, column);
strokeSquare(square, column * tileWidth, row * tileHeight);
strokeSquare(column * tileWidth, row * tileHeight);
}
}
private void strokeSquare(Square square, double x, double y) {
private void strokeSquare(double x, double y) {
PointType[] cornerTypes = PointType.values();
double[] xPoints = new double[cornerTypes.length];
double[] yPoints = new double[cornerTypes.length];
......@@ -82,16 +80,16 @@ public class GridCanvas extends Canvas {
for(CardinalDirection side : CardinalDirection.values()) {
int indexCorner0 = side.ordinal();
int indexCorner1 = (indexCorner0+1)%4;
strokeSquareSide(square, xPoints[indexCorner0], yPoints[indexCorner0], xPoints[indexCorner1], yPoints[indexCorner1], side);
strokeInternalTriangleSide(square, xPoints[indexCorner0],yPoints[indexCorner0],xPoints[indexCenter],yPoints[indexCenter], side);
strokeSquareSide(xPoints[indexCorner0], yPoints[indexCorner0], xPoints[indexCorner1], yPoints[indexCorner1]);
strokeInternalTriangleSide(xPoints[indexCorner0],yPoints[indexCorner0],xPoints[indexCenter],yPoints[indexCenter]);
}
}
private void strokeSquareSide(Square square, double x0, double y0, double x1, double y1, CardinalDirection side) {
private void strokeSquareSide(double x0, double y0, double x1, double y1) {
graphicsContext.strokeLine(x0, y0, x1, y1);
}
private void strokeInternalTriangleSide(Square square, double x0, double y0, double x1, double y1, CardinalDirection side) {
private void strokeInternalTriangleSide(double x0, double y0, double x1, double y1) {
graphicsContext.strokeLine(x0, y0, x1, y1);
}
......
......@@ -17,13 +17,13 @@
<Menu mnemonicParsing="false" text="Uniform Tiles">
<MenuItem mnemonicParsing="false" onAction="#updateEmptyUniformTile" text="Empty">
</MenuItem>
<MenuItem mnemonicParsing="false" onAction="#updateFirstNameOneUniformTile" text="Firstname 1">
<MenuItem mnemonicParsing="false" onAction="#updateRed" text="Red">
</MenuItem>
<MenuItem mnemonicParsing="false" onAction="#updateLastNameOneUniformTile" text="Lastname 1">
<MenuItem mnemonicParsing="false" onAction="#updateBlue" text="Blue">
</MenuItem>
<MenuItem mnemonicParsing="false" onAction="#updateFirstNameTwoUniformTile" text="Firstname 2">
<MenuItem mnemonicParsing="false" onAction="#updateGreen" text="Green">
</MenuItem>
<MenuItem mnemonicParsing="false" onAction="#updateLastNameTwoUniformTile" text="Lastname 2">
<MenuItem mnemonicParsing="false" onAction="#updateYellow" text="Yellow">
</MenuItem>
<MenuItem mnemonicParsing="false" onAction="#updateRandomColorUniformTile" text="Random color">
</MenuItem>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment