Remove almost everything from Lol Engine and start a clean header hierarchy

Makefile.am

@@ -10,7 +10,7 @@ DIST_SUBDIRS = $(SUBDIRS) binaries
 
 EXTRA_DIST += $(lol_files) bootstrap COPYING TODO \
               .gitignore .gitattributes .gitmodules \
-              .travis.yml lol.sln build.config
+              .travis.yml lolengine.sln build.config
 AUTOMAKE_OPTIONS = dist-bzip2
 ACLOCAL_AMFLAGS = -I build/autotools/m4
 

build/msbuild/lol.config.props

@@ -4,8 +4,10 @@
   <!--
      - Import settings that can be overridden by the user
    -->
-  <Import Condition="Exists('$(LolDir)\build.config')" Project="$(LolDir)\build.config" />
-  <Import Condition="Exists('$(SolutionDir)\build.config')" Project="$(SolutionDir)\build.config" />
+  <Import Condition="Exists('$(LolDir)\build.config')"
+          Project="$(LolDir)\build.config" />
+  <Import Condition="Exists('$(SolutionDir)\build.config') And ('$(SolutionDir)' != '$(LolDir)')"
+          Project="$(SolutionDir)\build.config" />
 
   <!--
      - Import defaults settings from Visual Studio

build/msbuild/lol.rules.props

@@ -27,8 +27,7 @@
 
       <AdditionalIncludeDirectories>
           $(LolDir)\lol\include;
-          $(LolDir)\src;
-          $(LolDir)\src\3rdparty\bullet3\src;
+          $(LolDir)\src\include;
           $(PegtlIncludes);
           $(ImguiIncludes);
           $(BtPhysIncludes);

src/3rdparty/lol-bullet.vcxproj

@@ -2,9 +2,9 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="LolMacros">
     <LolDir>$(SolutionDir)</LolDir>
-    <LolDir Condition="Exists('$(SolutionDir)\lol\lol.sln')">$(SolutionDir)\lol</LolDir>
-    <LolDir Condition="Exists('$(SolutionDir)\lolengine\lol.sln')">$(SolutionDir)\lolengine</LolDir>
-    <LolDir Condition="Exists('$(SolutionDir)\src\3rdparty\lolengine\lol.sln')">$(SolutionDir)\src\3rdparty\lolengine</LolDir>
+    <LolDir Condition="Exists('$(SolutionDir)\lol\lolengine.sln')">$(SolutionDir)\lol</LolDir>
+    <LolDir Condition="Exists('$(SolutionDir)\lolengine\lolengine.sln')">$(SolutionDir)\lolengine</LolDir>
+    <LolDir Condition="Exists('$(SolutionDir)\src\3rdparty\lolengine\lolengine.sln')">$(SolutionDir)\src\3rdparty\lolengine</LolDir>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|NX64">

src/3rdparty/lol-lua.vcxproj

@@ -2,9 +2,9 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="LolMacros">
     <LolDir>$(SolutionDir)</LolDir>
-    <LolDir Condition="Exists('$(SolutionDir)\lol\lol.sln')">$(SolutionDir)\lol</LolDir>
-    <LolDir Condition="Exists('$(SolutionDir)\lolengine\lol.sln')">$(SolutionDir)\lolengine</LolDir>
-    <LolDir Condition="Exists('$(SolutionDir)\src\3rdparty\lolengine\lol.sln')">$(SolutionDir)\src\3rdparty\lolengine</LolDir>
+    <LolDir Condition="Exists('$(SolutionDir)\lol\lolengine.sln')">$(SolutionDir)\lol</LolDir>
+    <LolDir Condition="Exists('$(SolutionDir)\lolengine\lolengine.sln')">$(SolutionDir)\lolengine</LolDir>
+    <LolDir Condition="Exists('$(SolutionDir)\src\3rdparty\lolengine\lolengine.sln')">$(SolutionDir)\src\3rdparty\lolengine</LolDir>
   </PropertyGroup>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|NX64">

