- Fixed bug in Quaternion..ctor

- Updated WhittedIntegrator
Kintaro · Mar 17, 2010 · 2cfeb08 · 2cfeb08
1 parent 879491f
commit 2cfeb08
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/Hyperion.Core/Geometry/Quaternion.cs b/Hyperion.Core/Geometry/Quaternion.cs
@@ -22,6 +22,7 @@ public Quaternion (Vector v, double w)
 
         public Quaternion (Transform t)
         {
+            v = new Vector ();
             Matrix m = t.Matrix;
             double trace = m.m[0] + m.m[5] + m.m[10];
             if (trace > 0.0)

diff --git a/Hyperion.Core/RenderOptions.cs b/Hyperion.Core/RenderOptions.cs
@@ -23,7 +23,7 @@ public sealed class RenderOptions
         public ParameterSet SurfaceIntegratorParameters;
         public string VolumeIntegratorName;
         public ParameterSet VolumeIntegratorParameters;
-        public AnimatedTransform WorldToCamera;
+        public AnimatedTransform WorldToCamera = new AnimatedTransform (new Transform (), 0.0, new Transform (), 0.0);
         public List<IPrimitive> Primitives = new List<IPrimitive> ();
         public List<IVolumeRegion> VolumeRegions = new List<IVolumeRegion> ();
         public List<ILight> Lights = new List<ILight> ();
@@ -44,6 +44,7 @@ public RenderOptions ()
             FilterParameters = new ParameterSet ();
             FilmParameters = new ParameterSet ();
             SamplerParameters = new ParameterSet ();
+            CameraParameters = new ParameterSet ();
         }
 
         public Scene CreateScene ()

diff --git a/Integrators/Hyperion.Integrators.Whitted/Whitted.cs b/Integrators/Hyperion.Integrators.Whitted/Whitted.cs
@@ -4,6 +4,7 @@
 using Hyperion.Core.Interfaces;
 using Hyperion.Core.Geometry;
 using Hyperion.Core.Reflection;
+using Hyperion.Core.Tools;
 
 namespace Hyperion.Integrators.Whitted
 {
@@ -50,5 +51,11 @@ public override Spectrum Li (Scene scene, IRenderer renderer, RayDifferential ra
 
             return L;
         }
+
+        public static ISurfaceIntegrator CreateSurfaceIntegrator (ParameterSet parameters)
+        {
+            int maxDepth = parameters.FindOneInt ("maxdepth", 5);
+            return new Whitted (maxDepth);
+        }
     }
 }