diff --git a/bodies/earth.py b/bodies/earth.py index 61cf0fe729c7a0cd0ee3c8aff4d11c770a40ac3b..802cd3cb6defeb6b309252ec7cffe35692981a70 100644 --- a/bodies/earth.py +++ b/bodies/earth.py @@ -27,7 +27,7 @@ class Earth(Body): init_position=[1.12 * AU, 0, 0], init_velocity=[0, 29.79, 0], texture="earth1.jpg", size_scale=1.0, distance_scale=1.0, - rotation_speed=15, ignore_mass=False, trail_color=None): + rotation_speed=15, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -40,7 +40,8 @@ class Earth(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/alcyone.py b/bodies/fixed_stars/alcyone.py index 19b3dcbde51a2da10d8b79a441bda35acfd2f2ef..26a61cf94c17c726513413235dbf042617b68aba 100644 --- a/bodies/fixed_stars/alcyone.py +++ b/bodies/fixed_stars/alcyone.py @@ -76,7 +76,7 @@ class Alcyone(FixedStar): init_velocity=[0, 0, 0], color=(0xBB, 0xAA, 0xFF), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.45, ignore_mass=False): + rotation_speed=0.45, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -88,7 +88,8 @@ class Alcyone(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/aldebaran.py b/bodies/fixed_stars/aldebaran.py index 922ac7af40814b88d78135ebe16f79adecb28002..2b5b4b26149045b2dfc6a2c9efb8a1d1b7620c29 100644 --- a/bodies/fixed_stars/aldebaran.py +++ b/bodies/fixed_stars/aldebaran.py @@ -59,7 +59,7 @@ class Aldebaran(FixedStar): init_velocity=[0, 0, 0], color=(250, 195, 47), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.35, ignore_mass=False): + rotation_speed=0.35, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -71,7 +71,8 @@ class Aldebaran(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/antares.py b/bodies/fixed_stars/antares.py index 3b2d9e568ec130984fb3addd8eccc50c1af6d2f3..2325529d9bcc2b38d5012ab9939d4f6a6b033083 100644 --- a/bodies/fixed_stars/antares.py +++ b/bodies/fixed_stars/antares.py @@ -60,7 +60,7 @@ class Antares(FixedStar): init_velocity=[0, 0, 0], color=(249, 198, 83), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.25, ignore_mass=False): + rotation_speed=0.25, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -72,7 +72,8 @@ class Antares(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) self.glows = 6 diff --git a/bodies/fixed_stars/arcturus.py b/bodies/fixed_stars/arcturus.py index 7c694d89cfad0cc809d927263f87183577adfd54..0dd7e11b00b82b9aaf55ea4da45c2ee754cb9ef5 100644 --- a/bodies/fixed_stars/arcturus.py +++ b/bodies/fixed_stars/arcturus.py @@ -53,7 +53,7 @@ class Arcturus(FixedStar): init_velocity=[0, 0, 0], color=(254, 218, 185), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.4, ignore_mass=False): + rotation_speed=0.4, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -65,7 +65,8 @@ class Arcturus(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/bellatrix.py b/bodies/fixed_stars/bellatrix.py index 0ce5e4fc845fbbc66902f22d561635b2aa9a43ae..d2f1d3e28e57a57f7f336dcf70692b06bea441f6 100644 --- a/bodies/fixed_stars/bellatrix.py +++ b/bodies/fixed_stars/bellatrix.py @@ -55,7 +55,7 @@ class Bellatrix(FixedStar): init_velocity=[0, 0, 0], color=(122, 187, 255), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.5, ignore_mass=False): + rotation_speed=0.5, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -67,7 +67,8 @@ class Bellatrix(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/betelgeuse.py b/bodies/fixed_stars/betelgeuse.py index 9821ba16beaf0aed0386ec4935b8a813359dfaf6..9f91ba6aae73a5742b2cedb981d17a15b916032f 100644 --- a/bodies/fixed_stars/betelgeuse.py +++ b/bodies/fixed_stars/betelgeuse.py @@ -57,7 +57,7 @@ class Betelgeuse(FixedStar): init_velocity=[0, 0, 0], color=(254, 162, 1), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.24, ignore_mass=False): + rotation_speed=0.24, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -69,7 +69,8 @@ class Betelgeuse(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/carinae_v382.py b/bodies/fixed_stars/carinae_v382.py index de42cef7ba7968ce229a27da846f8f16698c319a..c9a15309ea9e6af3064dd9da6eded8db27846573 100644 --- a/bodies/fixed_stars/carinae_v382.py +++ b/bodies/fixed_stars/carinae_v382.py @@ -56,7 +56,7 @@ class CarinaeV382(FixedStar): init_velocity=[0, 0, 0], color=(255, 172, 40), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.26, ignore_mass=False): + rotation_speed=0.26, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -68,7 +68,8 @@ class CarinaeV382(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/eta_carinae.py b/bodies/fixed_stars/eta_carinae.py index 1d42536110ec3ac3b68289f6695f6d3b131fa7df..b52a6275e48ddc7106ec06ecd87f373437d02ad4 100644 --- a/bodies/fixed_stars/eta_carinae.py +++ b/bodies/fixed_stars/eta_carinae.py @@ -50,7 +50,7 @@ class EtaCarinae(FixedStar): init_velocity=[0, 0, 0], color=(111, 140, 255), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.28, ignore_mass=False): + rotation_speed=0.28, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -62,7 +62,8 @@ class EtaCarinae(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/fixed_star.py b/bodies/fixed_stars/fixed_star.py index 62786c365ad9b274e4483c6c432ece957ea464c0..70ec1ddd1ca64f291912a41418627308b4942f52 100644 --- a/bodies/fixed_stars/fixed_star.py +++ b/bodies/fixed_stars/fixed_star.py @@ -28,7 +28,7 @@ class FixedStar(Body): color=(0xFF, 0xFF, 0xFF), texture=None, size_scale=1.0, distance_scale=1.0, rotation_speed=0.1, ignore_mass=False, density=1.408e3, trail_color=None, - texture_bright=None, texture_contrast=None): + texture_bright=None, texture_contrast=None, show_name=False): if texture is None or texture == "fixed_star.png": self.color = color # bright=1.1, contrast=3.2 @@ -45,7 +45,8 @@ class FixedStar(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) self.light_on = True diff --git a/bodies/fixed_stars/pollux.py b/bodies/fixed_stars/pollux.py index 7f0debd9ca0d67d0bf7ae2249d9c8aac38fca5e5..f6611c287abe2428d75cea93877101ab540904b8 100644 --- a/bodies/fixed_stars/pollux.py +++ b/bodies/fixed_stars/pollux.py @@ -59,7 +59,7 @@ class Pollux(FixedStar): init_velocity=[0, 0, 0], color=(0xF5, 0xE8, 0xD5), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.1, ignore_mass=False): + rotation_speed=0.1, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -71,7 +71,8 @@ class Pollux(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/procyon.py b/bodies/fixed_stars/procyon.py index 3d32363858291ee7424cb615fce91b4fbac11682..7fb6c056cb11b44d7b705ebb367d05bbc6b778de 100644 --- a/bodies/fixed_stars/procyon.py +++ b/bodies/fixed_stars/procyon.py @@ -77,7 +77,7 @@ class Procyon(FixedStar): init_velocity=[0, 0, 0], color=(0xF5, 0xE8, 0xD5), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.1, ignore_mass=False): + rotation_speed=0.1, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -89,7 +89,8 @@ class Procyon(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/rigel.py b/bodies/fixed_stars/rigel.py index f2cc8b57d087bc4e00eb47f4e5b3fd1133e949e5..56ed32324f3d7ad41749aeac44f6d8bcdf578441 100644 --- a/bodies/fixed_stars/rigel.py +++ b/bodies/fixed_stars/rigel.py @@ -53,7 +53,7 @@ class Rigel(FixedStar): init_velocity=[0, 0, 0], color=(200, 200, 255), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.33, ignore_mass=False): + rotation_speed=0.33, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -65,7 +65,8 @@ class Rigel(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) self.glows = 7 diff --git a/bodies/fixed_stars/sirius.py b/bodies/fixed_stars/sirius.py index f2db7aae62bb953674032518ae34f33ba0cb5b01..b19d5197de4cece0784513c79532dec3560ee98a 100644 --- a/bodies/fixed_stars/sirius.py +++ b/bodies/fixed_stars/sirius.py @@ -79,7 +79,7 @@ class Sirius(FixedStar): init_velocity=[0, 0, 0], color=(0xFF, 0xFF, 0xFF), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.55, ignore_mass=False): + rotation_speed=0.55, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -91,7 +91,8 @@ class Sirius(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/stephenson_2_18.py b/bodies/fixed_stars/stephenson_2_18.py index 3088736d8354917338ed3c6a2b1b1a91b720078c..fe134a5db13cb58356c1bb03ed035ffc60b8787c 100644 --- a/bodies/fixed_stars/stephenson_2_18.py +++ b/bodies/fixed_stars/stephenson_2_18.py @@ -62,7 +62,7 @@ class Stephenson_2_18(FixedStar): init_velocity=[0, 0, 0], color=(198, 29, 3), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.2, ignore_mass=False): + rotation_speed=0.2, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -75,6 +75,7 @@ class Stephenson_2_18(FixedStar): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, + "show_name": show_name, "texture_bright": 3, "texture_contrast": 4 } diff --git a/bodies/fixed_stars/uy_scuti.py b/bodies/fixed_stars/uy_scuti.py index 948bc376b797016f2233fcb537bda4dbea415595..774eed007dd9cec74c1541db91957fa6e1cfa169 100644 --- a/bodies/fixed_stars/uy_scuti.py +++ b/bodies/fixed_stars/uy_scuti.py @@ -53,7 +53,7 @@ class UYScuti(FixedStar): init_velocity=[0, 0, 0], color=(255, 116, 0), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.22, ignore_mass=False): + rotation_speed=0.22, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -65,7 +65,8 @@ class UYScuti(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/fixed_stars/vy_canis_majoris.py b/bodies/fixed_stars/vy_canis_majoris.py index d42a7e72427b3c25df891457f4f97538415797a8..433f849fe5b8ebb0bc0195e59742baeaa6f3a1c6 100644 --- a/bodies/fixed_stars/vy_canis_majoris.py +++ b/bodies/fixed_stars/vy_canis_majoris.py @@ -54,7 +54,7 @@ class VYCanisMajoris(FixedStar): init_velocity=[0, 0, 0], color=(234, 90, 65), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.23, ignore_mass=False): + rotation_speed=0.23, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -67,6 +67,7 @@ class VYCanisMajoris(FixedStar): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, + "show_name": show_name, "texture_bright": 2, "texture_contrast": 3 } diff --git a/bodies/fixed_stars/y_canum_venaticorum.py b/bodies/fixed_stars/y_canum_venaticorum.py index 6172df5cbdf641a1f1db933a2b53884d4824f346..8019785add70a7c24898267810e7a557b3c2e0de 100644 --- a/bodies/fixed_stars/y_canum_venaticorum.py +++ b/bodies/fixed_stars/y_canum_venaticorum.py @@ -54,7 +54,7 @@ class YCanumVenaticorum(FixedStar): init_velocity=[0, 0, 0], color=(255, 55, 18), texture="fixed_star.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.3, ignore_mass=False): + rotation_speed=0.3, ignore_mass=False, show_name=False): params = { "name": name, "mass": mass, @@ -66,7 +66,8 @@ class YCanumVenaticorum(FixedStar): "size_scale": size_scale, "distance_scale": distance_scale, "rotation_speed": rotation_speed, - "ignore_mass": ignore_mass + "ignore_mass": ignore_mass, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/jupiter.py b/bodies/jupiter.py index 62836050787ed06fbd5ae88785124e33c1867b8a..fc85189cd2243476681bd59abac92d808fbac127 100644 --- a/bodies/jupiter.py +++ b/bodies/jupiter.py @@ -27,7 +27,7 @@ class Jupiter(Body): init_position=[5.2 * AU, 0, 0], init_velocity=[0, 13.06, 0], texture="jupiter1.jpg", size_scale=1.0, distance_scale=1.0, - rotation_speed=36.2537, ignore_mass=False, trail_color=None): + rotation_speed=36.2537, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -40,7 +40,8 @@ class Jupiter(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/mars.py b/bodies/mars.py index d8b951116d6f7e361f6079f54dbc2a8122d61381..0c3a6f6964ef91a6853234354d459106cdf31406 100644 --- a/bodies/mars.py +++ b/bodies/mars.py @@ -26,7 +26,7 @@ class Mars(Body): init_position=[1.5 * AU, 0, 0], init_velocity=[0, 24.13, 0], texture="mars.jpg", size_scale=1.0, distance_scale=1.0, - rotation_speed=14.6223, ignore_mass=False, trail_color=None): + rotation_speed=14.6223, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -39,7 +39,8 @@ class Mars(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/mercury.py b/bodies/mercury.py index fd841d8e85e605efeb2ab8ed850f2ca06f1633c3..1e7409712e87ed0cea23a4b5721031dacb5f332c 100644 --- a/bodies/mercury.py +++ b/bodies/mercury.py @@ -27,7 +27,7 @@ class Mercury(Body): init_position=[0.4 * AU, 0, 0], init_velocity=[0, 47.87, 0], texture="mercury.jpg", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.2558, ignore_mass=False, trail_color=None): + rotation_speed=0.2558, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -40,7 +40,8 @@ class Mercury(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/moon.py b/bodies/moon.py index a572ab1c1ce5304def5462e77be5ec0787a67acf..2d0b17b61386d56430b710312af4f67cbf929761 100644 --- a/bodies/moon.py +++ b/bodies/moon.py @@ -26,7 +26,7 @@ class Moon(Body): init_position=[363104 + 1.12 * AU, 0, 0], init_velocity=[0, 29.79 + 1.023, 0], texture="moon.jpg", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.5487, ignore_mass=False, trail_color=None): + rotation_speed=0.5487, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -39,7 +39,8 @@ class Moon(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/neptune.py b/bodies/neptune.py index 5dfceb6c3123ea1f5b421bdcc8ab03d0f4040ba0..92a3370c1ca673b7ce3b24a067639155e3bdf4c9 100644 --- a/bodies/neptune.py +++ b/bodies/neptune.py @@ -27,7 +27,7 @@ class Neptune(Body): init_position=[30 * AU, 0, 0], init_velocity=[0, 5.43, 0], texture="neptune.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=22.3463, ignore_mass=False, trail_color=None): + rotation_speed=22.3463, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -40,7 +40,8 @@ class Neptune(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/pluto.py b/bodies/pluto.py index 20f5fcafb08b78b713d4a75ce0e87638edacc197..3656c87aca411da9833af7dff96d17a30af0a865 100644 --- a/bodies/pluto.py +++ b/bodies/pluto.py @@ -27,7 +27,7 @@ class Pluto(Body): init_position=[40 * AU, 0, 0], init_velocity=[0, 4.7, 0], texture="pluto.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=-2.3474, ignore_mass=False, trail_color=None): + rotation_speed=-2.3474, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -40,7 +40,8 @@ class Pluto(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/saturn.py b/bodies/saturn.py index e82afeba36e6109c1f4f3663d601bb028dfd44f4..7379039733f03e428cf2308c46e64fb2a92cd5b6 100644 --- a/bodies/saturn.py +++ b/bodies/saturn.py @@ -27,7 +27,7 @@ class Saturn(Body): init_position=[10 * AU, 0, 0], init_velocity=[0, 9.64, 0], texture="saturn.jpg", size_scale=1.0, distance_scale=1.0, - rotation_speed=33.7711, ignore_mass=False, trail_color=None): + rotation_speed=33.7711, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -40,7 +40,8 @@ class Saturn(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/sun.py b/bodies/sun.py index 589077f36c21e6dc258f6bd852f15a2762c1f38b..bd140cb815012eb52ad43aa1564ae7d3b9b220fe 100644 --- a/bodies/sun.py +++ b/bodies/sun.py @@ -23,7 +23,7 @@ class Sun(FixedStar): init_velocity=[0, 0, 0], color=(170, 98, 25), texture="sun2.jpg", size_scale=1.0, distance_scale=1.0, - rotation_speed=0.6130, ignore_mass=False, trail_color=None): + rotation_speed=0.6130, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -36,7 +36,8 @@ class Sun(FixedStar): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/uranus.py b/bodies/uranus.py index ea6a4933f11d7206e1d6322a850d76a785c7b565..3e3267bed5791db56065e40054da3b1095e2a3d4 100644 --- a/bodies/uranus.py +++ b/bodies/uranus.py @@ -27,7 +27,7 @@ class Uranus(Body): init_position=[19 * AU, 0, 0], init_velocity=[0, 6.81, 0], texture="uranus.png", size_scale=1.0, distance_scale=1.0, - rotation_speed=-20.8816, ignore_mass=False, trail_color=None): + rotation_speed=-20.8816, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -40,7 +40,8 @@ class Uranus(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/bodies/venus.py b/bodies/venus.py index ce681a2edece118a7d7c9250f004267e316f8f60..f63517c222e31fc8bce629b01149a2fe63840e9e 100644 --- a/bodies/venus.py +++ b/bodies/venus.py @@ -27,7 +27,7 @@ class Venus(Body): init_position=[0.72 * AU, 0, 0], init_velocity=[0, 35, 0], texture="venus.jpg", size_scale=1.0, distance_scale=1.0, - rotation_speed=-0.0617, ignore_mass=False, trail_color=None): + rotation_speed=-0.0617, ignore_mass=False, trail_color=None, show_name=False): params = { "name": name, "mass": mass, @@ -40,7 +40,8 @@ class Venus(Body): "distance_scale": distance_scale, "rotation_speed": rotation_speed, "ignore_mass": ignore_mass, - "trail_color": trail_color + "trail_color": trail_color, + "show_name": show_name } super().__init__(**params) diff --git a/common/func.py b/common/func.py index f5557c224f8aa893dfab4cbc36007df755d37499..ea1e1fa2737c730fa6487eea4c3964f23322e4e0 100644 --- a/common/func.py +++ b/common/func.py @@ -10,6 +10,7 @@ from PIL import Image from common.consts import AU import numpy as np import random +import os def get_dominant_colors(infile, resize=(20, 20)): @@ -35,7 +36,7 @@ def get_dominant_colors(infile, resize=(20, 20)): colors = list() - for i in range(min(10,len(color_counts))): + for i in range(min(10, len(color_counts))): palette_index = color_counts[i][1] dominant_color = palette[palette_index * 3: palette_index * 3 + 3] colors.append(tuple(dominant_color)) @@ -72,6 +73,28 @@ def get_positions_velocitys(angles, velocity=1, radius=1, radius_offset=None, ve return np.round(pxs, 2), np.round(pys, 2), -np.round(vxs, 2), np.round(vys, 2) +def find_file(file_path, default_val=None, find_deep=5): + """ + 代码可能会放到任意级别的目录下面，该函数能逐级往上级目录进行查找文件 + @param file_path: 文件路径 + @param default_val: 没有找到路径的默认值 + @param find_deep: 查找深度 + @return: + """ + if file_path is None: + return default_val + + if os.path.exists(file_path): + return os.path.normpath(file_path) + + for i in range(find_deep): + file_path = os.path.join("..", file_path) + if os.path.exists(file_path): + return os.path.normpath(file_path) + + return default_val + + def calculate_distance(pos1, pos2=[0, 0, 0]): """ 计算两点间的距离 @@ -86,4 +109,5 @@ def calculate_distance(pos1, pos2=[0, 0, 0]): if __name__ == '__main__': - print(calculate_distance([6, 8, 0], [3, 4, 0])) + # print(calculate_distance([6, 8, 0], [3, 4, 0])) + print(find_file("common/func.py")) diff --git a/sim_scenes/fiction/fixed_stars.py b/sim_scenes/fiction/fixed_stars.py index 8e43d36613a18296dd84834d00f4b9a047737e9f..6e1bfd941a5e6b09a1e623e9b395032358fe8869 100644 --- a/sim_scenes/fiction/fixed_stars.py +++ b/sim_scenes/fiction/fixed_stars.py @@ -55,4 +55,4 @@ if __name__ == '__main__': # 常用快捷键： P：运行和暂停 O：重新开始 I：显示天体轨迹 # position = 左-右+、上+下-、前+后- ursina_run(bodies, SECONDS_PER_WEEK, position=(0, AU, -AU / 500), - show_name=True, bg_music="../sounds/universe_03.mp3") + show_name=True, bg_music="sounds/universe_03.mp3") diff --git a/sim_scenes/fiction/sun_dysen_sphere.py b/sim_scenes/fiction/sun_dysen_sphere.py index 5160a8296e23256143ed4aef50d1882e685d2635..27150190b0bf2662bf2c2178af2037b3821de741 100644 --- a/sim_scenes/fiction/sun_dysen_sphere.py +++ b/sim_scenes/fiction/sun_dysen_sphere.py @@ -27,4 +27,5 @@ if __name__ == '__main__': # 使用 ursina 查看的运行效果 # 常用快捷键： P：运行和暂停 O：重新开始 I：显示天体轨迹 # position = 左-右+、上+下-、前+后- - ursina_run(bodies, SECONDS_PER_WEEK, position=(0, AU / 4, -2 * AU), bg_music="../sounds/universe_02.mp3") + ursina_run(bodies, SECONDS_PER_WEEK, position=(0, AU / 4, -2 * AU), + bg_music="sounds/universe_02.mp3") diff --git a/sim_scenes/solar_system/earth_at_night.py b/sim_scenes/solar_system/earth_at_night.py index 6b0440e189e6191894be7c0f12c1184258780bdc..9a5d150448844342143b3b3fbc8c42a67cf32954 100644 --- a/sim_scenes/solar_system/earth_at_night.py +++ b/sim_scenes/solar_system/earth_at_night.py @@ -12,7 +12,7 @@ from sim_scenes.func import ursina_run if __name__ == '__main__': """ - 高清水星模拟运行 + 地球晚上模拟运行 """ bodies = [ Earth(texture="earth_at_night.jpg", @@ -22,4 +22,4 @@ if __name__ == '__main__': # 使用 ursina 查看的运行效果 # 常用快捷键： P：运行和暂停 O：重新开始 I：显示天体轨迹 # position = 左-右+、上+下-、前+后- - ursina_run(bodies, SECONDS_PER_HOUR / 2, position=(0, 200000, -2000000), cosmic_bg="../textures/cosmic2.jpg") + ursina_run(bodies, SECONDS_PER_HOUR / 2, position=(0, 200000, -2000000), cosmic_bg="textures/cosmic2.jpg") diff --git a/sim_scenes/solar_system/mercury_hd.py b/sim_scenes/solar_system/hd_mercury.py similarity index 84% rename from sim_scenes/solar_system/mercury_hd.py rename to sim_scenes/solar_system/hd_mercury.py index 722b9d3599e8b170bb860fe4fefb4b1d70003cc3..a2daa2aa7a3701cd94e64cab51d7f2e59f1e4389 100644 --- a/sim_scenes/solar_system/mercury_hd.py +++ b/sim_scenes/solar_system/hd_mercury.py @@ -17,9 +17,9 @@ if __name__ == '__main__': bodies = [ Mercury(texture="mercury_hd.tif", init_position=[0, 0, 0], init_velocity=[0, 0, 0], - size_scale=100) + size_scale=100, show_name=True) ] # 使用 ursina 查看的运行效果 # 常用快捷键： P：运行和暂停 O：重新开始 I：显示天体轨迹 # position = 左-右+、上+下-、前+后- - ursina_run(bodies, SECONDS_PER_DAY, position=(0, 30000, -600000), cosmic_bg="../textures/cosmic1.jpg") + ursina_run(bodies, SECONDS_PER_DAY, position=(0, 30000, -700000), cosmic_bg="textures/cosmic1.jpg") diff --git a/sim_scenes/solar_system/hd_pluto.py b/sim_scenes/solar_system/hd_pluto.py new file mode 100644 index 0000000000000000000000000000000000000000..d0f4ae644340ec8c993c5e46b721b96c87ebc55b --- /dev/null +++ b/sim_scenes/solar_system/hd_pluto.py @@ -0,0 +1,25 @@ +# -*- coding:utf-8 -*- +# title :高清冥王星模拟运行 +# description :高清冥王星模拟运行 +# author :Python超人 +# date :2023-02-11 +# link :https://gitcode.net/pythoncr/ +# python_version :3.8 +# ============================================================================== +from bodies import Pluto +from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY +from sim_scenes.func import ursina_run + +if __name__ == '__main__': + """ + 高清冥王星模拟运行 + """ + bodies = [ + Pluto(texture="pluto_hd.jpg", + init_position=[0, 0, 0], init_velocity=[0, 0, 0], + size_scale=100, show_name=True) + ] + # 使用 ursina 查看的运行效果 + # 常用快捷键： P：运行和暂停 O：重新开始 I：显示天体轨迹 + # position = 左-右+、上+下-、前+后- + ursina_run(bodies, SECONDS_PER_DAY, position=(0, 10000, -450000), cosmic_bg="textures/cosmic1.jpg") diff --git a/sim_scenes/solar_system/hd_venus.py b/sim_scenes/solar_system/hd_venus.py new file mode 100644 index 0000000000000000000000000000000000000000..13925cb7cdb52c0a254db92b52cdaddf1845924a --- /dev/null +++ b/sim_scenes/solar_system/hd_venus.py @@ -0,0 +1,25 @@ +# -*- coding:utf-8 -*- +# title :高清金星模拟运行 +# description :高清金星模拟运行 +# author :Python超人 +# date :2023-02-11 +# link :https://gitcode.net/pythoncr/ +# python_version :3.8 +# ============================================================================== +from bodies import Venus +from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY +from sim_scenes.func import ursina_run + +if __name__ == '__main__': + """ + 高清金星模拟运行 + """ + bodies = [ + Venus(texture="venus_hd.jpg", + init_position=[0, 0, 0], init_velocity=[0, 0, 0], + size_scale=100, show_name=True) + ] + # 使用 ursina 查看的运行效果 + # 常用快捷键： P：运行和暂停 O：重新开始 I：显示天体轨迹 + # position = 左-右+、上+下-、前+后- + ursina_run(bodies, SECONDS_PER_DAY, position=(0, 30000, -1500000), cosmic_bg="textures/cosmic1.jpg") diff --git a/sim_scenes/solar_system/solar_system_1.py b/sim_scenes/solar_system/solar_system_1.py index a65615c65464715b959134042c8c9d9a94fafe76..f2a0731c75c6e0d7ea5d17d98afa5cafc9ffb864 100644 --- a/sim_scenes/solar_system/solar_system_1.py +++ b/sim_scenes/solar_system/solar_system_1.py @@ -42,4 +42,4 @@ if __name__ == '__main__': # 使用 ursina 查看的运行效果 # 常用快捷键： P：运行和暂停 O：重新开始 I：显示天体轨迹 # position = 左-右+、上+下-、前+后- - ursina_run(bodies, SECONDS_PER_YEAR, position=(0, 2 * AU, -11 * AU), bg_music="../sounds/universe_04.mp3") + ursina_run(bodies, SECONDS_PER_YEAR, position=(0, 2 * AU, -11 * AU), bg_music="sounds/universe_04.mp3") diff --git a/sim_scenes/solar_system/solar_system_3.py b/sim_scenes/solar_system/solar_system_3.py index c93422717fc6a5fc72bff7f795bd43557f25bc55..3bf30972091229a3933e831ef7049a858310fe26 100644 --- a/sim_scenes/solar_system/solar_system_3.py +++ b/sim_scenes/solar_system/solar_system_3.py @@ -7,10 +7,9 @@ # python_version :3.8 # ============================================================================== from bodies import Sun, Mercury, Venus, Earth, Mars, Jupiter, Saturn, Uranus, Neptune, Pluto, Asteroid -from bodies.body import AU -from common.consts import SECONDS_PER_WEEK from common.func import get_positions_velocitys -from sim_scenes.func import mayavi_run +from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY, SECONDS_PER_MONTH, SECONDS_PER_YEAR, AU +from sim_scenes.func import mayavi_run, ursina_run import numpy as np if __name__ == '__main__': @@ -46,10 +45,10 @@ if __name__ == '__main__': # ] # endregion 1 -------------------------- - # region 2.随机构建 60 小行星，注意：太多的小行星会影响电脑性能 - NUM_OF_ASTEROIDS = 60 + # region 2.随机构建 10 小行星，注意：太多的小行星会影响电脑性能 + NUM_OF_ASTEROIDS = 10 asteroids = [] - angles = np.linspace(0, 40 * np.pi, NUM_OF_ASTEROIDS) + angles = np.linspace(0, 100 * np.pi, NUM_OF_ASTEROIDS) pxs, pys, vxs, vys = get_positions_velocitys(angles, radius=1.60 * AU, velocity=23.37, @@ -82,4 +81,9 @@ if __name__ == '__main__': # 使用 mayavi 查看的运行效果 # mayavi_run(bodies, SECONDS_PER_WEEK, view_azimuth=-45) - mayavi_run(bodies, SECONDS_PER_WEEK, view_azimuth=-45, view_distance=3e9, view_focalpoint=[5e2, 5e2, 5e2]) + # mayavi_run(bodies, SECONDS_PER_WEEK, view_azimuth=-45, view_distance=3e9, view_focalpoint=[5e2, 5e2, 5e2]) + + # 使用 ursina 查看的运行效果 + # 常用快捷键： P：运行和暂停 O：重新开始 I：显示天体轨迹 + # position = 左-右+、上+下-、前+后- + ursina_run(bodies, SECONDS_PER_YEAR, position=(0, 2 * AU, -11 * AU)) \ No newline at end of file diff --git a/simulators/ursina_simulator.py b/simulators/ursina_simulator.py index a26611b60ca2601d46be7c73b868769dec3fea31..84a489226444b965f8bf2e8851d65eaedcffde27 100644 --- a/simulators/ursina_simulator.py +++ b/simulators/ursina_simulator.py @@ -20,6 +20,7 @@ from simulators.views.ursina_view import UrsinaView, UrsinaPlayer from simulators.ursina.ursina_config import UrsinaConfig from simulators.simulator import Simulator from common.system import System +from common.func import find_file import time import datetime import math @@ -265,7 +266,9 @@ class UrsinaSimulator(Simulator): # cosmic_bg = '../textures/cosmic1.png' # cosmic_bg = '../textures/cosmic2.jpg' cosmic_bg = '../textures/cosmic3.jpg' - import os + + cosmic_bg = find_file(cosmic_bg) + if cosmic_bg is not None and os.path.exists(cosmic_bg): self.cosmic_background(cosmic_bg) @@ -289,6 +292,8 @@ class UrsinaSimulator(Simulator): else: bg_music = None + bg_music = find_file(bg_music) + if bg_music is None: # bg_music = "../sounds/universe_04.mp3" bg_music = "../none" diff --git a/simulators/views/ursina_view.py b/simulators/views/ursina_view.py index 39732483ce0b3b567cbdbfceeead74f02cb88057..8e8e7c53f89d9e7fdcb7217e0772941601956355 100644 --- a/simulators/views/ursina_view.py +++ b/simulators/views/ursina_view.py @@ -18,6 +18,7 @@ from bodies import Body from simulators.ursina.ursina_config import UrsinaConfig from simulators.ursina.ursina_event import UrsinaEvent from common.color_utils import adjust_brightness, conv_to_vec4_color, get_inverse_color +from common.func import find_file from simulators.views.body_view import BodyView from simulators.views.ursina_mesh import create_sphere, create_torus import numpy as np @@ -364,17 +365,21 @@ class Planet(Entity): 创建行星环（使用土星贴图） :return: """ + rings_texture = 'textures/saturnRings.jpg' + rings_texture = find_file(rings_texture) + # 行星环偏移角度 # self.ring_rotation_x = 80 # 创建行星环 - # self.ring = Entity(parent=self.planet, model='circle', texture='../textures/saturnRings.jpg', scale=3.5, + # self.ring = Entity(parent=self.planet, model='circle', texture=rings_texture, scale=3.5, # rotation=(self.ring_rotation_x, 0, 0), double_sided=True) + # 行星环偏移角度 self.ring_rotation_x = 80 # 创建行星环 torus = create_torus(0.7, 1.2, 64) - self.ring = Entity(parent=self, model=torus, texture='../textures/saturnRings.jpg', scale=1, + self.ring = Entity(parent=self, model=torus, texture=rings_texture, scale=1, rotation=(self.ring_rotation_x, 0, 0), double_sided=True) # 设置行星环不受灯光影响，否则看不清行星环