From 75c56c0032443a253ed9113f377532933f6b3ea8 Mon Sep 17 00:00:00 2001 From: jbb01 <32650546+jbb01@users.noreply.github.com> Date: Mon, 12 Aug 2024 10:34:58 +0200 Subject: [PATCH] move packages --- .../java/eu/jonahbauer/raytracing/Examples.java | 8 ++++---- src/main/java/eu/jonahbauer/raytracing/Main.java | 4 +--- .../java/eu/jonahbauer/raytracing/math/Ray.java | 2 +- .../jonahbauer/raytracing/render/ImageFormat.java | 2 +- .../raytracing/render/camera/SimpleCamera.java | 2 +- .../jonahbauer/raytracing/render/canvas/Canvas.java | 8 ++++---- .../raytracing/render/canvas/LiveCanvas.java | 8 ++++---- .../raytracing/render/canvas/RGBCanvas.java | 8 ++++---- .../raytracing/render/canvas/XYZCanvas.java | 10 +++++----- .../{spectral/colors => color}/Chromaticity.java | 2 +- .../render/{spectral/colors => color}/ColorRGB.java | 2 +- .../{spectral/colors => color}/ColorSpace.java | 6 +++--- .../{spectral/colors => color}/ColorSpaces.java | 4 ++-- .../render/{spectral/colors => color}/ColorXYZ.java | 2 +- .../colors => color}/SigmoidPolynomial.java | 4 ++-- .../{spectral/colors => color}/SpectrumTable.java | 2 +- .../colors => color}/SpectrumTableGenerator.java | 4 ++-- .../colors => color}/doc-files/rgb2spectrum.png | Bin .../render/material/DielectricMaterial.java | 8 ++++---- .../raytracing/render/material/DiffuseLight.java | 8 ++++---- .../render/material/DirectionalMaterial.java | 4 ++-- .../render/material/IsotropicMaterial.java | 8 ++++---- .../render/material/LambertianMaterial.java | 6 +++--- .../raytracing/render/material/Material.java | 6 +++--- .../render/material/MetallicMaterial.java | 6 +++--- .../raytracing/render/renderer/SimpleRenderer.java | 2 +- .../{spectral => }/spectrum/BlackbodySpectrum.java | 2 +- .../{spectral => }/spectrum/ConstantSpectrum.java | 2 +- .../spectrum/DenselySampledSpectrum.java | 2 +- .../spectrum/PiecewiseLinearSpectrum.java | 2 +- .../{spectral => }/spectrum/RGBAlbedoSpectrum.java | 8 ++++---- .../spectrum/RGBIlluminantSpectrum.java | 8 ++++---- .../spectrum/RGBUnboundedSpectrum.java | 8 ++++---- .../{spectral => spectrum}/SampledSpectrum.java | 9 ++++----- .../{spectral => spectrum}/SampledWavelengths.java | 6 ++---- .../{spectral => }/spectrum/ScaledSpectrum.java | 2 +- .../render/{spectral => }/spectrum/Spectra.java | 4 ++-- .../render/{spectral => }/spectrum/Spectrum.java | 10 ++++------ .../render/{spectral => }/spectrum/Util.java | 2 +- .../raytracing/render/texture/CheckerTexture.java | 2 +- .../raytracing/render/texture/ImageTexture.java | 10 +++++----- .../raytracing/render/texture/PerlinTexture.java | 4 ++-- .../raytracing/render/texture/Texture.java | 2 +- .../java/eu/jonahbauer/raytracing/scene/Scene.java | 4 ++-- .../java/eu/jonahbauer/raytracing/scene/SkyBox.java | 4 ++-- .../raytracing/render/canvas/RGBCanvasTest.java | 2 +- .../raytracing/scene/hittable3d/SphereTest.java | 2 +- 47 files changed, 107 insertions(+), 114 deletions(-) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/Chromaticity.java (75%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/ColorRGB.java (98%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/ColorSpace.java (94%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/ColorSpaces.java (92%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/ColorXYZ.java (98%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/SigmoidPolynomial.java (89%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/SpectrumTable.java (98%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/SpectrumTableGenerator.java (98%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral/colors => color}/doc-files/rgb2spectrum.png (100%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/BlackbodySpectrum.java (94%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/ConstantSpectrum.java (82%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/DenselySampledSpectrum.java (96%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/PiecewiseLinearSpectrum.java (96%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/RGBAlbedoSpectrum.java (70%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/RGBIlluminantSpectrum.java (80%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/RGBUnboundedSpectrum.java (74%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => spectrum}/SampledSpectrum.java (92%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => spectrum}/SampledWavelengths.java (93%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/ScaledSpectrum.java (84%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/Spectra.java (99%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/Spectrum.java (82%) rename src/main/java/eu/jonahbauer/raytracing/render/{spectral => }/spectrum/Util.java (88%) diff --git a/src/main/java/eu/jonahbauer/raytracing/Examples.java b/src/main/java/eu/jonahbauer/raytracing/Examples.java index 805ff35..c238794 100644 --- a/src/main/java/eu/jonahbauer/raytracing/Examples.java +++ b/src/main/java/eu/jonahbauer/raytracing/Examples.java @@ -1,11 +1,11 @@ package eu.jonahbauer.raytracing; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpaces; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBAlbedoSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBIlluminantSpectrum; +import eu.jonahbauer.raytracing.render.color.ColorSpaces; +import eu.jonahbauer.raytracing.render.spectrum.RGBAlbedoSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.RGBIlluminantSpectrum; import eu.jonahbauer.raytracing.render.texture.CheckerTexture; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import eu.jonahbauer.raytracing.render.camera.SimpleCamera; import eu.jonahbauer.raytracing.render.material.*; import eu.jonahbauer.raytracing.render.texture.ImageTexture; diff --git a/src/main/java/eu/jonahbauer/raytracing/Main.java b/src/main/java/eu/jonahbauer/raytracing/Main.java index 6f82d2d..f8ee54b 100644 --- a/src/main/java/eu/jonahbauer/raytracing/Main.java +++ b/src/main/java/eu/jonahbauer/raytracing/Main.java @@ -5,9 +5,7 @@ import eu.jonahbauer.raytracing.render.canvas.Canvas; import eu.jonahbauer.raytracing.render.canvas.LiveCanvas; import eu.jonahbauer.raytracing.render.canvas.XYZCanvas; import eu.jonahbauer.raytracing.render.renderer.SimpleRenderer; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpaces; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBAlbedoSpectrum; +import eu.jonahbauer.raytracing.render.color.ColorSpaces; import org.jetbrains.annotations.NotNull; import java.io.IOException; diff --git a/src/main/java/eu/jonahbauer/raytracing/math/Ray.java b/src/main/java/eu/jonahbauer/raytracing/math/Ray.java index 12bdd88..d4a8ca9 100644 --- a/src/main/java/eu/jonahbauer/raytracing/math/Ray.java +++ b/src/main/java/eu/jonahbauer/raytracing/math/Ray.java @@ -1,6 +1,6 @@ package eu.jonahbauer.raytracing.math; -import eu.jonahbauer.raytracing.render.spectral.SampledWavelengths; +import eu.jonahbauer.raytracing.render.spectrum.SampledWavelengths; import org.jetbrains.annotations.NotNull; import java.util.Objects; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/ImageFormat.java b/src/main/java/eu/jonahbauer/raytracing/render/ImageFormat.java index bf970c5..2347c00 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/ImageFormat.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/ImageFormat.java @@ -1,7 +1,7 @@ package eu.jonahbauer.raytracing.render; import eu.jonahbauer.raytracing.render.canvas.Canvas; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpaces; +import eu.jonahbauer.raytracing.render.color.ColorSpaces; import org.jetbrains.annotations.NotNull; import java.io.*; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/camera/SimpleCamera.java b/src/main/java/eu/jonahbauer/raytracing/render/camera/SimpleCamera.java index 27311f9..d1f315e 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/camera/SimpleCamera.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/camera/SimpleCamera.java @@ -2,7 +2,7 @@ package eu.jonahbauer.raytracing.render.camera; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.SampledWavelengths; +import eu.jonahbauer.raytracing.render.spectrum.SampledWavelengths; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/canvas/Canvas.java b/src/main/java/eu/jonahbauer/raytracing/render/canvas/Canvas.java index cf5a172..ea9203e 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/canvas/Canvas.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/canvas/Canvas.java @@ -1,9 +1,9 @@ package eu.jonahbauer.raytracing.render.canvas; -import eu.jonahbauer.raytracing.render.spectral.SampledSpectrum; -import eu.jonahbauer.raytracing.render.spectral.SampledWavelengths; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.SampledSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.SampledWavelengths; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; import org.jetbrains.annotations.NotNull; public interface Canvas { diff --git a/src/main/java/eu/jonahbauer/raytracing/render/canvas/LiveCanvas.java b/src/main/java/eu/jonahbauer/raytracing/render/canvas/LiveCanvas.java index e782836..5075999 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/canvas/LiveCanvas.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/canvas/LiveCanvas.java @@ -1,9 +1,9 @@ package eu.jonahbauer.raytracing.render.canvas; -import eu.jonahbauer.raytracing.render.spectral.SampledSpectrum; -import eu.jonahbauer.raytracing.render.spectral.SampledWavelengths; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.SampledSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.SampledWavelengths; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/canvas/RGBCanvas.java b/src/main/java/eu/jonahbauer/raytracing/render/canvas/RGBCanvas.java index 34d58c1..8d2d70d 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/canvas/RGBCanvas.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/canvas/RGBCanvas.java @@ -1,9 +1,9 @@ package eu.jonahbauer.raytracing.render.canvas; -import eu.jonahbauer.raytracing.render.spectral.SampledSpectrum; -import eu.jonahbauer.raytracing.render.spectral.SampledWavelengths; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.SampledSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.SampledWavelengths; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; import org.jetbrains.annotations.NotNull; import java.awt.image.BufferedImage; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/canvas/XYZCanvas.java b/src/main/java/eu/jonahbauer/raytracing/render/canvas/XYZCanvas.java index 2375339..fa93e39 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/canvas/XYZCanvas.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/canvas/XYZCanvas.java @@ -1,10 +1,10 @@ package eu.jonahbauer.raytracing.render.canvas; -import eu.jonahbauer.raytracing.render.spectral.SampledSpectrum; -import eu.jonahbauer.raytracing.render.spectral.SampledWavelengths; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorXYZ; +import eu.jonahbauer.raytracing.render.spectrum.SampledSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.SampledWavelengths; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.color.ColorXYZ; import org.jetbrains.annotations.NotNull; import java.awt.image.BufferedImage; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/Chromaticity.java b/src/main/java/eu/jonahbauer/raytracing/render/color/Chromaticity.java similarity index 75% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/Chromaticity.java rename to src/main/java/eu/jonahbauer/raytracing/render/color/Chromaticity.java index 3b9c3de..041d382 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/Chromaticity.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/color/Chromaticity.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.colors; +package eu.jonahbauer.raytracing.render.color; /** * A pair of chromaticity coordinates in the xyY color space diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorRGB.java b/src/main/java/eu/jonahbauer/raytracing/render/color/ColorRGB.java similarity index 98% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorRGB.java rename to src/main/java/eu/jonahbauer/raytracing/render/color/ColorRGB.java index 28f0af5..fb4b460 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorRGB.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/color/ColorRGB.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.colors; +package eu.jonahbauer.raytracing.render.color; import eu.jonahbauer.raytracing.math.IVec3; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorSpace.java b/src/main/java/eu/jonahbauer/raytracing/render/color/ColorSpace.java similarity index 94% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorSpace.java rename to src/main/java/eu/jonahbauer/raytracing/render/color/ColorSpace.java index 4fb5629..9d6b737 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorSpace.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/color/ColorSpace.java @@ -1,9 +1,9 @@ -package eu.jonahbauer.raytracing.render.spectral.colors; +package eu.jonahbauer.raytracing.render.color; import eu.jonahbauer.raytracing.math.Matrix3; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.spectrum.DenselySampledSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.spectrum.DenselySampledSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import org.jetbrains.annotations.NotNull; import java.util.Objects; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorSpaces.java b/src/main/java/eu/jonahbauer/raytracing/render/color/ColorSpaces.java similarity index 92% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorSpaces.java rename to src/main/java/eu/jonahbauer/raytracing/render/color/ColorSpaces.java index 7f42d6f..a2742df 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorSpaces.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/color/ColorSpaces.java @@ -1,6 +1,6 @@ -package eu.jonahbauer.raytracing.render.spectral.colors; +package eu.jonahbauer.raytracing.render.color; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectra; +import eu.jonahbauer.raytracing.render.spectrum.Spectra; import org.jetbrains.annotations.NotNull; import java.io.IOException; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorXYZ.java b/src/main/java/eu/jonahbauer/raytracing/render/color/ColorXYZ.java similarity index 98% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorXYZ.java rename to src/main/java/eu/jonahbauer/raytracing/render/color/ColorXYZ.java index 4e9bbf7..5d00db8 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/ColorXYZ.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/color/ColorXYZ.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.colors; +package eu.jonahbauer.raytracing.render.color; import eu.jonahbauer.raytracing.math.IVec3; import eu.jonahbauer.raytracing.math.Vec3; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SigmoidPolynomial.java b/src/main/java/eu/jonahbauer/raytracing/render/color/SigmoidPolynomial.java similarity index 89% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SigmoidPolynomial.java rename to src/main/java/eu/jonahbauer/raytracing/render/color/SigmoidPolynomial.java index 64c391b..cf172e1 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SigmoidPolynomial.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/color/SigmoidPolynomial.java @@ -1,6 +1,6 @@ -package eu.jonahbauer.raytracing.render.spectral.colors; +package eu.jonahbauer.raytracing.render.color; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; /** * A function of the form {@code s(p(x))} where {@code p} is a polynomial of second degree and {@code s} is the sigmoid diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SpectrumTable.java b/src/main/java/eu/jonahbauer/raytracing/render/color/SpectrumTable.java similarity index 98% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SpectrumTable.java rename to src/main/java/eu/jonahbauer/raytracing/render/color/SpectrumTable.java index b227da4..03d72eb 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SpectrumTable.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/color/SpectrumTable.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.colors; +package eu.jonahbauer.raytracing.render.color; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SpectrumTableGenerator.java b/src/main/java/eu/jonahbauer/raytracing/render/color/SpectrumTableGenerator.java similarity index 98% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SpectrumTableGenerator.java rename to src/main/java/eu/jonahbauer/raytracing/render/color/SpectrumTableGenerator.java index 51c6bef..75920d0 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/SpectrumTableGenerator.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/color/SpectrumTableGenerator.java @@ -1,8 +1,8 @@ -package eu.jonahbauer.raytracing.render.spectral.colors; +package eu.jonahbauer.raytracing.render.color; import eu.jonahbauer.raytracing.math.Matrix3; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import org.jetbrains.annotations.NotNull; import java.io.IOException; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/doc-files/rgb2spectrum.png b/src/main/java/eu/jonahbauer/raytracing/render/color/doc-files/rgb2spectrum.png similarity index 100% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/colors/doc-files/rgb2spectrum.png rename to src/main/java/eu/jonahbauer/raytracing/render/color/doc-files/rgb2spectrum.png diff --git a/src/main/java/eu/jonahbauer/raytracing/render/material/DielectricMaterial.java b/src/main/java/eu/jonahbauer/raytracing/render/material/DielectricMaterial.java index c7a9f7c..507c007 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/material/DielectricMaterial.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/material/DielectricMaterial.java @@ -2,10 +2,10 @@ package eu.jonahbauer.raytracing.render.material; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBAlbedoSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectra; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.RGBAlbedoSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectra; import eu.jonahbauer.raytracing.render.texture.Texture; import eu.jonahbauer.raytracing.scene.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/material/DiffuseLight.java b/src/main/java/eu/jonahbauer/raytracing/render/material/DiffuseLight.java index 4585f45..09d7755 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/material/DiffuseLight.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/material/DiffuseLight.java @@ -1,10 +1,10 @@ package eu.jonahbauer.raytracing.render.material; import eu.jonahbauer.raytracing.math.Ray; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBIlluminantSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.RGBIlluminantSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import eu.jonahbauer.raytracing.render.texture.Texture; import eu.jonahbauer.raytracing.scene.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/material/DirectionalMaterial.java b/src/main/java/eu/jonahbauer/raytracing/render/material/DirectionalMaterial.java index 7036417..1f38660 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/material/DirectionalMaterial.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/material/DirectionalMaterial.java @@ -2,8 +2,8 @@ package eu.jonahbauer.raytracing.render.material; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectra; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectra; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import eu.jonahbauer.raytracing.render.texture.Texture; import eu.jonahbauer.raytracing.scene.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/material/IsotropicMaterial.java b/src/main/java/eu/jonahbauer/raytracing/render/material/IsotropicMaterial.java index 5fbe796..76a717d 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/material/IsotropicMaterial.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/material/IsotropicMaterial.java @@ -2,10 +2,10 @@ package eu.jonahbauer.raytracing.render.material; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.render.renderer.pdf.SphereProbabilityDensityFunction; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBAlbedoSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.RGBAlbedoSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import eu.jonahbauer.raytracing.render.texture.Texture; import eu.jonahbauer.raytracing.scene.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/material/LambertianMaterial.java b/src/main/java/eu/jonahbauer/raytracing/render/material/LambertianMaterial.java index f080d88..dd76182 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/material/LambertianMaterial.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/material/LambertianMaterial.java @@ -2,9 +2,9 @@ package eu.jonahbauer.raytracing.render.material; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.render.renderer.pdf.CosineProbabilityDensityFunction; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBAlbedoSpectrum; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.RGBAlbedoSpectrum; import eu.jonahbauer.raytracing.render.texture.Texture; import eu.jonahbauer.raytracing.scene.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/material/Material.java b/src/main/java/eu/jonahbauer/raytracing/render/material/Material.java index 96af7a2..ec26472 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/material/Material.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/material/Material.java @@ -2,9 +2,9 @@ package eu.jonahbauer.raytracing.render.material; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.render.renderer.pdf.ProbabilityDensityFunction; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectra; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.spectrum.Spectra; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import eu.jonahbauer.raytracing.render.texture.Texture; import eu.jonahbauer.raytracing.scene.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/material/MetallicMaterial.java b/src/main/java/eu/jonahbauer/raytracing/render/material/MetallicMaterial.java index a95a79f..5024423 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/material/MetallicMaterial.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/material/MetallicMaterial.java @@ -2,9 +2,9 @@ package eu.jonahbauer.raytracing.render.material; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBAlbedoSpectrum; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.RGBAlbedoSpectrum; import eu.jonahbauer.raytracing.render.texture.Texture; import eu.jonahbauer.raytracing.scene.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/renderer/SimpleRenderer.java b/src/main/java/eu/jonahbauer/raytracing/render/renderer/SimpleRenderer.java index 1e00bd4..0acce55 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/renderer/SimpleRenderer.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/renderer/SimpleRenderer.java @@ -4,7 +4,7 @@ import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.render.material.Material; import eu.jonahbauer.raytracing.render.renderer.pdf.TargetingProbabilityDensityFunction; import eu.jonahbauer.raytracing.render.renderer.pdf.MixtureProbabilityDensityFunction; -import eu.jonahbauer.raytracing.render.spectral.SampledSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.SampledSpectrum; import eu.jonahbauer.raytracing.render.camera.Camera; import eu.jonahbauer.raytracing.render.canvas.Canvas; import eu.jonahbauer.raytracing.scene.Scene; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/BlackbodySpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/BlackbodySpectrum.java similarity index 94% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/BlackbodySpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/BlackbodySpectrum.java index 4a07f8b..b22600e 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/BlackbodySpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/BlackbodySpectrum.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; public final class BlackbodySpectrum implements Spectrum { /** diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/ConstantSpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/ConstantSpectrum.java similarity index 82% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/ConstantSpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/ConstantSpectrum.java index e5348da..a25048c 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/ConstantSpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/ConstantSpectrum.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; /** * A constant spectrum. diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/DenselySampledSpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/DenselySampledSpectrum.java similarity index 96% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/DenselySampledSpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/DenselySampledSpectrum.java index ad759cb..13aa81a 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/DenselySampledSpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/DenselySampledSpectrum.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/PiecewiseLinearSpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/PiecewiseLinearSpectrum.java similarity index 96% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/PiecewiseLinearSpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/PiecewiseLinearSpectrum.java index c6c4c3d..c558a9c 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/PiecewiseLinearSpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/PiecewiseLinearSpectrum.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; import java.util.Arrays; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBAlbedoSpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBAlbedoSpectrum.java similarity index 70% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBAlbedoSpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBAlbedoSpectrum.java index 64c4a23..9007e70 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBAlbedoSpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBAlbedoSpectrum.java @@ -1,8 +1,8 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.colors.SigmoidPolynomial; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.color.SigmoidPolynomial; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import org.jetbrains.annotations.NotNull; public final class RGBAlbedoSpectrum implements Spectrum { diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBIlluminantSpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBIlluminantSpectrum.java similarity index 80% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBIlluminantSpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBIlluminantSpectrum.java index 63c5d1a..52b9781 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBIlluminantSpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBIlluminantSpectrum.java @@ -1,8 +1,8 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.colors.SigmoidPolynomial; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.color.SigmoidPolynomial; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBUnboundedSpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBUnboundedSpectrum.java similarity index 74% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBUnboundedSpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBUnboundedSpectrum.java index ee154c1..7946670 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/RGBUnboundedSpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/RGBUnboundedSpectrum.java @@ -1,8 +1,8 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.colors.SigmoidPolynomial; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.color.SigmoidPolynomial; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import org.jetbrains.annotations.NotNull; public final class RGBUnboundedSpectrum implements Spectrum { diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/SampledSpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/SampledSpectrum.java similarity index 92% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/SampledSpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/SampledSpectrum.java index f3319ab..1c6fa45 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/SampledSpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/SampledSpectrum.java @@ -1,10 +1,9 @@ -package eu.jonahbauer.raytracing.render.spectral; +package eu.jonahbauer.raytracing.render.spectrum; import eu.jonahbauer.raytracing.math.IVec; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorXYZ; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.color.ColorXYZ; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/SampledWavelengths.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/SampledWavelengths.java similarity index 93% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/SampledWavelengths.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/SampledWavelengths.java index 1621abb..d276768 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/SampledWavelengths.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/SampledWavelengths.java @@ -1,8 +1,6 @@ -package eu.jonahbauer.raytracing.render.spectral; +package eu.jonahbauer.raytracing.render.spectrum; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorXYZ; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectra; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.color.ColorXYZ; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/ScaledSpectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/ScaledSpectrum.java similarity index 84% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/ScaledSpectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/ScaledSpectrum.java index 0949ef9..cc4844a 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/ScaledSpectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/ScaledSpectrum.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Spectra.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/Spectra.java similarity index 99% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Spectra.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/Spectra.java index e845a43..c108c8f 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Spectra.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/Spectra.java @@ -1,6 +1,6 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorXYZ; +import eu.jonahbauer.raytracing.render.color.ColorXYZ; import org.jetbrains.annotations.NotNull; import java.io.BufferedReader; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Spectrum.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/Spectrum.java similarity index 82% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Spectrum.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/Spectrum.java index 09bc817..c96a110 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Spectrum.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/Spectrum.java @@ -1,12 +1,10 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorXYZ; -import eu.jonahbauer.raytracing.render.spectral.SampledSpectrum; -import eu.jonahbauer.raytracing.render.spectral.SampledWavelengths; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.color.ColorXYZ; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import eu.jonahbauer.raytracing.render.texture.Texture; import eu.jonahbauer.raytracing.scene.HitResult; import eu.jonahbauer.raytracing.scene.SkyBox; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Util.java b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/Util.java similarity index 88% rename from src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Util.java rename to src/main/java/eu/jonahbauer/raytracing/render/spectrum/Util.java index 783e3e0..22694cb 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/spectral/spectrum/Util.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/spectrum/Util.java @@ -1,4 +1,4 @@ -package eu.jonahbauer.raytracing.render.spectral.spectrum; +package eu.jonahbauer.raytracing.render.spectrum; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/texture/CheckerTexture.java b/src/main/java/eu/jonahbauer/raytracing/render/texture/CheckerTexture.java index a88a533..0d39987 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/texture/CheckerTexture.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/texture/CheckerTexture.java @@ -1,7 +1,7 @@ package eu.jonahbauer.raytracing.render.texture; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import org.jetbrains.annotations.NotNull; public record CheckerTexture(double scale, @NotNull Texture even, @NotNull Texture odd) implements Texture { diff --git a/src/main/java/eu/jonahbauer/raytracing/render/texture/ImageTexture.java b/src/main/java/eu/jonahbauer/raytracing/render/texture/ImageTexture.java index 009f8e4..08cf60a 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/texture/ImageTexture.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/texture/ImageTexture.java @@ -1,11 +1,11 @@ package eu.jonahbauer.raytracing.render.texture; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorSpace; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBAlbedoSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.RGBIlluminantSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.color.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorSpace; +import eu.jonahbauer.raytracing.render.spectrum.RGBAlbedoSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.RGBIlluminantSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import org.jetbrains.annotations.NotNull; import javax.imageio.ImageIO; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/texture/PerlinTexture.java b/src/main/java/eu/jonahbauer/raytracing/render/texture/PerlinTexture.java index 3dbb41c..c7c55fe 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/texture/PerlinTexture.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/texture/PerlinTexture.java @@ -1,8 +1,8 @@ package eu.jonahbauer.raytracing.render.texture; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectra; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectra; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import org.jetbrains.annotations.NotNull; import java.util.Objects; diff --git a/src/main/java/eu/jonahbauer/raytracing/render/texture/Texture.java b/src/main/java/eu/jonahbauer/raytracing/render/texture/Texture.java index f63383c..67facec 100644 --- a/src/main/java/eu/jonahbauer/raytracing/render/texture/Texture.java +++ b/src/main/java/eu/jonahbauer/raytracing/render/texture/Texture.java @@ -1,7 +1,7 @@ package eu.jonahbauer.raytracing.render.texture; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import eu.jonahbauer.raytracing.scene.HitResult; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/scene/Scene.java b/src/main/java/eu/jonahbauer/raytracing/scene/Scene.java index b7c4af1..633bbc4 100644 --- a/src/main/java/eu/jonahbauer/raytracing/scene/Scene.java +++ b/src/main/java/eu/jonahbauer/raytracing/scene/Scene.java @@ -2,8 +2,8 @@ package eu.jonahbauer.raytracing.scene; import eu.jonahbauer.raytracing.math.AABB; import eu.jonahbauer.raytracing.math.Ray; -import eu.jonahbauer.raytracing.render.spectral.SampledSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectra; +import eu.jonahbauer.raytracing.render.spectrum.SampledSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectra; import eu.jonahbauer.raytracing.scene.util.HittableBinaryTree; import eu.jonahbauer.raytracing.scene.util.HittableCollection; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/eu/jonahbauer/raytracing/scene/SkyBox.java b/src/main/java/eu/jonahbauer/raytracing/scene/SkyBox.java index 9ece0a8..4b2e89a 100644 --- a/src/main/java/eu/jonahbauer/raytracing/scene/SkyBox.java +++ b/src/main/java/eu/jonahbauer/raytracing/scene/SkyBox.java @@ -1,8 +1,8 @@ package eu.jonahbauer.raytracing.scene; import eu.jonahbauer.raytracing.math.Ray; -import eu.jonahbauer.raytracing.render.spectral.SampledSpectrum; -import eu.jonahbauer.raytracing.render.spectral.spectrum.Spectrum; +import eu.jonahbauer.raytracing.render.spectrum.SampledSpectrum; +import eu.jonahbauer.raytracing.render.spectrum.Spectrum; import org.jetbrains.annotations.NotNull; @FunctionalInterface diff --git a/src/test/java/eu/jonahbauer/raytracing/render/canvas/RGBCanvasTest.java b/src/test/java/eu/jonahbauer/raytracing/render/canvas/RGBCanvasTest.java index d17277a..fd95b15 100644 --- a/src/test/java/eu/jonahbauer/raytracing/render/canvas/RGBCanvasTest.java +++ b/src/test/java/eu/jonahbauer/raytracing/render/canvas/RGBCanvasTest.java @@ -1,6 +1,6 @@ package eu.jonahbauer.raytracing.render.canvas; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import eu.jonahbauer.raytracing.render.ImageFormat; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/src/test/java/eu/jonahbauer/raytracing/scene/hittable3d/SphereTest.java b/src/test/java/eu/jonahbauer/raytracing/scene/hittable3d/SphereTest.java index 8dc202b..e6ce8b6 100644 --- a/src/test/java/eu/jonahbauer/raytracing/scene/hittable3d/SphereTest.java +++ b/src/test/java/eu/jonahbauer/raytracing/scene/hittable3d/SphereTest.java @@ -3,7 +3,7 @@ package eu.jonahbauer.raytracing.scene.hittable3d; import eu.jonahbauer.raytracing.math.Range; import eu.jonahbauer.raytracing.math.Ray; import eu.jonahbauer.raytracing.math.Vec3; -import eu.jonahbauer.raytracing.render.spectral.colors.ColorRGB; +import eu.jonahbauer.raytracing.render.color.ColorRGB; import eu.jonahbauer.raytracing.render.material.LambertianMaterial; import org.junit.jupiter.api.Test;