diff --git a/.gitattributes b/.gitattributes index b81f2447ce..6bf4416c44 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9,4 +9,4 @@ # Let's try this for scenario files too *.scn eol=crlf # Do not propagate build script into branches unless requested -appveyor.yml merge=ours +.github/workflows/build.yml merge=ours diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000000..0b41ac948f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,66 @@ +# This starter workflow is for a CMake project running on a single platform. There is a different starter workflow if you need cross-platform coverage. +# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-multi-platform.yml +name: CMake on a single platform + +on: + push: + branches: [ "CMake" ] + +env: + GH_TOKEN: ${{github.token}} + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: RelWithDebInfo + BUILD_NAME: NASSP-V9.0-Orbiter2024-${{github.run_number}} + +jobs: + build: + + # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac. + # You can convert this to a matrix build if you need cross-platform coverage. + # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix + runs-on: windows-latest + + steps: + - uses: actions/checkout@v4 + + - name: Check dependency cache for Orbiter 2024 x64 + uses: actions/cache@v4 + id: cache + with: + path: ${{github.workspace}}/Orbiter2024-x64.zip + key: O2024-x64-zip + + - name: Download Orbiter 2024 x64 if not cached + if: steps.cache.outputs.cache-hit != 'true' + run: Invoke-WebRequest -Uri https://github.com/orbitersim/orbiter/releases/download/2024/Orbiter-x64.zip -OutFile ${{github.workspace}}/Orbiter2024-x64.zip + + - name: Extract Orbiter + run: Expand-Archive -Force ${{github.workspace}}/Orbiter2024-x64.zip ${{github.workspace}}/Orbiter2024 + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -DORBITER_INSTALL_DIR:STRING="${{github.workspace}}/Orbiter2024" -DFINAL_INSTALL_DIR:STRING="${{github.workspace}}/install" -B ${{github.workspace}}/build -G "Visual Studio 17 2022" -A x64 ${{github.workspace}}/Orbitersdk/samples/ProjectApollo/ + + - name: Build + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} -j 4 + + - name: Install + run: cmake --install ${{github.workspace}}/build + + - name: Write version file + run: | + $version = "${{ env.BUILD_NAME }}" + @" + $version + "@ | Out-File -Encoding UTF8 "${{ github.workspace }}/install/NASSP_VERSION.txt" + + - name: Zip output directory + run: Compress-Archive -Path ${{github.workspace}}/install/* -DestinationPath ${{github.workspace}}/${{env.BUILD_NAME}}-x64.zip -Force + + - name: Create GitHub release and tag + run: gh release create ${{env.BUILD_NAME}} ${{github.workspace}}/${{env.BUILD_NAME}}-x64.zip --target CMake + + - name: Create QSG asset + run: gh release upload ${{env.BUILD_NAME}} '${{github.workspace}}/Doc/Project Apollo - NASSP/NASSP Quick Start Guide.pdf' diff --git a/.gitignore b/.gitignore index e54c63e7e8..95333ffcfc 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,31 @@ XRSound/ /.ninja_deps # Ignore Matlab log analyzers /*.m +/Orbitersdk/samples/ProjectApollo/CMakeSettings.json +/Extern +/GravityModels +/packages/ldoc +/pl +/CMakeDoxyfile.in +/CMakeDoxygenDefaults.cmake +/lfs.dll +/lfs.exp +/lfs.ilk +/lfs.lib +/lfs.pdb +/lua.dll +/lua.exp +/lua.ilk +/lua.lib +/lua.pdb +/SketchpadOutput2.dds +/zlibd.dll +/zlibd.exp +/zlibd.ilk +/zlibd.lib +/zlibd.pdb +/zlib.dll +/zlib.exp +/zlib.ilk +/zlib.lib +/zlib.pdb diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2a326f552f..ee32049343 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,10 +8,9 @@ This guide is a work in progress and will be updated in the future. ## Building To build the project you will need a working installation of Orbiter developed by Martin Schweiger. These are all the requirements for a working development environment -* [Orbiter Beta](http://orbit.medphys.ucl.ac.uk/betainstall.html) -* [D3D9 Client for orbiter](https://www.orbiter-forum.com/showthread.php?t=18431) -* NASSP Orbiter2016 (or derivative) branch checked out inside the Orbiter installation -* Visual Studio (2017, 2019, or 2022) +* [Orbiter 2024 x64](https://github.com/orbitersim/orbiter/releases/tag/2024) +* NASSP Orbiter2024 (or derivative) branch checked out inside the Orbiter installation +* Visual Studio 2019 or 2022 (2022 is preferred) ## Submitting changes To get your work included in the project we ask you to make a pull request with a brief summary of the changes you did followed by details of your implementation. diff --git a/COPYING.txt b/COPYING.txt deleted file mode 100644 index d4d5df3803..0000000000 --- a/COPYING.txt +++ /dev/null @@ -1,31 +0,0 @@ - BE AWARE: YOU CANNOT LEGALLY CREATE A COMBINED - BINARY DISTRIBUTION OF NASSP AND ORBITER! - -NASSP is a DLL plugin for a non-Free software program, Orbiter. - -The GPL v2 does not permit the DISTRIBUTION of a combined Free DLL and -non-Free program. - -The USAGE of such a combination is perfectly legal, as the GPL v2 is a -DISTRIBUTION license and not a USAGE license. The GPL specifically -states it only covers COPYING, MODIFICATION, and DISTRIBUTION of -software and not RUNNING of software. - -A violation occurs only when someone combines the GPL library with the -closed source component and then distributes the result. - -Only the copyright holders of the project have a course of action if -someone does combine the works and distribute them. - -We do include GPLed code from other projects. The copyright holders of -those projects can take action against anyone who distributes a combined -NASSP/Orbiter binary, but they cannot take action against us, or anyone -who merely uses NASSP with Orbiter. Only the act of distribution of a -combined NASSP/Orbiter binary package can create a violation. - -Remember, the GPL is a license that we, the copyright holders, grant. We -own the rights. We are the only people who can bother anyone else for -violating the terms of the license. - -Please refer to the GPL v2, available in the repository root directory -as NASSP-LICENSE.txt, for more information. diff --git a/Config/ProjectApollo/Earth.cfg b/Config/ProjectApollo/Earth.cfg deleted file mode 100644 index d3571a44b6..0000000000 --- a/Config/ProjectApollo/Earth.cfg +++ /dev/null @@ -1,82 +0,0 @@ -; === Configuration file for planet Earth === -Name = Earth -Module = Earth -Module_Atm = EarthAtmJ71G ; default atmosphere model if no user selection -ErrorLimit = 1e-8 -SamplingInterval = 79 ; interpolation sampling interval [s] - ; (interpolation error ~0.1m) -; === Physical Parameters === -Mass = 5.973698968e+24 -;Size = 6.378165e6 ; equatorial radius -Size = 6.37101e6 ; mean radius -JCoeff = 1082.6269e-6 -2.51e-6 -1.60e-6 -0.15e-6 - ; harmonic coefficients for shape description -AlbedoRGB = 0.7 0.85 1.0 - -; === Rotation and precession parameters === -; ref: see www.orbiter-forum.com/showthread.php?t=8185 -PrecessionLAN = 0 ; [rad] -PrecessionObliquity = 0 ; [rad] -PrecessionPeriod = -9413040.4 ; precession period (days) = 25771.5 years -LAN = 0 ; [rad] -LAN_MJD = 51544.5 ; [MJD] -SidRotOffset = 4.88948754 ; [rad] -SidRotPeriod = 86164.10132 ; [s] -Obliquity = 0.4090928023 ; [rad] - -; === Atmospheric Parameters === -;AtmPressure0 = 101.4e3 ; pressure at zero altitude [Pa] (defined via module) -AtmDensity0 = 1.293 ; density at zero altitude [kg/m^3] -AtmGasConstant = 286.91 ; specific gas constant [J/(K kg)] -AtmGamma = 1.4 ; specific heat ratio c_p/c_v -;AtmAltLimit = 200e3 ; cutoff altitude [m] -AtmAttenuationAlt = 100e3; ; cutoff altitude for light attenuation -AtmHorizonAlt = 64e3 ; horizon rendering altitude [m] -AtmHazeExtent = 0.14 ; horizon haze extent -AtmColor0 = 0.55 0.75 1.04 -AtmHazeColor = 0.6 0.8 1.0 -AtmFogParam = 5e-5 3e-5 4e3 -AtmFogColor = 0.55 0.85 1.10 - -; === Cloud parameters === -CloudAlt = 7e3 ; altitude of cloud layer -CloudRotPeriod = 1e6 -CloudShadowDepth = 0.3 -CloudMicrotextureAlt = 35e3 300e3 - -; === Visualisation Parameters === -TileFormat = 2 -CloudFormat = 2 -MaxPatchResolution = 19 ; surface texture resolution limit (1-14) -MinCloudResolution = 1 ; cloud layer from this resolution -MaxCloudResolution = 9 ; highest cloud resolution level -SpecularRipple = TRUE ; enable specular water microtexture - -; === Surface Bases === -BEGIN_SURFBASE -DIR ProjectApollo\Earth\Base -END_SURFBASE - -; === Fixed surface observation points === -BEGIN_OBSERVER -KSC:LCC: -80.6529 +28.5800 20 -KSC:VAB: -80.65336 28.57944 3.22 ; High Bay 3 crawlerway -KSC:Press Site: -80.648290 +28.575633 6 -KSC:Causeway: -80.621459 +28.510921 7 -KSC:Crawlerway: -80.621657 +28.588825 7 -KSC:Pad 39A FSS:-80.60857 28.60112 90.00 -KSC:Pad 39A Water Tower:-80.60723 28.60225 100.00 -KSC:Pad 39A hardstand:-80.60796 28.59991 17.00 -KSC:Pad 39A crawlerway:-80.60834 28.59715 5.00 -KSC:Pad 39B: -80.6226 +28.6179 5 -KSC:Pad 39B Water Tower: -80.62361 28.62099 110.00 -KSC:SLF: -80.69935 +28.61021 2.8 -KSC:Playalinda DOAMS: -80.694552 +28.704287 6 -KSC:UCS-23 ATOTS: -80.562239 +28.503494 6 -KSC:Cocoa Beach DOAMS: -80.628652 +28.347573 6 -EDW:Tower: -117.88416 34.91723 50.00 -END_OBSERVER - -; === VOR transmitters === -BEGIN_NAVBEACON -END_NAVBEACON diff --git a/Config/ProjectApollo/Earth/Base/Canaveral.cfg b/Config/ProjectApollo/Earth/Base/Canaveral.cfg deleted file mode 100644 index 0c7b0ec57f..0000000000 --- a/Config/ProjectApollo/Earth/Base/Canaveral.cfg +++ /dev/null @@ -1,184 +0,0 @@ -BASE-V2.0 -Name = Cape Canaveral -Location = -80.675 +28.5208 -Size = 1000 - -BEGIN_NAVBEACON -VOR KSCX -80.53835 28.43352 112.70 500 -END_NAVBEACON - -BEGIN_OBJECTLIST -MESH - FILE ProjectApollo\VAB_interior - OWNMATERIAL - ROT 15 - POS -7256 -3.8 2345 - PRELOAD -END -MESH - FILE ProjectApollo\KSCCrawlerway1 - UNDERSHADOWS - OWNMATERIAL - POS -7350 -4.0 2844 - ROT -1.5 - PRELOAD -END -MESH - FILE ProjectApollo\KSCCrawlerway2 - UNDERSHADOWS - OWNMATERIAL - POS -8027 -5.8 4545 - PRELOAD -END -MESH - FILE ProjectApollo\KSCCrawlerway3 - UNDERSHADOWS - OWNMATERIAL - POS -9076 -8.5 6517 - PRELOAD -END -; --- Pad 39B concrete hardstand --- -MESH - FILE ProjectApollo\CanaveralLC39A - UNDERSHADOWS - OWNMATERIAL - POS -11790 11.4 5330 - ROT 89.5 - SCALE 1 - PRELOAD -END -LPAD2 - POS -11026 0 4966.5 - ROT 180 - SCALE 0 - TEX Lpad02 -END -;MESH -; FILE ProjectApollo\Saturn1bML -; SHADOW -; OWNMATERIAL -; POS -11040 75 4962 -; ROT -90 -;END -; -- Pad 39A concrete hardstand -- -MESH - FILE ProjectApollo\CanaveralLC39A - UNDERSHADOWS - OWNMATERIAL - POS -9690 11.4 6970 - ROT 89.5 - SCALE 1 - PRELOAD -END -LPAD2 - POS -8951.4 0 6647.2 - ROT 180 - SCALE 0 - TEX Lpad02 -END -; --- Pad 34 --- -MESH - FILE ProjectApollo\CanaveralLC34Pad - UNDERSHADOWS - OWNMATERIAL - POS -120 -9.21 11120 - ROT 270 - PRELOAD -END -LPAD1 - POS 631 0 10812.2 - SCALE 0 - ROT 220 - TEX Lpad02 -END -; --- Pad 37 --- -MESH - FILE ProjectApollo\CanaveralLC37 - UNDERSHADOWS - OWNMATERIAL - POS -1250 -0.3 10540 - ROT 58 - PRELOAD -END -LPAD1 ; Pad A NEEDS COORDINATES - POS 631 0 10812.2 - SCALE 0 - ROT 220 - TEX Lpad02 -END -LPAD1 ; Pad B NEEDS COORDINATES - POS 631 0 10812.2 - SCALE 0 - ROT 220 - TEX Lpad02 -END -; --- Rest of Canaveral --- -RUNWAY - END1 6860 0 11805 - END2 4978 0 9398 - WIDTH 100 - ILS1 132.6 - ILS2 132.6 - RWTEX Runway2 - NRWSEG 9 - RWSEG1 1 0.018 0.25 0.5 1 0.875 - RWSEG2 1 0.088 0 0.25 0.5 0 - RWSEG3 1 0.018 0.25 0.5 0.75 0.625 - RWSEG4 1 0.088 0 0.25 0.5 0 - RWSEG5 5 0.576 0 0.25 1 0.5 - RWSEG6 1 0.088 0 0.25 0.5 0 - RWSEG7 1 0.02 0.25 0.5 0.625 0.75 - RWSEG8 1 0.088 0 0.25 0 0.5 - RWSEG9 1 0.02 0.25 0.5 0.875 1 -END -RUNWAYLIGHTS - END1 6860 -13 11805 - END2 4978 -7 9398 - WIDTH 100 -END -END_OBJECTLIST - -BEGIN_SURFTILELIST -2 -462 160 3 -2 -461 160 3 -2 -462 161 3 -2 -461 161 3 -2 -462 162 3 -2 -461 162 3 -2 -462 163 3 -2 -461 163 3 -2 -460 164 3 -3 -920 320 3 -3 -919 320 3 -3 -918 320 3 -3 -917 320 3 -3 -920 321 3 -3 -919 321 3 -3 -918 321 3 -3 -920 322 3 -3 -919 322 3 -3 -918 322 3 -3 -920 323 3 -3 -919 323 3 -3 -918 323 3 -3 -917 323 3 -3 -920 324 3 -3 -919 324 3 -3 -918 324 3 -3 -917 324 3 -3 -920 325 3 -3 -917 325 3 -3 -920 326 3 -3 -919 326 3 -3 -918 326 3 -3 -920 327 3 -3 -919 327 3 -4 -1838 650 3 -4 -1837 650 3 -4 -1836 650 3 -4 -1835 650 3 -4 -1838 651 3 -4 -1837 651 3 -4 -1836 651 3 -4 -1835 651 3 -END_SURFTILELIST diff --git a/Config/ProjectApollo/Earth_VirtualAGC.cfg b/Config/ProjectApollo/Earth_VirtualAGC.cfg index 30636bfa5f..f8d1162dbd 100644 --- a/Config/ProjectApollo/Earth_VirtualAGC.cfg +++ b/Config/ProjectApollo/Earth_VirtualAGC.cfg @@ -8,10 +8,13 @@ SamplingInterval = 79 ; interpolation sampling interval [s] ; === Physical Parameters === Mass = 5.97374033e+24 ; reverse calculated with Orbiter's gravitational constant to match GSOPs G*M Size = 6.373338e6 ; launch pad radius, mandatory as long as Orbiter's Earth is spherical -JCoeff = 1082.6269e-6 -2.51e-6 -1.60e-6 -0.15e-6 - ; harmonic coefficients for shape description AlbedoRGB = 0.7 0.85 1.0 +; === Gravity Models === +GravModelPath = egm96_to360.tab ; the name of the gravity model file to load, located in /GravityModels +GravCoeffCutoff = 10 ; the maximum number of terms to load. +;JCoeff = 1082.6269e-6 -2.51e-6 -1.60e-6 -0.15e-6 ; harmonic coefficients for shape description, + ; === Rotation and precession parameters === ; ref: see www.orbiter-forum.com/showthread.php?t=8185 PrecessionLAN = 0 ; [rad] @@ -32,11 +35,10 @@ AtmGamma = 1.4 ; specific heat ratio c_p/c_v AtmAttenuationAlt = 100e3; ; cutoff altitude for light attenuation AtmHorizonAlt = 80e3 ; horizon rendering altitude [m] AtmHazeExtent = 0.14 ; horizon haze extent -;AtmColor0 = 0.55 0.75 1.04 -AtmColor0 = 0.42 0.72 1.02 -AtmHazeColor = 0.55 0.75 1.0 -AtmFogParam = 3.7e-5 2.0e-5 5e3 ; 4.0e-5 2.2e-5 5e3 -AtmFogColor = 0.57 0.80 0.92 +AtmColor0 = 0.42 0.63 0.92 +AtmHazeColor = 0.57 0.74 1.0 +AtmFogParam = 4e-5 2.0e-5 5e3 +AtmFogColor = 0.58 0.77 0.98 AtmTintColor = 0.04 0.05 0.20 ; additive tint to surfaces from high altitude ShadowDepth = 0.65 @@ -51,11 +53,13 @@ CloudMicrotextureAlt = 35e3 300e3 TileFormat = 2 CloudFormat = 2 LabelFormat = 2 -MaxPatchResolution = 19 ; surface texture resolution limit (1-19) +MaxPatchResolution = 21 ; surface texture resolution limit (1-21) MinCloudResolution = 1 ; cloud layer from this resolution MaxCloudResolution = 9 ; highest cloud resolution level ElevationResolution = 0.5 ; target resolution of elevation data [m] SpecularRipple = TRUE ; enable specular water microtexture +MaxElevation = 9000 +MinElevation = -420 MarkerPath = Config\ProjectApollo\Earth_VirtualAGC ; === Surface Bases === diff --git a/Config/ProjectApollo/Moon.cfg b/Config/ProjectApollo/Moon.cfg index 802dd5943a..f68fb0e465 100644 --- a/Config/ProjectApollo/Moon.cfg +++ b/Config/ProjectApollo/Moon.cfg @@ -6,7 +6,12 @@ ErrorLimit = 1e-5 ; === Physical Parameters === Mass = 7.34763862e+22 ; reverse calculated with Orbiter's gravitational constant to match GSOPs G*M Size = 1.73809e6 ; mean radius -JCoeff = 207.108e-6 -2.1e-5 ; GSOP Colossus 3 + +; === Gravity Models === +; ref: see Doc/Orbiter Technical Reference.pdf for details on implimentation and usage +GravModelPath = jgl165p1.sha ; the name of the gravity model file to load, located in /GravityModels +GravCoeffCutoff = 120 ; the maximum number of terms to load. +;JCoeff = 207.108e-6 -2.1e-5 ; GSOP Colossus 3, comment out the above two lines and uncomment this to use the old gravity model. ; === Rotation and precession parameters === ; ref: see www.orbiter-forum.com/showthread.php?t=8185 @@ -31,10 +36,12 @@ SidRotPeriod = 2360588.15 ; === Visualisation Parameters === TileFormat = 2 LabelFormat = 2 -MaxPatchResolution = 18 ; highest sphere patch level +MaxPatchResolution = 20 ; highest sphere patch level ElevationResolution = 0.5 ; target resolution of elevation data [m] HorizonExcess = 0.015 ; prevent mountain tops beyond sphere horizon from disappearing MarkerPath = Config\ProjectApollo\Moon +MaxElevation = 10800 +MinElevation = -9200 ; === Surface Bases === BEGIN_SURFBASE diff --git a/Config/ProjectApollo/Sol.cfg b/Config/ProjectApollo/Sol.cfg deleted file mode 100644 index c6fd13e33a..0000000000 --- a/Config/ProjectApollo/Sol.cfg +++ /dev/null @@ -1,33 +0,0 @@ -; === Configuration file for solar system === -Name = ProjectApollo\Sol - -Star1 = Sun -Planet1 = Mercury -Planet2 = Venus -Planet3 = ProjectApollo\Earth -Earth:Moon1 = ProjectApollo\Moon -Planet4 = Mars -Mars:Moon1 = Phobos -Mars:Moon2 = Deimos -Planet5 = Jupiter -Jupiter:Moon1 = Io -Jupiter:Moon2 = Europa -Jupiter:Moon3 = Ganymede -Jupiter:Moon4 = Callisto -Planet6 = Saturn -Saturn:Moon1 = Mimas -Saturn:Moon2 = Enceladus -Saturn:Moon3 = Tethys -Saturn:Moon4 = Dione -Saturn:Moon5 = Rhea -Saturn:Moon6 = Titan -Planet7 = Uranus -Uranus:Moon1 = Miranda -Uranus:Moon2 = Ariel -Uranus:Moon3 = Umbriel -Uranus:Moon4 = Titania -Uranus:Moon5 = Oberon -Planet8 = Neptune -Neptune:Moon1 = Triton -Neptune:Moon2 = Proteus -Neptune:Moon3 = Nereid \ No newline at end of file diff --git a/Config/ProjectApollo/Sol_VirtualAGC.cfg b/Config/ProjectApollo/Sol_VirtualAGC.cfg index d04b4dee43..29f66ea6e7 100644 --- a/Config/ProjectApollo/Sol_VirtualAGC.cfg +++ b/Config/ProjectApollo/Sol_VirtualAGC.cfg @@ -7,8 +7,8 @@ Planet2 = Venus Planet3 = ProjectApollo\Earth_VirtualAGC Earth:Moon1 = ProjectApollo\Moon Planet4 = Mars -Mars:Moon1 = Phobos -Mars:Moon2 = Deimos +;Mars:Moon1 = Phobos +;Mars:Moon2 = Deimos Planet5 = Jupiter Jupiter:Moon1 = Io Jupiter:Moon2 = Europa @@ -22,12 +22,12 @@ Saturn:Moon4 = Dione Saturn:Moon5 = Rhea Saturn:Moon6 = Titan Planet7 = Uranus -Uranus:Moon1 = Miranda -Uranus:Moon2 = Ariel -Uranus:Moon3 = Umbriel -Uranus:Moon4 = Titania -Uranus:Moon5 = Oberon +;Uranus:Moon1 = Miranda +;Uranus:Moon2 = Ariel +;Uranus:Moon3 = Umbriel +;Uranus:Moon4 = Titania +;Uranus:Moon5 = Oberon Planet8 = Neptune -Neptune:Moon1 = Triton -Neptune:Moon2 = Proteus -Neptune:Moon3 = Nereid \ No newline at end of file +;Neptune:Moon1 = Triton +;Neptune:Moon2 = Proteus +;Neptune:Moon3 = Nereid \ No newline at end of file diff --git a/Doc/Project Apollo - NASSP/NASSP Quick Start Guide.pdf b/Doc/Project Apollo - NASSP/NASSP Quick Start Guide.pdf index 4e443b79cf..9a944c5672 100644 Binary files a/Doc/Project Apollo - NASSP/NASSP Quick Start Guide.pdf and b/Doc/Project Apollo - NASSP/NASSP Quick Start Guide.pdf differ diff --git a/Doc/Project Apollo - NASSP/Programmers Notes/NASSP Quick Start Guide.docx b/Doc/Project Apollo - NASSP/Programmers Notes/NASSP Quick Start Guide.docx index 6771ff3025..49c5165f2e 100644 Binary files a/Doc/Project Apollo - NASSP/Programmers Notes/NASSP Quick Start Guide.docx and b/Doc/Project Apollo - NASSP/Programmers Notes/NASSP Quick Start Guide.docx differ diff --git a/Orbitersdk/samples/ProjectApollo/.gitignore b/Orbitersdk/samples/ProjectApollo/.gitignore new file mode 100644 index 0000000000..345dc6cfe2 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/.gitignore @@ -0,0 +1,12 @@ +CMakeLists.txt.user +CMakeCache.txt +CMakeFiles +CMakeScripts +Testing +Makefile +cmake_install.cmake +install_manifest.txt +compile_commands.json +CTestTestfile.cmake +_deps +out/ \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt new file mode 100644 index 0000000000..017251d91e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/CMakeLists.txt @@ -0,0 +1,149 @@ +cmake_minimum_required(VERSION 3.19) + +# Set the project name +project(NASSP VERSION 9.0) + +# Set C++ compiler variables +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +if(CMAKE_SIZEOF_VOID_P EQUAL 8) # 64-bit build? + set(BUILD64 1) + set(ARCH "x64") + set(PLATFORM_STRING "x64") +else() + set(BUILD64 0) + set(ARCH "x86") + set(PLATFORM_STRING "Win32") +endif() + +if (NOT ${CMAKE_GENERATOR} STREQUAL "Ninja") + add_compile_options(/MP) +endif() + +#Add /permissive if using C++20 or higher +#add_compile_options(/permissive) + +# Group projects in VS +set_property(GLOBAL PROPERTY USE_FOLDERS ON) + +# Set NASSP-related variables +set(NASSP_SOURCE_ROOT ${CMAKE_SOURCE_DIR}) +set(NASSP_REPO_ROOT ${NASSP_SOURCE_ROOT}/../../../) + +# Check if the user has specified a non-default Orbiter installation location. +# If not, use the default and alert the user. +set(ORBITER_INSTALL_DIR ${NASSP_REPO_ROOT} CACHE STRING "Location of OpenOrbiter installation directory") +set(ORBITERSDK_DIR ${ORBITER_INSTALL_DIR}/Orbitersdk) + +# Allow having a separate installation directory than the Orbiter installation folder. +# This is generally meant for automated build systems or for folks who want to produce +# an installation package of just NASSP's data and modules without +# including Orbiter data or any NASSP git data or source files. +set(FINAL_INSTALL_DIR ${ORBITER_INSTALL_DIR} CACHE STRING "Location for final build/file copy output, defaults to your chosen Orbiter install directory") + +if(EXISTS ${ORBITER_INSTALL_DIR}/lua.dll) + set(OPENORBITER ON) + message("[NASSP] Configured for OpenOrbiter build.") +else() + set(OPENORBITER OFF) + message("[NASSP] Configured for Orbiter Beta build.") +endif() + +# Microsoft Visual C compiler specific options +if(MSVC) + # Flag pointer truncation as an error because if it happens that's bad news! + add_compile_options("/we4311") + # We need to force the linker to compile us against the statically-linked + # C runtime when building for Orbiter Beta due to XRSound. + if(NOT OPENORBITER) + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") + #add_compile_options("/MT") + endif() + add_link_options("/NODEFAULTLIB:LIBCMTD") +endif() + +# Set project libraries to output their DLL files and debug info to +# the final installation dir's "Modules/ProjectApollo" directory, +# unless a sub-project's CMakeLists.txt file overrides this locally, +# such as MFDs, which need to go in "Modules/Plugins" or PanelSDK, +# which can stay in the default directory since it's statically linked. +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) +# Workaround for buildbot appending build config name to output path. +# If we start building with another config besides "RelWithDebInfo", this needs +# to be changed in this file and any projects which output to a different directory, +# such as MFDs or ProjectApolloConfigurator. +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) + +# Sub-projects are what actually build all our vessels, MFDs, etc. +add_subdirectory(Project/PanelSDK) +add_subdirectory(Project/ApolloRTCCMFD) +add_subdirectory(Project/ASTP) +add_subdirectory(Project/CMChute) +add_subdirectory(Project/Crawler) +add_subdirectory(Project/EVA) +add_subdirectory(Project/Flag) +add_subdirectory(Project/FloatBag) +add_subdirectory(Project/Floodlight) +add_subdirectory(Project/LC34) +add_subdirectory(Project/LC37) +add_subdirectory(Project/LCC) +add_subdirectory(Project/LEM) +add_subdirectory(Project/LES) +add_subdirectory(Project/LEVA) +add_subdirectory(Project/LRV) +add_subdirectory(Project/MCC) +add_subdirectory(Project/ML) +add_subdirectory(Project/MSS) +add_subdirectory(Project/ProjectApolloConfigurator) +add_subdirectory(Project/ProjectApolloMFD) +add_subdirectory(Project/Saturn1B) +add_subdirectory(Project/Saturn5) +add_subdirectory(Project/s1b) +add_subdirectory(Project/s1c) +add_subdirectory(Project/Sat1bAbort1) +add_subdirectory(Project/Sat1bAbort2) +add_subdirectory(Project/Sat5Abort1) +add_subdirectory(Project/Sat5Abort2) +add_subdirectory(Project/Sat5Abort3) +add_subdirectory(Project/Sat5LMDSC) +add_subdirectory(Project/sii) +add_subdirectory(Project/SIVB) +add_subdirectory(Project/Skylab) +add_subdirectory(Project/sm) +add_subdirectory(Project/VAB) + + +# Copy all relevant documents/scenarios/sounds/configs from this +# repository into the configured final destination directory. +# This will only happen if the NASSP repo is NOT located inside +# the Orbiter installation directory. If we are located +# inside an Orbiter installation, we can't easily differentiate +# between our own files and those included with Orbiter. +if(${NASSP_REPO_ROOT} STREQUAL ${ORBITER_INSTALL_DIR}) + message("[NASSP] Refusing to copy config files, NASSP is cloned directly into an Orbiter installation.") +elseif(${NASSP_REPO_ROOT} STREQUAL ${FINAL_INSTALL_DIR}) + message("[NASSP] Unnecessary to copy config files, final output directory is the NASSP repo location.") +else() + message("[NASSP] Copying config/data files to final destination directory is possible with \"Install\".") + message("[NASSP] Final destination directory: ${FINAL_INSTALL_DIR}") + + # Create the list of input directories to be copied to the install location + set(NASSP_INSTALL_DIR_LIST + "Config" + "Doc" + "Html" + "Meshes" + "Missions" + "Scenarios" + "Script" + "Sound" + "Textures" + "XRSound" + ) + + file(TO_CMAKE_PATH ${FINAL_INSTALL_DIR} destination_fixed) + foreach(dir ${NASSP_INSTALL_DIR_LIST}) + install(DIRECTORY ${NASSP_REPO_ROOT}/${dir} DESTINATION ${destination_fixed}) + endforeach() +endif() diff --git a/Orbitersdk/samples/ProjectApollo/CMakeSettings.json b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json new file mode 100644 index 0000000000..ccf2deb2be --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/CMakeSettings.json @@ -0,0 +1,60 @@ +{ + "configurations": [ + { + "name": "x64-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x64_x64" ] + }, + { + "name": "x64-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x64_x64" ], + "variables": [ + { + "name": "FINAL_INSTALL_DIR", + "value": "C:\\Users\\James\\Desktop\\Games\\Orbiter 2024 x64", + "type": "STRING" + }, + { + "name": "ORBITER_INSTALL_DIR", + "value": "C:\\Users\\James\\Desktop\\Games\\Orbiter 2024 x64", + "type": "STRING" + } + ] + }, + { + "name": "x86-Debug", + "generator": "Ninja", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x86" ] + }, + { + "name": "x86-Release", + "generator": "Ninja", + "configurationType": "RelWithDebInfo", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "installRoot": "${projectDir}\\out\\install\\${name}", + "cmakeCommandArgs": "", + "buildCommandArgs": "", + "ctestCommandArgs": "", + "inheritEnvironments": [ "msvc_x86" ] + } + ] +} \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt new file mode 100644 index 0000000000..c6e3c10026 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ASTP/CMakeLists.txt @@ -0,0 +1,24 @@ +project(ASTP) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/ASTP.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/payload.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt new file mode 100644 index 0000000000..85baaa2c13 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ApolloRTCCMFD/CMakeLists.txt @@ -0,0 +1,63 @@ +project(ApolloRTCCMFD) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_rtccmfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/rtcc.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/AnalyticEphemerisGenerator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApolloGeneralizedOpticsProgram.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApollomfdButtons.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApolloRTCCMFD.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApolloRTCCMFD_Display.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ARCore.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ARoapiModule.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/AscentRendezvousMonitor.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/CoastNumericalIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/CSMLMGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/EnckeIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/EntryCalculations.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/GeneralizedIterator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/GeneralPurposeManeuver.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LDPP.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LMGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LOITargeting.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LunarTargetingProgram.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LWP.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ReentryNumericalIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCC_EMSMISS.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/rtcc_intermediate_library_programs.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/rtcc_library_programs.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCCModule.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCCDisplayFormatting.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLIGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLIProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLMCC.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLTrajectoryComputers.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TwoImpulseProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Plugin) +# Workaround for buildbot appending build config name to output path +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/Plugin) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + WinMM + WS2_32 +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt new file mode 100644 index 0000000000..689db7cb37 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/CMChute/CMakeLists.txt @@ -0,0 +1,21 @@ +project(CMChute) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_landing + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_landing/CMChute.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt new file mode 100644 index 0000000000..e0257cde36 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Crawler/CMakeLists.txt @@ -0,0 +1,28 @@ +project(Crawler) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_launch/Crawler.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt new file mode 100644 index 0000000000..cb3818959a --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/EVA/CMakeLists.txt @@ -0,0 +1,24 @@ +project(EVA) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_csm/eva.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Flag/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Flag/CMakeLists.txt new file mode 100644 index 0000000000..ec060aac38 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Flag/CMakeLists.txt @@ -0,0 +1,19 @@ +project(Flag) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_moon/flag.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt new file mode 100644 index 0000000000..8e91e35c28 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/FloatBag/CMakeLists.txt @@ -0,0 +1,21 @@ +project(FloatBag) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_landing + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_landing/FloatBag.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt new file mode 100644 index 0000000000..026266713b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Floodlight/CMakeLists.txt @@ -0,0 +1,26 @@ +project(Floodlight) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_launch/Floodlight.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt new file mode 100644 index 0000000000..a4828afd7b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LC34/CMakeLists.txt @@ -0,0 +1,35 @@ +project(LC34) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/IU_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilicalInterface.cpp + ${NASSP_SOURCE_ROOT}/src_launch/LC34.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RCA110A.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SCMUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SI_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SIB_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/TailUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt new file mode 100644 index 0000000000..941b91f555 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LC37/CMakeLists.txt @@ -0,0 +1,36 @@ +project(LC37) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/IU_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilicalInterface.cpp + ${NASSP_SOURCE_ROOT}/src_launch/LC37.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RCA110A.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SCMUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SI_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SIB_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/TailUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt new file mode 100644 index 0000000000..f0d51c1e4a --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LCC/CMakeLists.txt @@ -0,0 +1,26 @@ +project(LCC) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_rtccmfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/LCC.cpp + ${NASSP_SOURCE_ROOT}/src_launch/LCC_MFD.cpp + ${NASSP_SOURCE_ROOT}/src_launch/LCCMFDButtons.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RCA110A.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt new file mode 100644 index 0000000000..dc47b065c0 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LEM/CMakeLists.txt @@ -0,0 +1,114 @@ +# Set the project name +project(LEM) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_lm/yaAGS + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/animations.cpp + ${NASSP_SOURCE_ROOT}/src_aux/BasicExcelVC6.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCard.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardLocation.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardManager.cpp + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_aux/vesim.cpp + ${NASSP_SOURCE_ROOT}/src_lm/CWEA_FlipFlop.cpp + ${NASSP_SOURCE_ROOT}/src_lm/LEM.cpp + ${NASSP_SOURCE_ROOT}/src_lm/LEMcomputer.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemconnector.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemmesh.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lempanel.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemswitches.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemsystems.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lemvc.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_aca.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_aeaa.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_ags.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_aps.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_cwea.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_dps.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_ecs.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_eds.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_eps.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_lr.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_programer.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_rcs.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_rr.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_scea.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_telecom.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lm_ttca.cpp + ${NASSP_SOURCE_ROOT}/src_lm/lmscs.cpp + ${NASSP_SOURCE_ROOT}/src_lm/LMMalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_lm/yaAGS/aea_engine.c + ${NASSP_SOURCE_ROOT}/src_lm/yaAGS/aea_engine_init.c + ${NASSP_SOURCE_ROOT}/src_lm/yaAGS/OutputAPI_AGS.c + ${NASSP_SOURCE_ROOT}/src_mfd/MFDconnector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/apolloguidance.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cdu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistController.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistControllerHelpers.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dsky.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dskyinterface.cpp + ${NASSP_SOURCE_ROOT}/src_sys/FDAI.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imulog.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imumath.cpp + ${NASSP_SOURCE_ROOT}/src_sys/inertial.cpp + ${NASSP_SOURCE_ROOT}/src_sys/Malfunction.cpp + ${NASSP_SOURCE_ROOT}/src_sys/MalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_sys/mechanicalaccelerometer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/missiontimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/ordeal.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundevents.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp + ${NASSP_SOURCE_ROOT}/src_sys/payload.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp + ${NASSP_SOURCE_ROOT}/src_sys/toggleswitch.cpp + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine_init.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_utilities.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/Backtrace.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/random.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/rfopen.c +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(LEM PRIVATE ${NASSP_SOURCE_ROOT}/src_lm/LEMResources.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + GLU32 + dxguid + dinput8 + OpenGL32 + User32 + WinMM + WS2_32 + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt new file mode 100644 index 0000000000..4e74318d07 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LES/CMakeLists.txt @@ -0,0 +1,20 @@ +project(LES) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/LES.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt new file mode 100644 index 0000000000..6bcfbbe100 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LEVA/CMakeLists.txt @@ -0,0 +1,30 @@ +project(LEVA) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_moon/leva.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt new file mode 100644 index 0000000000..d920010c95 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/LRV/CMakeLists.txt @@ -0,0 +1,30 @@ +project(LRV) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_moon/lrv.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt new file mode 100644 index 0000000000..50accd11c7 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/MCC/CMakeLists.txt @@ -0,0 +1,79 @@ +project(MCC) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_rtccmfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_launch/mcc.cpp + ${NASSP_SOURCE_ROOT}/src_launch/mccvc.cpp + ${NASSP_SOURCE_ROOT}/src_launch/mccvessel.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Calculations.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_B.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_C.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_C_PRIME.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_D.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_F.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_G.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_H1.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MCC_Mission_SL.cpp + ${NASSP_SOURCE_ROOT}/src_launch/rtcc.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_Calculations.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_B.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_C.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_C_PRIME.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_D.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_F.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_G.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_H1.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RTCC_Mission_SL.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/AnalyticEphemerisGenerator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ApolloGeneralizedOpticsProgram.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/AscentRendezvousMonitor.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/CoastNumericalIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/CSMLMGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/EnckeIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/EntryCalculations.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/GeneralizedIterator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/GeneralPurposeManeuver.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LDPP.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LMGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LOITargeting.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LunarTargetingProgram.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/LWP.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/ReentryNumericalIntegrator.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCC_EMSMISS.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCCDisplayFormatting.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/rtcc_intermediate_library_programs.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/rtcc_library_programs.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/RTCCModule.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLIGuidanceSim.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLIProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLMCC.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TLTrajectoryComputers.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/TwoImpulseProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/ProjectApollo) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + WinMM + WS2_32 +) diff --git a/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt new file mode 100644 index 0000000000..1b9c7c129b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ML/CMakeLists.txt @@ -0,0 +1,38 @@ +project(ML) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_launch/IU_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/IUUmbilicalInterface.cpp + ${NASSP_SOURCE_ROOT}/src_launch/ML.cpp + ${NASSP_SOURCE_ROOT}/src_launch/RCA110A.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SCMUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SI_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SIB_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/SIC_ESE.cpp + ${NASSP_SOURCE_ROOT}/src_launch/TailUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_launch/TSMUmbilical.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt new file mode 100644 index 0000000000..9a65a1b23e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/MSS/CMakeLists.txt @@ -0,0 +1,28 @@ +project(MSS) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_launch/MSS.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt new file mode 100644 index 0000000000..0baefc4799 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/PanelSDK/CMakeLists.txt @@ -0,0 +1,31 @@ +project(PanelSDK) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/PanelSDK.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/BUILD.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Matrix.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Vectors.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/VSMGMT.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/esysparse.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/esystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/hsysparse.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/hsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals/thermal.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} STATIC ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt new file mode 100644 index 0000000000..14b259eb0f --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloConfigurator/CMakeLists.txt @@ -0,0 +1,30 @@ +project(ProjectApolloConfigurator) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/vesim.cpp + ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Startup) +# Workaround for buildbot appending build config name to output path +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/Startup) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(ProjectApolloConfigurator PRIVATE ${NASSP_SOURCE_ROOT}/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + dxguid + dinput8 + GLU32 + User32 + Orbiter + Orbitersdk + OpenGL32 +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt new file mode 100644 index 0000000000..c6e2551a4e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/ProjectApolloMFD/CMakeLists.txt @@ -0,0 +1,39 @@ +project(ProjectApolloMFD) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_rtccmfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_mfd/MFDConnector.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/ProjectApolloChecklistMFD.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/ProjectApolloMFD.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/ProjectApolloMFDButtons.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/ProjectApolloPlugin.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) + +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${FINAL_INSTALL_DIR}/Modules/Plugin) +# Workaround for buildbot appending build config name to output path +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${FINAL_INSTALL_DIR}/Modules/Plugin) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(ProjectApolloMFD PRIVATE ${NASSP_SOURCE_ROOT}/src_mfd/MFDResources.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + User32 + Orbiter + Orbitersdk + WinMM + WS2_32 +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt new file mode 100644 index 0000000000..7c1b78937e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/SIVB/CMakeLists.txt @@ -0,0 +1,47 @@ +project(SIVB) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/dcs.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/eds.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/FCC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/iu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUAuxiliaryPowerDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlSignalProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDA.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/lvimu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sivb.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sivbsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/inertial.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt new file mode 100644 index 0000000000..3359998979 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort1/CMakeLists.txt @@ -0,0 +1,29 @@ +project(Sat1bAbort1) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/Saturn1Abort.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt new file mode 100644 index 0000000000..6eb7a974ff --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat1bAbort2/CMakeLists.txt @@ -0,0 +1,29 @@ +project(Sat1bAbort2) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/Saturn1Abort2.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt new file mode 100644 index 0000000000..48b15f1aca --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort1/CMakeLists.txt @@ -0,0 +1,29 @@ +project(Sat5Abort1) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/Sat5Abort1.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt new file mode 100644 index 0000000000..51430e0d21 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort2/CMakeLists.txt @@ -0,0 +1,29 @@ +project(Sat5Abort2) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/Sat5Abort2.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt new file mode 100644 index 0000000000..478d759e86 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5Abort3/CMakeLists.txt @@ -0,0 +1,31 @@ +project(Sat5Abort3) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_csm/smjc.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/Sat5Abort3.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt new file mode 100644 index 0000000000..9c3f09bb85 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Sat5LMDSC/CMakeLists.txt @@ -0,0 +1,31 @@ +project(Sat5LMDSC) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_lm/Sat5LMDSC.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt new file mode 100644 index 0000000000..bdf134ffbb --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn1B/CMakeLists.txt @@ -0,0 +1,132 @@ +# Set the project name +project(Saturn1B) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_landing + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/animations.cpp + ${NASSP_SOURCE_ROOT}/src_aux/BasicExcelVC6.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCard.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardLocation.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardManager.cpp + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_aux/vesim.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csm_telecom.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmcautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_csm/CSMcomputer.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmconnector.cpp + ${NASSP_SOURCE_ROOT}/src_csm/CSMMalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmrcs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmsensors.cpp + ${NASSP_SOURCE_ROOT}/src_csm/dockingprobe.cpp + ${NASSP_SOURCE_ROOT}/src_csm/ecs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/eps.cpp + ${NASSP_SOURCE_ROOT}/src_csm/rhc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sce.cpp + ${NASSP_SOURCE_ROOT}/src_csm/scs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturn.cpp + ${NASSP_SOURCE_ROOT}/src_csm/satswitches.cpp + ${NASSP_SOURCE_ROOT}/src_csm/satsystems.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnmesh.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnpanel.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnvc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/secs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/smjc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sps.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/MFDconnector.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/saturn1b.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/canard.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/dcs.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/eds.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/FCC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/iu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUAuxiliaryPowerDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlSignalProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/j2engine.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDA.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/lvimu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/qball.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/s1bsystems.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sat1bmesh.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/siisystems.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sivbsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/apolloguidance.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cdu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistController.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistControllerHelpers.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dsky.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dskyinterface.cpp + ${NASSP_SOURCE_ROOT}/src_sys/FDAI.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imulog.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imumath.cpp + ${NASSP_SOURCE_ROOT}/src_sys/inertial.cpp + ${NASSP_SOURCE_ROOT}/src_sys/Malfunction.cpp + ${NASSP_SOURCE_ROOT}/src_sys/MalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_sys/mechanicalaccelerometer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/missiontimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/ordeal.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundevents.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp + ${NASSP_SOURCE_ROOT}/src_sys/payload.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp + ${NASSP_SOURCE_ROOT}/src_sys/toggleswitch.cpp + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine_init.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_utilities.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/Backtrace.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/random.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/rfopen.c +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/lib/Lua) +link_directories(${ORBITERSDK_DIR}/..) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(Saturn1B PRIVATE ${NASSP_SOURCE_ROOT}/src_csm/Resources.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + GLU32 + dxguid + dinput8 + OpenGL32 + User32 + WinMM + WS2_32 + Orbiter + Orbitersdk + PanelSDK + XRSound +) +if(OPENORBITER) + target_link_libraries(${PROJECT_NAME} PRIVATE lua) +else() + target_link_libraries(${PROJECT_NAME} PRIVATE lua5.1) +endif() \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt new file mode 100644 index 0000000000..2e99558f4b --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Saturn5/CMakeLists.txt @@ -0,0 +1,131 @@ +project(Saturn5) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_landing + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_moon + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK/Internals + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/animations.cpp + ${NASSP_SOURCE_ROOT}/src_aux/BasicExcelVC6.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CDK.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCard.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardLocation.cpp + ${NASSP_SOURCE_ROOT}/src_aux/CueCardManager.cpp + ${NASSP_SOURCE_ROOT}/src_aux/Mission.cpp + ${NASSP_SOURCE_ROOT}/src_aux/OrbiterMath.cpp + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_aux/vesim.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csm_telecom.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmcautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_csm/CSMcomputer.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmconnector.cpp + ${NASSP_SOURCE_ROOT}/src_csm/CSMMalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmrcs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/csmsensors.cpp + ${NASSP_SOURCE_ROOT}/src_csm/dockingprobe.cpp + ${NASSP_SOURCE_ROOT}/src_csm/ecs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/eps.cpp + ${NASSP_SOURCE_ROOT}/src_csm/rhc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sce.cpp + ${NASSP_SOURCE_ROOT}/src_csm/scs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturn.cpp + ${NASSP_SOURCE_ROOT}/src_csm/satswitches.cpp + ${NASSP_SOURCE_ROOT}/src_csm/satsystems.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnmesh.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnpanel.cpp + ${NASSP_SOURCE_ROOT}/src_csm/saturnvc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/secs.cpp + ${NASSP_SOURCE_ROOT}/src_csm/smjc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sps.cpp + ${NASSP_SOURCE_ROOT}/src_mfd/MFDconnector.cpp + ${NASSP_SOURCE_ROOT}/src_rtccmfd/OrbMech.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/saturn5.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/canard.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/dcs.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/eds.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/FCC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/iu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUAuxiliaryPowerDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlDistributor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/IUControlSignalProcessor.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/j2engine.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDA.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/LVDC.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/lvimu.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/qball.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/s1csystems.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sat5mesh.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/siisystems.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/sivbsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/apolloguidance.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cautionwarning.cpp + ${NASSP_SOURCE_ROOT}/src_sys/cdu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistController.cpp + ${NASSP_SOURCE_ROOT}/src_sys/checklistControllerHelpers.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dsky.cpp + ${NASSP_SOURCE_ROOT}/src_sys/dskyinterface.cpp + ${NASSP_SOURCE_ROOT}/src_sys/FDAI.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imu.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imulog.cpp + ${NASSP_SOURCE_ROOT}/src_sys/imumath.cpp + ${NASSP_SOURCE_ROOT}/src_sys/inertial.cpp + ${NASSP_SOURCE_ROOT}/src_sys/Malfunction.cpp + ${NASSP_SOURCE_ROOT}/src_sys/MalfunctionSimulation.cpp + ${NASSP_SOURCE_ROOT}/src_sys/mechanicalaccelerometer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/missiontimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/ordeal.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundevents.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp + ${NASSP_SOURCE_ROOT}/src_sys/payload.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/thread.cpp + ${NASSP_SOURCE_ROOT}/src_sys/toggleswitch.cpp + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_engine_init.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/agc_utilities.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/Backtrace.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/random.c + ${NASSP_SOURCE_ROOT}/src_sys/yaAGC/rfopen.c +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/lib/Lua) +link_directories(${ORBITERSDK_DIR}/..) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_sources(Saturn5 PRIVATE ${NASSP_SOURCE_ROOT}/src_csm/Resources.rc) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + GLU32 + dxguid + dinput8 + OpenGL32 + User32 + WinMM + WS2_32 + Orbiter + Orbitersdk + PanelSDK + XRSound +) +if(OPENORBITER) + target_link_libraries(${PROJECT_NAME} PRIVATE lua) +else() + target_link_libraries(${PROJECT_NAME} PRIVATE lua5.1) +endif() \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt new file mode 100644 index 0000000000..4251bd1f3e --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/Skylab/CMakeLists.txt @@ -0,0 +1,36 @@ +project(Skylab) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_lm + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_skylab + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_skylab/ATMDC.cpp + ${NASSP_SOURCE_ROOT}/src_skylab/skylab.cpp + ${NASSP_SOURCE_ROOT}/src_skylab/SkylabConnector.cpp + ${NASSP_SOURCE_ROOT}/src_skylab/SkylabMesh.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/powersource.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt new file mode 100644 index 0000000000..906e4d7711 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/VAB/CMakeLists.txt @@ -0,0 +1,29 @@ +project(VAB) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_aux/tracer.cpp + ${NASSP_SOURCE_ROOT}/src_launch/VAB.cpp + ${NASSP_SOURCE_ROOT}/src_launch/VABAnimations.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt new file mode 100644 index 0000000000..c6d9b3d080 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/s1b/CMakeLists.txt @@ -0,0 +1,33 @@ +project(s1b) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/s1b.cpp + ${NASSP_SOURCE_ROOT}/src_saturn/s1bsystems.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt new file mode 100644 index 0000000000..e75e73d10d --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/s1c/CMakeLists.txt @@ -0,0 +1,32 @@ +project(s1c) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/s1c.cpp + ${NASSP_SOURCE_ROOT}/src_sys/connector.cpp + ${NASSP_SOURCE_ROOT}/src_sys/pyro.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt new file mode 100644 index 0000000000..ff901f7033 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/sii/CMakeLists.txt @@ -0,0 +1,29 @@ +project(sii) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_launch + ${NASSP_SOURCE_ROOT}/src_mfd + ${NASSP_SOURCE_ROOT}/src_saturn + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_saturn/sii.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt b/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt new file mode 100644 index 0000000000..2223762531 --- /dev/null +++ b/Orbitersdk/samples/ProjectApollo/Project/sm/CMakeLists.txt @@ -0,0 +1,29 @@ +project(sm) + +set(INCLUDE_DIRS + ${NASSP_SOURCE_ROOT}/src_aux + ${NASSP_SOURCE_ROOT}/src_csm + ${NASSP_SOURCE_ROOT}/src_sys + ${NASSP_SOURCE_ROOT}/src_sys/PanelSDK + ${ORBITERSDK_DIR}/include + ${ORBITERSDK_DIR}/XRSound +) +set(SOURCES + ${NASSP_SOURCE_ROOT}/src_csm/smjc.cpp + ${NASSP_SOURCE_ROOT}/src_csm/sm.cpp + ${NASSP_SOURCE_ROOT}/src_sys/DelayTimer.cpp + ${NASSP_SOURCE_ROOT}/src_sys/soundlib.cpp +) + +link_directories(${ORBITERSDK_DIR}/lib) +link_directories(${ORBITERSDK_DIR}/XRSound) +link_directories(${CMAKE_BINARY_DIR}/Projects/PanelSDK) + +add_library(${PROJECT_NAME} SHARED ${SOURCES}) +target_include_directories(${PROJECT_NAME} PRIVATE ${INCLUDE_DIRS}) +target_link_libraries(${PROJECT_NAME} PRIVATE + Orbiter + Orbitersdk + PanelSDK + XRSound +) \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp b/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp index ac756e6a04..1e07d4ab2a 100644 --- a/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_aux/ProjectApolloConfigurator/ProjectApolloConfigurator.cpp @@ -33,6 +33,7 @@ #include "resource.h" #include #include "vesim.h" +#include // ============================================================== // Some global parameters @@ -89,9 +90,9 @@ class ProjectApolloConfigurator: public LaunchpadItem { char *Description() { return "Global configuration for Project Apollo - NASSP."; } bool clbkOpen (HWND hLaunchpad); int clbkWriteConfig (); - static BOOL CALLBACK DlgProcFrame (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - static BOOL CALLBACK DlgProcVisual (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); - static BOOL CALLBACK DlgProcControl (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static INT_PTR CALLBACK DlgProcFrame (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static INT_PTR CALLBACK DlgProcVisual (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); + static INT_PTR CALLBACK DlgProcControl (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); protected: void WriteConfig(FILEHANDLE hFile); @@ -227,7 +228,7 @@ void ProjectApolloConfigurator::WriteConfig(FILEHANDLE hFile) oapiCloseFile (hFile, FILE_OUT); } -BOOL CALLBACK ProjectApolloConfigurator::DlgProcFrame (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK ProjectApolloConfigurator::DlgProcFrame (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { TCITEM tabitem; HWND hTab; @@ -432,7 +433,7 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcFrame (HWND hWnd, UINT uMsg, WPA return 0; } -BOOL CALLBACK ProjectApolloConfigurator::DlgProcVisual (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK ProjectApolloConfigurator::DlgProcVisual (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { switch (uMsg) { case WM_INITDIALOG: // display the current value @@ -453,7 +454,7 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcVisual (HWND hWnd, UINT uMsg, WP return 0; } -BOOL CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { char buffer[100]; @@ -547,7 +548,7 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, W } else if (HIWORD(wParam) == BN_CLICKED && (HWND)lParam == GetDlgItem(hWnd, IDC_BUTTON_CREATECONFIG)) { std::string configdir = "Config\\ProjectApollo\\Vesim\\"; LPDIRECTINPUT8 dx8ppv; - HRESULT hr = DirectInput8Create((HINSTANCE) GetWindowLong(hWnd, GWL_HINSTANCE), DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&dx8ppv, NULL); // Give us a DirectInput context + HRESULT hr = DirectInput8Create((HINSTANCE) GetWindowLongPtr(hWnd, GWLP_HINSTANCE), DIRECTINPUT_VERSION, IID_IDirectInput8, (void **)&dx8ppv, NULL); // Give us a DirectInput context if (!FAILED(hr)) { Vesim lmvm(NULL, NULL), csmvm(NULL, NULL); lmvm.setupDevices("LM", dx8ppv); @@ -572,7 +573,7 @@ BOOL CALLBACK ProjectApolloConfigurator::DlgProcControl (HWND hWnd, UINT uMsg, W // set the text color in (HDC)lParam SetBkMode((HDC)wParam,TRANSPARENT); SetTextColor((HDC)wParam, RGB(255,0,0)); - return (BOOL)CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); + return (INT_PTR)CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); } break; } diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/dinput8.lib b/Orbitersdk/samples/ProjectApollo/src_aux/dinput8.lib deleted file mode 100644 index 3fad62fbd1..0000000000 Binary files a/Orbitersdk/samples/ProjectApollo/src_aux/dinput8.lib and /dev/null differ diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib b/Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib deleted file mode 100644 index 37bf188bc4..0000000000 Binary files a/Orbitersdk/samples/ProjectApollo/src_aux/dsound.lib and /dev/null differ diff --git a/Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib b/Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib deleted file mode 100644 index f251a925fe..0000000000 Binary files a/Orbitersdk/samples/ProjectApollo/src_aux/dxguid.lib and /dev/null differ diff --git a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp index 447d5070c6..626e410717 100644 --- a/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_csm/saturn.cpp @@ -2972,7 +2972,7 @@ void Saturn::GetScenarioState (FILEHANDLE scn, void *vstatus) // find. // - srandom(VehicleNo + (int) vstatus + (int) time(0)); + srandom(VehicleNo + (size_t) vstatus + (int) time(0)); // // At some point we should reorder these checks by length, to minimise the chances diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp index 6b90f276e8..63a463ba48 100644 --- a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.cpp @@ -38,12 +38,12 @@ LCC_MFD::~LCC_MFD(void) return; } -int LCC_MFD::MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) +OAPI_MSGTYPE LCC_MFD::MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { switch (msg) { case OAPI_MSG_MFD_OPENED: - return (int)(new LCC_MFD(LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); + return (OAPI_MSGTYPE)(new LCC_MFD(LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); } return 0; } diff --git a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h index 5eb2896421..135e326cdc 100644 --- a/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_launch/LCC_MFD.h @@ -28,6 +28,11 @@ #include "LCC.h" #include "LCCMFDButtons.h" + +#ifndef OAPI_MSGTYPE +typedef int OAPI_MSGTYPE; +#endif + class LCC_MFD :public MFD2 { private: @@ -50,7 +55,7 @@ class LCC_MFD :public MFD2 void set_SLCCDiscreteInput(int n, bool set); void LoadCheckoutProgram(const char *str); - static int MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); protected: const LCCMFDButtons m_buttonPages; diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.cpp b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.cpp index f33fdd4582..1cb493c4f3 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.cpp @@ -1506,13 +1506,13 @@ void ProjectApolloChecklistMFD::RecallStatus (void) { } -int ProjectApolloChecklistMFD::MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) +OAPI_MSGTYPE ProjectApolloChecklistMFD::MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { switch (msg) { case OAPI_MSG_MFD_OPENED: // Our new MFD mode has been selected, so we create the MFD and // return a pointer to it. - return (int)(new ProjectApolloChecklistMFD (LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); + return (OAPI_MSGTYPE)(new ProjectApolloChecklistMFD (LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); } return 0; } diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h index efbb1219b5..dd245cb487 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloChecklistMFD.h @@ -27,6 +27,10 @@ class MCC; +#ifndef OAPI_MSGTYPE +typedef int OAPI_MSGTYPE; +#endif + class ProjectApolloChecklistMFD: public MFD2 { public: ProjectApolloChecklistMFD (DWORD w, DWORD h, VESSEL *vessel); @@ -42,7 +46,7 @@ class ProjectApolloChecklistMFD: public MFD2 { void RecallStatus (void); void substituteVariables(char *buffer,int buflen); - static int MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); MFDConnector conn; vector groups; diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp index 4412528087..fc05fb1011 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.cpp @@ -2843,13 +2843,13 @@ void ProjectApolloMFD::RecallStatus (void) } // MFD message parser -int ProjectApolloMFD::MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) +OAPI_MSGTYPE ProjectApolloMFD::MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { switch (msg) { case OAPI_MSG_MFD_OPENED: // Our new MFD mode has been selected, so we create the MFD and // return a pointer to it. - return (int)(new ProjectApolloMFD (LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); + return (OAPI_MSGTYPE)(new ProjectApolloMFD (LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam)); } return 0; } diff --git a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h index 6d7c48416a..5ebe96d1ba 100644 --- a/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h +++ b/Orbitersdk/samples/ProjectApollo/src_mfd/ProjectApolloMFD.h @@ -34,6 +34,10 @@ class MCC; class SIVB; class Skylab; +#ifndef OAPI_MSGTYPE +typedef int OAPI_MSGTYPE; +#endif + /// /// \ingroup MFD /// @@ -128,7 +132,7 @@ class ProjectApolloMFD: public MFD2 { void ReadStatus (FILEHANDLE scn); void StoreStatus (void) const; void RecallStatus (void); - static int MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc (UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); protected: diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.cpp b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.cpp index ddfb55321e..7d3c4f691c 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.cpp @@ -75,10 +75,10 @@ DLLCLBK void ExitModule(HINSTANCE hDLL) { // Called by Orbiter when mod nGutsUsed = 0; } -int ARoapiModule::MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { // Message parser, handling MFD open requests +OAPI_MSGTYPE ARoapiModule::MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam) { // Message parser, handling MFD open requests switch (msg) { case OAPI_MSG_MFD_OPENED: - return (int)(new ApolloRTCCMFD(LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam, mfd)); // Open an ephemeral RTCC instance each time we make a new RTCC MFD, plus F8, etc/ + return (OAPI_MSGTYPE)(new ApolloRTCCMFD(LOWORD(wparam), HIWORD(wparam), (VESSEL*)lparam, mfd)); // Open an ephemeral RTCC instance each time we make a new RTCC MFD, plus F8, etc/ } return 0; } diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h index 6544d73bc7..01449b1dc9 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/ARoapiModule.h @@ -26,6 +26,10 @@ See http://nassp.sourceforge.net/license/ for more details. #include "Orbitersdk.h" +#ifndef OAPI_MSGTYPE +typedef int OAPI_MSGTYPE; +#endif + class ARoapiModule : public oapi::Module { public: ARoapiModule(HINSTANCE hDLL); @@ -35,6 +39,6 @@ class ARoapiModule : public oapi::Module { void clbkPreStep(double simt, double simdt, double mjd); void clbkPostStep(double simt, double simdt, double mjd); void clbkDeleteVessel(OBJHANDLE hVessel); - static int MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); + static OAPI_MSGTYPE MsgProc(UINT msg, UINT mfd, WPARAM wparam, LPARAM lparam); }; \ No newline at end of file diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp index 794b8c9691..f8b132a263 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/EnckeIntegrator.cpp @@ -132,7 +132,7 @@ void EnckeFreeFlightIntegrator::Propagate(EMMENIInputTable &in) } else if (ISTOPS == 4 || ISTOPS == 6 || ISTOPS == 7 || ISTOPS == 8) { - //0.0001° tolerance + //0.0001� tolerance DEV = 0.0001*RAD; } else diff --git a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/RTCCSystemParameters.h b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/RTCCSystemParameters.h index 65ec39d063..6041912fd2 100644 --- a/Orbitersdk/samples/ProjectApollo/src_rtccmfd/RTCCSystemParameters.h +++ b/Orbitersdk/samples/ProjectApollo/src_rtccmfd/RTCCSystemParameters.h @@ -247,12 +247,12 @@ struct RTCCSystemParameters MDCMAT[5] = -5.1257e-7; MDCMAT[6] = 7.739e-8; MDCMAT[7] = 5.7700e-8; MDCMAT[8] = -3.4567e-9; MDSMAT[0] = -4.1312e-9; MDSMAT[1] = -8.9613e-7; MDSMAT[2] = 2.6809e-7; MDSMAT[3] = -2.15567e-8; MDSMAT[4] = 1.9885e-7; MDSMAT[5] = -4.4095e-7; MDSMAT[6] = 1.497e-7; MDSMAT[7] = -1.2389e-8; MDSMAT[8] = 6.4464e-9; - MGTESE = 0; //4 to use the full tesseral data. Use 0 in Orbiter Beta and earlier, 4 in Open Orbiter + MGTESE = 4; //4 to use the full tesseral data. Use 0 in Orbiter Beta and earlier, 4 in Open Orbiter //Moon MMCMAT[0] = 0.0; MMCMAT[1] = 0.20715e-4; MMCMAT[2] = 0.34e-4; MMCMAT[3] = 0.0; MMCMAT[4] = 0.02583e-4; MMCMAT[5] = 0.0; MMCMAT[6] = 0.0; MMCMAT[7] = 0.0; MMCMAT[8] = 0.0; MMSMAT[0] = 0.0; MMSMAT[1] = 0.0; MMSMAT[2] = 0.0; MMSMAT[3] = 0.0; MMSMAT[4] = 0.0; MMSMAT[5] = 0.0; MMSMAT[6] = 0.0; MMSMAT[7] = 0.0; MMSMAT[8] = 0.0; - MMTESE = 0; //3 with L1 model. Use 0 in Orbiter Beta and earlier, 3 in Open Orbiter + MMTESE = 3; //3 with L1 model. Use 0 in Orbiter Beta and earlier, 3 in Open Orbiter //Time from launch to EOI, seconds MDLIEV[0] = 0.76673814e3; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp index ebfb3b3cda..521fdf7cbb 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/PanelSDK/Internals/Hsysparse.cpp @@ -551,7 +551,7 @@ void H_system::Create_h_ExteriorVentPipe(char* line) { if (!out) { char errorBuffer[255]; sprintf_s(errorBuffer, sizeof(errorBuffer), "Fatal Error, could not connect %s to EXTERIOR_ENVIRONMENT:IN", name); - oapiWriteLogError(errorBuffer); + oapiWriteLogError(errorBuffer, "%s"); } int two_way = 1; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp index c303183cc6..71dbf6a467 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp +++ b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.cpp @@ -744,61 +744,6 @@ int SoundEvent::LoadMissionTimeSoundArray(const SoundLib &soundlib, char *soundn return true; } -int SoundEvent::InitDirectSound() -{ - -// LPDIRECTSOUND8 m_pDS; - HRESULT hr; -// LPDIRECTSOUNDBUFFER pDSBPrimary = NULL; - - TRACESETUP("INITDIRECTSOUND"); - - // Create IDirectSound using the primary sound device - hr = DirectSoundCreate8( NULL, &m_pDS, NULL ); - if (hr != DS_OK) - { - TRACE ("ERROR DIRECTSOUNDCREATE") - this->makeInvalid(); - return (false); - } - else TRACE("DIRECTSOUND CREATE OK"); - - // Set DirectSound coop level - hr = m_pDS->SetCooperativeLevel( GetActiveWindow() , DSSCL_PRIORITY ) ; - if (hr != DS_OK) - TRACE ("ERROR DIRECTSOUND SET COOP") - else TRACE("DIRECTSOUND SETCOOP OK"); - - // Get the primary buffer - DSBUFFERDESC dsbd; - ZeroMemory( &dsbd, sizeof(DSBUFFERDESC) ); - dsbd.dwSize = sizeof(DSBUFFERDESC); - dsbd.dwFlags = DSBCAPS_PRIMARYBUFFER; - dsbd.dwBufferBytes = 0; - dsbd.lpwfxFormat = NULL; - - hr = m_pDS->CreateSoundBuffer( &dsbd, &pDSBPrimary, NULL ); - if (hr != DS_OK) - TRACE ("ERROR DIRECTSOUND CREATE SOUND BUFFER") - else TRACE("DIRECTSOUND CREATE SOUND BUFFER OK"); - - WAVEFORMATEX wfx; - ZeroMemory( &wfx, sizeof(WAVEFORMATEX) ); - wfx.wFormatTag = (WORD) WAVE_FORMAT_PCM; - wfx.nChannels = (WORD) 2; - wfx.nSamplesPerSec = (DWORD) 22050; - wfx.wBitsPerSample = (WORD) 16; - wfx.nBlockAlign = (WORD) (wfx.wBitsPerSample / 8 * wfx.nChannels); - wfx.nAvgBytesPerSec = (DWORD) (wfx.nSamplesPerSec * wfx.nBlockAlign); - - hr = pDSBPrimary->SetFormat(&wfx); - if (hr != DS_OK) - TRACE ("ERROR DIRECTSOUND SET FORMAT") - else TRACE("DIRECTSOUND SET FORMAT OK"); - - return(true); -} - int SoundEvent::PlaySound(char *filenames,int newbuffer, double offset) { HMMIO m_hmmio; diff --git a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.h b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.h index d1fa3b7c23..43f6f41713 100644 --- a/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.h +++ b/Orbitersdk/samples/ProjectApollo/src_sys/soundevents.h @@ -64,7 +64,6 @@ class SoundEvent { int Done(); int LoadMissionLandingSoundArray(const SoundLib &soundlib,char *soundname); int LoadMissionTimeSoundArray(const SoundLib &soundlib, char *soundname, double MissionTime); - int InitDirectSound(); int PlaySound(char *filenames,int newbuffer,double offset); int IsPlaying(); int Finish(double offsetfinish); diff --git a/README.md b/README.md index 147769c2f7..6cd744d75e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ or accessible simulation there are plenty of better options, both for Orbiter and for other platforms. Orbiter is a Windows program, so this is a Windows-based project. You -will need Microsoft Visual Studio 2017 (or newer) to build the project. +will need Microsoft Visual Studio 2019/2022 (or newer) to build the project. Until someone ports Orbiter to other platforms (or produces an Orbiter-compatible simulator of sufficient capability) there's not much that can be done about this. Orbiter and NASSP might run under WINE, diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Launch T-20m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Launch T-20m.scn index 92b1add185..7f72af8fd4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Launch T-20m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 01 - Launch T-20m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - Launch T-20m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40359.6868319195 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -77,6 +80,8 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 12160 + LMPAD 1352 03363 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 @@ -571,6 +576,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Insertion.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Insertion.scn index 4066efc205..92963e99f5 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Insertion.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 02 - Insertion.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - Insertion END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40359.7098216302 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -68,6 +71,8 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 12160 + LMPAD 1352 03363 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 @@ -756,6 +761,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - TLI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - TLI T-15m.scn index de9f99697a..f8fb38994f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - TLI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 03 - TLI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - TLI T-15m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40359.7970705112 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -65,6 +68,8 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 12160 + LMPAD 1352 03363 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 @@ -976,6 +981,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - TDE.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - TDE.scn index 9772733a37..5286366897 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - TDE.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 04 - TDE.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - TDE END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40359.8258982647 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -64,6 +67,8 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1351 12160 + LMPAD 1352 03363 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 @@ -1000,6 +1005,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - MCC-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - MCC-2 T-15m.scn index 12b04055ab..9a45d8fd8a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - MCC-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 05 - MCC-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - MCC-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40360.7964776799 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -794,6 +797,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -10703,6 +10708,8 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1351 12160 + EMEM1352 3363 EMEM1452 73631 EMEM1453 70750 EMEM1454 1660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - LOI-1 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - LOI-1 T-15m.scn index 145fe91617..7ff0eca399 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - LOI-1 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 06 - LOI-1 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - LOI-1 T-15m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40362.8540869538 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -798,6 +801,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -10926,6 +10931,8 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1351 12160 + EMEM1352 3363 EMEM1452 73631 EMEM1453 70750 EMEM1454 1660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - LOI-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - LOI-2 T-15m.scn index b33a760b48..57839c976d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - LOI-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 07 - LOI-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - LOI-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40363.0373031563 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -866,6 +869,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -10962,6 +10967,8 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1351 12160 + EMEM1352 3363 EMEM1452 73631 EMEM1453 70750 EMEM1454 1660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - LM Powerup.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - LM Powerup.scn index ed73ed774c..2854384fd5 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - LM Powerup.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 08 - LM Powerup.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - LM Powerup END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40363.6483251643 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -823,6 +826,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -10338,6 +10343,8 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1351 12160 + EMEM1352 3363 EMEM1452 73631 EMEM1453 70750 EMEM1454 1660 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - DOI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - DOI T-15m.scn index 38035dda20..64ced4f8b2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - DOI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 09 - DOI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - DOI T-15m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40363.8467382164 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -874,6 +877,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -10997,6 +11002,8 @@ AGC_BEGIN EMEM1344 4175 EMEM1345 23625 EMEM1346 155 + EMEM1351 12160 + EMEM1352 3363 EMEM1361 3312 EMEM1363 3050 EMEM1364 12003 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Phasing T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Phasing T-15m.scn index b97bbfb37e..da96cc0370 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Phasing T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 10 - Phasing T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - Phasing T-15m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40363.8969394024 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -904,6 +907,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 140 EMEM2001 762 EMEM2002 23 @@ -11258,6 +11263,8 @@ AGC_BEGIN EMEM1344 4243 EMEM1345 3654 EMEM1346 155 + EMEM1351 12160 + EMEM1352 3363 EMEM1361 3312 EMEM1363 3227 EMEM1364 52100 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - LM Insertion T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - LM Insertion T-15m.scn index ba17be4da1..71f008c459 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - LM Insertion T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 11 - LM Insertion T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - LM Insertion T-15m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40363.9735374268 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -900,6 +903,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 140 EMEM2001 762 EMEM2002 23 @@ -11363,6 +11368,8 @@ AGC_BEGIN EMEM1344 4313 EMEM1345 37132 EMEM1346 155 + EMEM1351 12160 + EMEM1352 3363 EMEM1361 3312 EMEM1363 3227 EMEM1364 52100 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Post RNDZ Docking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Post RNDZ Docking.scn index 1640a42132..420d1e0877 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Post RNDZ Docking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 12 - Post RNDZ Docking.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - Post RNDZ Docking END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40364.1215012044 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -930,6 +933,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 23 EMEM2001 142 EMEM2002 23 @@ -11881,6 +11886,8 @@ AGC_BEGIN EMEM1344 4426 EMEM1345 4464 EMEM1346 155 + EMEM1351 12160 + EMEM1352 3363 EMEM1361 3312 EMEM1363 3712 EMEM1364 26007 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - TEI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - TEI T-15m.scn index 3a2f52a433..f7e5554760 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - TEI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 13 - TEI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - TEI T-15m END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40365.4220035632 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -917,6 +920,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 23 EMEM2001 142 EMEM2002 23 @@ -12672,6 +12677,8 @@ AGC_BEGIN EMEM1344 4527 EMEM1345 15261 EMEM1346 3434 + EMEM1351 12160 + EMEM1352 3363 EMEM1361 3312 EMEM1363 15257 EMEM1366 4 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Entry Prep.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Entry Prep.scn index 6f0fa0d0ad..b654b2129c 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Entry Prep.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 14 - Entry Prep.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - Entry Prep END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40367.6105657496 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -863,6 +866,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 37 EMEM2001 244 EMEM2002 23 @@ -6878,6 +6883,8 @@ AGC_BEGIN EMEM1344 4527 EMEM1345 15261 EMEM1346 3434 + EMEM1351 12160 + EMEM1352 3363 EMEM1361 3312 EMEM1363 15257 EMEM1366 4 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - Entry Interface.scn index dc86bdafd7..366a9ba1b8 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 10/Apollo 10 - 15 - Entry Interface.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 10 - Entry Interface END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40367.6929974364 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -882,6 +885,8 @@ AGC_BEGIN EMEM1770 30000 EMEM1771 2200 EMEM1772 15070 + EMEM1773 12160 + EMEM1774 3363 EMEM2000 37 EMEM2001 244 EMEM2002 23 @@ -7033,6 +7038,8 @@ AGC_BEGIN EMEM1344 4527 EMEM1345 15261 EMEM1346 3434 + EMEM1351 12160 + EMEM1352 3363 EMEM1361 3312 EMEM1363 15257 EMEM1366 4 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Launch T-20m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Launch T-20m.scn index b484a20b90..8adb35d5d9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Launch T-20m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 01 - Launch T-20m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - Launch T-20m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40418.5500079629 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -80,6 +83,8 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1352 12160 + LMPAD 1353 03363 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 @@ -658,6 +663,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Insertion.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Insertion.scn index d53fcf1867..1fffbc9255 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Insertion.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 02 - Insertion.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - Insertion END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40418.5736738582 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -61,6 +64,7 @@ Columbia:ProjectApollo\Saturn5 SMMASS 4266.943359375000 CMFUELLOAD 111.538360595703 CMMASS 5458.576171875000 + LMPADCNT 269 LMPAD 0077 02000 LMPAD 0104 00000 LMPAD 0106 00000 @@ -69,6 +73,8 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1352 12160 + LMPAD 1353 03363 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 @@ -328,6 +334,7 @@ Columbia:ProjectApollo\Saturn5 LMPAD 3430 57777 LMPAD 3431 20000 LMPAD 3432 00000 + AEAPADCNT 18 AEAPAD 0224 267730 AEAPAD 0225 261350 AEAPAD 0227 547243 @@ -962,6 +969,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - TLI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - TLI T-15m.scn index 8f8c80a5f8..ed3087831e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - TLI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 03 - TLI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - TLI T-15m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40418.6643909336 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -68,6 +71,8 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1352 12160 + LMPAD 1353 03363 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 @@ -1063,6 +1068,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - TDE.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - TDE.scn index 661407604b..ce9615aff5 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - TDE.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 04 - TDE.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - TDE END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40418.6960898538 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -67,6 +70,8 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 + LMPAD 1352 12160 + LMPAD 1353 03363 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 @@ -1084,6 +1089,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - MCC-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - MCC-2 T-15m.scn index 84f0922e95..6ff89ff8bd 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - MCC-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 05 - MCC-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - MCC-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40419.6678468411 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -804,6 +807,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -10653,6 +10658,8 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1352 12160 + EMEM1353 3363 EMEM1452 76612 EMEM1453 74435 EMEM1454 1573 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - LOI-1 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - LOI-1 T-15m.scn index 910f28d528..7ffc705250 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - LOI-1 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 06 - LOI-1 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - LOI-1 T-15m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40421.7184180854 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -792,6 +795,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11555,6 +11560,8 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1352 12160 + EMEM1353 3363 EMEM1452 76612 EMEM1453 74435 EMEM1454 1573 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - LOI-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - LOI-2 T-15m.scn index ff900efefa..0455b4a7ad 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - LOI-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 07 - LOI-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - LOI-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40421.9011801084 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -852,6 +855,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11043,6 +11048,8 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1352 12160 + EMEM1353 3363 EMEM1452 76612 EMEM1453 74435 EMEM1454 1573 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - LM Powerup.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - LM Powerup.scn index 9ee774bf51..4ceb3e49af 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - LM Powerup.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 08 - LM Powerup.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - LM Powerup END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40422.5496591595 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -866,6 +869,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -10390,6 +10395,8 @@ AGC_BEGIN EMEM1245 15463 EMEM1331 7351 EMEM1332 10050 + EMEM1352 12160 + EMEM1353 3363 EMEM1452 76612 EMEM1453 74435 EMEM1454 1573 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - DOI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - DOI T-15m.scn index 9d055133fb..c4c75261a2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - DOI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 09 - DOI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - DOI T-15m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40422.7921638313 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -874,6 +877,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11146,6 +11151,8 @@ AGC_BEGIN EMEM1344 4264 EMEM1345 30032 EMEM1346 554 + EMEM1352 12160 + EMEM1353 3363 EMEM1361 3304 EMEM1363 3227 EMEM1364 52100 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - PDI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - PDI T-15m.scn index 49146ac3b3..3ef03dffd9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - PDI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 10 - PDI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - PDI T-15m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40422.8317621738 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -876,6 +879,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11239,6 +11244,8 @@ AGC_BEGIN EMEM1345 3022 EMEM1346 554 EMEM1351 77776 + EMEM1352 12160 + EMEM1353 3363 EMEM1361 3304 EMEM1363 3227 EMEM1364 52100 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Lunar Liftoff T-1m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Lunar Liftoff T-1m.scn index 1c05510b85..bc010715e9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Lunar Liftoff T-1m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 11 - Lunar Liftoff T-1m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - Lunar Liftoff T-1m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40423.7519589637 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -838,6 +841,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11565,6 +11570,8 @@ AGC_BEGIN EMEM1345 20230 EMEM1346 554 EMEM1351 2 + EMEM1352 12160 + EMEM1353 3363 EMEM1361 3304 EMEM1363 2535 EMEM1364 52107 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Post RNDZ Docking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Post RNDZ Docking.scn index b03152f180..b506c7af38 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Post RNDZ Docking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 12 - Post RNDZ Docking.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - Post RNDZ Docking END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40423.8914896877 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -898,6 +901,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 23 EMEM2001 143 EMEM2002 23 @@ -12857,6 +12862,8 @@ AGC_BEGIN EMEM1345 35236 EMEM1346 155 EMEM1351 2 + EMEM1352 12160 + EMEM1353 3363 EMEM1361 3304 EMEM1363 2300 EMEM1364 66107 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - TEI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - TEI T-15m.scn index 28681b67b9..eca2101e8b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - TEI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 13 - TEI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - TEI T-15m END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40424.2026227524 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -881,6 +884,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 23 EMEM2001 143 EMEM2002 23 @@ -12720,6 +12725,8 @@ AGC_BEGIN EMEM1345 20266 EMEM1346 3434 EMEM1351 2 + EMEM1352 12160 + EMEM1353 3363 EMEM1361 3304 EMEM1363 2300 EMEM1364 66107 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Entry Prep.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Entry Prep.scn index 4b38342789..83509e88fa 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Entry Prep.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 14 - Entry Prep.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - Entry Prep END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40426.5965491918 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -882,6 +885,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 23 EMEM2001 143 EMEM2002 23 @@ -7066,6 +7071,8 @@ AGC_BEGIN EMEM1345 20266 EMEM1346 3434 EMEM1351 2 + EMEM1352 12160 + EMEM1353 3363 EMEM1361 3336 EMEM1363 14 EMEM1364 60 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - Entry Interface.scn index de3257a122..82586053ee 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 11/Apollo 11 - 15 - Entry Interface.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 11 - Entry Interface END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40426.6903435241 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -884,6 +887,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2200 EMEM1775 15070 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 23 EMEM2001 143 EMEM2002 23 @@ -7225,6 +7230,8 @@ AGC_BEGIN EMEM1345 20266 EMEM1346 3434 EMEM1351 2 + EMEM1352 12160 + EMEM1353 3363 EMEM1361 3336 EMEM1363 14 EMEM1364 60 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 01 - Launch T-20m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 01 - Launch T-20m.scn index 994f50a1b4..6665fbd7b8 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 01 - Launch T-20m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 01 - Launch T-20m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - Launch T-20m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40539.6680651554 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -79,6 +82,8 @@ Yankee-Clipper:ProjectApollo\Saturn5 LMPAD 1244 15643 LMPAD 1326 07351 LMPAD 1327 10050 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -665,6 +670,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 02 - Insertion.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 02 - Insertion.scn index 4893f53388..8b9ceff35b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 02 - Insertion.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 02 - Insertion.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - Insertion END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40539.6912204794 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -68,6 +71,8 @@ Yankee-Clipper:ProjectApollo\Saturn5 LMPAD 1244 15643 LMPAD 1326 07351 LMPAD 1327 10050 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -846,6 +851,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 03 - TLI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 03 - TLI T-15m.scn index 136f2e63cf..bbcf2e4e14 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 03 - TLI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 03 - TLI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - TLI T-15m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40539.7880539417 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -67,6 +70,8 @@ Yankee-Clipper:ProjectApollo\Saturn5 LMPAD 1244 15643 LMPAD 1326 07351 LMPAD 1327 10050 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -1082,6 +1087,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 04 - TDE.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 04 - TDE.scn index 085404a85f..09700ffece 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 04 - TDE.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 04 - TDE.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - TDE END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40539.8171953967 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -66,6 +69,8 @@ Yankee-Clipper:ProjectApollo\Saturn5 LMPAD 1244 15643 LMPAD 1326 07351 LMPAD 1327 10050 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -1128,6 +1133,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 05 - MCC-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 05 - MCC-2 T-15m.scn index c1ed881979..d5d856b632 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 05 - MCC-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 05 - MCC-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - MCC-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40540.9547314373 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -815,6 +818,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11642,6 +11647,8 @@ AGC_BEGIN EMEM1244 15643 EMEM1326 7351 EMEM1327 10050 + EMEM1347 12160 + EMEM1350 3363 EMEM1452 77015 EMEM1453 65137 EMEM1454 32 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 06 - LOI-1 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 06 - LOI-1 T-15m.scn index f399413096..b28f5c5f61 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 06 - LOI-1 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 06 - LOI-1 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - LOI-1 T-15m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40543.1476113901 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -826,6 +829,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11846,6 +11851,8 @@ AGC_BEGIN EMEM1244 15643 EMEM1326 7351 EMEM1327 10050 + EMEM1347 12160 + EMEM1350 3363 EMEM1452 77015 EMEM1453 65137 EMEM1454 32 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 07 - LOI-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 07 - LOI-2 T-15m.scn index bae17146dc..c793863910 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 07 - LOI-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 07 - LOI-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - LOI-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40543.3332384985 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -865,6 +868,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11965,6 +11970,8 @@ AGC_BEGIN EMEM1244 15643 EMEM1326 7351 EMEM1327 10050 + EMEM1347 12160 + EMEM1350 3363 EMEM1452 77015 EMEM1453 65137 EMEM1454 32 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 08 - LM Powerup.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 08 - LM Powerup.scn index 1dc0cb4deb..6d66b8c191 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 08 - LM Powerup.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 08 - LM Powerup.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - LM Powerup END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40544.0156722276 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -853,6 +856,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -11500,6 +11505,8 @@ AGC_BEGIN EMEM1244 15643 EMEM1326 7351 EMEM1327 10050 + EMEM1347 12160 + EMEM1350 3363 EMEM1452 77015 EMEM1453 65137 EMEM1454 32 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 09 - DOI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 09 - DOI T-15m.scn index 263e5be63c..5b08e68ed9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 09 - DOI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 09 - DOI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - DOI T-15m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40544.2298448110 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -868,6 +871,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -12151,6 +12156,8 @@ AGC_BEGIN EMEM1341 4531 EMEM1342 35055 EMEM1343 155 + EMEM1347 12160 + EMEM1350 3363 EMEM1354 77777 EMEM1355 77776 EMEM1361 3325 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 10 - PDI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 10 - PDI T-15m.scn index e5591a41f4..02fa2d25a9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 10 - PDI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 10 - PDI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - PDI T-15m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40544.2695316733 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -903,6 +906,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -12342,6 +12347,8 @@ AGC_BEGIN EMEM1342 3017 EMEM1343 554 EMEM1346 77776 + EMEM1347 12160 + EMEM1350 3363 EMEM1354 1 EMEM1355 77755 EMEM1361 3325 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 11 - Lunar Liftoff T-1m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 11 - Lunar Liftoff T-1m.scn index 43c74e5fbc..84e6c7cb66 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 11 - Lunar Liftoff T-1m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 11 - Lunar Liftoff T-1m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - Lunar Liftoff T-1m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40545.5997287874 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -868,6 +871,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -12779,6 +12784,8 @@ AGC_BEGIN EMEM1342 2652 EMEM1343 554 EMEM1346 2 + EMEM1347 12160 + EMEM1350 3363 EMEM1355 1 EMEM1361 3325 EMEM1363 3574 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 12 - Post RNDZ Docking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 12 - Post RNDZ Docking.scn index 706a2da265..7dc57564b4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 12 - Post RNDZ Docking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 12 - Post RNDZ Docking.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - Post RNDZ Docking END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40545.7412206649 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -912,6 +915,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -14417,6 +14422,8 @@ AGC_BEGIN EMEM1342 27325 EMEM1343 155 EMEM1346 2 + EMEM1347 12160 + EMEM1350 3363 EMEM1354 77773 EMEM1355 77764 EMEM1356 4 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 13 - TEI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 13 - TEI T-15m.scn index e70e24f9e9..e5cc9f5bb3 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 13 - TEI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 13 - TEI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - TEI T-15m END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40546.8552453846 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -958,6 +961,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -14165,6 +14170,8 @@ AGC_BEGIN EMEM1342 12453 EMEM1343 3434 EMEM1346 2 + EMEM1347 12160 + EMEM1350 3363 EMEM1354 77761 EMEM1355 4 EMEM1356 4 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 14 - Entry Prep.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 14 - Entry Prep.scn index 3b9c9e5ddd..e664b02077 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 14 - Entry Prep.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 14 - Entry Prep.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - Entry Prep END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40549.7788245578 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -910,6 +913,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -6973,6 +6978,8 @@ AGC_BEGIN EMEM1342 12453 EMEM1343 3434 EMEM1346 2 + EMEM1347 12160 + EMEM1350 3363 EMEM1354 77761 EMEM1355 4 EMEM1356 4 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 15 - Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 15 - Entry Interface.scn index 4b5c4d0819..4e6cc3a767 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 15 - Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 12/Apollo 12 - 15 - Entry Interface.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 12 - Entry Interface END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40549.8621882029 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -932,6 +935,8 @@ AGC_BEGIN EMEM1773 552 EMEM1774 2201 EMEM1775 21431 + EMEM1776 12160 + EMEM1777 3363 EMEM2000 137 EMEM2001 763 EMEM2002 23 @@ -7166,6 +7171,8 @@ AGC_BEGIN EMEM1342 12453 EMEM1343 3434 EMEM1346 2 + EMEM1347 12160 + EMEM1350 3363 EMEM1354 77761 EMEM1355 4 EMEM1356 4 diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 01 - Launch T-20m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 01 - Launch T-20m.scn index c1991202bb..d940708c3d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 01 - Launch T-20m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 01 - Launch T-20m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - Launch T-20m END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40140.6130189227 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 02 - Insertion.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 02 - Insertion.scn index e1ecbd7cc1..a9fef225ef 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 02 - Insertion.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 02 - Insertion.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - Insertion END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40140.6345963950 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 03 - CSM LV Sep.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 03 - CSM LV Sep.scn index a68f605aa9..c6fde02709 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 03 - CSM LV Sep.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 03 - CSM LV Sep.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - CSM LV Sep END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40140.7437970978 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 04 - Phasing T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 04 - Phasing T-15m.scn index 180fc6c7c7..bf4c90e31c 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 04 - Phasing T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 04 - Phasing T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - Phasing T-15m END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40140.7554051775 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 05 - NCC-1 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 05 - NCC-1 T-15m.scn index 2e53e0629e..a2c29312b0 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 05 - NCC-1 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 05 - NCC-1 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - NCC-1 T-15m END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40141.7171238579 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 06 - Rendezvous.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 06 - Rendezvous.scn index 00e325a836..4091ad4ab4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 06 - Rendezvous.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 06 - Rendezvous.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - Rendezvous END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40141.7970009567 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 07 - SPS-3 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 07 - SPS-3 T-15m.scn index 1ebbf734a3..1b288fb060 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 07 - SPS-3 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 07 - SPS-3 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - SPS-3 T-15m END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40143.7746154840 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 08 - SPS-4 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 08 - SPS-4 T-15m.scn index 868adc6f6f..0b0203ad7c 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 08 - SPS-4 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 08 - SPS-4 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - SPS-4 T-15m END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40145.6463377364 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 09 - SPS-5 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 09 - SPS-5 T-15m.scn index 0d8c47f66a..295f58e846 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 09 - SPS-5 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 09 - SPS-5 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - SPS-5 T-15m END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40147.5092657056 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 10 - SPS-6 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 10 - SPS-6 T-15m.scn index c204ee13db..f6d35aa6b6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 10 - SPS-6 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 10 - SPS-6 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - SPS-6 T-15m END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40149.3720440455 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 11 - Deorbit T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 11 - Deorbit T-15m.scn index f5204a7b3d..b3105cd789 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 11 - Deorbit T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 11 - Deorbit T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - Deorbit T-15m END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40151.4460558442 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 12 - Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 12 - Entry Interface.scn index c450bce517..f4445782c4 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 12 - Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 7/Apollo 7 - 12 - Entry Interface.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 7 - Entry Interface END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40151.4718197970 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 01 - Launch T-20m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 01 - Launch T-20m.scn index e4626bdd29..0e317c5bbe 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 01 - Launch T-20m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 01 - Launch T-20m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - Launch T-20m END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40211.5215491416 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 02 - Insertion.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 02 - Insertion.scn index 82604d769f..98dd6ef941 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 02 - Insertion.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 02 - Insertion.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - Insertion END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40211.5442287449 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 03 - TLI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 03 - TLI T-15m.scn index e2b4c3c0a6..48d2f64c0f 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 03 - TLI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 03 - TLI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - TLI T-15m END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40211.6436999171 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 04 - CSM LV Sep.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 04 - CSM LV Sep.scn index c8bd08d2ff..4c0754f56b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 04 - CSM LV Sep.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 04 - CSM LV Sep.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - CSM LV Sep END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40211.6729232473 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 05 - MCC-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 05 - MCC-2 T-15m.scn index 71e26a73ad..e7f6fea40e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 05 - MCC-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 05 - MCC-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - MCC-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40212.6886613917 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 06 - MCC-4 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 06 - MCC-4 T-15m.scn index 583056eb71..6f3b5c28fc 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 06 - MCC-4 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 06 - MCC-4 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - MCC-4 T-15m END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40214.0713408801 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 07 - LOI-1 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 07 - LOI-1 T-15m.scn index 5a0b4ac0f9..33c18fe7d5 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 07 - LOI-1 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 07 - LOI-1 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - LOI-1 T-15m END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40214.4048029061 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 08 - LOI-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 08 - LOI-2 T-15m.scn index d70e3a0aff..f3ff272e5e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 08 - LOI-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 08 - LOI-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - LOI-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40214.5869423605 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 09 - TEI T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 09 - TEI T-15m.scn index 2808f42a12..0bb531ddd2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 09 - TEI T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 09 - TEI T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - TEI T-15m END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40215.2446452234 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 10 - Entry Prep.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 10 - Entry Prep.scn index 09b36043ab..3fdd2ee86e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 10 - Entry Prep.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 10 - Entry Prep.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - Entry Prep END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40217.5795223771 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 11 - Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 11 - Entry Interface.scn index 25a74a44ac..babe2bc80d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 11 - Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 8/Apollo 8 - 11 - Entry Interface.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 8 - Entry Interface END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40217.6518694139 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-20m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-20m.scn index 4f271dcf01..3f4b1e6fc2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-20m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 01 - Launch T-20m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - Launch T-20m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40283.6527512055 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - Insertion.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - Insertion.scn index 2741e42a9e..7ae7847c67 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - Insertion.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 02 - Insertion.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - Insertion END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40283.6755548179 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - TDE.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - TDE.scn index a3eb8a547c..7417af6e38 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - TDE.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 03 - TDE.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - TDE END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40283.7734485112 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - SPS-1 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - SPS-1 T-15m.scn index 85cade6c13..89dc212514 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - SPS-1 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 04 - SPS-1 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - SPS-1 T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40283.9067612882 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - SPS-2 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - SPS-2 T-15m.scn index fc6920260b..aec515a9d2 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - SPS-2 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 05 - SPS-2 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - SPS-2 T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40284.5809495748 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Docked DPS T-2m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Docked DPS T-2m.scn index ba224a544d..c3ae6adada 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Docked DPS T-2m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 06 - Docked DPS T-2m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - Docked DPS T-2m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40285.7350830350 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - SPS-5 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - SPS-5 T-15m.scn index 40c7638251..6acdbc7159 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - SPS-5 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 07 - SPS-5 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - SPS-5 T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40285.9233866152 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - EVA Day.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - EVA Day.scn index dc04acfcb7..db2786cdfa 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - EVA Day.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 08 - EVA Day.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - EVA Day END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40286.4606374516 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Phasing T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Phasing T-15m.scn index 832ebbe9f4..ce22bab3b0 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Phasing T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 09 - Phasing T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - Phasing T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40287.5679024670 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - LM Insertion T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - LM Insertion T-15m.scn index a67bdd4073..45250795ac 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - LM Insertion T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 10 - LM Insertion T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - LM Insertion T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40287.6455357161 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Post RNDZ Docking.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Post RNDZ Docking.scn index 62966a6020..dddcc97feb 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Post RNDZ Docking.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 11 - Post RNDZ Docking.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - LM Insertion T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40287.7839910031 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - SPS-6 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - SPS-6 T-15m.scn index 5d13c03569..bfd699fbc9 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - SPS-6 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 12 - SPS-6 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - SPS-6 T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40288.7427505699 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - SPS-7 T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - SPS-7 T-15m.scn index 1cf0882aae..4bd7896f2b 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - SPS-7 T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 13 - SPS-7 T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - SPS-7 T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40290.7352131646 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Deorbit T-15m.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Deorbit T-15m.scn index 9d8c3aca33..ecd6b056f6 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Deorbit T-15m.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 14 - Deorbit T-15m.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - Deorbit T-15m END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40293.5927894320 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Entry Interface.scn b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Entry Interface.scn index 1428d9c125..da684698c7 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Entry Interface.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo - Mission Scenarios/Apollo 9/Apollo 9 - 15 - Entry Interface.scn @@ -2,10 +2,13 @@ BEGIN_DESC Apollo 9 - Entry Interface END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40293.6171010971 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn index db42de07f9..9d5b9b533e 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 10 - Launch.scn @@ -2,14 +2,15 @@ BEGIN_DESC Tom Stafford, John Young and Gene Cernan take the CSM/LM combo for its first translunar flight. Stafford and Cernan pass 10 miles above Tranquility Base to map out the approach for Apollo 11. May 18, 1969. (AS-505) Apollo 10 was also the only manned Saturn V to launch from Pad 39B. - -Enabled features: MCC END_DESC +BEGIN_URLDESC + NASSP/505 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40359.534028 - Help NASSP/505 END_ENVIRONMENT BEGIN_FOCUS @@ -65,8 +66,8 @@ Charlie-Brown:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 - LMPAD 1351 00000 - LMPAD 1352 00000 + LMPAD 1351 12160 + LMPAD 1352 03363 LMPAD 1452 73631 LMPAD 1453 70750 LMPAD 1454 01660 @@ -580,8 +581,8 @@ LVIMU_END CMPAD1770 30000 CMPAD1771 2200 CMPAD1772 15070 - CMPAD1773 0 - CMPAD1774 0 + CMPAD1773 12160 + CMPAD1774 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn index 98e7053e7f..f80219e89a 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 11 - Launch.scn @@ -1,14 +1,15 @@ BEGIN_DESC Neil Armstrong Mike Collins and Buzz Aldrin change history forever. The first manned Lunar Landing on July 16, 1969. The scenario starts at T-4h00min, launch azimuth is +72.06�. - -Enabled features: MCC END_DESC +BEGIN_URLDESC + NASSP/506 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40418.397222333 - Help NASSP/506 END_ENVIRONMENT BEGIN_FOCUS @@ -67,8 +68,8 @@ Columbia:ProjectApollo\Saturn5 LMPAD 1245 15463 LMPAD 1331 07351 LMPAD 1332 10050 - LMPAD 1352 00000 - LMPAD 1353 00000 + LMPAD 1352 12160 + LMPAD 1353 03363 LMPAD 1354 00000 LMPAD 1355 00000 LMPAD 1356 00000 @@ -713,8 +714,8 @@ Columbia:ProjectApollo\Saturn5 CMPAD1773 552 CMPAD1774 2200 CMPAD1775 15070 - CMPAD1776 0 - CMPAD1777 0 + CMPAD1776 12160 + CMPAD1777 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn index 27a2feaea8..03373f2869 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 12 - Launch.scn @@ -2,10 +2,13 @@ BEGIN_DESC Pete Conrad, Al Bean and Dick Gordon make man's second landing on the moon. Pete's prescision landing near Surveyor III makes future accurate exploration possible. November 14, 1969. The scenario starts at T-4h00min, crew ingress is at T-1h40min. (AS-507) END_DESC +BEGIN_URLDESC + NASSP/507 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40539.515277778 - Help NASSP/507 END_ENVIRONMENT BEGIN_FOCUS @@ -63,8 +66,8 @@ Yankee-Clipper:ProjectApollo\Saturn5 LMPAD 1244 15643 LMPAD 1326 07351 LMPAD 1327 10050 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -579,8 +582,8 @@ Yankee-Clipper:ProjectApollo\Saturn5 CMPAD1773 552 CMPAD1774 2201 CMPAD1775 21431 - CMPAD1776 0 - CMPAD1777 0 + CMPAD1776 12160 + CMPAD1777 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/Apollo 7 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 7 - Launch.scn index 48bdf470c3..4a3cb0566d 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 7 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 7 - Launch.scn @@ -1,14 +1,15 @@ BEGIN_DESC Wally Schirra, Walt Cunningham and Donn Eisele take the most complex machine yet created, the Apollo CSM, on its first test flight, Oct 11th 1968. The scenario starts on the pad LC34 at T-4h00min, crew ingress is at T-2h40min, launch azimuth is +72�. (AS-205) - -Enabled features: MCC END_DESC +BEGIN_URLDESC + NASSP/205 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo/Sol_VirtualAGC Date MJD 40140.46024305544 - Help NASSP/205 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo 8 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 8 - Launch.scn index ccd204ca0e..6ffb2c6cc3 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 8 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 8 - Launch.scn @@ -1,13 +1,14 @@ BEGIN_DESC Join Frank Borman, James Lovell and Bill Anders on Mankind's first trek a quarter of a million miles to the moon on December 21, 1968. The scenario starts at T-4h00min, crew ingress is at T-2h40min, launch azimuth is +72.12�. (AS-503) - -Enabled features: MCC END_DESC +BEGIN_URLDESC + NASSP/503 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40211.36875 - Help NASSP/503 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn b/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn index 491c17faf1..ae6a65ecad 100644 --- a/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Apollo 9 - Launch.scn @@ -1,13 +1,14 @@ BEGIN_DESC Jim McDivitt, Dave Scott and Rusty Schwiekart take LM-3 for the first LM manned flight and the first docking of two manned spacecraft. March 3, 1969. (AS-504) - -Enabled features: MCC END_DESC +BEGIN_URLDESC + NASSP/504 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40283.500000 - Help NASSP/504 END_ENVIRONMENT BEGIN_FOCUS diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 4 - Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 4 - Launch.scn index ba51306c55..61c156610e 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 4 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 4 - Launch.scn @@ -3,7 +3,7 @@ The Saturn V makes its first flight to test itself and carry an unmanned CSM int END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 39803.5000115741 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 6 - Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 6 - Launch.scn index 3c456af408..1cb50befbe 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 6 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Apollo - Historical Missions/Apollo 6 - Launch.scn @@ -3,7 +3,7 @@ The Saturn V makes its second flight to test itself and carry an unmanned CSM/LM END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 39950.5000115741 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-1a Earth Resources mission.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-1a Earth Resources mission.scn index 650416ccc4..4170e97251 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-1a Earth Resources mission.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-1a Earth Resources mission.scn @@ -3,7 +3,7 @@ AAP - Mission 1a. CDR:Donald R. Garrett, CMP:Joel M. Rosenweig, LMP:Neil B. Ande END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40312.5838078704 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn 1B - Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn 1B - Launch.scn index ba5f2dea05..63a30e9f96 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn 1B - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn 1B - Launch.scn @@ -3,7 +3,7 @@ AAP - Saturn 1B - Launch. Testing scenario in which a Saturn 1b launches a CSM i END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 41951.543565 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn V - Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn V - Launch.scn index fae9b900fc..0c881a9119 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn V - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo Applications Program/AAP-Saturn V - Launch.scn @@ -3,7 +3,7 @@ AAP - Saturn V - Launch. After launch you will find yourself in a 185.2km 185.2 END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 41951.543565 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo to Venus Orbital Test.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo to Venus Orbital Test.scn index 39fdb31d95..b13271e6f6 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo to Venus Orbital Test.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Apollo to Venus Orbital Test.scn @@ -6,7 +6,7 @@ Be prepared for random failures during the launch and flight. END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40995.52222222 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Manned Venus Flyby/Test flight approaching orbit-raising burn.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Manned Venus Flyby/Test flight approaching orbit-raising burn.scn index 2e8b782406..f9fbfb855b 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Manned Venus Flyby/Test flight approaching orbit-raising burn.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Manned Venus Flyby/Test flight approaching orbit-raising burn.scn @@ -6,7 +6,7 @@ After the burn, use Prog 59 in the AGC to vent remaining propellant from the SIV END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40995.6700611447 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Moonlab.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Moonlab.scn index 20080d3831..4c9f593f4f 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Moonlab.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Moonlab.scn @@ -3,7 +3,7 @@ Moonlab. Mission to set up a Lunar Orbiting Spacestation. First flight objective END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40483.40103032411 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Random Failures Test Launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Random Failures Test Launch.scn index 97285021f0..6b5ad7dfc2 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Random Failures Test Launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Random Failures Test Launch.scn @@ -3,7 +3,7 @@ Test out the random failures with this mission. Odds are about one in ten of som END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40418.52222222 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Reference Missions/DRM-64.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Reference Missions/DRM-64.scn index 4fb6d78bb8..138f68cba3 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Reference Missions/DRM-64.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Reference Missions/DRM-64.scn @@ -6,7 +6,7 @@ TLI occurs at GET 02:46:44. LOI occurs around GET 69:17:53. END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 39982.7305557871 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 1b Skylab.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 1b Skylab.scn index 0182bb63a5..85917a01cb 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 1b Skylab.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 1b Skylab.scn @@ -3,7 +3,7 @@ Test of early Skylab plans using a Saturn 1b to launch a 'wet workshop' and crew END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40995.52222222 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 5 INT 20 launch.scn b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 5 INT 20 launch.scn index 8a0b1b150a..3ff432e74e 100644 --- a/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 5 INT 20 launch.scn +++ b/Scenarios/Project Apollo - NASSP/Broken Scenarios/Fictional Missions/Saturn 5 INT 20 launch.scn @@ -3,7 +3,7 @@ Fly the planned Saturn 5 - INT 20 derivative to orbit. Be prepared for random fa END_DESC BEGIN_ENVIRONMENT - System ProjectApollo/Sol + System ProjectApollo/Sol_VirtualAGC Date MJD 40418.52222222 END_ENVIRONMENT diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch and Landing.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch and Landing.scn index 1ee6a1a0e0..33db85d59b 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch and Landing.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch and Landing.scn @@ -61,8 +61,8 @@ Odyssey:ProjectApollo/Saturn5 LMPAD 1244 00000 LMPAD 1326 07401 LMPAD 1327 10246 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -563,8 +563,8 @@ Odyssey:ProjectApollo/Saturn5 CMPAD1773 552 CMPAD1774 2210 CMPAD1775 25231 - CMPAD1776 0 - CMPAD1777 0 + CMPAD1776 12160 + CMPAD1777 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn index a8bde2b557..4548360ed5 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 13 - Launch.scn @@ -2,10 +2,13 @@ BEGIN_DESC Take part in the bravery of the Apollo 13 crew as you use your LEM aquarius to save your life from death in the translunar gulf. Using NASSP's Apollo 13 vehicle. April 11, 1970. (AS-508) END_DESC +BEGIN_URLDESC + NASSP/508 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40687.634028 - Help NASSP/508 END_ENVIRONMENT BEGIN_FOCUS @@ -62,8 +65,8 @@ Odyssey:ProjectApollo/Saturn5 LMPAD 1244 00000 LMPAD 1326 07401 LMPAD 1327 10246 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1351 00000 LMPAD 1352 00000 LMPAD 1353 00000 @@ -567,8 +570,8 @@ Odyssey:ProjectApollo/Saturn5 CMPAD1773 552 CMPAD1774 2210 CMPAD1775 25231 - CMPAD1776 0 - CMPAD1777 0 + CMPAD1776 12160 + CMPAD1777 03363 CMPAD2000 137 CMPAD2001 763 CMPAD2002 23 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn index ffee7eec1e..470e99c63d 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 14 - Launch.scn @@ -2,10 +2,13 @@ BEGIN_DESC Al Shepard, Stu Roosa and Ed Mitchel make man's fourth landing attempt on the moon at Fra Mauro. Jan 31 1971. The scenario starts at T-4h00min, crew ingress is at T-1h40min. (AS-509) END_DESC +BEGIN_URLDESC + NASSP/509 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 40982.6826388889 - Help NASSP/509 END_ENVIRONMENT BEGIN_FOCUS @@ -58,12 +61,12 @@ Kitty-Hawk:ProjectApollo/Saturn5 LMPAD 0077 12000 LMPAD 0104 06000 LMPAD 0106 00000 - LMPAD 1243 07440 - LMPAD 1244 00000 - LMPAD 1326 07441 - LMPAD 1327 10056 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1243 07351 + LMPAD 1244 15643 + LMPAD 1326 07351 + LMPAD 1327 10050 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1452 03250 @@ -643,8 +646,8 @@ LVIMU_END CMPAD1763 1545 CMPAD1764 2077 CMPAD1765 1571 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 233 CMPAD1771 502 CMPAD2000 137 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn index a6cec28665..63c1606380 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 15 - Launch.scn @@ -2,10 +2,13 @@ BEGIN_DESC Dave Scott, Jim Irwin and Al Worden make the first detailed exploration of the moon at Hadley Rille on July 26, 1971. They carried the first LRV. The scenario starts at T-4h00min, launch azimuth is +80.01°. END_DESC +BEGIN_URLDESC + NASSP/510 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 41158.3986111111 - Help NASSP/510 END_ENVIRONMENT BEGIN_FOCUS @@ -62,8 +65,8 @@ Endeavour:ProjectApollo\Saturn5 LMPAD 1315 13146 LMPAD 1326 07351 LMPAD 1327 10050 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1452 04264 @@ -561,8 +564,8 @@ LVDC_BEGIN CMPAD1763 1545 CMPAD1764 2077 CMPAD1765 1571 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 233 CMPAD1771 474 CMPAD2000 137 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn index 80da855585..112309feec 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 16 - Launch.scn @@ -2,10 +2,13 @@ BEGIN_DESC John Young, Charlie Duke and Ken Mattingly make man's second detailed exploration of the moon and discover their landing site, Descartes, is not what it seems. April 16 1972. (AS-511) END_DESC +BEGIN_URLDESC + NASSP/511 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 41423.579167 - Help NASSP/511 END_ENVIRONMENT BEGIN_FOCUS @@ -78,8 +81,8 @@ Casper:ProjectApollo\Saturn5 LMPAD 1315 13146 LMPAD 1326 07351 LMPAD 1327 10050 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1452 04554 @@ -574,8 +577,8 @@ LVDC_BEGIN CMPAD1763 1532 CMPAD1764 2064 CMPAD1765 1634 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 233 CMPAD1771 476 CMPAD2000 137 diff --git a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn index 1083b696cf..ec21cad9c9 100644 --- a/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn +++ b/Scenarios/Project Apollo - NASSP/WIP Scenarios/Apollo 17 - Launch.scn @@ -2,10 +2,13 @@ BEGIN_DESC Gene Cernan, Ron Evans and the first scientist-astronaut, Jack Schmitt, make man's last exploration of the Moon. It is also the Saturn V's only night launch. Dec 7 1972. (AS-512) END_DESC +BEGIN_URLDESC + NASSP/512 +END_URLDESC + BEGIN_ENVIRONMENT System ProjectApollo\Sol_VirtualAGC Date MJD 41657.953472 - Help NASSP/512 END_ENVIRONMENT BEGIN_FOCUS @@ -77,8 +80,8 @@ America:ProjectApollo\Saturn5 LMPAD 1315 13146 LMPAD 1326 10110 LMPAD 1327 10342 - LMPAD 1347 00000 - LMPAD 1350 00000 + LMPAD 1347 12160 + LMPAD 1350 03363 LMPAD 1353 00000 LMPAD 1354 00003 LMPAD 1452 04146 @@ -639,8 +642,8 @@ LVDC_BEGIN CMPAD1763 1547 CMPAD1764 2101 CMPAD1765 1606 - CMPAD1766 0 - CMPAD1767 0 + CMPAD1766 12160 + CMPAD1767 03363 CMPAD1770 235 CMPAD1771 502 CMPAD2000 137 diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index cc0b456fbc..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,46 +0,0 @@ -version: 8.0-Beta-{branch}-{build} -skip_tags: true -os: Visual Studio 2017 -configuration: Release -platform: Win32 -before_build: -- appveyor DownloadFile http://cirno.lunar-tokyo.net/PA-Items-%APPVEYOR_REPO_BRANCH%.zip -- 7z x PA-Items-%APPVEYOR_REPO_BRANCH%.zip -- del PA-Items-%APPVEYOR_REPO_BRANCH%.zip -build: - verbosity: normal -after_build: -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Config\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Doc\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Html\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Meshes\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Missions\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Modules\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Scenarios\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Script\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Sound\ -xr!OrbiterSound_SDK -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\Textures\ -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\NASSP-LICENSE.txt -- 7z a NASSP-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\README.md -- 7z a NASSP-XRSound-Config-V%APPVEYOR_BUILD_VERSION%.zip %APPVEYOR_BUILD_FOLDER%\XRSound\ -artifacts: -- path: NASSP-V$(appveyor_build_version).zip - name: NASSP -- path: NASSP-XRSound-Config-V$(appveyor_build_version).zip - name: NASSP-XRSound-Config -deploy: -- provider: GitHub - tag: NASSP-V$(appveyor_build_version) - description: V8.0 Beta Release - auth_token: - secure: IQ7NMbd0zOFrOgF1Kmp2i5/6C/bTng4X83G4tu9YAoYViKEvjWTPcn7r/0kKJ7M2 - artifact: NASSP,NASSP-XRSound-Config - prerelease: true -notifications: - - provider: Webhook - url: http://cirno.lunar-tokyo.net/NASSP/web-hook.php - headers: - Authorization: - secure: dbYgsSP4RjFtMPSa95EaBA== - on_build_success: true - on_build_failure: true