diff --git a/sim_scenes/featured/look_at_sky_on_earth.py b/sim_scenes/featured/look_at_sky_on_earth.py index 64d3955fb0b138356b046c76a9c82a440192e32c..95aeff6c6dba860df1057c32aac95ec8435c7c0b 100644 --- a/sim_scenes/featured/look_at_sky_on_earth.py +++ b/sim_scenes/featured/look_at_sky_on_earth.py @@ -50,18 +50,19 @@ class LookAtSkyOnEarth(UniverseSimScenes): clouds_texture = "transparent.png" earth_size_scale = 1 else: - earth_texture = "earth-huge.jpg" + earth_texture = "earth_miller_projection_sw.png" # "earth_miller_projection_SW.jpg" clouds_texture = "transparent_clouds.png" - earth_size_scale = 5e3 + earth_size_scale = 6e3 # 运动的地球 self.earth, self.earth_clouds, self.earth_cn = create_earth(earth_texture=earth_texture, earth_size_scale=earth_size_scale, earth_cn_texture=None, - clouds_texture=clouds_texture, - with_clouds=True, earth_rotation_speed=16, - clouds_rotation_speed=17, + clouds_texture=None, + with_clouds=True, earth_rotation_speed=4, + clouds_rotation_speed=4, earth_cn_size_factor=earth_cn_size_factor, earth_clouds_size_factor=earth_clouds_size_factor) + self.earth.set_resolution(200) # # 地球立春的位置和速度 # self.earth.init_position = [-9.1507536e+07, 0.0000000e+00, 1.1907757e+08] @@ -80,7 +81,7 @@ class LookAtSkyOnEarth(UniverseSimScenes): self.earth.init_velocity = pos_vel["vel"] self.bodies = [ - self.sun, self.earth, self.earth_clouds + self.sun, self.earth #, self.earth_clouds ] if self.show_china: @@ -93,9 +94,10 @@ class LookAtSkyOnEarth(UniverseSimScenes): def on_ready(self): self.earth.planet.rotation_y -= 180 # 一开始就正对太阳 + self.earth.planet.alpha = 0.9 # self.earth_cn.planet.rotation_y -= 185 # 一开始就正对太阳 - - self.earth_clouds.planet.rotation_y -= 50 # 一开始就正对太阳 + if hasattr(self.earth_clouds, "planet"): + self.earth_clouds.planet.rotation_y -= 50 # 一开始就正对太阳 if self.show_name: font = find_file("fonts/DroidSansFallback.ttf", UrsinaConfig.CN_FONT) @@ -158,14 +160,16 @@ class LookAtSkyOnEarth(UniverseSimScenes): if self.look_point is None: # 摄像机始终看向移动的地球 camera_look_at(self.earth, rotation_z=0) + # camera.fov = 120 # 默认:60 # camera.parent = self.sun.planet else: camera.parent = self.earth.planet camera.rotation_z = 90 + camera.fov = 75 # 默认:60 camera.clip_plane_near = 10 camera.clip_plane_far = 1000000 - camera.fov = 75 # 默认:60 + def delay_app_start(): import time diff --git a/simulators/ursina/entities/entity_utils.py b/simulators/ursina/entities/entity_utils.py index 3246f4d801fe475bc0b9b27d5667e9578fc03777..a7de08d07117ca248234bf661c061990975a545e 100644 --- a/simulators/ursina/entities/entity_utils.py +++ b/simulators/ursina/entities/entity_utils.py @@ -410,7 +410,7 @@ def create_foreground(foreground_img): color=color.white, origin=(-.48, .48, -.48), scale=(width*2, height), - position=(-0.85, -0.33, 0) + position=(-0.86, -0.33, 0) ) # foreground = Entity(model='quad', scale=(1, 1), texture=foreground_img, eternal=True) diff --git a/textures/armazonesdusk_1.png b/textures/armazonesdusk_1.png index 424f472f5d3d105cc15f0f406958e808b2a25763..4f3da91f01fd4b5967f5ff57dddda3fe98225dc4 100644 Binary files a/textures/armazonesdusk_1.png and b/textures/armazonesdusk_1.png differ diff --git a/textures/armazonesdusk_2.png b/textures/armazonesdusk_2.png index ff89021275fc88c15dcc55fcb9128980b97e12e8..ab21c7d12745018e00758560b1550914e1b92db5 100644 Binary files a/textures/armazonesdusk_2.png and b/textures/armazonesdusk_2.png differ diff --git a/textures/armazonesdusk_3.png b/textures/armazonesdusk_3.png index 4d25f0e2bc08eef3a4a4b5ea23ae36411894fca6..5d4fc21af1970e0dd6ee29d00db3308e3631af40 100644 Binary files a/textures/armazonesdusk_3.png and b/textures/armazonesdusk_3.png differ diff --git a/textures/armazonesdusk_4.png b/textures/armazonesdusk_4.png index 6b8421e59197aacfd65c9897e3eb6ba53a5d4def..2e758c57c3f73630450644d3145d024c5c88c464 100644 Binary files a/textures/armazonesdusk_4.png and b/textures/armazonesdusk_4.png differ diff --git a/textures/earth_miller_projection_SW.jpg b/textures/earth_miller_projection_SW.jpg index 072b7dfc806816c6882b7eddbb616494596982bd..2ba593df44555d675b386b71ae9be1b18770ec83 100644 Binary files a/textures/earth_miller_projection_SW.jpg and b/textures/earth_miller_projection_SW.jpg differ