aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2020-01-11 21:12:40 +0100
committerAdrian Kummerlaender2020-01-11 21:12:40 +0100
commit071bc3e6439d7775e9684dfeeb27d423d47167a9 (patch)
treed213661266265c5278de5dc421c7d84776a5a8da
parentfa18daffb246fd8f48963ebdc0f791b91c88d08e (diff)
downloadfirmament-071bc3e6439d7775e9684dfeeb27d423d47167a9.tar
firmament-071bc3e6439d7775e9684dfeeb27d423d47167a9.tar.gz
firmament-071bc3e6439d7775e9684dfeeb27d423d47167a9.tar.bz2
firmament-071bc3e6439d7775e9684dfeeb27d423d47167a9.tar.xz
firmament-071bc3e6439d7775e9684dfeeb27d423d47167a9.zip
Add version of local fisheye sunrise with fancy plotting
-rw-r--r--bluedot.py2
-rw-r--r--fancy_local_sunrise.py90
-rw-r--r--local_sunrise.py13
-rw-r--r--raymarch.cl2
-rw-r--r--sunrise.py2
5 files changed, 101 insertions, 8 deletions
diff --git a/bluedot.py b/bluedot.py
index 2f937e3..42bb9bc 100644
--- a/bluedot.py
+++ b/bluedot.py
@@ -41,7 +41,7 @@ for i in numpy.arange(*sun_range):
sun = make_double3(numpy.cos(i*2*numpy.pi/360),numpy.sin(i*2*numpy.pi/360),0)
print(sun)
- program.render(
+ program.render_pinhole(
cl_queue, (config['size_x'], config['size_y']), None, cl_picture,
make_double3(*(config['eye_pos'] * earth['earth_radius'])),
make_double3(*(config['eye_dir'] * earth['earth_radius'])),
diff --git a/fancy_local_sunrise.py b/fancy_local_sunrise.py
new file mode 100644
index 0000000..a206c25
--- /dev/null
+++ b/fancy_local_sunrise.py
@@ -0,0 +1,90 @@
+import numpy as np
+import matplotlib.pyplot as plt
+from string import Template
+
+import pyopencl as cl
+from pyopencl.cltypes import make_double3
+
+mf = cl.mem_flags
+
+from planets import earth
+
+from sun import sun_direction
+from datetime import datetime
+
+config = {
+ 'size_x': 1000,
+ 'size_y': 1000,
+
+ 'ray_samples' : 16,
+ 'light_samples': 8,
+
+ 'exposure': 2.0,
+ 'zoom': 1.0, # only for pinhole view
+
+ 'eye_pos': np.array([0, 0, 1.0001]),
+ 'eye_dir': np.array([0, 1, 0]), # only for pinhole view
+
+ 'date': (2020, 1, 20),
+ 'timezone': 1, # GMT+1
+ 'summertime': False,
+
+ 'latitude': 49.01356,
+ 'longitude': 8.40444
+}
+
+time_range = (6, 20, 0.5)
+
+cl_platform = cl.get_platforms()[0]
+cl_context = cl.Context(properties=[(cl.context_properties.PLATFORM, cl_platform)])
+cl_queue = cl.CommandQueue(cl_context)
+
+cl_picture = cl.Buffer(cl_context, mf.WRITE_ONLY, size=config['size_x']*config['size_y']*3*np.float64(0).nbytes)
+program = None
+
+with open('raymarch.cl') as f:
+ program = cl.Program(cl_context, Template(f.read()).substitute(
+ {**config, **earth}
+ )).build()
+
+for time in np.arange(*time_range):
+ pit = datetime(*config['date'], int(np.floor(time)), int((time-np.floor(time))*60), 0)
+ sun_dir = sun_direction(config['latitude'], config['longitude'], pit, config['timezone'], 1.0 if config['summertime'] else 0.0)
+
+ sun = make_double3(
+ np.cos(sun_dir[0])*np.sin(sun_dir[1]),
+ np.cos(sun_dir[0])*np.cos(sun_dir[1]),
+ np.sin(sun_dir[0])
+ )
+ print(sun_dir)
+
+ program.render_fisheye(
+ cl_queue, (config['size_x'], config['size_y']), None, cl_picture,
+ make_double3(*(config['eye_pos'] * earth['earth_radius'])),
+ make_double3(*(config['eye_dir'] * earth['earth_radius'])),
+ sun)
+
+ np_picture = np.ndarray(shape=(config['size_y'], config['size_x'], 3), dtype=np.float64)
+ cl.enqueue_copy(cl_queue, np_picture, cl_picture).wait();
+
+ fig = plt.gcf()
+
+ ax_image = fig.add_axes([0.0, 0.0, 1.0, 1.0], label='Sky')
+ ax_image.imshow(np_picture, origin='lower')
+ ax_image.axis('off')
+
+ ax_polar = fig.add_axes([0.0, 0.0, 1.0, 1.0], projection='polar', label='Overlay')
+ ax_polar.patch.set_alpha(0)
+ ax_polar.set_theta_zero_location('N')
+ ax_polar.set_rlim(bottom=90, top=0)
+ yticks = [0, 15, 30, 45, 60, 75, 90]
+ ax_polar.set_yticks(yticks)
+ ax_polar.set_yticklabels(['' if i == 90 else '%d°' % i for i in yticks], color='white', fontsize=6)
+ ax_polar.set_rlabel_position(-90/4)
+ ax_polar.set_xticklabels(['N', 'NW', 'W', 'SW', 'S', 'SE', 'E', 'NE'])
+ ax_polar.grid(True)
+
+ plt.savefig("sky_%05.1f.png" % time, bbox_inches='tight', pad_inches=0.2)
+
+ fig.clear()
+
diff --git a/local_sunrise.py b/local_sunrise.py
index 37cf17d..dbc8555 100644
--- a/local_sunrise.py
+++ b/local_sunrise.py
@@ -21,18 +21,21 @@ config = {
'ray_samples' : 16,
'light_samples': 8,
- 'exposure': 4.0,
+ 'exposure': 2.0,
'zoom': 1.0, # only for pinhole view
'eye_pos': np.array([0, 0, 1.0001]),
'eye_dir': np.array([0, 1, 0]), # only for pinhole view
'date': (2020, 1, 20),
- 'latitude': 49.01,
- 'longitude': 8.4
+ 'timezone': 1, # GMT+1
+ 'summertime': False,
+
+ 'latitude': 49.01356,
+ 'longitude': 8.40444
}
-time_range = (5, 20, 1)
+time_range = (6, 20, 0.5)
cl_platform = cl.get_platforms()[0]
cl_context = cl.Context(properties=[(cl.context_properties.PLATFORM, cl_platform)])
@@ -48,7 +51,7 @@ with open('raymarch.cl') as f:
for time in np.arange(*time_range):
pit = datetime(*config['date'], int(np.floor(time)), int((time-np.floor(time))*60), 0)
- sun_dir = sun_direction(config['latitude'], config['longitude'], pit, 1.0)
+ sun_dir = sun_direction(config['latitude'], config['longitude'], pit, config['timezone'], 1.0 if config['summertime'] else 0.0)
sun = make_double3(
np.cos(sun_dir[0])*np.sin(sun_dir[1]),
diff --git a/raymarch.cl b/raymarch.cl
index 34ef8ed..d0092d9 100644
--- a/raymarch.cl
+++ b/raymarch.cl
@@ -189,7 +189,7 @@ __kernel void render_fisheye(__global double* result, double3 eye_pos, double3 e
const double2 screen_pos = getNormalizedScreenPos(x, y);
if (!inFishEyeView(screen_pos)) {
- setColor(result, x, y, 0.0);
+ setColor(result, x, y, 1.0);
return;
}
diff --git a/sunrise.py b/sunrise.py
index 408f408..47457f6 100644
--- a/sunrise.py
+++ b/sunrise.py
@@ -43,7 +43,7 @@ for i in numpy.arange(*sun_range):
sun = make_double3(0.0,numpy.cos(i*2*numpy.pi/360),numpy.sin(i*2*numpy.pi/360))
print(sun)
- program.render(
+ program.render_pinhole(
cl_queue, (config['size_x'], config['size_y']), None, cl_picture,
make_double3(*(config['eye_pos'] * earth['earth_radius'])),
make_double3(*(config['eye_dir'] * earth['earth_radius'])),