Hartmut
af320bcdc8
Introduces GMSH as an alternative to OCC BRepMesh for STEP→GLB tessellation. GMSH produces conforming meshes that eliminate fan triangles at cylinder seam edges — a structural limitation of OCC BRepMesh that cannot be fixed via deflection parameters. Changes: - render-worker/Dockerfile: install gmsh>=4.15.0 + libglu1-mesa + libxft2 - export_step_to_gltf.py: --tessellation_engine occ|gmsh CLI arg + _tessellate_with_gmsh() using BRep→GMSH→Poly_Triangulation write-back - admin.py: tessellation_engine setting (SETTINGS_DEFAULTS, SettingsOut, SettingsUpdate, validation) - export_glb.py: pass tessellation_engine to export_step_to_gltf.py CLI in both geometry and production GLB tasks - Admin.tsx: radio button UI for OCC vs GMSH selection Tested: 121 faces meshed, 0 BRepMesh fallback, 649K triangles on sample part. Clean seam edges for UV unwrap — GMSH respects B-rep periodic face boundaries. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
85 lines
2.8 KiB
Docker
85 lines
2.8 KiB
Docker
FROM ubuntu:22.04
|
|
|
|
ARG BLENDER_VERSION=5.0.1
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
ENV PYTHONUNBUFFERED=1
|
|
ENV BLENDER_VERSION=${BLENDER_VERSION}
|
|
# Blender 5.x is mounted from the host at /opt/blender (see docker-compose.yml)
|
|
ENV BLENDER_BIN=/opt/blender/blender
|
|
# OSMesa for headless cadquery/VTK (no display needed)
|
|
ENV PYOPENGL_PLATFORM=osmesa
|
|
ENV VTK_DEFAULT_EGL=0
|
|
|
|
# Runtime libraries for cadquery/OCC + Blender 5.x headless
|
|
# Also installs Python 3.11 via deadsnakes PPA (Ubuntu 22.04 ships 3.10)
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
software-properties-common gnupg gpg-agent \
|
|
&& add-apt-repository ppa:deadsnakes/ppa -y \
|
|
&& apt-get update && apt-get install -y --no-install-recommends \
|
|
python3.11 \
|
|
python3.11-dev \
|
|
python3.11-distutils \
|
|
python3-pip \
|
|
python3-dev \
|
|
curl \
|
|
libpq-dev \
|
|
gcc \
|
|
libxrender1 \
|
|
libxi6 \
|
|
libxkbcommon-x11-0 \
|
|
libsm6 \
|
|
libglib2.0-0 \
|
|
libgl1-mesa-glx \
|
|
libosmesa6 \
|
|
libgomp1 \
|
|
libxfixes3 \
|
|
libxrandr2 \
|
|
libxcursor1 \
|
|
libxinerama1 \
|
|
libwayland-client0 \
|
|
libwayland-cursor0 \
|
|
libwayland-egl1 \
|
|
libvulkan1 \
|
|
mesa-vulkan-drivers \
|
|
libegl1 \
|
|
libegl-mesa0 \
|
|
libgbm1 \
|
|
ffmpeg \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
WORKDIR /app
|
|
|
|
# Use Python 3.11 as the default pip target
|
|
RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python3.11 \
|
|
&& update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.11 1 \
|
|
&& update-alternatives --install /usr/bin/pip3 pip3 /usr/local/bin/pip3.11 1
|
|
|
|
# Install backend Python dependencies (includes celery, sqlalchemy, fastapi, etc.)
|
|
COPY backend/pyproject.toml .
|
|
RUN pip3 install --no-cache-dir -e .
|
|
|
|
# Install cadquery (heavy — installed after backend deps for better layer caching)
|
|
RUN pip3 install --no-cache-dir "cadquery>=2.4.0"
|
|
|
|
# Install trimesh for STL→GLB geometry export (separate layer to avoid cache invalidation)
|
|
RUN pip3 install --no-cache-dir "trimesh>=4.2.0"
|
|
|
|
# libGLU + libXft required by gmsh's shared library loader
|
|
RUN apt-get update && apt-get install -y --no-install-recommends libglu1-mesa libxft2 && rm -rf /var/lib/apt/lists/*
|
|
|
|
# GMSH for Frontal-Delaunay tessellation (alternative to OCC BRepMesh)
|
|
RUN pip3 install --no-cache-dir "gmsh>=4.15.0"
|
|
|
|
# Copy render scripts
|
|
COPY render-worker/scripts/ /render-scripts/
|
|
|
|
# Version check script — fails fast if Blender < 5.0.1
|
|
COPY render-worker/check_version.py /check_version.py
|
|
|
|
# Copy backend app code (overridden by volume mount in docker-compose)
|
|
COPY backend/ .
|
|
|
|
# Verify Blender version at build time if binary is available
|
|
# (skipped during build since /opt/blender is a host mount)
|
|
CMD ["bash", "-c", "python3 /check_version.py && celery -A app.tasks.celery_app worker --loglevel=info -Q thumbnail_rendering --concurrency=1"]
|