F

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

Dockerfile

@@ -0,0 +1,19 @@
+# Build stage
+FROM node:20-alpine as build
+
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm ci
+
+COPY . .
+RUN npm run build
+
+# Production stage
+FROM nginx:alpine
+
+COPY --from=build /app/dist /usr/share/nginx/html
+
+EXPOSE 80
+
+CMD ["nginx", "-g", "daemon off;"]

README.md

@@ -18,3 +18,55 @@ View your app in AI Studio: https://ai.studio/apps/drive/1gUfO_tgl_CPfAGf1eXuSFy
 2. Set the `GEMINI_API_KEY` in [.env.local](.env.local) to your Gemini API key
 3. Run the app:
    `npm run dev`
+
+### 💾 Экспорт и Шеринг
+- **STL Экспорт**: Генерация готовых к печати STL файлов. Можно скачать отдельные детали или весь проект архивом (ZIP).
+- **Сохранение проектов**: Возможность поделиться ссылкой на конфигурацию (все параметры кодируются в URL).
+
+## 🚀 Запуск Локально
+
+Для работы требуется установленный **Node.js**.
+
+1. Клонируйте репозиторий:
+   ```bash
+   git clone https://github.com/your-username/printfit-box-generator.git
+   cd printfit-box-generator
+   ```
+
+2. Установите зависимости:
+   ```bash
+   npm install
+   ```
+
+3. Запустите локальный сервер разработки:
+   ```bash
+   npm run dev
+   ```
+
+4. Откройте приложение в браузере (обычно http://localhost:5173).
+
+## 🐳 Запуск в Docker
+
+Приложение можно легко развернуть в контейнере Docker (используется Nginx для раздачи статики).
+
+1. Соберите образ:
+   ```bash
+   docker build -t printfit-app .
+   ```
+
+2. Запустите контейнер:
+   ```bash
+   docker run -p 8080:80 printfit-app
+   ```
+
+3. Откройте http://localhost:8080
+
+## 🛠 Технологический Стек
+- **React**: UI и управление состоянием.
+- **Three.js (@react-three/fiber)**: 3D рендеринг и геометрия.
+- **Tailwind CSS**: Стилизация интерфейса.
+- **Vite**: Сборщик проекта.
+- **Lucide React**: Иконки.
+
+## 📝 Лицензия
+Этот проект распространяется под лицензией MIT. Вы можете свободно использовать, изменять и распространять его.

package.json

@@ -13,20 +13,20 @@
     "start": "vite preview --port 3000 --host"
   },
   "dependencies": {
-    "@react-three/drei": "^10.7.7",
-    "@react-three/fiber": "^9.4.2",
-    "jszip": "3.10.1",
-    "lucide-react": "^0.562.0",
     "react": "^19.2.3",
     "react-dom": "^19.2.3",
     "three": "^0.182.0",
     "three-stdlib": "^2.36.1",
+    "lucide-react": "^0.562.0",
+    "@react-three/drei": "^10.7.7",
+    "@react-three/fiber": "^9.4.2",
+    "jszip": "3.10.1",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@types/node": "^22.14.0",
     "@types/react": "^19.0.0",
     "@types/react-dom": "^19.0.0",
+    "@types/node": "^22.14.0",
     "@types/uuid": "^9.0.8",
     "@vitejs/plugin-react": "^5.0.0",
     "typescript": "~5.8.2",

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 },
+    drawer: { width: 100, depth: 100, height: 100 },
-    wallThickness: 1.2,
+    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,284 +1,320 @@
-import React, { useEffect } from 'react';
+import React from 'react';
-import { AppConfig, PerforationPattern } from '../types';
+import { AppConfig, PerforationShape } from '../types';
-import { Settings2, Box, Ruler, LayoutGrid, Circle, Hexagon, Triangle, Scan } from 'lucide-react';
+import { Ruler, Box, Layers, Minimize2, CircleDashed, Grid, Circle, Hexagon, Triangle } from 'lucide-react';
 
 interface Props {
   config: AppConfig;
-  onChange: (config: AppConfig) => void;
+  onChange: (newConfig: AppConfig) => void;
 }
 
-export const ConfigStep: React.FC<Props> = ({ config, onChange }) => {
+const InputGroup: React.FC<{ label: string; children: React.ReactNode }> = ({ label, children }) => (
+  <div className="flex flex-col gap-2 mb-4">
+    <label className="text-sm font-medium text-gray-300">{label}</label>
+    <div className="flex gap-4">{children}</div>
+  </div>
+);
 
-  // Инициализация дефолтных значений перфорации
+const NumberInput = ({
-  useEffect(() => {
+  label,
-    if (!config.perforation) {
+  value,
-      onChange({
+  onChange,
-        ...config,
+  max
-        perforation: { enabled: false, pattern: 'hexagon', diameter: 8, spacing: 2 }
+}: {
-      });
+  label: string;
-    }
+  value: number;
-  }, []);
+  onChange: (val: number) => void;
+  max?: number
+}) => (
+  <div className="flex-1 relative">
+    <span className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-500 text-xs">{label}</span>
+    <input
+      type="number"
+      min="1"
+      max={max}
+      value={value}
+      onChange={(e) => onChange(parseFloat(e.target.value) || 0)}
+      className="w-full bg-slate-800 border border-slate-700 rounded p-2 pl-8 text-white focus:ring-2 focus:ring-primary outline-none"
+    />
+    <span className="absolute right-3 top-1/2 -translate-y-1/2 text-gray-500 text-xs">мм</span>
+  </div>
+);
 
-  const perf = config.perforation || { enabled: false, pattern: 'hexagon', diameter: 8, spacing: 2 };
+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>
+  );
 
