Changeset 57

Timestamp:

02/17/10 08:21:16 (2 years ago)

Author:

FeepingCreature

Message:

• Let's try this again
  
• HAVE A FRACTAL
  

Files:

• trunk/camera.d (modified) (3 diffs)
• trunk/scene/fractal.d (modified) (1 diff)
• trunk/test21.sc (added)

trunk/camera.d

@@ -37 +37 @@
-    res.lights = lights; res.iters = i_iters; res.max = max; res.cont = continuous; res.maxdepth = i_depth;
-    res.loop = loop; res.loops = loops;
+    res.fov = fov;
-    return res;
-  }
@@ -45 +46 @@
-  Light[] lights;
-  vec pos, lookat, up, left, lp;
+  float fov;
-  int width, height;
-  void setUp(vec v) {
@@ -118 +120 @@
-    
-    ray.cam_origin = pos;
+    ray.angle = fov * PI180 / .max(width, height);
-    if (bit_isnan(ray.angle)) {
-      ray.angle = float.epsilon;

trunk/scene/fractal.d

@@ -154 +154 @@
-        cur += dist;
-        float localε = ε;
+        /*logln("Local ε at ", cur, " => ", ray.at(cur), ": ", ray.radius(cur), " * ", localε,
+          "; ray angle ", ray.angle,
+          ", ray origin ", ray.cam_origin,
+          ", distance ", (ray.cam_origin - ray.at(cur)).length
+        );*/
-        if (adapt)
-          localε *= ray.radius(cur);
-
+
+
-          localε = float.epsilon; // just to be sure
-        // logln("Local ε at ", ray.at(cur), ": ", localε, "; ray angle ", ray.angle, ", ray origin ", ray.cam_origin);
-        
-!> localε) { // NOT < .. workaround for nans
+< localε) {
-          auto norm = getGrad(ray.at(cur), localε).normalized;
-          
-iter
+max_step
-            cur += localε - dist; // definitely move away at least this much
-            continue; // we're pointed AWAY. Not stopping.
-          }
-          // don't produce a hit if we're clearly moving away
-iter
+max_step
-          return;
-        }