poppygl 0.0.15 → 0.0.16

package/dist/index.d.ts

@@ -156,6 +156,7 @@ declare class SoftwareRenderer {
  */
 declare function drawInfiniteGrid(software_renderer: SoftwareRenderer, params: {
     camera: Camera;
+    grid_y?: number;
     cell_size?: number;
     section_size?: number;
     fade_distance?: number;

package/dist/index.js

@@ -630,6 +630,7 @@ function computeGridFadeAlpha(params) {
   );
 }
 function drawInfiniteGrid(software_renderer, params) {
+  const grid_y = params.grid_y ?? 0;
   const cell_size = params.cell_size ?? 1;
   const section_size = params.section_size ?? 10;
   const fade_distance = params.fade_distance ?? 100;
@@ -667,13 +668,21 @@ function drawInfiniteGrid(software_renderer, params) {
       const ray_dir_y = far_point[1] - near_point[1];
       const ray_dir_z = far_point[2] - near_point[2];
       if (Math.abs(ray_dir_y) < 1e-6) continue;
-      const t = -near_point[1] / ray_dir_y;
+      const t = (grid_y - near_point[1]) / ray_dir_y;
       if (t < 0 || t > 1) continue;
       const world_x = near_point[0] + t * ray_dir_x;
       const world_z = near_point[2] + t * ray_dir_z;
+      const world_pt = vec43.fromValues(world_x, grid_y, world_z, 1);
+      const clip_pt = vec43.create();
+      vec43.transformMat4(clip_pt, world_pt, vp);
+      const ndc_z = clip_pt[2] / clip_pt[3];
+      const depth_01 = ndc_z * 0.5 + 0.5;
+      const di = y * software_renderer.width + x;
+      if (depth_01 >= software_renderer.depth[di]) continue;
       const dx = world_x - cam_pos_x;
+      const dy = grid_y - cam_pos_y;
       const dz = world_z - cam_pos_z;
-      const dist = Math.sqrt(dx * dx + dz * dz);
+      const dist = Math.sqrt(dx * dx + dy * dy + dz * dz);
       const alpha = computeGridFadeAlpha({
         dist,
         fade_distance,
@@ -824,9 +833,15 @@ function renderDrawCalls(drawCalls, optionsInput = {}, imageFactory = createUint
       }
     }
   };
+  renderGroup(opaqueDraws);
+  renderGroup(maskDraws);
   if (infiniteGridOptions) {
+    const aabb = computeWorldAABB(drawCalls);
+    const modelCenterY = (aabb.min[1] + aabb.max[1]) / 2;
+    const gridY = infiniteGridOptions.offset?.y ?? modelCenterY;
     drawInfiniteGrid(renderer, {
       camera,
+      grid_y: gridY,
       cell_size: infiniteGridOptions.cellSize,
       section_size: infiniteGridOptions.sectionSize,
       fade_distance: infiniteGridOptions.fadeDistance,
@@ -836,8 +851,6 @@ function renderDrawCalls(drawCalls, optionsInput = {}, imageFactory = createUint
       gamma_out: options.gamma
     });
   }
-  renderGroup(opaqueDraws);
-  renderGroup(maskDraws);
   renderGroup(blendDraws);
   return { bitmap: renderer.bitmap, camera, options };
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "poppygl",
   "main": "dist/index.js",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/poppygl.git"