diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bd88eb9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,34 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/** +!**/src/test/** + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +/bin/ \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..d267ba6 --- /dev/null +++ b/build.gradle @@ -0,0 +1,37 @@ +plugins { + id 'java-library' +} + +project.ext { + lanyuVersion = "1.0.3" +} + +group = 'es.lanyu' +version = '0.0.1' +sourceCompatibility = 1.8 +targetCompatibility = 1.8 + +repositories { + jcenter() + maven { url 'https://jitpack.io' } +} + +dependencies { + testImplementation 'junit:junit:4.13' + api "com.github.LanyuEStudio:lanyuCommon:$lanyuVersion" +} + +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource +} + +task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir +} + +artifacts { + archives sourcesJar + archives javadocJar +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..62d4c05 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..bb8b2fc --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..fbd7c51 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/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 + ;; + 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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..5093609 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,104 @@ +@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=. +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="-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%" == "0" goto init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..c329cef --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'lanyu-graficos' \ No newline at end of file diff --git a/src/main/java/es/lanyu/commons/graficos/Coloreable.java b/src/main/java/es/lanyu/commons/graficos/Coloreable.java new file mode 100644 index 0000000..4ea5dc2 --- /dev/null +++ b/src/main/java/es/lanyu/commons/graficos/Coloreable.java @@ -0,0 +1,49 @@ +package es.lanyu.commons.graficos; + +import java.awt.Color; + +import es.lanyu.commons.math.MathUtils; + +public interface Coloreable { + + public static String leerDatosColor(Coloreable color) { + Color c = color.getColor(); + // Ver https://stackoverflow.com/a/18194652 + return "hex:" + color.getHexFromRGB() + + " | r:" + c.getRed() + ", g:" + c.getGreen() + ", b:" + c.getBlue() + + ", a:" + c.getAlpha(); + } + + static Color generarColor() { + return generarColor(false); + } + + static Color generarColor(boolean randomAlpha) { + return new Color(MathUtils.nextFloat(), MathUtils.nextFloat(), MathUtils.nextFloat(), + randomAlpha ? MathUtils.nextFloat() : 1f); + } + + static Coloreable generarColoreableRandom() { + return generarColoreableRandom(false); + } + + static Coloreable generarColoreableRandom(boolean randomAlpha) { + return generarColoreable(generarColor(randomAlpha)); + } + + static Coloreable generarColoreable(Color color) { + return new Coloreable() { + @Override + public Color getColor() { return color; } + }; + } + + Color getColor(); + + default String getHexFromRGB() { + String hex = Integer.toHexString(getColor().getRGB()); + int length = hex.length(); + return "#" + hex.substring(length - 6, length).toUpperCase(); + } + +} diff --git a/src/main/java/es/lanyu/commons/graficos/ConfiguracionVideo.java b/src/main/java/es/lanyu/commons/graficos/ConfiguracionVideo.java new file mode 100644 index 0000000..f7dc838 --- /dev/null +++ b/src/main/java/es/lanyu/commons/graficos/ConfiguracionVideo.java @@ -0,0 +1,34 @@ +package es.lanyu.commons.graficos; + +import es.lanyu.commons.config.ConfiguracionBase; +import es.lanyu.commons.config.Propiedades; + +public class ConfiguracionVideo extends ConfiguracionBase { + float velocidadZoom = 1.8f; + float maximoZoom = 1.1f; + String idCamaraActivada = "camaraActivada"; + + public ConfiguracionVideo(Propiedades propiedades) { + super(propiedades); + } + + public float getVelocidadZoom() { + return velocidadZoom; + } + + public float getMaximoZoom() { + return maximoZoom; + } + + public boolean isCamaraActivada() { + return Boolean.valueOf(getPropiedades().getProperty(idCamaraActivada)); + } + + public void setCamaraActivada(boolean camaraActivada) { + getPropiedades().actualizarPropiedad(idCamaraActivada, Boolean.toString(camaraActivada)); + } + + public void alternarCamaraActivada() { + setCamaraActivada(!isCamaraActivada()); + } +} diff --git a/src/main/java/es/lanyu/commons/graficos/Dibujable.java b/src/main/java/es/lanyu/commons/graficos/Dibujable.java new file mode 100644 index 0000000..9227861 --- /dev/null +++ b/src/main/java/es/lanyu/commons/graficos/Dibujable.java @@ -0,0 +1,7 @@ +package es.lanyu.commons.graficos; + +public interface Dibujable { + + T getSprite(); + +} diff --git a/src/main/java/es/lanyu/commons/graficos/Dibujo.java b/src/main/java/es/lanyu/commons/graficos/Dibujo.java new file mode 100644 index 0000000..87d704b --- /dev/null +++ b/src/main/java/es/lanyu/commons/graficos/Dibujo.java @@ -0,0 +1,5 @@ +package es.lanyu.commons.graficos; + +import es.lanyu.commons.movimiento.Posicionable; + +public interface Dibujo extends Dibujable, Posicionable { } diff --git a/src/main/java/es/lanyu/commons/graficos/Textureable.java b/src/main/java/es/lanyu/commons/graficos/Textureable.java new file mode 100644 index 0000000..af46789 --- /dev/null +++ b/src/main/java/es/lanyu/commons/graficos/Textureable.java @@ -0,0 +1,9 @@ +package es.lanyu.commons.graficos; + +import es.lanyu.commons.io.AsociableConArchivo; + +public interface Textureable extends AsociableConArchivo { + + T getTextura(); + +} diff --git a/src/test/java/es/lanyu/test/graficos/GraficosTest.java b/src/test/java/es/lanyu/test/graficos/GraficosTest.java new file mode 100644 index 0000000..af1a3b3 --- /dev/null +++ b/src/test/java/es/lanyu/test/graficos/GraficosTest.java @@ -0,0 +1,35 @@ +package es.lanyu.test.graficos; + +import static org.junit.Assert.assertTrue; + +import java.awt.Color; +import java.util.Arrays; +import java.util.List; +import java.util.function.Function; + +import org.junit.Test; + +import es.lanyu.commons.graficos.Coloreable; + +public class GraficosTest { + + @Test + public void colorTest() { + Coloreable c; + boolean alphaMenorDe16 = false, alphaMayorDe16 = false; + do { + c = Coloreable.generarColoreableRandom(true); + String hex = c.getHexFromRGB(); + Color color = c.getColor(); + List> funciones = Arrays.asList(Color::getRed, Color::getGreen, Color::getBlue); + for (int j = 1, k = 0; j < hex.length() - 1; j += 2, k++) { + boolean coincidencia = funciones.get(k).apply(color).equals(Integer.decode("#" + hex.substring(j, j + 2))); + assertTrue("No coinciden valores " + hex + " con " + color, coincidencia); + } + if (color.getAlpha() < 16) alphaMenorDe16 = true; + else alphaMayorDe16 = true; + System.out.println("Color generado: " + Coloreable.leerDatosColor(c)); + } while (!(alphaMenorDe16 && alphaMayorDe16)); + } + +}