From 338d8ee26c9a1b515b13938a3e1e19fe4fb34746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 6 Dec 2018 03:15:19 +0100 Subject: [PATCH] new openscad engine is now the default one --- src/c3nav/mapdata/render/engines/__init__.py | 4 ++-- .../mapdata/render/engines/{openscadnew.py => openscad.py} | 4 ++-- src/c3nav/mapdata/render/engines/openscadold.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename src/c3nav/mapdata/render/engines/{openscadnew.py => openscad.py} (99%) diff --git a/src/c3nav/mapdata/render/engines/__init__.py b/src/c3nav/mapdata/render/engines/__init__.py index 8146f66b..13070edf 100644 --- a/src/c3nav/mapdata/render/engines/__init__.py +++ b/src/c3nav/mapdata/render/engines/__init__.py @@ -3,8 +3,8 @@ from django.core import checks from c3nav.mapdata.render.engines.base import register_engine, get_engine, get_engine_filetypes # noqa from c3nav.mapdata.render.engines.blender import BlenderEngine # noqa -from c3nav.mapdata.render.engines.openscadold import OpenSCADEngine # noqa -from c3nav.mapdata.render.engines.openscadnew import OpenSCADNewEngine # noqa +from c3nav.mapdata.render.engines.openscadold import OldOpenSCADEngine # noqa +from c3nav.mapdata.render.engines.openscad import OpenSCADEngine # noqa from c3nav.mapdata.render.engines.wavefront import WavefrontEngine # noqa from c3nav.mapdata.render.engines.stl import STLEngine # noqa from c3nav.mapdata.render.engines.svg import SVGEngine # noqa diff --git a/src/c3nav/mapdata/render/engines/openscadnew.py b/src/c3nav/mapdata/render/engines/openscad.py similarity index 99% rename from src/c3nav/mapdata/render/engines/openscadnew.py rename to src/c3nav/mapdata/render/engines/openscad.py index 470c4c62..6085fcc0 100644 --- a/src/c3nav/mapdata/render/engines/openscadnew.py +++ b/src/c3nav/mapdata/render/engines/openscad.py @@ -55,8 +55,8 @@ class OpenScadCommand(AbstractOpenScadElem): @register_engine -class OpenSCADNewEngine(Base3DEngine): - filetype = 'new.scad' +class OpenSCADEngine(Base3DEngine): + filetype = 'scad' def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) diff --git a/src/c3nav/mapdata/render/engines/openscadold.py b/src/c3nav/mapdata/render/engines/openscadold.py index b212987f..0a6b511a 100644 --- a/src/c3nav/mapdata/render/engines/openscadold.py +++ b/src/c3nav/mapdata/render/engines/openscadold.py @@ -5,7 +5,7 @@ from c3nav.mapdata.render.engines.base3d import Base3DEngine @register_engine -class OpenSCADEngine(Base3DEngine): +class OldOpenSCADEngine(Base3DEngine): filetype = 'old.scad' def _create_polyhedron(self, vertices):