fggl/CMakeLists.txt

-
 # headers
 file(GLOB_RECURSE HEADER_LIST CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/include/fggl/**.hpp")
 
 # the fggl library itself
+# Should be shared linkage for legal reasons (LGPL)
 add_library(fggl ${HEADER_LIST})
 
+target_link_libraries(fggl PUBLIC entt)
+
 # we need to tell people using the library about our headers
 target_include_directories(fggl
         PUBLIC
@@ -31,6 +33,14 @@ if (CLANG_TIDY_FOUND)
     set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=*,-llvmlibc-*,-fuchsia-*,-cppcoreguidelines-*,-android-*,-llvm-*,-altera-*,-modernize-use-trailing-return-type)
 endif ()
 
+# the important stuff everything else uses
+add_subdirectory(math)
+add_subdirectory(util)
+add_subdirectory(grid)
+
+add_subdirectory(assets)
+add_subdirectory(phys)
+
 target_sources(${PROJECT_NAME}
         PRIVATE
         app.cpp
@@ -38,11 +48,7 @@ target_sources(${PROJECT_NAME}
         data/model.cpp
         data/procedural.cpp
         data/heightmap.cpp
-
-        ecs/ecs.cpp
-        ecs3/module/module.cpp
-        ecs3/fast/Container.cpp
-        ecs3/prototype/world.cpp
+        data/module.cpp
 
         scenes/menu.cpp
         scenes/game.cpp
@@ -50,35 +56,35 @@ target_sources(${PROJECT_NAME}
         input/input.cpp
         input/mouse.cpp
         input/camera_input.cpp
+)
 
-        gui/widget.cpp
-        gui/widgets.cpp
-        gui/containers.cpp
-        gui/fonts.cpp
-
-        math/triangulation.cpp
-        math/shapes.cpp
-        )
+# GUI support
+add_subdirectory(gui)
 
 # yaml-cpp for configs and storage
 find_package(yaml-cpp)
 target_link_libraries(fggl PUBLIC yaml-cpp)
 
-# spdlog for cleaner logging
-find_package(spdlog)
-target_link_libraries(${PROJECT_NAME} PRIVATE spdlog::spdlog)
-
-find_package(freetype)
-target_link_libraries(${PROJECT_NAME} PUBLIC freetype)
+# model loading
+add_subdirectory(data/assimp)
 
 # Graphics backend
 add_subdirectory(gfx)
 add_subdirectory(audio)
 
 # physics integration
-add_subdirectory(phys/bullet)
 
 # Debug backend
 add_subdirectory(debug)
 
+# platform integrations
+add_subdirectory(platform)
+add_subdirectory(entity)
 
+##
+# begin windows support
+##
+if (MSVC)
+    target_compile_options(${PROJECT_NAME} PUBLIC "/ZI")
+    target_link_options(${PROJECT_NAME} PUBLIC "/INCREMENTAL")
+endif ()

fggl/FgglConfig.h.in

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
 // the configured options and settings for Tutorial
 #define FGGL_VERSION_MAJOR @FGGL_VERSION_MAJOR@
 #define FGGL_VERSION_MINOR @FGGL_VERSION_MINOR@

fggl/app.cpp

+/*
+ * This file is part of FGGL.
+ *
+ * FGGL is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
+ * later version.
+ *
+ * FGGL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with FGGL.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
 
 #include <cstdlib>
-#include <memory>
 
 #include <spdlog/spdlog.h>
-
 #include <fggl/app.hpp>
-#include <fggl/ecs3/types.hpp>
-#include <fggl/ecs3/module/module.h>
-#include <fggl/util/service.h>
 
 namespace fggl {
 
-    App::App(const Identifer& name) : App::App( name, name ) {
-    }
+	App::App(modules::Manager *services, const Identifer &name) : App::App(services, name, name) {
+	}
 
-    App::App(const Identifer& name, const Identifer& folder ) :
-        m_running(true),
-        m_types(std::make_unique<ecs3::TypeRegistry>()),
-        m_modules(std::make_unique<ecs3::ModuleManager>(*m_types)),
+	App::App(modules::Manager *services, const Identifer & /*name*/, const Identifer & /*folder*/ ) :
+		m_running(true),
 		m_window(nullptr),
-        m_states() {}
+		m_states(),
+		m_subsystems(services) {}
 
-    int App::run(int argc, const char** argv) {
+	auto App::run(int /*argc*/, const char **/*argv*/) -> int {
+		auto *windowing = m_subsystems->get<display::WindowService>();
 
-        {
-            // activate the first state
-            auto& state = m_states.active();
+		{
+			// activate the first state
+			auto &state = m_states.active();
 			m_expectedScene = m_states.activeID();
-            state.activate();
-        }
+			state.activate();
+		}
+
+		auto lastTime = glfwGetTime();
+
+		while (m_running) {
+			auto currTime = glfwGetTime();
+			auto delta = currTime - lastTime;
+			lastTime = currTime;
 
-        while ( m_running ) {
 			// trigger a state change if expected
-			if ( m_expectedScene != m_states.activeID() ) {
-				m_states.change(m_expectedScene);
+			if (m_expectedScene != m_states.activeID()) {
+				auto result = m_states.change(m_expectedScene);
+				if (!result) {
+					m_expectedScene = m_states.activeID();
+				}
 			}
 
-            auto& state = m_states.active();
-            m_modules->onUpdate();
-            state.update();
+			// process window events
+			if (windowing != nullptr) {
+				windowing->pollEvents();
+			}
+			//m_modules->onUpdate();
+
+			auto &state = m_states.active();
+			state.update((float)delta);
 
-            // window rendering to frame buffer
-            if ( m_window != nullptr ) {
-                m_modules->onFrameStart();
-                m_window->frameStart();
+			// window rendering to frame buffer
+			if (m_window != nullptr) {
+				//	m_modules->onFrameStart();
+				m_window->frameStart();
 
-                // get draw instructions
-				auto& graphics = m_window->graphics();
-                state.render(graphics);
+				// get draw instructions
+				auto &graphics = m_window->graphics();
+				state.render(graphics);
 
-                m_window->frameEnd();
-                m_modules->onFrameEnd();
+				m_window->frameEnd();
+				//  m_modules->onFrameEnd();
 
 				m_running = m_running && !m_window->wantClose();
-            }
-        }
+			}
+		}
 
-        {
-            // shutdown last state
-            auto& state = m_states.active();
-            state.deactivate();
-        }
+		{
+			// shutdown last state
+			auto &state = m_states.active();
+			state.deactivate();
+		}
 
-        return EXIT_SUCCESS;
-    }
+		return EXIT_SUCCESS;
+	}
 
 } //namespace fggl