Even more VBO refactoring (openscad#5585)

* Renamed CGAL_OGL_VBO_helper to VBOPolyhedron * Renamed VertexArray to VBOBuilder * Flattened inheritance hierarchy; removed unnecessary CGAL_OGL_VBOPolyhedron * Merged CGAL_OGL_Polyhedron into VBOPolyhedron * Remove wireframe-only support
gsohler · Jan 22, 2025 · e6cca91 · e6cca91
1 parent 97a7d86
commit e6cca91
Show file tree

Hide file tree

Showing 42 changed files with 262 additions and 853 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1043,7 +1043,7 @@ else()
     src/glview/fbo.cc
     src/glview/Renderer.cc
     src/glview/system-gl.cc
-    src/glview/VertexArray.cc
+    src/glview/VBOBuilder.cc
     src/glview/VertexState.cc
     src/glview/VBORenderer.cc
     src/glview/GLView.cc

diff --git a/doc/openscad.1 b/doc/openscad.1
@@ -80,7 +80,7 @@ If exporting an image, use an OpenCSG preview (optionally in throwntogether mode
 .B \-\-animate[=N]
 Export N animated frames as PNG images.
 .TP
-.B \-\-view[=axes|crosshairs|edges|scales|wireframe]
+.B \-\-view[=axes|crosshairs|edges|scales]
 View options
 .TP
 .B \-\-csglimit=limit

diff --git a/locale/cs.po b/locale/cs.po
@@ -945,10 +945,6 @@ msgstr "Povrchy"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "Drátové zobrazení"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/de.po b/locale/de.po
@@ -946,10 +946,6 @@ msgstr "&Flächen anzeigen"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "&Gittermodell"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/es.po b/locale/es.po
@@ -955,10 +955,6 @@ msgstr "Superficies"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "Estructura"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/fr.po b/locale/fr.po
@@ -955,10 +955,6 @@ msgstr "Surfaces"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "Fil de fer"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/hy.po b/locale/hy.po
@@ -951,10 +951,6 @@ msgstr "Հարթություններ"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "Սխեմատիկ տեսքը"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/ka.po b/locale/ka.po
@@ -931,10 +931,6 @@ msgstr "ზედაპირები"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "მოდელი"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/openscad.pot b/locale/openscad.pot
@@ -911,10 +911,6 @@ msgstr ""
 msgid "F10"
 msgstr ""
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr ""
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr ""

diff --git a/locale/pl.po b/locale/pl.po
@@ -956,10 +956,6 @@ msgstr "Ściany"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "Szkielet"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/ru.po b/locale/ru.po
@@ -928,10 +928,6 @@ msgstr "Поверхности"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "Каркас"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/tr.po b/locale/tr.po
@@ -938,10 +938,6 @@ msgstr "Yüzeyler"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "Tel kafes"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/uk.po b/locale/uk.po
@@ -952,10 +952,6 @@ msgstr "Поверхні"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "Каркас"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
@@ -940,10 +940,6 @@ msgstr "面"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "线框图"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/locale/zh_TW.po b/locale/zh_TW.po
@@ -950,10 +950,6 @@ msgstr "表面"
 msgid "F10"
 msgstr "F10"
 
-#: build/OpenSCAD_autogen/include/ui_MainWindow.h:1075
-msgid "Wireframe"
-msgstr "線框"
-
 #: build/OpenSCAD_autogen/include/ui_MainWindow.h:1077
 msgid "F11"
 msgstr "F11"

diff --git a/src/core/lexer.l b/src/core/lexer.l
@@ -98,15 +98,7 @@ extern YYLTYPE parserlloc;
         } \
     } 
 
-#ifdef DEBUG
-#define YY_USER_ACTION parserlloc.last_column += yyleng; \
-        PRINTDB("YY_USER_ACTION(): %3d, %3d - %3d, %3d | %3d: %s", \
-                parserlloc.first_line % parserlloc.first_column % \
-                parserlloc.last_line % parserlloc.last_column % \
-                yyleng % quoted_string(yytext));
-#else
 #define YY_USER_ACTION parserlloc.last_column += yyleng;
-#endif
 
 extern void parsererror(char const *s);
 void to_utf8(const char *, char *);