maallyn/updated-radar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors

Browse Source
This commit is contained in:
Mark Allyn
2026-04-24 00:25:29 -07:00
parent f68524a6ae
commit 01c1db41db
34 changed files with 361 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/CMakeCache.txt
View File

@@ -351,6 +351,8 @@ CMAKE_C_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
CMAKE_DLLTOOL-ADVANCED:INTERNAL=1
//Path to cache edit program executable.
CMAKE_EDIT_COMMAND:INTERNAL=/usr/bin/cmake-gui
//Whether to issue deprecation errors for macros and functions.
CMAKE_ERROR_DEPRECATED:INTERNAL=FALSE
//Executable file format
CMAKE_EXECUTABLE_FORMAT:INTERNAL=ELF
//ADVANCED property for variable: CMAKE_EXE_LINKER_FLAGS
@@ -440,12 +442,20 @@ CMAKE_STATIC_LINKER_FLAGS_RELEASE-ADVANCED:INTERNAL=1
CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_STRIP
CMAKE_STRIP-ADVANCED:INTERNAL=1
//Suppress errors that are meant for the author of the CMakeLists.txt
// files.
CMAKE_SUPPRESS_DEVELOPER_ERRORS:INTERNAL=TRUE
//Suppress Warnings that are meant for the author of the CMakeLists.txt
// files.
CMAKE_SUPPRESS_DEVELOPER_WARNINGS:INTERNAL=TRUE
//ADVANCED property for variable: CMAKE_TAPI
CMAKE_TAPI-ADVANCED:INTERNAL=1
//uname command
CMAKE_UNAME:INTERNAL=/usr/bin/uname
//ADVANCED property for variable: CMAKE_VERBOSE_MAKEFILE
CMAKE_VERBOSE_MAKEFILE-ADVANCED:INTERNAL=1
//Whether to issue warnings for deprecated functionality.
CMAKE_WARN_DEPRECATED:INTERNAL=FALSE
//Details about finding Freetype
FIND_PACKAGE_MESSAGE_DETAILS_Freetype:INTERNAL=[/usr/lib/x86_64-linux-gnu/libfreetype.so][/usr/include/freetype2][v2.14.2()]
//Details about finding OpenGL

89
build/CMakeFiles/Makefile.cmake
View File

