diff --git a/scenes/README.md b/sim_scenes/README.md similarity index 100% rename from scenes/README.md rename to sim_scenes/README.md diff --git a/scenes/__init__.py b/sim_scenes/__init__.py similarity index 100% rename from scenes/__init__.py rename to sim_scenes/__init__.py diff --git a/scenes/demo.py b/sim_scenes/demo.py similarity index 97% rename from scenes/demo.py rename to sim_scenes/demo.py index 7a4fbb6c9b9d875e927897e09d16944348c9f14d..8814d5ec603090c662a3c9d3397a5955ed84aef9 100644 --- a/scenes/demo.py +++ b/sim_scenes/demo.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY -from scenes.func import mayavi_run, mpl_run, ursina_run +from sim_scenes.func import mayavi_run, mpl_run, ursina_run from bodies.body import Body, AU if __name__ == '__main__': diff --git a/scenes/fiction/__init__.py b/sim_scenes/fiction/__init__.py similarity index 100% rename from scenes/fiction/__init__.py rename to sim_scenes/fiction/__init__.py diff --git a/scenes/fiction/fixed_stars.py b/sim_scenes/fiction/fixed_stars.py similarity index 98% rename from scenes/fiction/fixed_stars.py rename to sim_scenes/fiction/fixed_stars.py index 4a400e7eaa6f8692eb3e5c8bbf879272df17bea2..8e43d36613a18296dd84834d00f4b9a047737e9f 100644 --- a/scenes/fiction/fixed_stars.py +++ b/sim_scenes/fiction/fixed_stars.py @@ -9,7 +9,7 @@ from bodies import Sun, Earth, Sirius, Rigel, Bellatrix, Alcyone, Antares, Arcturus, Aldebaran, Betelgeuse from bodies import EtaCarinae, YCanumVenaticorum, VYCanisMajoris, UYScuti, CarinaeV382, Stephenson_2_18 from common.consts import SECONDS_PER_WEEK, SECONDS_PER_MONTH, SECONDS_PER_YEAR, SECONDS_PER_DAY -from scenes.func import mayavi_run, mpl_run, ursina_run +from sim_scenes.func import mayavi_run, mpl_run, ursina_run from bodies.body import Body, AU if __name__ == '__main__': diff --git a/scenes/fiction/sun_dysen_sphere.py b/sim_scenes/fiction/sun_dysen_sphere.py similarity index 95% rename from scenes/fiction/sun_dysen_sphere.py rename to sim_scenes/fiction/sun_dysen_sphere.py index 109c8f2a4436baea3d7bdc89e36a3c6e13ed8080..5160a8296e23256143ed4aef50d1882e685d2635 100644 --- a/scenes/fiction/sun_dysen_sphere.py +++ b/sim_scenes/fiction/sun_dysen_sphere.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, DysenSphere from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY, AU -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run if __name__ == '__main__': """ diff --git a/scenes/func.py b/sim_scenes/func.py similarity index 100% rename from scenes/func.py rename to sim_scenes/func.py diff --git a/scenes/science/__init__.py b/sim_scenes/science/__init__.py similarity index 100% rename from scenes/science/__init__.py rename to sim_scenes/science/__init__.py diff --git a/scenes/science/gravity_slingshot.py b/sim_scenes/science/gravity_slingshot.py similarity index 96% rename from scenes/science/gravity_slingshot.py rename to sim_scenes/science/gravity_slingshot.py index 6c4149770ba031b7f6402ce9b40a8ea843fb88f3..3916b9f0562244682b2e66ea2d805e6d69771d35 100644 --- a/scenes/science/gravity_slingshot.py +++ b/sim_scenes/science/gravity_slingshot.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth, Moon from common.consts import SECONDS_PER_HOUR, SECONDS_PER_HALF_DAY, SECONDS_PER_DAY, SECONDS_PER_WEEK, SECONDS_PER_MONTH -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run from bodies.body import AU if __name__ == '__main__': diff --git a/scenes/solar_system/__init__.py b/sim_scenes/solar_system/__init__.py similarity index 100% rename from scenes/solar_system/__init__.py rename to sim_scenes/solar_system/__init__.py diff --git a/scenes/solar_system/earth_at_night.py b/sim_scenes/solar_system/earth_at_night.py similarity index 96% rename from scenes/solar_system/earth_at_night.py rename to sim_scenes/solar_system/earth_at_night.py index b2cf8d7be50c011b49ea3ecdb5de9f9ff923b0f8..6b0440e189e6191894be7c0f12c1184258780bdc 100644 --- a/scenes/solar_system/earth_at_night.py +++ b/sim_scenes/solar_system/earth_at_night.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Earth from common.consts import SECONDS_PER_HOUR -from scenes.func import ursina_run +from sim_scenes.func import ursina_run if __name__ == '__main__': """ diff --git a/scenes/solar_system/earth_moon.py b/sim_scenes/solar_system/earth_moon.py similarity index 96% rename from scenes/solar_system/earth_moon.py rename to sim_scenes/solar_system/earth_moon.py index dbd81d5b9be024c887bdd9c334c180fe7f393f08..1fc6e4c2972256ddfb8c9aca533d346d50fe5314 100644 --- a/scenes/solar_system/earth_moon.py +++ b/sim_scenes/solar_system/earth_moon.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth, Moon from common.consts import SECONDS_PER_HOUR, SECONDS_PER_HALF_DAY, SECONDS_PER_DAY, SECONDS_PER_WEEK, SECONDS_PER_MONTH -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run from bodies.body import AU if __name__ == '__main__': diff --git a/scenes/solar_system/mercury_high_resolution.py b/sim_scenes/solar_system/mercury_high_resolution.py similarity index 95% rename from scenes/solar_system/mercury_high_resolution.py rename to sim_scenes/solar_system/mercury_high_resolution.py index b935dbb1923f54c02fa650cce8594617b26e9605..722b9d3599e8b170bb860fe4fefb4b1d70003cc3 100644 --- a/scenes/solar_system/mercury_high_resolution.py +++ b/sim_scenes/solar_system/mercury_high_resolution.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Mercury from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY -from scenes.func import ursina_run +from sim_scenes.func import ursina_run if __name__ == '__main__': """ diff --git a/scenes/solar_system/solar_system_1.py b/sim_scenes/solar_system/solar_system_1.py similarity index 98% rename from scenes/solar_system/solar_system_1.py rename to sim_scenes/solar_system/solar_system_1.py index 01170964e267318203ea2b3fb03da84a04eac6dc..a65615c65464715b959134042c8c9d9a94fafe76 100644 --- a/scenes/solar_system/solar_system_1.py +++ b/sim_scenes/solar_system/solar_system_1.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Mercury, Venus, Earth, Mars, Jupiter, Saturn, Uranus, Neptune, Pluto, Moon, Asteroids from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY, SECONDS_PER_YEAR, AU -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run if __name__ == '__main__': # 八大行星：木星(♃)、土星(♄)、天王星(♅)、海王星(♆)、地球(⊕)、金星(♀)、火星(♂)、水星(☿) diff --git a/scenes/solar_system/solar_system_2.py b/sim_scenes/solar_system/solar_system_2.py similarity index 98% rename from scenes/solar_system/solar_system_2.py rename to sim_scenes/solar_system/solar_system_2.py index 73d241fde54f9c9d16bb4118673a054f775eef0a..a3e878f25c63570477fa958bdd2af57d2de033d4 100644 --- a/scenes/solar_system/solar_system_2.py +++ b/sim_scenes/solar_system/solar_system_2.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Mercury, Venus, Earth, Mars, Jupiter, Saturn, Uranus, Neptune, Pluto, Asteroids from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY, SECONDS_PER_MONTH, SECONDS_PER_YEAR, AU -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run if __name__ == '__main__': # 八大行星：木星(♃)、土星(♄)、天王星(♅)、海王星(♆)、地球(⊕)、金星(♀)、火星(♂)、水星(☿) diff --git a/scenes/solar_system/solar_system_3.py b/sim_scenes/solar_system/solar_system_3.py similarity index 99% rename from scenes/solar_system/solar_system_3.py rename to sim_scenes/solar_system/solar_system_3.py index 05258b4dde28e68c25528306164330bce95a491b..c93422717fc6a5fc72bff7f795bd43557f25bc55 100644 --- a/scenes/solar_system/solar_system_3.py +++ b/sim_scenes/solar_system/solar_system_3.py @@ -10,7 +10,7 @@ from bodies import Sun, Mercury, Venus, Earth, Mars, Jupiter, Saturn, Uranus, Ne from bodies.body import AU from common.consts import SECONDS_PER_WEEK from common.func import get_positions_velocitys -from scenes.func import mayavi_run +from sim_scenes.func import mayavi_run import numpy as np if __name__ == '__main__': diff --git a/scenes/solar_system/sun_earth.py b/sim_scenes/solar_system/sun_earth.py similarity index 95% rename from scenes/solar_system/sun_earth.py rename to sim_scenes/solar_system/sun_earth.py index 8b9f346aa14ad71844f5a61e0a07371635783b14..89c5ea31e2072628df5da55e2e74ff08d24a700b 100644 --- a/scenes/solar_system/sun_earth.py +++ b/sim_scenes/solar_system/sun_earth.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth, Sirius from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY, AU -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run if __name__ == '__main__': """ diff --git a/scenes/solar_system/sun_earth_jupiter.py b/sim_scenes/solar_system/sun_earth_jupiter.py similarity index 95% rename from scenes/solar_system/sun_earth_jupiter.py rename to sim_scenes/solar_system/sun_earth_jupiter.py index 54c99e3ae12d32452da5a46c65561cf8410b7dfb..009bfe7c19139b5b8b9d05f26c2adb87c24ea38e 100644 --- a/scenes/solar_system/sun_earth_jupiter.py +++ b/sim_scenes/solar_system/sun_earth_jupiter.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth, Jupiter from common.consts import SECONDS_PER_WEEK, AU -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run if __name__ == '__main__': """ diff --git a/scenes/solar_system/sun_earth_moon.py b/sim_scenes/solar_system/sun_earth_moon.py similarity index 97% rename from scenes/solar_system/sun_earth_moon.py rename to sim_scenes/solar_system/sun_earth_moon.py index 0b1edfdfd29bad22275da12644582fb8fbe8be50..139769bdbb946767678c92ebdefba4c5923f3d5b 100644 --- a/scenes/solar_system/sun_earth_moon.py +++ b/sim_scenes/solar_system/sun_earth_moon.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth, Moon from common.consts import SECONDS_PER_HOUR, SECONDS_PER_HALF_DAY, SECONDS_PER_DAY, SECONDS_PER_WEEK, SECONDS_PER_MONTH -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run from bodies.body import AU if __name__ == '__main__': diff --git a/scenes/tri_bodies/__init__.py b/sim_scenes/tri_bodies/__init__.py similarity index 100% rename from scenes/tri_bodies/__init__.py rename to sim_scenes/tri_bodies/__init__.py diff --git a/scenes/tri_bodies/three_body_01.py b/sim_scenes/tri_bodies/three_body_01.py similarity index 95% rename from scenes/tri_bodies/three_body_01.py rename to sim_scenes/tri_bodies/three_body_01.py index 3fbfc1b5d5dd19f67c3ff59d72e929ce3902e0fa..a0a872b86bdbd468b5e96d07e47edad6047babb6 100644 --- a/scenes/tri_bodies/three_body_01.py +++ b/sim_scenes/tri_bodies/three_body_01.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth from common.consts import SECONDS_PER_WEEK, SECONDS_PER_YEAR, SECONDS_PER_MONTH, AU -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run if __name__ == '__main__': """ diff --git a/scenes/tri_bodies/three_body_02.py b/sim_scenes/tri_bodies/three_body_02.py similarity index 96% rename from scenes/tri_bodies/three_body_02.py rename to sim_scenes/tri_bodies/three_body_02.py index 32bedec44f97c6e77b7cb7e48ef3da78667dc263..8fec6fa7aff0a8fcd9a3ddf9ed91ee3730641069 100644 --- a/scenes/tri_bodies/three_body_02.py +++ b/sim_scenes/tri_bodies/three_body_02.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run if __name__ == '__main__': """ diff --git a/scenes/tri_bodies/three_body_03.py b/sim_scenes/tri_bodies/three_body_03.py similarity index 97% rename from scenes/tri_bodies/three_body_03.py rename to sim_scenes/tri_bodies/three_body_03.py index 09715cec9dcf7595f8637f7d0a39014a6a621bd0..ff01efbbcd9839b2dab87d6389a6ddc94e596afb 100644 --- a/scenes/tri_bodies/three_body_03.py +++ b/sim_scenes/tri_bodies/three_body_03.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth from common.consts import SECONDS_PER_DAY, SECONDS_PER_WEEK, SECONDS_PER_YEAR, AU -from scenes.func import mayavi_run, mpl_run, ursina_run +from sim_scenes.func import mayavi_run, mpl_run, ursina_run if __name__ == '__main__': """ diff --git a/scenes/tri_bodies/tri_bodies_sim_perfect.py b/sim_scenes/tri_bodies/tri_bodies_sim_perfect.py similarity index 97% rename from scenes/tri_bodies/tri_bodies_sim_perfect.py rename to sim_scenes/tri_bodies/tri_bodies_sim_perfect.py index 925a21b2ff5bc8975e284382936adb0a9ac781cc..346729e2a34f7cf326ccda8686718b28fefecf49 100644 --- a/scenes/tri_bodies/tri_bodies_sim_perfect.py +++ b/sim_scenes/tri_bodies/tri_bodies_sim_perfect.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth, FixedStar from common.consts import SECONDS_PER_WEEK, SECONDS_PER_DAY, AU, SECONDS_PER_MONTH, SECONDS_PER_YEAR -from scenes.func import mayavi_run, ursina_run +from sim_scenes.func import mayavi_run, ursina_run if __name__ == '__main__': """ diff --git a/scenes/tri_bodies/two_body_01.py b/sim_scenes/tri_bodies/two_body_01.py similarity index 94% rename from scenes/tri_bodies/two_body_01.py rename to sim_scenes/tri_bodies/two_body_01.py index 305fda68c4c9809a7380537977da84bdabb6103b..b617d853641c0b6a31af4b0970750026634515f4 100644 --- a/scenes/tri_bodies/two_body_01.py +++ b/sim_scenes/tri_bodies/two_body_01.py @@ -8,7 +8,7 @@ # ============================================================================== from bodies import Sun, Earth from common.consts import SECONDS_PER_WEEK, SECONDS_PER_YEAR, AU -from scenes.func import mayavi_run, mpl_run, ursina_run +from sim_scenes.func import mayavi_run, mpl_run, ursina_run if __name__ == '__main__': """ diff --git a/scenes/ursina_json_sim.py b/sim_scenes/ursina_json_sim.py similarity index 98% rename from scenes/ursina_json_sim.py rename to sim_scenes/ursina_json_sim.py index 76ac4901ff23908f89ddbf0f3eab2b29316fa0fc..1d36416600e123265d60dbbcb22a4d800bb58ee1 100644 --- a/scenes/ursina_json_sim.py +++ b/sim_scenes/ursina_json_sim.py @@ -9,7 +9,7 @@ from bodies import Body from common.consts import SECONDS_PER_WEEK, SECONDS_PER_MONTH, SECONDS_PER_YEAR, AU -from scenes.func import ursina_run +from sim_scenes.func import ursina_run if __name__ == '__main__': # TODO: 去掉注释，太阳演示 diff --git a/simulators/mayavi_simulator.py b/simulators/mayavi_simulator.py index 01bf4078592056fe1fd7d5ce80699c0e3ba8fb0d..a49ca776d64b4919a6297d7bd8f3d4c8089b2cfa 100644 --- a/simulators/mayavi_simulator.py +++ b/simulators/mayavi_simulator.py @@ -31,7 +31,7 @@ class MayaviSimulator(Simulator): if __name__ == '__main__': - from scenes.func import mayavi_run + from sim_scenes.func import mayavi_run from bodies import Sun, Earth from common.consts import SECONDS_PER_WEEK diff --git a/simulators/mpl_simulator.py b/simulators/mpl_simulator.py index 035735715dd20657abeb686caed90a96a25d6f97..3d558338c8b5da2a03bda4a6dbb81c3169b0c0b5 100644 --- a/simulators/mpl_simulator.py +++ b/simulators/mpl_simulator.py @@ -127,7 +127,7 @@ class MplSimulator(Simulator): if __name__ == '__main__': - from scenes.func import mpl_run + from sim_scenes.func import mpl_run from bodies import Sun, Earth from common.consts import SECONDS_PER_WEEK diff --git a/simulators/ursina_simulator.py b/simulators/ursina_simulator.py index e8f43e5a8022b852e9e34487cc332d369265e052..a26611b60ca2601d46be7c73b868769dec3fea31 100644 --- a/simulators/ursina_simulator.py +++ b/simulators/ursina_simulator.py @@ -25,7 +25,7 @@ import datetime import math import os from ursina import EditorCamera, PointLight, SpotLight, AmbientLight, DirectionalLight -from scenes.func import ursina_run +from sim_scenes.func import ursina_run class WorldGrid(Entity):