Merge branch 'master' of https://github.com/adamstirtan/raytracer

Author: adamstirtan

RayTracer.Core.Tests/CameraOptionsTests.cs

@@ -0,0 +1,31 @@
+using System.Numerics;
+using RayTracer.Core;
+using RayTracer.Core.Scenes;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace RayTracer.Core.Tests
+{
+    [TestClass]
+    public class CameraOptionsTests
+    {
+        [TestMethod]
+        public void Engine_Uses_RenderOptions_CameraTarget_When_Set()
+        {
+            var scene = new SphereScene();
+            var options = new RenderOptions
+            {
+                Width = 100,
+                Height = 80,
+                CameraPosition = new Vector3(0,0,-5),
+                CameraTarget = new Vector3(10,10,10),
+                TraceDepth = 1,
+                DisableReflections = true
+            };
+
+            var engine = new Engine(scene, options);
+            var img = engine.Render();
+            Assert.AreEqual(options.Width, img.Width);
+            Assert.AreEqual(options.Height, img.Height);
+        }
+    }
+}

RayTracer.Core/Engine.cs

@@ -66,7 +66,8 @@ public Image<Rgba32> Render()
 
         // Camera basis using CameraPosition and CameraTarget/Scene Camera Target
         Vector3 camPos = _scene.Camera.Position;
-        Vector3 camTarget = _scene.Camera.Target.HasValue ? _scene.Camera.Target.Value : _options.CameraTarget;
+        // Prefer explicit CameraTarget from options when provided (non-zero), otherwise fall back to scene's camera target
+        Vector3 camTarget = _options.CameraTarget != Vector3.Zero ? _options.CameraTarget : (_scene.Camera.Target.HasValue ? _scene.Camera.Target.Value : Vector3.Zero);
         Vector3 camForward = Vector3.Normalize(camTarget - camPos);
         if (camForward == Vector3.Zero) camForward = Vector3.UnitZ;
         Vector3 worldUp = Vector3.UnitY;

RayTracer.Core/RayTracer.Core.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

RayTracer.Core/Scenes/ReflectiveSphereScene.cs

@@ -0,0 +1,58 @@
+using System.Numerics;
+using RayTracer.Core.Materials;
+using RayTracer.Core.Primitives;
+
+namespace RayTracer.Core.Scenes;
+
+public class ReflectiveSphereScene : Scene
+{
+    public ReflectiveSphereScene()
+    {
+        // Ground plane
+        AddObject(new Primitives.Plane(new Vector3(0, 1, 0), 1000, new Material(new Vector3(0.12f, 0.12f, 0.12f), diffuse: 0.9f, reflection: 0.15f, specular: 0.2f), null));
+
+        // Arrange ~10 spheres in a loose cluster to showcase reflections
+        var center = new Vector3(0f, 0.6f, 8f);
+        var positions = new Vector3[] {
+            new Vector3( -3.0f, 0.45f, 7.5f),
+            new Vector3( -1.6f, 0.6f, 8.8f),
+            new Vector3( -0.2f, 0.5f, 7.3f),
+            new Vector3( 1.2f, 0.55f, 8.1f),
+            new Vector3( 2.6f, 0.4f, 7.8f),
+            new Vector3( 0.0f, 1.2f, 9.2f),
+            new Vector3( -2.4f, 1.0f, 9.6f),
+            new Vector3( 2.0f, 1.1f, 9.9f),
+            new Vector3( -0.8f, 0.9f, 10.6f),
+            new Vector3( 1.6f, 0.75f, 11.0f)
+        };
+
+        float[] radii = new float[] { 0.45f, 0.6f, 0.4f, 0.5f, 0.35f, 0.85f, 0.7f, 0.6f, 0.55f, 0.65f };
+
+        // Create reflective materials with slight variation in tint
+        for (int i = 0; i < positions.Length; i++)
+        {
+            var pos = positions[i];
+            var radius = radii[i % radii.Length];
+            var tint = new Vector3(
+                0.3f + 0.6f * (i % 3 == 0 ? 1f : 0.6f),
+                0.25f + 0.5f * ((i + 1) % 3 == 0 ? 1f : 0.45f),
+                0.2f + 0.7f * ((i + 2) % 3 == 0 ? 1f : 0.5f)
+            );
+
+            var mat = new Material(tint, diffuse: 0.08f, reflection: 0.92f, specular: 1f);
+            AddObject(new Sphere(pos, radius, mat, null));
+        }
+
+        // A few semi-matte spheres to add contrast
+        AddObject(new Sphere(new Vector3(-4.2f, 0.5f, 9.0f), 0.6f, new Material(new Vector3(0.15f,0.18f,0.25f), diffuse: 0.7f, reflection: 0.05f, specular: 0.15f), null));
+        AddObject(new Sphere(new Vector3(4.0f, 0.6f, 8.6f), 0.7f, new Material(new Vector3(0.9f,0.85f,0.7f), diffuse: 0.6f, reflection: 0.1f, specular: 0.2f), null));
+
+        // Lights: soft key and fill lights to produce visible reflections/highlights
+        AddLight(new Light(new Vector3(4f, 8f, -6f), float.MinValue, new Material(new Vector3(1f, 0.98f, 0.95f))));
+        AddLight(new Light(new Vector3(-6f, 6f, -4f), float.MinValue, new Material(new Vector3(0.8f, 0.9f, 1f))));
+        AddLight(new Light(new Vector3(0f, 10f, 6f), float.MinValue, new Material(new Vector3(0.6f, 0.6f, 0.7f))));
+
+        // Camera target
+        Camera.Target = center;
+    }
+}

RayTracer.Windows/App.xaml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Application
+    x:Class="RayTracer.Windows.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:RayTracer.Windows">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Other merged dictionaries here -->
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Other app resources here -->
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

RayTracer.Windows/App.xaml.cs

@@ -0,0 +1,50 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using Microsoft.UI.Xaml.Shapes;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.ApplicationModel;
+using Windows.ApplicationModel.Activation;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace RayTracer.Windows
+{
+    /// <summary>
+    /// Provides application-specific behavior to supplement the default Application class.
+    /// </summary>
+    public partial class App : Application
+    {
+        private Window? _window;
+
+        /// <summary>
+        /// Initializes the singleton application object.  This is the first line of authored code
+        /// executed, and as such is the logical equivalent of main() or WinMain().
+        /// </summary>
+        public App()
+        {
+            InitializeComponent();
+        }
+
+        /// <summary>
+        /// Invoked when the application is launched.
+        /// </summary>
+        /// <param name="args">Details about the launch request and process.</param>
+        protected override void OnLaunched(Microsoft.UI.Xaml.LaunchActivatedEventArgs args)
+        {
+            _window = new MainWindow();
+            _window.Activate();
+        }
+    }
+}