Skip to content

Commit

Permalink
Update configuration of the project to make it work again
Browse files Browse the repository at this point in the history
  • Loading branch information
pedro00dk committed Oct 11, 2020
1 parent af922b2 commit 01fc245
Show file tree
Hide file tree
Showing 29 changed files with 199 additions and 292 deletions.
65 changes: 6 additions & 59 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,60 +1,7 @@
# Created by .ignore support plugin (hsz.mobi)
### Java template
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff:
.idea/workspace.xml
.idea/tasks.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml

# Sensitive or high-churn files:
.idea/dataSources.ids
.idea/dataSources.xml
.idea/dataSources.local.xml
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml

# Gradle:
.idea/gradle.xml
.idea/libraries

# Mongo Explorer plugin:
.idea/mongoSettings.xml

## File-based project format:
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties
.vscode/

.settings/
.classpath
.project
*.class
bin/
22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

57 changes: 0 additions & 57 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

38 changes: 37 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,37 @@
#Trivial Tracer
# Trivial Tracer

To compile the project run `make compile`.
To start the tracers run `make run`.

Run options can be passed through environment variables, the are:
- `CORNEL=true` : Run the cornel room example instead of the spheres room.
- `PATH_TRACE=true` : Uses a path tracer instead of a ray tracer.
- `THREADS=true` : Enables multi-threading.

#### Examples:
```shell
$ make run
$ CORNEL=true make run
$ PATH_TRACE=true make run
$ CORNEL=true PATH_TRACE=true THREADS=true make run
```

### Spheres Room

Ray tracing

![](docs/spheres-room-rt.png)

Path tracing

![](docs/spheres-room-pt.png)

### Cornel Room

Ray tracing

![](docs/cornel-room-rt.png)

Path tracing

![](docs/cornel-room-pt.png)
11 changes: 0 additions & 11 deletions TrivialTracer.iml

This file was deleted.

Binary file added docs/cornel-room-pt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/cornel-room-rt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/spheres-room-pt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/spheres-room-rt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
build:
mvn clean compile

run: build
mvn exec:exec
48 changes: 48 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<project>
<modelVersion>4.0.0</modelVersion>

<groupId>trivialtracer</groupId>
<artifactId>trivial-tracer</artifactId>
<version>1.0.0</version>

<properties>
<maven.compiler.target>14</maven.compiler.target>
<maven.compiler.source>14</maven.compiler.source>
</properties>

<build>
<sourceDirectory>${project.basedir}/src</sourceDirectory>
<directory>${project.basedir}/bin</directory>
<resources>
<resource>
<directory>${project.basedir}/res</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<source>14</source>
<target>14</target>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<classpath/>
<argument>Main</argument>
</arguments>
</configuration>
</plugin>
</plugins>
</build>

</project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 01fc245

Please sign in to comment.