Dev/modules3 NOT FOR MERGING for now!!!

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "maths"]
 	path = maths
 	url = https://github.com/sebsjames/maths
+[submodule "json"]
+	path = json
+	url = https://github.com/nlohmann/json

CMakeLists.txt

@@ -1,12 +1,12 @@
-cmake_minimum_required(VERSION 3.14)
-project(mathplot)
+cmake_minimum_required(VERSION 3.28.5)
+project(mathplot LANGUAGES CXX C)
 # Note that the project version is encoded in mplot/version.h and not in this CMakeLists.txt
 
 message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}")
 message(STATUS "  (This can be changed with `cmake -DCMAKE_INSTALL_PREFIX=/some/place`")
 
 #
-# The base C++ version in mathplot is current C++-17 but I am considering C++20 or 23
+# We're firmly at C++20.
 #
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -44,9 +44,9 @@ else()
     set(CMAKE_CXX_FLAGS "-Wall -g -std=c++20 -xHOST -O3")
   else() # GCC or Clang
     if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
-      # Add compiler version check, to ensure gcc is version 11 or later.
-      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
-        message(FATAL_ERROR "GCC version must be at least 11")
+      # Add compiler version check, to ensure gcc is version 14? 15? or later.
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14)
+        message(FATAL_ERROR "GCC version must be at least 14")
       else()
         message(STATUS "GCC version ${CMAKE_CXX_COMPILER_VERSION} OK!")
       endif()
@@ -155,7 +155,9 @@ else()
 endif()
 
 # Use packaged nlohmann json
-find_package(nlohmann_json REQUIRED)
+# find_package(nlohmann_json REQUIRED)
+# Now nlohmann is submoduled to get an up-to-date version (for C++ modules)
+include_directories("${PROJECT_SOURCE_DIR}/json/include")
 
 # If Qt5 is present, then some optional Qt examples will be compiled
 find_package(Qt5 QUIET COMPONENTS Gui Core Widgets)

README.md

@@ -36,45 +36,47 @@ This quick start shows dependency installation for Linux, because on this platfo
 sudo apt install build-essential cmake git wget \
                  nlohmann-json3-dev librapidxml-dev \
                  freeglut3-dev libglu1-mesa-dev libxmu-dev libxi-dev \
-                 libglfw3-dev libfreetype-dev libarmadillo-dev libhdf5-dev
+                 libglfw3-dev libfreetype-dev libarmadillo-dev libhdf5-dev clang-23 # yes, it's bleeding edge, no this won't work
 
 git clone --recurse-submodules git@github.com:sebsjames/mathplot   # Get your copy of the morphologica code
 cd mathplot
 mkdir build         # Create a build directory
 cd build
-cmake ..            # Call cmake to generate the makefiles
-make graph1         # Compile a single one of the examples. Add VERBOSE=1 to see the compiler commands.
+cmake .. -GNinja    # Call cmake to generate the makefiles
+ninja graph1        # Compile a single one of the examples. Add VERBOSE=1 to see the compiler commands.
 ./examples/graph1   # Run the program. You should see a graph of a cubic function.
 # After closing the graph1 program, open its source code and modify something (see examples/graph2.cpp for ideas)
 gedit ../examples/graph1.cpp
 ```
 The program graph1.cpp is:
 ```c++
 // Visualize a graph. Minimal example showing how a default graph appears
-#include <sm/vvec> // vvec is part of Seb's maths library
-#include <mplot/Visual.h>
-#include <mplot/GraphVisual.h>
+#include <memory>
+import mplot.visual;
+import mplot.graphvisual; // exports sm.vvec and sm.vec
 
 int main()
 {
-    // Set up your mplot::Visual 'scene environment'.
+    // Set up a mplot::Visual 'scene environment'.
     mplot::Visual v(1024, 768, "Made with mplot::GraphVisual");
-    // Create a new GraphVisual object with offset within the scene of 0,0,0
+    // Create a GraphVisual object (obtaining a unique_ptr to the object) with a spatial offset within the scene of 0,0,0
     auto gv = std::make_unique<mplot::GraphVisual<double>> (sm::vec<float>({0,0,0}));
-    // Boilerplate bindmodel function call - do this for every model you add to a Visual
-    v.bindmodel (gv);
-    // Data for the x axis. sm::vvec is like std::vector, but with built-in maths methods
+    // This mandatory line of boilerplate code sets the parent pointer in GraphVisual and binds some functions
+    gv->set_parent (v.get_id());
+    // Data for the x axis. A vvec is like std::vector, but with built-in maths methods
     sm::vvec<double> x;
     // This works like numpy's linspace() (the 3 args are "start", "end" and "num"):
     x.linspace (-0.5, 0.8, 14);
     // Set a graph up of y = x^3
     gv->setdata (x, x.pow(3));
     // finalize() makes the GraphVisual compute the vertices of the OpenGL model
     gv->finalize();
-    // Add the GraphVisual OpenGL model to the Visual scene (which takes ownership of the unique_ptr)
+    // Add the GraphVisual OpenGL model to the Visual scene, transferring ownership of the unique_ptr
     v.addVisualModel (gv);
     // Render the scene on the screen until user quits with 'Ctrl-q'
     v.keepOpen();
+    // Because v owns the unique_ptr to the GraphVisual, its memory will be deallocated when v goes out of scope.
+    return 0;
 }
 ```
 The program generates a clean looking graph...

doxygen/Doxyfile.in

@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = morphologica
+PROJECT_NAME           = mathplot
 PROJECT_NUMBER         = git main
 OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/doc_doxygen/
 OUTPUT_LANGUAGE        = English
@@ -63,11 +63,11 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../morph ../morph/nn ../morph/bn ../README.md ../morph/gl ../morph/qt ../morph/wx ../morph/linuxos
+INPUT                  = ../mplot ../mplot/compoundray ../mplot/fonts ../README.md ../mplot/fps ../mplot/gl ../mplot/glad ../mplot/healpix ../mplot/jcvoronoi ../mplot/qt ../mplot/wx ../maths/sm
 USE_MDFILE_AS_MAINPAGE = README.md
-FILE_PATTERNS          = *.h
+FILE_PATTERNS          = *
 RECURSIVE              = NO
-EXCLUDE                = ../morph/nlohmann ../morph/rapidxml.hpp ../morph/rapidxml_iterators.hpp ../morph/rapidxml_print.hpp ../morph/rapidxml_utils.hpp ../morph/lodepng.h
+EXCLUDE                = ../mplot/nlohmann
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       =
 EXAMPLE_PATH           =

doxygen/Doxyfile_local.in

@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = morphologica
+PROJECT_NAME           = mathplot
 PROJECT_NUMBER         = @VERSION@
 OUTPUT_DIRECTORY       = @CMAKE_CURRENT_BINARY_DIR@/doc_doxygen/
 OUTPUT_LANGUAGE        = English
@@ -63,7 +63,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/morph/ @CMAKE_CURRENT_SOURCE_DIR@/tests @CMAKE_CURRENT_SOURCE_DIR@/README.md
+INPUT                  = @CMAKE_CURRENT_SOURCE_DIR@/mplot/ @CMAKE_CURRENT_SOURCE_DIR@/tests @CMAKE_CURRENT_SOURCE_DIR@/README.md
 USE_MDFILE_AS_MAINPAGE = @CMAKE_CURRENT_SOURCE_DIR@/README.md
 FILE_PATTERNS          = *.h
 RECURSIVE              = NO