Merge pull request #72 from tomasz-herman/develop

Develop
tomasz-herman · Jan 30, 2021 · 31734fc · 31734fc
2 parents 1162c17 + 2ada090
commit 31734fc
Show file tree

Hide file tree

Showing 48 changed files with 31,524 additions and 4,587 deletions.
diff --git a/RayTracer/Properties/Strings.Designer.cs b/RayTracer/Properties/Strings.Designer.cs
diff --git a/RayTracer/Resources/Models/grass.dae b/RayTracer/Resources/Models/grass.dae
diff --git a/RayTracer/Resources/Models/tank.dae b/RayTracer/Resources/Models/tank.dae
diff --git a/RayTracer/Resources/Textures/moro.png b/RayTracer/Resources/Textures/moro.png
diff --git a/RayTracer/Source/Cameras/LensCamera.cs b/RayTracer/Source/Cameras/LensCamera.cs
@@ -16,7 +16,7 @@ public class LensCamera : Camera
         private Func<int, List<Vector2>> _sampling;
         private int _samplesCount;
 
-        public bool AutoFocus { get; set; }
+        public bool AutoFocus { get; set; } = true;
 
         public float LensRadius
         {
@@ -60,7 +60,7 @@ public int SamplesCount
             }
         }
 
-        public LensCamera(Vector3 position, float lensRadius = 0.25f, float focusDistance = 5, int samplesCount = 10000,
+        public LensCamera(Vector3 position, float lensRadius = 0.2f, float focusDistance = 5, int samplesCount = 10000,
             Func<int, List<Vector2>> sampling = null)
         {
             Position = position;

diff --git a/RayTracer/Source/Models/Cuboid.cs b/RayTracer/Source/Models/Cuboid.cs
@@ -3,6 +3,7 @@
 using RayTracing.Materials;
 using RayTracing.Maths;
 using RayTracing.RayTracing;
+using Properties = RayTracer.Properties;
 
 namespace RayTracing.Models
 {

diff --git a/RayTracer/Source/Models/CustomModel.cs b/RayTracer/Source/Models/CustomModel.cs
@@ -2,12 +2,13 @@
 using OpenTK;
 using RayTracing.Maths;
 using RayTracing.RayTracing;
+using Properties = RayTracer.Properties;
 
 namespace RayTracing.Models
 {
     public class CustomModel : Model
     {
-        public Mesh Mesh
+        public new Mesh Mesh
         {
             get => base.Mesh;
             set

diff --git a/RayTracer/Source/Models/Cylinder.cs b/RayTracer/Source/Models/Cylinder.cs
@@ -4,6 +4,7 @@
 using OpenTK;
 using RayTracing.Materials;
 using RayTracing.Maths;
+using Properties = RayTracer.Properties;
 
 namespace RayTracing.Models
 {

diff --git a/RayTracer/Source/Models/Plane.cs b/RayTracer/Source/Models/Plane.cs
@@ -2,6 +2,7 @@
 using OpenTK;
 using RayTracing.Materials;
 using RayTracing.Maths;
+using Properties = RayTracer.Properties;
 
 namespace RayTracing.Models
 {

diff --git a/RayTracer/Source/Models/Rectangle.cs b/RayTracer/Source/Models/Rectangle.cs
@@ -3,6 +3,7 @@
 using RayTracing.Materials;
 using RayTracing.Maths;
 using RayTracing.RayTracing;
+using Properties = RayTracer.Properties;
 
 namespace RayTracing.Models
 {

diff --git a/RayTracer/Source/Models/Sphere.cs b/RayTracer/Source/Models/Sphere.cs
@@ -3,6 +3,7 @@
 using OpenTK;
 using RayTracing.Materials;
 using RayTracing.Maths;
+using Properties = RayTracer.Properties;
 
 namespace RayTracing.Models
 {

diff --git a/RayTracer/Source/Renderer/RayTracer.cs b/RayTracer/Source/Renderer/RayTracer.cs
@@ -27,7 +27,11 @@ public RayTracer(int maxDepth, int samples, Func<int, List<Vector2>> sampling, i
 
         public Color Shade(Ray ray, Scene scene, int depth)
         {
-            if (depth == 0) return new Color();
+            if (depth == 0)
+            {
+                var ambient = scene.AmbientLight.Color;
+                return new Color(ambient.R, ambient.G, ambient.B);
+            }
 
             HitInfo hitInfo = new HitInfo();
 

diff --git a/RayTracer/Source/Renderer/SamplesRayTracer.cs b/RayTracer/Source/Renderer/SamplesRayTracer.cs
@@ -12,13 +12,10 @@ namespace RayTracing
 {
     public class SamplesRayTracer : IncrementalRayTracer
     {
-        private readonly int _samplesRenderStep;
-
         public SamplesRayTracer(int maxDepth, int samples, Func<int, List<Vector2>> sampling, int resolution,
             int samplesRenderStep) : base(
             maxDepth, samples, sampling, resolution, samplesRenderStep)
         {
-            _samplesRenderStep = samplesRenderStep;
         }
 
         public override void Render(Scene scene, Camera camera)
@@ -71,7 +68,7 @@ public override void Render(Scene scene, Camera camera)
                 if (CancellationToken.IsCancellationRequested)
                     return;
 
-                if (k % _samplesRenderStep == 0 || k == Samples - 1)
+                if (k % SamplesRenderStep == 0 || k == Samples - 1)
                 {
                     var output = new Texture(image);
                     output.Process(c => (c / (k + 1)).Clamp());

diff --git a/RayTracerApp/Forms/EditObjectForm.Designer.cs b/RayTracerApp/Forms/EditObjectForm.Designer.cs