@@ -11,98 +11,21 @@ set(CMAKE_MAKEFILE_DEPENDS
"CMakeFiles/4.2.3/CMakeCCompiler.cmake"
"CMakeFiles/4.2.3/CMakeCXXCompiler.cmake"
"CMakeFiles/4.2.3/CMakeSystem.cmake"
"/usr/share/cmake-4.2/Modules/CMakeCCompiler.cmake.in"
"/usr/share/cmake-4.2/Modules/CMakeCCompilerABI.c"
"/usr/share/cmake-4.2/Modules/CMakeCInformation.cmake"
"/usr/share/cmake-4.2/Modules/CMakeCXXCompiler.cmake.in"
"/usr/share/cmake-4.2/Modules/CMakeCXXCompilerABI.cpp"
"/usr/share/cmake-4.2/Modules/CMakeCXXInformation.cmake"
"/usr/share/cmake-4.2/Modules/CMakeCommonLanguageInclude.cmake"
"/usr/share/cmake-4.2/Modules/CMakeCompilerIdDetection.cmake"
"/usr/share/cmake-4.2/Modules/CMakeDetermineCCompiler.cmake"
"/usr/share/cmake-4.2/Modules/CMakeDetermineCXXCompiler.cmake"
"/usr/share/cmake-4.2/Modules/CMakeDetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/CMakeDetermineCompilerABI.cmake"
"/usr/share/cmake-4.2/Modules/CMakeDetermineCompilerId.cmake"
"/usr/share/cmake-4.2/Modules/CMakeDetermineCompilerSupport.cmake"
"/usr/share/cmake-4.2/Modules/CMakeDetermineSystem.cmake"
"/usr/share/cmake-4.2/Modules/CMakeFindBinUtils.cmake"
"/usr/share/cmake-4.2/Modules/CMakeGenericSystem.cmake"
"/usr/share/cmake-4.2/Modules/CMakeInitializeConfigs.cmake"
"/usr/share/cmake-4.2/Modules/CMakeLanguageInformation.cmake"
"/usr/share/cmake-4.2/Modules/CMakeParseImplicitIncludeInfo.cmake"
"/usr/share/cmake-4.2/Modules/CMakeParseImplicitLinkInfo.cmake"
"/usr/share/cmake-4.2/Modules/CMakeParseLibraryArchitecture.cmake"
"/usr/share/cmake-4.2/Modules/CMakeSystem.cmake.in"
"/usr/share/cmake-4.2/Modules/CMakeSystemSpecificInformation.cmake"
"/usr/share/cmake-4.2/Modules/CMakeSystemSpecificInitialize.cmake"
"/usr/share/cmake-4.2/Modules/CMakeTestCCompiler.cmake"
"/usr/share/cmake-4.2/Modules/CMakeTestCXXCompiler.cmake"
"/usr/share/cmake-4.2/Modules/CMakeTestCompilerCommon.cmake"
"/usr/share/cmake-4.2/Modules/CMakeUnixFindMake.cmake"
"/usr/share/cmake-4.2/Modules/CheckCSourceCompiles.cmake"
"/usr/share/cmake-4.2/Modules/CheckIncludeFile.cmake"
"/usr/share/cmake-4.2/Modules/CheckLibraryExists.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/ADSP-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/ARMClang-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Borland-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Bruce-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/CMakeCommonCompilerMacros.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Clang-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Cray-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/CrayClang-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Diab-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/FujitsuClang-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/GHS-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/GNU-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/GNU-C.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/GNU-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/GNU-CXX.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/GNU-FindBinUtils.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/GNU.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/HP-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/HP-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/IAR-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/IBMClang-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/IBMClang-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Intel-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/IntelLLVM-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/LCC-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/LCC-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/MSVC-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/NVHPC-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/NVIDIA-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/OrangeC-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/PGI-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/PathScale-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Renesas-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/SCO-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/TI-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/TIClang-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Tasking-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/Watcom-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/XL-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/XL-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/XLClang-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/XLClang-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-4.2/Modules/FindFreetype.cmake"
"/usr/share/cmake-4.2/Modules/FindOpenGL.cmake"
"/usr/share/cmake-4.2/Modules/FindPackageHandleStandardArgs.cmake"
@@ -112,11 +35,7 @@ set(CMAKE_MAKEFILE_DEPENDS
"/usr/share/cmake-4.2/Modules/Internal/CMakeCLinkerInformation.cmake"
"/usr/share/cmake-4.2/Modules/Internal/CMakeCXXLinkerInformation.cmake"
"/usr/share/cmake-4.2/Modules/Internal/CMakeCommonLinkerInformation.cmake"
"/usr/share/cmake-4.2/Modules/Internal/CMakeDetermineLinkerId.cmake"
"/usr/share/cmake-4.2/Modules/Internal/CMakeInspectCLinker.cmake"
"/usr/share/cmake-4.2/Modules/Internal/CMakeInspectCXXLinker.cmake"
"/usr/share/cmake-4.2/Modules/Internal/CheckSourceCompiles.cmake"
"/usr/share/cmake-4.2/Modules/Internal/FeatureTesting.cmake"
"/usr/share/cmake-4.2/Modules/Linker/GNU-C.cmake"
"/usr/share/cmake-4.2/Modules/Linker/GNU-CXX.cmake"
"/usr/share/cmake-4.2/Modules/Linker/GNU.cmake"
@@ -124,7 +43,6 @@ set(CMAKE_MAKEFILE_DEPENDS
"/usr/share/cmake-4.2/Modules/Platform/Linker/Linux-GNU-C.cmake"
"/usr/share/cmake-4.2/Modules/Platform/Linker/Linux-GNU-CXX.cmake"
"/usr/share/cmake-4.2/Modules/Platform/Linker/Linux-GNU.cmake"
"/usr/share/cmake-4.2/Modules/Platform/Linux-Determine-CXX.cmake"
"/usr/share/cmake-4.2/Modules/Platform/Linux-GNU-C.cmake"
"/usr/share/cmake-4.2/Modules/Platform/Linux-GNU-CXX.cmake"
"/usr/share/cmake-4.2/Modules/Platform/Linux-GNU.cmake"
@@ -142,13 +60,6 @@ set(CMAKE_MAKEFILE_OUTPUTS
# Byproducts of CMake generate step:
set(CMAKE_MAKEFILE_PRODUCTS
"CMakeFiles/4.2.3/CMakeSystem.cmake"
"CMakeFiles/4.2.3/CMakeCCompiler.cmake"
"CMakeFiles/4.2.3/CMakeCXXCompiler.cmake"
"CMakeFiles/4.2.3/CMakeCCompiler.cmake"
"CMakeFiles/4.2.3/CMakeCCompiler.cmake"
"CMakeFiles/4.2.3/CMakeCXXCompiler.cmake"
"CMakeFiles/4.2.3/CMakeCXXCompiler.cmake"
"CMakeFiles/CMakeDirectoryInformation.cmake"
)

28
build/CMakeFiles/radar.dir/compiler_depend.internal
View File

@@ -2432,6 +2432,7 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o
/usr/include/c++/15/bits/ranges_util.h
/usr/include/c++/15/bits/refwrap.h
/usr/include/c++/15/bits/requires_hosted.h
/usr/include/c++/15/bits/specfun.h
/usr/include/c++/15/bits/std_abs.h
/usr/include/c++/15/bits/std_mutex.h
/usr/include/c++/15/bits/stl_algobase.h
@@ -2457,13 +2458,13 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o
/usr/include/c++/15/cerrno
/usr/include/c++/15/climits
/usr/include/c++/15/clocale
/usr/include/c++/15/cmath
/usr/include/c++/15/compare
/usr/include/c++/15/concepts
/usr/include/c++/15/cstddef
/usr/include/c++/15/cstdint
/usr/include/c++/15/cstdio
/usr/include/c++/15/cstdlib
/usr/include/c++/15/cstring
/usr/include/c++/15/ctime
/usr/include/c++/15/cwchar
/usr/include/c++/15/debug/assertions.h
@@ -2484,6 +2485,18 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o
/usr/include/c++/15/ratio
/usr/include/c++/15/string
/usr/include/c++/15/string_view
/usr/include/c++/15/tr1/bessel_function.tcc
/usr/include/c++/15/tr1/beta_function.tcc
/usr/include/c++/15/tr1/ell_integral.tcc
/usr/include/c++/15/tr1/exp_integral.tcc
/usr/include/c++/15/tr1/gamma.tcc
/usr/include/c++/15/tr1/hypergeometric.tcc
/usr/include/c++/15/tr1/legendre_function.tcc
/usr/include/c++/15/tr1/modified_bessel_func.tcc
/usr/include/c++/15/tr1/poly_hermite.tcc
/usr/include/c++/15/tr1/poly_laguerre.tcc
/usr/include/c++/15/tr1/riemann_zeta.tcc
/usr/include/c++/15/tr1/special_function_util.h
/usr/include/c++/15/tuple
/usr/include/c++/15/type_traits
/usr/include/c++/15/unordered_map
@@ -2502,14 +2515,13 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o
/usr/include/linux/stddef.h
/usr/include/linux/types.h
/usr/include/locale.h
/usr/include/math.h
/usr/include/pthread.h
/usr/include/sched.h
/usr/include/stdc-predef.h
/usr/include/stdint.h
/usr/include/stdio.h
/usr/include/stdlib.h
/usr/include/string.h
/usr/include/strings.h
/usr/include/syscall.h
/usr/include/time.h
/usr/include/unistd.h
@@ -2531,12 +2543,22 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o
/usr/include/x86_64-linux-gnu/bits/errno.h
/usr/include/x86_64-linux-gnu/bits/floatn-common.h
/usr/include/x86_64-linux-gnu/bits/floatn.h
/usr/include/x86_64-linux-gnu/bits/flt-eval-method.h
/usr/include/x86_64-linux-gnu/bits/fp-fast.h
/usr/include/x86_64-linux-gnu/bits/fp-logb.h
/usr/include/x86_64-linux-gnu/bits/getopt_core.h
/usr/include/x86_64-linux-gnu/bits/getopt_posix.h
/usr/include/x86_64-linux-gnu/bits/iscanonical.h
/usr/include/x86_64-linux-gnu/bits/libc-header-start.h
/usr/include/x86_64-linux-gnu/bits/libm-simd-decl-stubs.h
/usr/include/x86_64-linux-gnu/bits/local_lim.h
/usr/include/x86_64-linux-gnu/bits/locale.h
/usr/include/x86_64-linux-gnu/bits/long-double.h
/usr/include/x86_64-linux-gnu/bits/math-vector.h
/usr/include/x86_64-linux-gnu/bits/mathcalls-helper-functions.h
/usr/include/x86_64-linux-gnu/bits/mathcalls-macros.h
/usr/include/x86_64-linux-gnu/bits/mathcalls-narrow.h
/usr/include/x86_64-linux-gnu/bits/mathcalls.h
/usr/include/x86_64-linux-gnu/bits/posix1_lim.h
/usr/include/x86_64-linux-gnu/bits/posix2_lim.h
/usr/include/x86_64-linux-gnu/bits/posix_opt.h

28
build/CMakeFiles/radar.dir/compiler_depend.make
View File

@@ -2421,6 +2421,7 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o: /home/maallyn/new-radar/src/sco
/usr/include/c++/15/bits/ranges_util.h \
/usr/include/c++/15/bits/refwrap.h \
/usr/include/c++/15/bits/requires_hosted.h \
/usr/include/c++/15/bits/specfun.h \
/usr/include/c++/15/bits/std_abs.h \
/usr/include/c++/15/bits/std_mutex.h \
/usr/include/c++/15/bits/stl_algobase.h \
@@ -2446,13 +2447,13 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o: /home/maallyn/new-radar/src/sco
/usr/include/c++/15/cerrno \
/usr/include/c++/15/climits \
/usr/include/c++/15/clocale \
/usr/include/c++/15/cmath \
/usr/include/c++/15/compare \
/usr/include/c++/15/concepts \
/usr/include/c++/15/cstddef \
/usr/include/c++/15/cstdint \
/usr/include/c++/15/cstdio \
/usr/include/c++/15/cstdlib \
/usr/include/c++/15/cstring \
/usr/include/c++/15/ctime \
/usr/include/c++/15/cwchar \
/usr/include/c++/15/debug/assertions.h \
@@ -2473,6 +2474,18 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o: /home/maallyn/new-radar/src/sco
/usr/include/c++/15/ratio \
/usr/include/c++/15/string \
/usr/include/c++/15/string_view \
/usr/include/c++/15/tr1/bessel_function.tcc \
/usr/include/c++/15/tr1/beta_function.tcc \
/usr/include/c++/15/tr1/ell_integral.tcc \
/usr/include/c++/15/tr1/exp_integral.tcc \
/usr/include/c++/15/tr1/gamma.tcc \
/usr/include/c++/15/tr1/hypergeometric.tcc \
/usr/include/c++/15/tr1/legendre_function.tcc \
/usr/include/c++/15/tr1/modified_bessel_func.tcc \
/usr/include/c++/15/tr1/poly_hermite.tcc \
/usr/include/c++/15/tr1/poly_laguerre.tcc \
/usr/include/c++/15/tr1/riemann_zeta.tcc \
/usr/include/c++/15/tr1/special_function_util.h \
/usr/include/c++/15/tuple \
/usr/include/c++/15/type_traits \
/usr/include/c++/15/unordered_map \
@@ -2491,14 +2504,13 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o: /home/maallyn/new-radar/src/sco
/usr/include/linux/stddef.h \
/usr/include/linux/types.h \
/usr/include/locale.h \
/usr/include/math.h \
/usr/include/pthread.h \
/usr/include/sched.h \
/usr/include/stdc-predef.h \
/usr/include/stdint.h \
/usr/include/stdio.h \
/usr/include/stdlib.h \
/usr/include/string.h \
/usr/include/strings.h \
/usr/include/syscall.h \
/usr/include/time.h \
/usr/include/unistd.h \
@@ -2520,12 +2532,22 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o: /home/maallyn/new-radar/src/sco
/usr/include/x86_64-linux-gnu/bits/errno.h \
/usr/include/x86_64-linux-gnu/bits/floatn-common.h \
/usr/include/x86_64-linux-gnu/bits/floatn.h \
/usr/include/x86_64-linux-gnu/bits/flt-eval-method.h \
/usr/include/x86_64-linux-gnu/bits/fp-fast.h \
/usr/include/x86_64-linux-gnu/bits/fp-logb.h \
/usr/include/x86_64-linux-gnu/bits/getopt_core.h \
/usr/include/x86_64-linux-gnu/bits/getopt_posix.h \
/usr/include/x86_64-linux-gnu/bits/iscanonical.h \
/usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
/usr/include/x86_64-linux-gnu/bits/libm-simd-decl-stubs.h \
/usr/include/x86_64-linux-gnu/bits/local_lim.h \
/usr/include/x86_64-linux-gnu/bits/locale.h \
/usr/include/x86_64-linux-gnu/bits/long-double.h \
/usr/include/x86_64-linux-gnu/bits/math-vector.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls-helper-functions.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls-macros.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls-narrow.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls.h \
/usr/include/x86_64-linux-gnu/bits/posix1_lim.h \
/usr/include/x86_64-linux-gnu/bits/posix2_lim.h \
/usr/include/x86_64-linux-gnu/bits/posix_opt.h \

BIN
build/CMakeFiles/radar.dir/src/graticule.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/knob_panel.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/left_panel.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/main.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/phosphor.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/rpi_receiver.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/scope.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/scope_intro.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/scope_manager.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o
View File

Binary file not shown.

24
build/CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o.d
View File

@@ -199,4 +199,26 @@ CMakeFiles/radar.dir/src/scope_marine_ppi.cpp.o: \
/home/maallyn/new-radar/include/KHR/khrplatform.h \
/home/maallyn/new-radar/src/phosphor.h \
/home/maallyn/new-radar/src/graticule.h /usr/include/GLFW/glfw3.h \
/usr/include/c++/15/cstring /usr/include/string.h /usr/include/strings.h
/usr/include/c++/15/cmath /usr/include/math.h \
/usr/include/x86_64-linux-gnu/bits/math-vector.h \
/usr/include/x86_64-linux-gnu/bits/libm-simd-decl-stubs.h \
/usr/include/x86_64-linux-gnu/bits/flt-eval-method.h \
/usr/include/x86_64-linux-gnu/bits/fp-logb.h \
/usr/include/x86_64-linux-gnu/bits/fp-fast.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls-macros.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls-helper-functions.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls.h \
/usr/include/x86_64-linux-gnu/bits/mathcalls-narrow.h \
/usr/include/x86_64-linux-gnu/bits/iscanonical.h \
/usr/include/c++/15/bits/specfun.h /usr/include/c++/15/tr1/gamma.tcc \
/usr/include/c++/15/tr1/special_function_util.h \
/usr/include/c++/15/tr1/bessel_function.tcc \
/usr/include/c++/15/tr1/beta_function.tcc \
/usr/include/c++/15/tr1/ell_integral.tcc \
/usr/include/c++/15/tr1/exp_integral.tcc \
/usr/include/c++/15/tr1/hypergeometric.tcc \
/usr/include/c++/15/tr1/legendre_function.tcc \
/usr/include/c++/15/tr1/modified_bessel_func.tcc \
/usr/include/c++/15/tr1/poly_hermite.tcc \
/usr/include/c++/15/tr1/poly_laguerre.tcc \
/usr/include/c++/15/tr1/riemann_zeta.tcc

BIN
build/CMakeFiles/radar.dir/src/scope_ppi.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/shared_render_state.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/simulator.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/target_buffer.cpp.o
View File

Binary file not shown.

BIN
build/CMakeFiles/radar.dir/src/traffic_cop.cpp.o
View File

Binary file not shown.

BIN
build/radar
View File

Binary file not shown.

53
build/shaders/phosphor.frag
View File

@@ -2,9 +2,15 @@
* MIT License
* Author: Mark Allyn
*
* phosphor.frag — maps the single-channel phosphor energy texture to
* the P7 colour sequence (blue → green → yellow-green → dark) and
* applies a simple inline bloom (box-filter glow) to bright pixels.
* phosphor.frag — maps the two-channel phosphor energy texture to the
* P7 colour sequence (blue → green → yellow-green → dark) and applies
* a simple inline bloom (box-filter glow) to bright pixels.
*
* The phosphor FBO is GL_RG32F:
* R channel — signal energy (target echoes, sweep background)
* multiplied by u_gain before display
* G channel — range ring energy, gain-independent; mixed with signal
* after gain is applied so rings never dim with gain
*
* Coordinate system: gl_FragCoord.xy in GL viewport pixels (origin
* bottom-left). Scope centre is passed as u_scopeCenter in the same
@@ -14,17 +20,19 @@
out vec4 fragColor;
uniform sampler2D u_phosphor; // GL_R32F phosphor energy FBO
uniform sampler2D u_phosphor; // GL_RG32F phosphor energy FBO
uniform vec2 u_scopeCenter; // scope centre in GL viewport pixels (bottom-left origin)
uniform float u_scopeRadius; // scope radius in pixels
uniform float u_gain; // receiver gain [0,1] — scales brightness
uniform float u_gain; // receiver gain [0,1] — scales signal (R) channel only
uniform float u_bloomStep; // UV step for bloom sample (≈ 2.5 / FBO_SIZE)
uniform float u_bloomStrength; // additive blend weight for bloom
// P7 energy thresholds (match settings.h)
// P7 energy thresholds — MUST match settings.h P7_THRESH_* constants.
// T_YGREE is intentionally low (0.05) to keep most of the decay in the
// GREEN zone; see the comment in settings.h for the full rationale.
const float T_BLUE = 0.82;
const float T_GREEN = 0.55;
const float T_YGREE = 0.22;
const float T_YGREE = 0.05;
const float T_DARK = 0.03;
// P7 colour anchors
@@ -34,16 +42,22 @@ const vec3 C_YGREE = vec3(0.50, 1.00, 0.05);
const vec3 C_YELLW = vec3(0.70, 0.70, 0.00);
const vec3 C_BLACK = vec3(0.00, 0.00, 0.00);
// P7 colour ramp: hue selected by energy level, then scaled by energy so
// brightness decreases monotonically from fresh strike (peak) to dark.
// This prevents intermediate decay colours (yellow-green) from appearing
// brighter than the initial blue flash.
vec3 p7Color(float e) {
if (e < T_DARK) return C_BLACK;
vec3 hue;
if (e >= T_BLUE)
return mix(C_GREEN, C_BLUE, (e - T_GREEN) / (T_BLUE - T_GREEN));
if (e >= T_GREEN)
return mix(C_YGREE, C_GREEN, (e - T_YGREE) / (T_GREEN - T_YGREE));
if (e >= T_YGREE)
return mix(C_YELLW, C_YGREE, (e - T_DARK ) / (T_YGREE - T_DARK ));
if (e >= T_DARK)
return mix(C_BLACK, C_YELLW, e / T_DARK);
return C_BLACK;
hue = C_BLUE;
else if (e >= T_GREEN)
hue = mix(C_GREEN, C_BLUE, (e - T_GREEN) / (T_BLUE - T_GREEN));
else if (e >= T_YGREE)
hue = mix(C_YGREE, C_GREEN, (e - T_YGREE) / (T_GREEN - T_YGREE));
else
hue = mix(C_YELLW, C_YGREE, (e - T_DARK) / (T_YGREE - T_DARK));
return hue * e;
}
void main() {
@@ -57,10 +71,12 @@ void main() {
}
// Map from PPI delta [-1,+1] to phosphor texture UV [0,1]
// delta.x = east, delta.y = north (both y directions already match)
vec2 uv = delta * 0.5 + 0.5;
float energy = texture(u_phosphor, uv).r * u_gain;
vec2 rg = texture(u_phosphor, uv).rg;
// Signal (R): gain-scaled received echoes.
// Ring (G): gain-independent timing reference; always at full brightness.
float energy = max(rg.r * u_gain, rg.g);
// Inline bloom: weighted box-filter over a 5×5 neighbourhood
float bloom = 0.0;
@@ -68,7 +84,8 @@ void main() {
for (int dx = -2; dx <= 2; dx++) {
for (int dy = -2; dy <= 2; dy++) {
float w = exp(-float(dx*dx + dy*dy) * 0.45);
float e = texture(u_phosphor, uv + vec2(dx, dy) * u_bloomStep).r;
vec2 srg = texture(u_phosphor, uv + vec2(dx, dy) * u_bloomStep).rg;
float e = max(srg.r * u_gain, srg.g);
bloom += e * w;
wsum += w;
}

56
build/shaders/sweep.frag
View File

@@ -4,13 +4,16 @@
*
* sweep.frag — phosphor accumulation update shader.
*
* For each texel in the 1024×1024 phosphor FBO:
* 1. Decay the previous frame's energy by u_decayFactor.
* 2. If the texel's PPI bearing falls within the current sweep arc
* [u_beamAnglePrev, u_beamAngle], add contributions from:
* - range rings (beam-painted per the P7 spec)
* - target echoes
* 3. Output the updated single-channel energy value.
* The FBO is GL_RG32F (two independent energy channels):
* R — signal energy: target echoes + sweep-background glow.
* Multiplied by u_gain in the display pass so operators can
* adjust received-signal brightness without touching rings.
* G — range-ring energy: written at u_ringBrightness; NOT scaled
* by gain. Rings are a precision timing reference, not a
* received echo. Both channels decay at the same P7 rate.
*
* The sweep background (u_sweepBg) goes into the G channel so the
* rotating beam is always visible regardless of the gain setting.
*
* PPI convention: north = +y, east = +x; bearing = atan2(x, y)
* in degrees, clockwise from north.
@@ -19,13 +22,13 @@
in vec2 vTexCoord;
layout(location = 0) out vec4 fragOut; // .r = energy; .gba unused
layout(location = 0) out vec4 fragOut; // .r = signal; .g = ring+sweep; .ba unused
uniform sampler2D u_prevPhosphor; // previous frame's energy texture (GL_R32F)
uniform sampler2D u_prevPhosphor; // previous frame's energy texture (GL_RG32F)
uniform float u_decayFactor; // exp(-decay_rate * dt)
uniform float u_beamAngle; // current beam angle, degrees CW from north
uniform float u_beamAnglePrev; // beam angle at previous frame
uniform float u_sweepBg; // ambient sweep-line energy (makes beam visible)
uniform float u_sweepBg; // ambient sweep-line energy (gain-independent)
uniform float u_halfBeamDeg; // half-beamwidth for target blobs (display widening)
// Targets: .x = range_norm (0-1), .y = bearing_deg, .z = brightness, .w = size_norm
@@ -59,8 +62,8 @@ bool inSweep(float b, float prev, float curr) {
// ----------------------------------------------------------------
void main() {
vec2 pos = vTexCoord * 2.0 - 1.0; // PPI coords: (-1,-1) SW … (+1,+1) NE
float rng = length(pos);
vec2 pos = vTexCoord * 2.0 - 1.0; // PPI coords: (-1,-1) SW … (+1,+1) NE
float rng = length(pos);
if (rng > 1.0) {
fragOut = vec4(0.0);
@@ -71,23 +74,25 @@ void main() {
float brg = degrees(atan(pos.x, pos.y));
if (brg < 0.0) brg += 360.0;
// Decay previous value
float energy = texture(u_prevPhosphor, vTexCoord).r * u_decayFactor;
vec2 prev = texture(u_prevPhosphor, vTexCoord).rg;
float signal = prev.r * u_decayFactor;
float ring = prev.g * u_decayFactor;
if (inSweep(brg, u_beamAnglePrev, u_beamAngle)) {
float contrib = u_sweepBg; // beam passage gives a faint ambient glow
// ---- Range rings (painted at every bearing as beam sweeps) ----
// ---- Range rings → G channel (gain-independent) ----
float ringContrib = u_sweepBg; // sweep-background glow also in G channel
for (int i = 0; i < u_ringCount; i++) {
float d = abs(rng - u_ringRadii[i]);
if (d < u_ringWidth) {
float w = 1.0 - d / u_ringWidth;
contrib = max(contrib, u_ringBrightness * w * w);
ringContrib = max(ringContrib, u_ringBrightness * w * w);
}
}
ring = max(ring, ringContrib);
// ---- Target echoes ----
// ---- Target echoes → R channel (gain-scaled in display pass) ----
float sigContrib = 0.0;
for (int i = 0; i < u_targetCount; i++) {
float tRng = u_targets[i].x;
float tBrg = u_targets[i].y;
@@ -96,21 +101,18 @@ void main() {
if (tRng <= 0.0 || tBrt <= 0.0) continue;
// Angular proximity: beam must be sweeping over the target's bearing
float dBrg = angleDiff(brg, tBrg);
if (dBrg >= u_halfBeamDeg) continue;
// Range proximity: pixel must be within the target blob
float dRng = abs(rng - tRng);
if (dRng >= tSize) continue;
float bw = 1.0 - dBrg / u_halfBeamDeg; // angular taper
float rw = 1.0 - dRng / tSize; // range taper
contrib = max(contrib, tBrt * bw * rw);
float bw = 1.0 - dBrg / u_halfBeamDeg;
float rw = 1.0 - dRng / tSize;
sigContrib = max(sigContrib, tBrt * bw * rw);
}
energy = max(energy, contrib);
signal = max(signal, sigContrib);
}
fragOut = vec4(clamp(energy, 0.0, 1.0), 0.0, 0.0, 1.0);
fragOut = vec4(clamp(signal, 0.0, 1.0), clamp(ring, 0.0, 1.0), 0.0, 1.0);
}