Added Mercury and Venus.

This commit is contained in:
Quantum 2013-10-31 18:51:04 -04:00
parent 614ac617cf
commit 4e51fdaff3
5 changed files with 24 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 358 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 176 KiB

After

Width:  |  Height:  |  Size: 92 KiB

View file

@ -1,5 +1,6 @@
@echo off @echo off
cd %~dp0assets\textures cd %~dp0assets\textures
call :convert mercury.jpg mercury_small.jpg 1024x512
call :convert earth.jpg earth_medium.jpg 2048x1024 call :convert earth.jpg earth_medium.jpg 2048x1024
call :convert earth.jpg earth_small.jpg 1024x512 call :convert earth.jpg earth_small.jpg 1024x512
call :convert moon.jpg moon_medium.jpg 2048x1024 call :convert moon.jpg moon_medium.jpg 2048x1024

View file

@ -22,6 +22,24 @@
"mass": 1.9891e+30, "mass": 1.9891e+30,
"rotation": 2164320 "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": { "earth": {
"texture": ["earth.jpg", "earth_medium.jpg", "earth_small.jpg", [0, 0.28, 1, 1]], "texture": ["earth.jpg", "earth_medium.jpg", "earth_small.jpg", [0, 0.28, 1, 1]],
"radius": 6378.1, "radius": 6378.1,

View file

@ -75,9 +75,10 @@ def shrink(file):
print 'saved to:', os.path.basename(name) print 'saved to:', os.path.basename(name)
save(image, name) save(image, name)
else: else:
print print 'alrady there'
textures = [ textures = [
'mercury.jpg',
'earth.jpg', 'earth.jpg',
'moon.jpg', 'moon.jpg',
'mars.jpg', 'mars.jpg',
@ -98,9 +99,9 @@ textures = [
def frozen(): def frozen():
import imp import imp
return (hasattr(sys, "frozen") or # new py2exe return (hasattr(sys, 'frozen') or # new py2exe
hasattr(sys, "importers") # old py2exe hasattr(sys, 'importers') # old py2exe
or imp.is_frozen("__main__")) # tools/freeze or imp.is_frozen('__main__')) # tools/freeze
def get_main_dir(): def get_main_dir():
if frozen(): if frozen():