From 77647d688fb771a1ddbacef18141df31f1134d43 Mon Sep 17 00:00:00 2001
From: Quantum <quantum2048@gmail.com>
Date: Mon, 25 Nov 2013 17:04:27 -0500
Subject: [PATCH] Fixed handling of textures without fallback.
Earth now has same colour as atmosphere without a texture.
---
punyverse/world.json | 2 +-
punyverse/world.py | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/punyverse/world.json b/punyverse/world.json
index 9da6d1f..adb9dd9 100644
--- a/punyverse/world.json
+++ b/punyverse/world.json
@@ -49,7 +49,7 @@
"rotation": -20996798
},
"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.11, 0.32, 0.43, 1]],
"radius": 6378.1,
"z": "AU",
"pitch": -90,
diff --git a/punyverse/world.py b/punyverse/world.py
index ed73e0e..7df3bb7 100644
--- a/punyverse/world.py
+++ b/punyverse/world.py
@@ -42,6 +42,9 @@ def get_best_texture(info, optional=False, loader=load_texture):
pass
else:
break
+ else:
+ cheap = True
+ texture = [1, 1, 1, 1]
else:
try:
texture = loader(info)