From c0c7203024c60f4ebb70958ee8727271ab4136fb Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Wed, 18 Sep 2024 02:02:47 +0100 Subject: Initial commit of code for calculating sun position Given the longitude and latitude, and a time into 2024, calculate the relative sun position suitable for providing lighting angles. Based on code from https://www.psa.es/ Loosely checked against https://www.pveducation.org/ and its close, working on faith really, but the numbers look plausible. Could do with a tidy up! --- test/Jamfile.jam | 1 + test/test-environment.cpp | 105 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) create mode 100644 test/test-environment.cpp (limited to 'test') diff --git a/test/Jamfile.jam b/test/Jamfile.jam index 0b830a8..3ab4c4c 100644 --- a/test/Jamfile.jam +++ b/test/Jamfile.jam @@ -63,6 +63,7 @@ run test-instancing.cpp : -- : test-glContainer : test ; run perf-instancing.cpp : \< : test-instancing : benchmark test ; run test-glContainer.cpp : : : test ; run test-pack.cpp : : : test ; +run test-environment.cpp : : : test ; compile test-static-enumDetails.cpp ; compile test-static-stream_support.cpp ; explicit perf-assetFactory ; diff --git a/test/test-environment.cpp b/test/test-environment.cpp new file mode 100644 index 0000000..7b758d1 --- /dev/null +++ b/test/test-environment.cpp @@ -0,0 +1,105 @@ +#define BOOST_TEST_MODULE environment +#include +#include +#include +#include + +#include +#include + +constexpr auto degreesToRads = pi / 180.F; +constexpr auto dEarthMeanRadius = 6371.01F; // In km +constexpr auto dAstronomicalUnit = 149597890.F; // In km + +// Based on the C++ code published at https://www.psa.es/sdg/sunpos.htm +// Linked from https://www.pveducation.org/pvcdrom/properties-of-sunlight/suns-position-to-high-accuracy +Direction2D +getSunPos(const Direction2D position, const float timeOfYear2024) +{ + auto & longitude = position.x; + auto & latitude = position.y; + using std::acos; + using std::asin; + using std::atan2; + using std::cos; + using std::floor; + using std::sin; + using std::tan; + constexpr auto JD2451545 {946728000}; // which is noon 1 January 2000 Universal Time + constexpr auto J11 {1704067200}; // 31st Dec 2023, so timeOfYear2024 1 is 1st Jan etc + constexpr auto JDiff = static_cast(J11 - JD2451545); + + // Calculate difference in days between the current Julian Day + // and JD 2451545.0, which is noon 1 January 2000 Universal Time + // Calculate time of the day in UT decimal hours + const auto dDecimalHours = 24.F * (timeOfYear2024 - floor(timeOfYear2024)); + const auto dElapsedJulianDays = (JDiff + timeOfYear2024 * 86400.F) / 86400.F; + + // Calculate ecliptic coordinates (ecliptic longitude and obliquity of the + // ecliptic in radians but without limiting the angle to be less than 2*Pi + // (i.e., the result may be greater than 2*Pi) + const auto dOmega = 2.1429F - 0.0010394594F * dElapsedJulianDays; + const auto dMeanLongitude = 4.8950630F + 0.017202791698F * dElapsedJulianDays; // Radians + const auto dMeanAnomaly = 6.2400600F + 0.0172019699F * dElapsedJulianDays; + const auto dEclipticLongitude = dMeanLongitude + 0.03341607F * sin(dMeanAnomaly) + + 0.00034894F * sin(2 * dMeanAnomaly) - 0.0001134F - 0.0000203F * sin(dOmega); + const auto dEclipticObliquity = 0.4090928F - 6.2140e-9F * dElapsedJulianDays + 0.0000396F * cos(dOmega); + + // Calculate celestial coordinates ( right ascension and declination ) in radians + // but without limiting the angle to be less than 2*Pi (i.e., the result may be + // greater than 2*Pi) + const auto dSin_EclipticLongitude = sin(dEclipticLongitude); + const auto dY = cos(dEclipticObliquity) * dSin_EclipticLongitude; + const auto dX = cos(dEclipticLongitude); + auto dRightAscension = atan2(dY, dX); + if (dRightAscension < 0) { + dRightAscension = dRightAscension + two_pi; + } + const auto dDeclination = asin(sin(dEclipticObliquity) * dSin_EclipticLongitude); + + // Calculate local coordinates ( azimuth and zenith angle ) in degrees + const auto dGreenwichMeanSiderealTime = 6.6974243242F + 0.0657098283F * dElapsedJulianDays + dDecimalHours; + const auto dLocalMeanSiderealTime + = (dGreenwichMeanSiderealTime * 15.0F + (longitude / degreesToRads)) * degreesToRads; + const auto dHourAngle = dLocalMeanSiderealTime - dRightAscension; + const auto dLatitudeInRadians = latitude; + const auto dCos_Latitude = cos(dLatitudeInRadians); + const auto dSin_Latitude = sin(dLatitudeInRadians); + const auto dCos_HourAngle = cos(dHourAngle); + Direction2D udtSunCoordinates; + udtSunCoordinates.y + = (acos(dCos_Latitude * dCos_HourAngle * cos(dDeclination) + sin(dDeclination) * dSin_Latitude)); + udtSunCoordinates.x = atan2(-sin(dHourAngle), tan(dDeclination) * dCos_Latitude - dSin_Latitude * dCos_HourAngle); + if (udtSunCoordinates.x < 0) { + udtSunCoordinates.x = udtSunCoordinates.x + two_pi; + } + // Parallax Correction + const auto dParallax = (dEarthMeanRadius / dAstronomicalUnit) * sin(udtSunCoordinates.y); + udtSunCoordinates.y = half_pi - (udtSunCoordinates.y + dParallax); + + return udtSunCoordinates; +} + +using sunPosTestData = std::tuple; +constexpr Direction2D Doncaster = {-1.1, 53.5}; +constexpr Direction2D NewYork = {74.0, 40.7}; +constexpr Direction2D Syndey = {-151.2, -33.9}; + +BOOST_DATA_TEST_CASE(sun_position, + boost::unit_test::data::make({ + {{0.F, 0.F}, 1.00F, {181.52F, -66.86F}}, + {{0.F, 0.F}, 1.25F, {113.12F, -0.85F}}, + {{0.F, 0.F}, 1.50F, {177.82F, 66.97F}}, + {{0.F, 0.F}, 1.75F, {246.99F, 0.90F}}, + {{0.F, 0.F}, 2.00F, {181.52F, -67.04F}}, + {{0.F, 0.F}, 180.50F, {2.1F, 66.80F}}, + {Doncaster, 180.50F, {176.34F, 59.64F}}, + {NewYork, 180.50F, {278.04F, 27.34F}}, + {Syndey, 180.50F, {106.13F, -63.29F}}, + }), + position, timeOfYear, expSunPos) +{ + const auto sunPos = getSunPos(position * degreesToRads, timeOfYear) / degreesToRads; + BOOST_CHECK_CLOSE(sunPos.x, expSunPos.x, 1.F); + BOOST_CHECK_CLOSE(sunPos.y, expSunPos.y, 1.F); +} -- cgit v1.2.3 From e9c9d5a883e819e7799e630a883917ce4c69b41a Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 19 Sep 2024 19:53:08 +0100 Subject: Add new mathematical constants to lib --- test/test-environment.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'test') diff --git a/test/test-environment.cpp b/test/test-environment.cpp index 7b758d1..0d02aa1 100644 --- a/test/test-environment.cpp +++ b/test/test-environment.cpp @@ -7,10 +7,6 @@ #include #include -constexpr auto degreesToRads = pi / 180.F; -constexpr auto dEarthMeanRadius = 6371.01F; // In km -constexpr auto dAstronomicalUnit = 149597890.F; // In km - // Based on the C++ code published at https://www.psa.es/sdg/sunpos.htm // Linked from https://www.pveducation.org/pvcdrom/properties-of-sunlight/suns-position-to-high-accuracy Direction2D @@ -74,7 +70,7 @@ getSunPos(const Direction2D position, const float timeOfYear2024) udtSunCoordinates.x = udtSunCoordinates.x + two_pi; } // Parallax Correction - const auto dParallax = (dEarthMeanRadius / dAstronomicalUnit) * sin(udtSunCoordinates.y); + const auto dParallax = (earthMeanRadius / astronomicalUnit) * sin(udtSunCoordinates.y); udtSunCoordinates.y = half_pi - (udtSunCoordinates.y + dParallax); return udtSunCoordinates; -- cgit v1.2.3 From e1eae158efa45fa03d530846c16e266452f3c296 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 19 Sep 2024 20:03:09 +0100 Subject: Update getSunPos to use a standard time_t --- test/test-environment.cpp | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'test') diff --git a/test/test-environment.cpp b/test/test-environment.cpp index 0d02aa1..0e9e37a 100644 --- a/test/test-environment.cpp +++ b/test/test-environment.cpp @@ -4,13 +4,14 @@ #include #include +#include #include #include // Based on the C++ code published at https://www.psa.es/sdg/sunpos.htm // Linked from https://www.pveducation.org/pvcdrom/properties-of-sunlight/suns-position-to-high-accuracy Direction2D -getSunPos(const Direction2D position, const float timeOfYear2024) +getSunPos(const Direction2D position, const time_t time) { auto & longitude = position.x; auto & latitude = position.y; @@ -21,15 +22,13 @@ getSunPos(const Direction2D position, const float timeOfYear2024) using std::floor; using std::sin; using std::tan; - constexpr auto JD2451545 {946728000}; // which is noon 1 January 2000 Universal Time - constexpr auto J11 {1704067200}; // 31st Dec 2023, so timeOfYear2024 1 is 1st Jan etc - constexpr auto JDiff = static_cast(J11 - JD2451545); + static const auto JD2451545 = "2000-01-01T12:00:00"_time_t; // Calculate difference in days between the current Julian Day // and JD 2451545.0, which is noon 1 January 2000 Universal Time // Calculate time of the day in UT decimal hours - const auto dDecimalHours = 24.F * (timeOfYear2024 - floor(timeOfYear2024)); - const auto dElapsedJulianDays = (JDiff + timeOfYear2024 * 86400.F) / 86400.F; + const auto dDecimalHours = static_cast(time % 86400) / 3600.F; + const auto dElapsedJulianDays = static_cast(time - JD2451545) / 86400.F; // Calculate ecliptic coordinates (ecliptic longitude and obliquity of the // ecliptic in radians but without limiting the angle to be less than 2*Pi @@ -76,22 +75,23 @@ getSunPos(const Direction2D position, const float timeOfYear2024) return udtSunCoordinates; } -using sunPosTestData = std::tuple; +using sunPosTestData = std::tuple; constexpr Direction2D Doncaster = {-1.1, 53.5}; constexpr Direction2D NewYork = {74.0, 40.7}; constexpr Direction2D Syndey = {-151.2, -33.9}; +constexpr Direction2D EqGM = {}; BOOST_DATA_TEST_CASE(sun_position, boost::unit_test::data::make({ - {{0.F, 0.F}, 1.00F, {181.52F, -66.86F}}, - {{0.F, 0.F}, 1.25F, {113.12F, -0.85F}}, - {{0.F, 0.F}, 1.50F, {177.82F, 66.97F}}, - {{0.F, 0.F}, 1.75F, {246.99F, 0.90F}}, - {{0.F, 0.F}, 2.00F, {181.52F, -67.04F}}, - {{0.F, 0.F}, 180.50F, {2.1F, 66.80F}}, - {Doncaster, 180.50F, {176.34F, 59.64F}}, - {NewYork, 180.50F, {278.04F, 27.34F}}, - {Syndey, 180.50F, {106.13F, -63.29F}}, + {EqGM, "2024-01-02T00:00:00"_time_t, {181.52F, -66.86F}}, + {EqGM, "2024-01-02T06:00:00"_time_t, {113.12F, -0.85F}}, + {EqGM, "2024-01-02T12:00:00"_time_t, {177.82F, 66.97F}}, + {EqGM, "2024-01-02T18:00:00"_time_t, {246.99F, 0.90F}}, + {EqGM, "2024-01-03T00:00:00"_time_t, {181.52F, -67.04F}}, + {EqGM, "2024-06-29T12:00:00"_time_t, {2.1F, 66.80F}}, + {Doncaster, "2024-06-29T12:00:00"_time_t, {176.34F, 59.64F}}, + {NewYork, "2024-06-29T12:00:00"_time_t, {278.04F, 27.34F}}, + {Syndey, "2024-06-29T12:00:00"_time_t, {106.13F, -63.29F}}, }), position, timeOfYear, expSunPos) { -- cgit v1.2.3 From 489fa7f930689dc9ff271138e613a8d68d88ee45 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 20 Sep 2024 20:17:32 +0100 Subject: Add basic environment object Will hold world time/date, weather, location etc --- test/test-render.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'test') diff --git a/test/test-render.cpp b/test/test-render.cpp index b9a809e..ea53708 100644 --- a/test/test-render.cpp +++ b/test/test-render.cpp @@ -1,3 +1,4 @@ +#include "game/environment.h" #define BOOST_TEST_MODULE test_render #include "testHelpers.h" @@ -33,6 +34,7 @@ class TestScene : public SceneProvider { std::shared_ptr plant1; RailLinks rail; std::shared_ptr gd = std::make_shared(GeoData::createFlat({0, 0}, {1000000, 1000000}, 1)); + std::shared_ptr env = std::make_shared(); Terrain terrain {gd}; Water water {gd}; @@ -68,6 +70,12 @@ public: { } + void + environment(const SceneShader &, const SceneRenderer & r) const override + { + env->render(r, *this); + } + void shadows(const ShadowMapper & shadowMapper) const override { -- cgit v1.2.3 From 9b3eff2ee85ca6627342cfbbe1ac3ba988dc377f Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 20 Sep 2024 20:27:51 +0100 Subject: Move getSunPos to Environment --- test/test-environment.cpp | 70 ++--------------------------------------------- 1 file changed, 2 insertions(+), 68 deletions(-) (limited to 'test') diff --git a/test/test-environment.cpp b/test/test-environment.cpp index 0e9e37a..b6e0e4f 100644 --- a/test/test-environment.cpp +++ b/test/test-environment.cpp @@ -6,75 +6,9 @@ #include #include +#include #include -// Based on the C++ code published at https://www.psa.es/sdg/sunpos.htm -// Linked from https://www.pveducation.org/pvcdrom/properties-of-sunlight/suns-position-to-high-accuracy -Direction2D -getSunPos(const Direction2D position, const time_t time) -{ - auto & longitude = position.x; - auto & latitude = position.y; - using std::acos; - using std::asin; - using std::atan2; - using std::cos; - using std::floor; - using std::sin; - using std::tan; - static const auto JD2451545 = "2000-01-01T12:00:00"_time_t; - - // Calculate difference in days between the current Julian Day - // and JD 2451545.0, which is noon 1 January 2000 Universal Time - // Calculate time of the day in UT decimal hours - const auto dDecimalHours = static_cast(time % 86400) / 3600.F; - const auto dElapsedJulianDays = static_cast(time - JD2451545) / 86400.F; - - // Calculate ecliptic coordinates (ecliptic longitude and obliquity of the - // ecliptic in radians but without limiting the angle to be less than 2*Pi - // (i.e., the result may be greater than 2*Pi) - const auto dOmega = 2.1429F - 0.0010394594F * dElapsedJulianDays; - const auto dMeanLongitude = 4.8950630F + 0.017202791698F * dElapsedJulianDays; // Radians - const auto dMeanAnomaly = 6.2400600F + 0.0172019699F * dElapsedJulianDays; - const auto dEclipticLongitude = dMeanLongitude + 0.03341607F * sin(dMeanAnomaly) - + 0.00034894F * sin(2 * dMeanAnomaly) - 0.0001134F - 0.0000203F * sin(dOmega); - const auto dEclipticObliquity = 0.4090928F - 6.2140e-9F * dElapsedJulianDays + 0.0000396F * cos(dOmega); - - // Calculate celestial coordinates ( right ascension and declination ) in radians - // but without limiting the angle to be less than 2*Pi (i.e., the result may be - // greater than 2*Pi) - const auto dSin_EclipticLongitude = sin(dEclipticLongitude); - const auto dY = cos(dEclipticObliquity) * dSin_EclipticLongitude; - const auto dX = cos(dEclipticLongitude); - auto dRightAscension = atan2(dY, dX); - if (dRightAscension < 0) { - dRightAscension = dRightAscension + two_pi; - } - const auto dDeclination = asin(sin(dEclipticObliquity) * dSin_EclipticLongitude); - - // Calculate local coordinates ( azimuth and zenith angle ) in degrees - const auto dGreenwichMeanSiderealTime = 6.6974243242F + 0.0657098283F * dElapsedJulianDays + dDecimalHours; - const auto dLocalMeanSiderealTime - = (dGreenwichMeanSiderealTime * 15.0F + (longitude / degreesToRads)) * degreesToRads; - const auto dHourAngle = dLocalMeanSiderealTime - dRightAscension; - const auto dLatitudeInRadians = latitude; - const auto dCos_Latitude = cos(dLatitudeInRadians); - const auto dSin_Latitude = sin(dLatitudeInRadians); - const auto dCos_HourAngle = cos(dHourAngle); - Direction2D udtSunCoordinates; - udtSunCoordinates.y - = (acos(dCos_Latitude * dCos_HourAngle * cos(dDeclination) + sin(dDeclination) * dSin_Latitude)); - udtSunCoordinates.x = atan2(-sin(dHourAngle), tan(dDeclination) * dCos_Latitude - dSin_Latitude * dCos_HourAngle); - if (udtSunCoordinates.x < 0) { - udtSunCoordinates.x = udtSunCoordinates.x + two_pi; - } - // Parallax Correction - const auto dParallax = (earthMeanRadius / astronomicalUnit) * sin(udtSunCoordinates.y); - udtSunCoordinates.y = half_pi - (udtSunCoordinates.y + dParallax); - - return udtSunCoordinates; -} - using sunPosTestData = std::tuple; constexpr Direction2D Doncaster = {-1.1, 53.5}; constexpr Direction2D NewYork = {74.0, 40.7}; @@ -95,7 +29,7 @@ BOOST_DATA_TEST_CASE(sun_position, }), position, timeOfYear, expSunPos) { - const auto sunPos = getSunPos(position * degreesToRads, timeOfYear) / degreesToRads; + const auto sunPos = Environment::getSunPos(position * degreesToRads, timeOfYear) / degreesToRads; BOOST_CHECK_CLOSE(sunPos.x, expSunPos.x, 1.F); BOOST_CHECK_CLOSE(sunPos.y, expSunPos.y, 1.F); } -- cgit v1.2.3