diff --git a/punyverse/assets/textures/mercury.jpg b/punyverse/assets/textures/mercury.jpg new file mode 100644 index 0000000..8bda9ff Binary files /dev/null and b/punyverse/assets/textures/mercury.jpg differ diff --git a/punyverse/assets/textures/venus.jpg b/punyverse/assets/textures/venus.jpg index 9bc76d9..a692613 100644 Binary files a/punyverse/assets/textures/venus.jpg and b/punyverse/assets/textures/venus.jpg differ diff --git a/punyverse/gencheap.bat b/punyverse/gencheap.bat index 1dcca77..5e64e53 100644 --- a/punyverse/gencheap.bat +++ b/punyverse/gencheap.bat @@ -1,5 +1,6 @@ @echo off cd %~dp0assets\textures +call :convert mercury.jpg mercury_small.jpg 1024x512 call :convert earth.jpg earth_medium.jpg 2048x1024 call :convert earth.jpg earth_small.jpg 1024x512 call :convert moon.jpg moon_medium.jpg 2048x1024 diff --git a/punyverse/world.json b/punyverse/world.json index 0140cba..78d474c 100644 --- a/punyverse/world.json +++ b/punyverse/world.json @@ -22,6 +22,24 @@ "mass": 1.9891e+30, "rotation": 2164320 }, + "mercury": { + "texture": ["mercury.jpg", "mercury_small.jpg", [0.44, 0.43, 0.43]], + "radius": 2439.7, + "z": "0.466697 * AU", + "pitch": -90, + "yaw": 0.35, + "division": 30, + "rotation": 5067014 + }, + "venus": { + "texture": ["venus.jpg", [0.655, 0.38, 0.1]], + "radius": 6051.8, + "z": "0.723327 * AU", + "pitch": -90, + "yaw": 177.36, + "division": 30, + "rotation": -20996798 + }, "earth": { "texture": ["earth.jpg", "earth_medium.jpg", "earth_small.jpg", [0, 0.28, 1, 1]], "radius": 6378.1, diff --git a/small_images.py b/small_images.py index aac098d..8e68a40 100644 --- a/small_images.py +++ b/small_images.py @@ -75,9 +75,10 @@ def shrink(file): print 'saved to:', os.path.basename(name) save(image, name) else: - print + print 'alrady there' textures = [ + 'mercury.jpg', 'earth.jpg', 'moon.jpg', 'mars.jpg', @@ -98,9 +99,9 @@ textures = [ def frozen(): import imp - return (hasattr(sys, "frozen") or # new py2exe - hasattr(sys, "importers") # old py2exe - or imp.is_frozen("__main__")) # tools/freeze + return (hasattr(sys, 'frozen') or # new py2exe + hasattr(sys, 'importers') # old py2exe + or imp.is_frozen('__main__')) # tools/freeze def get_main_dir(): if frozen():