Commit 455da912 authored by Rick van der Wal's avatar Rick van der Wal
Browse files

Improved snake rules, support for mouse handler

parent 0b1a9e37
......@@ -35,24 +35,29 @@ set[Message] aSnake_view_separated(M3 model)
, findClass(model, "Food")
, findClass(model, "World")
};
return { error("<getName(model, shapeClass)> is part of the model and should be moved to SnakeGame", createdClass)
return { error("<getName(model, shapeClass)> is part of the user interface and should be moved to SnakeGame", createdClass)
| createdClass <- createdClasses
, shapeClass <- shapeClasses
, shapeClass in model.extends[createdClass] || shapeClass in allTypeDependenciesLoc(model, createdClass)
};
//return { error("<allTypeDependenciesLoc(model, findClass(model, "Food"))>", findClass(model, "Main")) };
}
set[Message] aSnake_controller_separated(M3 model)
{
// Check if InputHandler is the only class that uses JavaFX EventHandler
// This is difficult because other classes can add event handlers to scenes using a lambda, in which case they don't need the EventHandler import, this won't work then
set[loc] eventClasses =
{ javafxSceneInputKeyEvent
, javafxSceneInputMouseEvent
};
set[loc] createdClasses =
{ findClass(model, "Main")
{ findClass(model, "Segment")
, findClass(model, "Snake")
, findClass(model, "Food")
, findClass(model, "World")
};
return { error("<getName(model, javafxEventEventHandler)> is part of the controller and should be moved to InputHandler", createdClass)
return { error("<getName(model, eventClass)> is part of the input and should be moved to InputHandler", createdClass)
| createdClass <- createdClasses
, javafxEventEventHandler in allTypeDependenciesLoc(model, createdClass)
, eventClass <- eventClasses
, eventClass in allTypeDependenciesLoc(model, createdClass)
};
}
......@@ -34,5 +34,6 @@ public loc javaUtilLock = |java+interface:///java/util/concurrent/locks/Lock|;
public loc javaUtilCondition = |java+interface:///java/util/concurrent/locks/Condition|;
public loc javafxAnimationTimeline = |java+class:///javafx/animation/Timeline|;
public loc javafxEventEventHandler = |java+interface:///javafx/event/EventHandler|;
public loc javafxSceneShapeCircle = |java+class:///javafx/scene/shape/Circle|;
public loc javafxSceneInputKeyEvent = |java+class:///javafx/scene/input/KeyEvent|;
public loc javafxSceneInputMouseEvent = |java+class:///javafx/scene/input/MouseEvent|;
**/bin/
**/build/
**/nbproject/private/
**/dist/
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="assignment-snake-example-solution" default="default" basedir=".">
<description>Builds, tests, and runs the project assignment-snake-example-solution.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="assignment-snake-example-solution-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build
build.xml.data.CRC32=9ad955a9
build.xml.script.CRC32=177edaf7
build.xml.stylesheet.CRC32=f85dc8f2@1.93.0.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=9ad955a9
nbproject/build-impl.xml.script.CRC32=5e8de1e6
nbproject/build-impl.xml.stylesheet.CRC32=f89f7d21@1.93.0.48
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
application.title=assignment-snake-example-solution
application.vendor=mkl
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.modulepath=\
${run.modulepath}
debug.test.classpath=\
${run.test.classpath}
debug.test.modulepath=\
${run.test.modulepath}
# Files in build.classes.dir which should be excluded from distribution jar
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/assignment-snake-example-solution.jar
dist.javadoc.dir=${dist.dir}/javadoc
dist.jlink.dir=${dist.dir}/jlink
dist.jlink.output=${dist.jlink.dir}/assignment-snake-example-solution
endorsed.classpath=
excludes=
file.reference.assignment-snake-example-solution-src=src
includes=**
jar.compress=false
javac.classpath=\
${libs.JavaFX_11.0.2.classpath}
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.external.vm=true
javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=13
javac.target=13
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.test.modulepath=\
${javac.modulepath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.html5=false
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
# The jlink additional root modules to resolve
jlink.additionalmodules=
# The jlink additional command line parameters
jlink.additionalparam=
jlink.launcher=true
jlink.launcher.name=assignment-snake-example-solution
main.class=snake.Main
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=default_platform
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project.
# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
# To set system properties for unit tests define test-sys-prop.name=value:
run.jvmargs=--add-modules javafx.controls
run.modulepath=\
${javac.modulepath}:\
${libs.JavaFX_11.0.2.classpath}
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
run.test.modulepath=\
${javac.test.modulepath}
source.encoding=UTF-8
src.dir=${file.reference.assignment-snake-example-solution-src}
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>assignment-snake-example-solution</name>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots/>
</data>
</configuration>
</project>
package snake;
import javafx.event.EventHandler;
import javafx.scene.input.KeyEvent;
import javafx.scene.input.MouseEvent;
/**
* Handles controls of a snake game, where the 'a' and 'd' keys can be used to move and 's' (un)pauses the game
*/
public class InputHandler {
private final EventHandler<KeyEvent> keyHandler;
private final EventHandler<MouseEvent> mouseHandler;
public InputHandler(World world) {
Snake snake = world.getSnake();
keyHandler = keyEvent -> {
switch (keyEvent.getCode()) {
case A:
snake.setDirection(snake.getDirection().rotateLeft());
break;
case D:
snake.setDirection(snake.getDirection().rotateRight());
break;
case S:
world.setRunning(!world.isRunning());
break;
}
keyEvent.consume();
};
mouseHandler = mouseEvent -> {
int x = (int) (mouseEvent.getX() / SnakeGame.SCALE);
int y = (int) (mouseEvent.getY() / SnakeGame.SCALE);
if(x >= 0 && y >= 0 && x < world.getSize() && y < world.getSize()) {
world.getFood().moveTo(x, y);
}
mouseEvent.consume();
};
}
public EventHandler<KeyEvent> getKeyHandler() {
return keyHandler;
}
public EventHandler<MouseEvent> getMouseHandler() {
return mouseHandler;
}
}
......@@ -25,7 +25,10 @@ public class Main extends Application {
Scene scene = new Scene(root);
scene.setOnKeyPressed(new InputHandler(world));
InputHandler inputHandler = new InputHandler(world);
scene.setOnKeyPressed(inputHandler.getKeyHandler());
scene.setOnMouseClicked(inputHandler.getMouseHandler());
primaryStage.setTitle("Snake");
primaryStage.setScene(scene);
......
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="assignment-snake-example-solution" default="default" basedir=".">
<description>Builds, tests, and runs the project assignment-snake-example-solution.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="assignment-snake-example-solution-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment