summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony LaTorre <tlatorre9@gmail.com>2011-08-18 11:11:25 -0400
committerAnthony LaTorre <tlatorre9@gmail.com>2011-08-18 11:11:25 -0400
commitf3589198dc7ffb765a2e76a8e608da1f169eb1ba (patch)
treed001fac01c48e55a44fd39b5492712794d120b88
parent506bcfcf589c007fa899c4f83595dc3a788447b3 (diff)
downloadchroma-f3589198dc7ffb765a2e76a8e608da1f169eb1ba.tar.gz
chroma-f3589198dc7ffb765a2e76a8e608da1f169eb1ba.tar.bz2
chroma-f3589198dc7ffb765a2e76a8e608da1f169eb1ba.zip
make default camera resolution widescreen. fix checkerboard scene.
-rwxr-xr-xcamera.py6
-rw-r--r--scenes/checkerboard.py6
2 files changed, 5 insertions, 7 deletions
diff --git a/camera.py b/camera.py
index 7d23be5..609d9f0 100755
--- a/camera.py
+++ b/camera.py
@@ -568,7 +568,7 @@ class EventViewer(Camera):
self.color_hit_pmts()
return
- if event.key == K_PAGEDOWN:
+ elif event.key == K_PAGEDOWN:
entry = self.T.GetReadEntry()
if entry > 0:
self.T.GetEntry(entry-1)
@@ -589,10 +589,8 @@ if __name__ == '__main__':
parser = optparse.OptionParser('%prog filename.stl')
parser.add_option('-b', '--bits', type='int', dest='bits',
help='bits for z-ordering space axes', default=10)
- #parser.add_option('-l', action='store_true', dest='load_bvh',
- # help='load bounding volumes', default=False)
parser.add_option('-r', '--resolution', dest='resolution',
- help='specify resolution', default='800,600')
+ help='specify resolution', default='1024,576')
parser.add_option('-i', dest='io_file', default=None)
options, args = parser.parse_args()
diff --git a/scenes/checkerboard.py b/scenes/checkerboard.py
index 7e4f755..de7983e 100644
--- a/scenes/checkerboard.py
+++ b/scenes/checkerboard.py
@@ -30,9 +30,9 @@ def build_checkerboard_scene(checkers_per_side=10, squares_per_checker=50):
checkerboard = Solid(checkerboard_mesh, vacuum, vacuum, surface=checkerboard_surface, color=checkerboard_color)
- sphere1 = Solid(sphere(theta=np.pi/256), water, vacuum)
- sphere2 = Solid(sphere(theta=np.pi/256), vacuum, vacuum, surface=shiny_surface)
- sphere3 = Solid(sphere(theta=np.pi/256), vacuum, vacuum, surface=lambertian_surface)
+ sphere1 = Solid(sphere(nsteps=512), water, vacuum)
+ sphere2 = Solid(sphere(nsteps=512), vacuum, vacuum, surface=shiny_surface)
+ sphere3 = Solid(sphere(nsteps=512), vacuum, vacuum, surface=lambertian_surface)
checkerboard_scene = Geometry()
checkerboard_scene.add_solid(checkerboard, displacement=(0,0,-1.5))