New scenes added

src/main/java/App.java

@@ -0,0 +1,23 @@
+import image.Image;
+import image.ImageWriter;
+import raytracer.RayTracer;
+import raytracer.RayTracerConfig;
+import raytracer.RayTracerImpl;
+import raytracer.RayTracerLights;
+import raytracer.scene.BallsScene;
+import raytracer.scene.LightsScene;
+import util.Dimension;
+import java.nio.file.Paths;
+import java.util.concurrent.TimeUnit;
+
+public class App {
+    public static void main(String[] args) throws Exception{
+        ImageWriter writer = new ImageWriter(Math::sqrt);
+//        RayTracer rayTracer = new RayTracerImpl(new RayTracerConfig(new Dimension(400, 16d/9d), 50, 50), new BallsScene());
+        RayTracer rayTracer = new RayTracerLights(new RayTracerConfig(new Dimension(400, 16d/9d), 50, 50), new LightsScene());
+        long st = System.currentTimeMillis();
+        Image image = rayTracer.render();
+        System.out.printf("Processing time: %d seconds\n", TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - st));
+        writer.writeToFile(Paths.get("image.png"), image);
+    }
+}

src/main/java/image/ArrayImage.java

@@ -0,0 +1,48 @@
+package image;
+
+import math.Color;
+import util.Pair;
+
+import java.util.*;
+
+public class ArrayImage implements Image{
+    private final int xLen;
+    private final int yLen;
+    private final Color[][] colors;
+
+    public ArrayImage(int xLen, int yLen) {
+        this.xLen = xLen;
+        this.yLen = yLen;
+        colors = new Color[xLen][yLen];
+    }
+
+    public ArrayImage(Color[][] colors) {
+        this.colors = colors;
+        this.xLen = colors.length;
+        this.yLen = colors[0].length;
+    }
+
+    @Override
+    public Pair<Integer, Integer> getSize() {
+        return new Pair<>(xLen, yLen);
+    }
+
+    @Override
+    public Color getColor(int x, int y) {
+        if(x >= xLen || y >= yLen){
+            throw new IllegalArgumentException("Coordinate out of image size");
+        }
+        return colors[x][y];
+    }
+
+    @Override
+    public Iterator<Pixel> iterator() {
+        List<Pixel> list = new ArrayList<>();
+        for (int i = 0; i < xLen; i++) {
+            for (int j = 0; j < yLen; j++) {
+                list.add(new Pixel(i, j, colors[i][j]));
+            }
+        }
+        return list.iterator();
+    }
+}

src/main/java/image/ColorImage.java

@@ -0,0 +1,45 @@
+package image;
+
+import math.Color;
+import util.Pair;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class ColorImage implements Image{
+    private final int x;
+    private final int y;
+    private final Color color;
+
+    public ColorImage(int x, int y, Color color) {
+        this.x = x;
+        this.y = y;
+        this.color = color;
+    }
+
+    public ColorImage(Color color) {
+        this(1, 1, color);
+    }
+
+    @Override
+    public Pair<Integer, Integer> getSize() {
+        return new Pair<>(x, y);
+    }
+
+    @Override
+    public Color getColor(int x, int y) {
+        return color;
+    }
+
+    @Override
+    public Iterator<Pixel> iterator() {
+        List<Pixel> pixels = new ArrayList<>();
+        for (int i = 0; i < x; i++){
+            for (int j = 0; j < y; j++) {
+                pixels.add(new Pixel(i, j, color));
+            }
+        }
+        return pixels.iterator();
+    }
+}

src/main/java/image/Image.java

@@ -1,7 +1,9 @@
 package image;
 
+import math.Color;
 import util.Pair;
 
 public interface Image extends Iterable<Pixel>{
     Pair<Integer, Integer> getSize();
+    Color getColor(int x, int y);
 }

src/main/java/image/ImageWriter.java