-  const updatePerf = (updates: Partial<typeof perf>) => {
+  // Simple canvas-like SVG generation
-    onChange({ ...config, perforation: { ...perf, ...updates } });
+  const width = 200;
-  };
+  const height = 120;
-
+  const size = config.size * 2; // Scale up mostly for visibility
-  const updateDrawer = (key: keyof typeof config.drawer, value: number) => {
+  const gap = config.gap * 2;
-    onChange({ ...config, drawer: { ...config.drawer, [key]: value } });
-  };
-
-  // --- RENDER PREVIEW ---
-  const renderPreview = () => {
-    if (!perf.enabled) return <div className="text-gray-500 text-xs flex items-center justify-center h-full">Перфорация выключена</div>;
-
-    const size = perf.diameter;
-    const gap = Math.max(2, perf.spacing);
   const step = size + gap;
-    const W = 200; 
-    const H = 120;
 
   const elements = [];
-    // Приблизительный расчет для превью
-    const rows = Math.floor(H / (step * 0.866));
-    const cols = Math.floor(W / step);
 
-    const startX = (W - (cols * step)) / 2;
+  if (config.shape === 'circle') {
-    const startY = (H - (rows * step * 0.866)) / 2;
+    for (let y = 0; y < height; y += step) {
-
+      for (let x = 0; x < width; x += step) {
-    for(let j=0; j<rows; j++) {
+        elements.push(<circle key={`${x}-${y}`} cx={x + step / 2} cy={y + step / 2} r={size / 2} fill="#3b82f6" />);
-        const isOdd = j % 2 !== 0;
-        const y = startY + j * (perf.pattern === 'circle' ? step : step * 0.866);
-        
-        for(let i=0; i<cols; i++) {
-            let x = startX + i * step;
-            if ((perf.pattern === 'hexagon' || perf.pattern === 'triangle') && isOdd) x += step / 2;
-
-            if (x > W - size || y > H - size) continue;
-
-            const color = "#3b82f6";
-
-            if (perf.pattern === 'circle') {
-                elements.push(<circle key={`${i}-${j}`} cx={x} cy={y} r={size/2} fill={color} />);
-            } else if (perf.pattern === 'hexagon') {
-                const r = size / 2;
-                const points = [];
-                for (let k = 0; k < 6; k++) {
-                    const angle = (k * 60 + 30) * Math.PI / 180;
-                    points.push(`${x + r * Math.cos(angle)},${y + r * Math.sin(angle)}`);
       }
-                elements.push(<polygon key={`${i}-${j}`} points={points.join(' ')} fill={color} />);
-            } else if (perf.pattern === 'triangle') {
-                const r = size / 2;
-                const angleOffset = isOdd ? 180 : 0;
-                const points = [];
-                for (let k = 0; k < 3; k++) {
-                    const angle = (k * 120 - 90 + angleOffset) * Math.PI / 180;
-                    points.push(`${x + r * Math.cos(angle)},${y + r * Math.sin(angle)}`);
     }
-                elements.push(<polygon key={`${i}-${j}`} points={points.join(' ')} fill={color} />);
+  } 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 (
-        <svg viewBox={`0 0 ${W} ${H}`} className="w-full h-full bg-slate-950/50 border border-slate-700/50 rounded">
+    <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="max-w-5xl mx-auto space-y-6 pb-24">
+    <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 className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+      <div>
-          
+        <h2 className="text-xl font-bold mb-6 flex items-center gap-2 text-primary">
-          {/* 1. РАЗМЕРЫ */}
+          <Box size={24} /> 1. Размеры
-          <section className="bg-slate-900 p-6 rounded-xl border border-slate-800 shadow-xl">
-            <h2 className="text-lg font-bold mb-6 flex items-center gap-2 text-blue-400">
-                <Box size={20}/> 1. Размеры
         </h2>
 
-            <div className="space-y-5">
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-8">
-                <div className="bg-slate-950/50 p-4 rounded-lg border border-slate-800/50">
+          {/* Drawer Dimensions */}
-                    <h3 className="text-xs font-bold text-gray-400 uppercase mb-3 flex items-center gap-2"><Ruler size={14}/> Внутренние размеры ящика</h3>
+          <div className="bg-slate-800/50 p-4 rounded-lg border border-slate-700">
-                    <div className="space-y-4">
+            <h3 className="text-lg font-semibold mb-4 flex items-center gap-2 text-gray-200">
-                        <div>
+              <Ruler className="text-accent" size={18} /> Внутренние размеры ящика
-                            <label className="text-xs text-gray-500 mb-1.5 block ml-1">Ширина (X)</label>
+            </h3>
-                            <div className="relative">
+            <InputGroup label="Ширина (X)">
-                                <input type="number" value={config.drawer.width} onChange={(e) => updateDrawer('width', parseFloat(e.target.value))} className="w-full bg-slate-800 border border-slate-700 rounded-lg pl-4 pr-12 py-2.5 text-white focus:ring-2 focus:ring-blue-500/50 outline-none transition-all font-mono"/>
+              <NumberInput label="Ш" value={config.drawer.width} onChange={(v) => updateDrawer('width', v)} />
-                                <span className="absolute right-4 top-1/2 -translate-y-1/2 text-xs text-gray-500 font-bold">MM</span>
+            </InputGroup>
+            <InputGroup label="Глубина (Y)">
+              <NumberInput label="Г" value={config.drawer.depth} onChange={(v) => updateDrawer('depth', v)} />
+            </InputGroup>
+            <InputGroup label="Высота (Z)">
+              <NumberInput label="В" value={config.drawer.height} onChange={(v) => updateDrawer('height', v)} />
+            </InputGroup>
           </div>
-                        </div>
-                        <div>
-                            <label className="text-xs text-gray-500 mb-1.5 block ml-1">Глубина (Y)</label>
-                            <div className="relative">
-                                <input type="number" value={config.drawer.depth} onChange={(e) => updateDrawer('depth', parseFloat(e.target.value))} className="w-full bg-slate-800 border border-slate-700 rounded-lg pl-4 pr-12 py-2.5 text-white focus:ring-2 focus:ring-blue-500/50 outline-none transition-all font-mono"/>
-                                <span className="absolute right-4 top-1/2 -translate-y-1/2 text-xs text-gray-500 font-bold">MM</span>
-                            </div>
-                        </div>
-                        <div>
-                            <label className="text-xs text-gray-500 mb-1.5 block ml-1">Высота (Z)</label>
-                            <div className="relative">
-                                <input type="number" value={config.drawer.height} onChange={(e) => updateDrawer('height', parseFloat(e.target.value))} className="w-full bg-slate-800 border border-slate-700 rounded-lg pl-4 pr-12 py-2.5 text-white focus:ring-2 focus:ring-blue-500/50 outline-none transition-all font-mono"/>
-                                <span className="absolute right-4 top-1/2 -translate-y-1/2 text-xs text-gray-500 font-bold">MM</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-          </section>
 
-          {/* 2. ПАРАМЕТРЫ ПЕЧАТИ */}
+          {/* Settings */}
-          <section className="bg-slate-900 p-6 rounded-xl border border-slate-800 shadow-xl">
+          <div className="bg-slate-800/50 p-4 rounded-lg border border-slate-700 flex flex-col justify-center">
-            <h2 className="text-lg font-bold mb-6 flex items-center gap-2 text-yellow-500">
+            <h3 className="text-lg font-semibold mb-4 flex items-center gap-2 text-gray-200">
-                <Settings2 size={20}/> Параметры печати
+              <Layers className="text-accent" size={18} /> Параметры печати
-            </h2>
+            </h3>
-
-            <div className="bg-slate-950/50 p-4 rounded-lg border border-slate-800/50 space-y-6">
 
             {/* Wall Thickness */}
-                <div>
+            <div className="mb-6">
-                    <div className="flex justify-between text-xs font-medium text-gray-400 mb-2">
+              <div className="flex justify-between items-center mb-2">
-                        <span>Толщина стенок</span>
+                <label className="text-sm font-medium text-gray-300">Толщина стенок</label>
-                        <span className="text-blue-400 bg-blue-400/10 px-2 py-0.5 rounded">{config.wallThickness} мм</span>
+                <span className="text-primary font-bold bg-primary/10 px-2 py-1 rounded text-sm border border-primary/20">
+                  {config.wallThickness.toFixed(1)} мм
+                </span>
               </div>
-                    <input type="range" min="0.8" max="4.0" step="0.4" 
+              <div className="flex items-center gap-4">
+                <span className="text-xs text-gray-500 font-mono">0.4</span>
+                <input
+                  type="range"
+                  min="0.4"
+                  max="3.2"
+                  step="0.1"
                   value={config.wallThickness}
                   onChange={(e) => onChange({ ...config, wallThickness: parseFloat(e.target.value) })}
-                        className="w-full h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500"
+                  className="w-full h-2 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-primary hover:accent-blue-400 transition-all"
                 />
-                    <div className="flex justify-between text-[10px] text-gray-600 mt-1 px-1">
+                <span className="text-xs text-gray-500 font-mono">3.2</span>
-                        <span>0.8</span><span>4.0</span>
               </div>
             </div>
 
             {/* Corner Radius */}
-                <div>
+            <div className="mb-6">
-                    <div className="flex justify-between text-xs font-medium text-gray-400 mb-2">
+              <div className="flex justify-between items-center mb-2">
-                        <span>Радиус скругления</span>
+                <label className="text-sm font-medium text-gray-300 flex items-center gap-1">
-                        <span className="text-purple-400 bg-purple-400/10 px-2 py-0.5 rounded">{config.cornerRadius} мм</span>
+                  <CircleDashed size={14} className="text-gray-400" /> Радиус скругления
+                </label>
+                <span className="text-purple-400 font-bold bg-purple-400/10 px-2 py-1 rounded text-sm border border-purple-400/20">
+                  {config.cornerRadius?.toFixed(0) || 0} мм
+                </span>
               </div>
-                    <input type="range" min="0" max="20" step="1" 
+              <div className="flex items-center gap-4">
-                        value={config.cornerRadius} 
+                <span className="text-xs text-gray-500 font-mono">0</span>
+                <input
+                  type="range"
+                  min="0"
+                  max="20"
+                  step="1"
+                  value={config.cornerRadius || 0}
                   onChange={(e) => onChange({ ...config, cornerRadius: parseFloat(e.target.value) })}
-                        className="w-full h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-purple-500"
+                  className="w-full h-2 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-purple-500 hover:accent-purple-400 transition-all"
                 />
-                    <div className="flex justify-between text-[10px] text-gray-600 mt-1 px-1">
+                <span className="text-xs text-gray-500 font-mono">20</span>
-                        <span>0</span><span>20</span>
               </div>
             </div>
 
-                {/* Tolerance */}
+            {/* Printer Tolerance */}
-                <div>
+            <div className="mb-4">
-                    <div className="flex justify-between text-xs font-medium text-gray-400 mb-2">
+              <div className="flex justify-between items-center mb-2">
-                        <span>Зазор (Tolerance)</span>
+                <label className="text-sm font-medium text-gray-300 flex items-center gap-1">
-                        <span className="text-yellow-400 bg-yellow-400/10 px-2 py-0.5 rounded">{config.printerTolerance} мм</span>
+                  <Minimize2 size={14} className="text-gray-400" /> Зазор (Tolerance)
+                </label>
+                <span className="text-accent font-bold bg-accent/10 px-2 py-1 rounded text-sm border border-accent/20">
+                  {config.printerTolerance.toFixed(1)} мм
+                </span>
               </div>
-                    <input type="range" min="0" max="1.0" step="0.05" 
+              <div className="flex items-center gap-4">
+                <span className="text-xs text-gray-500 font-mono">0.0</span>
+                <input
+                  type="range"
+                  min="0.0"
+                  max="2.0"
+                  step="0.1"
                   value={config.printerTolerance}
                   onChange={(e) => onChange({ ...config, printerTolerance: parseFloat(e.target.value) })}
-                        className="w-full h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-yellow-500"
+                  className="w-full h-2 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-accent hover:accent-amber-400 transition-all"
                 />
-                    <div className="flex justify-between text-[10px] text-gray-600 mt-1 px-1">
+                <span className="text-xs text-gray-500 font-mono">2.0</span>
-                        <span>0.0</span><span>1.0</span>
               </div>
             </div>
 
           </div>
-          </section>
+        </div>
       </div>
 
-      {/* НИЖНИЙ БЛОК: ПЕРФОРАЦИЯ */}
+      {/* SECTION 2: Perforation */}
-      <section className={`bg-slate-900 p-6 rounded-xl border border-slate-800 shadow-xl transition-all ${perf.enabled ? 'border-blue-500/30' : ''}`}>
+      <div className="bg-slate-800/30 p-6 rounded-lg border border-slate-700/50">
-        <div className="flex justify-between items-center mb-6">
+        <div className="flex items-center justify-between mb-6">
-            <h2 className={`text-lg font-bold flex items-center gap-2 ${perf.enabled ? 'text-blue-400' : 'text-gray-500'}`}>
+          <h3 className="text-lg font-semibold flex items-center gap-2 text-blue-400">
-                <LayoutGrid size={20}/> 2. Перфорация (узоры)
+            <Grid size={20} /> 2. Перфорация (узоры)
-            </h2>
+          </h3>
+
           <div className="flex items-center gap-3">
-                <span className="text-xs font-bold text-gray-500 uppercase tracking-wider">{perf.enabled ? 'Включено' : 'Выключено'}</span>
+            <span className="text-sm font-medium text-gray-400 uppercase tracking-wider">Включено</span>
             <button
-                    onClick={() => updatePerf({ enabled: !perf.enabled })}
+              onClick={() => updatePerforation('enabled', !config.perforation.enabled)}
-                    className={`w-14 h-7 rounded-full p-1 transition-all duration-300 ${perf.enabled ? 'bg-blue-600 shadow-lg shadow-blue-900/50' : 'bg-slate-700'}`}
+              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'}`}
             >
-                    <div className={`w-5 h-5 bg-white rounded-full shadow-sm transform transition-transform duration-300 ${perf.enabled ? 'translate-x-7' : 'translate-x-0'}`}/>
+              <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-500 ${perf.enabled ? 'opacity-100 max-h-[500px]' : 'opacity-40 pointer-events-none grayscale max-h-[100px] overflow-hidden'}`}>
+        <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>
-                    <label className="text-xs font-bold text-gray-400 uppercase mb-3 block">Тип узора</label>
+                <div className="flex justify-between items-center mb-2">
-                    <div className="grid grid-cols-3 gap-3">
+                  <label className="text-sm font-medium text-gray-300">Диаметр отверстий</label>
-                        <button onClick={() => updatePerf({ pattern: 'circle' })} className={`py-3 rounded-lg border flex flex-col items-center justify-center gap-2 transition-all ${perf.pattern === 'circle' ? 'bg-blue-500/10 border-blue-500 text-blue-400 shadow-lg shadow-blue-900/20' : 'bg-slate-800 border-slate-700 text-gray-500 hover:bg-slate-700 hover:text-gray-300'}`}>
+                  <span className="text-sm font-bold text-blue-400">{config.perforation.size} мм</span>
-                            <Circle size={20}/> <span className="text-xs font-medium">Круг</span>
-                        </button>
-                        <button onClick={() => updatePerf({ pattern: 'hexagon' })} className={`py-3 rounded-lg border flex flex-col items-center justify-center gap-2 transition-all ${perf.pattern === 'hexagon' ? 'bg-blue-500/10 border-blue-500 text-blue-400 shadow-lg shadow-blue-900/20' : 'bg-slate-800 border-slate-700 text-gray-500 hover:bg-slate-700 hover:text-gray-300'}`}>
-                            <Hexagon size={20}/> <span className="text-xs font-medium">Соты</span>
-                        </button>
-                        <button onClick={() => updatePerf({ pattern: 'triangle' })} className={`py-3 rounded-lg border flex flex-col items-center justify-center gap-2 transition-all ${perf.pattern === 'triangle' ? 'bg-blue-500/10 border-blue-500 text-blue-400 shadow-lg shadow-blue-900/20' : 'bg-slate-800 border-slate-700 text-gray-500 hover:bg-slate-700 hover:text-gray-300'}`}>
-                            <Triangle size={20}/> <span className="text-xs font-medium">Треуг.</span>
-                        </button>
                 </div>
-                </div>
+                <div className="flex items-center gap-4">
-
+                  <span className="text-xs text-gray-500">2 мм</span>
-                {/* Ползунки параметров */}
+                  <input
-                <div className="bg-slate-950/50 p-4 rounded-lg border border-slate-800/50 space-y-6">
+                    type="range" min="2" max="25" step="1"
-                    {/* Diameter */}
+                    value={config.perforation.size}
-                    <div>
+                    onChange={(e) => updatePerforation('size', parseFloat(e.target.value))}
-                        <div className="flex justify-between text-xs font-medium text-gray-400 mb-2">
+                    className="flex-1 h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500"
-                            <span>Диаметр отверстий</span>
-                            <span className="text-blue-400 bg-blue-400/10 px-2 py-0.5 rounded font-mono">{perf.diameter} мм</span>
-                        </div>
-                        <input type="range" min="2" max="12" step="0.5" 
-                            value={perf.diameter} 
-                            onChange={(e) => updatePerf({ diameter: parseFloat(e.target.value) })}
-                            className="w-full h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500"
                   />
-                        <div className="flex justify-between text-[10px] text-gray-600 mt-1 px-1">
+                  <span className="text-xs text-gray-500">25 мм</span>
-                            <span>2 мм</span><span>12 мм</span>
                 </div>
               </div>
 
-                    {/* Spacing */}
               <div>
-                        <div className="flex justify-between text-xs font-medium text-gray-400 mb-2">
+                <div className="flex justify-between items-center mb-2">
-                            <span>Зазор (между отверстиями)</span>
+                  <label className="text-sm font-medium text-gray-300">Зазор (между отверстиями)</label>
-                            <span className="text-blue-400 bg-blue-400/10 px-2 py-0.5 rounded font-mono">{perf.spacing} мм</span>
+                  <span className="text-sm font-bold text-blue-400">{config.perforation.gap} мм</span>
                 </div>
-                        <input type="range" min="2" max="10" step="0.5" 
+                <div className="flex items-center gap-4">
-                            value={perf.spacing} 
+                  <span className="text-xs text-gray-500">1 мм</span>
-                            onChange={(e) => updatePerf({ spacing: parseFloat(e.target.value) })}
+                  <input
-                            className="w-full h-1.5 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500"
+                    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"
                   />
-                        <div className="flex justify-between text-[10px] text-gray-600 mt-1 px-1">
+                  <span className="text-xs text-gray-500">10 мм</span>
-                            <span>2 мм</span><span>10 мм</span>
                 </div>
               </div>
             </div>
           </div>
 
           {/* Preview */}
-            <div className="flex flex-col">
+          <div>
-                <div className="flex justify-between items-end mb-2">
+            <label className="text-xs font-bold text-gray-500 uppercase mb-3 block">Предпросмотр</label>
-                    <label className="text-xs font-bold text-gray-400 uppercase">Предпросмотр</label>
+            <PerforationPreview config={config.perforation} />
-                    <span className="text-[10px] text-gray-600 flex items-center gap-1"><Scan size={10}/> Масштаб условен</span>
-                </div>
-                <div className="flex-1 min-h-[200px] bg-slate-950 rounded-lg border border-slate-800 relative overflow-hidden flex items-center justify-center p-4">
-                    <div className="w-full h-full max-w-[300px] max-h-[180px] shadow-2xl">
-                        {renderPreview()}
           </div>
         </div>
       </div>
     </div>
-      </section>
-
-    </div>
   );
 };

src/components/PreviewStep.tsx

@@ -1,18 +1,17 @@
-import React, { useMemo, Suspense, useEffect, useRef, useState } from 'react';
+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 } from '../types';
+import { AppConfig, GeneratedPart, LayoutSplits, PerforationConfig } from '../types';
-import { createBinGeometry, exportSTL, generateSTL } from '../services/geometryGenerator';
+import { createBinGeometry, generateSTL, exportSTL } from '../services/geometryGenerator';
-import { Download, Package, Info, Loader2 } from 'lucide-react';
+import { Download, Package, Info, Loader2, Share2, Check, Ruler } from 'lucide-react';
-
+import { generateShareUrl } from '../utils/share';
-// --- 3D Helper Components ---
 
+// --- DrawerFrame (Каркас ящика) ---
 const DrawerFrame = ({ config }: { config: AppConfig }) => {
     const { width, depth, height } = config.drawer;
     const offset = 0.5;
-    
     return (
         <group position={[width / 2, height / 2, depth / 2]}>
             <lineSegments>
@@ -23,43 +22,171 @@ const DrawerFrame = ({ config }: { config: AppConfig }) => {
     )
 }
 
-// --- Bin Component ---
+// --- BinMesh (Ячейка) ---
-
 interface BinMeshProps {
     part: GeneratedPart;
-  config: AppConfig;
+    thickness: number;
+    cornerRadius: number;
+    perforation: PerforationConfig;
     isSelected: boolean;
     onClick: () => void;
 }
 
-const BinMesh: React.FC<BinMeshProps> = ({ part, config, isSelected, onClick }) => {
+const BinMesh: React.FC<BinMeshProps> = ({ part, thickness, cornerRadius, perforation, isSelected, onClick }) => {
-  // Мемоизация геометрии для производительности
+    // 1. Создаем геометрию, учитывая ВНУТРЕННИЕ ПЕРЕГОРОДКИ
     const geometry = useMemo(() => {
         return createBinGeometry(
             part.width,
             part.depth,
             part.height,
-        config.wallThickness,
+            thickness,
-        config.perforation // Передаем конфиг перфорации!
+            cornerRadius,
+            part.internalPartitions, // <--- ВАЖНО: передаем перегородки в генератор
+            perforation
         );
-  }, [part, config.wallThickness, config.perforation]);
+    }, [part, thickness, cornerRadius, perforation]);
+
+    // 2. Создаем контур выделения (EdgesGeometry)
+    // Threshold 20 градусов скрывает линии на плавных скруглениях
+    const edgesGeometry = useMemo(() => {
+        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
-       <mesh 
+            position={[part.x + part.width / 2, 0, part.y + part.depth / 2]}
-         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}
                 />
             </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 position={[0, part.height/2, 0]}>
+                <lineSegments geometry={edgesGeometry}>
-            <edgesGeometry args={[new THREE.BoxGeometry(part.width, part.height, part.depth)]} />
                     <lineBasicMaterial color="white" linewidth={2} />
                 </lineSegments>
             )}
@@ -67,69 +194,150 @@ const BinMesh: React.FC<BinMeshProps> = ({ part, config, isSelected, onClick })
     );
 };
 
+// --- PreviewStep (Основной компонент) ---
 interface Props {
     parts: GeneratedPart[];
     config: AppConfig;
+    splits: LayoutSplits;
 }
 
-export const PreviewStep: React.FC<Props> = ({ parts, config }) => {
+export const PreviewStep: React.FC<Props> = ({ parts, config, splits }) => {
     const [selectedId, setSelectedId] = useState<string | null>(null);
     const [isZipping, setIsZipping] = useState(false);
+    const [shareUrlCopied, setShareUrlCopied] = useState(false);
     const itemRefs = useRef<{ [key: string]: HTMLDivElement | null }>({});
 
+    // Скролл к выбранной детали в списке
     useEffect(() => {
         if (selectedId && itemRefs.current[selectedId]) {
-      itemRefs.current[selectedId]?.scrollIntoView({
+            itemRefs.current[selectedId]?.scrollIntoView({ behavior: 'smooth', block: 'center' });
-        behavior: 'smooth',
-        block: 'center'
-      });
         }
     }, [selectedId]);
 
+    // Скачивание одной детали
     const handleDownload = (part: GeneratedPart) => {
-    const geometry = createBinGeometry(part.width, part.depth, part.height, config.wallThickness, config.perforation);
+        const geometry = createBinGeometry(
+            part.width,
+            part.depth,
+            part.height,
+            config.wallThickness,
+            config.cornerRadius,
+            part.internalPartitions, // <--- ВАЖНО для STL
+            config.perforation
+        );
         const mesh = new THREE.Mesh(geometry, new THREE.MeshStandardMaterial());
         exportSTL(mesh, `${part.name.replace(/\s+/g, '_')}.stl`);
     };
 
+    // Скачивание всего архивом
     const handleDownloadAll = async () => {
         if (isZipping) return;
         setIsZipping(true);
-    
         try {
-        console.log("Starting ZIP generation...");
-        if (typeof JSZip === 'undefined' && !JSZip) {
-            throw new Error("Библиотека JSZip не загружена.");
-        }
-
             const zip = new JSZip();
-        
             parts.forEach(part => {
-            const geometry = createBinGeometry(part.width, part.depth, part.height, config.wallThickness, config.perforation);
+                const geometry = createBinGeometry(
+                    part.width,
+                    part.depth,
+                    part.height,
+                    config.wallThickness,
+                    config.cornerRadius,
+                    part.internalPartitions, // <--- ВАЖНО для STL
+                    config.perforation
+                );
                 const mesh = new THREE.Mesh(geometry, new THREE.MeshStandardMaterial());
                 const stlData = generateSTL(mesh);
                 zip.file(`${part.name.replace(/\s+/g, '_')}.stl`, stlData);
             });
-
             const content = await zip.generateAsync({ type: "blob" });
-        
             const link = document.createElement('a');
             link.href = URL.createObjectURL(content);
             link.download = "PrintFit_Project.zip";
             document.body.appendChild(link);
             link.click();
             document.body.removeChild(link);
-        
         } catch (e: any) {
-        console.error("Failed to create zip archive", e);
+            alert(`Ошибка архивации: ${e.message}`);
-        alert(`Ошибка при создании архива: ${e.message || 'Неизвестная ошибка'}`);
         } finally {
             setIsZipping(false);
         }
     };
 
+    // Поделиться ссылкой
+    const handleShare = async () => {
+        const url = generateShareUrl(config, splits);
+        let success = false;
+        try {
+            if (navigator.clipboard && navigator.clipboard.writeText) {
+                await navigator.clipboard.writeText(url);
+                success = true;
+            } else { throw new Error('Clipboard API unavailable'); }
+        } catch (err) {
+            try {
+                const textArea = document.createElement("textarea");
+                textArea.value = url;
+                textArea.style.position = "fixed";
+                textArea.style.left = "-9999px";
+                textArea.style.top = "0";
+                document.body.appendChild(textArea);
+                textArea.focus();
+                textArea.select();
+                const result = document.execCommand('copy');
+                document.body.removeChild(textArea);
+                if (result) success = true;
+            } catch (e) { console.error("Copy failed", e); }
+        }
+        if (success) {
+            setShareUrlCopied(true);
+            setTimeout(() => setShareUrlCopied(false), 3000);
+        } else {
+            prompt("Скопируйте ссылку вручную:", url);
+        }
+    };
+
     return (
-    <div className="flex flex-col lg:flex-row h-full gap-6">
+        <div className="flex flex-col h-full">
+            {/* Верхняя панель: Размеры + Поделиться */}
+            <div className="flex flex-col xl:flex-row justify-between items-center bg-slate-800/80 p-4 rounded-xl border border-slate-700 mb-4 gap-4 backdrop-blur-sm shadow-lg">
+
+                <div className="flex flex-wrap items-center gap-6 justify-center md:justify-start">
+                    <div className="hidden md:flex items-center gap-2 text-gray-300 mr-2">
+                        <Ruler className="text-primary" size={20} />
+                        <span className="font-medium text-sm uppercase tracking-wide opacity-70">Размеры ящика:</span>
+                    </div>
+                    <div className="flex flex-wrap gap-6 font-mono text-white items-baseline">
+                        <div className="flex items-baseline gap-2">
+                            <span className="text-slate-500 text-sm font-bold uppercase tracking-wider">Ширина:</span>
+                            <span className="text-2xl font-bold text-white drop-shadow-sm">{config.drawer.width}</span>
+                        </div>
+                        <div className="flex items-baseline gap-2">
+                            <span className="text-slate-500 text-sm font-bold uppercase tracking-wider">Глубина:</span>
+                            <span className="text-2xl font-bold text-white drop-shadow-sm">{config.drawer.depth}</span>
+                        </div>
+                        <div className="flex items-baseline gap-2">
+                            <span className="text-slate-500 text-sm font-bold uppercase tracking-wider">Высота:</span>
+                            <span className="text-2xl font-bold text-white drop-shadow-sm">{config.drawer.height}</span>
+                        </div>
+                        <span className="text-sm text-slate-500 font-bold self-baseline">мм</span>
+                    </div>
+                </div>
+
+                <button
+                    onClick={handleShare}
+                    className={`
+                  flex items-center gap-2 px-6 py-3 rounded-lg text-sm font-bold transition-all border shadow-md active:scale-95 shrink-0
+                  ${shareUrlCopied
+                            ? 'bg-green-600 border-green-500 text-white shadow-green-900/20'
+                            : 'bg-blue-600 hover:bg-blue-500 border-blue-500 text-white shadow-blue-900/20'
+                        }
+              `}
+                >
+                    {shareUrlCopied ? <Check size={18} /> : <Share2 size={18} />}
+                    {shareUrlCopied ? 'СКОПИРОВАНО!' : 'Поделиться'}
+                </button>
+            </div>
+
+            <div className="flex flex-col lg:flex-row h-full gap-6 relative flex-1 min-h-0">
                 {/* 3D Viewer */}
                 <div className="flex-1 bg-slate-900 rounded-xl overflow-hidden shadow-2xl border border-slate-800 relative min-h-[400px]">
                     <div className="absolute top-4 right-4 z-10 bg-black/60 p-3 rounded-lg text-xs text-gray-300 backdrop-blur pointer-events-none border border-slate-700">
@@ -140,7 +348,6 @@ export const PreviewStep: React.FC<Props> = ({ parts, config }) => {
                             <li>• ЛКМ: Вращение</li>
                             <li>• ПКМ: Перемещение</li>
                             <li>• Скролл: Масштаб</li>
-               <li className="text-accent mt-2 font-semibold">• Клик по детали для выбора</li>
                         </ul>
                     </div>
 
@@ -156,12 +363,9 @@ export const PreviewStep: React.FC<Props> = ({ parts, config }) => {
                     >
                         <Suspense fallback={null}>
                             <color attach="background" args={['#0f172a']} />
-            
                             <ambientLight intensity={0.7} />
                             <directionalLight position={[100, 200, 50]} intensity={1.2} />
-            <directionalLight position={[-100, 100, -50]} intensity={0.5} />
                             <Environment preset="city" />
-
                             <Center>
                                 <group>
                                     <DrawerFrame config={config} />
@@ -169,20 +373,21 @@ export const PreviewStep: React.FC<Props> = ({ parts, config }) => {
                                         <BinMesh
                                             key={part.id}
                                             part={part}
-                            config={config}
+                                            thickness={config.wallThickness}
+                                            cornerRadius={config.cornerRadius || 0}
+                                            perforation={config.perforation}
                                             isSelected={selectedId === part.id}
                                             onClick={() => setSelectedId(part.id)}
                                         />
                                     ))}
                                 </group>
                             </Center>
-            
                             <OrbitControls makeDefault minDistance={10} maxDistance={10000} />
                         </Suspense>
                     </Canvas>
                 </div>
 
-      {/* Sidebar List */}
+                {/* Sidebar List (Grid Layout) */}
                 <div className="w-full lg:w-96 bg-slate-900 p-6 rounded-xl border border-slate-800 flex flex-col h-full shadow-xl">
                     <div className="flex justify-between items-center mb-6 shrink-0">
                         <h2 className="text-xl font-bold flex items-center gap-2 text-primary">
@@ -191,59 +396,63 @@ export const PreviewStep: React.FC<Props> = ({ parts, config }) => {
                         <button
                             onClick={handleDownloadAll}
                             disabled={isZipping || parts.length === 0}
-                className={`bg-green-600 hover:bg-green-700 text-white px-3 py-1.5 rounded-md text-sm font-medium flex items-center gap-1 transition-all active:scale-95 disabled:opacity-50 disabled:scale-100 disabled:cursor-not-allowed`}
+                            className="bg-slate-700 hover:bg-slate-600 text-white px-3 py-1.5 rounded-md text-sm font-medium flex items-center gap-1 transition-all"
                         >
-                {isZipping ? (
+                            {isZipping ? <Loader2 size={16} className="animate-spin" /> : <Download size={16} />}
-                    <>
+                            Архив
-                        <Loader2 size={16} className="animate-spin" /> ZIP...
-                    </>
-                ) : (
-                    <>
-                        <Download size={16} /> Скачать все
-                    </>
-                )}
                         </button>
                     </div>
 
-        <div className="flex-1 overflow-y-auto pr-2 space-y-3 custom-scrollbar">
+                    <div className="flex-1 overflow-y-auto pr-1 custom-scrollbar">
+                        <div className="grid grid-cols-2 gap-3 pb-4">
                             {parts.map(part => (
                                 <div
                                     key={part.id}
                                     ref={(el) => { itemRefs.current[part.id] = el }}
-                    className={`p-4 rounded-lg border transition-all cursor-pointer group ${selectedId === part.id ? 'bg-slate-800 border-accent shadow-md shadow-accent/10 ring-1 ring-accent' : 'bg-slate-800/50 border-slate-700 hover:border-slate-500 hover:bg-slate-800'}`}
+                                    className={`
+                            p-3 rounded-lg border transition-all cursor-pointer group flex flex-col gap-2 relative overflow-hidden
+                            ${selectedId === part.id
+                                            ? 'bg-slate-800 border-accent shadow-md shadow-accent/10 ring-1 ring-accent'
+                                            : 'bg-slate-800/50 border-slate-700 hover:border-slate-500 hover:bg-slate-800'
+                                        }
+                          `}
                                     onClick={() => setSelectedId(part.id)}
                                 >
-                    <div className="flex justify-between items-start mb-2">
+                                    {/* Индикатор цвета */}
-                        <span className="font-semibold text-gray-200 group-hover:text-white transition-colors">{part.name}</span>
                                     <div
-                            className="w-3 h-3 rounded-full border border-white/10" 
+                                        className="absolute top-0 right-0 w-16 h-16 bg-gradient-to-br from-white/5 to-transparent rounded-bl-3xl pointer-events-none"
+                                        style={{ backgroundColor: part.color, opacity: 0.1 }}
+                                    />
+
+                                    {/* Заголовок */}
+                                    <div className="flex items-center justify-between z-10">
+                                        <span className="font-bold text-gray-200 text-xs truncate" title={part.name}>
+                                            {part.name}
+                                        </span>
+                                        <div
+                                            className="w-2.5 h-2.5 rounded-full border border-white/20 shadow-sm"
                                             style={{ backgroundColor: part.color }}
                                         />
                                     </div>
-                    <div className="grid grid-cols-3 gap-2 text-xs text-gray-400 mb-3">
+
-                        <div className="bg-slate-900/50 p-1.5 rounded">
+                                    {/* Размеры */}
-                            <span className="block text-gray-500 uppercase text-[9px] mb-0.5">Ширина</span>
+                                    <div className="text-[10px] text-gray-400 font-mono z-10">
-                            {part.width.toFixed(1)}
+                                        {part.width.toFixed(0)} × {part.depth.toFixed(0)} × {part.height.toFixed(0)}
-                        </div>
-                        <div className="bg-slate-900/50 p-1.5 rounded">
-                            <span className="block text-gray-500 uppercase text-[9px] mb-0.5">Глубина</span>
-                            {part.depth.toFixed(1)}
-                        </div>
-                        <div className="bg-slate-900/50 p-1.5 rounded">
-                            <span className="block text-gray-500 uppercase text-[9px] mb-0.5">Высота</span>
-                            {part.height.toFixed(1)}
-                        </div>
                                     </div>
+
+                                    {/* Кнопка скачивания */}
                                     <button
                                         onClick={(e) => { e.stopPropagation(); handleDownload(part); }}
-                        className="w-full py-2 bg-slate-700 hover:bg-primary hover:text-white text-gray-300 rounded text-xs flex items-center justify-center gap-2 transition-colors font-medium"
+                                        className="w-full py-1.5 bg-slate-700 hover:bg-primary hover:text-white text-gray-300 rounded text-xs flex items-center justify-center gap-1.5 transition-colors font-medium border border-slate-600 hover:border-primary z-10 mt-1"
                                     >
-                        <Download size={14} /> Скачать STL
+                                        <Download size={12} /> STL
                                     </button>
                                 </div>
                             ))}
                         </div>
                     </div>
                 </div>
+            </div>
+        </div>
     );
 };

src/services/geometryGenerator.ts

@@ -1,40 +1,33 @@
 import * as THREE from 'three';
 import { STLExporter, mergeBufferGeometries } from 'three-stdlib';
-import { AppConfig, LayoutSplits, GeneratedPart, PerforationConfig } from '../types';
+import { AppConfig, LayoutSplits, GeneratedPart, Partition, PerforationConfig } from '../types';
 
-/**
+export const calculateParts = (config: AppConfig, splits: LayoutSplits): GeneratedPart[] => {
- * 1. Расчет списка ящиков на основе сетки
- */
-export const calculateParts = (
-  config: AppConfig,
-  splits: LayoutSplits
-): GeneratedPart[] => {
     const parts: GeneratedPart[] = [];
+    const safeX = Array.isArray(splits?.x) ? splits.x : [];
+    const safeY = Array.isArray(splits?.y) ? splits.y : [];
+    const safeParts = splits?.partitions || {};
 
-  // Сортируем линии реза
+    const xPoints = [0, ...[...safeX].sort((a, b) => a - b), 1];
-  const xPoints = [0, ...[...splits.x].sort((a, b) => a - b), 1];
+    const yPoints = [0, ...[...safeY].sort((a, b) => a - b), 1];
-  const yPoints = [0, ...[...splits.y].sort((a, b) => a - b), 1];
 
     let partCounter = 1;
 
     for (let i = 0; i < xPoints.length - 1; i++) {
         for (let j = 0; j < yPoints.length - 1; j++) {
+            const rawW = (xPoints[i + 1] - xPoints[i]) * config.drawer.width;
+            const rawD = (yPoints[j + 1] - yPoints[j]) * config.drawer.depth;
 
-      const segmentX = xPoints[i] * config.drawer.width;
+            if (rawW < 5 || rawD < 5) continue;
-      const segmentY = yPoints[j] * config.drawer.depth;
-      const segmentW = (xPoints[i + 1] - xPoints[i]) * config.drawer.width;
-      const segmentD = (yPoints[j + 1] - yPoints[j]) * config.drawer.depth;
 
-      // Применяем Tolerance (зазор)
+            const rawX = xPoints[i] * config.drawer.width;
-      const realWidth = segmentW - config.printerTolerance;
+            const rawY = yPoints[j] * config.drawer.depth;
-      const realDepth = segmentD - config.printerTolerance;
+            const internalPartitions = safeParts[`${i}-${j}`] || [];
-      const realX = segmentX + (config.printerTolerance / 2);
-      const realY = segmentY + (config.printerTolerance / 2);
 
-      // Фильтр слишком мелких ячеек
+            const realWidth = rawW - config.printerTolerance;
-      if (realWidth < 1 || realDepth < 1) {
+            const realDepth = rawD - config.printerTolerance;
-          continue; 
+            const realX = rawX + (config.printerTolerance / 2);
-      }
+            const realY = rawY + (config.printerTolerance / 2);
 
             parts.push({
                 id: `part-${partCounter}`,
@@ -44,189 +37,603 @@ export const calculateParts = (
                 height: config.drawer.height,
                 x: realX,
                 y: realY,
-          color: `hsl(${(partCounter * 137.5) % 360}, 70%, 50%)`
+                color: `hsl(${Math.random() * 360}, 70%, 50%)`,
+                internalPartitions: internalPartitions
             });
             partCounter++;
         }
     }
-
     return parts;
 };
 
-/**
+// --- ГЕОМЕТРИЯ ---
- * 2. Создание формы стены с отверстиями (алгоритм из архива)
+
- */
+const createRoundedRectShape = (width: number, height: number, radius: number): THREE.Shape => {
-const createPerforatedWallShape = (
+    const shape = new THREE.Shape();
+    const x = -width / 2;
+    const y = -height / 2;
+    const r = Math.min(radius, width / 2 - 0.1, height / 2 - 0.1);
+
+    if (r <= 0.1) {
+        shape.moveTo(x, y);
+        shape.lineTo(x + width, y);
+        shape.lineTo(x + width, y + height);
+        shape.lineTo(x, y + height);
+        shape.lineTo(x, y);
+    } else {
+        shape.moveTo(x, y + r);
+        shape.lineTo(x, y + height - r);
+        shape.quadraticCurveTo(x, y + height, x + r, y + height);
+        shape.lineTo(x + width - r, y + height);
+        shape.quadraticCurveTo(x + width, y + height, x + width, y + height - r);
+        shape.lineTo(x + width, y + r);
+        shape.quadraticCurveTo(x + width, y, x + width - r, y);
+        shape.lineTo(x + r, y);
+        shape.quadraticCurveTo(x, y, x, y + r);
+    }
+    return shape;
+};
+
+const createConcaveFilletShape = (radius: number): THREE.Shape => {
+    const shape = new THREE.Shape();
+    shape.moveTo(0, 0);
+    shape.lineTo(radius, 0);
+    shape.absarc(radius, radius, radius, -Math.PI / 2, -Math.PI, true);
+    shape.lineTo(0, 0);
+    return shape;
+};
+
+// New Helper: Create Perforated Plate (Vertical Wall)
+const createPerforatedPlate = (
     width: number,
     height: number,
-    perf: PerforationConfig
+    thickness: number,
-): THREE.Shape => {
+    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);
 
-    if (!perf.enabled) return shape;
+    // Hole Generation
-
+    if (perf && perf.enabled && width > perf.size && height > perf.size) {
-    const { size, spacing, shape: type, border } = perf;
+        const { shape: shapeType, size, gap } = perf;
-    
+        const step = size + gap;
-    // Эффективная зона
+        // Margins: ensure holes don't cut into the solid edge zones
-    const startX = border;
+        const startX = Math.max(gap, marginLeft + gap);
-    const endX = width - border;
+        const startY = gap;
-    const startY = border;
+        const endX = width - Math.max(gap, marginRight + gap);
-    const endY = height - border;
+        const endY = height - gap;
-
-    if (startX >= endX || startY >= endY) return shape;
-
-    const cellSize = size + spacing;
-
-    // Хелпер добавления отверстия
-    const addHole = (cx: number, cy: number) => {
-        // Проверка границ
-        if (cx - size/2 < startX || cx + size/2 > endX || cy - size/2 < startY || cy + size/2 > endY) return;
-
-        const holePath = new THREE.Path();
-
-        if (type === 'circle') {
-            holePath.absarc(cx, cy, size / 2, 0, Math.PI * 2, true);
-        } else if (type === 'hexagon') {
-             const r = size / 2;
-             for (let k = 0; k < 6; k++) {
-                 const angle = (k * 60 + 30) * (Math.PI / 180);
-                 const px = cx + r * Math.cos(angle);
-                 const py = cy + r * Math.sin(angle);
-                 if (k === 0) holePath.moveTo(px, py);
-                 else holePath.lineTo(px, py);
-             }
-             holePath.closePath();
-        } else if (type === 'triangle') {
-            const r = size / 2;
-            const angles = [90, 210, 330];
-            angles.forEach((deg, idx) => {
-                const rad = deg * (Math.PI / 180);
-                const px = cx + r * Math.cos(rad);
-                const py = cy + r * Math.sin(rad);
-                if (idx === 0) holePath.moveTo(px, py);
-                else holePath.lineTo(px, py);
-            });
-            holePath.closePath();
-        }
-
-        shape.holes.push(holePath);
-    };
-
-    // Генерация сетки
-    if (type === 'hexagon') {
-        const hexHeight = size; 
-        const hexWidth = size * 0.866; 
-        const colDist = hexWidth + spacing;
-        const rowDist = (hexHeight * 0.75) + spacing;
 
+        // Rows
         let row = 0;
-        for (let y = startY + size/2; y < endY; y += rowDist) {
+        for (let y = startY + size / 2; y < endY; y += (shapeType === 'triangle' || shapeType === 'honeycomb' ? step * 0.866 : step)) {
-            const offset = (row % 2) === 1 ? colDist / 2 : 0;
+            const isStaggered = (row % 2 !== 0);
-            for (let x = startX + size/2 + offset; x < endX; x += colDist) {
+            const xOffset = (isStaggered && (shapeType === 'honeycomb' || shapeType === 'triangle')) ? step / 2 : 0;
-                addHole(x, y);
+
+            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++;
         }
-    } else {
-        // Обычная сетка
-        for (let x = startX + size/2; x < endX; x += cellSize) {
-            for (let y = startY + size/2; y < endY; y += cellSize) {
-                addHole(x, y);
-            }
-        }
     }
 
-    return shape;
+    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;
 };
 
-/**
- * 3. Генерация 3D геометрии одного ящика
- */
 export const createBinGeometry = (
     width: number,
     depth: number,
     height: number,
     thickness: number,
+    radius: number = 0,
+    partitions: Partition[] = [],
     perforation?: PerforationConfig
 ): THREE.BufferGeometry => {
     const geometries: THREE.BufferGeometry[] = [];
-  const perfConfig = perforation || { enabled: false, shape: 'circle', size: 0, spacing: 0, border: 0 };
 
-  // 1. Пол - Всегда сплошной
+    // ДНО (Floor) - Always same
-  // ВАЖНО: .toNonIndexed() нужен для корректного слияния с ExtrudeGeometry
+    const floorShape = createRoundedRectShape(width, depth, radius);
-  const floorGeo = new THREE.BoxGeometry(width, thickness, depth).toNonIndexed();
+    const floorGeo = new THREE.ExtrudeGeometry(floorShape, { depth: thickness, bevelEnabled: false });
-  floorGeo.translate(0, thickness / 2, 0);
+    floorGeo.rotateX(-Math.PI / 2); // Lay flat
     geometries.push(floorGeo);
 
-  const wallHeight = height - thickness;
+    // 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);
+        const innerDepth = depth - (2 * thickness);
 
-  if (wallHeight > 0) {
+        if (innerWidth > 0.1 && innerDepth > 0.1) {
-      const extrudeSettings = {
+            const innerHole = createRoundedRectShape(innerWidth, innerDepth, innerRadius);
-          depth: thickness,
+            outerShape.holes.push(innerHole);
-          bevelEnabled: false,
+        }
+
+        const wallHeight = height - thickness;
+        const wallGeo = new THREE.ExtrudeGeometry(outerShape, { depth: wallHeight, bevelEnabled: false });
+        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
                     };
 
-      // 2. Левая и Правая стенки (Полная глубина)
+                    if ((p.max ?? 1) > 0.99) exclusionsFront.push(zone); // Near
-      // Рисуем профиль шириной = глубине ящика
+                    if ((p.min ?? 0) < 0.01) exclusionsBack.push(zone);  // Far
-      const lrShape = createPerforatedWallShape(depth, wallHeight, perfConfig);
+                }
-      // ВАЖНО: .toNonIndexed()
-      const lrGeo = new THREE.ExtrudeGeometry(lrShape, extrudeSettings).toNonIndexed();
 
-      // Left Wall
+            } else { // p.axis === 'y'
-      const leftWall = lrGeo.clone();
+                // Runs Width-wise (X axis in Layout).
-      leftWall.rotateY(-Math.PI / 2); 
+                // Intersects Left and Right walls.
-      leftWall.translate(-(width/2) + thickness, thickness, -(depth/2)); 
-      geometries.push(leftWall);
 
-      // Right Wall
+                const partGlobalZ = (-effectiveInnerD / 2) + (effectiveInnerD * p.offset);
-      const rightWall = lrGeo.clone();
+                const sD = depth - 2 * effRadius;
-      rightWall.rotateY(-Math.PI / 2);
+                const localXOnWall = partGlobalZ + sD / 2;
-      rightWall.translate((width/2), thickness, -(depth/2));
-      geometries.push(rightWall);
 
-      // 3. Передняя и Задняя стенки (Вставляются между боковыми)
+                if (localXOnWall + thickness / 2 + padding > 0 && localXOnWall - thickness / 2 - padding < sD) {
-      // Ширина уменьшена на 2 толщины
+                    const zone = {
-      const wallFBWidth = Math.max(0, width - (2 * thickness));
+                        start: localXOnWall - thickness / 2 - padding,
-      if (wallFBWidth > 0) {
+                        end: localXOnWall + thickness / 2 + padding,
-          const fbShape = createPerforatedWallShape(wallFBWidth, wallHeight, perfConfig);
+                        yMax: hEff
-          const fbGeo = new THREE.ExtrudeGeometry(fbShape, extrudeSettings).toNonIndexed();
+                    };
 
-          // Front Wall
+                    if ((p.min ?? 0) < 0.01) {
-          const frontWall = fbGeo.clone();
+                        exclusionsLeft.push(zone);
-          frontWall.translate(-(wallFBWidth/2), thickness, (depth/2) - thickness);
+                    }
-          geometries.push(frontWall);
+                    if ((p.max ?? 1) > 0.99) {
+                        exclusionsRight.push(zone);
+                    }
+                }
+            }
+        });
 
-          // Back Wall
+        // Front/Back
-          const backWall = fbGeo.clone();
+        if (straightW > 0.1) {
-          backWall.translate(-(wallFBWidth/2), thickness, -(depth/2));
+            // Wall 1 (at +Z). This is "Front" (Near). Contacts p.max.
-          geometries.push(backWall);
+            // 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
+
+    partitions.forEach(p => {
+        const pMin = p.min ?? 0;
+        const pMax = p.max ?? 1;
+
+        if (pMax - pMin < 0.01) return;
+
+        const lengthRatio = pMax - pMin;
+        const midRatio = pMin + (lengthRatio / 2);
+
+        // 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;
+                pX = (-innerWidth / 2) + (innerWidth * p.offset);
+                pY = (-innerDepth / 2) + (innerDepth * midRatio);
+            } else {
+                pWidth = lengthRatio * innerWidth;
+                pDepth = thickness;
+                pX = (-innerWidth / 2) + (innerWidth * midRatio);
+                pY = (-innerDepth / 2) + (innerDepth * p.offset);
+            }
+
+            const partShape = createRoundedRectShape(pWidth, pDepth, 0.1);
+            const partGeo = new THREE.ExtrudeGeometry(partShape, { depth: effectiveHeight, bevelEnabled: false });
+            partGeo.rotateX(-Math.PI / 2);
+            partGeo.translate(pX, thickness, pY);
+            geometries.push(partGeo);
+        }
+
+        // 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;
+                const neighbor = partitions.find(n => {
+                    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;
+            };
+
+            const hStart = Math.min(p.height, getNeighborHeight(pMin));
+            const hEnd = Math.min(p.height, getNeighborHeight(pMax));
+
+            const addFillet = (x: number, y: number, rotY: number, h: number) => {
+                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);
+                geometries.push(geo);
+            };
+
+            const t = thickness / 2;
+
+            if (p.axis === 'x') {
+                const topY = (-innerDepth / 2) + (innerDepth * pMin);
+                const botY = (-innerDepth / 2) + (innerDepth * pMax);
+
+                addFillet(pX - t, topY, Math.PI, hStart);
+                addFillet(pX + t, topY, -Math.PI / 2, hStart);
+                addFillet(pX - t, botY, Math.PI / 2, hEnd);
+                addFillet(pX + t, botY, 0, hEnd);
+            } else {
+                const leftX = (-innerWidth / 2) + (innerWidth * pMin);
+                const rightX = (-innerWidth / 2) + (innerWidth * pMax);
+
+                addFillet(leftX, pY - t, 0, hStart);
+                addFillet(leftX, pY + t, -Math.PI / 2, hStart);
+                addFillet(rightX, pY - t, Math.PI / 2, hEnd);
+                addFillet(rightX, pY + t, Math.PI, hEnd);
+            }
+        }
+    });
+
     const merged = mergeBufferGeometries(geometries);
-  return merged || new THREE.BoxGeometry(1, 1, 1).toNonIndexed();
+    if (merged) merged.computeVertexNormals();
+    return merged || new THREE.BoxGeometry(1, 1, 1);
 };
 
 export const generateSTL = (mesh: THREE.Object3D): Uint8Array | string => {
     const exporter = new STLExporter();
     const result = exporter.parse(mesh, { binary: true });
-    
+    if (result instanceof DataView) return new Uint8Array(result.buffer, result.byteOffset, result.byteLength);
-    if (result instanceof DataView) {
-        return new Uint8Array(result.buffer, result.byteOffset, result.byteLength);
-    }
     return result as 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

@@ -4,29 +4,29 @@ export interface DrawerDimensions {
   height: number;
 }
 
-export type PerforationPattern = 'circle' | 'hexagon' | 'triangle';
-
-export interface PerforationConfig {
-  enabled: boolean;
-  pattern: PerforationPattern;
-  diameter: number; // Размер отверстия
-  spacing: number;  // Расстояние между центрами (шаг)
-}
-
 export interface AppConfig {
   drawer: DrawerDimensions;
   wallThickness: number;
   printerTolerance: number;
   cornerRadius: number;
-  perforation: PerforationConfig; // Новая секция
+  perforation: PerforationConfig;
+}
+
+export type PerforationShape = 'circle' | 'honeycomb' | 'triangle' | 'diamond';
+
+export interface PerforationConfig {
+  enabled: boolean;
+  shape: PerforationShape;
+  size: number;
+  gap: number;
 }
 
 export interface Partition {
   id: string;
   axis: 'x' | 'y';
-  offset: number;
+  offset: number; // Позиция (0.0 - 1.0)
-  min: number;
+  min: number;    // Начало стенки (0.0 - 1.0)
-  max: number;
+  max: number;    // Конец стенки (0.0 - 1.0)
   height: number;
   rounded: boolean;
 }