diff --git a/CHANGELOG b/CHANGELOG index 470410d8..932dba1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -9,31 +9,27 @@ http://glvis.org -Version 3.4.1 (development) -=========================== +Version 4.0, released on Dec 11, 2020 +===================================== Starting with this version, the GLVis open source license is changed to BSD-3. -- Keystroke changes: cutting plane in 2D is now toggled with 'i' instead of 'w', - and 2D element subdivision is controlled with 'o/O' instead of 'i/I'. These - are the same as the corresponding keystrokes in 3D. +Unlike previous GLVis releases, this version requires a C++11 compiler. -- Overhauled rendering and window management backend, replacing X Windows with - SDL for platform-native window and event handling. This allows for OpenGL 3+ - and HiDPI support on Mac OS X. +- Major overhaul and modernization of the GLVis rendering and window management, + replacing X Windows with SDL for platform-native window and event handling. + This enables OpenGL 3+ support and HiDPI support on Mac OS X. - Two rendering backends are included: one for legacy OpenGL contexts without support for shaders, and one with full support for modern OpenGL 3 features. The modern OpenGL context is preferred by default; a new command-line argument - "-oldgl" can be used to only request the legacy backend. - -- Transparency and printing in textured coloring modes is now supported, and - no-texture coloring has been removed as a result. - -- Text on screen is now rendered using a texture atlas. + "-oldgl" can be used to request the legacy backend. - Preliminary support for building GLVis to Javascript/WebAssembly using - Emscripten. + Emscripten, see https://github.com/GLVis/glvis-js. + +- Documented project workflow and provided contribution guidelines in the new + top-level file, CONTRIBUTING.md. - Added several perceptually uniform colormaps "turbo", "viridis", "plasma", "fusion", "iceburn", "viola", "pride" and "ocean" from @@ -41,27 +37,37 @@ Starting with this version, the GLVis open source license is changed to BSD-3. * Matplotlib: https://bids.github.io/colormap/ * CMasher: https://github.com/1313e/CMasher -- Added the ability to discretize a palette, i.e. to use just a prescribed - number of its colors, see the new "number of colors" input of the F6 key. +- Added support for visualization of the element ordering curve with 'Ctrl+o'. + +- Keystroke changes: cutting plane in 2D is now toggled with 'i' instead of 'w', + and 2D element subdivision is controlled with 'o/O' instead of 'i/I'. These + are the same as the corresponding keystrokes in 3D. + +- Improved the 3D cutting plane algorithm for curved elements. The key 'I' can + be used to switch to the previous (faster) algorithm which is suitable for + meshes with planar faces. + +- Updated to support the display and slicing of meshes with wedge elements. + +- Improved the opening of parallel meshes/solutions. + +- Transparency and printing in textured coloring modes is now supported, and + no-texture coloring has been removed as a result. + +- FreeType is now a required dependency and text on screen is rendered using a + texture atlas. - Replaced the "deep sea" palette with "ocean". Added new palette: gray. +- Added the ability to discretize a palette, i.e. to use just a prescribed + number of its colors, see the new "number of colors" input of the F6 key. + - Added new script and socket command: "palette_repeat" which can be used to repeat and reverse/flip the palette - controls the same parameter as the first prompt after pressing the F6 key in the GLVis window. -- Improved cutting plane algorithm for curved elements. The key 'I' can be used - to switch to the previous (faster) algorithm which is suitable for meshes with - planar faces. - -- Updated to support the display and slicing of meshes with wedge elements. - - Added a key for setting the bounding box from the terminal (Shift+F7). -- Add support to visualize the element ordering curve with 'Ctrl+o'. - -- Improved the opening of parallel meshes/solutions. - Version 3.4, released on May 29, 2018 ===================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 317b170a..ab130145 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,6 +14,7 @@ cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) # Prohibit in-source builds diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e113523d..e366821b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,9 +84,10 @@ The GLVis source code has the following structure: ``` . - └── lib - └── gl - └── shaders + ├── lib + │ └── gl + │ └── shaders + └── share ``` ## GitHub Workflow @@ -271,19 +272,19 @@ Before a PR can be merged, it should satisfy the following: ### Releases -- Releases are just tags in the `master` branch, e.g. https://github.com/glvis/glvis/releases/tag/v3.3.2, - and have a version that ends in an even "patch" number, e.g. `v3.2.2` or +- Releases are just tags in the `master` branch, e.g. https://github.com/glvis/glvis/releases/tag/v3.4, + and have a version that ends in an even "patch" number, e.g. `v3.4.2` or `v3.4` (by convention `v3.4` is the same as `v3.4.0`.) Between releases, the - version ends in an odd "patch" number, e.g. `v3.3.3`. + version ends in an odd "patch" number, e.g. `v3.4.1`. - We use [milestones](https://github.com/glvis/glvis/milestones) to coordinate the work on different PRs toward a release, see for example the - [v3.3.2 release](https://github.com/glvis/glvis/milestone/1?closed=1). + [v3.4 release](https://github.com/glvis/glvis/milestone/1?closed=1). - After a release is complete, the `next` branch is recreated, e.g. as follows - (replace `3.3.2` with current release): - - Rename the current `next` branch to `next-pre-v3.3.2`. - - Create a new `next` branch starting from the `v3.3.2` release. + (replace `3.4` with current release): + - Rename the current `next` branch to `next-pre-v3.4`. + - Create a new `next` branch starting from the `v3.4` release. - Local copies of `next` can then be updated with `git fetch origin next && git checkout -B next origin/next`. ### Release Checklist diff --git a/README b/README index 53b75be1..7c6bf875 100644 --- a/README +++ b/README @@ -144,8 +144,8 @@ Ctrl+arrow keys - Translate the viewpoint Ctrl+o - Toggle an element ordering curve in 2D and 3D i - Toggle cutting (clipping) plane in 2D -y/Y - Rotate clipping plane (theta) in 2D -z/Z - Translate clipping plane in 2D +y/Y - Rotate cutting plane (theta) in 2D +z/Z - Translate cutting plane in 2D ` - Toggle a ruler, with initial origin at the center of the bounding box. The origin can be later moved with '~'. @@ -230,19 +230,19 @@ U - Toggle the functionality of 'u' (prints a message in the terminal when 3D data commands ================ -i - Toggle clipping (cutting) plane +i - Toggle cutting (clipping) plane The options are: -> none -> cut through the elements - -> show only elements behind the clipping plane -I - Toggle the clipping plane algorithm used when the option "cut through the + -> show only elements behind the cutting plane +I - Toggle the cutting plane algorithm used when the option "cut through the elements" is selected. The two algorithms are: -> slower, more accurate algorithm for curved meshes (default) -> faster algorithm suitable for meshes with planar faces -x/X - Rotate clipping plane (phi) -y/Y - Rotate clipping plane (theta) -z/Z - Translate clipping plane -E - Display/Hide the elements in the clipping plane -M - Display/Hide the mesh in the clipping plane +x/X - Rotate cutting plane (phi) +y/Y - Rotate cutting plane (theta) +z/Z - Translate cutting plane +E - Display/Hide the elements in the cutting plane +M - Display/Hide the mesh in the cutting plane o/O - Refine/de-refine elements diff --git a/glvis.cpp b/glvis.cpp index 68a5bff3..b925eb9d 100644 --- a/glvis.cpp +++ b/glvis.cpp @@ -12,7 +12,6 @@ // GLVis - an OpenGL visualization server based on the MFEM library - #include #include #include diff --git a/lib/aux_vis.cpp b/lib/aux_vis.cpp index 0202f29a..aea6a252 100644 --- a/lib/aux_vis.cpp +++ b/lib/aux_vis.cpp @@ -693,7 +693,7 @@ void RightButtonLoc (EventInfo *event) if (event->keymod & KMOD_SHIFT) { - //glLoadIdentity(); + // glLoadIdentity(); // GLfloat light[] = {newx,-newy, sqrt((float)(newx*newx+newy*newy)), 0.0 }; newx -= startx; newy -= starty; diff --git a/lib/aux_vis.hpp b/lib/aux_vis.hpp index 3e6562e5..b367eb18 100644 --- a/lib/aux_vis.hpp +++ b/lib/aux_vis.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_AUX_VIS -#define GLVIS_AUX_VIS +#ifndef GLVIS_AUX_VIS_HPP +#define GLVIS_AUX_VIS_HPP #include "gl/platform_gl.hpp" #include "gl/types.hpp" diff --git a/lib/font.hpp b/lib/font.hpp index e0b6e797..58218a1e 100644 --- a/lib/font.hpp +++ b/lib/font.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef FONT_HPP -#define FONT_HPP +#ifndef GLVIS_FONT_HPP +#define GLVIS_FONT_HPP #include #include FT_FREETYPE_H @@ -23,7 +23,6 @@ using namespace std; - class GlVisFont { public: @@ -61,9 +60,9 @@ class GlVisFont void getObjectSize(const std::string& text, int& w, int& h); GlVisFont() - : init(false) - , font_init(false) - , face_has_kerning(false) + : init(false), + font_init(false), + face_has_kerning(false) { if (FT_Init_FreeType(&library)) { @@ -110,4 +109,4 @@ class GlVisFont void setAlphaChannel(GLenum alpha) { alpha_channel = alpha; } }; -#endif /* FONT_HPP */ +#endif /* GLVIS_FONT_HPP */ diff --git a/lib/gl/attr_traits.hpp b/lib/gl/attr_traits.hpp index 05783462..59ce5913 100644 --- a/lib/gl/attr_traits.hpp +++ b/lib/gl/attr_traits.hpp @@ -9,6 +9,9 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. +#ifndef GLVIS_ATTR_TRAITS_HPP +#define GLVIS_ATTR_TRAITS_HPP + #include "types.hpp" #include "renderer_core.hpp" #include @@ -148,4 +151,7 @@ AttrTexcoord> const static GLenum FFArrayIdx = GL_TEXTURE_COORD_ARRAY; constexpr static auto FFSetupFunc = glTexCoordPointer; }; + } + +#endif diff --git a/lib/gl/platform_gl.hpp b/lib/gl/platform_gl.hpp index dfa9f919..a3f91017 100644 --- a/lib/gl/platform_gl.hpp +++ b/lib/gl/platform_gl.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_PLATFORM_GL -#define GLVIS_PLATFORM_GL +#ifndef GLVIS_PLATFORM_GL_HPP +#define GLVIS_PLATFORM_GL_HPP #include #ifndef __EMSCRIPTEN__ diff --git a/lib/gl/renderer.cpp b/lib/gl/renderer.cpp index 6342c744..3b1763a7 100644 --- a/lib/gl/renderer.cpp +++ b/lib/gl/renderer.cpp @@ -325,4 +325,3 @@ void GLDevice::captureXfbBuffer(CaptureBuffer& capture, const TextBuffer& t_buf) } } - diff --git a/lib/gl/renderer.hpp b/lib/gl/renderer.hpp index 0ec93617..088b8b36 100644 --- a/lib/gl/renderer.hpp +++ b/lib/gl/renderer.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_RENDERER -#define GLVIS_RENDERER +#ifndef GLVIS_RENDERER_HPP +#define GLVIS_RENDERER_HPP #include #include @@ -296,4 +296,4 @@ class MeshRenderer } -#endif // GLVIS_RENDERER +#endif // GLVIS_RENDERER_HPP diff --git a/lib/gl/renderer_core.hpp b/lib/gl/renderer_core.hpp index 4b795f5f..fb221528 100644 --- a/lib/gl/renderer_core.hpp +++ b/lib/gl/renderer_core.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_RENDERER_CORE -#define GLVIS_RENDERER_CORE +#ifndef GLVIS_RENDERER_CORE_HPP +#define GLVIS_RENDERER_CORE_HPP #include "renderer.hpp" namespace gl3 @@ -118,4 +118,4 @@ class CoreGLDevice : public GLDevice } -#endif // GLVIS_RENDERER_CORE +#endif // GLVIS_RENDERER_CORE_HPP diff --git a/lib/gl/renderer_ff.cpp b/lib/gl/renderer_ff.cpp index e1e2c108..f4089065 100644 --- a/lib/gl/renderer_ff.cpp +++ b/lib/gl/renderer_ff.cpp @@ -262,8 +262,8 @@ void FFGLDevice::drawDeviceBuffer(int hnd) } glCallList(disp_lists[hnd].list); // reset texturing parameters - //glMultiTexCoord2f(GL_TEXTURE0, 0.f, 0.f); - //glMultiTexCoord2f(GL_TEXTURE1, 0.f, 0.f); + // glMultiTexCoord2f(GL_TEXTURE0, 0.f, 0.f); + // glMultiTexCoord2f(GL_TEXTURE1, 0.f, 0.f); } void FFGLDevice::drawDeviceBuffer(const TextBuffer& buf) diff --git a/lib/gl/renderer_ff.hpp b/lib/gl/renderer_ff.hpp index 28597524..5501d78f 100644 --- a/lib/gl/renderer_ff.hpp +++ b/lib/gl/renderer_ff.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_RENDERER_FF -#define GLVIS_RENDERER_FF +#ifndef GLVIS_RENDERER_FF_HPP +#define GLVIS_RENDERER_FF_HPP #include "renderer.hpp" @@ -62,4 +62,4 @@ class FFGLDevice : public GLDevice } -#endif // GLVIS_RENDERER_FF +#endif // GLVIS_RENDERER_FF_HPP diff --git a/lib/gl/types.cpp b/lib/gl/types.cpp index 19e39335..a5f79083 100644 --- a/lib/gl/types.cpp +++ b/lib/gl/types.cpp @@ -133,4 +133,3 @@ void GlBuilder::saveVertex(const GlBuilder::FFState& v) } } } - diff --git a/lib/gl/types.hpp b/lib/gl/types.hpp index 5ccdd85a..eda252f9 100644 --- a/lib/gl/types.hpp +++ b/lib/gl/types.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_AUX_GL3 -#define GLVIS_AUX_GL3 +#ifndef GLVIS_TYPES_HPP +#define GLVIS_TYPES_HPP #include #include @@ -677,5 +677,4 @@ class GlDrawable } -#endif // GLVIS_AUX_GL3 - +#endif // GLVIS_TYPES_HPP diff --git a/lib/gl2ps.c b/lib/gl2ps.c index 5c17ec09..0f3f02bf 100644 --- a/lib/gl2ps.c +++ b/lib/gl2ps.c @@ -33,6 +33,11 @@ * Please report all bugs and problems to . */ +// Suppress GL2PS OpenGL warning on Mac +#ifdef __APPLE__ +#define GL_SILENCE_DEPRECATION +#endif + #include "gl2ps.h" #include diff --git a/lib/logo.hpp b/lib/logo.hpp index daea13b8..54e030cb 100644 --- a/lib/logo.hpp +++ b/lib/logo.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef __LOGO_HPP__ -#define __LOGO_HPP__ +#ifndef GLVIS_LOGO_HPP +#define GLVIS_LOGO_HPP extern unsigned char logo_rgba[]; extern unsigned int logo_rgba_len; diff --git a/lib/material.hpp b/lib/material.hpp index 011991f1..6a508c6e 100644 --- a/lib/material.hpp +++ b/lib/material.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef MATERIAL_HPP -#define MATERIAL_HPP +#ifndef GLVIS_MATERIAL_HPP +#define GLVIS_MATERIAL_HPP #include struct Material diff --git a/lib/openglvis.hpp b/lib/openglvis.hpp index a0395a58..960479db 100644 --- a/lib/openglvis.hpp +++ b/lib/openglvis.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_OPENGLVIS -#define GLVIS_OPENGLVIS +#ifndef GLVIS_OPENGLVIS_HPP +#define GLVIS_OPENGLVIS_HPP #include #include "sdl.hpp" diff --git a/lib/palettes.hpp b/lib/palettes.hpp index cdb99ae1..e7bcb283 100644 --- a/lib/palettes.hpp +++ b/lib/palettes.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_COLOR_PALETTES -#define GLVIS_COLOR_PALETTES +#ifndef GLVIS_PALETTES_HPP +#define GLVIS_PALETTES_HPP /// Initializes the palette textures. void paletteInit(); diff --git a/lib/sdl.cpp b/lib/sdl.cpp index d99ebe91..4559a080 100644 --- a/lib/sdl.cpp +++ b/lib/sdl.cpp @@ -519,7 +519,7 @@ void SdlWindow::keyEvent(SDL_Keysym& ks) if (isAlt) { saved_keys += "Alt-"; } if (ks.sym < 256 && std::isalpha(ks.sym)) { - //key with corresponding text output + // key with corresponding text output char c = ks.sym; if (!(ks.mod & KMOD_SHIFT)) { c = std::tolower(c); } saved_keys += c; diff --git a/lib/sdl.hpp b/lib/sdl.hpp index 8dc06636..747e120c 100644 --- a/lib/sdl.hpp +++ b/lib/sdl.hpp @@ -9,8 +9,9 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef SDL_HPP -#define SDL_HPP +#ifndef GLVIS_SDL_HPP +#define GLVIS_SDL_HPP + #include #include #include @@ -96,7 +97,7 @@ class SdlWindow SdlWindow(); ~SdlWindow(); - /// Creates a new OpenGL window. Returns false if SDL or OpenGL intialization + /// Creates a new OpenGL window. Returns false if SDL or OpenGL initialization /// fails. bool createWindow(const char * title, int x, int y, int w, int h, bool legacyGlOnly); diff --git a/lib/sdl_x11.hpp b/lib/sdl_x11.hpp index 3003016e..2762f414 100644 --- a/lib/sdl_x11.hpp +++ b/lib/sdl_x11.hpp @@ -13,6 +13,7 @@ #define GLVIS_SDL_X11_HPP #ifdef SDL_VIDEO_DRIVER_X11 + #include "sdl_helper.hpp" #include "gl/platform_gl.hpp" #include "threads.hpp" @@ -100,4 +101,5 @@ class SdlX11Platform final : public SdlNativePlatform }; #endif // SDL_VIDEO_DRIVER_X11 + #endif // GLVIS_SDL_X11_HPP diff --git a/lib/threads.hpp b/lib/threads.hpp index 6c6bfe60..c87f6190 100644 --- a/lib/threads.hpp +++ b/lib/threads.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_THREADS -#define GLVIS_THREADS +#ifndef GLVIS_THREADS_HPP +#define GLVIS_THREADS_HPP #include "vsdata.hpp" #include diff --git a/lib/visual.hpp b/lib/visual.hpp index a0abd670..cddc0679 100644 --- a/lib/visual.hpp +++ b/lib/visual.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_VISUAL -#define GLVIS_VISUAL +#ifndef GLVIS_VISUAL_HPP +#define GLVIS_VISUAL_HPP // Visualization header file diff --git a/lib/vsdata.hpp b/lib/vsdata.hpp index 4a0cb62a..5e4924c9 100644 --- a/lib/vsdata.hpp +++ b/lib/vsdata.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_VSDATA -#define GLVIS_VSDATA +#ifndef GLVIS_VSDATA_HPP +#define GLVIS_VSDATA_HPP #include diff --git a/lib/vssolution.cpp b/lib/vssolution.cpp index cfe8a180..4443f735 100644 --- a/lib/vssolution.cpp +++ b/lib/vssolution.cpp @@ -78,8 +78,8 @@ static void SolutionKeyHPressed() << "| s - Turn on/off unit cube scaling |" << endl << "| S - Take snapshot/Record a movie |" << endl << "| t - Cycle materials and lights |" << endl - << "| y/Y Rotate the clipping plane |" << endl - << "| z/Z Move the clipping plane |" << endl + << "| y/Y Rotate the cutting plane |" << endl + << "| z/Z Move the cutting plane |" << endl << "| \\ - Set light source position |" << endl << "| Ctrl+p - Print to a PDF file |" << endl << "| Ctrl+o - Element ordering curve |" << endl @@ -2339,7 +2339,7 @@ gl3::SceneInfo VisualizationSceneSolution::GetSceneObjs() params.static_color = GetLineColor(); if (draw_cp) { - //draw cutting plane + // draw cutting plane params.use_clip_plane = false; scene.queue.emplace_back(params, &cp_buf); params.use_clip_plane = true; @@ -2350,7 +2350,7 @@ gl3::SceneInfo VisualizationSceneSolution::GetSceneObjs() { scene.queue.emplace_back(params, &bdr_buf); } - //draw lines + // draw lines if (drawmesh == 1) { scene.queue.emplace_back(params, &line_buf); @@ -2359,7 +2359,7 @@ gl3::SceneInfo VisualizationSceneSolution::GetSceneObjs() { scene.queue.emplace_back(params, &lcurve_buf); } - //draw numberings + // draw numberings if (drawnums == 1) { scene.queue.emplace_back(params, &e_nums_buf); diff --git a/lib/vssolution.hpp b/lib/vssolution.hpp index 3ab2fcfe..f434399e 100644 --- a/lib/vssolution.hpp +++ b/lib/vssolution.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_VSSOLUTION -#define GLVIS_VSSOLUTION +#ifndef GLVIS_VSSOLUTION_HPP +#define GLVIS_VSSOLUTION_HPP #include "mfem.hpp" using namespace mfem; diff --git a/lib/vssolution3d.cpp b/lib/vssolution3d.cpp index b242acf6..b9be1fe6 100644 --- a/lib/vssolution3d.cpp +++ b/lib/vssolution3d.cpp @@ -62,9 +62,9 @@ static void Solution3dKeyHPressed() << "| u/U Move the level surface |" << endl << "| v/V Add/Delete a level surface |" << endl << "| w/W Move bdr elements up/down |" << endl - << "| x/X Rotate clipping plane (phi) |" << endl - << "| y/Y Rotate clipping plane (theta) |" << endl - << "| z/Z Translate clipping plane |" << endl + << "| x/X Rotate cutting plane (phi) |" << endl + << "| y/Y Rotate cutting plane (theta) |" << endl + << "| z/Z Translate cutting plane |" << endl << "| Ctrl+p - Print to a PDF file |" << endl << "| Ctrl+o - Element ordering curve |" << endl << "+------------------------------------+" << endl diff --git a/lib/vssolution3d.hpp b/lib/vssolution3d.hpp index 6008b047..e813890e 100644 --- a/lib/vssolution3d.hpp +++ b/lib/vssolution3d.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_VSSOLUTION_3D -#define GLVIS_VSSOLUTION_3D +#ifndef GLVIS_VSSOLUTION_3D_HPP +#define GLVIS_VSSOLUTION_3D_HPP #include "mfem.hpp" #include "gl/types.hpp" diff --git a/lib/vsvector.cpp b/lib/vsvector.cpp index 041c74ba..49d8cd8d 100644 --- a/lib/vsvector.cpp +++ b/lib/vsvector.cpp @@ -886,7 +886,7 @@ void VisualizationSceneVector::PrepareVectorField() { rerun = 0; - //glNewList(vectorlist, GL_COMPILE); + // glNewList(vectorlist, GL_COMPILE); vector_buf.clear(); if (drawvector > 0) @@ -948,7 +948,7 @@ void VisualizationSceneVector::PrepareVectorField() } } - //glEndList(); + // glEndList(); } while (rerun); diff --git a/lib/vsvector.hpp b/lib/vsvector.hpp index c0a271d9..87fa3709 100644 --- a/lib/vsvector.hpp +++ b/lib/vsvector.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_VSVECTOR -#define GLVIS_VSVECTOR +#ifndef GLVIS_VSVECTOR_HPP +#define GLVIS_VSVECTOR_HPP #include "mfem.hpp" #include "gl/types.hpp" diff --git a/lib/vsvector3d.cpp b/lib/vsvector3d.cpp index 1497b9a9..2374ab4a 100644 --- a/lib/vsvector3d.cpp +++ b/lib/vsvector3d.cpp @@ -59,9 +59,9 @@ static void VectorKeyHPressed() << "| u/U Move the level field vectors |" << endl << "| v/V Vector field |" << endl << "| w/W Add/Delete level field vector |" << endl - << "| x/X Rotate clipping plane (phi) |" << endl - << "| y/Y Rotate clipping plane (theta) |" << endl - << "| z/Z Translate clipping plane |" << endl + << "| x/X Rotate cutting plane (phi) |" << endl + << "| y/Y Rotate cutting plane (theta) |" << endl + << "| z/Z Translate cutting plane |" << endl << "| Ctrl+p - Print to a PDF file |" << endl << "+------------------------------------+" << endl << "| Function keys |" << endl diff --git a/lib/vsvector3d.hpp b/lib/vsvector3d.hpp index 026883e7..d346c2eb 100644 --- a/lib/vsvector3d.hpp +++ b/lib/vsvector3d.hpp @@ -9,8 +9,8 @@ // terms of the BSD-3 license. We welcome feedback and contributions, see file // CONTRIBUTING.md for details. -#ifndef GLVIS_VSVECTOR_3D -#define GLVIS_VSVECTOR_3D +#ifndef GLVIS_VSVECTOR_3D_HPP +#define GLVIS_VSVECTOR_3D_HPP #include "mfem.hpp" #include "gl/types.hpp" diff --git a/makefile b/makefile index e36fedff..81594171 100644 --- a/makefile +++ b/makefile @@ -125,7 +125,7 @@ DEFINES = -DGLVIS_MULTISAMPLE=$(GLVIS_MULTISAMPLE)\ -DGLVIS_OGL3 GLVIS_FLAGS += $(DEFINES) -# we don't want most of the stuff below because emscripten handles that for us +# We don't want most of the stuff below because Emscripten handles that for us EMCC_OPTS += $(CPPFLAGS) $(CXXFLAGS) $(MFEM_INCFLAGS) $(DEFINES) EMCC_LIBS += $(MFEM_LIBS)