From 90435c890d769db5334b75045383fb45b718e2c9 Mon Sep 17 00:00:00 2001
From: march3 <gang.wei@qq.com>
Date: Fri, 24 Mar 2023 12:27:53 +0800
Subject: [PATCH] =?UTF-8?q?Python=E8=B6=85=E4=BA=BA-=E5=AE=87=E5=AE=99?=
 =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {scenes => sim_scenes}/README.md                               | 0
 {scenes => sim_scenes}/__init__.py                             | 0
 {scenes => sim_scenes}/demo.py                                 | 2 +-
 {scenes => sim_scenes}/fiction/__init__.py                     | 0
 {scenes => sim_scenes}/fiction/fixed_stars.py                  | 2 +-
 {scenes => sim_scenes}/fiction/sun_dysen_sphere.py             | 2 +-
 {scenes => sim_scenes}/func.py                                 | 0
 {scenes => sim_scenes}/science/__init__.py                     | 0
 {scenes => sim_scenes}/science/gravity_slingshot.py            | 2 +-
 {scenes => sim_scenes}/solar_system/__init__.py                | 0
 {scenes => sim_scenes}/solar_system/earth_at_night.py          | 2 +-
 {scenes => sim_scenes}/solar_system/earth_moon.py              | 2 +-
 {scenes => sim_scenes}/solar_system/mercury_high_resolution.py | 2 +-
 {scenes => sim_scenes}/solar_system/solar_system_1.py          | 2 +-
 {scenes => sim_scenes}/solar_system/solar_system_2.py          | 2 +-
 {scenes => sim_scenes}/solar_system/solar_system_3.py          | 2 +-
 {scenes => sim_scenes}/solar_system/sun_earth.py               | 2 +-
 {scenes => sim_scenes}/solar_system/sun_earth_jupiter.py       | 2 +-
 {scenes => sim_scenes}/solar_system/sun_earth_moon.py          | 2 +-
 {scenes => sim_scenes}/tri_bodies/__init__.py                  | 0
 {scenes => sim_scenes}/tri_bodies/three_body_01.py             | 2 +-
 {scenes => sim_scenes}/tri_bodies/three_body_02.py             | 2 +-
 {scenes => sim_scenes}/tri_bodies/three_body_03.py             | 2 +-
 {scenes => sim_scenes}/tri_bodies/tri_bodies_sim_perfect.py    | 2 +-
 {scenes => sim_scenes}/tri_bodies/two_body_01.py               | 2 +-
 {scenes => sim_scenes}/ursina_json_sim.py                      | 2 +-
 simulators/mayavi_simulator.py                                 | 2 +-
 simulators/mpl_simulator.py                                    | 2 +-
 simulators/ursina_simulator.py                                 | 2 +-
 29 files changed, 22 insertions(+), 22 deletions(-)
 rename {scenes => sim_scenes}/README.md (100%)
 rename {scenes => sim_scenes}/__init__.py (100%)
 rename {scenes => sim_scenes}/demo.py (97%)
 rename {scenes => sim_scenes}/fiction/__init__.py (100%)
 rename {scenes => sim_scenes}/fiction/fixed_stars.py (98%)
 rename {scenes => sim_scenes}/fiction/sun_dysen_sphere.py (95%)
 rename {scenes => sim_scenes}/func.py (100%)
 rename {scenes => sim_scenes}/science/__init__.py (100%)
 rename {scenes => sim_scenes}/science/gravity_slingshot.py (96%)
 rename {scenes => sim_scenes}/solar_system/__init__.py (100%)
 rename {scenes => sim_scenes}/solar_system/earth_at_night.py (96%)
 rename {scenes => sim_scenes}/solar_system/earth_moon.py (96%)
 rename {scenes => sim_scenes}/solar_system/mercury_high_resolution.py (95%)
 rename {scenes => sim_scenes}/solar_system/solar_system_1.py (98%)
 rename {scenes => sim_scenes}/solar_system/solar_system_2.py (98%)
 rename {scenes => sim_scenes}/solar_system/solar_system_3.py (99%)
 rename {scenes => sim_scenes}/solar_system/sun_earth.py (95%)
 rename {scenes => sim_scenes}/solar_system/sun_earth_jupiter.py (95%)
 rename {scenes => sim_scenes}/solar_system/sun_earth_moon.py (97%)
 rename {scenes => sim_scenes}/tri_bodies/__init__.py (100%)
 rename {scenes => sim_scenes}/tri_bodies/three_body_01.py (95%)
 rename {scenes => sim_scenes}/tri_bodies/three_body_02.py (96%)
 rename {scenes => sim_scenes}/tri_bodies/three_body_03.py (97%)
 rename {scenes => sim_scenes}/tri_bodies/tri_bodies_sim_perfect.py (97%)
 rename {scenes => sim_scenes}/tri_bodies/two_body_01.py (94%)
 rename {scenes => sim_scenes}/ursina_json_sim.py (98%)

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 7a4fbb6..8814d5e 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 4a400e7..8e43d36 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 109c8f2..5160a82 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 6c41497..3916b9f 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 b2cf8d7..6b0440e 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 dbd81d5..1fc6e4c 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 b935dbb..722b9d3 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 0117096..a65615c 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 73d241f..a3e878f 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 05258b4..c934227 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 8b9f346..89c5ea3 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 54c99e3..009bfe7 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 0b1edfd..139769b 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 3fbfc1b..a0a872b 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 32bedec..8fec6fa 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 09715ce..ff01efb 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 925a21b..346729e 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 305fda6..b617d85 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 76ac490..1d36416 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 01bf407..a49ca77 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 0357357..3d55833 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 e8f43e5..a26611b 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):
-- 
GitLab