diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..87b738c 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..44e7c4d --- /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-5.2.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..af6708f --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## 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"' + +# 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, switch paths to Windows format before running java +if $cygwin ; 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=$((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" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6d57edc --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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 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" + +@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/jphp-gui-ext/package.php.yml b/jphp-gui-ext/package.php.yml index 98aaf0b..ac233fa 100644 --- a/jphp-gui-ext/package.php.yml +++ b/jphp-gui-ext/package.php.yml @@ -1,6 +1,6 @@ name: jphp-gui-ext -version: 2.1.3 +version: 2.1.4 description: GUI based on JavaFX 11 library. deps: @@ -30,6 +30,9 @@ gradle: history: + 2.1.4: + - Create wrappers for JavaFX transforms. + - Small EventProvider fixes. 2.1.2: - Small Fixes 2.1.1: diff --git a/jphp-gui-ext/sdk/php/gui/UXNode.php b/jphp-gui-ext/sdk/php/gui/UXNode.php index 7208b07..604982e 100644 --- a/jphp-gui-ext/sdk/php/gui/UXNode.php +++ b/jphp-gui-ext/sdk/php/gui/UXNode.php @@ -4,6 +4,7 @@ use php\gui\effect\UXEffect; use php\gui\effect\UXEffectPipeline; use php\gui\event\UXEvent; +use php\gui\transform\UXTransform; use php\lang\IllegalArgumentException; use php\gui\UXList; @@ -297,6 +298,11 @@ abstract class UXNode */ public $boundsInParent = ['x' => 0.0, 'y' => 0.0, 'z' => 0.0, 'width' => 0.0, 'height' => 0.0, 'depth' => 0.0]; + /** + * @var UXList of UXTransform + */ + public $transforms; + /** * UXNode constructor. */ diff --git a/jphp-gui-ext/sdk/php/gui/transform/UXAffine.php b/jphp-gui-ext/sdk/php/gui/transform/UXAffine.php new file mode 100644 index 0000000..9b2df1e --- /dev/null +++ b/jphp-gui-ext/sdk/php/gui/transform/UXAffine.php @@ -0,0 +1,48 @@ +{ + @Override + public Class[] getOperationClasses(){ + return new Class[]{MatrixType.class}; + } + + @Override + public MatrixType convert(Environment environment, TraceInfo traceInfo, Memory memory) throws Throwable{ + return MatrixType.valueOf(memory.toString()); + } + + @Override + public Memory unconvert(Environment environment, TraceInfo traceInfo, MatrixType matrixType) throws Throwable{ + return StringMemory.valueOf(matrixType.name()); + } +} diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/bind/Point2DMemoryOperation.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/bind/Point2DMemoryOperation.java new file mode 100644 index 0000000..8e6f408 --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/bind/Point2DMemoryOperation.java @@ -0,0 +1,31 @@ +package org.develnext.jphp.ext.javafx.bind; + +import javafx.geometry.Point2D; +import php.runtime.Memory; +import php.runtime.env.Environment; +import php.runtime.env.TraceInfo; +import php.runtime.memory.ArrayMemory; +import php.runtime.memory.support.MemoryOperation; + +public class Point2DMemoryOperation extends MemoryOperation{ + @Override + public Class[] getOperationClasses(){ + return new Class[]{Point2D.class}; + } + + @Override + public Point2D convert(Environment environment, TraceInfo traceInfo, Memory memory) throws Throwable{ + Memory[] values = memory.toValue(ArrayMemory.class).values(); + + if(values.length < 2){ + throw new IllegalArgumentException("Array length must be greater than or equal to two"); + } + + return new Point2D(values[0].toDouble(), values[1].toDouble()); + } + + @Override + public Memory unconvert(Environment environment, TraceInfo traceInfo, Point2D point2D) throws Throwable{ + return ArrayMemory.ofDoubles(point2D.getX(), point2D.getY()); + } +} diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/bind/Point3DMemoryOperation.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/bind/Point3DMemoryOperation.java new file mode 100644 index 0000000..630b845 --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/bind/Point3DMemoryOperation.java @@ -0,0 +1,32 @@ +package org.develnext.jphp.ext.javafx.bind; + +import javafx.geometry.Point2D; +import javafx.geometry.Point3D; +import php.runtime.Memory; +import php.runtime.env.Environment; +import php.runtime.env.TraceInfo; +import php.runtime.memory.ArrayMemory; +import php.runtime.memory.support.MemoryOperation; + +public class Point3DMemoryOperation extends MemoryOperation{ + @Override + public Class[] getOperationClasses(){ + return new Class[]{Point3D.class}; + } + + @Override + public Point3D convert(Environment environment, TraceInfo traceInfo, Memory memory) throws Throwable{ + Memory[] values = memory.toValue(ArrayMemory.class).values(); + + if(values.length < 3){ + throw new IllegalArgumentException("Array length must be greater than or equal to three"); + } + + return new Point3D(values[0].toDouble(), values[1].toDouble(), values[2].toDouble()); + } + + @Override + public Memory unconvert(Environment environment, TraceInfo traceInfo, Point3D point3D) throws Throwable{ + return ArrayMemory.ofDoubles(point3D.getX(), point3D.getY(), point3D.getZ()); + } +} diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/UXNode.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/UXNode.java index 445e87a..96e158b 100644 --- a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/UXNode.java +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/UXNode.java @@ -22,6 +22,7 @@ import javafx.scene.layout.Pane; import javafx.scene.layout.Region; import javafx.scene.paint.Color; +import javafx.scene.transform.Transform; import javafx.stage.Stage; import javafx.stage.Window; import org.develnext.jphp.ext.javafx.JavaFXExtension; @@ -142,6 +143,9 @@ interface WrappedInterface { @Property("classes") ObservableList styleClass(); + @Property() + ObservableList transforms(); + //@Property(hiddenInDebugInfo = true) @Nullable Object userData(); boolean contains(double localX, double localY); diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/animation/UXAnimation.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/animation/UXAnimation.java index c5cede3..3dce1ad 100644 --- a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/animation/UXAnimation.java +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/animation/UXAnimation.java @@ -5,6 +5,7 @@ import javafx.util.Duration; import org.develnext.jphp.ext.javafx.JavaFXExtension; import org.develnext.jphp.ext.javafx.support.EventProvider; +import org.develnext.jphp.ext.javafx.support.JavaFxUtils; import php.runtime.annotation.Reflection; import php.runtime.annotation.Reflection.Abstract; import php.runtime.annotation.Reflection.Name; @@ -72,13 +73,7 @@ public T getWrappedObject() { @Reflection.Signature @SuppressWarnings("unchecked") public void on(String event, Invoker invoker, String group) { - EventProvider eventProvider = EventProvider.get(getWrappedObject(), event); - - if (eventProvider != null) { - eventProvider.on(getWrappedObject(), event, group, invoker); - } else { - throw new IllegalArgumentException("Unable to find the '"+event+"' event type"); - } + JavaFxUtils.on(this.getWrappedObject(), event, invoker, group); } @Reflection.Signature @@ -89,13 +84,7 @@ public void on(String event, Invoker invoker) { @Reflection.Signature @SuppressWarnings("unchecked") public void off(String event, @Reflection.Nullable String group) { - EventProvider eventProvider = EventProvider.get(getWrappedObject(), event); - - if (eventProvider != null) { - eventProvider.off(getWrappedObject(), event, group); - } else { - throw new IllegalArgumentException("Unable to find the '"+event+"' event type"); - } + JavaFxUtils.off(this.getWrappedObject(), event, group); } @Reflection.Signature @@ -105,12 +94,6 @@ public void off(String event) { @Reflection.Signature public void trigger(String event, @Reflection.Nullable Event e) { - EventProvider eventProvider = EventProvider.get(getWrappedObject(), event); - - if (eventProvider != null) { - eventProvider.trigger(getWrappedObject(), event, e); - } else { - throw new IllegalArgumentException("Unable to find the '"+event+"' event type"); - } + JavaFxUtils.trigger(this.getWrappedObject(), event, e); } } diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXAffine.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXAffine.java new file mode 100644 index 0000000..c8e388f --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXAffine.java @@ -0,0 +1,97 @@ +package org.develnext.jphp.ext.javafx.classes.transform; + +import javafx.geometry.Point2D; +import javafx.geometry.Point3D; +import javafx.scene.transform.Affine; +import javafx.scene.transform.MatrixType; +import javafx.scene.transform.Rotate; +import javafx.scene.transform.Transform; +import org.develnext.jphp.ext.javafx.JavaFXExtension; +import php.runtime.annotation.Reflection.Name; +import php.runtime.annotation.Reflection.Property; +import php.runtime.annotation.Reflection.Signature; +import php.runtime.env.Environment; +import php.runtime.reflection.ClassEntity; + +@Name(JavaFXExtension.NS + "transform\\UXAffine") +public class UXAffine extends UXTransform{ + public UXAffine(Environment env, Affine wrappedObject){ + super(env, wrappedObject); + } + + public UXAffine(Environment env, ClassEntity clazz){ + super(env, clazz); + } + + interface WrappedInterface{ + @Name("appendArray") void append(double[] matrix, MatrixType type, int offset); + @Name("append2D") void append(double mxx, double mxy, double tx, double myx, double myy, double ty); + @Name("append3D") void append(double mxx, double mxy, double mxz, double tx, double myx, double myy, double myz, double ty, double mzx, double mzy, double mzz, double tz); + @Name("appendTransform") void append(Transform transform); + + void appendScale(double sx, double sy); + void appendScale(double sx, double sy, double sz); + void appendScale(double sx, double sy, double sz, Point3D pivot); + + void appendShear(double shx, double shy); + void appendShear(double shx, double shy, Point2D pivot); + + void appendTranslation(double tx, double ty); + void appendTranslation(double tx, double ty, double tz); + + @Name("appendRotation2D") void appendRotation(double angle); + @Name("appendRotation2D") void appendRotation(double angle, Point2D pivot); + + @Name("appendRotation3D") void appendRotation(double angle, Point3D pivot, Point3D axis); + + @Name("prependArray") void prepend(double[] matrix, MatrixType type, int offset); + @Name("prepend2D") void prepend(double mxx, double mxy, double tx, double myx, double myy, double ty); + @Name("prepend3D") void prepend(double mxx, double mxy, double mxz, double tx, double myx, double myy, double myz, double ty, double mzx, double mzy, double mzz, double tz); + @Name("prependTransform") void prepend(Transform transform); + + void prependScale(double sx, double sy); + void prependScale(double sx, double sy, double sz); + void prependScale(double sx, double sy, double sz, Point3D pivot); + + void prependShear(double shx, double shy); + void prependShear(double shx, double shy, Point2D pivot); + + void prependTranslation(double tx, double ty); + void prependTranslation(double tx, double ty, double dz); + + @Name("prependRotation2D") void prependRotation(double angle); + @Name("prependRotation2D") void prependRotation(double angle, Point2D pivot); + + @Name("prependRotation3D") void prependRotation(double angle, Point3D pivot, Point3D axis); + + void setElement(MatrixType type, int row, int column, double value); + + void setToIdentity(); + void setToTransform(Transform transform); + + @Property double mxx(); + @Property double mxy(); + @Property double mxz(); + + @Property double myx(); + @Property double myy(); + @Property double myz(); + + @Property double mzx(); + @Property double mzy(); + @Property double mzz(); + + @Property double tx(); + @Property double ty(); + @Property double tz(); + } + + @Signature + public void __construct(){ + __wrappedObject = new Affine(); + } + @Signature + public void __construct(Transform transform){ + __wrappedObject = new Affine(transform); + } +} diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXRotate.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXRotate.java new file mode 100644 index 0000000..052942b --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXRotate.java @@ -0,0 +1,55 @@ +package org.develnext.jphp.ext.javafx.classes.transform; + +import javafx.geometry.Point3D; +import javafx.scene.transform.Rotate; +import org.develnext.jphp.ext.javafx.JavaFXExtension; + +import php.runtime.annotation.Reflection.*; +import php.runtime.env.Environment; +import php.runtime.reflection.ClassEntity; + +@Name(JavaFXExtension.NS + "transform\\UXRotate") +public class UXRotate extends UXTransform{ + public UXRotate(Environment env, Rotate wrappedObject){ + super(env, wrappedObject); + } + + public UXRotate(Environment env, ClassEntity clazz){ + super(env, clazz); + } + + interface WrappedInterface{ + @Property double angle(); + + @Property double pivotX(); + @Property double pivotY(); + @Property double pivotZ(); + + @Property Point3D axis(); + } + + @Signature + public void __construct(){ + __wrappedObject = new Rotate(); + } + @Signature + public void __construct(double angle){ + __wrappedObject = new Rotate(angle); + } + @Signature + public void __construct(double angle, double pivotX){ + __wrappedObject = new Rotate(angle, pivotX, 0); + } + @Signature + public void __construct(double angle, double pivotX, double pivotY){ + __wrappedObject = new Rotate(angle, pivotX, pivotY); + } + @Signature + public void __construct(double angle, double pivotX, double pivotY, double pivotZ){ + __wrappedObject = new Rotate(angle, pivotX, pivotY, pivotZ); + } + @Signature + public void __construct(double angle, double pivotX, double pivotY, double pivotZ, Point3D axis){ + __wrappedObject = new Rotate(angle, pivotX, pivotY, pivotZ, axis); + } +} diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXScale.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXScale.java new file mode 100644 index 0000000..b41b6e8 --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXScale.java @@ -0,0 +1,49 @@ +package org.develnext.jphp.ext.javafx.classes.transform; + +import javafx.geometry.Point3D; +import javafx.scene.transform.Rotate; +import javafx.scene.transform.Scale; +import org.develnext.jphp.ext.javafx.JavaFXExtension; +import php.runtime.annotation.Reflection.Name; +import php.runtime.annotation.Reflection.Property; +import php.runtime.annotation.Reflection.Signature; +import php.runtime.env.Environment; +import php.runtime.reflection.ClassEntity; + +@Name(JavaFXExtension.NS + "transform\\UXScale") +public class UXScale extends UXTransform{ + public UXScale(Environment env, Scale wrappedObject){ + super(env, wrappedObject); + } + + public UXScale(Environment env, ClassEntity clazz){ + super(env, clazz); + } + + interface WrappedInterface{ + @Property double x(); + @Property double y(); + @Property double z(); + + @Property double pivotX(); + @Property double pivotY(); + @Property double pivotZ(); + } + + @Signature + public void __construct(){ + __wrappedObject = new Scale(); + } + @Signature + public void __construct(double x){ + __wrappedObject = new Scale(x, 1); + } + @Signature + public void __construct(double x, double y){ + __wrappedObject = new Scale(x, y); + } + @Signature + public void __construct(double x, double y, double z){ + __wrappedObject = new Scale(x, y, z); + } +} diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXShear.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXShear.java new file mode 100644 index 0000000..d8937ab --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXShear.java @@ -0,0 +1,42 @@ +package org.develnext.jphp.ext.javafx.classes.transform; + +import javafx.geometry.Point2D; +import javafx.scene.transform.Shear; +import org.develnext.jphp.ext.javafx.JavaFXExtension; +import php.runtime.annotation.Reflection.Name; +import php.runtime.annotation.Reflection.Property; +import php.runtime.annotation.Reflection.Signature; +import php.runtime.env.Environment; +import php.runtime.reflection.ClassEntity; + +@Name(JavaFXExtension.NS + "transform\\UXShear") +public class UXShear extends UXTransform{ + public UXShear(Environment env, Shear wrappedObject){ + super(env, wrappedObject); + } + + public UXShear(Environment env, ClassEntity clazz){ + super(env, clazz); + } + + interface WrappedInterface{ + @Property double x(); + @Property double y(); + + @Property double pivotX(); + @Property double pivotY(); + } + + @Signature + public void __construct(){ + __wrappedObject = new Shear(); + } + @Signature + public void __construct(Point2D position){ + __wrappedObject = new Shear(position.getX(), position.getY()); + } + @Signature + public void __construct(Point2D position, Point2D pivot){ + __wrappedObject = new Shear(position.getX(), position.getY(), pivot.getX(), pivot.getY()); + } +} diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXTransform.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXTransform.java new file mode 100644 index 0000000..ebf4e68 --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXTransform.java @@ -0,0 +1,103 @@ +package org.develnext.jphp.ext.javafx.classes.transform; + +import javafx.event.Event; +import javafx.geometry.Bounds; +import javafx.geometry.Point2D; +import javafx.geometry.Point3D; +import javafx.scene.transform.MatrixType; +import javafx.scene.transform.Transform; +import org.develnext.jphp.ext.javafx.JavaFXExtension; +import org.develnext.jphp.ext.javafx.support.EventProvider; +import org.develnext.jphp.ext.javafx.support.JavaFxUtils; +import php.runtime.annotation.Reflection.*; +import php.runtime.env.Environment; +import php.runtime.invoke.Invoker; +import php.runtime.lang.BaseWrapper; +import php.runtime.reflection.ClassEntity; + +import java.util.HashMap; +import java.util.Map; + +@Abstract +@Name(JavaFXExtension.NS + "transform\\UXTransform") +public class UXTransform extends BaseWrapper{ + public UXTransform(Environment env, T wrappedObject){ + super(env, wrappedObject); + } + + public UXTransform(Environment env, ClassEntity clazz){ + super(env, clazz); + } + + interface WrappedInterface{ + @Property boolean identity(); + @Property boolean type2D(); + + @Property double mxx(); + @Property double mxy(); + @Property double mxz(); + + @Property double myx(); + @Property double myy(); + @Property double myz(); + + @Property double mzx(); + @Property double mzy(); + @Property double mzz(); + + @Property double tx(); + @Property double ty(); + @Property double tz(); + + double determinant(); + double getElement(MatrixType type, int row, int column); + + //boolean similarTo(Transform transform, Bounds range, double maxDelta); + + double[] column(MatrixType type, int column); + double[] row(MatrixType type, int row); + + double[] toArray(MatrixType type); + + Transform createConcatenation(Transform transform); + Transform createInverse(); + + Point2D transform(double x, double y); + Point2D inverseTransform(double x, double y); + Point2D deltaTransform(double x, double y); + Point2D inverseDeltaTransform(double x, double y); + + Point3D transform(double x, double y, double z); + Point3D inverseTransform(double x, double y, double z); + Point3D deltaTransform(double x, double y, double z); + Point3D inverseDeltaTransform(double x, double y, double z); + } + + @Signature + public Transform __clone(){ + return getWrappedObject().clone(); + } + + @Signature + public void on(String event, Invoker invoker, String group){ + JavaFxUtils.on(this.getWrappedObject(), event, invoker, group); + } + @Signature + public void on(String event, Invoker invoker){ + on(event, invoker, "general"); + } + + @Signature + public void off(String event, Invoker invoker, String group){ + JavaFxUtils.off(this.getWrappedObject(), event, group); + } + @Signature + public void off(String event, Invoker invoker){ + JavaFxUtils.off(this.getWrappedObject(), event, null); + } + + @Signature + public void trigger(String eventName, Event event){ + JavaFxUtils.trigger(this.getWrappedObject(), eventName, event); + } +} \ No newline at end of file diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXTranslate.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXTranslate.java new file mode 100644 index 0000000..3d2ede1 --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/classes/transform/UXTranslate.java @@ -0,0 +1,45 @@ +package org.develnext.jphp.ext.javafx.classes.transform; + +import javafx.geometry.Point3D; +import javafx.scene.transform.Scale; +import javafx.scene.transform.Translate; +import org.develnext.jphp.ext.javafx.JavaFXExtension; +import php.runtime.annotation.Reflection.Name; +import php.runtime.annotation.Reflection.Property; +import php.runtime.annotation.Reflection.Signature; +import php.runtime.env.Environment; +import php.runtime.reflection.ClassEntity; + +@Name(JavaFXExtension.NS + "transform\\UXTranslate") +public class UXTranslate extends UXTransform{ + public UXTranslate(Environment env, Translate wrappedObject){ + super(env, wrappedObject); + } + + public UXTranslate(Environment env, ClassEntity clazz){ + super(env, clazz); + } + + interface WrappedInterface{ + @Property double x(); + @Property double y(); + @Property double z(); + } + + @Signature + public void __construct(){ + __wrappedObject = new Translate(); + } + @Signature + public void __construct(double x){ + __wrappedObject = new Translate(x, 1); + } + @Signature + public void __construct(double x, double y){ + __wrappedObject = new Translate(x, y); + } + @Signature + public void __construct(double x, double y, double z){ + __wrappedObject = new Translate(x, y, z); + } +} diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/support/JavaFxUtils.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/support/JavaFxUtils.java index 265b2bd..a0f5902 100644 --- a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/support/JavaFxUtils.java +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/support/JavaFxUtils.java @@ -74,7 +74,7 @@ public static void off(Object target, String event) { } @SuppressWarnings("unchecked") - public static void trigger(T object, String event, Event e) { + public static void trigger(T object, String event, Event e) { EventProvider eventProvider = EventProvider.get(object, event); if (eventProvider != null) { diff --git a/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/support/event/TransformEventProvider.java b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/support/event/TransformEventProvider.java new file mode 100644 index 0000000..0599c4d --- /dev/null +++ b/jphp-gui-ext/src-jvm/main/java/org/develnext/jphp/ext/javafx/support/event/TransformEventProvider.java @@ -0,0 +1,26 @@ +package org.develnext.jphp.ext.javafx.support.event; + +import javafx.event.EventHandler; +import javafx.scene.transform.Transform; +import org.develnext.jphp.ext.javafx.support.EventProvider; + +public class TransformEventProvider extends EventProvider{ + public Handler transformchangedHandler(){ + return new Handler(){ + @Override + public void set(Transform target, EventHandler eventHandler){ + target.setOnTransformChanged(eventHandler); + } + + @Override + public EventHandler get(Transform target){ + return target.getOnTransformChanged(); + } + }; + } + + @Override + public Class getTargetClass(){ + return Transform.class; + } +}