From e6b1b65d8a576b7aaf7ceb9b5fc2b3c8b901b8a6 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Mon, 20 May 2019 16:10:04 +0300 Subject: [PATCH 01/36] feat(project): initial project setup --- .gitignore | 10 + .travis.yml | 18 ++ build.gradle | 60 ++++++ gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 172 ++++++++++++++++++ gradlew.bat | 84 +++++++++ settings.gradle | 1 + .../labs/introtoprogramming/lab5/Main.java | 4 + .../introtoprogramming/lab5/MainTests.java | 4 + 9 files changed, 359 insertions(+) create mode 100644 .travis.yml create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/labs/introtoprogramming/lab5/Main.java create mode 100644 src/test/java/com/labs/introtoprogramming/lab5/MainTests.java diff --git a/.gitignore b/.gitignore index a1c2a23..0c8cbef 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,13 @@ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* + +# Intellij Idea +.idea +out + +# Gradle +.gradle +.idea/**/gradle.xml +.idea/**/libraries +build diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..9d8c5b3 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +sudo: false +language: java +jdk: + - oraclejdk8 +branches: + only: + - master + - dev + +before_install: + - chmod +x gradlew + - chmod +x gradle/wrapper/gradle-wrapper.jar + +script: + - ./gradlew test jacocoTestReport build + +after_success: + - bash <(curl -s https://codecov.io/bash) diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..96ce739 --- /dev/null +++ b/build.gradle @@ -0,0 +1,60 @@ +plugins { + id 'java' + id 'checkstyle' + id 'com.github.spotbugs' version '1.6.9' +} + +apply plugin: 'com.github.spotbugs' +apply plugin: 'jacoco' + +group 'com.labs.introtoprogramming' +version '1.0-SNAPSHOT' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' +} + +//noinspection GroovyAssignabilityCheck +task checkSpotBugsReport{ + doLast { + def xmlReport = spotbugsMain.reports.xml + if (!xmlReport.destination.exists()) return + def slurped = new XmlSlurper().parse(xmlReport.destination) + def report = "" + slurped['BugInstance'].eachWithIndex { bug, index -> + report += "${index + 1}. Spotted bug risk ${bug.@'type'} of category ${bug.@'category'} " + report += "in the following places" + bug['SourceLine'].each { place -> + report += "\n ${place.@'classname'} at lines ${place.@'start'}:${place.@'end'}" + } + } + if (report.length() > 1) { + logger.error "[SPOTBUGS]\n ${report}" + } + } +} + +spotbugsMain.finalizedBy checkSpotBugsReport + +spotbugs { + effort = "max" + reportLevel = "high" + ignoreFailures = false +} + +checkstyle { + toolVersion '8.17' +} + +jacocoTestReport { + reports { + xml.enabled true + html.enabled false + } +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b7aa0c4 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon May 20 15:40:32 EEST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /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="" + +# 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..e95643d --- /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= + +@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..58bd181 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'ProgrammingAssignment5' diff --git a/src/main/java/com/labs/introtoprogramming/lab5/Main.java b/src/main/java/com/labs/introtoprogramming/lab5/Main.java new file mode 100644 index 0000000..93e1708 --- /dev/null +++ b/src/main/java/com/labs/introtoprogramming/lab5/Main.java @@ -0,0 +1,4 @@ +package com.labs.introtoprogramming.lab5; + +public class Main { +} diff --git a/src/test/java/com/labs/introtoprogramming/lab5/MainTests.java b/src/test/java/com/labs/introtoprogramming/lab5/MainTests.java new file mode 100644 index 0000000..9e76a9e --- /dev/null +++ b/src/test/java/com/labs/introtoprogramming/lab5/MainTests.java @@ -0,0 +1,4 @@ +package com.labs.introtoprogramming.lab5; + +public class MainTests { +} From 7d139df59430d48f8ed8ad915462f0bfd099be78 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorchenko Date: Tue, 21 May 2019 09:31:02 +0300 Subject: [PATCH 02/36] feat(project): add README.md --- README.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..4b5f4f7 --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +# Introduction to programming - lab5 +[![Build Status](https://travis-ci.com/Brookoko/ProgrammingAssignment5.svg?branch=master)](https://travis-ci.com/Brookoko/ProgrammingAssignment5) +[![codecov](https://codecov.io/gh/Brookoko/ProgrammingAssignment5/branch/master/graph/badge.svg)](https://codecov.io/gh/Brookoko/ProgrammingAssignment5) + +Solution for [assignment #5](https://github.com/ProgramEngineeringKPI/Introduction-To-Programming/blob/master/labs_spring_2019/assignment_5.md). + +Variant: 0 + +This program render a 3d object onto a 2d plane. + +TODO: add usage here. + +Code is covered with tests ([junit](https://junit.org), [jacoco](https://www.eclemma.org/jacoco/)). + +[Checkstyle](https://checkstyle.sourceforge.net/) is used for code style checks. + +[Spotbugs](https://spotbugs.github.io/) - for static analysis. + +[Gradle](https://gradle.org) - for build automation. + +Authors: + - Nikita Volobuev + - Bohdan Fedorchenko + - Ekatereana Gricaenko From 256f8cabb145c266cfa283e498e48582bb683f62 Mon Sep 17 00:00:00 2001 From: Bohdan Fedorchenko Date: Wed, 22 May 2019 21:09:22 +0300 Subject: [PATCH 03/36] fix(project): correct misspelling --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4b5f4f7..748ca83 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Solution for [assignment #5](https://github.com/ProgramEngineeringKPI/Introducti Variant: 0 -This program render a 3d object onto a 2d plane. +This program renders 3d scenes. TODO: add usage here. From 74f6ad9c71e322e7b243dfe12ecedcec0fb4d783 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Wed, 22 May 2019 21:23:15 +0300 Subject: [PATCH 04/36] feat(project): add checkstyle --- config/checkstyle/checkstyle.xml | 252 +++++++++++++++++++++++++++++++ 1 file changed, 252 insertions(+) create mode 100644 config/checkstyle/checkstyle.xml diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 0000000..b11b7db --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e43a5155f04f2ad0166df39cf6673c81e396ac74 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Wed, 22 May 2019 21:30:56 +0300 Subject: [PATCH 05/36] feat(project): add gradle-wrapper.jar --- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 56172 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..28861d273a5d270fd8f65dd74570c17c9c507736 GIT binary patch literal 56172 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