src/Makefile.am

@@ -9,15 +9,6 @@ noinst_LTLIBRARIES = liblol-core.la
 EXTRA_DIST += lol-core.vcxproj lol-core.vcxproj.filters
 
 liblol_core_la_SOURCES = \
-    lolgl.h scene.cpp scene.h font.cpp font.h \
-    textureimage.cpp textureimage.h textureimage-private.h \
-    tileset.cpp tileset.h video.cpp video.h \
-    profiler.cpp profiler.h text.cpp text.h emitter.cpp emitter.h \
-    messageservice.cpp messageservice.h \
-    gradient.cpp gradient.h gpu/grad.lolfx \
-    platform.cpp platform.h sprite.cpp sprite.h camera.cpp camera.h \
-    light.cpp light.h \
-    \
     $(liblol_core_headers) \
     $(liblol_core_sources) \
     \
@@ -25,84 +16,15 @@ liblol_core_la_SOURCES = \
     $(sdl_sources) \
     $(d3d9_sources) \
     $(android_sources)
-liblol_core_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/3rdparty/lua/src
+liblol_core_la_CPPFLAGS = $(AM_CPPFLAGS)
 liblol_core_la_LDFLAGS = $(AM_LDFLAGS)
 
-liblol_core_headers = \
-    lol/engine-internal.h lol/engine.h lol/public.h lol/extras.h \
-    lol/lua.h \
-    \
-    lol/base/all.h \
-    lol/base/enum.h \
-    \
-    lol/audio/all.h \
-    lol/audio/audio.h lol/audio/sample.h \
-    \
-    lol/engine/all.h \
-    lol/engine/tickable.h \
-    \
-    lol/sys/all.h \
-    lol/sys/init.h \
-    \
-    lol/image/all.h \
-    lol/image/image.h \
-    lol/image/resource.h lol/image/movie.h \
-    \
-    lol/net/all.h \
-    lol/net/http.h \
-    \
-    lol/gpu/all.h \
-    lol/gpu/shader.h lol/gpu/indexbuffer.h lol/gpu/vertexbuffer.h \
-    lol/gpu/framebuffer.h lol/gpu/texture.h lol/gpu/lolfx.h \
-    lol/gpu/renderer.h lol/gpu/rendercontext.h lol/gpu/debug.h \
-    \
-    lol/debug/all.h \
-    lol/debug/lines.h
+liblol_core_headers =
 
 liblol_core_sources = \
-    application/application.cpp application/application.h \
-    application/egl-app.cpp application/egl-app.h \
-    \
-    lolua/baselua.cpp lolua/baselua.h \
-    \
-    commandstack.h \
-    easymesh/easymeshbuild.cpp easymesh/easymeshbuild.h \
-    easymesh/easymeshrender.cpp easymesh/easymeshrender.h \
-    easymesh/easymesh.cpp easymesh/easymesh.h \
-    easymesh/easymeshinternal.cpp easymesh/easymeshcsg.cpp \
-    easymesh/easymeshprimitive.cpp easymesh/easymeshtransform.cpp \
-    easymesh/easymeshcursor.cpp easymesh/easymeshlua.cpp \
-    easymesh/easymeshlua.h easymesh/easyarray.h \
-    easymesh/csgbsp.cpp easymesh/csgbsp.h \
-    easymesh/shiny.lolfx easymesh/shinyflat.lolfx \
-    easymesh/shinydebugwireframe.lolfx \
-    easymesh/shinydebuglighting.lolfx easymesh/shinydebugnormal.lolfx \
-    easymesh/shinydebugUV.lolfx easymesh/shiny_SK.lolfx \
-    \
     base/assert.cpp base/engine.cpp base/log.cpp \
     \
