Implement a spherical curvature correction

[geometrycompositor.git] / source / main.c

diff --git a/source/main.c b/source/main.c
index 024e84930d88209f58cc0dcdbe9b643015b959a4..b1247d88d680ec012d36215fc0bede6fcb8f782b 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -32,6 +32,12 @@ typedef struct CompositedWindow
        int recreate_mask;
 } CompositedWindow;
 
+enum
+{
+       CYLINDRICAL = 1,
+       SPHERICAL
+};
+
 typedef struct CompositedMonitor
 {
        char *name;
@@ -41,7 +47,8 @@ typedef struct CompositedMonitor
        unsigned width;
        unsigned height;
        float keystone_vertical;
-       float cylinder_depth;
+       float curvature_type;
+       float curvature_depth;
        float vertical_center;
        float perspective;
        unsigned vertex_buffer;
@@ -611,9 +618,9 @@ void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monito
 
        aspect = (float)monitor->width/monitor->height;
 
-       if(monitor->cylinder_depth)
+       if(monitor->curvature_depth)
        {
-               cyl_radius = (monitor->cylinder_depth*monitor->cylinder_depth+0.25f)/(2.0f*monitor->cylinder_depth);
+               cyl_radius = (monitor->curvature_depth*monitor->curvature_depth+0.25f)/(2.0f*monitor->curvature_depth);
                cyl_arc = 2.0f*asin(0.5f/cyl_radius);
        }
 
@@ -638,10 +645,24 @@ void update_monitor_vertices(CompositedScreen *screen, CompositedMonitor *monito
                        v[0] = (float)x/t-0.5f;
                        v[1] = ((float)y/t-0.5f)/aspect;
                        v[2] = 0;
-                       if(monitor->cylinder_depth)
+                       if(monitor->curvature_depth)
                        {
-                               v[2] = (1.0f-cos(v[0]*cyl_arc))*cyl_radius-monitor->cylinder_depth;
-                               v[0] = sin(v[0]*cyl_arc)*cyl_radius;
+                               if(monitor->curvature_type==CYLINDRICAL)
+                               {
+                                       v[2] = (1.0f-cos(v[0]*cyl_arc))*cyl_radius-monitor->curvature_depth;
+                                       v[0] = sin(v[0]*cyl_arc)*cyl_radius;
+                               }
+                               else if(monitor->curvature_type==SPHERICAL)
+                               {
+                                       float r;
+
+                                       v[0] = tan(v[0]*cyl_arc)*cyl_radius;
+                                       v[1] = tan(v[1]*cyl_arc)*cyl_radius;
+                                       r = sqrt(v[0]*v[0]+v[1]*v[1]+cyl_radius*cyl_radius)/fabs(cyl_radius);
+                                       v[0] /= r;
+                                       v[1] /= r;
+                                       v[2] = cyl_radius-cyl_radius/r-monitor->curvature_depth;
+                               }
                        }
                }
 
@@ -736,7 +757,8 @@ int initialize_monitor(Compositor *compositor, CompositedScreen *screen, XRRScre
        XRRFreeOutputInfo(output);
 
        monitor->keystone_vertical = 0.0f;
-       monitor->cylinder_depth = 0.0f;
+       monitor->curvature_type = CYLINDRICAL;
+       monitor->curvature_depth = 0.0f;
        monitor->vertical_center = 0.5f;
        monitor->perspective = 1.0f;
 
@@ -821,7 +843,7 @@ void update_geometry_correction(Compositor *compositor, CompositedScreen *screen
        use_gl(compositor, screen);
 
        name_ptr = names;
-       for(i=0; i*4+3<values_length; ++i)
+       for(i=0; i*5+4<values_length; ++i)
        {
                CompositedMonitor *monitor;
 
@@ -831,10 +853,11 @@ void update_geometry_correction(Compositor *compositor, CompositedScreen *screen
                monitor = find_monitor_by_name(screen, name_ptr);
                if(monitor)
                {
-                       monitor->keystone_vertical = values[i*4]/4096.0f;
-                       monitor->cylinder_depth = values[i*4+1]/4096.0f;
-                       monitor->vertical_center = values[i*4+2]/4096.0f;
-                       monitor->perspective = values[i*4+3]/4096.0f;
+                       monitor->keystone_vertical = values[i*5]/4096.0f;
+                       monitor->curvature_type = values[i*5+1];
+                       monitor->curvature_depth = values[i*5+2]/4096.0f;
+                       monitor->vertical_center = values[i*5+3]/4096.0f;
+                       monitor->perspective = values[i*5+4]/4096.0f;
 
                        if(monitor->enabled)
                                update_monitor_vertices(screen, monitor);