Jonas Reith
56d74aba7b
The app was 100% keyboard-driven (~40 single-key shortcuts dumped as a dense text list in the HUD) -- this adds a discoverable, mouse-friendly sidebar menu overlaying the top-right of the 3D globe, built with raygui (raylib's official header-only widget library, fetched via CMake FetchContent). Every existing keyboard shortcut keeps working unchanged: 16 key-handler bodies were extracted from ViewerInput.cpp into named Viewer methods so both the key and the matching toolbar widget call the exact same code, and can never diverge. Sections: a View Mode dropdown (replacing keys 1-0, expanding the old 6-key cycle into 4 explicit entries), Overlays (checkboxes), World/Time (play/pause, step, fast-forward, a log-scaled speed slider, hydrology, reseed, save/load), Civilization & Ecology, Live World, and Edit Mode. Key F1 collapses/expands the sidebar (default expanded); a new inToolbar input gate keeps interacting with it from also orbiting the camera or picking a globe tile underneath, and it's disabled while the Phase-3 modal prompt is up. Found and fixed a real bug while building this: GuiCheckBox treats its bounds as the checkbox glyph itself (raygui auto-positions the label outside it), not a whole clickable row -- a naive full-row checkbox call drew an oversized glyph with the label clipped off-panel. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01TMfyZv91tonDnPJqbaTVJE
109 lines
3.4 KiB
CMake
109 lines
3.4 KiB
CMake
cmake_minimum_required(VERSION 3.16)
|
|
project(PlanetSim CXX)
|
|
|
|
set(CMAKE_CXX_STANDARD 17)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
|
include(FetchContent)
|
|
FetchContent_Declare(
|
|
raylib
|
|
GIT_REPOSITORY https://github.com/raysan5/raylib.git
|
|
GIT_TAG 5.5
|
|
)
|
|
# Build raylib as a static lib, no examples.
|
|
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
|
set(BUILD_GAMES OFF CACHE BOOL "" FORCE)
|
|
FetchContent_MakeAvailable(raylib)
|
|
|
|
# raygui: raylib's official header-only companion widget library (buttons, checkboxes,
|
|
# dropdowns, sliders, scroll panels -- used by the Toolbar sidebar, src/render/Toolbar.cpp).
|
|
# Download-only: it's a single header (src/raygui.h), no build step of its own needed.
|
|
FetchContent_Declare(
|
|
raygui
|
|
GIT_REPOSITORY https://github.com/raysan5/raygui.git
|
|
GIT_TAG 5.0
|
|
GIT_SHALLOW TRUE
|
|
DOWNLOAD_ONLY TRUE
|
|
)
|
|
FetchContent_MakeAvailable(raygui)
|
|
|
|
set(SIM_SOURCES
|
|
src/sim/IcoSphere.cpp
|
|
src/sim/Planet.cpp
|
|
src/sim/PlanetTectonics.cpp
|
|
src/sim/PlanetDrift.cpp
|
|
src/sim/PlanetErosion.cpp
|
|
src/sim/PlanetHydrology.cpp
|
|
src/sim/PlanetBiomes.cpp
|
|
src/sim/PlanetClimate.cpp
|
|
src/sim/PlanetLive.cpp
|
|
src/sim/PlanetOcean.cpp
|
|
src/sim/PlanetWeather.cpp
|
|
src/sim/PlanetVolcano.cpp
|
|
src/sim/PlanetBiota.cpp
|
|
src/sim/PlanetFloraGen.cpp
|
|
src/sim/PlanetFaunaGen.cpp
|
|
src/sim/PlanetFungiGen.cpp
|
|
src/sim/NameGen.cpp
|
|
src/sim/PlanetGeography.cpp
|
|
src/sim/PlanetEcoregions.cpp
|
|
src/sim/PlanetCiv.cpp
|
|
src/sim/PlanetNation.cpp
|
|
src/sim/PlanetCulture.cpp
|
|
src/sim/PlanetConflict.cpp
|
|
src/sim/PlanetTrade.cpp
|
|
src/sim/PlanetEdit.cpp
|
|
src/sim/PlanetIO.cpp
|
|
)
|
|
|
|
set(RENDER_SOURCES
|
|
src/render/Colors.cpp
|
|
src/render/Map2D.cpp
|
|
src/render/Overlays.cpp
|
|
src/render/Picking.cpp
|
|
src/render/Panels.cpp
|
|
src/render/Toolbar.cpp
|
|
src/render/RayGuiImpl.cpp
|
|
src/render/Viewer.cpp
|
|
src/render/ViewerInput.cpp
|
|
src/render/ViewerRender.cpp
|
|
)
|
|
|
|
add_library(planetsim_sim STATIC ${SIM_SOURCES})
|
|
target_include_directories(planetsim_sim PUBLIC src/sim)
|
|
|
|
add_executable(planetsim
|
|
src/main.cpp
|
|
${RENDER_SOURCES}
|
|
)
|
|
# Flat includes ("Planet.hpp", "Viewer.hpp", ...) resolve across both folders.
|
|
target_include_directories(planetsim PRIVATE src/sim src/render ${raygui_SOURCE_DIR}/src)
|
|
target_link_libraries(planetsim PRIVATE planetsim_sim raylib)
|
|
|
|
# OpenMP parallelizes the per-cell passes in Planet::step(). Optional: without
|
|
# it the #pragma omp lines are ignored and the sim runs (correctly) serial.
|
|
find_package(OpenMP)
|
|
if(OpenMP_CXX_FOUND)
|
|
target_link_libraries(planetsim_sim PUBLIC OpenMP::OpenMP_CXX)
|
|
endif()
|
|
|
|
# Linux system libs raylib needs at link time.
|
|
if(UNIX AND NOT APPLE)
|
|
target_link_libraries(planetsim PRIVATE m pthread dl)
|
|
endif()
|
|
|
|
enable_testing()
|
|
foreach(test_name logic biota ocean live weather volcano geography ecoregions civ nation culture conflict diplomacy trade colony cultevo edit)
|
|
add_executable(test_${test_name} test_${test_name}.cpp)
|
|
target_link_libraries(test_${test_name} PRIVATE planetsim_sim)
|
|
add_test(NAME ${test_name} COMMAND test_${test_name})
|
|
endforeach()
|
|
|
|
add_executable(test_events test_events.cpp ${RENDER_SOURCES})
|
|
target_include_directories(test_events PRIVATE src/sim src/render ${raygui_SOURCE_DIR}/src)
|
|
target_link_libraries(test_events PRIVATE planetsim_sim raylib)
|
|
if(UNIX AND NOT APPLE)
|
|
target_link_libraries(test_events PRIVATE m pthread dl)
|
|
endif()
|
|
add_test(NAME events COMMAND test_events)
|