ZM+x{iQDVZRnLYbdXrQjU&=u%hsN4|smH&B~F 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 b+=;!jU|P+J`>$CfFsoU|bwOU-ceCsYH7qU$ literal 0 HcmV?d00001 From aa3931998c5df6437fc7d23f8b720a0063d9a543 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sat, 25 May 2019 10:56:14 +0300 Subject: [PATCH 06/36] feat(project): change package name to labs.introtoprogramming.lab5 --- build.gradle | 2 +- src/main/java/com/labs/introtoprogramming/lab5/Main.java | 4 ---- src/main/java/labs/introtoprogramming/lab5/Main.java | 9 +++++++++ 3 files changed, 10 insertions(+), 5 deletions(-) delete mode 100644 src/main/java/com/labs/introtoprogramming/lab5/Main.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/Main.java diff --git a/build.gradle b/build.gradle index 96ce739..33bb38c 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { apply plugin: 'com.github.spotbugs' apply plugin: 'jacoco' -group 'com.labs.introtoprogramming' +group 'labs.introtoprogramming' version '1.0-SNAPSHOT' sourceCompatibility = 1.8 diff --git a/src/main/java/com/labs/introtoprogramming/lab5/Main.java b/src/main/java/com/labs/introtoprogramming/lab5/Main.java deleted file mode 100644 index 93e1708..0000000 --- a/src/main/java/com/labs/introtoprogramming/lab5/Main.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.labs.introtoprogramming.lab5; - -public class Main { -} diff --git a/src/main/java/labs/introtoprogramming/lab5/Main.java b/src/main/java/labs/introtoprogramming/lab5/Main.java new file mode 100644 index 0000000..0f51ee9 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/Main.java @@ -0,0 +1,9 @@ +package labs.introtoprogramming.lab5; + +public class Main { + + public static void main(String[] args) { + System.out.println("Hello World!"); + } + +} From 73d1fc6172b8651e2f3972a1aaf855173a294ac1 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sat, 25 May 2019 11:33:09 +0300 Subject: [PATCH 07/36] feat(project): basic structure --- .../labs/introtoprogramming/lab5/Main.java | 4 ++- .../lab5/config/Config.java | 4 +++ .../lab5/config/ConfigReader.java | 4 +++ .../exception/NotImplementedException.java | 13 ++++++++++ .../lab5/geometry/Vector3.java | 14 +++++++++++ .../lab5/graphics/Raster.java | 25 +++++++++++++++++++ .../lab5/io/obj/ObjReader.java | 4 +++ .../lab5/object/Sphere.java | 11 ++++++++ .../introtoprogramming/lab5/scene/Camera.java | 4 +++ .../lab5/scene/PointLight.java | 4 +++ .../introtoprogramming/lab5/scene/Scene.java | 14 +++++++++++ .../lab5/scene/SceneObject.java | 9 +++++++ 12 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/config/Config.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/config/ConfigReader.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/exception/NotImplementedException.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/graphics/Raster.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/io/obj/ObjReader.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/object/Sphere.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/Camera.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/PointLight.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/Scene.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java diff --git a/src/main/java/labs/introtoprogramming/lab5/Main.java b/src/main/java/labs/introtoprogramming/lab5/Main.java index 0f51ee9..e0c95fb 100644 --- a/src/main/java/labs/introtoprogramming/lab5/Main.java +++ b/src/main/java/labs/introtoprogramming/lab5/Main.java @@ -1,9 +1,11 @@ package labs.introtoprogramming.lab5; +import labs.introtoprogramming.lab5.exception.NotImplementedException; + public class Main { public static void main(String[] args) { - System.out.println("Hello World!"); + throw new NotImplementedException(); } } diff --git a/src/main/java/labs/introtoprogramming/lab5/config/Config.java b/src/main/java/labs/introtoprogramming/lab5/config/Config.java new file mode 100644 index 0000000..eb1930c --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/config/Config.java @@ -0,0 +1,4 @@ +package labs.introtoprogramming.lab5.config; + +public class Config { +} diff --git a/src/main/java/labs/introtoprogramming/lab5/config/ConfigReader.java b/src/main/java/labs/introtoprogramming/lab5/config/ConfigReader.java new file mode 100644 index 0000000..884ab1c --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/config/ConfigReader.java @@ -0,0 +1,4 @@ +package labs.introtoprogramming.lab5.config; + +public interface ConfigReader { +} diff --git a/src/main/java/labs/introtoprogramming/lab5/exception/NotImplementedException.java b/src/main/java/labs/introtoprogramming/lab5/exception/NotImplementedException.java new file mode 100644 index 0000000..b66429d --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/exception/NotImplementedException.java @@ -0,0 +1,13 @@ +package labs.introtoprogramming.lab5.exception; + +public class NotImplementedException extends RuntimeException { + + public NotImplementedException(String message) { + super(message); + } + + public NotImplementedException() { + this("Not implemented yet"); + } + +} diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java new file mode 100644 index 0000000..cfc0d2e --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java @@ -0,0 +1,14 @@ +package labs.introtoprogramming.lab5.geometry; + +public class Vector3 { + + private final double x; + private final double y; + private final double z; + + public Vector3(double x, double y, double z) { + this.x = x; + this.y = y; + this.z = z; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/graphics/Raster.java b/src/main/java/labs/introtoprogramming/lab5/graphics/Raster.java new file mode 100644 index 0000000..6470a2b --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/graphics/Raster.java @@ -0,0 +1,25 @@ +package labs.introtoprogramming.lab5.graphics; + +public class Raster { + + private final int width; + private final int height; + + private byte[][] red; + private byte[][] green; + private byte[][] blue; + + public Raster(int width, int height) { + this.width = width; + this.height = height; + this.red = new byte[width][height]; + this.green = new byte[width][height]; + this.blue = new byte[width][height]; + } + + public void setPixel(int x, int y, byte red, byte green, byte blue) { + this.red[x][y] = red; + this.green[x][y] = green; + this.blue[x][y] = blue; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/io/obj/ObjReader.java b/src/main/java/labs/introtoprogramming/lab5/io/obj/ObjReader.java new file mode 100644 index 0000000..76d29cc --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/io/obj/ObjReader.java @@ -0,0 +1,4 @@ +package labs.introtoprogramming.lab5.io.obj; + +public interface ObjReader { +} diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java new file mode 100644 index 0000000..d218e9c --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java @@ -0,0 +1,11 @@ +package labs.introtoprogramming.lab5.object; + +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.SceneObject; + +public class Sphere extends SceneObject { + + private Vector3 position; + private double radius; + +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java new file mode 100644 index 0000000..01b0769 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java @@ -0,0 +1,4 @@ +package labs.introtoprogramming.lab5.scene; + +public abstract class Camera extends SceneObject { +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/PointLight.java b/src/main/java/labs/introtoprogramming/lab5/scene/PointLight.java new file mode 100644 index 0000000..5c1d06e --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/PointLight.java @@ -0,0 +1,4 @@ +package labs.introtoprogramming.lab5.scene; + +public abstract class PointLight extends SceneObject { +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java b/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java new file mode 100644 index 0000000..82e5fcb --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java @@ -0,0 +1,14 @@ +package labs.introtoprogramming.lab5.scene; + +import java.awt.Color; +import java.util.List; + +public interface Scene { + + List getSceneObjects(); + + List getLights(); + + Color getBackgroundColor(); + +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java new file mode 100644 index 0000000..e8a059e --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java @@ -0,0 +1,9 @@ +package labs.introtoprogramming.lab5.scene; + +import labs.introtoprogramming.lab5.geometry.Vector3; + +public class SceneObject { + + private Vector3 position; + +} From bf4e59f21aba15d051f6ec1a1fb544fdb96822e0 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sat, 25 May 2019 20:48:46 +0300 Subject: [PATCH 08/36] feat(gui): raster renderer --- .../lab5/graphics/ArrayRaster.java | 61 ++++++++++++++ .../lab5/graphics/BufferedImageRaster.java | 53 ++++++++++++ .../lab5/graphics/Raster.java | 32 +++---- .../lab5/gui/RasterRendererComponent.java | 30 +++++++ .../introtoprogramming/lab5/gui/Window.java | 83 +++++++++++++++++++ .../lab5/graphics/ArrayRasterTests.java | 38 +++++++++ .../graphics/BufferedImageRasterTests.java | 45 ++++++++++ 7 files changed, 323 insertions(+), 19 deletions(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/graphics/ArrayRaster.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/gui/RasterRendererComponent.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/gui/Window.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/graphics/ArrayRasterTests.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/graphics/BufferedImageRasterTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/graphics/ArrayRaster.java b/src/main/java/labs/introtoprogramming/lab5/graphics/ArrayRaster.java new file mode 100644 index 0000000..8e5cad1 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/graphics/ArrayRaster.java @@ -0,0 +1,61 @@ +package labs.introtoprogramming.lab5.graphics; + +import java.awt.Color; +import java.awt.Image; +import java.awt.image.BufferedImage; + +public class ArrayRaster implements Raster { + + private final int width; + private final int height; + + private byte[][] red; + private byte[][] green; + private byte[][] blue; + + public ArrayRaster(int width, int height) { + this.width = width; + this.height = height; + this.red = new byte[width][height]; + this.green = new byte[width][height]; + this.blue = new byte[width][height]; + } + + public Image toImage() { + BufferedImage image = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_RGB); + for (int x = 0; x < width; x++) { + for (int y = 0; y < height; y++) { + image.setRGB(x, y, getPixelRGB(x, y)); + } + } + return image; + } + + public void setPixel(int x, int y, int rgb) { + this.red[x][y] = (byte) ((rgb >> 16) & 0xFF); + this.green[x][y] = (byte) ((rgb >> 8) & 0xFF); + this.blue[x][y] = (byte) (rgb & 0xFF); + } + + public void setPixel(int x, int y, byte red, byte green, byte blue) { + this.red[x][y] = red; + this.green[x][y] = green; + this.blue[x][y] = blue; + } + + public Color getPixelColor(int x, int y) { + return new Color(red[x][y] & 255, green[x][y] & 255, blue[x][y] & 255); + } + + public int getPixelRGB(int x, int y) { + return 0xFF << 24 | ((red[x][y] & 0xFF) << 16) | ((green[x][y] & 0xFF) << 8) | (blue[x][y] & 0xFF); + } + + public int getWidth() { + return width; + } + + public int getHeight() { + return height; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java b/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java new file mode 100644 index 0000000..bfc0af4 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java @@ -0,0 +1,53 @@ +package labs.introtoprogramming.lab5.graphics; + +import java.awt.Color; +import java.awt.GraphicsEnvironment; +import java.awt.Image; +import java.awt.image.BufferedImage; + +public class BufferedImageRaster implements Raster { + + private final BufferedImage image; + + public BufferedImageRaster(int width, int height) { + // Image Data Model compatible with default screen device to avoid any conversions while rendering + image = GraphicsEnvironment.getLocalGraphicsEnvironment() + .getDefaultScreenDevice() + .getDefaultConfiguration().createCompatibleImage(width, height); + } + + @Override + public Image toImage() { + return image; + } + + @Override + public void setPixel(int x, int y, int rgb) { + image.setRGB(x, y, rgb); + } + + @Override + public void setPixel(int x, int y, byte red, byte green, byte blue) { + image.setRGB(x, y, 0xFF << 24 | ((red & 0xFF) << 16) | ((green & 0xFF) << 8) | (blue & 0xFF)); + } + + @Override + public Color getPixelColor(int x, int y) { + return new Color(image.getRGB(x, y)); + } + + @Override + public int getPixelRGB(int x, int y) { + return image.getRGB(x, y); + } + + @Override + public int getWidth() { + return image.getWidth(); + } + + @Override + public int getHeight() { + return image.getHeight(); + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/graphics/Raster.java b/src/main/java/labs/introtoprogramming/lab5/graphics/Raster.java index 6470a2b..be115ce 100644 --- a/src/main/java/labs/introtoprogramming/lab5/graphics/Raster.java +++ b/src/main/java/labs/introtoprogramming/lab5/graphics/Raster.java @@ -1,25 +1,19 @@ package labs.introtoprogramming.lab5.graphics; -public class Raster { +import java.awt.Color; +import java.awt.Image; - private final int width; - private final int height; +public interface Raster { - private byte[][] red; - private byte[][] green; - private byte[][] blue; + Image toImage(); - public Raster(int width, int height) { - this.width = width; - this.height = height; - this.red = new byte[width][height]; - this.green = new byte[width][height]; - this.blue = new byte[width][height]; - } + void setPixel(int x, int y, int rgb); + void setPixel(int x, int y, byte red, byte green, byte blue); - public void setPixel(int x, int y, byte red, byte green, byte blue) { - this.red[x][y] = red; - this.green[x][y] = green; - this.blue[x][y] = blue; - } -} + Color getPixelColor(int x, int y); + int getPixelRGB(int x, int y); + + int getWidth(); + int getHeight(); + +} \ No newline at end of file diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/RasterRendererComponent.java b/src/main/java/labs/introtoprogramming/lab5/gui/RasterRendererComponent.java new file mode 100644 index 0000000..e12f7bd --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/gui/RasterRendererComponent.java @@ -0,0 +1,30 @@ +package labs.introtoprogramming.lab5.gui; + +import java.awt.Canvas; +import java.awt.Graphics; +import labs.introtoprogramming.lab5.graphics.Raster; + +public class RasterRendererComponent extends Canvas { + + private Raster raster; + + private int framesRendered = 0; + + @Override + public void update(Graphics g) { + g.drawImage(raster.toImage(), 0, 0, this); + framesRendered++; + } + + void setRaster(Raster raster) { + this.raster = raster; + } + + int getFramesRendered() { + return framesRendered; + } + + void resetFramesRendered() { + this.framesRendered = 0; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/Window.java b/src/main/java/labs/introtoprogramming/lab5/gui/Window.java new file mode 100644 index 0000000..2759e57 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/gui/Window.java @@ -0,0 +1,83 @@ +package labs.introtoprogramming.lab5.gui; + +import java.awt.Toolkit; +import javax.swing.JFrame; +import labs.introtoprogramming.lab5.graphics.Raster; + +public class Window { + + private static final int FPS_UPDATE_RATE = 100; + + private JFrame frame; + private RasterRendererComponent renderer; + private Toolkit toolkit; + private String title; + + private boolean displayFPS = false; + private long prevFPSTimestamp = -1; + + public Window() { + System.setProperty("sun.java2d.opengl", "true"); + + this.toolkit = Toolkit.getDefaultToolkit(); + + this.frame = new JFrame(); + this.frame.setLayout(null); + this.frame.setResizable(false); + + this.renderer = new RasterRendererComponent(); + this.frame.add(renderer); + + this.frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + } + + private void updateFPSCounter() { + if (displayFPS && renderer.getFramesRendered() >= FPS_UPDATE_RATE) { + long currentTime = System.currentTimeMillis(); + if (prevFPSTimestamp != -1) { + double fps = Math.round(1000.0 / ((double) (currentTime - prevFPSTimestamp) / renderer.getFramesRendered())); + frame.setTitle(title + " " + ((int) fps) + "FPS"); + } + prevFPSTimestamp = currentTime; + renderer.resetFramesRendered(); + } + } + + public void update() { + renderer.repaint(); + toolkit.sync(); + + updateFPSCounter(); + } + + public void show() { + frame.setVisible(true); + } + + public void setDimensions(int width, int height) { + // Centered on the screen + frame.setBounds(getScreenWidth() / 2 - width / 2, getScreenHeight() / 2 - height / 2, width, height); + renderer.setBounds(0, 0, width, height); + } + + private int getScreenWidth() { + return toolkit.getScreenSize().width; + } + + private int getScreenHeight() { + return toolkit.getScreenSize().height; + } + + public void setTitle(String text) { + this.title = text; + frame.setTitle(text); + } + + public void setRaster(Raster raster) { + this.renderer.setRaster(raster); + } + + public void setDisplayFPS(boolean displayFPS) { + this.displayFPS = displayFPS; + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/graphics/ArrayRasterTests.java b/src/test/java/labs/introtoprogramming/lab5/graphics/ArrayRasterTests.java new file mode 100644 index 0000000..abdc292 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/graphics/ArrayRasterTests.java @@ -0,0 +1,38 @@ +package labs.introtoprogramming.lab5.graphics; + +import static org.junit.Assert.assertEquals; + +import java.awt.Color; +import java.awt.image.BufferedImage; +import org.junit.Test; + +public class ArrayRasterTests { + + @Test + public void testSetPixelRGB() { + Raster raster = new ArrayRaster(100, 100); + raster.setPixel(0, 0, 42); + assertEquals(42, raster.getPixelRGB(0, 0) & 0xFFFFFF); + } + + @Test + public void testSetPixel() { + Raster raster = new ArrayRaster(100, 100); + raster.setPixel(1, 2, (byte) 1, (byte) 2, (byte) 3); + assertEquals(new Color(1, 2, 3).getRGB(), raster.getPixelRGB(1, 2)); + } + + @Test + public void testGetPixelColor() { + Raster raster = new ArrayRaster(100, 100); + raster.setPixel(1, 2, (byte) 255, (byte) 0, (byte) 0); + assertEquals(Color.RED, raster.getPixelColor(1, 2)); + } + + @Test + public void testToImage() { + Raster raster = new ArrayRaster(2, 2); + raster.setPixel(1, 1, Color.RED.getRGB()); + assertEquals(Color.RED.getRGB(), ((BufferedImage) raster.toImage()).getRGB(1, 1)); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/graphics/BufferedImageRasterTests.java b/src/test/java/labs/introtoprogramming/lab5/graphics/BufferedImageRasterTests.java new file mode 100644 index 0000000..3d24293 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/graphics/BufferedImageRasterTests.java @@ -0,0 +1,45 @@ +package labs.introtoprogramming.lab5.graphics; + +import static org.junit.Assert.assertEquals; + +import java.awt.Color; +import java.awt.image.BufferedImage; +import org.junit.Test; + +public class BufferedImageRasterTests { + + @Test + public void testGetDimensions() { + Raster raster = new BufferedImageRaster(101, 102); + assertEquals(101, raster.getWidth()); + assertEquals(102, raster.getHeight()); + } + + @Test + public void testSetPixelRGB() { + Raster raster = new BufferedImageRaster(100, 100); + raster.setPixel(0, 0, 42); + assertEquals(42, raster.getPixelRGB(0, 0) & 0xFFFFFF); + } + + @Test + public void testSetPixel() { + Raster raster = new BufferedImageRaster(100, 100); + raster.setPixel(1, 2, (byte) 1, (byte) 2, (byte) 3); + assertEquals(new Color(1, 2, 3).getRGB(), raster.getPixelRGB(1, 2)); + } + + @Test + public void testGetPixelColor() { + Raster raster = new BufferedImageRaster(100, 100); + raster.setPixel(1, 2, (byte) 255, (byte) 0, (byte) 0); + assertEquals(Color.RED, raster.getPixelColor(1, 2)); + } + + @Test + public void testToImage() { + Raster raster = new BufferedImageRaster(2, 2); + raster.setPixel(1, 1, Color.RED.getRGB()); + assertEquals(Color.RED.getRGB(), ((BufferedImage) raster.toImage()).getRGB(1, 1)); + } +} From bd49c8b6380ac78740a14f2c5e9fa1390b73540f Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Mon, 27 May 2019 21:01:17 +0300 Subject: [PATCH 09/36] fix(gradle): set awt headless --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 33bb38c..a353bf9 100644 --- a/build.gradle +++ b/build.gradle @@ -20,6 +20,8 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' } +System.setProperty("java.awt.headless", "true"); + //noinspection GroovyAssignabilityCheck task checkSpotBugsReport{ doLast { From 62387d81e681a6f2296ffe18cb9efc35fa352ba2 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Mon, 27 May 2019 21:47:54 +0300 Subject: [PATCH 10/36] fix(BufferedImageRaster): support headless environments --- build.gradle | 2 -- .../lab5/graphics/BufferedImageRaster.java | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index a353bf9..33bb38c 100644 --- a/build.gradle +++ b/build.gradle @@ -20,8 +20,6 @@ dependencies { testCompile group: 'junit', name: 'junit', version: '4.12' } -System.setProperty("java.awt.headless", "true"); - //noinspection GroovyAssignabilityCheck task checkSpotBugsReport{ doLast { diff --git a/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java b/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java index bfc0af4..874b74e 100644 --- a/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java +++ b/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java @@ -11,9 +11,13 @@ public class BufferedImageRaster implements Raster { public BufferedImageRaster(int width, int height) { // Image Data Model compatible with default screen device to avoid any conversions while rendering - image = GraphicsEnvironment.getLocalGraphicsEnvironment() + if (!GraphicsEnvironment.isHeadless()) { + image = GraphicsEnvironment.getLocalGraphicsEnvironment() .getDefaultScreenDevice() .getDefaultConfiguration().createCompatibleImage(width, height); + } else { + image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + } } @Override From f6118d963878df6374d28d3e16ebab900ccf8420 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Sun, 26 May 2019 11:07:57 +0300 Subject: [PATCH 11/36] feat (scene): add basic scene rendering --- .../lab5/exception/NoCamerException.java | 12 ++++ .../introtoprogramming/lab5/geometry/Ray.java | 37 ++++++++++ .../lab5/geometry/Vector3.java | 71 +++++++++++++++++++ .../lab5/object/Sphere.java | 35 ++++++++- .../lab5/scene/BasicRender.java | 62 ++++++++++++++++ .../lab5/scene/BasicScene.java | 46 ++++++++++++ .../introtoprogramming/lab5/scene/Camera.java | 18 +++++ .../introtoprogramming/lab5/scene/Mesh.java | 19 +++++ .../introtoprogramming/lab5/scene/Scene.java | 3 + .../lab5/scene/SceneObject.java | 32 ++++++++- .../lab5/scene/SceneRender.java | 9 +++ .../lab5/scene/Transform.java | 47 ++++++++++++ 12 files changed, 389 insertions(+), 2 deletions(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/exception/NoCamerException.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/BasicRender.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/SceneRender.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/Transform.java diff --git a/src/main/java/labs/introtoprogramming/lab5/exception/NoCamerException.java b/src/main/java/labs/introtoprogramming/lab5/exception/NoCamerException.java new file mode 100644 index 0000000..6fe70b0 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/exception/NoCamerException.java @@ -0,0 +1,12 @@ +package labs.introtoprogramming.lab5.exception; + +public class NoCamerException extends RuntimeException { + + public NoCamerException(String message) { + super(message); + } + + public NoCamerException() { + this("No camera found"); + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java new file mode 100644 index 0000000..a490cb5 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java @@ -0,0 +1,37 @@ +package labs.introtoprogramming.lab5.geometry; + +public class Ray { + private Vector3 origin; + private Vector3 direction; + private double t; + + public Ray(Vector3 origin, Vector3 direction, double t) { + this.origin = origin; + this.direction = direction; + this.t = t; + } + + public Ray(Vector3 origin, Vector3 direction) { + this(origin, direction, 1); + } + + public void setMultiplier(double t) { + this.t = t; + } + + public double getMultiplier() { + return t; + } + + public Vector3 getOrigin() { + return origin; + } + + public Vector3 getDirection() { + return direction; + } + + public Vector3 getPoint() { + return origin.add(direction.multiply(t)); + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java index cfc0d2e..d2a6b59 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java @@ -11,4 +11,75 @@ public Vector3(double x, double y, double z) { this.y = y; this.z = z; } + + public double magnitude() { + return Math.sqrt(sqrtMagnitude()); + } + + public double sqrtMagnitude() { + return x * x + y * y + z * z; + } + + public Vector3 normalize() { + double magnitude = magnitude(); + return new Vector3(x / magnitude, y / magnitude, z / magnitude); + } + + public double distance(Vector3 target) { + double X = Math.pow(target.x - x, 2); + double Y = Math.pow(target.y - y, 2); + double Z = Math.pow(target.z - z, 2); + return Math.sqrt(X + Y + Z); + } + + public double dotProduct(Vector3 target) { + return target.x * x + target.y * y + target.z * z; + } + + public Vector3 multiply(double t) { + return new Vector3(x * t, y * t, z * t); + } + + public Vector3 subtract(Vector3 target) { + return new Vector3(x - target.x, y - target.y, z - target.z); + } + + public Vector3 add(Vector3 target) { + return new Vector3(x + target.x, y + target.y, z + target.z); + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof Vector3)) return false; + if (obj == this) return true; + Vector3 vector = (Vector3) obj; + return Math.abs(vector.x - x) < 1e-10 && + Math.abs(vector.y - y) < 1e-10 && + Math.abs(vector.z - z) < 1e-10; + } + + @Override + public int hashCode() { + return (int) (x + y + z); + } + + public static Vector3 zero() { + return new Vector3(0, 0, 0); + } + + public static Vector3 right() { + return new Vector3(1, 0, 0); + } + + public static Vector3 up() { + return new Vector3(0, 1, 0); + } + + public static Vector3 forward() { + return new Vector3(0, 0, 1); + } + + public static Vector3 one() { + return new Vector3(1, 1, 1); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java index d218e9c..55e233a 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java @@ -1,11 +1,44 @@ package labs.introtoprogramming.lab5.object; +import labs.introtoprogramming.lab5.geometry.Ray; import labs.introtoprogramming.lab5.geometry.Vector3; import labs.introtoprogramming.lab5.scene.SceneObject; public class Sphere extends SceneObject { - private Vector3 position; private double radius; + public Sphere(Vector3 position, double radius) { + super(position); + this.radius = radius; + } + + @Override + public boolean intersect(Ray ray) { + Vector3 originToCenter = transform.position().subtract(ray.getOrigin()); + double distToCenter = originToCenter.dotProduct(ray.getDirection()); + double sqrtDistToRay = originToCenter.sqrtMagnitude() - distToCenter * distToCenter; + if (sqrtDistToRay > radius * radius) { + return false; + } + double distFromCenterToIntersection = Math.sqrt( + radius * radius - sqrtDistToRay); + double firstIntersection = distToCenter - distFromCenterToIntersection; + double secondIntersection = distToCenter + distFromCenterToIntersection; + double intersection; + if (firstIntersection < 0) { + if (secondIntersection < 0) { + return false; + } + intersection = secondIntersection; + } else { + if (firstIntersection > secondIntersection) { + intersection = secondIntersection; + } else { + intersection = firstIntersection; + } + } + ray.setMultiplier(intersection); + return true; + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRender.java new file mode 100644 index 0000000..d937c5d --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRender.java @@ -0,0 +1,62 @@ +package labs.introtoprogramming.lab5.scene; + +import labs.introtoprogramming.lab5.exception.NoCamerException; +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.graphics.Raster; + +import java.awt.Color; +import java.util.List; +import java.util.stream.Collectors; + +public class BasicRender implements SceneRender { + private List intractable; + private int width = 1920; // Temporary value while Raster is not implemented. + private int height = 1280; // It will be replaced with raster.getWidth() and raster.getHeight(). + + @Override + public void render(Scene scene, Raster raster) { + Camera camera = scene.getCamera().orElseThrow(NoCamerException::new); + intractable = scene.getSceneObjects().stream() + .filter(obj -> !(obj instanceof PointLight) && !(obj instanceof Camera)) + .collect(Collectors.toList()); + Vector3 pos = camera.getTransform().position(); + double aspectRation = (double) width / height; + double fieldOfView = Math.tan(camera.fieldOfView() / 2); + for (int y = 0; y < height; y++) { + double normalizedY = 1 - 2 * (y + 0.5) / height; + double cameraY = (1 - 2 * normalizedY) * fieldOfView; + for (int x = 0; x < width; x++) { + double normalizedX = 2 * (x + 0.5) / width - 1; + double cameraX = (2 * normalizedX - 1) * aspectRation * fieldOfView; + Vector3 direction = new Vector3(cameraX, cameraY, -1).normalize(); + Ray primaryRay = new Ray(pos, direction); + Color color = getColor(primaryRay, scene); + raster.setPixel(x, y, + (byte) color.getRed(), + (byte) color.getGreen(), + (byte) color.getBlue()); + } + } + } + + private Color getColor(Ray primaryRay, Scene scene) { + SceneObject obj = findInteraction(primaryRay); + return obj != null ? obj.getMesh().color() : scene.getBackgroundColor(); + } + + private SceneObject findInteraction(Ray primaryRay) { + SceneObject intersection = null; + double minDistance = Double.POSITIVE_INFINITY; + for (SceneObject obj : intractable) { + double distance = obj.getTransform().position().distance(primaryRay.getOrigin()); + if (distance < minDistance) { + if (obj.intersect(primaryRay)) { + minDistance = distance; + intersection = obj; + } + } + } + return intersection; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java new file mode 100644 index 0000000..ab695bc --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java @@ -0,0 +1,46 @@ +package labs.introtoprogramming.lab5.scene; + +import java.awt.Color; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +public class BasicScene implements Scene { + private List entities; + private Color background; + + public BasicScene(List entities, Color background) { + this.entities = entities; + this.background = background; + } + + public BasicScene(List entities) { + this(entities, new Color(0, 0, 0)); + } + + @Override + public List getSceneObjects() { + return entities; + } + + @Override + public List getLights() { + return entities.stream() + .filter(obj -> obj instanceof PointLight) + .map(obj -> (PointLight) obj) + .collect(Collectors.toList()); + } + + @Override + public Optional getCamera() { + return entities.stream() + .filter(obj -> obj instanceof Camera) + .map(obj -> (Camera) obj) + .findFirst(); + } + + @Override + public Color getBackgroundColor() { + return background; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java index 01b0769..8ab4e96 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java @@ -1,4 +1,22 @@ package labs.introtoprogramming.lab5.scene; public abstract class Camera extends SceneObject { + private double size; + + public Camera(Transform transform, double size) { + super(transform); + this.size = size; + } + + public Camera(Transform transform) { + this(transform, 1); + } + + public double size() { + return size; + } + + public double fieldOfView() { + return 2 * Math.atan(size); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java b/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java new file mode 100644 index 0000000..e431317 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java @@ -0,0 +1,19 @@ +package labs.introtoprogramming.lab5.scene; + +import java.awt.Color; + +public class Mesh { + public Color color; + + public Mesh(Color color) { + this.color = color; + } + + public Mesh() { + this(new Color(255, 255, 255)); + } + + public Color color() { + return color; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java b/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java index 82e5fcb..dad60a4 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java @@ -2,6 +2,7 @@ import java.awt.Color; import java.util.List; +import java.util.Optional; public interface Scene { @@ -9,6 +10,8 @@ public interface Scene { List getLights(); + Optional getCamera(); + Color getBackgroundColor(); } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java index e8a059e..c0f5a2c 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java @@ -1,9 +1,39 @@ package labs.introtoprogramming.lab5.scene; +import labs.introtoprogramming.lab5.geometry.Ray; import labs.introtoprogramming.lab5.geometry.Vector3; public class SceneObject { - private Vector3 position; + protected Transform transform; + protected Mesh mesh; + public SceneObject(Transform transform, Mesh mesh) { + this.transform = transform; + this.mesh = mesh; + } + + public SceneObject(Transform transform) { + this(transform, new Mesh()); + } + + public SceneObject(Vector3 position) { + this(new Transform(position), new Mesh()); + } + + public SceneObject() { + this(new Transform(), new Mesh()); + } + + public Transform getTransform() { + return transform; + } + + public Mesh getMesh() { + return mesh; + } + + public boolean intersect(Ray ray) { + return false; + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneRender.java new file mode 100644 index 0000000..1e30807 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneRender.java @@ -0,0 +1,9 @@ +package labs.introtoprogramming.lab5.scene; + +import labs.introtoprogramming.lab5.graphics.Raster; + +public interface SceneRender { + + void render(Scene scene, Raster raster); + +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java b/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java new file mode 100644 index 0000000..5de37a9 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java @@ -0,0 +1,47 @@ +package labs.introtoprogramming.lab5.scene; + +import labs.introtoprogramming.lab5.geometry.Vector3; + +public class Transform { + private Vector3 position; + private Vector3 rotation; + private Vector3 scale; + + public Transform(Vector3 position, Vector3 rotation) { + this.position = position; + this.rotation = rotation; + this.scale = Vector3.one(); + } + + public Transform(Vector3 position) { + this(position, Vector3.zero()); + } + + public Transform() { + this(Vector3.zero(), Vector3.zero()); + } + + public Vector3 position() { + return position.multiply(1); + } + + public Vector3 rotation() { + return rotation.multiply(1); + } + + public Vector3 scale() { + return scale.multiply(1); + } + + public void setPosition(Vector3 position) { + this.position = position; + } + + public void setRotation(Vector3 rotation) { + this.rotation = rotation; + } + + public void setScale(Vector3 scale) { + this.scale = scale; + } +} From fd27860c8d5cf1a6cc9abddf6b135ce30313e958 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Mon, 27 May 2019 13:42:33 +0300 Subject: [PATCH 12/36] refactor(scene): optimaze scene rendering --- .../introtoprogramming/lab5/geometry/Ray.java | 4 ++ .../lab5/geometry/Vector3.java | 37 +++++++++++++------ .../lab5/object/Sphere.java | 5 ++- .../introtoprogramming/lab5/scene/Mesh.java | 3 +- .../{BasicRender.java => RasterRender.java} | 12 ++++-- .../lab5/scene/SceneObject.java | 5 --- .../lab5/scene/SceneRender.java | 4 +- 7 files changed, 44 insertions(+), 26 deletions(-) rename src/main/java/labs/introtoprogramming/lab5/scene/{BasicRender.java => RasterRender.java} (89%) diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java index a490cb5..4dec8e7 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java @@ -31,6 +31,10 @@ public Vector3 getDirection() { return direction; } + public void setDirection(Vector3 direction) { + this.direction = direction; + } + public Vector3 getPoint() { return origin.add(direction.multiply(t)); } diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java index d2a6b59..b9032f4 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java @@ -22,30 +22,43 @@ public double sqrtMagnitude() { public Vector3 normalize() { double magnitude = magnitude(); - return new Vector3(x / magnitude, y / magnitude, z / magnitude); + if (magnitude > 0) { + double inverseMagnitude = 1 / magnitude; + return multiply(inverseMagnitude); + } + return multiply(1); } - public double distance(Vector3 target) { - double X = Math.pow(target.x - x, 2); - double Y = Math.pow(target.y - y, 2); - double Z = Math.pow(target.z - z, 2); - return Math.sqrt(X + Y + Z); + public double distance(Vector3 v) { + return new Vector3( + v.x - x, + v.y - y, + v.z - z + ).magnitude(); } - public double dotProduct(Vector3 target) { - return target.x * x + target.y * y + target.z * z; + public double dotProduct(Vector3 v) { + return v.x * x + v.y * y + v.z * z; + } + + public Vector3 crossProduct(Vector3 v) { + return new Vector3( + y * v.z - z * v.y, + z * v.x - x * v.z, + x * v.y - y * v.x + ); } public Vector3 multiply(double t) { return new Vector3(x * t, y * t, z * t); } - public Vector3 subtract(Vector3 target) { - return new Vector3(x - target.x, y - target.y, z - target.z); + public Vector3 subtract(Vector3 v) { + return new Vector3(x - v.x, y - v.y, z - v.z); } - public Vector3 add(Vector3 target) { - return new Vector3(x + target.x, y + target.y, z + target.z); + public Vector3 add(Vector3 v) { + return new Vector3(x + v.x, y + v.y, z + v.z); } @Override diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java index 55e233a..2039b60 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java @@ -3,13 +3,14 @@ import labs.introtoprogramming.lab5.geometry.Ray; import labs.introtoprogramming.lab5.geometry.Vector3; import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; public class Sphere extends SceneObject { private double radius; - public Sphere(Vector3 position, double radius) { - super(position); + public Sphere(Transform transform, double radius) { + super(transform); this.radius = radius; } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java b/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java index e431317..7b3ad16 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java @@ -3,7 +3,8 @@ import java.awt.Color; public class Mesh { - public Color color; + + private Color color; public Mesh(Color color) { this.color = color; diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java similarity index 89% rename from src/main/java/labs/introtoprogramming/lab5/scene/BasicRender.java rename to src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java index d937c5d..4063476 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java @@ -9,13 +9,18 @@ import java.util.List; import java.util.stream.Collectors; -public class BasicRender implements SceneRender { +public class RasterRender implements SceneRender { private List intractable; + private Raster raster; private int width = 1920; // Temporary value while Raster is not implemented. private int height = 1280; // It will be replaced with raster.getWidth() and raster.getHeight(). + public RasterRender(Raster raster) { + this.raster = raster; + } + @Override - public void render(Scene scene, Raster raster) { + public void render(Scene scene) { Camera camera = scene.getCamera().orElseThrow(NoCamerException::new); intractable = scene.getSceneObjects().stream() .filter(obj -> !(obj instanceof PointLight) && !(obj instanceof Camera)) @@ -23,6 +28,7 @@ public void render(Scene scene, Raster raster) { Vector3 pos = camera.getTransform().position(); double aspectRation = (double) width / height; double fieldOfView = Math.tan(camera.fieldOfView() / 2); + Ray primaryRay = new Ray(pos, Vector3.zero()); for (int y = 0; y < height; y++) { double normalizedY = 1 - 2 * (y + 0.5) / height; double cameraY = (1 - 2 * normalizedY) * fieldOfView; @@ -30,7 +36,7 @@ public void render(Scene scene, Raster raster) { double normalizedX = 2 * (x + 0.5) / width - 1; double cameraX = (2 * normalizedX - 1) * aspectRation * fieldOfView; Vector3 direction = new Vector3(cameraX, cameraY, -1).normalize(); - Ray primaryRay = new Ray(pos, direction); + primaryRay.setDirection(direction); Color color = getColor(primaryRay, scene); raster.setPixel(x, y, (byte) color.getRed(), diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java index c0f5a2c..021123a 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java @@ -1,7 +1,6 @@ package labs.introtoprogramming.lab5.scene; import labs.introtoprogramming.lab5.geometry.Ray; -import labs.introtoprogramming.lab5.geometry.Vector3; public class SceneObject { @@ -17,10 +16,6 @@ public SceneObject(Transform transform) { this(transform, new Mesh()); } - public SceneObject(Vector3 position) { - this(new Transform(position), new Mesh()); - } - public SceneObject() { this(new Transform(), new Mesh()); } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneRender.java index 1e30807..5f8bbaf 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/SceneRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneRender.java @@ -1,9 +1,7 @@ package labs.introtoprogramming.lab5.scene; -import labs.introtoprogramming.lab5.graphics.Raster; - public interface SceneRender { - void render(Scene scene, Raster raster); + void render(Scene scene); } From 9d4883d51187fdbd8261ccb6850927130bf59857 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Mon, 27 May 2019 13:44:11 +0300 Subject: [PATCH 13/36] feat(geometry): add test for vector, ray and sphere --- .../lab5/geometry/RayTests.java | 38 ++++++ .../lab5/geometry/VectorTests.java | 115 ++++++++++++++++++ .../lab5/object/SphereTests.java | 46 +++++++ 3 files changed, 199 insertions(+) create mode 100644 src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java diff --git a/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java b/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java new file mode 100644 index 0000000..de40971 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java @@ -0,0 +1,38 @@ +package labs.introtoprogramming.lab5.geometry; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class RayTests { + private static final double DELTA = 1e-10; + + @Test + public void testInstantiation() { + Ray ray = new Ray(Vector3.zero(), Vector3.right(), 1); + assertEquals(Vector3.zero(), ray.getOrigin()); + assertEquals(Vector3.right(), ray.getDirection()); + assertEquals(1, ray.getMultiplier(), DELTA); + } + + @Test + public void testMultiplier() { + Ray ray = new Ray(Vector3.zero(), Vector3.right()); + ray.setMultiplier(10); + assertEquals(10, ray.getMultiplier(), DELTA); + } + + @Test + public void testGetPoint() { + Ray ray = new Ray(Vector3.zero(), Vector3.one()); + ray.setMultiplier(10); + assertEquals(new Vector3(10, 10, 10), ray.getPoint()); + } + + @Test + public void testSetDirection() { + Ray ray = new Ray(Vector3.zero(), Vector3.zero()); + ray.setDirection(Vector3.one()); + assertEquals(Vector3.one(), ray.getDirection()); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java b/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java new file mode 100644 index 0000000..0bb23dd --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java @@ -0,0 +1,115 @@ +package labs.introtoprogramming.lab5.geometry; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; + +import org.junit.Test; + +public class VectorTests { + private static final double DELTA = 1e-10; + + @Test + public void testSqrtMagnitude() { + Vector3 vector = Vector3.one(); + assertEquals(3, vector.sqrtMagnitude(), DELTA); + } + + @Test + public void testMagnitude() { + Vector3 vector = Vector3.right(); + assertEquals(1, vector.magnitude(), DELTA); + } + + @Test + public void testNormalize() { + Vector3 a = new Vector3(2, 4, 4); + assertEquals(new Vector3( 2. / 6, 4. / 6, 4. / 6), a.normalize()); + } + + @Test + public void testNormalizeZeroVector() { + Vector3 a = Vector3.zero(); + assertEquals(Vector3.zero(), a.normalize()); + } + + @Test + public void testDistance() { + Vector3 from = Vector3.zero(); + Vector3 to = Vector3.right(); + assertEquals(1, from.distance(to), DELTA); + } + + @Test + public void testDistanceToSame() { + Vector3 vector = Vector3.one(); + assertEquals(0, vector.distance(vector), DELTA); + } + + @Test + public void testDotProduct() { + Vector3 a = Vector3.one(); + Vector3 b = Vector3.one().multiply(3); + assertEquals(9, a.dotProduct(b), DELTA); + } + + @Test + public void testCrossProduct() { + Vector3 a = Vector3.right(); + Vector3 b = Vector3.up(); + assertEquals(Vector3.forward(), a.crossProduct(b)); + } + + @Test + public void testMultiply() { + Vector3 a = new Vector3(0, 1, 2); + Vector3 res = a.multiply(3); + assertEquals(new Vector3(0, 3, 6), res); + } + + @Test + public void testSubtract() { + Vector3 a = new Vector3(3, 3, 3); + Vector3 b = new Vector3(1, 2, 3); + assertEquals(new Vector3(2, 1, 0), a.subtract(b)); + } + + @Test + public void testAdd() { + Vector3 a = new Vector3(3, 3, 3); + Vector3 b = new Vector3(1, 2, 3); + assertEquals(new Vector3(4, 5, 6), a.add(b)); + } + + @Test + public void testEquals() { + Vector3 a = Vector3.one(); + Vector3 b = Vector3.one(); + assertEquals(a, b); + } + + @Test + public void testEqualsSame() { + Vector3 a = new Vector3(1, 1, 1); + assertEquals(a, a); + } + + @Test + public void testEqualsNotVector() { + Vector3 a = Vector3.one(); + Ray ray = new Ray(a, a); + assertNotEquals(a, ray); + } + + @Test + public void testEqualsBiggerDelta() { + Vector3 a = Vector3.one(); + Vector3 b = Vector3.one().add(Vector3.one().multiply(DELTA * 10)); + assertNotEquals(a, b); + } + + @Test + public void testHashCode() { + Vector3 a = Vector3.one(); + assertEquals(3, a.hashCode(), DELTA); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java new file mode 100644 index 0000000..4ed2215 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java @@ -0,0 +1,46 @@ +package labs.introtoprogramming.lab5.object; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.Transform; +import org.junit.Test; + +public class SphereTests { + private static final double DELTA = 1e-10; + + @Test + public void testIntersection() { + Ray ray = new Ray(Vector3.zero(), Vector3.right()); + Sphere sphere = new Sphere(new Transform(Vector3.right().multiply(2)), 1); + assertTrue(sphere.intersect(ray)); + assertEquals(ray.getMultiplier(), 1, DELTA); + } + + @Test + public void testIntersectionInner() { + Ray ray = new Ray(Vector3.zero(), Vector3.right()); + Sphere sphere = new Sphere(new Transform(Vector3.zero()), 1); + assertTrue(sphere.intersect(ray)); + assertEquals(ray.getMultiplier(), 1, DELTA); + } + + @Test + public void testNoIntersection() { + Ray ray = new Ray(Vector3.zero(), Vector3.right()); + Sphere sphere = new Sphere(new Transform(Vector3.one().multiply(2)), 1); + assertFalse(sphere.intersect(ray)); + assertEquals(ray.getMultiplier(), 1, DELTA); + } + + @Test + public void testIntersectionOppositeDirection() { + Ray ray = new Ray(Vector3.zero(), Vector3.right().multiply(-1)); + Sphere sphere = new Sphere(new Transform(Vector3.right().multiply(2)), 1); + assertFalse(sphere.intersect(ray)); + assertEquals(ray.getMultiplier(), 1, DELTA); + } +} From 7b1ca913a74e856a7712746f5c0dfcba2060d775 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Mon, 27 May 2019 23:17:06 +0300 Subject: [PATCH 14/36] feat(scene): add javadoc for scene object --- .../lab5/exception/NoCamerException.java | 12 ---- .../lab5/exception/NoCameraException.java | 12 ++++ .../introtoprogramming/lab5/geometry/Ray.java | 16 +++--- .../lab5/geometry/Vector3.java | 44 +++++---------- .../lab5/object/Sphere.java | 10 +++- .../introtoprogramming/lab5/scene/Camera.java | 18 +++++- .../lab5/scene/RasterRender.java | 6 +- .../lab5/scene/SceneObject.java | 6 ++ .../lab5/scene/Transform.java | 12 +++- .../lab5/geometry/RayTests.java | 24 ++++---- .../lab5/geometry/VectorTests.java | 56 ++++++++++++------- .../lab5/object/SphereTests.java | 24 ++++---- 12 files changed, 136 insertions(+), 104 deletions(-) delete mode 100644 src/main/java/labs/introtoprogramming/lab5/exception/NoCamerException.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/exception/NoCameraException.java diff --git a/src/main/java/labs/introtoprogramming/lab5/exception/NoCamerException.java b/src/main/java/labs/introtoprogramming/lab5/exception/NoCamerException.java deleted file mode 100644 index 6fe70b0..0000000 --- a/src/main/java/labs/introtoprogramming/lab5/exception/NoCamerException.java +++ /dev/null @@ -1,12 +0,0 @@ -package labs.introtoprogramming.lab5.exception; - -public class NoCamerException extends RuntimeException { - - public NoCamerException(String message) { - super(message); - } - - public NoCamerException() { - this("No camera found"); - } -} diff --git a/src/main/java/labs/introtoprogramming/lab5/exception/NoCameraException.java b/src/main/java/labs/introtoprogramming/lab5/exception/NoCameraException.java new file mode 100644 index 0000000..38639e9 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/exception/NoCameraException.java @@ -0,0 +1,12 @@ +package labs.introtoprogramming.lab5.exception; + +public class NoCameraException extends RuntimeException { + + public NoCameraException(String message) { + super(message); + } + + public NoCameraException() { + this("No camera found"); + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java index 4dec8e7..3d3011c 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java @@ -3,24 +3,24 @@ public class Ray { private Vector3 origin; private Vector3 direction; - private double t; + private double scale; - public Ray(Vector3 origin, Vector3 direction, double t) { + public Ray(Vector3 origin, Vector3 direction, double scale) { this.origin = origin; this.direction = direction; - this.t = t; + this.scale = scale; } public Ray(Vector3 origin, Vector3 direction) { this(origin, direction, 1); } - public void setMultiplier(double t) { - this.t = t; + public void setScale(double scale) { + this.scale = scale; } - public double getMultiplier() { - return t; + public double getScale() { + return scale; } public Vector3 getOrigin() { @@ -36,6 +36,6 @@ public void setDirection(Vector3 direction) { } public Vector3 getPoint() { - return origin.add(direction.multiply(t)); + return origin.add(direction.multiply(scale)); } } diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java index b9032f4..c2b3ced 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java @@ -1,6 +1,14 @@ package labs.introtoprogramming.lab5.geometry; public class Vector3 { + // Accuracy of comparing two double values + private static final double COORDINATES_PRECISION = 1e-10; + + public static final Vector3 ZERO = new Vector3(0, 0, 0); + public static final Vector3 RIGHT = new Vector3(1, 0, 0); + public static final Vector3 UP = new Vector3(0, 1, 0); + public static final Vector3 FORWARD = new Vector3(0, 0, 1); + public static final Vector3 ONE = new Vector3(1, 1, 1); private final double x; private final double y; @@ -13,10 +21,10 @@ public Vector3(double x, double y, double z) { } public double magnitude() { - return Math.sqrt(sqrtMagnitude()); + return Math.sqrt(magnitudeSquared()); } - public double sqrtMagnitude() { + public double magnitudeSquared() { return x * x + y * y + z * z; } @@ -30,11 +38,7 @@ public Vector3 normalize() { } public double distance(Vector3 v) { - return new Vector3( - v.x - x, - v.y - y, - v.z - z - ).magnitude(); + return subtract(v).magnitude(); } public double dotProduct(Vector3 v) { @@ -66,33 +70,13 @@ public boolean equals(Object obj) { if (!(obj instanceof Vector3)) return false; if (obj == this) return true; Vector3 vector = (Vector3) obj; - return Math.abs(vector.x - x) < 1e-10 && - Math.abs(vector.y - y) < 1e-10 && - Math.abs(vector.z - z) < 1e-10; + return Math.abs(vector.x - x) < COORDINATES_PRECISION && + Math.abs(vector.y - y) < COORDINATES_PRECISION && + Math.abs(vector.z - z) < COORDINATES_PRECISION; } @Override public int hashCode() { return (int) (x + y + z); } - - public static Vector3 zero() { - return new Vector3(0, 0, 0); - } - - public static Vector3 right() { - return new Vector3(1, 0, 0); - } - - public static Vector3 up() { - return new Vector3(0, 1, 0); - } - - public static Vector3 forward() { - return new Vector3(0, 0, 1); - } - - public static Vector3 one() { - return new Vector3(1, 1, 1); - } } diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java index 2039b60..529bf07 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java @@ -9,6 +9,12 @@ public class Sphere extends SceneObject { private double radius; + /** + * Representation of spherical object. + * + * @param transform container of object transformations + * @param radius size of sphere + */ public Sphere(Transform transform, double radius) { super(transform); this.radius = radius; @@ -18,7 +24,7 @@ public Sphere(Transform transform, double radius) { public boolean intersect(Ray ray) { Vector3 originToCenter = transform.position().subtract(ray.getOrigin()); double distToCenter = originToCenter.dotProduct(ray.getDirection()); - double sqrtDistToRay = originToCenter.sqrtMagnitude() - distToCenter * distToCenter; + double sqrtDistToRay = originToCenter.magnitudeSquared() - distToCenter * distToCenter; if (sqrtDistToRay > radius * radius) { return false; } @@ -39,7 +45,7 @@ public boolean intersect(Ray ray) { intersection = firstIntersection; } } - ray.setMultiplier(intersection); + ray.setScale(intersection); return true; } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java index 8ab4e96..0eb20a3 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java @@ -1,21 +1,37 @@ package labs.introtoprogramming.lab5.scene; public abstract class Camera extends SceneObject { + private static final double DEFAULT_SIZE = 1; + private double size; + /** + * Representation of camera. + * + * @param transform container of object transformations + * @param size perspective size of camera (half of plane height at distance 1 from camera origin) + */ public Camera(Transform transform, double size) { super(transform); this.size = size; } public Camera(Transform transform) { - this(transform, 1); + this(transform, DEFAULT_SIZE); } public double size() { return size; } + /** + * Calculate camera field of view. + * Assume that plane always at distance 1 and + * size represents half of plane height + * tangents of half of the field of view is equal to size + * + * @return field of view in radians + */ public double fieldOfView() { return 2 * Math.atan(size); } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java index 4063476..d95d6e4 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java @@ -1,6 +1,6 @@ package labs.introtoprogramming.lab5.scene; -import labs.introtoprogramming.lab5.exception.NoCamerException; +import labs.introtoprogramming.lab5.exception.NoCameraException; import labs.introtoprogramming.lab5.geometry.Ray; import labs.introtoprogramming.lab5.geometry.Vector3; import labs.introtoprogramming.lab5.graphics.Raster; @@ -21,14 +21,14 @@ public RasterRender(Raster raster) { @Override public void render(Scene scene) { - Camera camera = scene.getCamera().orElseThrow(NoCamerException::new); + Camera camera = scene.getCamera().orElseThrow(NoCameraException::new); intractable = scene.getSceneObjects().stream() .filter(obj -> !(obj instanceof PointLight) && !(obj instanceof Camera)) .collect(Collectors.toList()); Vector3 pos = camera.getTransform().position(); double aspectRation = (double) width / height; double fieldOfView = Math.tan(camera.fieldOfView() / 2); - Ray primaryRay = new Ray(pos, Vector3.zero()); + Ray primaryRay = new Ray(pos, Vector3.ZERO); for (int y = 0; y < height; y++) { double normalizedY = 1 - 2 * (y + 0.5) / height; double cameraY = (1 - 2 * normalizedY) * fieldOfView; diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java index 021123a..1af25e1 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java @@ -7,6 +7,12 @@ public class SceneObject { protected Transform transform; protected Mesh mesh; + /** + * Base class of scene objects. + * + * @param transform container of object transformations + * @param mesh container of + */ public SceneObject(Transform transform, Mesh mesh) { this.transform = transform; this.mesh = mesh; diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java b/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java index 5de37a9..3884a72 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java @@ -7,18 +7,24 @@ public class Transform { private Vector3 rotation; private Vector3 scale; + /** + * Container of object transformations. + * + * @param position position of object relatively to world coordinates + * @param rotation rotation around axes in euler angels + */ public Transform(Vector3 position, Vector3 rotation) { this.position = position; this.rotation = rotation; - this.scale = Vector3.one(); + this.scale = Vector3.ONE; } public Transform(Vector3 position) { - this(position, Vector3.zero()); + this(position, Vector3.ZERO); } public Transform() { - this(Vector3.zero(), Vector3.zero()); + this(Vector3.ZERO, Vector3.ZERO); } public Vector3 position() { diff --git a/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java b/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java index de40971..baf80eb 100644 --- a/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java @@ -9,30 +9,30 @@ public class RayTests { @Test public void testInstantiation() { - Ray ray = new Ray(Vector3.zero(), Vector3.right(), 1); - assertEquals(Vector3.zero(), ray.getOrigin()); - assertEquals(Vector3.right(), ray.getDirection()); - assertEquals(1, ray.getMultiplier(), DELTA); + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT, 1); + assertEquals(Vector3.ZERO, ray.getOrigin()); + assertEquals(Vector3.RIGHT, ray.getDirection()); + assertEquals(1, ray.getScale(), DELTA); } @Test public void testMultiplier() { - Ray ray = new Ray(Vector3.zero(), Vector3.right()); - ray.setMultiplier(10); - assertEquals(10, ray.getMultiplier(), DELTA); + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + ray.setScale(10); + assertEquals(10, ray.getScale(), DELTA); } @Test public void testGetPoint() { - Ray ray = new Ray(Vector3.zero(), Vector3.one()); - ray.setMultiplier(10); + Ray ray = new Ray(Vector3.ZERO, Vector3.ONE); + ray.setScale(10); assertEquals(new Vector3(10, 10, 10), ray.getPoint()); } @Test public void testSetDirection() { - Ray ray = new Ray(Vector3.zero(), Vector3.zero()); - ray.setDirection(Vector3.one()); - assertEquals(Vector3.one(), ray.getDirection()); + Ray ray = new Ray(Vector3.ZERO, Vector3.ZERO); + ray.setDirection(Vector3.ONE); + assertEquals(Vector3.ONE, ray.getDirection()); } } diff --git a/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java b/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java index 0bb23dd..a9e2d37 100644 --- a/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java @@ -10,53 +10,53 @@ public class VectorTests { @Test public void testSqrtMagnitude() { - Vector3 vector = Vector3.one(); - assertEquals(3, vector.sqrtMagnitude(), DELTA); + Vector3 vector = Vector3.ONE; + assertEquals(3, vector.magnitudeSquared(), DELTA); } @Test public void testMagnitude() { - Vector3 vector = Vector3.right(); + Vector3 vector = Vector3.RIGHT; assertEquals(1, vector.magnitude(), DELTA); } @Test public void testNormalize() { Vector3 a = new Vector3(2, 4, 4); - assertEquals(new Vector3( 2. / 6, 4. / 6, 4. / 6), a.normalize()); + assertEquals(new Vector3( 2.0 / 6, 4.0 / 6, 4.0 / 6), a.normalize()); } @Test public void testNormalizeZeroVector() { - Vector3 a = Vector3.zero(); - assertEquals(Vector3.zero(), a.normalize()); + Vector3 a = Vector3.ZERO; + assertEquals(Vector3.ZERO, a.normalize()); } @Test public void testDistance() { - Vector3 from = Vector3.zero(); - Vector3 to = Vector3.right(); + Vector3 from = Vector3.ZERO; + Vector3 to = Vector3.RIGHT; assertEquals(1, from.distance(to), DELTA); } @Test public void testDistanceToSame() { - Vector3 vector = Vector3.one(); + Vector3 vector = Vector3.ONE; assertEquals(0, vector.distance(vector), DELTA); } @Test public void testDotProduct() { - Vector3 a = Vector3.one(); - Vector3 b = Vector3.one().multiply(3); + Vector3 a = Vector3.ONE; + Vector3 b = Vector3.ONE.multiply(3); assertEquals(9, a.dotProduct(b), DELTA); } @Test public void testCrossProduct() { - Vector3 a = Vector3.right(); - Vector3 b = Vector3.up(); - assertEquals(Vector3.forward(), a.crossProduct(b)); + Vector3 a = Vector3.RIGHT; + Vector3 b = Vector3.UP; + assertEquals(Vector3.FORWARD, a.crossProduct(b)); } @Test @@ -82,8 +82,8 @@ public void testAdd() { @Test public void testEquals() { - Vector3 a = Vector3.one(); - Vector3 b = Vector3.one(); + Vector3 a = Vector3.ONE; + Vector3 b = Vector3.ONE; assertEquals(a, b); } @@ -95,21 +95,35 @@ public void testEqualsSame() { @Test public void testEqualsNotVector() { - Vector3 a = Vector3.one(); + Vector3 a = Vector3.ONE; Ray ray = new Ray(a, a); assertNotEquals(a, ray); } @Test - public void testEqualsBiggerDelta() { - Vector3 a = Vector3.one(); - Vector3 b = Vector3.one().add(Vector3.one().multiply(DELTA * 10)); + public void testEqualsBiggerDeltaX() { + Vector3 a = Vector3.ONE; + Vector3 b = Vector3.ONE.add(Vector3.RIGHT.multiply(DELTA * 10)); + assertNotEquals(a, b); + } + + @Test + public void testEqualsBiggerDeltaY() { + Vector3 a = Vector3.ONE; + Vector3 b = Vector3.ONE.add(Vector3.UP.multiply(DELTA * 10)); + assertNotEquals(a, b); + } + + @Test + public void testEqualsBiggerDeltaZ() { + Vector3 a = Vector3.ONE; + Vector3 b = Vector3.ONE.add(Vector3.FORWARD.multiply(DELTA * 10)); assertNotEquals(a, b); } @Test public void testHashCode() { - Vector3 a = Vector3.one(); + Vector3 a = Vector3.ONE; assertEquals(3, a.hashCode(), DELTA); } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java index 4ed2215..9dae088 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java @@ -14,33 +14,33 @@ public class SphereTests { @Test public void testIntersection() { - Ray ray = new Ray(Vector3.zero(), Vector3.right()); - Sphere sphere = new Sphere(new Transform(Vector3.right().multiply(2)), 1); + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Sphere sphere = new Sphere(new Transform(Vector3.RIGHT.multiply(2)), 1); assertTrue(sphere.intersect(ray)); - assertEquals(ray.getMultiplier(), 1, DELTA); + assertEquals(ray.getScale(), 1, DELTA); } @Test public void testIntersectionInner() { - Ray ray = new Ray(Vector3.zero(), Vector3.right()); - Sphere sphere = new Sphere(new Transform(Vector3.zero()), 1); + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Sphere sphere = new Sphere(new Transform(Vector3.ZERO), 1); assertTrue(sphere.intersect(ray)); - assertEquals(ray.getMultiplier(), 1, DELTA); + assertEquals(ray.getScale(), 1, DELTA); } @Test public void testNoIntersection() { - Ray ray = new Ray(Vector3.zero(), Vector3.right()); - Sphere sphere = new Sphere(new Transform(Vector3.one().multiply(2)), 1); + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Sphere sphere = new Sphere(new Transform(Vector3.ONE.multiply(2)), 1); assertFalse(sphere.intersect(ray)); - assertEquals(ray.getMultiplier(), 1, DELTA); + assertEquals(ray.getScale(), 1, DELTA); } @Test public void testIntersectionOppositeDirection() { - Ray ray = new Ray(Vector3.zero(), Vector3.right().multiply(-1)); - Sphere sphere = new Sphere(new Transform(Vector3.right().multiply(2)), 1); + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT.multiply(-1)); + Sphere sphere = new Sphere(new Transform(Vector3.RIGHT.multiply(2)), 1); assertFalse(sphere.intersect(ray)); - assertEquals(ray.getMultiplier(), 1, DELTA); + assertEquals(ray.getScale(), 1, DELTA); } } From 6daa266c7695b474e0e96636b410628b88cb522d Mon Sep 17 00:00:00 2001 From: Brook333 Date: Tue, 28 May 2019 19:04:51 +0300 Subject: [PATCH 15/36] feat(scene): add test for basic ray tracing --- ...Render.java => BasicRaytracingRender.java} | 26 ++--- .../introtoprogramming/lab5/scene/Camera.java | 2 +- .../introtoprogramming/lab5/scene/Mesh.java | 4 + .../scene/BasicRaytracingRenderTests.java | 105 ++++++++++++++++++ 4 files changed, 120 insertions(+), 17 deletions(-) rename src/main/java/labs/introtoprogramming/lab5/scene/{RasterRender.java => BasicRaytracingRender.java} (65%) create mode 100644 src/test/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRenderTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java similarity index 65% rename from src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java rename to src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java index d95d6e4..923ce16 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/RasterRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java @@ -6,35 +6,29 @@ import labs.introtoprogramming.lab5.graphics.Raster; import java.awt.Color; -import java.util.List; -import java.util.stream.Collectors; -public class RasterRender implements SceneRender { - private List intractable; +public class BasicRaytracingRender implements SceneRender { private Raster raster; - private int width = 1920; // Temporary value while Raster is not implemented. - private int height = 1280; // It will be replaced with raster.getWidth() and raster.getHeight(). - public RasterRender(Raster raster) { + public BasicRaytracingRender(Raster raster) { this.raster = raster; } @Override public void render(Scene scene) { Camera camera = scene.getCamera().orElseThrow(NoCameraException::new); - intractable = scene.getSceneObjects().stream() - .filter(obj -> !(obj instanceof PointLight) && !(obj instanceof Camera)) - .collect(Collectors.toList()); Vector3 pos = camera.getTransform().position(); + int width = raster.getWidth(); + int height = raster.getHeight(); double aspectRation = (double) width / height; double fieldOfView = Math.tan(camera.fieldOfView() / 2); Ray primaryRay = new Ray(pos, Vector3.ZERO); for (int y = 0; y < height; y++) { double normalizedY = 1 - 2 * (y + 0.5) / height; - double cameraY = (1 - 2 * normalizedY) * fieldOfView; + double cameraY = normalizedY * fieldOfView; for (int x = 0; x < width; x++) { double normalizedX = 2 * (x + 0.5) / width - 1; - double cameraX = (2 * normalizedX - 1) * aspectRation * fieldOfView; + double cameraX = normalizedX * aspectRation * fieldOfView; Vector3 direction = new Vector3(cameraX, cameraY, -1).normalize(); primaryRay.setDirection(direction); Color color = getColor(primaryRay, scene); @@ -46,15 +40,15 @@ public void render(Scene scene) { } } - private Color getColor(Ray primaryRay, Scene scene) { - SceneObject obj = findInteraction(primaryRay); + Color getColor(Ray primaryRay, Scene scene) { + SceneObject obj = findInteraction(primaryRay, scene); return obj != null ? obj.getMesh().color() : scene.getBackgroundColor(); } - private SceneObject findInteraction(Ray primaryRay) { + SceneObject findInteraction(Ray primaryRay, Scene scene) { SceneObject intersection = null; double minDistance = Double.POSITIVE_INFINITY; - for (SceneObject obj : intractable) { + for (SceneObject obj : scene.getSceneObjects()) { double distance = obj.getTransform().position().distance(primaryRay.getOrigin()); if (distance < minDistance) { if (obj.intersect(primaryRay)) { diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java index 0eb20a3..2b60465 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java @@ -1,6 +1,6 @@ package labs.introtoprogramming.lab5.scene; -public abstract class Camera extends SceneObject { +public class Camera extends SceneObject { private static final double DEFAULT_SIZE = 1; private double size; diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java b/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java index 7b3ad16..ee1f7b0 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Mesh.java @@ -17,4 +17,8 @@ public Mesh() { public Color color() { return color; } + + public void setColor(Color color) { + this.color = color; + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRenderTests.java b/src/test/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRenderTests.java new file mode 100644 index 0000000..583e93c --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRenderTests.java @@ -0,0 +1,105 @@ +package labs.introtoprogramming.lab5.scene; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.awt.Color; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import labs.introtoprogramming.lab5.exception.NoCameraException; +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.graphics.BufferedImageRaster; +import labs.introtoprogramming.lab5.graphics.Raster; +import labs.introtoprogramming.lab5.object.Sphere; +import org.junit.Test; + +public class BasicRaytracingRenderTests { + + @Test + public void testFindInteraction() { + List list = Collections.singletonList( + new Sphere(new Transform(Vector3.FORWARD.multiply(3)), 1) + ); + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + Raster raster = new BufferedImageRaster(100, 100); + Scene scene = new BasicScene(list); + BasicRaytracingRender render = new BasicRaytracingRender(raster); + SceneObject interaction = render.findInteraction(ray, scene); + assertEquals(list.get(0), interaction); + } + + @Test + public void testFindInteractionEmptyScene() { + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + Raster raster = new BufferedImageRaster(100, 100); + Scene scene = new BasicScene(Collections.emptyList()); + BasicRaytracingRender render = new BasicRaytracingRender(raster); + SceneObject interaction = render.findInteraction(ray, scene); + assertNull(interaction); + } + + @Test + public void testFindInteractionSeveralObjects() { + List list = Arrays.asList( + new Sphere(new Transform(Vector3.FORWARD.multiply(5)), 1), + new Sphere(new Transform(Vector3.FORWARD.multiply(3)), 1), + new Sphere(new Transform(Vector3.FORWARD.multiply(10)), 1) + ); + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + Raster raster = new BufferedImageRaster(100, 100); + Scene scene = new BasicScene(list); + BasicRaytracingRender render = new BasicRaytracingRender(raster); + SceneObject interaction = render.findInteraction(ray, scene); + assertEquals(list.get(1), interaction); + } + + @Test + public void testGetColor() { + List list = Collections.singletonList( + new Sphere(new Transform(Vector3.FORWARD.multiply(3)), 1) + ); + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + Raster raster = new BufferedImageRaster(100, 100); + Scene scene = new BasicScene(list); + BasicRaytracingRender render = new BasicRaytracingRender(raster); + Color color = render.getColor(ray, scene); + assertEquals(list.get(0).getMesh().color(), color); + } + + @Test + public void testGetColorNoInteraction() { + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + Raster raster = new BufferedImageRaster(100, 100); + Scene scene = new BasicScene(Collections.emptyList()); + BasicRaytracingRender render = new BasicRaytracingRender(raster); + Color color = render.getColor(ray, scene); + assertEquals(scene.getBackgroundColor(), color); + } + + @Test + public void testRender() { + List list = Arrays.asList( + new Sphere(new Transform(Vector3.FORWARD.multiply(-3)), 1), + new Camera(new Transform(Vector3.ZERO)) + ); + Raster raster = new BufferedImageRaster(100, 100); + Scene scene = new BasicScene(list); + BasicRaytracingRender render = new BasicRaytracingRender(raster); + render.render(scene); + assertEquals(list.get(0).getMesh().color(), raster.getPixelColor(49, 49)); + } + + @Test(expected = NoCameraException.class) + public void testRenderNoCamera() { + List list = Collections.singletonList( + new Sphere(new Transform(Vector3.FORWARD.multiply(3)), 1) + ); + Raster raster = new BufferedImageRaster(100, 100); + Scene scene = new BasicScene(list); + BasicRaytracingRender render = new BasicRaytracingRender(raster); + render.render(scene); + } +} From 7a3fc59aa5952eb6fde6570dbee7e185e4edc730 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Mon, 3 Jun 2019 23:16:44 +0300 Subject: [PATCH 16/36] refactor(scene): move aspect ratio to camera object and add copy constructor for Vector3 --- .../introtoprogramming/lab5/geometry/Vector3.java | 13 ++++++++++++- .../lab5/scene/BasicRaytracingRender.java | 4 ++-- .../labs/introtoprogramming/lab5/scene/Camera.java | 14 +++++++++++--- .../introtoprogramming/lab5/scene/Transform.java | 6 +++--- .../lab5/scene/BasicRaytracingRenderTests.java | 4 ++-- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java index c2b3ced..305ce11 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java @@ -1,6 +1,6 @@ package labs.introtoprogramming.lab5.geometry; -public class Vector3 { +public class Vector3 implements Cloneable { // Accuracy of comparing two double values private static final double COORDINATES_PRECISION = 1e-10; @@ -20,6 +20,12 @@ public Vector3(double x, double y, double z) { this.z = z; } + public Vector3(Vector3 v) { + x = v.x; + y = v.y; + z = v.z; + } + public double magnitude() { return Math.sqrt(magnitudeSquared()); } @@ -79,4 +85,9 @@ public boolean equals(Object obj) { public int hashCode() { return (int) (x + y + z); } + + @Override + public Object clone() throws CloneNotSupportedException { + return super.clone(); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java index 923ce16..03036e9 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java @@ -20,7 +20,7 @@ public void render(Scene scene) { Vector3 pos = camera.getTransform().position(); int width = raster.getWidth(); int height = raster.getHeight(); - double aspectRation = (double) width / height; + double aspectRatio = camera.aspectRatio(); double fieldOfView = Math.tan(camera.fieldOfView() / 2); Ray primaryRay = new Ray(pos, Vector3.ZERO); for (int y = 0; y < height; y++) { @@ -28,7 +28,7 @@ public void render(Scene scene) { double cameraY = normalizedY * fieldOfView; for (int x = 0; x < width; x++) { double normalizedX = 2 * (x + 0.5) / width - 1; - double cameraX = normalizedX * aspectRation * fieldOfView; + double cameraX = normalizedX * aspectRatio * fieldOfView; Vector3 direction = new Vector3(cameraX, cameraY, -1).normalize(); primaryRay.setDirection(direction); Color color = getColor(primaryRay, scene); diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java index 2b60465..23c774f 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java @@ -1,9 +1,12 @@ package labs.introtoprogramming.lab5.scene; +import labs.introtoprogramming.lab5.graphics.Raster; + public class Camera extends SceneObject { private static final double DEFAULT_SIZE = 1; private double size; + private Raster raster; /** * Representation of camera. @@ -11,13 +14,14 @@ public class Camera extends SceneObject { * @param transform container of object transformations * @param size perspective size of camera (half of plane height at distance 1 from camera origin) */ - public Camera(Transform transform, double size) { + public Camera(Raster raster, Transform transform, double size) { super(transform); + this.raster = raster; this.size = size; } - public Camera(Transform transform) { - this(transform, DEFAULT_SIZE); + public Camera(Raster raster, Transform transform) { + this(raster, transform, DEFAULT_SIZE); } public double size() { @@ -35,4 +39,8 @@ public double size() { public double fieldOfView() { return 2 * Math.atan(size); } + + public double aspectRatio() { + return (double) raster.getWidth() / raster.getHeight(); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java b/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java index 3884a72..71a07b8 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java @@ -28,15 +28,15 @@ public Transform() { } public Vector3 position() { - return position.multiply(1); + return new Vector3(position); } public Vector3 rotation() { - return rotation.multiply(1); + return new Vector3(rotation); } public Vector3 scale() { - return scale.multiply(1); + return new Vector3(scale); } public void setPosition(Vector3 position) { diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRenderTests.java b/src/test/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRenderTests.java index 583e93c..d5782d8 100644 --- a/src/test/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRenderTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRenderTests.java @@ -81,11 +81,11 @@ public void testGetColorNoInteraction() { @Test public void testRender() { + Raster raster = new BufferedImageRaster(100, 100); List list = Arrays.asList( new Sphere(new Transform(Vector3.FORWARD.multiply(-3)), 1), - new Camera(new Transform(Vector3.ZERO)) + new Camera(raster, new Transform(Vector3.ZERO)) ); - Raster raster = new BufferedImageRaster(100, 100); Scene scene = new BasicScene(list); BasicRaytracingRender render = new BasicRaytracingRender(raster); render.render(scene); From 89d2729d02b9ca6b67ae8baed0c1f3cb97e857dd Mon Sep 17 00:00:00 2001 From: Brook333 Date: Wed, 5 Jun 2019 00:11:13 +0300 Subject: [PATCH 17/36] refactor(transformation): rebase dev into transformation --- .../lab5/geometry/Matrix44.java | 117 ++++++++++++++++++ .../introtoprogramming/lab5/geometry/Ray.java | 4 + .../lab5/geometry/Vector3.java | 6 +- .../lab5/scene/BasicRaytracingRender.java | 4 +- .../introtoprogramming/lab5/scene/Camera.java | 16 ++- .../lab5/scene/Transform.java | 39 ++++++ .../lab5/geometry/RayTests.java | 7 ++ 7 files changed, 188 insertions(+), 5 deletions(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java new file mode 100644 index 0000000..ced6ef2 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java @@ -0,0 +1,117 @@ +package labs.introtoprogramming.lab5.geometry; + +public class Matrix44 { + private double[][] m; + + public Matrix44() { + m = new double[4][4]; + for (int i = 0; i < 4; i++) { + m[i][i] = 1; + } + } + + public void generateTransformation(Vector3 translation, Vector3 rotation, Vector3 scale) { + applyTranslation(translation); + applyRotation(rotation); + applyScale(scale); + } + + private void applyTranslation(Vector3 translation) { + m[0][3] = translation.x; + m[1][3] = translation.y; + m[2][3] = translation.z; + } + + private void applyScale(Vector3 scale) { + m[0][0] *= scale.x; + m[1][1] *= scale.y; + m[2][2] *= scale.z; + } + + private void applyRotation(Vector3 rotation) { + double[][] rot = applyRotationAroundX(rotation.x); + rot = multiply(rot, applyRotationAroundY(rotation.y)); + rot = multiply(rot, applyRotationAroundZ(rotation.z)); + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + m[j][i] = rot[j][i]; + } + } + } + + private double[][] applyRotationAroundX(double angle) { + double[][] rotation = new double[3][3]; + rotation[0][0] = 1; + double radians = Math.toRadians(angle); + rotation[1][1] = Math.cos(radians); + rotation[1][2] = Math.sin(radians); + rotation[2][1] = -Math.sin(radians); + rotation[2][2] = Math.cos(radians); + return rotation; + } + + private double[][] applyRotationAroundY(double angle) { + double[][] rotation = new double[3][3]; + rotation[1][1] = 1; + double radians = Math.toRadians(angle); + rotation[0][0] = Math.cos(radians); + rotation[0][2] = -Math.sin(radians); + rotation[2][0] = Math.sin(radians); + rotation[2][2] = Math.cos(radians); + return rotation; + } + + private double[][] applyRotationAroundZ(double angle) { + double[][] rotation = new double[3][3]; + rotation[2][2] = 1; + double radians = Math.toRadians(angle); + rotation[0][0] = Math.cos(radians); + rotation[0][1] = Math.sin(radians); + rotation[1][0] = -Math.sin(radians); + rotation[1][1] = Math.cos(radians); + return rotation; + } + + public Vector3 applyVector(Vector3 v) { + return new Vector3( + v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2], + v.x * m[1][0] + v.y * m[1][1] + v.z * m[1][2], + v.x * m[2][0] + v.y * m[2][1] + v.z * m[2][2] + ); + } + + public Vector3 applyPoint(Vector3 v) { + return translate(applyVector(v)); + } + + private Vector3 translate(Vector3 v) { + return v.add(new Vector3(m[0][3], m[1][3], m[2][3])); + } + + double[][] multiply(double[][] a, double[][] b) { + double[][] res = new double[a.length][b[0].length]; + for (int i = 0; i < 3; i++) { + for (int j = 0; j < 3; j++) { + res[i][j] = a[i][0] * b[0][j] + + a[i][1] * b[1][j] + + a[i][2] * b[2][j]; + } + } + return res; + } + + public void setMatrix(Vector3 right, Vector3 up, Vector3 forward, Vector3 translate) { + m[0][0] = right.x; + m[1][0] = right.y; + m[2][0] = right.z; + m[0][1] = up.x; + m[1][1] = up.y; + m[2][1] = up.z; + m[0][2] = forward.x; + m[1][2] = forward.y; + m[2][2] = forward.z; + m[0][3] = translate.x; + m[1][3] = translate.y; + m[2][3] = translate.z; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java index 3d3011c..dd10b65 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Ray.java @@ -27,6 +27,10 @@ public Vector3 getOrigin() { return origin; } + public void setOrigin(Vector3 origin) { + this.origin = origin; + } + public Vector3 getDirection() { return direction; } diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java index 305ce11..3cd79ec 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java @@ -10,9 +10,9 @@ public class Vector3 implements Cloneable { public static final Vector3 FORWARD = new Vector3(0, 0, 1); public static final Vector3 ONE = new Vector3(1, 1, 1); - private final double x; - private final double y; - private final double z; + final double x; + final double y; + final double z; public Vector3(double x, double y, double z) { this.x = x; diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java index 03036e9..749c085 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java @@ -23,6 +23,7 @@ public void render(Scene scene) { double aspectRatio = camera.aspectRatio(); double fieldOfView = Math.tan(camera.fieldOfView() / 2); Ray primaryRay = new Ray(pos, Vector3.ZERO); + Transform transform = camera.getTransform(); for (int y = 0; y < height; y++) { double normalizedY = 1 - 2 * (y + 0.5) / height; double cameraY = normalizedY * fieldOfView; @@ -30,7 +31,8 @@ public void render(Scene scene) { double normalizedX = 2 * (x + 0.5) / width - 1; double cameraX = normalizedX * aspectRatio * fieldOfView; Vector3 direction = new Vector3(cameraX, cameraY, -1).normalize(); - primaryRay.setDirection(direction); + primaryRay.setDirection(transform.applyVector(direction).normalize()); + primaryRay.setOrigin(transform.applyPoint(transform.position())); Color color = getColor(primaryRay, scene); raster.setPixel(x, y, (byte) color.getRed(), diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java index 23c774f..44f6193 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java @@ -1,6 +1,7 @@ package labs.introtoprogramming.lab5.scene; import labs.introtoprogramming.lab5.graphics.Raster; +import labs.introtoprogramming.lab5.geometry.Vector3; public class Camera extends SceneObject { private static final double DEFAULT_SIZE = 1; @@ -32,7 +33,7 @@ public double size() { * Calculate camera field of view. * Assume that plane always at distance 1 and * size represents half of plane height - * tangents of half of the field of view is equal to size + * tangents of half of the field of view is equal to size. * * @return field of view in radians */ @@ -43,4 +44,17 @@ public double fieldOfView() { public double aspectRatio() { return (double) raster.getWidth() / raster.getHeight(); } + + /** + * Set position of camera to from and and orientation to face to + * + * @param from position of camera + * @param to point to look at + */ + public void lookAt(Vector3 from, Vector3 to) { + Vector3 forward = from.subtract(to).normalize(); + Vector3 right = Vector3.UP.crossProduct(forward); + Vector3 up = forward.crossProduct(right); + transform.setMatrix(right, up, forward, from); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java b/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java index 71a07b8..cac53c3 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Transform.java @@ -1,11 +1,13 @@ package labs.introtoprogramming.lab5.scene; +import labs.introtoprogramming.lab5.geometry.Matrix44; import labs.introtoprogramming.lab5.geometry.Vector3; public class Transform { private Vector3 position; private Vector3 rotation; private Vector3 scale; + private Matrix44 matrix; /** * Container of object transformations. @@ -17,6 +19,8 @@ public Transform(Vector3 position, Vector3 rotation) { this.position = position; this.rotation = rotation; this.scale = Vector3.ONE; + matrix = new Matrix44(); + matrix.generateTransformation(position, rotation, scale); } public Transform(Vector3 position) { @@ -40,14 +44,49 @@ public Vector3 scale() { } public void setPosition(Vector3 position) { + matrix.generateTransformation(position, rotation, scale); this.position = position; } public void setRotation(Vector3 rotation) { + matrix.generateTransformation(position, rotation, scale); this.rotation = rotation; } public void setScale(Vector3 scale) { + matrix.generateTransformation(position, rotation, scale); this.scale = scale; } + + /** + * Apply transformation matrix to given vector. + * + * @param v vector to transform + * @return transformed vector to local space + */ + public Vector3 applyVector(Vector3 v) { + return matrix.applyVector(v); + } + + /** + * Apply transformation matrix to given point. + * + * @param v point to transform + * @return transformed point to local space + */ + public Vector3 applyPoint(Vector3 v) { + return matrix.applyPoint(v); + } + + /** + * Create new transform matrix from given right, up, forward axis and translation. + * + * @param right normalized right vector + * @param up normalized up vector + * @param forward normalized forward vector + * @param translate translation relatively to word coordinates + */ + public void setMatrix(Vector3 right, Vector3 up, Vector3 forward, Vector3 translate) { + matrix.setMatrix(right, up, forward, translate); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java b/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java index baf80eb..a7bdca8 100644 --- a/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/geometry/RayTests.java @@ -35,4 +35,11 @@ public void testSetDirection() { ray.setDirection(Vector3.ONE); assertEquals(Vector3.ONE, ray.getDirection()); } + + @Test + public void testSetOrigin() { + Ray ray = new Ray(Vector3.ZERO, Vector3.ZERO); + ray.setOrigin(Vector3.ONE); + assertEquals(Vector3.ONE, ray.getOrigin()); + } } From e5116367be5b846e144f9e8d30a70c006c32fa30 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Wed, 29 May 2019 16:40:25 +0300 Subject: [PATCH 18/36] feat(object): add plane and disk --- .../introtoprogramming/lab5/object/Disk.java | 31 ++++++++++++++ .../introtoprogramming/lab5/object/Plane.java | 31 ++++++++++++++ .../lab5/object/DiskTests.java | 40 +++++++++++++++++++ .../lab5/object/PlaneTests.java | 33 +++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 src/main/java/labs/introtoprogramming/lab5/object/Disk.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/object/Plane.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Disk.java b/src/main/java/labs/introtoprogramming/lab5/object/Disk.java new file mode 100644 index 0000000..747f93d --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/object/Disk.java @@ -0,0 +1,31 @@ +package labs.introtoprogramming.lab5.object; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.Transform; + +public class Disk extends Plane { + private static final double DEFAULT_SIZE = 1; + + private double radius; + + public Disk(Transform transform, double radius) { + super(transform); + this.radius = radius; + } + + public Disk(Transform transform) { + this(transform, DEFAULT_SIZE); + } + + @Override + public boolean intersect(Ray ray) { + if (super.intersect(ray)) { + Vector3 intersection = ray.getPoint(); + Vector3 direction = intersection.subtract(transform.position()); + double distance = direction.magnitudeSquared(); + return (distance <= radius * radius); + } + return false; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Plane.java b/src/main/java/labs/introtoprogramming/lab5/object/Plane.java new file mode 100644 index 0000000..3ac060f --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/object/Plane.java @@ -0,0 +1,31 @@ +package labs.introtoprogramming.lab5.object; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; + +public class Plane extends SceneObject { + private static final double DELTA = 1e-10; + + public Plane(Transform transform) { + super(transform); + } + + @Override + public boolean intersect(Ray ray) { + Vector3 origin = transform.position(); + Vector3 normal = transform.applyVector(Vector3.UP); + double angle = normal.dotProduct(ray.getDirection()); + if (angle > DELTA) { + Vector3 direction = origin.subtract(ray.getOrigin()); + double scale = direction.dotProduct(normal) / angle; + if (scale >= 0) { + ray.setScale(scale); + return true; + } + return false; + } + return false; + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java b/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java new file mode 100644 index 0000000..b0df5f2 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java @@ -0,0 +1,40 @@ +package labs.introtoprogramming.lab5.object; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.Transform; +import org.junit.Test; + +public class DiskTests { + + @Test + public void testIntersection() { + Disk disk = new Disk(new Transform(Vector3.ZERO)); + Ray ray = new Ray(Vector3.UP.multiply(-3), Vector3.UP.multiply(1)); + assertTrue(disk.intersect(ray)); + } + + @Test + public void testParallel() { + Disk disk = new Disk(new Transform(Vector3.ZERO)); + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + assertFalse(disk.intersect(ray)); + } + + @Test + public void testReverseToNormal() { + Disk disk = new Disk(new Transform(Vector3.ZERO)); + Ray ray = new Ray(Vector3.UP.multiply(3), Vector3.UP.multiply(-1)); + assertFalse(disk.intersect(ray)); + } + + @Test + public void testGreaterThanRadius() { + Disk disk = new Disk(new Transform(Vector3.RIGHT), 0.5); + Ray ray = new Ray(Vector3.UP.multiply(-3), Vector3.UP.multiply(1)); + assertFalse(disk.intersect(ray)); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java b/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java new file mode 100644 index 0000000..9cd487a --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java @@ -0,0 +1,33 @@ +package labs.introtoprogramming.lab5.object; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.Transform; +import org.junit.Test; + +public class PlaneTests { + + @Test + public void testIntersection() { + Plane plane = new Plane(new Transform(Vector3.ZERO)); + Ray ray = new Ray(Vector3.UP.multiply(-3), Vector3.UP.multiply(1)); + assertTrue(plane.intersect(ray)); + } + + @Test + public void testParallel() { + Plane plane = new Plane(new Transform(Vector3.ZERO)); + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + assertFalse(plane.intersect(ray)); + } + + @Test + public void testReverseToNormal() { + Plane plane = new Plane(new Transform(Vector3.ZERO)); + Ray ray = new Ray(Vector3.UP.multiply(3), Vector3.UP.multiply(-1)); + assertFalse(plane.intersect(ray)); + } +} From fef5818867ab48742b59f6cc460bf1b47013db3f Mon Sep 17 00:00:00 2001 From: Brook333 Date: Thu, 30 May 2019 22:17:21 +0300 Subject: [PATCH 19/36] feat(object): add box --- .../lab5/geometry/Matrix44.java | 2 +- .../lab5/geometry/Vector3.java | 6 +- .../introtoprogramming/lab5/object/Box.java | 93 +++++++++++++++++++ .../introtoprogramming/lab5/object/Disk.java | 6 +- .../lab5/scene/BasicRaytracingRender.java | 10 +- .../lab5/geometry/Matrix44Tests.java | 32 +++++++ .../lab5/object/BoxTests.java | 70 ++++++++++++++ .../lab5/object/DiskTests.java | 6 ++ .../lab5/object/PlaneTests.java | 5 + .../lab5/object/SphereTests.java | 6 +- 10 files changed, 223 insertions(+), 13 deletions(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/object/Box.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/geometry/Matrix44Tests.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java index ced6ef2..8442aef 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java @@ -88,7 +88,7 @@ private Vector3 translate(Vector3 v) { return v.add(new Vector3(m[0][3], m[1][3], m[2][3])); } - double[][] multiply(double[][] a, double[][] b) { + private double[][] multiply(double[][] a, double[][] b) { double[][] res = new double[a.length][b[0].length]; for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java index 3cd79ec..af5c7ef 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java @@ -10,9 +10,9 @@ public class Vector3 implements Cloneable { public static final Vector3 FORWARD = new Vector3(0, 0, 1); public static final Vector3 ONE = new Vector3(1, 1, 1); - final double x; - final double y; - final double z; + public final double x; + public final double y; + public final double z; public Vector3(double x, double y, double z) { this.x = x; diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Box.java b/src/main/java/labs/introtoprogramming/lab5/object/Box.java new file mode 100644 index 0000000..1d840a9 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/object/Box.java @@ -0,0 +1,93 @@ +package labs.introtoprogramming.lab5.object; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; + +public class Box extends SceneObject { + private static final double DELTA = 1e-10; + private static final double DEFAULT_SIZE = 1; + + private Vector3 lowerBounds; + private Vector3 upperBounds; + + public Box(Transform transform, double size) { + super(transform); + Vector3 pos = transform.position(); + Vector3 bound = Vector3.ONE.multiply(size * 0.5); + upperBounds = pos.add(bound); + lowerBounds = pos.add(bound.multiply(-size)); + } + + public Box(Transform transform) { + this(transform, DEFAULT_SIZE); + } + + @Override + public boolean intersect(Ray ray) { + Vector3 direction = ray.getDirection(); + Vector3 origin = ray.getOrigin(); + double tMin, tMax, tyMin, tyMax, tzMin, tzMax; + double x = Math.abs(direction.x) < DELTA ? + direction.x >= 0 ? 1 / DELTA : -1 / DELTA : 1 / direction.x; + double y = Math.abs(direction.y) < DELTA ? + direction.y >= 0 ? 1 / DELTA : -1 / DELTA : 1 / direction.y; + double z = Math.abs(direction.z) < DELTA ? + direction.z >= 0 ? 1 / DELTA : -1 / DELTA : 1 / direction.z; + + if (direction.x >= 0) { + tMin = (lowerBounds.x - origin.x) * x; + tMax = (upperBounds.x - origin.x) * x; + } else { + tMin = (upperBounds.x - origin.x) * x; + tMax = (lowerBounds.x - origin.x) * x; + } + + if (direction.y >= 0) { + tyMin = (lowerBounds.y - origin.y) * y; + tyMax = (upperBounds.y - origin.y) * y; + } else { + tyMin = (upperBounds.y - origin.y) * y; + tyMax = (lowerBounds.y - origin.y) * y; + } + + if (tMin > tyMax || tyMin > tMax) { + return false; + } + tMin = Math.max(tyMin, tMin); + tMax = Math.min(tyMax, tMax); + + if (direction.z >= 0) { + tzMin = (lowerBounds.z - origin.z) * z; + tzMax = (upperBounds.z - origin.z) * z; + } else { + tzMin = (upperBounds.z - origin.z) * z; + tzMax = (lowerBounds.z - origin.z) * z; + } + + if (tMin > tzMax || tzMin > tMax) { + return false; + } + + tMin = Math.max(tzMin, tMin); + tMax = Math.min(tzMax, tMax); + + double t; + if (tMin < 0) { + if (tMax < 0) { + return false; + } + t = tMax; + } else { + if (tMin > tMax) { + t = tMax; + } else { + t = tMin; + } + } + + ray.setScale(t); + return true; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Disk.java b/src/main/java/labs/introtoprogramming/lab5/object/Disk.java index 747f93d..71b66d3 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Disk.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Disk.java @@ -24,7 +24,11 @@ public boolean intersect(Ray ray) { Vector3 intersection = ray.getPoint(); Vector3 direction = intersection.subtract(transform.position()); double distance = direction.magnitudeSquared(); - return (distance <= radius * radius); + if (distance > radius * radius) { + ray.setScale(1); + return false; + } + return true; } return false; } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java index 749c085..8d64bf4 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java @@ -51,14 +51,14 @@ SceneObject findInteraction(Ray primaryRay, Scene scene) { SceneObject intersection = null; double minDistance = Double.POSITIVE_INFINITY; for (SceneObject obj : scene.getSceneObjects()) { - double distance = obj.getTransform().position().distance(primaryRay.getOrigin()); - if (distance < minDistance) { if (obj.intersect(primaryRay)) { - minDistance = distance; - intersection = obj; + double distance = primaryRay.getScale(); + if (distance < minDistance) { + minDistance = distance; + intersection = obj; + } } } - } return intersection; } } diff --git a/src/test/java/labs/introtoprogramming/lab5/geometry/Matrix44Tests.java b/src/test/java/labs/introtoprogramming/lab5/geometry/Matrix44Tests.java new file mode 100644 index 0000000..a2d8b08 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/geometry/Matrix44Tests.java @@ -0,0 +1,32 @@ +package labs.introtoprogramming.lab5.geometry; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class Matrix44Tests { + + @Test + public void testSetMatrix() { + Matrix44 matrix44 = new Matrix44(); + matrix44.setMatrix(Vector3.RIGHT, Vector3.UP, Vector3.FORWARD, Vector3.ZERO); + Vector3 v = matrix44.applyPoint(Vector3.ONE); + assertEquals(Vector3.ONE, v); + } + + @Test + public void testApplyVector() { + Matrix44 matrix44 = new Matrix44(); + matrix44.setMatrix(Vector3.RIGHT, Vector3.UP, Vector3.FORWARD, Vector3.ONE.multiply(100)); + Vector3 v = matrix44.applyVector(Vector3.ONE); + assertEquals(Vector3.ONE, v); + } + + @Test + public void testApplyPoint() { + Matrix44 matrix44 = new Matrix44(); + matrix44.setMatrix(Vector3.RIGHT, Vector3.UP, Vector3.FORWARD, Vector3.ONE); + Vector3 v = matrix44.applyPoint(Vector3.ONE); + assertEquals(Vector3.ONE.multiply(2), v); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java b/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java new file mode 100644 index 0000000..ae7ea83 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java @@ -0,0 +1,70 @@ +package labs.introtoprogramming.lab5.object; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.Transform; +import org.junit.Test; + +public class BoxTests { + private static final double DELTA = 1e-10; + + @Test + public void testIntersection() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Box box = new Box(new Transform(Vector3.RIGHT.multiply(2)),1); + assertTrue(box.intersect(ray)); + assertEquals(1.5, ray.getScale(), DELTA); + } + + @Test + public void testIntersectionInner() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Box box = new Box(new Transform(Vector3.ZERO), 1); + assertTrue(box.intersect(ray)); + assertEquals(0.5, ray.getScale(), DELTA); + } + + @Test + public void testNoIntersectionUpAxis() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Box box = new Box(new Transform(Vector3.ONE.multiply(2)), 1); + assertFalse(box.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } + + @Test + public void testNoIntersectionForwardAxis() { + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + Box box = new Box(new Transform(Vector3.ONE.multiply(2)), 1); + assertFalse(box.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } + + + @Test + public void testIntersectionOppositeDirection() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT.multiply(-1)); + Box box = new Box(new Transform(Vector3.RIGHT.multiply(2)), 1); + assertFalse(box.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } + + @Test + public void testIntersectionNegativeDirection() { + Ray ray = new Ray(Vector3.ZERO, Vector3.ONE.multiply(-1)); + Box box = new Box(new Transform(Vector3.ONE.multiply(-2)),1); + assertTrue(box.intersect(ray)); + assertEquals(1.5, ray.getScale(), DELTA); + } + + @Test + public void testIntersectionZeroDirection() { + Ray ray = new Ray(Vector3.ZERO, Vector3.ZERO); + Box box = new Box(new Transform(Vector3.RIGHT.multiply(2)),1); + assertFalse(box.intersect(ray)); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java b/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java index b0df5f2..33ad99a 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java @@ -1,5 +1,6 @@ package labs.introtoprogramming.lab5.object; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -9,12 +10,14 @@ import org.junit.Test; public class DiskTests { + private static final double DELTA = 1e-10; @Test public void testIntersection() { Disk disk = new Disk(new Transform(Vector3.ZERO)); Ray ray = new Ray(Vector3.UP.multiply(-3), Vector3.UP.multiply(1)); assertTrue(disk.intersect(ray)); + assertEquals(3, ray.getScale(), DELTA); } @Test @@ -22,6 +25,7 @@ public void testParallel() { Disk disk = new Disk(new Transform(Vector3.ZERO)); Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); assertFalse(disk.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); } @Test @@ -29,6 +33,7 @@ public void testReverseToNormal() { Disk disk = new Disk(new Transform(Vector3.ZERO)); Ray ray = new Ray(Vector3.UP.multiply(3), Vector3.UP.multiply(-1)); assertFalse(disk.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); } @Test @@ -36,5 +41,6 @@ public void testGreaterThanRadius() { Disk disk = new Disk(new Transform(Vector3.RIGHT), 0.5); Ray ray = new Ray(Vector3.UP.multiply(-3), Vector3.UP.multiply(1)); assertFalse(disk.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java b/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java index 9cd487a..b757837 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java @@ -1,5 +1,6 @@ package labs.introtoprogramming.lab5.object; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -9,12 +10,14 @@ import org.junit.Test; public class PlaneTests { + private static final double DELTA = 1e-10; @Test public void testIntersection() { Plane plane = new Plane(new Transform(Vector3.ZERO)); Ray ray = new Ray(Vector3.UP.multiply(-3), Vector3.UP.multiply(1)); assertTrue(plane.intersect(ray)); + assertEquals(3, ray.getScale(), DELTA); } @Test @@ -22,6 +25,7 @@ public void testParallel() { Plane plane = new Plane(new Transform(Vector3.ZERO)); Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); assertFalse(plane.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); } @Test @@ -29,5 +33,6 @@ public void testReverseToNormal() { Plane plane = new Plane(new Transform(Vector3.ZERO)); Ray ray = new Ray(Vector3.UP.multiply(3), Vector3.UP.multiply(-1)); assertFalse(plane.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java index 9dae088..d128deb 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java @@ -17,7 +17,7 @@ public void testIntersection() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); Sphere sphere = new Sphere(new Transform(Vector3.RIGHT.multiply(2)), 1); assertTrue(sphere.intersect(ray)); - assertEquals(ray.getScale(), 1, DELTA); + assertEquals(1, ray.getScale(), DELTA); } @Test @@ -25,7 +25,7 @@ public void testIntersectionInner() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); Sphere sphere = new Sphere(new Transform(Vector3.ZERO), 1); assertTrue(sphere.intersect(ray)); - assertEquals(ray.getScale(), 1, DELTA); + assertEquals(1, ray.getScale(), DELTA); } @Test @@ -41,6 +41,6 @@ public void testIntersectionOppositeDirection() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT.multiply(-1)); Sphere sphere = new Sphere(new Transform(Vector3.RIGHT.multiply(2)), 1); assertFalse(sphere.intersect(ray)); - assertEquals(ray.getScale(), 1, DELTA); + assertEquals(1, ray.getScale(), DELTA); } } From c5c79379c3f7168692063cf41591385c99877e41 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Wed, 5 Jun 2019 10:54:06 +0300 Subject: [PATCH 20/36] feat(scene): add test for camera and transform --- .../lab5/geometry/Matrix44.java | 41 ++++++++++++++-- .../lab5/geometry/Vector3.java | 20 ++++---- .../introtoprogramming/lab5/object/Box.java | 17 +++---- .../lab5/scene/BasicRaytracingRender.java | 12 ++--- .../introtoprogramming/lab5/scene/Camera.java | 4 +- .../lab5/geometry/Matrix44Tests.java | 14 +++++- .../lab5/geometry/VectorTests.java | 11 ++++- .../lab5/object/BoxTests.java | 32 +++++++++---- .../lab5/object/PlaneTests.java | 8 ++++ .../lab5/object/SphereTests.java | 2 +- .../lab5/scene/CameraTests.java | 47 +++++++++++++++++++ .../lab5/scene/TransformTests.java | 47 +++++++++++++++++++ 12 files changed, 212 insertions(+), 43 deletions(-) create mode 100644 src/test/java/labs/introtoprogramming/lab5/scene/CameraTests.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/scene/TransformTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java index 8442aef..171f803 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Matrix44.java @@ -3,6 +3,9 @@ public class Matrix44 { private double[][] m; + /** + * Transformation matrix. + */ public Matrix44() { m = new double[4][4]; for (int i = 0; i < 4; i++) { @@ -10,6 +13,13 @@ public Matrix44() { } } + /** + * Create new transformation matrix from given translation, rotation and scale. + * + * @param translation translation of object relatively to world origin + * @param rotation rotation of object relatively to world origin + * @param scale scale of object + */ public void generateTransformation(Vector3 translation, Vector3 rotation, Vector3 scale) { applyTranslation(translation); applyRotation(rotation); @@ -72,6 +82,12 @@ private double[][] applyRotationAroundZ(double angle) { return rotation; } + /** + * Apply transformation matrix to vector. + * + * @param v vector to transform + * @return transformed vector + */ public Vector3 applyVector(Vector3 v) { return new Vector3( v.x * m[0][0] + v.y * m[0][1] + v.z * m[0][2], @@ -80,8 +96,14 @@ public Vector3 applyVector(Vector3 v) { ); } - public Vector3 applyPoint(Vector3 v) { - return translate(applyVector(v)); + /** + * Apply transformation matrix to point. + * + * @param p point to transform + * @return transformed point + */ + public Vector3 applyPoint(Vector3 p) { + return translate(applyVector(p)); } private Vector3 translate(Vector3 v) { @@ -92,14 +114,23 @@ private double[][] multiply(double[][] a, double[][] b) { double[][] res = new double[a.length][b[0].length]; for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { - res[i][j] = a[i][0] * b[0][j] + - a[i][1] * b[1][j] + - a[i][2] * b[2][j]; + res[i][j] = a[i][0] * b[0][j] + + a[i][1] * b[1][j] + + a[i][2] * b[2][j]; } } return res; } + /** + * Create transformation matrix from given right, up, forward vectors + * and translation relatively to world origin. + * + * @param right normalized right vector + * @param up normalized up vector + * @param forward normalized forward vector + * @param translate translation of object relatively to world origin + */ public void setMatrix(Vector3 right, Vector3 up, Vector3 forward, Vector3 translate) { m[0][0] = right.x; m[1][0] = right.y; diff --git a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java index af5c7ef..ddda264 100644 --- a/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java +++ b/src/main/java/labs/introtoprogramming/lab5/geometry/Vector3.java @@ -21,9 +21,7 @@ public Vector3(double x, double y, double z) { } public Vector3(Vector3 v) { - x = v.x; - y = v.y; - z = v.z; + this(v.x, v.y, v.z); } public double magnitude() { @@ -73,12 +71,16 @@ public Vector3 add(Vector3 v) { @Override public boolean equals(Object obj) { - if (!(obj instanceof Vector3)) return false; - if (obj == this) return true; - Vector3 vector = (Vector3) obj; - return Math.abs(vector.x - x) < COORDINATES_PRECISION && - Math.abs(vector.y - y) < COORDINATES_PRECISION && - Math.abs(vector.z - z) < COORDINATES_PRECISION; + if (!(obj instanceof Vector3)) { + return false; + } + if (obj == this) { + return true; + } + Vector3 v = (Vector3) obj; + return Math.abs(v.x - x) < COORDINATES_PRECISION + && Math.abs(v.y - y) < COORDINATES_PRECISION + && Math.abs(v.z - z) < COORDINATES_PRECISION; } @Override diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Box.java b/src/main/java/labs/introtoprogramming/lab5/object/Box.java index 1d840a9..88370e5 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Box.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Box.java @@ -6,7 +6,7 @@ import labs.introtoprogramming.lab5.scene.Transform; public class Box extends SceneObject { - private static final double DELTA = 1e-10; + private static final double DELTA = 1e-6; private static final double DEFAULT_SIZE = 1; private Vector3 lowerBounds; @@ -17,7 +17,7 @@ public Box(Transform transform, double size) { Vector3 pos = transform.position(); Vector3 bound = Vector3.ONE.multiply(size * 0.5); upperBounds = pos.add(bound); - lowerBounds = pos.add(bound.multiply(-size)); + lowerBounds = pos.add(bound.multiply(-1)); } public Box(Transform transform) { @@ -29,12 +29,9 @@ public boolean intersect(Ray ray) { Vector3 direction = ray.getDirection(); Vector3 origin = ray.getOrigin(); double tMin, tMax, tyMin, tyMax, tzMin, tzMax; - double x = Math.abs(direction.x) < DELTA ? - direction.x >= 0 ? 1 / DELTA : -1 / DELTA : 1 / direction.x; - double y = Math.abs(direction.y) < DELTA ? - direction.y >= 0 ? 1 / DELTA : -1 / DELTA : 1 / direction.y; - double z = Math.abs(direction.z) < DELTA ? - direction.z >= 0 ? 1 / DELTA : -1 / DELTA : 1 / direction.z; + double x = axisDirection(direction.x); + double y = axisDirection(direction.y); + double z = axisDirection(direction.z); if (direction.x >= 0) { tMin = (lowerBounds.x - origin.x) * x; @@ -90,4 +87,8 @@ public boolean intersect(Ray ray) { ray.setScale(t); return true; } + + private double axisDirection(double val) { + return Math.abs(val) < DELTA ? val >= 0 ? 1 / DELTA : -1 / DELTA : 1 / val; + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java index 8d64bf4..9ae2c15 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java @@ -51,14 +51,14 @@ SceneObject findInteraction(Ray primaryRay, Scene scene) { SceneObject intersection = null; double minDistance = Double.POSITIVE_INFINITY; for (SceneObject obj : scene.getSceneObjects()) { - if (obj.intersect(primaryRay)) { - double distance = primaryRay.getScale(); - if (distance < minDistance) { - minDistance = distance; - intersection = obj; - } + if (obj.intersect(primaryRay)) { + double distance = primaryRay.getScale(); + if (distance < minDistance) { + minDistance = distance; + intersection = obj; } } + } return intersection; } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java index 44f6193..80ac2ba 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java @@ -1,7 +1,7 @@ package labs.introtoprogramming.lab5.scene; -import labs.introtoprogramming.lab5.graphics.Raster; import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.graphics.Raster; public class Camera extends SceneObject { private static final double DEFAULT_SIZE = 1; @@ -46,7 +46,7 @@ public double aspectRatio() { } /** - * Set position of camera to from and and orientation to face to + * Set position of camera to from and and orientation to face to. * * @param from position of camera * @param to point to look at diff --git a/src/test/java/labs/introtoprogramming/lab5/geometry/Matrix44Tests.java b/src/test/java/labs/introtoprogramming/lab5/geometry/Matrix44Tests.java index a2d8b08..c4b9d80 100644 --- a/src/test/java/labs/introtoprogramming/lab5/geometry/Matrix44Tests.java +++ b/src/test/java/labs/introtoprogramming/lab5/geometry/Matrix44Tests.java @@ -9,9 +9,10 @@ public class Matrix44Tests { @Test public void testSetMatrix() { Matrix44 matrix44 = new Matrix44(); - matrix44.setMatrix(Vector3.RIGHT, Vector3.UP, Vector3.FORWARD, Vector3.ZERO); + matrix44.setMatrix(Vector3.RIGHT.multiply(2), Vector3.UP, + Vector3.FORWARD.multiply(-1), Vector3.ONE); Vector3 v = matrix44.applyPoint(Vector3.ONE); - assertEquals(Vector3.ONE, v); + assertEquals(new Vector3(3, 2, 0), v); } @Test @@ -29,4 +30,13 @@ public void testApplyPoint() { Vector3 v = matrix44.applyPoint(Vector3.ONE); assertEquals(Vector3.ONE.multiply(2), v); } + + @Test + public void testGenerateTransformation() { + Matrix44 matrix44 = new Matrix44(); + matrix44.generateTransformation(Vector3.ONE, new Vector3(0, 0, 90), Vector3.ONE.multiply(2)); + Vector3 v = matrix44.applyPoint(Vector3.ONE); + System.out.println(v); + assertEquals(new Vector3(2, 0, 3), v); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java b/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java index a9e2d37..f0a4cb0 100644 --- a/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/geometry/VectorTests.java @@ -2,6 +2,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotSame; import org.junit.Test; @@ -23,7 +24,7 @@ public void testMagnitude() { @Test public void testNormalize() { Vector3 a = new Vector3(2, 4, 4); - assertEquals(new Vector3( 2.0 / 6, 4.0 / 6, 4.0 / 6), a.normalize()); + assertEquals(new Vector3(2.0 / 6, 4.0 / 6, 4.0 / 6), a.normalize()); } @Test @@ -126,4 +127,12 @@ public void testHashCode() { Vector3 a = Vector3.ONE; assertEquals(3, a.hashCode(), DELTA); } + + @Test + public void testClone() throws CloneNotSupportedException { + Vector3 a = Vector3.ONE; + Vector3 b = (Vector3) a.clone(); + assertNotSame(a, b); + assertEquals(a, b); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java b/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java index ae7ea83..ac1334d 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java @@ -15,7 +15,7 @@ public class BoxTests { @Test public void testIntersection() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); - Box box = new Box(new Transform(Vector3.RIGHT.multiply(2)),1); + Box box = new Box(new Transform(Vector3.RIGHT.multiply(2))); assertTrue(box.intersect(ray)); assertEquals(1.5, ray.getScale(), DELTA); } @@ -23,32 +23,39 @@ public void testIntersection() { @Test public void testIntersectionInner() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); - Box box = new Box(new Transform(Vector3.ZERO), 1); + Box box = new Box(new Transform(Vector3.ZERO), 2); assertTrue(box.intersect(ray)); - assertEquals(0.5, ray.getScale(), DELTA); + assertEquals(1, ray.getScale(), DELTA); } @Test public void testNoIntersectionUpAxis() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); - Box box = new Box(new Transform(Vector3.ONE.multiply(2)), 1); + Box box = new Box(new Transform(Vector3.ONE.multiply(2))); assertFalse(box.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } @Test - public void testNoIntersectionForwardAxis() { + public void testNoIntersectionForwardAxisUpperBound() { Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); - Box box = new Box(new Transform(Vector3.ONE.multiply(2)), 1); + Box box = new Box(new Transform(Vector3.ONE.multiply(2))); assertFalse(box.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } + @Test + public void testNoIntersectionForwardAxisLowerBound() { + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + Box box = new Box(new Transform(Vector3.ONE.multiply(-2))); + assertFalse(box.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } @Test public void testIntersectionOppositeDirection() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT.multiply(-1)); - Box box = new Box(new Transform(Vector3.RIGHT.multiply(2)), 1); + Box box = new Box(new Transform(Vector3.RIGHT.multiply(2))); assertFalse(box.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } @@ -56,7 +63,7 @@ public void testIntersectionOppositeDirection() { @Test public void testIntersectionNegativeDirection() { Ray ray = new Ray(Vector3.ZERO, Vector3.ONE.multiply(-1)); - Box box = new Box(new Transform(Vector3.ONE.multiply(-2)),1); + Box box = new Box(new Transform(Vector3.ONE.multiply(-2))); assertTrue(box.intersect(ray)); assertEquals(1.5, ray.getScale(), DELTA); } @@ -64,7 +71,14 @@ public void testIntersectionNegativeDirection() { @Test public void testIntersectionZeroDirection() { Ray ray = new Ray(Vector3.ZERO, Vector3.ZERO); - Box box = new Box(new Transform(Vector3.RIGHT.multiply(2)),1); + Box box = new Box(new Transform(Vector3.RIGHT.multiply(2))); + assertFalse(box.intersect(ray)); + } + + @Test + public void testIntersectionMinusZeroDirection() { + Ray ray = new Ray(Vector3.ZERO, new Vector3(-DELTA, -DELTA, -DELTA)); + Box box = new Box(new Transform(Vector3.RIGHT.multiply(2))); assertFalse(box.intersect(ray)); } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java b/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java index b757837..3ababdd 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java @@ -35,4 +35,12 @@ public void testReverseToNormal() { assertFalse(plane.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } + + @Test + public void testBelowRayOrigin() { + Plane plane = new Plane(new Transform(Vector3.UP.multiply(-1))); + Ray ray = new Ray(Vector3.ZERO, Vector3.UP); + assertFalse(plane.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java index d128deb..11e0696 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java @@ -1,8 +1,8 @@ package labs.introtoprogramming.lab5.object; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; import labs.introtoprogramming.lab5.geometry.Ray; import labs.introtoprogramming.lab5.geometry.Vector3; diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/CameraTests.java b/src/test/java/labs/introtoprogramming/lab5/scene/CameraTests.java new file mode 100644 index 0000000..d9793a8 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/scene/CameraTests.java @@ -0,0 +1,47 @@ +package labs.introtoprogramming.lab5.scene; + +import static org.junit.Assert.assertEquals; + +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.graphics.BufferedImageRaster; +import labs.introtoprogramming.lab5.graphics.Raster; +import org.junit.Test; + +public class CameraTests { + private static final double DELTA = 1e-6; + private static final Raster DUMMY_RASTER = new BufferedImageRaster(600, 400); + + @Test + public void testInstantiation() { + Camera cam = new Camera(DUMMY_RASTER, new Transform(Vector3.ZERO)); + assertEquals(cam.size(), 1, DELTA); + assertEquals(cam.fieldOfView(), 2 * Math.atan(1), DELTA); + assertEquals(cam.aspectRatio(), 600.0 / 400.0, DELTA); + } + + @Test + public void testSize() { + Camera cam = new Camera(DUMMY_RASTER, new Transform(Vector3.ZERO), 100); + assertEquals(cam.size(), 100, DELTA); + } + + @Test + public void testAspectRatio() { + Camera cam = new Camera(new BufferedImageRaster(1000, 1), new Transform(Vector3.ZERO)); + assertEquals(cam.aspectRatio(), 1000, DELTA); + } + + @Test + public void testFieldOfView() { + Camera cam = new Camera(DUMMY_RASTER, new Transform(Vector3.ZERO), 10); + assertEquals(cam.fieldOfView(), 2.94225535, DELTA); + } + + @Test + public void testLookAt() { + Camera cam = new Camera(DUMMY_RASTER, new Transform(Vector3.ZERO), 10); + cam.lookAt(Vector3.UP.multiply(10), Vector3.ONE.multiply(5)); + Vector3 res = cam.transform.applyPoint(Vector3.ONE); + assertEquals(new Vector3(-0.82136720504, 11.2440169359, 0.3333333333), res); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/TransformTests.java b/src/test/java/labs/introtoprogramming/lab5/scene/TransformTests.java new file mode 100644 index 0000000..f6cf2fa --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/scene/TransformTests.java @@ -0,0 +1,47 @@ +package labs.introtoprogramming.lab5.scene; + +import static org.junit.Assert.assertEquals; + +import labs.introtoprogramming.lab5.geometry.Vector3; +import org.junit.Test; + +public class TransformTests { + + @Test + public void testInstantiation() { + Transform tran = new Transform(Vector3.ONE, Vector3.ONE.multiply(45)); + assertEquals(Vector3.ONE, tran.position()); + assertEquals(Vector3.ONE.multiply(45), tran.rotation()); + assertEquals(Vector3.ONE, tran.scale()); + } + + @Test + public void testSetPosition() { + Transform tran = new Transform(Vector3.ZERO); + tran.setPosition(Vector3.ONE.multiply(5)); + assertEquals(new Vector3(5, 6, 5), tran.applyPoint(Vector3.UP)); + assertEquals(Vector3.UP, tran.applyVector(Vector3.UP)); + } + + @Test + public void testSetRotation() { + Transform tran = new Transform(Vector3.ZERO); + tran.setRotation(new Vector3(0, 0, 90)); + assertEquals(Vector3.RIGHT, tran.applyVector(Vector3.UP)); + } + + @Test + public void testSetScale() { + Transform tran = new Transform(Vector3.ZERO); + tran.setScale(Vector3.ONE.multiply(5)); + assertEquals(Vector3.UP.multiply(5), tran.applyVector(Vector3.UP)); + } + + @Test + public void testSetMatrix() { + Transform tran = new Transform(); + tran.setMatrix(Vector3.RIGHT.multiply(2), Vector3.UP, + Vector3.FORWARD.multiply(-1), Vector3.ONE.multiply(5)); + assertEquals(new Vector3(7, 6, 4), tran.applyPoint(Vector3.ONE)); + } +} From 453a4605a83984d3c3f4662fd05e9ee357168bcb Mon Sep 17 00:00:00 2001 From: Brook333 Date: Sun, 9 Jun 2019 17:34:32 +0300 Subject: [PATCH 21/36] feat(object): add triangle --- .../lab5/object/Triangle.java | 62 +++++++++++++++++++ .../lab5/object/TriangleTests.java | 50 +++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 src/main/java/labs/introtoprogramming/lab5/object/Triangle.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java b/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java new file mode 100644 index 0000000..dd5c6ae --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java @@ -0,0 +1,62 @@ +package labs.introtoprogramming.lab5.object; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; + +public class Triangle extends SceneObject { + private static final double DELTA = 1e-6; + + private Vector3 v0; // Points which define triangle + private Vector3 v1; + private Vector3 v2; + + /** + * Representation of triangle. + * + * @param transform container of object transformations + * @param v0 first vertex of triangle + * @param v1 second vertex of triangle + * @param v2 third vertex of triangle + */ + public Triangle(Transform transform, Vector3 v0, Vector3 v1, Vector3 v2) { + super(transform); + this.v0 = v0; + this.v1 = v1; + this.v2 = v2; + } + + @Override + public boolean intersect(Ray ray) { + Vector3 v0 = transform.applyPoint(this.v0); + Vector3 v1 = transform.applyPoint(this.v1); + Vector3 v2 = transform.applyPoint(this.v2); + Vector3 v0v1 = v1.subtract(v0); + Vector3 v0v2 = v2.subtract(v0); + Vector3 direction = ray.getDirection(); + + Vector3 p = direction.crossProduct(v0v2); + double det = v0v1.dotProduct(p); + if (Math.abs(det) < DELTA) { + return false; + } + double invDet = 1 / det; + + Vector3 t = ray.getOrigin().subtract(v0); + double u = t.dotProduct(p) * invDet; + if (u < 0 || u > 1) { + return false; + } + + Vector3 q = t.crossProduct(v0v1); + double v = direction.dotProduct(q) * invDet; + if (v < 0 || v + u > 1) { + return false; + } + + double scale = v0v2.dotProduct(q) * invDet; + ray.setScale(scale); + return true; + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java b/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java new file mode 100644 index 0000000..625c398 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java @@ -0,0 +1,50 @@ +package labs.introtoprogramming.lab5.object; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.Transform; +import org.junit.Test; + +public class TriangleTests { + private static final double DELTA = 1e-10; + + @Test + public void testIntersection() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Triangle triangle = new Triangle(new Transform(Vector3.RIGHT.multiply(2)), + Vector3.FORWARD, Vector3.UP, Vector3.FORWARD.multiply(-1)); + assertTrue(triangle.intersect(ray)); + assertEquals(2, ray.getScale(), DELTA); + } + + @Test + public void testNoIntersection() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Triangle triangle = new Triangle(new Transform(Vector3.UP.multiply(10)), + Vector3.FORWARD, Vector3.UP, Vector3.FORWARD.multiply(-1)); + assertFalse(triangle.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } + + @Test + public void testNoIntersectionParallel() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Triangle triangle = new Triangle(new Transform(Vector3.RIGHT.multiply(10)), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)); + assertFalse(triangle.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } + + @Test + public void testOutOfBoundNoIntersection() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Triangle triangle = new Triangle(new Transform(Vector3.RIGHT.multiply(2)), + Vector3.FORWARD.multiply(-1), Vector3.ONE, Vector3.UP.multiply(1)); + assertFalse(triangle.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } +} From edf8a1b3c474143d2856e477cec005d3a51aa4bc Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 20:07:30 +0300 Subject: [PATCH 22/36] fix(BufferedImageRaster): fix strange frame rendering bug --- .../lab5/graphics/BufferedImageRaster.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java b/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java index 874b74e..b7eaecf 100644 --- a/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java +++ b/src/main/java/labs/introtoprogramming/lab5/graphics/BufferedImageRaster.java @@ -3,6 +3,7 @@ import java.awt.Color; import java.awt.GraphicsEnvironment; import java.awt.Image; +import java.awt.Transparency; import java.awt.image.BufferedImage; public class BufferedImageRaster implements Raster { @@ -14,9 +15,9 @@ public BufferedImageRaster(int width, int height) { if (!GraphicsEnvironment.isHeadless()) { image = GraphicsEnvironment.getLocalGraphicsEnvironment() .getDefaultScreenDevice() - .getDefaultConfiguration().createCompatibleImage(width, height); + .getDefaultConfiguration().createCompatibleImage(width, height, Transparency.BITMASK); } else { - image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); } } From dc0e1b232ddff4d1a47de8c197660a78c1bc0de5 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 20:15:52 +0300 Subject: [PATCH 23/36] feat(ControllableCamera): camera controllable by keyboard and mouse --- .../introtoprogramming/lab5/gui/Input.java | 92 +++++++++++++++++++ .../lab5/gui/InputKeyListener.java | 49 ++++++++++ .../lab5/gui/MouseController.java | 57 ++++++++++++ .../lab5/gui/SceneRendererWindow.java | 72 +++++++++++++++ .../introtoprogramming/lab5/gui/Window.java | 3 +- .../lab5/scene/BasicScene.java | 17 +++- .../introtoprogramming/lab5/scene/Camera.java | 4 + .../lab5/scene/ControllableCamera.java | 25 +++++ .../introtoprogramming/lab5/scene/Scene.java | 18 +++- .../lab5/scene/SceneObject.java | 12 +++ 10 files changed, 342 insertions(+), 7 deletions(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/gui/Input.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/gui/InputKeyListener.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/gui/MouseController.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/ControllableCamera.java diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/Input.java b/src/main/java/labs/introtoprogramming/lab5/gui/Input.java new file mode 100644 index 0000000..617b633 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/gui/Input.java @@ -0,0 +1,92 @@ +package labs.introtoprogramming.lab5.gui; + +import labs.introtoprogramming.lab5.geometry.Vector3; + +public class Input { + + private boolean forwardKeyDown = false; + private boolean backwardKeyDown = false; + private boolean leftKeyDown = false; + private boolean rightKeyDown = false; + private boolean upKeyDown = false; + private boolean downKeyDown = false; + + private double mouseDeltaX = 0; + private double mouseDeltaY = 0; + + public Vector3 movementVector() { + return new Vector3((leftKeyDown ? -1 : 0) + (rightKeyDown ? 1 : 0), + (upKeyDown ? 1 : 0) + (downKeyDown ? -1 : 0), + (forwardKeyDown ? -1 : 0) + (backwardKeyDown ? 1 : 0)); + } + + public Vector3 mouseMovement() { + //noinspection SuspiciousNameCombination + return new Vector3(mouseDeltaY, mouseDeltaX, 0); + } + + public double getMouseDeltaX() { + return mouseDeltaX; + } + + public void setMouseDeltaX(double mouseDeltaX) { + this.mouseDeltaX = mouseDeltaX; + } + + public double getMouseDeltaY() { + return mouseDeltaY; + } + + public void setMouseDeltaY(double mouseDeltaY) { + this.mouseDeltaY = mouseDeltaY; + } + + public boolean isForwardKeyDown() { + return forwardKeyDown; + } + + public void setForwardKeyDown(boolean forwardKeyDown) { + this.forwardKeyDown = forwardKeyDown; + } + + public boolean isBackwardKeyDown() { + return backwardKeyDown; + } + + public void setBackwardKeyDown(boolean backwardKeyDown) { + this.backwardKeyDown = backwardKeyDown; + } + + public boolean isLeftKeyDown() { + return leftKeyDown; + } + + public void setLeftKeyDown(boolean leftKeyDown) { + this.leftKeyDown = leftKeyDown; + } + + public boolean isRightKeyDown() { + return rightKeyDown; + } + + public void setRightKeyDown(boolean rightKeyDown) { + this.rightKeyDown = rightKeyDown; + } + + public boolean isUpKeyDown() { + return upKeyDown; + } + + public void setUpKeyDown(boolean upKeyDown) { + this.upKeyDown = upKeyDown; + } + + public boolean isDownKeyDown() { + return downKeyDown; + } + + public void setDownKeyDown(boolean downKeyDown) { + this.downKeyDown = downKeyDown; + } + +} diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/InputKeyListener.java b/src/main/java/labs/introtoprogramming/lab5/gui/InputKeyListener.java new file mode 100644 index 0000000..4e37221 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/gui/InputKeyListener.java @@ -0,0 +1,49 @@ +package labs.introtoprogramming.lab5.gui; + +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; + +class InputKeyListener implements KeyListener { + + private Input input; + + InputKeyListener(Input input) { + this.input = input; + } + + @Override + public void keyTyped(KeyEvent e) { + // ignore + } + + @Override + public void keyPressed(KeyEvent e) { + keyCodeUpdate(e.getKeyCode(), true); + } + + @Override + public void keyReleased(KeyEvent e) { + keyCodeUpdate(e.getKeyCode(), false); + } + + private void keyCodeUpdate(int keyCode, boolean isDown) { + if (keyCode == KeyEvent.VK_W || keyCode == KeyEvent.VK_UP) { + input.setForwardKeyDown(isDown); + } + if (keyCode == KeyEvent.VK_S || keyCode == KeyEvent.VK_DOWN) { + input.setBackwardKeyDown(isDown); + } + if (keyCode == KeyEvent.VK_A || keyCode == KeyEvent.VK_LEFT) { + input.setLeftKeyDown(isDown); + } + if (keyCode == KeyEvent.VK_D || keyCode == KeyEvent.VK_RIGHT) { + input.setRightKeyDown(isDown); + } + if (keyCode == KeyEvent.VK_Q) { + input.setUpKeyDown(isDown); + } + if (keyCode == KeyEvent.VK_Z) { + input.setDownKeyDown(isDown); + } + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/MouseController.java b/src/main/java/labs/introtoprogramming/lab5/gui/MouseController.java new file mode 100644 index 0000000..5909296 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/gui/MouseController.java @@ -0,0 +1,57 @@ +package labs.introtoprogramming.lab5.gui; + +import java.awt.AWTException; +import java.awt.Cursor; +import java.awt.MouseInfo; +import java.awt.Point; +import java.awt.Robot; +import java.awt.Toolkit; +import java.awt.image.BufferedImage; +import javax.swing.JFrame; + +class MouseController { + + private static final String BLANK_CURSOR_NAME = "blank cursor"; + + private Input input; + private JFrame frame; + + private Robot robot; + private Point prevLocation; + + MouseController(Input input, JFrame frame) { + this.input = input; + this.frame = frame; + try { + this.robot = new Robot(); + } catch(AWTException e) { + throw new AssertionError(e); + } + } + + void hideCursor() { + BufferedImage cursorImg = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB); + Cursor blankCursor = Toolkit.getDefaultToolkit().createCustomCursor( + cursorImg, new Point(0, 0), BLANK_CURSOR_NAME); + frame.setCursor(blankCursor); + } + + void update() { + if (!frame.isFocused()) { + return; + } + + int centerX = frame.getX() + frame.getWidth() / 2; + int centerY = frame.getY() + frame.getHeight() / 2; + Point mouseLocation = MouseInfo.getPointerInfo().getLocation(); + + if (prevLocation != null) { + input.setMouseDeltaX(mouseLocation.getX() - centerX); + input.setMouseDeltaY(mouseLocation.getY() - centerY); + } + + prevLocation = mouseLocation; + robot.mouseMove(centerX, centerY); + } + +} diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java b/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java new file mode 100644 index 0000000..efd4d63 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java @@ -0,0 +1,72 @@ +package labs.introtoprogramming.lab5.gui; + +import java.util.Timer; +import java.util.TimerTask; +import labs.introtoprogramming.lab5.exception.NoCameraException; +import labs.introtoprogramming.lab5.scene.BasicRaytracingRender; +import labs.introtoprogramming.lab5.scene.Scene; +import labs.introtoprogramming.lab5.scene.SceneRender; + +public class SceneRendererWindow extends Window { + + private static final String UPDATE_LOOP_TIMER_NAME = "UpdateLoop"; + private static final int UPDATE_LOOP_DELAY = 100; // ms + private static final int TARGET_FPS = 60; + private static final int UPDATE_RATE = 1000/TARGET_FPS; + private static final boolean DEFAULT_CAMERA_CONTROLLABLE = false; + + private SceneRender render; + private Scene scene; + private MouseController mouseController; + private Input input; + + public SceneRendererWindow(Scene scene) { + this(new BasicRaytracingRender(scene.getCamera().orElseThrow(NoCameraException::new).raster()), scene); + setRaster(scene.getCamera().orElseThrow(NoCameraException::new).raster()); + } + + public SceneRendererWindow(SceneRender render, Scene scene) { + this.render = render; + this.scene = scene; + input = new Input(); + scene.getCamera().ifPresent(camera -> setRaster(camera.raster())); + scene.getSceneObjects().forEach(obj -> obj.setInput(input)); + mouseController = new MouseController(input, frame); + } + + public void show() { + super.show(); + startUpdateLoop(); + setupKeyboardListener(); + mouseController.hideCursor(); + } + + private void setupKeyboardListener() { + frame.addKeyListener(new InputKeyListener(input)); + } + + private void startUpdateLoop() { + new Timer(UPDATE_LOOP_TIMER_NAME, true).scheduleAtFixedRate(new TimerTask() { + long previousTime = System.currentTimeMillis(); + + @Override + public void run() { + long currentTime = System.currentTimeMillis(); + updateIteration((int) (currentTime - previousTime)); + previousTime = currentTime; + } + }, UPDATE_LOOP_DELAY, UPDATE_RATE); + } + + private void updateIteration(int delta) { + this.mouseController.update(); + scene.update(delta); + render.render(scene); + this.update(); + } + + private void setScene(Scene scene) { + this.scene = scene; + } + +} diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/Window.java b/src/main/java/labs/introtoprogramming/lab5/gui/Window.java index 2759e57..25a6cc4 100644 --- a/src/main/java/labs/introtoprogramming/lab5/gui/Window.java +++ b/src/main/java/labs/introtoprogramming/lab5/gui/Window.java @@ -8,7 +8,7 @@ public class Window { private static final int FPS_UPDATE_RATE = 100; - private JFrame frame; + protected JFrame frame; private RasterRendererComponent renderer; private Toolkit toolkit; private String title; @@ -74,6 +74,7 @@ public void setTitle(String text) { } public void setRaster(Raster raster) { + setDimensions(raster.getWidth(), raster.getHeight()); this.renderer.setRaster(raster); } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java index ab695bc..ecf6cc1 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java @@ -1,11 +1,12 @@ package labs.introtoprogramming.lab5.scene; import java.awt.Color; +import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -public class BasicScene implements Scene { +public class BasicScene extends Scene { private List entities; private Color background; @@ -18,6 +19,15 @@ public BasicScene(List entities) { this(entities, new Color(0, 0, 0)); } + public BasicScene() { + this(new ArrayList<>()); + } + + @Override + public void update(int delta) { + entities.forEach(obj -> obj.update(delta)); + } + @Override public List getSceneObjects() { return entities; @@ -43,4 +53,9 @@ public Optional getCamera() { public Color getBackgroundColor() { return background; } + + @Override + public void addSceneObject(SceneObject obj) { + entities.add(obj); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java index 80ac2ba..2571c2e 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Camera.java @@ -57,4 +57,8 @@ public void lookAt(Vector3 from, Vector3 to) { Vector3 up = forward.crossProduct(right); transform.setMatrix(right, up, forward, from); } + + public Raster raster() { + return raster; + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/ControllableCamera.java b/src/main/java/labs/introtoprogramming/lab5/scene/ControllableCamera.java new file mode 100644 index 0000000..73cd247 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scene/ControllableCamera.java @@ -0,0 +1,25 @@ +package labs.introtoprogramming.lab5.scene; + +import labs.introtoprogramming.lab5.graphics.Raster; + +public class ControllableCamera extends Camera { + + private static double DEFAULT_MOVEMENT_SPEED = 0.0015; + private static double DEFAULT_MOUSE_SENSITIVITY = 0.006; + private double movementSpeed = DEFAULT_MOVEMENT_SPEED; + private double mouseSensitivity = DEFAULT_MOUSE_SENSITIVITY; + + public ControllableCamera(Raster raster, Transform transform) { + super(raster, transform); + } + + @Override + protected void update(int delta) { + getTransform().setPosition( + getTransform().position().add(getInput().movementVector().multiply(movementSpeed * delta)) + ); + getTransform().setRotation(getTransform().rotation().add( + getInput().mouseMovement().multiply(mouseSensitivity * delta) + )); + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java b/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java index dad60a4..e39508d 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java @@ -1,17 +1,25 @@ package labs.introtoprogramming.lab5.scene; import java.awt.Color; +import java.util.Arrays; import java.util.List; import java.util.Optional; -public interface Scene { +public abstract class Scene { - List getSceneObjects(); + public abstract void update(int delta); - List getLights(); + public abstract List getSceneObjects(); - Optional getCamera(); + public abstract List getLights(); - Color getBackgroundColor(); + public abstract Optional getCamera(); + abstract Color getBackgroundColor(); + + public abstract void addSceneObject(SceneObject obj); + + public void addSceneObjects(SceneObject... obj) { + Arrays.stream(obj).forEach(this::addSceneObject); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java index 1af25e1..e9e8333 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java @@ -1,11 +1,13 @@ package labs.introtoprogramming.lab5.scene; import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.gui.Input; public class SceneObject { protected Transform transform; protected Mesh mesh; + protected Input input; /** * Base class of scene objects. @@ -26,6 +28,8 @@ public SceneObject() { this(new Transform(), new Mesh()); } + protected void update(int delta) {} + public Transform getTransform() { return transform; } @@ -37,4 +41,12 @@ public Mesh getMesh() { public boolean intersect(Ray ray) { return false; } + + public void setInput(Input input) { + this.input = input; + } + + protected Input getInput() { + return input; + } } From 23cfe7b7bb0255f74dd0f246a99bb95518d8b010 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 20:44:29 +0300 Subject: [PATCH 24/36] feat(scenes): add DemoScene --- .../labs/introtoprogramming/lab5/Main.java | 30 +++++++++++++++++-- .../lab5/scenes/DemoScene.java | 18 +++++++++++ 2 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/scenes/DemoScene.java diff --git a/src/main/java/labs/introtoprogramming/lab5/Main.java b/src/main/java/labs/introtoprogramming/lab5/Main.java index e0c95fb..15c5b25 100644 --- a/src/main/java/labs/introtoprogramming/lab5/Main.java +++ b/src/main/java/labs/introtoprogramming/lab5/Main.java @@ -1,11 +1,37 @@ package labs.introtoprogramming.lab5; -import labs.introtoprogramming.lab5.exception.NotImplementedException; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.graphics.BufferedImageRaster; +import labs.introtoprogramming.lab5.graphics.Raster; +import labs.introtoprogramming.lab5.gui.SceneRendererWindow; +import labs.introtoprogramming.lab5.scene.Scene; +import labs.introtoprogramming.lab5.scene.Camera; +import labs.introtoprogramming.lab5.scene.ControllableCamera; +import labs.introtoprogramming.lab5.scene.Transform; +import labs.introtoprogramming.lab5.scenes.DemoScene; public class Main { + private static final String APP_TILE = "ray tracing demo"; + private static final int SCREEN_WIDTH = 640; + private static final int SCREEN_HEIGHT = 640; + public static void main(String[] args) { - throw new NotImplementedException(); + new Main().run(); } + private void run() { + Scene demoScene = new DemoScene(); + demoScene.addSceneObject(createCamera()); + + SceneRendererWindow window = new SceneRendererWindow(demoScene); + window.setTitle(APP_TILE); + window.setDisplayFPS(true); + window.show(); + } + + private Camera createCamera() { + Raster raster = new BufferedImageRaster(SCREEN_WIDTH, SCREEN_HEIGHT); + return new ControllableCamera(raster, new Transform(Vector3.ZERO)); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scenes/DemoScene.java b/src/main/java/labs/introtoprogramming/lab5/scenes/DemoScene.java new file mode 100644 index 0000000..6b65c44 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/scenes/DemoScene.java @@ -0,0 +1,18 @@ +package labs.introtoprogramming.lab5.scenes; + +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.object.Box; +import labs.introtoprogramming.lab5.object.Sphere; +import labs.introtoprogramming.lab5.scene.BasicScene; +import labs.introtoprogramming.lab5.scene.Transform; + +public class DemoScene extends BasicScene { + + public DemoScene() { + addSceneObjects( + new Sphere(new Transform(Vector3.FORWARD.multiply(-3)), 1), + new Box(new Transform(Vector3.FORWARD.multiply(-10)), 1), + new Box(new Transform(Vector3.RIGHT.multiply(5)), 1) + ); + } +} From ad7ed847c8d9eba012bd2dd6ba63a992f81a29bb Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 21:05:33 +0300 Subject: [PATCH 25/36] feat(troubleshooting): add troubleshooting notes --- troubleshooting.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 troubleshooting.md diff --git a/troubleshooting.md b/troubleshooting.md new file mode 100644 index 0000000..f82f1f4 --- /dev/null +++ b/troubleshooting.md @@ -0,0 +1,4 @@ +# Camera movements are limited +If camera rotations are limited, then most probably `Robot` fails to center the cursor. +That's because `moveMouse` does not work on Wayland. The only solution is to switch to +Xorg. \ No newline at end of file From c69d67921bf937c733c0a6df21fbe5431457fc3e Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 21:06:55 +0300 Subject: [PATCH 26/36] refactor(tests): remove MainTests --- src/test/java/com/labs/introtoprogramming/lab5/MainTests.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 src/test/java/com/labs/introtoprogramming/lab5/MainTests.java diff --git a/src/test/java/com/labs/introtoprogramming/lab5/MainTests.java b/src/test/java/com/labs/introtoprogramming/lab5/MainTests.java deleted file mode 100644 index 9e76a9e..0000000 --- a/src/test/java/com/labs/introtoprogramming/lab5/MainTests.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.labs.introtoprogramming.lab5; - -public class MainTests { -} From 34c96ffe2e1574e3135cded7b9b1878014c966da Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 21:18:25 +0300 Subject: [PATCH 27/36] feat(Input): add tests --- .../introtoprogramming/lab5/gui/Input.java | 33 ---------- .../lab5/gui/InputTests.java | 60 +++++++++++++++++++ 2 files changed, 60 insertions(+), 33 deletions(-) create mode 100644 src/test/java/labs/introtoprogramming/lab5/gui/InputTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/Input.java b/src/main/java/labs/introtoprogramming/lab5/gui/Input.java index 617b633..2f131a7 100644 --- a/src/main/java/labs/introtoprogramming/lab5/gui/Input.java +++ b/src/main/java/labs/introtoprogramming/lab5/gui/Input.java @@ -25,68 +25,35 @@ public Vector3 mouseMovement() { return new Vector3(mouseDeltaY, mouseDeltaX, 0); } - public double getMouseDeltaX() { - return mouseDeltaX; - } - public void setMouseDeltaX(double mouseDeltaX) { this.mouseDeltaX = mouseDeltaX; } - public double getMouseDeltaY() { - return mouseDeltaY; - } - public void setMouseDeltaY(double mouseDeltaY) { this.mouseDeltaY = mouseDeltaY; } - public boolean isForwardKeyDown() { - return forwardKeyDown; - } - public void setForwardKeyDown(boolean forwardKeyDown) { this.forwardKeyDown = forwardKeyDown; } - public boolean isBackwardKeyDown() { - return backwardKeyDown; - } - public void setBackwardKeyDown(boolean backwardKeyDown) { this.backwardKeyDown = backwardKeyDown; } - public boolean isLeftKeyDown() { - return leftKeyDown; - } - public void setLeftKeyDown(boolean leftKeyDown) { this.leftKeyDown = leftKeyDown; } - public boolean isRightKeyDown() { - return rightKeyDown; - } - public void setRightKeyDown(boolean rightKeyDown) { this.rightKeyDown = rightKeyDown; } - public boolean isUpKeyDown() { - return upKeyDown; - } - public void setUpKeyDown(boolean upKeyDown) { this.upKeyDown = upKeyDown; } - public boolean isDownKeyDown() { - return downKeyDown; - } - public void setDownKeyDown(boolean downKeyDown) { this.downKeyDown = downKeyDown; } - } diff --git a/src/test/java/labs/introtoprogramming/lab5/gui/InputTests.java b/src/test/java/labs/introtoprogramming/lab5/gui/InputTests.java new file mode 100644 index 0000000..e104931 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/gui/InputTests.java @@ -0,0 +1,60 @@ +package labs.introtoprogramming.lab5.gui; + +import static org.junit.Assert.assertEquals; + +import java.awt.event.KeyEvent; +import labs.introtoprogramming.lab5.geometry.Vector3; +import org.junit.Test; + +public class InputTests { + + @Test + public void testKeyForward() { + Input input = new Input(); + input.setForwardKeyDown(true); + assertEquals(new Vector3(0, 0, -1), input.movementVector()); + } + + @Test + public void testKeyBackward() { + Input input = new Input(); + input.setBackwardKeyDown(true); + assertEquals(new Vector3(0, 0, 1), input.movementVector()); + } + + @Test + public void testKeyLeft() { + Input input = new Input(); + input.setLeftKeyDown(true); + assertEquals(new Vector3(-1, 0, 0), input.movementVector()); + } + + @Test + public void testKeyRight() { + Input input = new Input(); + input.setRightKeyDown(true); + assertEquals(new Vector3(1, 0, 0), input.movementVector()); + } + + @Test + public void testKeyUp() { + Input input = new Input(); + input.setUpKeyDown(true); + assertEquals(new Vector3(0, 1, 0), input.movementVector()); + } + + @Test + public void testKeyDown() { + Input input = new Input(); + input.setDownKeyDown(true); + assertEquals(new Vector3(0, -1, 0), input.movementVector()); + } + + @Test + public void testMouseDelta() { + Input input = new Input(); + input.setMouseDeltaX(2); + input.setMouseDeltaY(3); + assertEquals(new Vector3(3, 2, 0), input.mouseMovement()); + } +} From e76590c1ede62c8a460b686eb4c1bca122214116 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 21:26:32 +0300 Subject: [PATCH 28/36] feat(ControllableCamera): add tests --- .../lab5/scene/ControllableCameraTests.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/test/java/labs/introtoprogramming/lab5/scene/ControllableCameraTests.java diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/ControllableCameraTests.java b/src/test/java/labs/introtoprogramming/lab5/scene/ControllableCameraTests.java new file mode 100644 index 0000000..9a2aa92 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/scene/ControllableCameraTests.java @@ -0,0 +1,27 @@ +package labs.introtoprogramming.lab5.scene; + +import static junit.framework.TestCase.assertEquals; +import static junit.framework.TestCase.assertTrue; + +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.graphics.BufferedImageRaster; +import labs.introtoprogramming.lab5.graphics.Raster; +import labs.introtoprogramming.lab5.gui.Input; +import org.junit.Test; + +public class ControllableCameraTests { + + @Test + public void testUpdate() { + Raster raster = new BufferedImageRaster(100, 100); + SceneObject camera = new ControllableCamera(raster, new Transform(Vector3.ZERO)); + Input input = new Input(); + input.setForwardKeyDown(true); + input.setRightKeyDown(true); + camera.setInput(input); + camera.update(10); + assertTrue(camera.getTransform().position().x > 0); + assertTrue(camera.getTransform().position().z < 0); + } + +} From 051985645bde69043b14db5b2bf4c4f86005bdc2 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Sun, 9 Jun 2019 21:35:33 +0300 Subject: [PATCH 29/36] refactor(object): correct triangle intersection tests --- .../lab5/object/TriangleTests.java | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java b/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java index 625c398..5d960d2 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java @@ -24,8 +24,8 @@ public void testIntersection() { @Test public void testNoIntersection() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); - Triangle triangle = new Triangle(new Transform(Vector3.UP.multiply(10)), - Vector3.FORWARD, Vector3.UP, Vector3.FORWARD.multiply(-1)); + Triangle triangle = new Triangle(new Transform(Vector3.RIGHT.multiply(2)), + Vector3.FORWARD.multiply(-1), Vector3.ONE, Vector3.UP); assertFalse(triangle.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } @@ -40,10 +40,28 @@ public void testNoIntersectionParallel() { } @Test - public void testOutOfBoundNoIntersection() { + public void testNoIntersectionOverTriangle() { Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); - Triangle triangle = new Triangle(new Transform(Vector3.RIGHT.multiply(2)), - Vector3.FORWARD.multiply(-1), Vector3.ONE, Vector3.UP.multiply(1)); + Triangle triangle = new Triangle(new Transform(Vector3.UP.multiply(10)), + Vector3.FORWARD, Vector3.UP, Vector3.FORWARD.multiply(-1)); + assertFalse(triangle.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } + + @Test + public void testNoIntersectionBellowTriangle() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Triangle triangle = new Triangle(new Transform(Vector3.UP.multiply(-10)), + Vector3.FORWARD, Vector3.UP, Vector3.FORWARD.multiply(-1)); + assertFalse(triangle.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } + + @Test + public void testNoIntersectionOutOfBounds() { + Ray ray = new Ray(Vector3.ZERO, Vector3.RIGHT); + Triangle triangle = new Triangle(new Transform(Vector3.ZERO), + Vector3.FORWARD.multiply(1), Vector3.ONE, Vector3.UP.multiply(-1)); assertFalse(triangle.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } From 21caa877d4be5d4567a4c2b08a318ec13b0b2648 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 21:33:31 +0300 Subject: [PATCH 30/36] feat(scene): add scene tests --- .../lab5/scene/SceneTests.java | 32 +++++++++++++++++++ .../lab5/scenes/DemoSceneTests.java | 14 ++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/test/java/labs/introtoprogramming/lab5/scene/SceneTests.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/scenes/DemoSceneTests.java diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/SceneTests.java b/src/test/java/labs/introtoprogramming/lab5/scene/SceneTests.java new file mode 100644 index 0000000..14b863c --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/scene/SceneTests.java @@ -0,0 +1,32 @@ +package labs.introtoprogramming.lab5.scene; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.object.Box; +import org.junit.Test; + +public class SceneTests { + + @Test + public void testSceneUpdateUpdatesObjects() { + Scene scene = new BasicScene(); + MockSceneObject obj = new MockSceneObject(); + scene.addSceneObjects(new Box(new Transform(Vector3.ZERO), 1), obj); + scene.update(10); + assertTrue(obj.updated); + assertEquals(10, obj.updatedWithDelta); + } + + private class MockSceneObject extends SceneObject { + boolean updated = false; + int updatedWithDelta = 0; + + @Override + public void update(int delta) { + this.updated = true; + this.updatedWithDelta = delta; + } + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/scenes/DemoSceneTests.java b/src/test/java/labs/introtoprogramming/lab5/scenes/DemoSceneTests.java new file mode 100644 index 0000000..baed622 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/scenes/DemoSceneTests.java @@ -0,0 +1,14 @@ +package labs.introtoprogramming.lab5.scenes; + +import static junit.framework.TestCase.assertTrue; + +import org.junit.Test; + +public class DemoSceneTests { + + @Test + public void testInstantiation() { + DemoScene scene = new DemoScene(); + assertTrue(scene.getSceneObjects().size() > 0); + } +} From 1cfe8462f941bcfc70012817879c64def0a5b4cd Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Sun, 9 Jun 2019 21:41:19 +0300 Subject: [PATCH 31/36] feat(CameraTests): update with raster check --- .../java/labs/introtoprogramming/lab5/scene/CameraTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/CameraTests.java b/src/test/java/labs/introtoprogramming/lab5/scene/CameraTests.java index d9793a8..884470b 100644 --- a/src/test/java/labs/introtoprogramming/lab5/scene/CameraTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/scene/CameraTests.java @@ -17,6 +17,7 @@ public void testInstantiation() { assertEquals(cam.size(), 1, DELTA); assertEquals(cam.fieldOfView(), 2 * Math.atan(1), DELTA); assertEquals(cam.aspectRatio(), 600.0 / 400.0, DELTA); + assertEquals(DUMMY_RASTER, cam.raster()); } @Test From f691c40a51585e5e50d4937f2032bb7a8dadf30e Mon Sep 17 00:00:00 2001 From: Brook333 Date: Tue, 11 Jun 2019 13:56:01 +0300 Subject: [PATCH 32/36] feat(tree): add KD-tree --- .../introtoprogramming/lab5/object/Box.java | 15 ++- .../lab5/object/OptimizedObject.java | 27 ++++ .../lab5/object/Sphere.java | 7 + .../lab5/object/Triangle.java | 18 +++ .../lab5/scene/SceneObject.java | 5 + .../introtoprogramming/lab5/tree/KDNode.java | 55 ++++++++ .../introtoprogramming/lab5/tree/KDTree.java | 121 ++++++++++++++++++ .../lab5/tree/KDNodeTests.java | 70 ++++++++++ .../lab5/tree/KDTreeTests.java | 51 ++++++++ 9 files changed, 367 insertions(+), 2 deletions(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/object/OptimizedObject.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/tree/KDNode.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/tree/KDTree.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/tree/KDNodeTests.java create mode 100644 src/test/java/labs/introtoprogramming/lab5/tree/KDTreeTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Box.java b/src/main/java/labs/introtoprogramming/lab5/object/Box.java index 88370e5..e95b3de 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Box.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Box.java @@ -9,8 +9,8 @@ public class Box extends SceneObject { private static final double DELTA = 1e-6; private static final double DEFAULT_SIZE = 1; - private Vector3 lowerBounds; - private Vector3 upperBounds; + public Vector3 lowerBounds; + public Vector3 upperBounds; public Box(Transform transform, double size) { super(transform); @@ -20,6 +20,12 @@ public Box(Transform transform, double size) { lowerBounds = pos.add(bound.multiply(-1)); } + public Box(Transform transform, Vector3 lowerBounds, Vector3 upperBounds) { + super(transform); + this.lowerBounds = lowerBounds; + this.upperBounds = upperBounds; + } + public Box(Transform transform) { this(transform, DEFAULT_SIZE); } @@ -88,6 +94,11 @@ public boolean intersect(Ray ray) { return true; } + @Override + public Box getBoundary() { + return new Box(transform, lowerBounds, upperBounds); + } + private double axisDirection(double val) { return Math.abs(val) < DELTA ? val >= 0 ? 1 / DELTA : -1 / DELTA : 1 / val; } diff --git a/src/main/java/labs/introtoprogramming/lab5/object/OptimizedObject.java b/src/main/java/labs/introtoprogramming/lab5/object/OptimizedObject.java new file mode 100644 index 0000000..a8a50e7 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/object/OptimizedObject.java @@ -0,0 +1,27 @@ +package labs.introtoprogramming.lab5.object; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; +import labs.introtoprogramming.lab5.tree.KDTree; + +import java.util.ArrayList; + +public class OptimizedObject extends SceneObject { + private KDTree tree; + + public OptimizedObject(Transform transform, ArrayList objects) { + super(transform); + tree = new KDTree(objects); + } + + @Override + public boolean intersect(Ray ray) { + return tree.intersect(ray); + } + + @Override + public Box getBoundary() { + return tree.boundary(); + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java index 529bf07..4decaa0 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java @@ -48,4 +48,11 @@ public boolean intersect(Ray ray) { ray.setScale(intersection); return true; } + + @Override + public Box getBoundary() { + Vector3 pos = transform.position(); + Vector3 size = Vector3.ONE.multiply(radius); + return new Box(new Transform(), pos.add(size), pos.add(size.multiply(-1))); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java b/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java index dd5c6ae..879b894 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java @@ -59,4 +59,22 @@ public boolean intersect(Ray ray) { ray.setScale(scale); return true; } + + @Override + public Box getBoundary() { + Vector3 v0 = transform.applyPoint(this.v0); + Vector3 v1 = transform.applyPoint(this.v1); + Vector3 v2 = transform.applyPoint(this.v2); + Vector3 lower = new Vector3( + Math.min(Math.min(v0.x, v1.x), v2.x), + Math.min(Math.min(v0.y, v1.y), v2.y), + Math.min(Math.min(v0.z, v1.z), v2.z) + ); + Vector3 upper = new Vector3( + Math.max(Math.max(v0.x, v1.x), v2.x), + Math.max(Math.max(v0.y, v1.y), v2.y), + Math.max(Math.max(v0.z, v1.z), v2.z) + ); + return new Box(new Transform(), lower, upper); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java index 1af25e1..d2b3b78 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java @@ -1,6 +1,7 @@ package labs.introtoprogramming.lab5.scene; import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.object.Box; public class SceneObject { @@ -37,4 +38,8 @@ public Mesh getMesh() { public boolean intersect(Ray ray) { return false; } + + public Box getBoundary() { + return null; + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/tree/KDNode.java b/src/main/java/labs/introtoprogramming/lab5/tree/KDNode.java new file mode 100644 index 0000000..64a209c --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/tree/KDNode.java @@ -0,0 +1,55 @@ +package labs.introtoprogramming.lab5.tree; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.object.Box; +import labs.introtoprogramming.lab5.scene.SceneObject; + +import java.util.List; + +public class KDNode { + Box boundaryBox; + private KDNode[] children; + + private List objects; + + public KDNode(List objects, Box boundaryBox, KDNode[] children) { + this.objects = objects; + this.boundaryBox = boundaryBox; + this.children = children; + } + + public SceneObject intersect(Ray ray) { + if (boundaryBox.intersect(ray)) { + SceneObject res = checkChildren(ray); + if (res != null) { + return res; + } + double minDist = Double.MAX_VALUE; + for (SceneObject obj : objects) { + if (obj.intersect(ray)) { + double dist = ray.getScale(); + if (dist < minDist) { + minDist = dist; + res = obj; + } + } + } + return res; + } + return null; + } + + private SceneObject checkChildren(Ray ray) { + SceneObject res; + for (KDNode node : children) { + if (node == null) { + continue; + } + res = node.intersect(ray); + if (res != null) { + return res; + } + } + return null; + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/tree/KDTree.java b/src/main/java/labs/introtoprogramming/lab5/tree/KDTree.java new file mode 100644 index 0000000..c6f09c1 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/tree/KDTree.java @@ -0,0 +1,121 @@ +package labs.introtoprogramming.lab5.tree; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.object.Box; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; + +import java.util.ArrayList; +import java.util.List; + +public class KDTree { + private static double MIN_NUMBER_OF_OBJECTS = 3; + private KDNode root; + private SceneObject intersection; + + public KDTree(List objects) { + Box box = getBoundary(objects); + root = buildNode(objects, box); + } + + private Box getBoundary(List objects) { + if (objects.size() == 0) { + return new Box(new Transform(), Vector3.ZERO, Vector3.ZERO); + } + Vector3 lowerBound = new Vector3(Double.MAX_VALUE, Double.MAX_VALUE, Double.MAX_VALUE); + Vector3 upperBound = new Vector3(Double.MIN_VALUE, Double.MIN_VALUE, Double.MIN_VALUE); + for (SceneObject obj : objects) { + Box boundary = obj.getBoundary(); + if (boundary == null) { + continue; + } + lowerBound = new Vector3( + Math.min(lowerBound.x, boundary.lowerBounds.x), + Math.min(lowerBound.y, boundary.lowerBounds.y), + Math.min(lowerBound.z, boundary.lowerBounds.z) + ); + upperBound = new Vector3( + Math.max(upperBound.x, boundary.upperBounds.x), + Math.max(upperBound.y, boundary.upperBounds.y), + Math.max(upperBound.z, boundary.upperBounds.z) + ); + } + return new Box(new Transform(), lowerBound, upperBound); + } + + private KDNode buildNode(List objects, Box box) { + if (objects.size() <= MIN_NUMBER_OF_OBJECTS) { + return new KDNode(objects, box, new KDNode[0]); + } + KDNode[] children = getChildren(objects, box); + return new KDNode(objects, box, children); + } + + private KDNode[] getChildren(List objects, Box box) { + Vector3 mid = new Vector3( + (box.upperBounds.x + box.lowerBounds.x) / 2, + (box.upperBounds.y + box.lowerBounds.y) / 2, + (box.upperBounds.z + box.lowerBounds.z) / 2 + ); + Vector3 u = box.upperBounds; + Vector3 l = box.lowerBounds; + KDNode[] children = new KDNode[8]; + Box b = new Box(new Transform(), mid, u); + children[0] = buildNode(getObjectInBox(objects, b), b); + b = new Box(new Transform(), new Vector3(l.x, mid.y, mid.z), new Vector3(mid.x, u.y, u.z)); + children[1] = buildNode(getObjectInBox(objects, b), b); + b = new Box(new Transform(), new Vector3(mid.x, l.y, mid.z), new Vector3(u.x, mid.y, u.z)); + children[2] = buildNode(getObjectInBox(objects, b), b); + b = new Box(new Transform(), new Vector3(l.x, l.y, mid.z), new Vector3(mid.x, mid.y, u.z)); + children[3] = buildNode(getObjectInBox(objects, b), b); + b = new Box(new Transform(), new Vector3(mid.x, mid.y, l.z), new Vector3(u.x, u.y, mid.z)); + children[4] = buildNode(getObjectInBox(objects, b), b); + b = new Box(new Transform(), new Vector3(l.x, mid.y, l.z), new Vector3(mid.x, u.y, mid.z)); + children[5] = buildNode(getObjectInBox(objects, b), b); + b = new Box(new Transform(), new Vector3(mid.x, l.y, l.z), new Vector3(u.x, mid.y, mid.z)); + children[6] = buildNode(getObjectInBox(objects, b), b); + b = new Box(new Transform(), l, mid); + children[7] = buildNode(getObjectInBox(objects, b), b); + return children; + } + + private List getObjectInBox(List objects, Box box) { + ArrayList res = new ArrayList<>(); + for (SceneObject obj : objects) { + Box boundary = obj.getBoundary(); + if (boundary == null) { + continue; + } + if (boxInBox(boundary, box)) { + res.add(obj); + } + } + for (SceneObject obj : res) { + objects.remove(obj); + } + return res; + } + + private boolean boxInBox(Box in, Box out) { + return in.upperBounds.x <= out.upperBounds.x + && in.upperBounds.y <= out.upperBounds.y + && in.upperBounds.z <= out.upperBounds.z + && in.lowerBounds.x >= out.lowerBounds.x + && in.lowerBounds.y >= out.lowerBounds.y + && in.lowerBounds.z >= out.lowerBounds.z; + } + + public boolean intersect(Ray ray) { + intersection = root.intersect(ray); + return intersection != null; + } + + public SceneObject getIntersection() { + return intersection; + } + + public Box boundary() { + return root.boundaryBox; + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/tree/KDNodeTests.java b/src/test/java/labs/introtoprogramming/lab5/tree/KDNodeTests.java new file mode 100644 index 0000000..8a37d68 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/tree/KDNodeTests.java @@ -0,0 +1,70 @@ +package labs.introtoprogramming.lab5.tree; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.object.Box; +import labs.introtoprogramming.lab5.object.Sphere; +import labs.introtoprogramming.lab5.object.Triangle; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; + +import org.junit.Test; + +public class KDNodeTests { + private static List DUMMY_OBJECTS = Arrays.asList( + new Box(new Transform(), Vector3.ONE, Vector3.ONE.multiply(-1)), + new Triangle(new Transform(), Vector3.RIGHT, Vector3.RIGHT.multiply(-1), Vector3.UP), + new Sphere(new Transform(), 1) + ); + + @Test + public void testInstantiation() { + KDNode node = new KDNode(Collections.emptyList(), + new Box(new Transform(), Vector3.ZERO, Vector3.ZERO), + new KDNode[0]); + assertEquals(node.boundaryBox.upperBounds, Vector3.ZERO); + assertEquals(node.boundaryBox.lowerBounds, Vector3.ZERO); + } + + @Test + public void testIntersectionNoObjects() { + KDNode node = new KDNode(Collections.emptyList(), + new Box(new Transform(), Vector3.ZERO, Vector3.ZERO), + new KDNode[0]); + assertNull(node.intersect(new Ray(Vector3.ZERO, Vector3.ZERO))); + } + + @Test + public void testIntersectionMissBox() { + KDNode node = new KDNode(DUMMY_OBJECTS, + new Box(new Transform(), Vector3.ONE.multiply(-1), Vector3.ZERO), + new KDNode[0]); + assertNull(node.intersect(new Ray(Vector3.FORWARD, Vector3.UP))); + } + + @Test + public void testIntersectionChildIntersection() { + KDNode child = new KDNode(DUMMY_OBJECTS, + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[0]); + KDNode node = new KDNode(Collections.emptyList(), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[] { child }); + assertEquals(DUMMY_OBJECTS.get(2), node.intersect(new Ray(Vector3.FORWARD, Vector3.UP))); + } + + @Test + public void testIntersectionOwnObjectIntersection() { + KDNode node = new KDNode(DUMMY_OBJECTS, + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[0]); + assertEquals(DUMMY_OBJECTS.get(2), node.intersect(new Ray(Vector3.FORWARD, Vector3.UP))); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/tree/KDTreeTests.java b/src/test/java/labs/introtoprogramming/lab5/tree/KDTreeTests.java new file mode 100644 index 0000000..8ec4b51 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/tree/KDTreeTests.java @@ -0,0 +1,51 @@ +package labs.introtoprogramming.lab5.tree; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertFalse; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.object.Box; +import labs.introtoprogramming.lab5.object.Sphere; +import labs.introtoprogramming.lab5.object.Triangle; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; +import org.junit.Test; + + +public class KDTreeTests { + + private static List DUMMY_OBJECTS = Arrays.asList( + new Box(new Transform(), Vector3.ONE.multiply(-3), Vector3.ONE.multiply(3)), + new Triangle(new Transform(), Vector3.RIGHT, Vector3.RIGHT.multiply(-1), Vector3.UP), + new Sphere(new Transform(), 1) + ); + + @Test + public void testInstantiation() { + KDTree tree = new KDTree(DUMMY_OBJECTS); + Box boundary = tree.boundary(); + assertEquals(boundary.lowerBounds, DUMMY_OBJECTS.get(0).getBoundary().lowerBounds); + assertEquals(boundary.upperBounds, DUMMY_OBJECTS.get(0).getBoundary().upperBounds); + } + + @Test + public void testEmptyList() { + KDTree tree = new KDTree(Collections.emptyList()); + assertFalse(tree.intersect(new Ray(Vector3.ZERO, Vector3.ZERO))); + assertNull(tree.getIntersection()); + } + + @Test + public void test() { + KDTree tree = new KDTree(DUMMY_OBJECTS); + assertTrue(tree.intersect(new Ray(Vector3.ZERO, Vector3.FORWARD))); + assertEquals(DUMMY_OBJECTS.get(1), tree.getIntersection()); + } +} From 457c93fcd2afa0fa00d66a99d706e8c30a3f1ffa Mon Sep 17 00:00:00 2001 From: Brook333 Date: Tue, 11 Jun 2019 14:28:34 +0300 Subject: [PATCH 33/36] fix(tree): fix node check of objects inresection --- .../lab5/object/Triangle.java | 3 +++ .../introtoprogramming/lab5/tree/KDNode.java | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java b/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java index 879b894..042a7e2 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Triangle.java @@ -56,6 +56,9 @@ public boolean intersect(Ray ray) { } double scale = v0v2.dotProduct(q) * invDet; + if (scale < 0) { + return false; + } ray.setScale(scale); return true; } diff --git a/src/main/java/labs/introtoprogramming/lab5/tree/KDNode.java b/src/main/java/labs/introtoprogramming/lab5/tree/KDNode.java index 64a209c..9629b41 100644 --- a/src/main/java/labs/introtoprogramming/lab5/tree/KDNode.java +++ b/src/main/java/labs/introtoprogramming/lab5/tree/KDNode.java @@ -20,11 +20,11 @@ public KDNode(List objects, Box boundaryBox, KDNode[] children) { public SceneObject intersect(Ray ray) { if (boundaryBox.intersect(ray)) { + double minDist = Double.MAX_VALUE; SceneObject res = checkChildren(ray); if (res != null) { - return res; + minDist = ray.getScale(); } - double minDist = Double.MAX_VALUE; for (SceneObject obj : objects) { if (obj.intersect(ray)) { double dist = ray.getScale(); @@ -40,16 +40,21 @@ public SceneObject intersect(Ray ray) { } private SceneObject checkChildren(Ray ray) { - SceneObject res; + SceneObject res = null; + double minDist = Double.MAX_VALUE; for (KDNode node : children) { if (node == null) { continue; } - res = node.intersect(ray); - if (res != null) { - return res; + SceneObject obj = node.intersect(ray); + if (obj != null) { + double dist = ray.getScale(); + if (dist < minDist) { + res = obj; + minDist = dist; + } } } - return null; + return res; } } From bf9c2d3f847459641463c0e8baac497d715b808a Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Tue, 11 Jun 2019 19:35:38 +0300 Subject: [PATCH 34/36] refactor(ControllableCamera): add KeyAndMouseMovementController for moving and rotating objects --- .../labs/introtoprogramming/lab5/Main.java | 8 ++++-- .../lab5/controllers/Controller.java | 9 ++++++ .../KeyAndMouseMovementController.java | 28 +++++++++++++++++++ .../lab5/gui/SceneRendererWindow.java | 5 +--- .../lab5/scene/BasicScene.java | 17 +++++++++-- .../lab5/scene/ControllableCamera.java | 25 ----------------- .../introtoprogramming/lab5/scene/Scene.java | 8 +++++- .../lab5/scene/SceneObject.java | 12 -------- .../KeyAndMouseControllerTests.java} | 14 ++++++---- .../lab5/scene/SceneTests.java | 19 +++++++------ 10 files changed, 84 insertions(+), 61 deletions(-) create mode 100644 src/main/java/labs/introtoprogramming/lab5/controllers/Controller.java create mode 100644 src/main/java/labs/introtoprogramming/lab5/controllers/KeyAndMouseMovementController.java delete mode 100644 src/main/java/labs/introtoprogramming/lab5/scene/ControllableCamera.java rename src/test/java/labs/introtoprogramming/lab5/{scene/ControllableCameraTests.java => controllers/KeyAndMouseControllerTests.java} (57%) diff --git a/src/main/java/labs/introtoprogramming/lab5/Main.java b/src/main/java/labs/introtoprogramming/lab5/Main.java index 15c5b25..1616f55 100644 --- a/src/main/java/labs/introtoprogramming/lab5/Main.java +++ b/src/main/java/labs/introtoprogramming/lab5/Main.java @@ -1,12 +1,12 @@ package labs.introtoprogramming.lab5; +import labs.introtoprogramming.lab5.controllers.KeyAndMouseMovementController; import labs.introtoprogramming.lab5.geometry.Vector3; import labs.introtoprogramming.lab5.graphics.BufferedImageRaster; import labs.introtoprogramming.lab5.graphics.Raster; import labs.introtoprogramming.lab5.gui.SceneRendererWindow; import labs.introtoprogramming.lab5.scene.Scene; import labs.introtoprogramming.lab5.scene.Camera; -import labs.introtoprogramming.lab5.scene.ControllableCamera; import labs.introtoprogramming.lab5.scene.Transform; import labs.introtoprogramming.lab5.scenes.DemoScene; @@ -22,7 +22,9 @@ public static void main(String[] args) { private void run() { Scene demoScene = new DemoScene(); - demoScene.addSceneObject(createCamera()); + Camera camera = createCamera(); + demoScene.addSceneObjects(camera); + demoScene.addController(new KeyAndMouseMovementController(camera)); SceneRendererWindow window = new SceneRendererWindow(demoScene); window.setTitle(APP_TILE); @@ -32,6 +34,6 @@ private void run() { private Camera createCamera() { Raster raster = new BufferedImageRaster(SCREEN_WIDTH, SCREEN_HEIGHT); - return new ControllableCamera(raster, new Transform(Vector3.ZERO)); + return new Camera(raster, new Transform(Vector3.ZERO)); } } diff --git a/src/main/java/labs/introtoprogramming/lab5/controllers/Controller.java b/src/main/java/labs/introtoprogramming/lab5/controllers/Controller.java new file mode 100644 index 0000000..72a8e46 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/controllers/Controller.java @@ -0,0 +1,9 @@ +package labs.introtoprogramming.lab5.controllers; + +import labs.introtoprogramming.lab5.gui.Input; + +public abstract class Controller { + + public abstract void update(int delta, Input input); + +} diff --git a/src/main/java/labs/introtoprogramming/lab5/controllers/KeyAndMouseMovementController.java b/src/main/java/labs/introtoprogramming/lab5/controllers/KeyAndMouseMovementController.java new file mode 100644 index 0000000..4818230 --- /dev/null +++ b/src/main/java/labs/introtoprogramming/lab5/controllers/KeyAndMouseMovementController.java @@ -0,0 +1,28 @@ +package labs.introtoprogramming.lab5.controllers; + +import labs.introtoprogramming.lab5.gui.Input; +import labs.introtoprogramming.lab5.scene.SceneObject; + +public class KeyAndMouseMovementController extends Controller { + + private static double DEFAULT_MOVEMENT_SPEED = 0.0015; + private static double DEFAULT_MOUSE_SENSITIVITY = 0.006; + private double movementSpeed = DEFAULT_MOVEMENT_SPEED; + private double mouseSensitivity = DEFAULT_MOUSE_SENSITIVITY; + + private SceneObject controllableObject; + + public KeyAndMouseMovementController(SceneObject controllableObject) { + this.controllableObject = controllableObject; + } + + @Override + public void update(int delta, Input input) { + controllableObject.getTransform().setPosition(controllableObject.getTransform().position().add( + input.movementVector().multiply(movementSpeed * delta) + )); + controllableObject.getTransform().setRotation(controllableObject.getTransform().rotation().add( + input.mouseMovement().multiply(mouseSensitivity * delta) + )); + } +} diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java b/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java index efd4d63..c400875 100644 --- a/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java +++ b/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java @@ -13,7 +13,6 @@ public class SceneRendererWindow extends Window { private static final int UPDATE_LOOP_DELAY = 100; // ms private static final int TARGET_FPS = 60; private static final int UPDATE_RATE = 1000/TARGET_FPS; - private static final boolean DEFAULT_CAMERA_CONTROLLABLE = false; private SceneRender render; private Scene scene; @@ -30,7 +29,6 @@ public SceneRendererWindow(SceneRender render, Scene scene) { this.scene = scene; input = new Input(); scene.getCamera().ifPresent(camera -> setRaster(camera.raster())); - scene.getSceneObjects().forEach(obj -> obj.setInput(input)); mouseController = new MouseController(input, frame); } @@ -60,7 +58,7 @@ public void run() { private void updateIteration(int delta) { this.mouseController.update(); - scene.update(delta); + scene.update(delta, input); render.render(scene); this.update(); } @@ -68,5 +66,4 @@ private void updateIteration(int delta) { private void setScene(Scene scene) { this.scene = scene; } - } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java index ecf6cc1..8554b07 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicScene.java @@ -5,9 +5,12 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import labs.introtoprogramming.lab5.controllers.Controller; +import labs.introtoprogramming.lab5.gui.Input; public class BasicScene extends Scene { private List entities; + private List controllers = new ArrayList<>(); private Color background; public BasicScene(List entities, Color background) { @@ -24,8 +27,8 @@ public BasicScene() { } @Override - public void update(int delta) { - entities.forEach(obj -> obj.update(delta)); + public void update(int delta, Input input) { + controllers.forEach(controller -> controller.update(delta, input)); } @Override @@ -41,6 +44,11 @@ public List getLights() { .collect(Collectors.toList()); } + @Override + public List getControllers() { + return controllers; + } + @Override public Optional getCamera() { return entities.stream() @@ -58,4 +66,9 @@ public Color getBackgroundColor() { public void addSceneObject(SceneObject obj) { entities.add(obj); } + + @Override + public void addController(Controller controller) { + this.controllers.add(controller); + } } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/ControllableCamera.java b/src/main/java/labs/introtoprogramming/lab5/scene/ControllableCamera.java deleted file mode 100644 index 73cd247..0000000 --- a/src/main/java/labs/introtoprogramming/lab5/scene/ControllableCamera.java +++ /dev/null @@ -1,25 +0,0 @@ -package labs.introtoprogramming.lab5.scene; - -import labs.introtoprogramming.lab5.graphics.Raster; - -public class ControllableCamera extends Camera { - - private static double DEFAULT_MOVEMENT_SPEED = 0.0015; - private static double DEFAULT_MOUSE_SENSITIVITY = 0.006; - private double movementSpeed = DEFAULT_MOVEMENT_SPEED; - private double mouseSensitivity = DEFAULT_MOUSE_SENSITIVITY; - - public ControllableCamera(Raster raster, Transform transform) { - super(raster, transform); - } - - @Override - protected void update(int delta) { - getTransform().setPosition( - getTransform().position().add(getInput().movementVector().multiply(movementSpeed * delta)) - ); - getTransform().setRotation(getTransform().rotation().add( - getInput().mouseMovement().multiply(mouseSensitivity * delta) - )); - } -} diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java b/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java index e39508d..dfc6ea2 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/Scene.java @@ -4,15 +4,19 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; +import labs.introtoprogramming.lab5.controllers.Controller; +import labs.introtoprogramming.lab5.gui.Input; public abstract class Scene { - public abstract void update(int delta); + public abstract void update(int delta, Input input); public abstract List getSceneObjects(); public abstract List getLights(); + public abstract List getControllers(); + public abstract Optional getCamera(); abstract Color getBackgroundColor(); @@ -22,4 +26,6 @@ public abstract class Scene { public void addSceneObjects(SceneObject... obj) { Arrays.stream(obj).forEach(this::addSceneObject); } + + public abstract void addController(Controller controller); } diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java index e9e8333..1af25e1 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/SceneObject.java @@ -1,13 +1,11 @@ package labs.introtoprogramming.lab5.scene; import labs.introtoprogramming.lab5.geometry.Ray; -import labs.introtoprogramming.lab5.gui.Input; public class SceneObject { protected Transform transform; protected Mesh mesh; - protected Input input; /** * Base class of scene objects. @@ -28,8 +26,6 @@ public SceneObject() { this(new Transform(), new Mesh()); } - protected void update(int delta) {} - public Transform getTransform() { return transform; } @@ -41,12 +37,4 @@ public Mesh getMesh() { public boolean intersect(Ray ray) { return false; } - - public void setInput(Input input) { - this.input = input; - } - - protected Input getInput() { - return input; - } } diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/ControllableCameraTests.java b/src/test/java/labs/introtoprogramming/lab5/controllers/KeyAndMouseControllerTests.java similarity index 57% rename from src/test/java/labs/introtoprogramming/lab5/scene/ControllableCameraTests.java rename to src/test/java/labs/introtoprogramming/lab5/controllers/KeyAndMouseControllerTests.java index 9a2aa92..9a5b4e8 100644 --- a/src/test/java/labs/introtoprogramming/lab5/scene/ControllableCameraTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/controllers/KeyAndMouseControllerTests.java @@ -1,25 +1,27 @@ -package labs.introtoprogramming.lab5.scene; +package labs.introtoprogramming.lab5.controllers; -import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertTrue; import labs.introtoprogramming.lab5.geometry.Vector3; import labs.introtoprogramming.lab5.graphics.BufferedImageRaster; import labs.introtoprogramming.lab5.graphics.Raster; import labs.introtoprogramming.lab5.gui.Input; +import labs.introtoprogramming.lab5.scene.Camera; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; import org.junit.Test; -public class ControllableCameraTests { +public class KeyAndMouseControllerTests { @Test public void testUpdate() { Raster raster = new BufferedImageRaster(100, 100); - SceneObject camera = new ControllableCamera(raster, new Transform(Vector3.ZERO)); + SceneObject camera = new Camera(raster, new Transform(Vector3.ZERO)); + KeyAndMouseMovementController controller = new KeyAndMouseMovementController(camera); Input input = new Input(); input.setForwardKeyDown(true); input.setRightKeyDown(true); - camera.setInput(input); - camera.update(10); + controller.update(10, input); assertTrue(camera.getTransform().position().x > 0); assertTrue(camera.getTransform().position().z < 0); } diff --git a/src/test/java/labs/introtoprogramming/lab5/scene/SceneTests.java b/src/test/java/labs/introtoprogramming/lab5/scene/SceneTests.java index 14b863c..fefda33 100644 --- a/src/test/java/labs/introtoprogramming/lab5/scene/SceneTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/scene/SceneTests.java @@ -3,28 +3,31 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import labs.introtoprogramming.lab5.controllers.Controller; import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.gui.Input; import labs.introtoprogramming.lab5.object.Box; import org.junit.Test; public class SceneTests { @Test - public void testSceneUpdateUpdatesObjects() { + public void testSceneUpdateUpdatesControllers() { Scene scene = new BasicScene(); - MockSceneObject obj = new MockSceneObject(); - scene.addSceneObjects(new Box(new Transform(Vector3.ZERO), 1), obj); - scene.update(10); - assertTrue(obj.updated); - assertEquals(10, obj.updatedWithDelta); + MockSceneController controller = new MockSceneController(); + scene.addSceneObjects(new Box(new Transform(Vector3.ZERO), 1)); + scene.addController(controller); + scene.update(10, new Input()); + assertTrue(controller.updated); + assertEquals(10, controller.updatedWithDelta); } - private class MockSceneObject extends SceneObject { + private class MockSceneController extends Controller { boolean updated = false; int updatedWithDelta = 0; @Override - public void update(int delta) { + public void update(int delta, Input input) { this.updated = true; this.updatedWithDelta = delta; } From 321c84d7ad18f63a6e48858cd7890e06143e1bd4 Mon Sep 17 00:00:00 2001 From: Nikita Volobuev Date: Tue, 11 Jun 2019 19:42:21 +0300 Subject: [PATCH 35/36] feat(BasicRatraycingRender): add constructors taking scene or camera --- .../introtoprogramming/lab5/gui/SceneRendererWindow.java | 3 +-- .../lab5/scene/BasicRaytracingRender.java | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java b/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java index c400875..8388086 100644 --- a/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java +++ b/src/main/java/labs/introtoprogramming/lab5/gui/SceneRendererWindow.java @@ -20,8 +20,7 @@ public class SceneRendererWindow extends Window { private Input input; public SceneRendererWindow(Scene scene) { - this(new BasicRaytracingRender(scene.getCamera().orElseThrow(NoCameraException::new).raster()), scene); - setRaster(scene.getCamera().orElseThrow(NoCameraException::new).raster()); + this(new BasicRaytracingRender(scene), scene); } public SceneRendererWindow(SceneRender render, Scene scene) { diff --git a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java index 9ae2c15..339bece 100644 --- a/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java +++ b/src/main/java/labs/introtoprogramming/lab5/scene/BasicRaytracingRender.java @@ -10,6 +10,14 @@ public class BasicRaytracingRender implements SceneRender { private Raster raster; + public BasicRaytracingRender(Scene scene) { + this(scene.getCamera().orElseThrow(NoCameraException::new)); + } + + public BasicRaytracingRender(Camera camera) { + this(camera.raster()); + } + public BasicRaytracingRender(Raster raster) { this.raster = raster; } From 9bbfe3b4140db7e558dbdca125367511e1d11564 Mon Sep 17 00:00:00 2001 From: Brook333 Date: Tue, 11 Jun 2019 15:35:32 +0300 Subject: [PATCH 36/36] refactor(tree): add tests for boundary --- .../lab5/object/OptimizedObject.java | 4 +- .../lab5/object/Sphere.java | 2 +- .../introtoprogramming/lab5/tree/KDTree.java | 8 ++- .../lab5/object/BoxTests.java | 9 +++ .../lab5/object/DiskTests.java | 7 ++ .../lab5/object/OptimizedObjectTests.java | 40 +++++++++++ .../lab5/object/PlaneTests.java | 7 ++ .../lab5/object/SphereTests.java | 8 +++ .../lab5/object/TriangleTests.java | 17 +++++ .../lab5/tree/KDNodeTests.java | 49 ++++++++++++- .../lab5/tree/KDTreeTests.java | 72 ++++++++++++++++++- 11 files changed, 216 insertions(+), 7 deletions(-) create mode 100644 src/test/java/labs/introtoprogramming/lab5/object/OptimizedObjectTests.java diff --git a/src/main/java/labs/introtoprogramming/lab5/object/OptimizedObject.java b/src/main/java/labs/introtoprogramming/lab5/object/OptimizedObject.java index a8a50e7..1415279 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/OptimizedObject.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/OptimizedObject.java @@ -5,12 +5,12 @@ import labs.introtoprogramming.lab5.scene.Transform; import labs.introtoprogramming.lab5.tree.KDTree; -import java.util.ArrayList; +import java.util.List; public class OptimizedObject extends SceneObject { private KDTree tree; - public OptimizedObject(Transform transform, ArrayList objects) { + public OptimizedObject(Transform transform, List objects) { super(transform); tree = new KDTree(objects); } diff --git a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java index 4decaa0..5576e72 100644 --- a/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java +++ b/src/main/java/labs/introtoprogramming/lab5/object/Sphere.java @@ -53,6 +53,6 @@ public boolean intersect(Ray ray) { public Box getBoundary() { Vector3 pos = transform.position(); Vector3 size = Vector3.ONE.multiply(radius); - return new Box(new Transform(), pos.add(size), pos.add(size.multiply(-1))); + return new Box(new Transform(), pos.subtract(size), pos.add(size)); } } diff --git a/src/main/java/labs/introtoprogramming/lab5/tree/KDTree.java b/src/main/java/labs/introtoprogramming/lab5/tree/KDTree.java index c6f09c1..252a7d9 100644 --- a/src/main/java/labs/introtoprogramming/lab5/tree/KDTree.java +++ b/src/main/java/labs/introtoprogramming/lab5/tree/KDTree.java @@ -10,7 +10,7 @@ import java.util.List; public class KDTree { - private static double MIN_NUMBER_OF_OBJECTS = 3; + private static final double MIN_NUMBER_OF_OBJECTS = 3; private KDNode root; private SceneObject intersection; @@ -41,6 +41,12 @@ private Box getBoundary(List objects) { Math.max(upperBound.z, boundary.upperBounds.z) ); } + if (lowerBound.equals(Vector3.ONE.multiply(Double.MAX_VALUE))) { + lowerBound = Vector3.ONE.multiply(Double.MIN_VALUE); + } + if (upperBound.equals(Vector3.ONE.multiply(Double.MIN_VALUE))) { + upperBound = Vector3.ONE.multiply(Double.MAX_VALUE); + } return new Box(new Transform(), lowerBound, upperBound); } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java b/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java index ac1334d..5151540 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/BoxTests.java @@ -2,6 +2,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import labs.introtoprogramming.lab5.geometry.Ray; @@ -81,4 +82,12 @@ public void testIntersectionMinusZeroDirection() { Box box = new Box(new Transform(Vector3.RIGHT.multiply(2))); assertFalse(box.intersect(ray)); } + + @Test + public void testBoundary() { + Box box = new Box(new Transform(Vector3.RIGHT.multiply(2))); + Box boundary = box.getBoundary(); + assertEquals(box.upperBounds, boundary.upperBounds); + assertEquals(box.lowerBounds, boundary.lowerBounds); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java b/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java index 33ad99a..e3b432c 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/DiskTests.java @@ -2,6 +2,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import labs.introtoprogramming.lab5.geometry.Ray; @@ -43,4 +44,10 @@ public void testGreaterThanRadius() { assertFalse(disk.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } + + @Test + public void testBoundary() { + Disk disk = new Disk(new Transform()); + assertNull(disk.getBoundary()); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/OptimizedObjectTests.java b/src/test/java/labs/introtoprogramming/lab5/object/OptimizedObjectTests.java new file mode 100644 index 0000000..e803b78 --- /dev/null +++ b/src/test/java/labs/introtoprogramming/lab5/object/OptimizedObjectTests.java @@ -0,0 +1,40 @@ +package labs.introtoprogramming.lab5.object; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.util.Arrays; +import java.util.List; + +import labs.introtoprogramming.lab5.geometry.Ray; +import labs.introtoprogramming.lab5.geometry.Vector3; +import labs.introtoprogramming.lab5.scene.SceneObject; +import labs.introtoprogramming.lab5.scene.Transform; +import org.junit.Test; + +public class OptimizedObjectTests { + private static final double DELTA = 1e-10; + + private static List DUMMY_OBJECTS = Arrays.asList( + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new Triangle(new Transform(), Vector3.RIGHT, Vector3.RIGHT.multiply(-1), Vector3.UP), + new Sphere(new Transform(), 1) + ); + + @Test + public void testInstantiation() { + OptimizedObject obj = new OptimizedObject(new Transform(), DUMMY_OBJECTS); + Box boundary = obj.getBoundary(); + Box expected = DUMMY_OBJECTS.get(0).getBoundary(); + assertEquals(expected.lowerBounds, boundary.lowerBounds); + assertEquals(expected.upperBounds, boundary.upperBounds); + } + + @Test + public void testIntersection() { + OptimizedObject obj = new OptimizedObject(new Transform(), DUMMY_OBJECTS); + Ray ray = new Ray(Vector3.FORWARD.multiply(2), Vector3.FORWARD.multiply(-1)); + assertTrue(obj.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } +} diff --git a/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java b/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java index 3ababdd..8af0ece 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/PlaneTests.java @@ -2,6 +2,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import labs.introtoprogramming.lab5.geometry.Ray; @@ -43,4 +44,10 @@ public void testBelowRayOrigin() { assertFalse(plane.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } + + @Test + public void testBoundary() { + Plane plane = new Plane(new Transform()); + assertNull(plane.getBoundary()); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java index 11e0696..38adda2 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/SphereTests.java @@ -43,4 +43,12 @@ public void testIntersectionOppositeDirection() { assertFalse(sphere.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } + + @Test + public void testBoundary() { + Sphere sphere = new Sphere(new Transform(), 5); + Box boundary = sphere.getBoundary(); + assertEquals(Vector3.ONE.multiply(5), boundary.upperBounds); + assertEquals(Vector3.ONE.multiply(-5), boundary.lowerBounds); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java b/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java index 5d960d2..7e60794 100644 --- a/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/object/TriangleTests.java @@ -65,4 +65,21 @@ public void testNoIntersectionOutOfBounds() { assertFalse(triangle.intersect(ray)); assertEquals(1, ray.getScale(), DELTA); } + + @Test + public void testNoIntersectionOppositeDirection() { + Ray ray = new Ray(Vector3.ZERO, Vector3.FORWARD); + Triangle triangle = new Triangle(new Transform(Vector3.FORWARD.multiply(-9)), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)); + assertFalse(triangle.intersect(ray)); + assertEquals(1, ray.getScale(), DELTA); + } + + @Test + public void testBoundary() { + Triangle triangle = new Triangle(new Transform(), Vector3.RIGHT, Vector3.FORWARD, Vector3.UP); + Box boundary = triangle.getBoundary(); + assertEquals(Vector3.ONE, boundary.upperBounds); + assertEquals(Vector3.ZERO, boundary.lowerBounds); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/tree/KDNodeTests.java b/src/test/java/labs/introtoprogramming/lab5/tree/KDNodeTests.java index 8a37d68..6b4816d 100644 --- a/src/test/java/labs/introtoprogramming/lab5/tree/KDNodeTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/tree/KDNodeTests.java @@ -19,7 +19,7 @@ public class KDNodeTests { private static List DUMMY_OBJECTS = Arrays.asList( - new Box(new Transform(), Vector3.ONE, Vector3.ONE.multiply(-1)), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), new Triangle(new Transform(), Vector3.RIGHT, Vector3.RIGHT.multiply(-1), Vector3.UP), new Sphere(new Transform(), 1) ); @@ -67,4 +67,51 @@ public void testIntersectionOwnObjectIntersection() { new KDNode[0]); assertEquals(DUMMY_OBJECTS.get(2), node.intersect(new Ray(Vector3.FORWARD, Vector3.UP))); } + + @Test + public void testIntersectionEmptyChild() { + KDNode child = new KDNode(Collections.emptyList(), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[0]); + KDNode node = new KDNode(Collections.emptyList(), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[] { child }); + assertNull(node.intersect(new Ray(Vector3.FORWARD, Vector3.UP))); + } + + @Test + public void testIntersectionNullChild() { + KDNode node = new KDNode(Collections.emptyList(), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[2]); + assertNull(node.intersect(new Ray(Vector3.FORWARD, Vector3.UP))); + } + + @Test + public void testIntersectionNoChildIntersection() { + KDNode child = new KDNode(DUMMY_OBJECTS, + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[0]); + KDNode node = new KDNode(Collections.emptyList(), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[] { child }); + assertNull(node.intersect(new Ray(Vector3.FORWARD.multiply(100), Vector3.FORWARD))); + } + + @Test + public void testIntersectionMultyChildIntersection() { + KDNode first = new KDNode(Collections.singletonList(DUMMY_OBJECTS.get(0)), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[0]); + KDNode second = new KDNode(Collections.singletonList(DUMMY_OBJECTS.get(1)), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[0]); + KDNode third = new KDNode(Collections.singletonList(DUMMY_OBJECTS.get(2)), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[0]); + KDNode node = new KDNode(Collections.emptyList(), + new Box(new Transform(), Vector3.ONE.multiply(-5), Vector3.ONE.multiply(5)), + new KDNode[] { first, second, third }); + assertEquals(DUMMY_OBJECTS.get(2), node.intersect(new Ray(Vector3.FORWARD, Vector3.UP))); + } } diff --git a/src/test/java/labs/introtoprogramming/lab5/tree/KDTreeTests.java b/src/test/java/labs/introtoprogramming/lab5/tree/KDTreeTests.java index 8ec4b51..61d0ae4 100644 --- a/src/test/java/labs/introtoprogramming/lab5/tree/KDTreeTests.java +++ b/src/test/java/labs/introtoprogramming/lab5/tree/KDTreeTests.java @@ -5,6 +5,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -12,6 +13,8 @@ import labs.introtoprogramming.lab5.geometry.Ray; import labs.introtoprogramming.lab5.geometry.Vector3; import labs.introtoprogramming.lab5.object.Box; +import labs.introtoprogramming.lab5.object.Disk; +import labs.introtoprogramming.lab5.object.Plane; import labs.introtoprogramming.lab5.object.Sphere; import labs.introtoprogramming.lab5.object.Triangle; import labs.introtoprogramming.lab5.scene.SceneObject; @@ -27,6 +30,54 @@ public class KDTreeTests { new Sphere(new Transform(), 1) ); + private static List DUMMY_TRIANGLES = Arrays.asList( + new Triangle(new Transform(Vector3.FORWARD.multiply(-3)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-16)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-9)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.ONE.multiply(-10)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.ONE.multiply(-8)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-10).add(Vector3.UP)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-10).add(Vector3.UP.multiply(3))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-10).add(Vector3.UP.multiply(-3))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-10).add(Vector3.UP.multiply(-1))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-9)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-15)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-18)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.ONE.multiply(-9)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.ONE.multiply(-11)), Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(3))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(-3))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(-1))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(-1))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(-1))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(-1))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(-1))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(-1))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP.multiply(-1))), + Vector3.RIGHT, Vector3.UP, Vector3.RIGHT.multiply(-1)), + new Triangle(new Transform(Vector3.FORWARD.multiply(-12).add(Vector3.UP)), Vector3.RIGHT, + Vector3.UP, Vector3.RIGHT.multiply(-1)) + ); + + private static List DUMMY_OBJECTS_WITHOUT_BOUNDARY = Arrays.asList( + new Plane(new Transform()), + new Disk(new Transform(Vector3.ONE.multiply(-50))), + new Plane(new Transform(Vector3.ONE.multiply(100))), + new Disk(new Transform(Vector3.ONE.multiply(50))) + ); + @Test public void testInstantiation() { KDTree tree = new KDTree(DUMMY_OBJECTS); @@ -43,9 +94,26 @@ public void testEmptyList() { } @Test - public void test() { - KDTree tree = new KDTree(DUMMY_OBJECTS); + public void testIntersection() { + KDTree tree = new KDTree(new ArrayList<>(DUMMY_OBJECTS)); assertTrue(tree.intersect(new Ray(Vector3.ZERO, Vector3.FORWARD))); assertEquals(DUMMY_OBJECTS.get(1), tree.getIntersection()); } + + @Test + public void testBuild() { + KDTree tree = new KDTree(new ArrayList<>(DUMMY_TRIANGLES)); + assertTrue(tree.intersect(new Ray(Vector3.FORWARD, Vector3.FORWARD.multiply(-1)))); + assertEquals(DUMMY_TRIANGLES.get(0), tree.getIntersection()); + } + + @Test + public void testBuildObjectWithoutBoundary() { + KDTree tree = new KDTree(new ArrayList<>(DUMMY_OBJECTS_WITHOUT_BOUNDARY)); + Box boundary = tree.boundary(); + assertEquals(Vector3.ONE.multiply(Double.MAX_VALUE), boundary.upperBounds); + assertEquals(Vector3.ONE.multiply(Double.MIN_VALUE), boundary.lowerBounds); + assertTrue(tree.intersect(new Ray(Vector3.UP.multiply(-2), Vector3.UP.multiply(1)))); + assertEquals(DUMMY_OBJECTS_WITHOUT_BOUNDARY.get(0), tree.getIntersection()); + } }