@@ -40,4 +40,9 @@ public void writeToFile(Path file, BufferedImage bufferedImage, OutputFormat for
     public void writeToFile(Path file, BufferedImage bufferedImage) throws IOException {
         writeToFile(file, bufferedImage, OutputFormat.PNG);
     }
+
+    public void writeToFile(Path file, Image image) throws IOException{
+        writeToFile(file, write(image));
+    }
+
 }

src/main/java/image/ListImage.java

@@ -1,5 +1,6 @@
 package image;
 
+import math.Color;
 import util.Pair;
 
 import java.util.ArrayList;
@@ -26,4 +27,17 @@ public Iterator<Pixel> iterator() {
     public Pair<Integer, Integer> getSize() {
         return new Pair<Integer, Integer>(xLen, yLen);
     }
+
+    @Override
+    public Color getColor(int x, int y) {
+        if(x >= xLen || y >= yLen){
+            throw new IllegalArgumentException("Coordinate out of image size");
+        }
+        for (Pixel px: list) {
+            if(px.getX() == x && px.getY() == y){
+                return px.getColor();
+            }
+        }
+        throw new IllegalStateException("No color in this coordinate");
+    }
 }

src/main/java/material/DiffuseLight.java

@@ -0,0 +1,28 @@
+package material;
+
+import math.*;
+import texture.SolidColorTexture;
+import texture.Texture;
+
+public class DiffuseLight implements Material{
+    private final Texture texture;
+
+    public DiffuseLight(Color color) {
+        this.texture = new SolidColorTexture(color);
+    }
+
+    public DiffuseLight(Texture texture) {
+        this.texture = texture;
+    }
+
+    @Override
+    public boolean scatter(Ray rayIn, HitRecord record, Color attenuation, Ray scattered) {
+        scattered.setOrigin(new Point()).setDirection(new Vector());
+        return false;
+    }
+
+    @Override
+    public Color emitted(double u, double v, Point p) {
+        return texture.value(u, v, p);
+    }
+}

src/main/java/material/Material.java

@@ -1,9 +1,14 @@
 package material;
 
+import math.Point;
 import math.Ray;
 import math.Color;
 import math.HitRecord;
 
 public interface Material {
     boolean scatter(Ray rayIn, HitRecord record, Color attenuation, Ray scattered);
+
+    default Color emitted(double u, double v, Point p){
+        return new Color(0, 0, 0);
+    }
 }

src/main/java/material/Metal.java

@@ -40,7 +40,10 @@ public boolean scatter(Ray rayIn, HitRecord record, Color attenuation, Ray scatt
         scattered.setOrigin(record.getPoint())
                 .setDirection(reflected.add(Vectors.randomInUnitSphere().multiply(fuzz)))
                 .setTimeMoment(rayIn.getTimeMoment());
-        attenuation.set(albedo.value(record.getU(), record.getV(), record.getPoint()));
-        return Vectors.dot(scattered.getDirection(), record.getNormal()) > 0;
+
+        boolean scatter = Vectors.dot(scattered.getDirection(), record.getNormal()) > 0;
+        if (scatter)
+            attenuation.set(albedo.value(record.getU(), record.getV(), record.getPoint()));
+        return scatter;
     }
 }

src/main/java/math/Colors.java

@@ -7,10 +7,15 @@ public class Colors {
     public final static Color BLUE = new ImmutableColor(0, 0, 1);
     public final static Color BLACK = new ImmutableColor(0, 0, 0);
     public final static Color PURPLE = ImmutableColor.getByRGB(128,0,128);
+
     public static Color add(Color a, Color b){
         return new Color(a.getRed() + b.getRed(), a.getGreen() + b.getGreen(), a.getBlue() + b.getBlue());
     }
 
+    public static Color multiply(Color a, Color b){
+        return new Color(a.getRed() * b.getRed(), a.getGreen() * b.getGreen(), a.getBlue() * b.getBlue());
+    }
+
     public static class ImmutableColor extends Color{
 
         public ImmutableColor() {