tela.js 1.1.14 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tela.js",
-  "version": "1.1.14",
+  "version": "1.2.1",
   "author": "Pedroth",
   "repository": {
     "type": "git",

package/src/Camera/Camera.js

@@ -113,7 +113,7 @@ export default class Camera {
         return Promise
           .allSettled(rayMapWorkers(this, scene, canvas, lambdaWithRays, vars, dependencies))
           .then(() => {
-            return canvas.paint();
+            return canvas;
           })
       }
     }
@@ -143,7 +143,7 @@ export default class Camera {
         return Promise
           .allSettled(rayTraceWorkers(this, scene, canvas, params))
           .then(() => {
-            return canvas.paint();
+            return canvas;
           })
       }
     }

package/src/IO/IO.js

@@ -80,7 +80,7 @@ export function saveImageStreamToVideo(fileAddress, streamWithImages, { imageGet
     return {
         while: async streamStatePredicate => {
             console.log("Generating video...");
-            let s = streamWithImages;
+            let s = typeof streamWithImages === 'function' ? await streamWithImages() : streamWithImages;
             while (streamStatePredicate(s.head)) {
                 const image = imageGetter(s.head);
                 writeFileSync(`${fileName}_${ite++}.ppm`, createPPMFromImage(image));
@@ -147,7 +147,7 @@ export function saveParallelImageStreamToVideo(fileAddress, parallelStreamOfImag
     })
     return Promise.all(promises)
         .then(() => {
-            execSync(`ffmpeg -framerate ${fps} -i ${fileName}_%d.ppm ${fileName}.${extension}`);
+            execSync(`ffmpeg -framerate ${fps} -i ${fileName}_%d.ppm -y ${fileName}.${extension}`);
             for (let i = 0; i < n; i++) {
                 unlinkSync(`${fileName}_${i}.ppm`);
             }

package/src/Scene/BScene.js

@@ -39,8 +39,8 @@ export default class BScene extends NaiveScene {
     return this.boundingBoxScene.interceptWithRay(ray, level);
   }
 
-  distanceOnRay(ray) {
-    return this.boundingBoxScene.distanceOnRay(ray);
+  distanceOnRay(ray, combineLeafs = Math.min) {
+    return this.boundingBoxScene.distanceOnRay(ray, combineLeafs);
   }
 
   getElementNear(p) {
@@ -158,9 +158,9 @@ class Node {
     return children[index].distanceToPoint(p);
   }
 
-  distanceOnRay(ray) {
+  distanceOnRay(ray, combineLeafs) {
     if (this.left.isLeaf && this.right.isLeaf) {
-      return Math.min(
+      return combineLeafs(
         this.left.distanceToPoint(ray.init),
         this.right.distanceToPoint(ray.init)
       );
@@ -172,9 +172,9 @@ class Node {
     const second = leftT > rightT ? this.left : this.right;
     const firstT = Math.min(leftT, rightT);
     const secondT = Math.max(leftT, rightT);
-    const firstHit = first.distanceOnRay(ray, firstT);
+    const firstHit = first.isLeaf ? first.distanceToPoint(ray.init) : first.distanceOnRay(ray, combineLeafs);
     if (firstHit < secondT) return firstHit;
-    const secondHit = second.distanceOnRay(ray, secondT);
+    const secondHit = second.isLeaf ? second.distanceToPoint(ray.init) : second.distanceOnRay(ray, combineLeafs);
     return secondHit <= firstHit ? secondHit : firstHit;
   }
 

package/src/Tela/Tela.js

@@ -41,7 +41,7 @@ export default class Tela {
             this.image[k + 2] = color.blue;
             this.image[k + 3] = color.alpha;
         }
-        return this.paint();
+        return this;
     }
 
     mapBox(lambda, box) {
@@ -64,7 +64,7 @@ export default class Tela {
                 return Promise
                     .allSettled(workersPromises)
                     .then(() => {
-                        return this.paint();
+                        return this;
                     })
             }
         }
@@ -140,6 +140,24 @@ export default class Tela {
         return drawConvexPolygon(this, [x1, x2, x3], shader);
     }
 
+    drawCircle(center, radius, shader) {
+        const box = new Box(center.sub(Vec2(radius, radius)), center.add(Vec2(radius, radius)));
+        const intersection = this.box.intersection(box);
+        if (intersection.isEmpty) return;
+        const [xMin, yMin] = intersection.min.map(Math.floor).toArray();
+        const [xMax, yMax] = intersection.max.map(Math.floor).toArray();
+        for (let x = xMin; x < xMax; x++) {
+            for (let y = yMin; y < yMax; y++) {
+                const d = center.sub(Vec2(x, y)).length();
+                if (d > radius) continue;
+                const color = shader(x, y);
+                if (!color) continue;
+                this.setPxl(x, y, color);
+            }
+        }
+        return this;
+    }
+
     grid2canvas(i, j) {
         const h = this.height;
         const x = j;
@@ -184,7 +202,7 @@ export default class Tela {
                 this.image[k + 3] = this.image[k + 3] + (color.alpha - this.image[k + 3]) / it;
             }
             if (it < time) it++
-            return this.paint();
+            return this;
         }
 
         ans.setPxl = (x, y, color) => {

package/src/Utils/Utils.js

@@ -96,10 +96,11 @@ export class MyWorker {
     constructor(path) {
         try {
             if (IS_NODE) {
-                const workerPath = "/" + (import.meta.dirname).split('/').slice(1, -1).join('/');
+                let workerPath = "/" + (import.meta.dirname).split('/').slice(1, -1).join('/');
+                if (workerPath === "/") workerPath = "\\" + (import.meta.dirname).split('\\').slice(1, -1).join('\\')
                 this.worker = new __Worker(`${workerPath}/${path}`, { type: "module" });
             } else {
-                let workerPath = `${SOURCE}/src/${path}`;
+                const workerPath = `${SOURCE}/src/${path}`;
                 this.worker = new __Worker(`${workerPath}`, { type: "module" });
             }
         } catch (e) {

package/src/Utils/Video.js

@@ -17,4 +17,21 @@ export function video(file, lambda, { width = 640, height = 480, FPS = 25 }) {
         }
     );
     return saveImageStreamToVideo(file, stream, { fps: FPS });
+}
+
+export function videoAsync(file, lambda, { width = 640, height = 480, FPS = 25 }) {
+    const dt = 1 / FPS;
+    const lazyStream = async () => new Stream(
+        {
+            time: 0,
+            image: await lambda({ time: 0, image: Image.ofSize(width, height) })
+        },
+        async ({ time, image }) => {
+            return {
+                time: time + dt,
+                image: await lambda({ time, image })
+            }
+        }
+    );
+    return saveImageStreamToVideo(file, lazyStream, { fps: FPS });
 }