Merge pull request 'Добавление перфораций' (#10) from test into main

Reviewed-on: http://192.168.1.114:3000/rust/BoxGenerator/pulls/10

src/App.tsx

@@ -29,10 +29,16 @@ const App = () => {
   const [step, setStep] = useState(1);
 
   const [config, setConfig] = useState<AppConfig>({
-    drawer: { width: 300, depth: 400, height: 80 },
-    wallThickness: 1.2,
+    drawer: { width: 100, depth: 100, height: 100 },
+    wallThickness: 0.8,
     printerTolerance: 0.5,
     cornerRadius: 4,
+    perforation: {
+      enabled: true,
+      shape: 'honeycomb',
+      size: 8,
+      gap: 2
+    }
   });
 
   const [splits, setSplits] = useState<LayoutSplits>({

src/components/ConfigStep.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
-import { AppConfig } from '../types';
-import { Ruler, Box, Layers, Minimize2, CircleDashed } from 'lucide-react';
+import { AppConfig, PerforationShape } from '../types';
+import { Ruler, Box, Layers, Minimize2, CircleDashed, Grid, Circle, Hexagon, Triangle } from 'lucide-react';
 
 interface Props {
   config: AppConfig;
@@ -39,13 +39,92 @@ const NumberInput = ({
   </div>
 );
 
+const PerforationPreview = ({ config }: { config: AppConfig['perforation'] }) => {
+  if (!config.enabled) return (
+    <div className="w-full h-48 bg-slate-950 rounded-lg border border-slate-800 flex items-center justify-center text-gray-600">
+      <span className="text-sm">Перфорация отключена</span>
+    </div>
+  );
+
+  // Simple canvas-like SVG generation
+  const width = 200;
+  const height = 120;
+  const size = config.size * 2; // Scale up mostly for visibility
+  const gap = config.gap * 2;
+  const step = size + gap;
+
+  const elements = [];
+
+  if (config.shape === 'circle') {
+    for (let y = 0; y < height; y += step) {
+      for (let x = 0; x < width; x += step) {
+        elements.push(<circle key={`${x}-${y}`} cx={x + step / 2} cy={y + step / 2} r={size / 2} fill="#3b82f6" />);
+      }
+    }
+  } else if (config.shape === 'honeycomb') {
+    const hStep = size * 0.866; // height of equilateral triangle
+    for (let y = 0; y < height; y += (size + gap) * 0.85) {
+      const row = Math.floor(y / ((size + gap) * 0.85));
+      const xOffset = row % 2 === 0 ? 0 : (size + gap) / 2;
+      for (let x = xOffset - step; x < width; x += step) {
+        // Hexagon points
+        const r = size / 2;
+        const cx = x + step / 2;
+        const cy = y + step / 2;
+        // Points for flat-topped hexagon
+        const points = [];
+        for (let i = 0; i < 6; i++) {
+          const angle_deg = 60 * i + 30;
+          const angle_rad = Math.PI / 180 * angle_deg;
+          points.push(`${cx + r * Math.cos(angle_rad)},${cy + r * Math.sin(angle_rad)}`);
+        }
+        elements.push(<polygon key={`${x}-${y}`} points={points.join(" ")} fill="#3b82f6" />);
+      }
+    }
+  } else if (config.shape === 'triangle') {
+    for (let y = 0; y < height; y += step * 0.866) { // Staggered rows
+      const row = Math.floor(y / (step * 0.866));
+      const xOffset = row % 2 === 0 ? 0 : step / 2;
+      for (let x = -step + xOffset; x < width; x += step) {
+        const cx = x + step / 2;
+        const cy = y + step / 2;
+        const r = size / 2;
+        // Upright triangle
+        const points = [
+          `${cx},${cy - r}`,
+          `${cx + r * 0.866},${cy + r * 0.5}`,
+          `${cx - r * 0.866},${cy + r * 0.5}`
+        ];
+        elements.push(<polygon key={`${x}-${y}`} points={points.join(" ")} fill="#3b82f6" />);
+      }
+    }
+  }
+
+  return (
+    <div className="w-full h-48 bg-slate-950 rounded-lg border border-slate-800 overflow-hidden relative">
+      <svg width="100%" height="100%" viewBox={`0 0 ${width} ${height}`} preserveAspectRatio="xMidYMid slice">
+        {elements}
+      </svg>
+      <div className="absolute top-2 right-2 text-xs text-gray-500">:: Масштаб условен</div>
+    </div>
+  );
+}
+
+
 export const ConfigStep: React.FC<Props> = ({ config, onChange }) => {
   const updateDrawer = (key: keyof AppConfig['drawer'], val: number) => {
     onChange({ ...config, drawer: { ...config.drawer, [key]: val } });
   };
 
+  const updatePerforation = (key: keyof AppConfig['perforation'], val: any) => {
+    onChange({ ...config, perforation: { ...config.perforation, [key]: val } })
+  }
+
   return (
-    <div className="bg-slate-900 p-6 rounded-xl shadow-lg border border-slate-800 animate-fade-in">
+    <div className="bg-slate-900 p-6 rounded-xl shadow-lg border border-slate-800 animate-fade-in space-y-8">
+
+      {/* SECTION 1: Dimensions & Settings */}
+      <div>
         <h2 className="text-xl font-bold mb-6 flex items-center gap-2 text-primary">
           <Box size={24} /> 1. Размеры
         </h2>
@@ -96,7 +175,7 @@ export const ConfigStep: React.FC<Props> = ({ config, onChange }) => {
               </div>
             </div>
 
-           {/* Corner Radius (NEW) */}
+            {/* Corner Radius */}
             <div className="mb-6">
               <div className="flex justify-between items-center mb-2">
                 <label className="text-sm font-medium text-gray-300 flex items-center gap-1">
@@ -149,5 +228,93 @@ export const ConfigStep: React.FC<Props> = ({ config, onChange }) => {
           </div>
         </div>
       </div>
+
+      {/* SECTION 2: Perforation */}
+      <div className="bg-slate-800/30 p-6 rounded-lg border border-slate-700/50">
+        <div className="flex items-center justify-between mb-6">
+          <h3 className="text-lg font-semibold flex items-center gap-2 text-blue-400">
+            <Grid size={20} /> 2. Перфорация (узоры)
+          </h3>
+
+          <div className="flex items-center gap-3">
+            <span className="text-sm font-medium text-gray-400 uppercase tracking-wider">Включено</span>
+            <button
+              onClick={() => updatePerforation('enabled', !config.perforation.enabled)}
+              className={`w-12 h-6 rounded-full relative transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 ${config.perforation.enabled ? 'bg-blue-600' : 'bg-slate-600'}`}
+            >
+              <span className={`block w-4 h-4 rounded-full bg-white shadow transform transition-transform duration-200 ease-in-out absolute top-1 ${config.perforation.enabled ? 'translate-x-7' : 'translate-x-1'}`} />
+            </button>
+          </div>
+        </div>
+
+        <div className={`grid grid-cols-1 md:grid-cols-2 gap-8 transition-all duration-300 ${config.perforation.enabled ? 'opacity-100 pointer-events-auto' : 'opacity-40 pointer-events-none filter blur-[1px]'}`}>
+          <div>
+            <label className="text-xs font-bold text-gray-500 uppercase mb-3 block">Тип узора</label>
+            <div className="flex gap-4 mb-8">
+              {[
+                { id: 'circle', icon: Circle, label: 'Круг' },
+                { id: 'honeycomb', icon: Hexagon, label: 'Соты' },
+                { id: 'triangle', icon: Triangle, label: 'Треуг.' }
+              ].map((item) => (
+                <button
+                  key={item.id}
+                  onClick={() => updatePerforation('shape', item.id as PerforationShape)}
+                  className={`flex-1 flex flex-col items-center justify-center gap-2 py-4 px-2 rounded-lg border transition-all ${config.perforation.shape === item.id
+                      ? 'bg-slate-700/80 border-blue-500 text-blue-400 shadow-lg shadow-blue-500/10'
+                      : 'bg-slate-800 border-slate-700 text-gray-400 hover:bg-slate-750 hover:border-slate-600'
+                    }`}
+                >
+                  <item.icon size={24} />
+                  <span className="text-sm font-medium">{item.label}</span>
+                </button>
+              ))}
+            </div>
+
+            {/* Resize Controls */}
+            <div className="space-y-6">
+              <div>
+                <div className="flex justify-between items-center mb-2">
+                  <label className="text-sm font-medium text-gray-300">Диаметр отверстий</label>
+                  <span className="text-sm font-bold text-blue-400">{config.perforation.size} мм</span>
+                </div>
+                <div className="flex items-center gap-4">
+                  <span className="text-xs text-gray-500">2 мм</span>
+                  <input
+                    type="range" min="2" max="25" step="1"
+                    value={config.perforation.size}
+                    onChange={(e) => updatePerforation('size', parseFloat(e.target.value))}
+                    className="flex-1 h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500"
+                  />
+                  <span className="text-xs text-gray-500">25 мм</span>
+                </div>
+              </div>
+
+              <div>
+                <div className="flex justify-between items-center mb-2">
+                  <label className="text-sm font-medium text-gray-300">Зазор (между отверстиями)</label>
+                  <span className="text-sm font-bold text-blue-400">{config.perforation.gap} мм</span>
+                </div>
+                <div className="flex items-center gap-4">
+                  <span className="text-xs text-gray-500">1 мм</span>
+                  <input
+                    type="range" min="1" max="10" step="0.5"
+                    value={config.perforation.gap}
+                    onChange={(e) => updatePerforation('gap', parseFloat(e.target.value))}
+                    className="flex-1 h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500"
+                  />
+                  <span className="text-xs text-gray-500">10 мм</span>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          {/* Preview */}
+          <div>
+            <label className="text-xs font-bold text-gray-500 uppercase mb-3 block">Предпросмотр</label>
+            <PerforationPreview config={config.perforation} />
+          </div>
+        </div>
+      </div>
+    </div>
   );
 };

src/components/PreviewStep.tsx

@@ -1,9 +1,9 @@
 import React, { Suspense, useEffect, useRef, useState, useMemo } from 'react';
 import { Canvas } from '@react-three/fiber';
-import { OrbitControls, Center, Environment } from '@react-three/drei';
+import { OrbitControls, Center, Environment, Text } from '@react-three/drei';
 import * as THREE from 'three';
 import JSZip from 'jszip';
-import { AppConfig, GeneratedPart, LayoutSplits } from '../types';
+import { AppConfig, GeneratedPart, LayoutSplits, PerforationConfig } from '../types';
 import { createBinGeometry, generateSTL, exportSTL } from '../services/geometryGenerator';
 import { Download, Package, Info, Loader2, Share2, Check, Ruler } from 'lucide-react';
 import { generateShareUrl } from '../utils/share';
@@ -27,11 +27,12 @@ interface BinMeshProps {
     part: GeneratedPart;
     thickness: number;
     cornerRadius: number;
+    perforation: PerforationConfig;
     isSelected: boolean;
     onClick: () => void;
 }
 
-const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, isSelected, onClick }) => {
+const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, perforation, isSelected, onClick }) => {
     // 1. Создаем геометрию, учитывая ВНУТРЕННИЕ ПЕРЕГОРОДКИ
     const geometry = useMemo(() => {
         return createBinGeometry(
@@ -40,9 +41,10 @@ const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, isSele
             part.height,
             thickness,
             cornerRadius,
-        part.internalPartitions // <--- ВАЖНО: передаем перегородки в генератор
+            part.internalPartitions, // <--- ВАЖНО: передаем перегородки в генератор
+            perforation
         );
-  }, [part, thickness, cornerRadius]);
+    }, [part, thickness, cornerRadius, perforation]);
 
     // 2. Создаем контур выделения (EdgesGeometry)
     // Threshold 20 градусов скрывает линии на плавных скруглениях
@@ -50,18 +52,138 @@ const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, isSele
         return new THREE.EdgesGeometry(geometry, 20);
     }, [geometry]);
 
+    // 3. Вычисляем размеры и позиции для каждой под-ячейки
+    // 3. Вычисляем размеры и позиции для реальных отсеков (с учетом мерджинга)
+    const dimLabels = useMemo(() => {
+        const xOffsets = new Set<number>([0, 1]);
+        const zOffsets = new Set<number>([0, 1]);
+
+        part.internalPartitions.forEach(p => {
+            if (p.axis === 'x') xOffsets.add(p.offset);
+            if (p.axis === 'y') zOffsets.add(p.offset);
+        });
+
+        const xSplits = Array.from(xOffsets).sort((a, b) => a - b);
+        const zSplits = Array.from(zOffsets).sort((a, b) => a - b);
+
+        const numCols = xSplits.length - 1;
+        const numRows = zSplits.length - 1;
+        if (numCols === 0 || numRows === 0) return [];
+
+        // Union-Find для объединения ячеек, не разделенных стеной
+        const parent = new Int32Array(numCols * numRows).map((_, i) => i);
+        const find = (i: number): number => {
+            if (parent[i] === i) return i;
+            parent[i] = find(parent[i]);
+            return parent[i];
+        }
+        const union = (i: number, j: number) => {
+            const rootI = find(i);
+            const rootJ = find(j);
+            if (rootI !== rootJ) parent[rootJ] = rootI;
+        }
+        const getIdx = (c: number, r: number) => r * numCols + c;
+
+        // Вертикальные границы (X)
+        for (let i = 0; i < numCols - 1; i++) {
+            const boundaryX = xSplits[i + 1];
+            for (let j = 0; j < numRows; j++) {
+                const zMid = (zSplits[j] + zSplits[j + 1]) / 2;
+                // Проверяем наличие перегородки axis='x'
+                const isBlocked = part.internalPartitions.some(p =>
+                    p.axis === 'x' &&
+                    Math.abs(p.offset - boundaryX) < 0.001 &&
+                    (p.min ?? 0) <= zMid && (p.max ?? 1) >= zMid
+                );
+                if (!isBlocked) union(getIdx(i, j), getIdx(i + 1, j));
+            }
+        }
+
+        // Горизонтальные границы (Z/Y)
+        for (let j = 0; j < numRows - 1; j++) {
+            const boundaryZ = zSplits[j + 1];
+            for (let i = 0; i < numCols; i++) {
+                const xMid = (xSplits[i] + xSplits[i + 1]) / 2;
+                // Проверяем наличие перегородки axis='y'
+                const isBlocked = part.internalPartitions.some(p =>
+                    p.axis === 'y' &&
+                    Math.abs(p.offset - boundaryZ) < 0.001 &&
+                    (p.min ?? 0) <= xMid && (p.max ?? 1) >= xMid
+                );
+                if (!isBlocked) union(getIdx(i, j), getIdx(i, j + 1));
+            }
+        }
+
+        // Агрегируем регионы
+        const regions: Record<number, { minC: number, maxC: number, minR: number, maxR: number }> = {};
+        for (let j = 0; j < numRows; j++) {
+            for (let i = 0; i < numCols; i++) {
+                const root = find(getIdx(i, j));
+                if (!regions[root]) regions[root] = { minC: i, maxC: i, minR: j, maxR: j };
+                else {
+                    const r = regions[root];
+                    r.minC = Math.min(r.minC, i);
+                    r.maxC = Math.max(r.maxC, i);
+                    r.minR = Math.min(r.minR, j);
+                    r.maxR = Math.max(r.maxR, j);
+                }
+            }
+        }
+
+        return Object.values(regions).map((r, idx) => {
+            const fXStart = xSplits[r.minC];
+            const fXEnd = xSplits[r.maxC + 1];
+            const fZStart = zSplits[r.minR];
+            const fZEnd = zSplits[r.maxR + 1];
+
+            const fracW = fXEnd - fXStart;
+            const fracD = fZEnd - fZStart;
+
+            const dimX = Math.max(0, fracW * (part.width - thickness) - thickness);
+            const dimZ = Math.max(0, fracD * (part.depth - thickness) - thickness);
+
+            const cx = -part.width / 2 + (fXStart + fXEnd) / 2 * part.width;
+            const cz = -part.depth / 2 + (fZStart + fZEnd) / 2 * part.depth;
+
+            return {
+                key: `region-${idx}`,
+                pos: [cx, thickness + 0.2, cz] as [number, number, number],
+                text: `${dimX.toFixed(0)} x ${dimZ.toFixed(0)}`
+            };
+        });
+    }, [part, thickness]);
+
     return (
-    <group position={[part.x + part.width/2, 0, part.y + part.depth/2]}>
+        <group
+            position={[part.x + part.width / 2, 0, part.y + part.depth / 2]}
+            onClick={(e) => { e.stopPropagation(); onClick(); }}
+        >
             {/* Сама модель */}
-       <mesh geometry={geometry} onClick={(e) => { e.stopPropagation(); onClick(); }}>
+            <mesh geometry={geometry}>
                 <meshStandardMaterial
                     color={isSelected ? '#f59e0b' : part.color}
                     roughness={0.5}
                     metalness={0.1}
-            side={THREE.DoubleSide} // Рисуем обе стороны стенок
+                    side={THREE.DoubleSide}
                 />
             </mesh>
 
+            {/* Текстовые метки размеров внутри каждой ячейки */}
+            {dimLabels.map(label => (
+                <Text
+                    key={label.key}
+                    position={label.pos}
+                    rotation={[-Math.PI / 2, 0, 0]}
+                    fontSize={Math.min(part.width, part.depth) * 0.035}
+                    color="#1e293b"
+                    anchorX="center"
+                    anchorY="middle"
+                    characters="0123456789x "
+                >
+                    {label.text}
+                </Text>
+            ))}
+
             {/* Белая подсветка при выборе */}
             {isSelected && (
                 <lineSegments geometry={edgesGeometry}>
@@ -100,7 +222,8 @@ export const PreviewStep: React.FC<Props> = ({ parts, config, splits }) => {
             part.height,
             config.wallThickness,
             config.cornerRadius,
-        part.internalPartitions // <--- ВАЖНО для STL
+            part.internalPartitions, // <--- ВАЖНО для STL
+            config.perforation
         );
         const mesh = new THREE.Mesh(geometry, new THREE.MeshStandardMaterial());
         exportSTL(mesh, `${part.name.replace(/\s+/g, '_')}.stl`);
@@ -119,7 +242,8 @@ export const PreviewStep: React.FC<Props> = ({ parts, config, splits }) => {
                     part.height,
                     config.wallThickness,
                     config.cornerRadius,
-                part.internalPartitions // <--- ВАЖНО для STL
+                    part.internalPartitions, // <--- ВАЖНО для STL
+                    config.perforation
                 );
                 const mesh = new THREE.Mesh(geometry, new THREE.MeshStandardMaterial());
                 const stlData = generateSTL(mesh);
@@ -251,6 +375,7 @@ export const PreviewStep: React.FC<Props> = ({ parts, config, splits }) => {
                                             part={part}
                                             thickness={config.wallThickness}
                                             cornerRadius={config.cornerRadius || 0}
+                                            perforation={config.perforation}
                                             isSelected={selectedId === part.id}
                                             onClick={() => setSelectedId(part.id)}
                                         />

src/services/geometryGenerator.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import { STLExporter, mergeBufferGeometries } from 'three-stdlib';
-import { AppConfig, LayoutSplits, GeneratedPart, Partition } from '../types';
+import { AppConfig, LayoutSplits, GeneratedPart, Partition, PerforationConfig } from '../types';
 
 export const calculateParts = (config: AppConfig, splits: LayoutSplits): GeneratedPart[] => {
     const parts: GeneratedPart[] = [];
@@ -83,17 +83,144 @@ const createConcaveFilletShape = (radius: number): THREE.Shape => {
     return shape;
 };
 
+// New Helper: Create Perforated Plate (Vertical Wall)
+const createPerforatedPlate = (
+    width: number,
+    height: number,
+    thickness: number,
+    perf: PerforationConfig,
+    marginLeft: number = 0,
+    marginRight: number = 0,
+    exclusions: { start: number, end: number, yMax?: number }[] = []
+): THREE.BufferGeometry => {
+    const shape = new THREE.Shape();
+    shape.moveTo(0, 0);
+    shape.lineTo(width, 0);
+    shape.lineTo(width, height);
+    shape.lineTo(0, height);
+    shape.lineTo(0, 0);
+
+    // Hole Generation
+    if (perf && perf.enabled && width > perf.size && height > perf.size) {
+        const { shape: shapeType, size, gap } = perf;
+        const step = size + gap;
+        // Margins: ensure holes don't cut into the solid edge zones
+        const startX = Math.max(gap, marginLeft + gap);
+        const startY = gap;
+        const endX = width - Math.max(gap, marginRight + gap);
+        const endY = height - gap;
+
+        // Rows
+        let row = 0;
+        for (let y = startY + size / 2; y < endY; y += (shapeType === 'triangle' || shapeType === 'honeycomb' ? step * 0.866 : step)) {
+            const isStaggered = (row % 2 !== 0);
+            const xOffset = (isStaggered && (shapeType === 'honeycomb' || shapeType === 'triangle')) ? step / 2 : 0;
+
+            for (let x = startX + size / 2 + xOffset; x < endX; x += step) {
+                const hole = new THREE.Path();
+                const r = size / 2;
+
+                // Boundary check
+                if (x - r < marginLeft || x + r > width - marginRight || y - r < 0 || y + r > height) continue;
+
+                // Exclusion Zone Check
+                // Zone active if hole X is within [start, end] AND hole Y is below yMax (if specified).
+                // If y > yMax, the exclusion doesn't apply (it's above the intersecting wall).
+                // Note: y is measured from bottom (0) to top (height).
+                // yMax is the height of the intersecting partition.
+
+                const inExclusion = exclusions.some(zone => {
+                    if (x + r <= zone.start || x - r >= zone.end) return false; // X-axis check
+                    if (zone.yMax !== undefined && y - r > zone.yMax) return false; // Y-axis check (hole above wall)
+                    return true;
+                });
+
+                if (inExclusion) continue;
+
+                if (shapeType === 'circle') {
+                    hole.absarc(x, y, r, 0, Math.PI * 2, true);
+                } else if (shapeType === 'honeycomb') {
+                    // Hexagon
+                    for (let i = 0; i < 6; i++) {
+                        const ang = (i * 60 + 30) * Math.PI / 180;
+                        const px = x + r * Math.cos(ang);
+                        const py = y + r * Math.sin(ang);
+                        if (i === 0) hole.moveTo(px, py);
+                        else hole.lineTo(px, py);
+                    }
+                    hole.closePath();
+                } else if (shapeType === 'triangle') {
+                    // Triangle
+                    const ang1 = -90 * Math.PI / 180;
+                    const ang2 = 30 * Math.PI / 180;
+                    const ang3 = 150 * Math.PI / 180;
+                    hole.moveTo(x + r * Math.cos(ang1), y + r * Math.sin(ang1));
+                    hole.lineTo(x + r * Math.cos(ang2), y + r * Math.sin(ang2));
+                    hole.lineTo(x + r * Math.cos(ang3), y + r * Math.sin(ang3));
+                    hole.closePath();
+                }
+                shape.holes.push(hole);
+            }
+            row++;
+        }
+    }
+
+    const geo = new THREE.ExtrudeGeometry(shape, { depth: thickness, bevelEnabled: false });
+    // Extruded along Z. Wall is flat on XY.
+    // We want "thickness" to be Z depth.
+    return geo;
+};
+
+// New Helper: Create Corner Profile (Extruded Vertical)
+const createCornerProfile = (radius: number, thickness: number, height: number): THREE.BufferGeometry => {
+    if (radius <= 0) return new THREE.BufferGeometry();
+    const shape = new THREE.Shape();
+
+    // Create a Ring Segment (Hollow Corner) as a single loop.
+    // Center at (0,0).
+    const innerRadius = Math.max(0.01, radius - thickness); // Ensure slightly > 0 to maintain shape integrity
+
+    // 1. Start at Outer Start
+    shape.moveTo(radius, 0);
+
+    // 2. Outer Arc (CCW) -> To (0, radius)
+    shape.absarc(0, 0, radius, 0, Math.PI / 2, false);
+
+    // 3. Line to Inner End (0, innerRadius)
+    shape.lineTo(0, innerRadius);
+
+    // 4. Inner Arc (CW) -> To (innerRadius, 0)
+    shape.absarc(0, 0, innerRadius, Math.PI / 2, 0, true);
+
+    // 5. Close loop
+    shape.lineTo(radius, 0);
+
+    // Extrude
+    // curveSegments 32 for smoothness
+    const geo = new THREE.ExtrudeGeometry(shape, { depth: height, bevelEnabled: false, curveSegments: 32 });
+    return geo;
+};
+
 export const createBinGeometry = (
-  width: number, depth: number, height: number, thickness: number, radius: number = 0, partitions: Partition[] = []
+    width: number,
+    depth: number,
+    height: number,
+    thickness: number,
+    radius: number = 0,
+    partitions: Partition[] = [],
+    perforation?: PerforationConfig
 ): THREE.BufferGeometry => {
     const geometries: THREE.BufferGeometry[] = [];
 
-  // ДНО И ВНЕШНИЕ СТЕНКИ
+    // ДНО (Floor) - Always same
     const floorShape = createRoundedRectShape(width, depth, radius);
     const floorGeo = new THREE.ExtrudeGeometry(floorShape, { depth: thickness, bevelEnabled: false });
-  floorGeo.rotateX(-Math.PI / 2);
+    floorGeo.rotateX(-Math.PI / 2); // Lay flat
     geometries.push(floorGeo);
 
+    // WALLS
+    if (!perforation || !perforation.enabled) {
+        // --- ORIGINAL LOGIC (Optimized for Solid Walls) ---
         const outerShape = createRoundedRectShape(width, depth, radius);
         const innerRadius = Math.max(0.1, radius - thickness);
         const innerWidth = width - (2 * thickness);
@@ -109,10 +236,186 @@ export const createBinGeometry = (
         wallGeo.rotateX(-Math.PI / 2);
         wallGeo.translate(0, thickness, 0);
         geometries.push(wallGeo);
+    } else {
+        // --- PERFORATED LOGIC (Split Walls) ---
+        const wallHeight = height - thickness;
+        // Clamp radius to at least thickness for valid corners in this mode
+        const effRadius = Math.max(radius, thickness);
+
+        const straightW = width - 2 * effRadius;
+        const straightD = depth - 2 * effRadius;
+
+        // 1. Corners (4 pcs)
+        if (effRadius > 0) {
+            const cornerGeoBase = createCornerProfile(effRadius, thickness, wallHeight);
+
+            // 1. Stand Up: Extrusion Z -> Y. Shape moves to X(+)/Z(+).
+            cornerGeoBase.rotateX(-Math.PI / 2);
+
+            // Base Corner Shape (after rotateX) is Q4 (+X, -Z).
+            // Rotation Logic: -90 degrees per Quadrant (Standard Three.js Y-Rot).
+            // Q4 (0) -> Q1 (-90) -> Q2 (-180/180) -> Q3 (-270/+90).
+
+            const positions = [
+                // Back Right (+X, +Z). Q1.
+                // Rot -90 (-PI/2).
+                { x: width / 2 - effRadius, z: depth / 2 - effRadius, rot: -Math.PI / 2 },
+
+                // Back Left (-X, +Z). Q2.
+                // Rot 180 (PI).
+                { x: -(width / 2 - effRadius), z: depth / 2 - effRadius, rot: Math.PI },
+
+                // Front Left (-X, -Z). Q3.
+                // Rot 90 (PI/2). (Equivalent to -270).
+                { x: -(width / 2 - effRadius), z: -(depth / 2 - effRadius), rot: Math.PI / 2 },
+
+                // Front Right (+X, -Z). Q4.
+                // Rot 0.
+                { x: width / 2 - effRadius, z: -(depth / 2 - effRadius), rot: 0 }
+            ];
+
+            positions.forEach(pos => {
+                const corner = cornerGeoBase.clone();
+                corner.rotateY(pos.rot);
+                corner.translate(pos.x, 0, pos.z); // Start at Y=0
+                corner.translate(0, thickness, 0); // Move on top of floor
+                geometries.push(corner);
+            });
+        }
+
+        // 2. Straight Walls (4 pcs) - Centered on edges
+
+        // REWRITE EXCLUSION COLLECTION LOGIC TO BE WALL-SPECIFIC
+        const exclusionsBack: { start: number, end: number, yMax: number }[] = [];
+        const exclusionsFront: { start: number, end: number, yMax: number }[] = [];
+        const exclusionsLeft: { start: number, end: number, yMax: number }[] = [];
+        const exclusionsRight: { start: number, end: number, yMax: number }[] = [];
+
+        // Inner Dimensions
+        const effectiveInnerW = width - 2 * thickness;
+        const effectiveInnerD = depth - 2 * thickness;
+
+        partitions.forEach(p => {
+            const hEff = Math.max(0.1, p.height - thickness); // Exclude only up to partition height
+            // Ensure solid strip around partition by adding padding to exclusion zone
+            const padding = (perforation?.gap ?? 2) + 1;
+
+            if (p.axis === 'x') {
+                // Runs Depth-wise (Y axis in Layout).
+                // Intersects Front and Back walls.
+
+                const partGlobalX = (-effectiveInnerW / 2) + (effectiveInnerW * p.offset);
+                const sW = width - 2 * effRadius;
+                const localXOnWall = partGlobalX + sW / 2;
+
+                // Check intersection with active straight wall area + padding
+                if (localXOnWall + thickness / 2 + padding > 0 && localXOnWall - thickness / 2 - padding < sW) {
+                    const zone = {
+                        start: localXOnWall - thickness / 2 - padding,
+                        end: localXOnWall + thickness / 2 + padding,
+                        yMax: hEff
+                    };
+
+                    if ((p.max ?? 1) > 0.99) exclusionsFront.push(zone); // Near
+                    if ((p.min ?? 0) < 0.01) exclusionsBack.push(zone);  // Far
+                }
+
+            } else { // p.axis === 'y'
+                // Runs Width-wise (X axis in Layout).
+                // Intersects Left and Right walls.
+
+                const partGlobalZ = (-effectiveInnerD / 2) + (effectiveInnerD * p.offset);
+                const sD = depth - 2 * effRadius;
+                const localXOnWall = partGlobalZ + sD / 2;
+
+                if (localXOnWall + thickness / 2 + padding > 0 && localXOnWall - thickness / 2 - padding < sD) {
+                    const zone = {
+                        start: localXOnWall - thickness / 2 - padding,
+                        end: localXOnWall + thickness / 2 + padding,
+                        yMax: hEff
+                    };
+
+                    if ((p.min ?? 0) < 0.01) {
+                        exclusionsLeft.push(zone);
+                    }
+                    if ((p.max ?? 1) > 0.99) {
+                        exclusionsRight.push(zone);
+                    }
+                }
+            }
+        });
+
+        // Front/Back
+        if (straightW > 0.1) {
+            // Wall 1 (at +Z). This is "Front" (Near). Contacts p.max.
+            // Uses exclusionsFront.
+            const wGeoFront = createPerforatedPlate(straightW, wallHeight, thickness, perforation, 0, 0, exclusionsFront);
+            wGeoFront.translate(-straightW / 2, 0, 0);
+            const w1 = wGeoFront.clone();
+            w1.translate(0, thickness, depth / 2 - thickness);
+            geometries.push(w1);
+
+            // Wall 2 (at -Z). This is "Back" (Far). Contacts p.min.
+            // Uses exclusionsBack.
+            // Needs checking mapping (Rot 180).
+            // p.offset increases X. Wall rotated 180 means X is inverted.
+            // So we map exclusionsBack.
+            const exclusionsBackMapped = exclusionsBack.map(e => ({
+                start: straightW - e.end,
+                end: straightW - e.start,
+                yMax: e.yMax
+            }));
+
+            const wGeoBack = createPerforatedPlate(straightW, wallHeight, thickness, perforation, 0, 0, exclusionsBackMapped);
+            wGeoBack.translate(-straightW / 2, 0, 0);
+            const w2 = wGeoBack.clone();
+            w2.rotateY(Math.PI);
+            w2.translate(0, thickness, -(depth / 2 - thickness));
+            geometries.push(w2);
+        }
+
+        // Left/Right
+        if (straightD > 0.1) {
+            // Wall 3 (Right? +X).
+            // Plate is 0..straightD in X, 0..wallHeight in Y. Thickness along Z.
+            // We want it to be at X = width/2.
+            // It needs to be rotated -PI/2 around Y to align its X-axis with World Z-axis.
+            // After rotateY(-PI/2): Plate X (0..straightD) becomes World Z (0..straightD).
+            // Plate Z (thickness) becomes World -X (towards Left).
+            // So if we place it at X=width/2, it extrudes to width/2 - thickness. Correct for Right Wall.
+            const wGeoRight = createPerforatedPlate(straightD, wallHeight, thickness, perforation, 0, 0, exclusionsRight);
+            wGeoRight.translate(-straightD / 2, 0, 0); // Center X of plate
+            const w3 = wGeoRight.clone();
+            w3.rotateY(-Math.PI / 2); // Rotate to align with Z-axis
+            w3.translate(width / 2, thickness, 0); // Position at X=width/2
+            geometries.push(w3);
+
+            // Wall 4 (Left? -X).
+            // This wall is also rotated PI/2.
+            // Plate Z (thickness) becomes World X (towards Right).
+            // We want it at X=-width/2.
+            // It will extrude to -width/2 + thickness. Correct for Left Wall.
+            const exclusionsLeftMapped = exclusionsLeft.map(e => ({
+                start: straightD - e.end,
+                end: straightD - e.start,
+                yMax: e.yMax
+            }));
+
+            const wGeoLeft = createPerforatedPlate(straightD, wallHeight, thickness, perforation, 0, 0, exclusionsLeftMapped);
+            wGeoLeft.translate(-straightD / 2, 0, 0); // Center X of plate
+            const w4 = wGeoLeft.clone();
+            w4.rotateY(Math.PI / 2);
+            w4.translate(-width / 2, thickness, 0); // Position at X=-width/2
+            geometries.push(w4);
+        }
+    }
+
+
+    // ВНУТРЕННИЕ ПЕРЕГОРОДКИ
+    const innerWidth = width - (2 * thickness);
+    const innerDepth = depth - (2 * thickness); // Approximate usable space logic
 
-  // ВНУТРЕННИЕ ПЕРЕГОРОДКИ (СТРОГО ПО ДАННЫМ, БЕЗ SOLVER)
     partitions.forEach(p => {
-      // Берем данные напрямую. Если в 2D нарисовано от 0.2 до 0.8, тут будет 0.2 до 0.8.
         const pMin = p.min ?? 0;
         const pMax = p.max ?? 1;
 
@@ -121,8 +424,129 @@ export const createBinGeometry = (
         const lengthRatio = pMax - pMin;
         const midRatio = pMin + (lengthRatio / 2);
 
-      let pWidth = 0, pDepth = 0, pX = 0, pY = 0; 
+        // FIX: Subtract thickness because partitions sit ON TOP of the floor
+        const effectiveHeight = Math.max(0.1, p.height - thickness);
 
+        // --- PERFORATED LOGIC FOR PARTITIONS ---
+        // If enabled, use Plate. Else use Extrude Solid.
+        const usePerf = perforation && perforation.enabled;
+        let pX = 0, pY = 0; // Declare here for visibility in Fillets
+
+        if (usePerf) {
+            // Calculate exact geometry
+            let pLen = 0;
+
+            if (p.axis === 'x') {
+                // Axis X -> Divider runs along Y (Depth)
+                pLen = lengthRatio * innerDepth;
+                pX = (-innerWidth / 2) + (innerWidth * p.offset);
+                pY = (-innerDepth / 2) + (innerDepth * midRatio); // Center of partition
+
+                // Calculate Exclusions for Internal Partition
+                const partExclusions: { start: number, end: number, yMax?: number }[] = [];
+                // This partition is 'p' (Axis X, runs along Depth).
+                // Intersected by partitions 'n' (Axis Y, runs along Width).
+                // p global Y range: pY - pLen/2 to pY + pLen/2.
+                // n global Y pos: (-innerDepth/2) + (innerDepth * n.offset).
+
+                partitions.forEach(n => {
+                    if (n.axis !== 'y') return; // Only orthogonal partitions intersect
+                    // Check if n intersects p
+                    // Intersection Y location:
+                    const nY = (-innerDepth / 2) + (innerDepth * n.offset);
+
+                    // Does nY (which is global Y of the intersecting partition) match p's position?
+                    // p is Axis X, runs along DEPTH (Global Y).
+                    // p is centered at pX (Width) and covers pLen in Depth (Y).
+                    // Wait. p (Axis X) runs along Y? 
+                    // p.axis='x' -> "Runs along Y (Depth)". Correct.
+                    // So p covers Y range [pY - pLen/2, pY + pLen/2].
+                    // n is Axis Y, runs along X (Width).
+                    // n is centered at nY (Depth).
+                    // So intersection happens if nY is within p's Y range.
+
+                    const pStartGlobal = pY - pLen / 2;
+                    const pEndGlobal = pY + pLen / 2;
+
+                    // And check if n covers p's X location.
+                    // n runs along X from nMin to nMax.
+                    const nXStart = (-innerWidth / 2) + (innerWidth * (n.min ?? 0));
+                    const nXEnd = (-innerWidth / 2) + (innerWidth * (n.max ?? 1));
+                    const pXLoc = pX;
+
+                    if (nY >= pStartGlobal && nY <= pEndGlobal && pXLoc >= nXStart && pXLoc <= nXEnd) {
+                        // Intersection confirmed.
+                        // Calculate local coord on p's plate.
+                        // p runs along Y. Plate local X maps to Global Y.
+                        // local = global - pY + pLen/2.
+                        const nHeight = Math.max(0.1, n.height - thickness);
+                        const localX = nY - pY + pLen / 2;
+                        partExclusions.push({ start: localX - thickness / 2, end: localX + thickness / 2, yMax: nHeight });
+                    }
+                });
+
+                // Add margins (solid ends)
+                const margin = thickness;
+                const plate = createPerforatedPlate(pLen, effectiveHeight, thickness, perforation!, margin, margin, partExclusions);
+                plate.translate(-pLen / 2, 0, 0); // Center X
+
+                // Rotate to align with Depth (along Z)
+                // Plate X -> Z
+                plate.rotateY(-Math.PI / 2);
+
+                // Position
+                // Plate is now vertical Z-aligned. Thickness along X.
+                plate.translate(pX + thickness / 2, thickness, pY);
+                geometries.push(plate);
+
+            } else {
+                // Axis Y -> Divider runs along X (Width)
+                pLen = lengthRatio * innerWidth;
+                pX = (-innerWidth / 2) + (innerWidth * midRatio);
+                pY = (-innerDepth / 2) + (innerDepth * p.offset);
+
+                // Calculate Exclusions
+                const partExclusions: { start: number, end: number, yMax?: number }[] = [];
+                // This partition is 'p' (Axis Y, runs along Width).
+                // Intersected by partitions 'n' (Axis X, runs along Depth).
+
+                partitions.forEach(n => {
+                    if (n.axis !== 'x') return;
+                    const nX = (-innerWidth / 2) + (innerWidth * n.offset);
+
+                    const pStartGlobal = pX - pLen / 2; // X range of p
+                    const pEndGlobal = pX + pLen / 2;
+
+                    const nYStart = (-innerDepth / 2) + (innerDepth * (n.min ?? 0));
+                    const nYEnd = (-innerDepth / 2) + (innerDepth * (n.max ?? 1));
+                    const pYLoc = pY;
+
+                    if (nX >= pStartGlobal && nX <= pEndGlobal && pYLoc >= nYStart && pYLoc <= nYEnd) {
+                        // Intersection confirmed
+                        // local = global - pX + pLen/2
+                        const nHeight = Math.max(0.1, n.height - thickness); // INTERSECTING PARTITION HEIGHT
+                        const localX = nX - pX + pLen / 2;
+                        partExclusions.push({ start: localX - thickness / 2, end: localX + thickness / 2, yMax: nHeight });
+                    }
+                });
+
+                const margin = thickness;
+                const plate = createPerforatedPlate(pLen, effectiveHeight, thickness, perforation!, margin, margin, partExclusions);
+                plate.translate(-pLen / 2, 0, 0); // Center X
+
+                // Already aligned with X. Thickness along Z.
+                // Z range [0, th]. We want [-th/2, th/2] relative to pY.
+                // Translate Z by -th/2.
+                plate.translate(0, 0, -thickness / 2);
+
+                // Move to position
+                plate.translate(pX, thickness, pY);
+                geometries.push(plate);
+            }
+
+        } else {
+            // --- SOLID LOGIC ---
+            let pWidth = 0, pDepth = 0;
             if (p.axis === 'x') {
                 pWidth = thickness;
                 pDepth = lengthRatio * innerDepth;
@@ -136,27 +560,25 @@ export const createBinGeometry = (
             }
 
             const partShape = createRoundedRectShape(pWidth, pDepth, 0.1);
-      const partGeo = new THREE.ExtrudeGeometry(partShape, { depth: p.height, bevelEnabled: false });
+            const partGeo = new THREE.ExtrudeGeometry(partShape, { depth: effectiveHeight, bevelEnabled: false });
             partGeo.rotateX(-Math.PI / 2);
             partGeo.translate(pX, thickness, pY);
             geometries.push(partGeo);
+        }
 
-      // СКРУГЛЕНИЯ (Fillets)
+        // Fillets Logic for partitions (Keep solid for strength/aesthetics)
         if (p.rounded && radius > 1) {
             const filletR = Math.min(radius, 5);
             const filletShape = createConcaveFilletShape(filletR);
 
-          // Функция проверки высоты соседа (простая проверка на пересечение)
+            // Helper to get neighbor height
             const getNeighborHeight = (pos: number) => {
-              if (pos < 0.001 || pos > 0.999) return height; // Край ящика
-              
+                if (pos < 0.001 || pos > 0.999) return height;
                 const neighbor = partitions.find(n => {
-                  if (n.axis === p.axis) return false; // Перпендикуляр
+                    if (n.axis === p.axis) return false;
                     const nMin = n.min ?? 0;
                     const nMax = n.max ?? 1;
-                  // Совпадает ли позиция?
                     if (Math.abs(n.offset - pos) > 0.002) return false;
-                  // Перекрывает ли?
                     return p.offset > nMin && p.offset < nMax;
                 });
                 return neighbor ? neighbor.height : 0;
@@ -166,8 +588,9 @@ export const createBinGeometry = (
             const hEnd = Math.min(p.height, getNeighborHeight(pMax));
 
             const addFillet = (x: number, y: number, rotY: number, h: number) => {
-              if (h <= 1) return; 
-              const geo = new THREE.ExtrudeGeometry(filletShape, { depth: h, bevelEnabled: false });
+                const hEff = Math.max(0.1, h - thickness);
+                if (hEff <= 1) return;
+                const geo = new THREE.ExtrudeGeometry(filletShape, { depth: hEff, bevelEnabled: false });
                 geo.rotateX(-Math.PI / 2);
                 geo.rotateY(rotY);
                 geo.translate(x, thickness, y);
@@ -210,7 +633,7 @@ export const generateSTL = (mesh: THREE.Object3D): Uint8Array | string => {
 
 export const exportSTL = (mesh: THREE.Object3D, filename: string) => {
     const result = generateSTL(mesh);
-    const blob = new Blob([result], { type: 'application/octet-stream' });
+    const blob = new Blob([result as any], { type: 'application/octet-stream' });
     const link = document.createElement('a');
     link.href = URL.createObjectURL(blob);
     link.download = filename;

src/types.ts

@@ -9,6 +9,16 @@ export interface AppConfig {
   wallThickness: number;
   printerTolerance: number;
   cornerRadius: number;
+  perforation: PerforationConfig;
+}
+
+export type PerforationShape = 'circle' | 'honeycomb' | 'triangle' | 'diamond';
+
+export interface PerforationConfig {
+  enabled: boolean;
+  shape: PerforationShape;
+  size: number;
+  gap: number;
 }
 
 export interface Partition {