-    math/geometry.cpp \
-    \
-    gpu/shader.cpp gpu/indexbuffer.cpp gpu/vertexbuffer.cpp \
-    gpu/framebuffer.cpp gpu/texture.cpp gpu/renderer.cpp \
-    gpu/rendercontext.cpp gpu/debug.cpp \
-    \
-    audio/audio.cpp audio/sample.cpp \
-    \
-    ui/input.cpp ui/input.h ui/keys.inc ui/buttons.inc \
-    ui/gui.cpp ui/gui.h \
-    \
-    gpu/default-material.lolfx \
-    gpu/empty-material.lolfx \
-    gpu/test-material.lolfx \
-    gpu/tile.lolfx gpu/palette.lolfx gpu/line.lolfx \
-    gpu/blit.lolfx \
-    gpu/postprocess.lolfx \
-    \
-    gpu/lolfx.cpp \
-    \
-    mesh/mesh.cpp mesh/mesh.h \
-    mesh/primitivemesh.cpp mesh/primitivemesh.h \
+    audio/audio.cpp \
     \
     sys/init.cpp \
     \
@@ -118,29 +40,6 @@ liblol_core_sources = \
     image/filter/dilate.cpp image/filter/median.cpp image/filter/yuv.cpp \
     image/movie.cpp \
     \
-    net/http.cpp \
-    \
-    engine/tickable.cpp engine/ticker.cpp engine/ticker.h \
-    engine/entity.cpp engine/entity.h \
-    engine/world.cpp engine/world.h \
-    engine/worldentity.cpp engine/worldentity.h \
-    \
-    loldebug.h \
-    debug/fps.cpp debug/fps.h debug/lines.cpp \
-    debug/record.cpp debug/record.h debug/stats.cpp debug/stats.h
-
-if LOL_USE_SDL
-sdl_sources = \
-    application/sdl-app.cpp application/sdl-app.h \
-    ui/sdl-input.cpp ui/sdl-input.h
-endif
-
-d3d9_sources = \
-    ui/d3d9-input.cpp ui/d3d9-input.h
+    net/http.cpp
 
 include 3rdparty/lol-imgui.am
-
-android_sources = \
-    image/codec/android-image.cpp \
-    application/android-app.cpp application/android-app.h
-

src/include/lol/engine/net

@@ -0,0 +1,15 @@
+//
+//  Lol Engine
+//
+//  Copyright © 2010–2024 Sam Hocevar <sam@hocevar.net>
+//
+//  Lol Engine is free software. It comes without any warranty, to
+//  the extent permitted by applicable law. You can redistribute it
+//  and/or modify it under the terms of the Do What the Fuck You Want
+//  to Public License, Version 2, as published by the WTFPL Task Force.
+//  See http://www.wtfpl.net/ for more details.
+//
+
+#pragma once
+
+#include "private/net/http.h"

src/lol/net/http.h → src/include/lol/engine/private/net/http.h

@@ -1,7 +1,7 @@
 //
 //  Lol Engine
 //
-//  Copyright © 2010—2020 Sam Hocevar <sam@hocevar.net>
+//  Copyright © 2010–2024 Sam Hocevar <sam@hocevar.net>
 //
 //  Lol Engine is free software. It comes without any warranty, to
 //  the extent permitted by applicable law. You can redistribute it
@@ -13,14 +13,9 @@
 #pragma once
 
 #include <memory>
+#include <string>
 
-namespace lol
-{
-
-namespace net
-{
-
-namespace http
+namespace lol::net::http
 {
 
 enum class status : uint8_t
@@ -31,8 +26,6 @@ enum class status : uint8_t
     error   = 3,
 };
 
-class client_impl;
-
 class client
 {
 public:
@@ -46,17 +39,12 @@ public:
     void reset();
 
     // Get current URL, status (may be pending), and result
-    status get_status() const;
-    std::string const & get_url() const;
-    std::string const & get_result() const;
+    status status() const;
+    std::string const & url() const;
+    std::string const & result() const;
 
 private:
-    std::unique_ptr<client_impl> impl;
+    std::unique_ptr<class client_impl> impl;
 };
 
-} // namespace http
-
-} // namespace net
-
-} // namespace lol
-
+} // namespace lol::net::http