stop appending repeat keys to the input buffer
[retroray] / src / scr_mod.c
index 0a17745..48e51a0 100644 (file)
@@ -15,56 +15,19 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-#include <assert.h>
 #include "gaw/gaw.h"
 #include "app.h"
 #include "rtk.h"
 #include "scene.h"
-#include "rt.h"
+#include "geom.h"
 #include "cmesh.h"
 #include "meshgen.h"
+#include "font.h"
+#include "rend.h"
+#include "modui.h"
 
-enum {
-       TBN_NEW, TBN_OPEN, TBN_SAVE, TBN_SEP1,
-       TBN_SEL, TBN_MOVE, TBN_ROT, TBN_SCALE, TBN_SEP2,
-       TBN_ADD, TBN_RM, TBN_SEP3,
-       TBN_UNION, TBN_ISECT, TBN_DIFF, TBN_SEP4,
-       TBN_MTL, TBN_REND, TBN_VIEWREND, TBN_SEP5, TBN_CFG,
-
-       NUM_TOOL_BUTTONS
-};
-static const char *tbn_icon_name[] = {
-       "new", "open", "save", 0,
-       "sel", "move", "rot", "scale", 0,
-       "add", "remove", 0,
-       "union", "isect", "diff", 0,
-       "mtl", "rend", "viewrend", 0, "cfg"
-};
-static int tbn_icon_pos[][2] = {
-       {0,0}, {16,0}, {32,0}, {-1,-1},
-       {48,0}, {64,0}, {80,0}, {96,0}, {-1,-1},
-       {112,0}, {112,16}, {-1,-1},
-       {0,16}, {16,16}, {32,16}, {-1,-1},
-       {48,16}, {64,16}, {80,16}, {-1,-1}, {96,16}
-};
-static int tbn_istool[] = {
-       0, 0, 0, 0,
-       1, 1, 1, 1, 0,
-       0, 0, 0,
-       1, 1, 1, 0,
-       0, 0, 0, 0, 0
-};
-static rtk_icon *tbn_icons[NUM_TOOL_BUTTONS];
-static rtk_widget *tbn_buttons[NUM_TOOL_BUTTONS];
-
-#define TOOLBAR_HEIGHT 26
-
-enum {
-       TOOL_SEL, TOOL_MOVE, TOOL_ROT, TOOL_SCALE,
-       TOOL_UNION, TOOL_ISECT, TOOL_DIFF,
-       NUM_TOOLS
-};
-static rtk_widget *tools[NUM_TOOLS];
+static int vpdirty;
+static rtk_rect totalrend;
 
 
 static int mdl_init(void);
@@ -78,11 +41,16 @@ static void mdl_mouse(int bn, int press, int x, int y);
 static void mdl_motion(int x, int y);
 
 static void draw_object(struct object *obj);
+static void setup_material(struct material *mtl);
 static void draw_grid(void);
-static void tbn_callback(rtk_widget *w, void *cls);
 
-static void draw_rband(void);
-static void primray(cgm_ray *ray, int x, int y);
+static void act_settool(int tidx);
+static void act_addobj(void);
+static void act_rmobj(void);
+
+static void moveobj(struct object *obj, int px0, int py0, int px1, int py1);
+
+static void inval_vport(void);
 
 
 struct app_screen scr_model = {
@@ -93,8 +61,6 @@ struct app_screen scr_model = {
        mdl_keyb, mdl_mouse, mdl_motion
 };
 
-static rtk_widget *toolbar;
-static rtk_iconsheet *icons;
 
 static struct cmesh *mesh_sph;
 
@@ -104,68 +70,37 @@ static float view_matrix_inv[16], proj_matrix_inv[16];
 static int viewport[4];
 static cgm_ray pickray;
 
-static int cur_tool;
+static int cur_tool, prev_tool = -1;
 static int selobj = -1;
 
 static rtk_rect rband;
 static int rband_valid;
 
-static int mdl_init(void)
-{
-       int i, toolidx;
-       rtk_widget *w;
+static int rendering;
+static rtk_rect rendrect;
 
-       if(!(icons = rtk_load_iconsheet("data/icons.png"))) {
-               errormsg("failed to load iconsheet\n");
-               return -1;
-       }
-       for(i=0; i<NUM_TOOL_BUTTONS; i++) {
-               if(tbn_icon_name[i]) {
-                       tbn_icons[i] = rtk_define_icon(icons, tbn_icon_name[i],
-                                       tbn_icon_pos[i][0], tbn_icon_pos[i][1], 16, 16);
-               } else {
-                       tbn_icons[i] = 0;
-               }
-       }
 
-       if(!(toolbar = rtk_create_window(0, "toolbar", 0, 0, win_width, TOOLBAR_HEIGHT))) {
+static int mdl_init(void)
+{
+       if(modui_init() == -1) {
+               errormsg("failed to initialize modeller UI\n");
                return -1;
        }
-       rtk_win_layout(toolbar, RTK_HBOX);
-
-       toolidx = 0;
-       for(i=0; i<NUM_TOOL_BUTTONS; i++) {
-               if(!tbn_icons[i]) {
-                       rtk_create_separator(toolbar);
-               } else {
-                       if(!(w = rtk_create_iconbutton(toolbar, tbn_icons[i], 0))) {
-                               return -1;
-                       }
-                       tbn_buttons[i] = w;
-                       rtk_set_callback(w, tbn_callback, (void*)(intptr_t)i);
-                       if(tbn_istool[i]) {
-                               rtk_bn_mode(w, RTK_TOGGLEBN);
-                               tools[toolidx++] = w;
-                       }
-                       if(i == TBN_SEL) {
-                               rtk_set_value(w, 1);
-                       }
-               }
-       }
-       assert(toolidx == NUM_TOOLS);
 
        if(!(mesh_sph = cmesh_alloc())) {
                errormsg("failed to allocate sphere vis mesh\n");
                return -1;
        }
        gen_sphere(mesh_sph, 1.0f, 16, 8, 1.0f, 1.0f);
+
+       vpdirty = 1;
        return 0;
 }
 
 static void mdl_destroy(void)
 {
        cmesh_free(mesh_sph);
-       rtk_free_iconsheet(icons);
+       modui_cleanup();
 }
 
 static int mdl_start(void)
@@ -176,6 +111,8 @@ static int mdl_start(void)
        gaw_enable(GAW_CULL_FACE);
        gaw_enable(GAW_LIGHTING);
        gaw_enable(GAW_LIGHT0);
+
+       rend_pan(0, -TOOLBAR_HEIGHT);
        return 0;
 }
 
@@ -187,53 +124,69 @@ static void mdl_display(void)
 {
        int i, num;
 
-       gaw_clear(GAW_COLORBUF | GAW_DEPTHBUF);
+       /* viewport */
+       if(vpdirty) {
+               gaw_clear(GAW_COLORBUF | GAW_DEPTHBUF);
+
+               gaw_matrix_mode(GAW_MODELVIEW);
+               gaw_load_identity();
+               gaw_translate(0, 0, -cam_dist);
+               gaw_rotate(cam_phi, 1, 0, 0);
+               gaw_rotate(cam_theta, 0, 1, 0);
+               gaw_get_modelview(view_matrix);
+               cgm_mcopy(view_matrix_inv, view_matrix);
+               cgm_minverse(view_matrix_inv);
+
+               draw_grid();
+
+               num = scn_num_objects(scn);
+               for(i=0; i<num; i++) {
+                       setup_material(scn->objects[i]->mtl);
+
+                       if(i == selobj) {
+                               gaw_zoffset(1);
+                               gaw_enable(GAW_POLYGON_OFFSET);
+                               draw_object(scn->objects[i]);
+                               gaw_disable(GAW_POLYGON_OFFSET);
+
+                               gaw_save();
+                               gaw_disable(GAW_LIGHTING);
+                               gaw_poly_wire();
+                               gaw_color3f(0, 1, 0);
+                               draw_object(scn->objects[i]);
+                               gaw_poly_gouraud();
+                               gaw_restore();
+                       } else {
+                               draw_object(scn->objects[i]);
+                       }
+               }
+               vpdirty = 0;
 
-       rtk_draw_widget(toolbar);
+               /* dirty all GUI windows */
+               rtk_invalidate(toolbar);
+               rtk_invalidate(mtlwin);
+       }
 
-       gaw_matrix_mode(GAW_MODELVIEW);
-       gaw_load_identity();
-       gaw_translate(0, 0, -cam_dist);
-       gaw_rotate(cam_phi, 1, 0, 0);
-       gaw_rotate(cam_theta, 0, 1, 0);
-       gaw_get_modelview(view_matrix);
-       cgm_mcopy(view_matrix_inv, view_matrix);
-       cgm_minverse(view_matrix_inv);
-
-       draw_grid();
-
-       gaw_mtl_diffuse(0.5, 0.5, 0.5, 1);
-
-       num = scn_num_objects(scn);
-       for(i=0; i<num; i++) {
-               if(i == selobj) {
-                       gaw_zoffset(1);
-                       gaw_enable(GAW_POLYGON_OFFSET);
-                       draw_object(scn->objects[i]);
-                       gaw_disable(GAW_POLYGON_OFFSET);
-
-                       gaw_save();
-                       gaw_disable(GAW_LIGHTING);
-                       gaw_poly_wire();
-                       gaw_color3f(0, 1, 0);
-                       draw_object(scn->objects[i]);
-                       gaw_poly_gouraud();
-                       gaw_restore();
-               } else {
-                       draw_object(scn->objects[i]);
+       /* render layer */
+       if(rendering) {
+               if(!render(framebuf)) {
+                       rendering = 0;
                }
+               app_redisplay(rendrect.x, rendrect.y, rendrect.width, rendrect.height);
        }
 
-       if(rband_valid) {
-               draw_rband();
-       }
+       /* GUI */
+       rtk_draw_widget(toolbar);
+       rtk_draw_widget(mtlwin);
 }
 
 static void draw_object(struct object *obj)
 {
        struct sphere *sph;
 
-       calc_object_matrix(obj);
+       if(!obj->xform_valid) {
+               calc_object_matrix(obj);
+       }
        gaw_push_matrix();
        gaw_mult_matrix(obj->xform);
 
@@ -251,6 +204,13 @@ static void draw_object(struct object *obj)
        gaw_pop_matrix();
 }
 
+static void setup_material(struct material *mtl)
+{
+       gaw_mtl_diffuse(mtl->kd.x, mtl->kd.y, mtl->kd.z, 1.0f);
+       gaw_mtl_specular(mtl->ks.x, mtl->ks.y, mtl->ks.z, mtl->shin);
+       gaw_mtl_emission(mtl->ke.x, mtl->ke.y, mtl->ke.z);
+}
+
 static void draw_grid(void)
 {
        gaw_save();
@@ -290,14 +250,43 @@ static void mdl_reshape(int x, int y)
        cgm_minverse(proj_matrix_inv);
 
        rtk_resize(toolbar, win_width, TOOLBAR_HEIGHT);
+
+       inval_vport();
 }
 
 static void mdl_keyb(int key, int press)
 {
        if(rtk_input_key(toolbar, key, press)) {
-               app_redisplay();
                return;
        }
+
+       if(press) {
+               switch(key) {
+               case 27:
+                       act_settool(TOOL_SEL);
+                       break;
+               case 'g':
+                       act_settool(TOOL_MOVE);
+                       break;
+               case 'r':
+                       act_settool(TOOL_ROT);
+                       break;
+               case 's':
+                       act_settool(TOOL_SCALE);
+                       break;
+
+               case KEY_F6:
+                       act_settool(TOOL_REND_AREA);
+                       break;
+
+               case KEY_DEL:
+                       act_rmobj();
+                       break;
+
+               default:
+                       break;
+               }
+       }
 }
 
 static int vpdrag;
@@ -306,11 +295,11 @@ static void mdl_mouse(int bn, int press, int x, int y)
 {
        struct rayhit hit;
        if(!vpdrag && rtk_input_mbutton(toolbar, bn, press, x, y)) {
-               app_redisplay();
                return;
        }
 
        if(press) {
+               rband_valid = 0;
                rband.x = x;
                rband.y = y;
                vpdrag |= (1 << bn);
@@ -318,18 +307,41 @@ static void mdl_mouse(int bn, int press, int x, int y)
                vpdrag &= ~(1 << bn);
 
                if(rband_valid) {
-                       printf("rubber band: %d,%d %dx%d\n", rband.x, rband.y, rband.width, rband.height);
                        rband_valid = 0;
+                       app_rband(0, 0, 0, 0);
+
+                       if(cur_tool == TOOL_REND_AREA) {
+                               if(rband.width && rband.height) {
+                                       rendering = 1;
+                                       rend_size(win_width, win_height);
+                                       rtk_fix_rect(&rband);
+                                       rendrect = rband;
+                                       rend_begin(rband.x, rband.y, rband.width, rband.height);
+                                       app_redisplay(rband.x, rband.y, rband.width, rband.height);
+
+                                       if(totalrend.width) {
+                                               rtk_rect_union(&totalrend, &rband);
+                                       } else {
+                                               totalrend = rband;
+                                       }
+                               }
+                       }
 
                } else if(bn == 0 && x == rband.x && y == rband.y) {
                        primray(&pickray, x, y);
                        if(scn_intersect(scn, &pickray, &hit)) {
-                               selobj = scn_object_index(scn, hit.obj);
+                               int newsel = scn_object_index(scn, hit.obj);
+                               if(newsel != selobj) {
+                                       selobj = newsel;
+                                       inval_vport();
+                               }
                        } else {
+                               if(selobj != -1) {
+                                       inval_vport();
+                               }
                                selobj = -1;
                        }
                }
-               app_redisplay();
        }
 }
 
@@ -338,7 +350,6 @@ static void mdl_motion(int x, int y)
        int dx, dy;
 
        if(!vpdrag && rtk_input_mmotion(toolbar, x, y)) {
-               app_redisplay();
                return;
        }
 
@@ -352,23 +363,38 @@ static void mdl_motion(int x, int y)
                        cam_phi += dy * 0.5f;
                        if(cam_phi < -90) cam_phi = -90;
                        if(cam_phi > 90) cam_phi = 90;
-                       app_redisplay();
+                       inval_vport();
                }
 
                if(mouse_state[2]) {
                        cam_dist += dy * 0.1f;
                        if(cam_dist < 0) cam_dist = 0;
-                       app_redisplay();
+                       inval_vport();
                }
        } else {
                if(mouse_state[0]) {
-                       if(rband.x != x || rband.y != y) {
-                               rband.width = x - rband.x;
-                               rband.height = y - rband.y;
-                               rband_valid = 1;
+                       switch(cur_tool) {
+                       case TOOL_SEL:
+                       case TOOL_REND_AREA:
+                               if(rband.x != x || rband.y != y) {
+                                       rband.width = x - rband.x;
+                                       rband.height = y - rband.y;
+                                       rband_valid = 1;
+                                       app_rband(rband.x, rband.y, rband.width, rband.height);
+                               }
+                               break;
+
+                       case TOOL_MOVE:
+                               if(selobj >= 0) {
+                                       struct object *obj = scn->objects[selobj];
+                                       moveobj(obj, mouse_x, mouse_y, x, y);
+                               }
+                               break;
+
+                       default:
+                               break;
                        }
                }
-               app_redisplay();
        }
 }
 
@@ -382,43 +408,47 @@ static void add_sphere(void)
        scn_add_object(scn, obj);
 }
 
-static void tbn_callback(rtk_widget *w, void *cls)
+void tbn_callback(rtk_widget *w, void *cls)
 {
-       int i, id = (intptr_t)cls;
-       int idx;
+       int id = (intptr_t)cls;
 
        switch(id) {
+       case TBN_NEW:
+               scn_clear(scn);
+               inval_vport();
+               break;
+
        case TBN_SEL:
        case TBN_MOVE:
        case TBN_ROT:
        case TBN_SCALE:
-               idx = id - TBN_SEL;
-               if(0) {
+               act_settool(id - TBN_SEL);
+               break;
        case TBN_UNION:
        case TBN_ISECT:
        case TBN_DIFF:
-                       idx = id - TBN_UNION + TOOL_UNION;
-               }
-               cur_tool = idx;
-               for(i=0; i<NUM_TOOLS; i++) {
-                       if(i != cur_tool) {
-                               rtk_set_value(tools[i], 0);
-                       }
+               act_settool(id - TBN_UNION + TOOL_UNION);
+               break;
+
+       case TBN_MTL:
+               if(rtk_visible(mtlwin)) {
+                       rtk_hide(mtlwin);
+                       inval_vport();
+               } else {
+                       rtk_show(mtlwin);
                }
                break;
 
+       case TBN_REND_AREA:
+               act_settool(TOOL_REND_AREA);
+               break;
+
        case TBN_ADD:
-               idx = scn_num_objects(scn);
-               add_sphere();
-               selobj = idx;
+               act_addobj();
                break;
 
        case TBN_RM:
-               if(selobj >= 0) {
-                       scn_rm_object(scn, selobj);
-                       selobj = -1;
-                       app_redisplay();
-               }
+               act_rmobj();
                break;
 
        default:
@@ -426,43 +456,56 @@ static void tbn_callback(rtk_widget *w, void *cls)
        }
 }
 
-static void draw_rband(void)
+static void act_settool(int tidx)
 {
-       int i, x, y, w, h;
-       uint32_t *fbptr, *bptr;
+       int i;
+       rtk_rect r;
 
-       x = rband.x;
-       y = rband.y;
+       if(tidx == cur_tool) return;
 
-       if(rband.width < 0) {
-               w = -rband.width;
-               x += rband.width;
-       } else {
-               w = rband.width;
+       if(cur_tool == TOOL_REND_AREA) {
+               totalrend.width = 0;
+               app_redisplay(totalrend.x, totalrend.y, totalrend.width, totalrend.height);
+               inval_vport();
        }
-       if(rband.height < 0) {
-               h = -rband.height;
-               y += rband.height;
-       } else {
-               h = rband.height;
+
+       prev_tool = cur_tool;
+       cur_tool = tidx;
+       for(i=0; i<NUM_TOOLS; i++) {
+               if(i == cur_tool) {
+                       if(!rtk_get_value(tools[i])) {
+                               rtk_set_value(tools[i], 1);
+                               rtk_get_rect(tools[i], &r);
+                       }
+               } else {
+                       if(rtk_get_value(tools[i])) {
+                               rtk_set_value(tools[i], 0);
+                               rtk_get_rect(tools[i], &r);
+                       }
+               }
        }
+}
 
-       fbptr = framebuf + y * win_width + x;
-       bptr = fbptr + win_width * (h - 1);
+static void act_addobj(void)
+{
+       int idx = scn_num_objects(scn);
+       add_sphere();
+       selobj = idx;
 
-       for(i=0; i<w; i++) {
-               fbptr[i] ^= 0xffffff;
-               bptr[i] ^= 0xffffff;
-       }
-       fbptr += win_width;
-       for(i=0; i<h-2; i++) {
-               fbptr[0] ^= 0xffffff;
-               fbptr[w - 1] ^= 0xffffff;
-               fbptr += win_width;
+       inval_vport();
+}
+
+static void act_rmobj(void)
+{
+       if(selobj >= 0) {
+               scn_rm_object(scn, selobj);
+               selobj = -1;
+               inval_vport();
        }
 }
 
-static void primray(cgm_ray *ray, int x, int y)
+
+void primray(cgm_ray *ray, int x, int y)
 {
        float nx, ny;
        cgm_vec3 npos, farpt;
@@ -484,3 +527,30 @@ static void primray(cgm_ray *ray, int x, int y)
        ray->dir.y = farpt.y - ray->origin.y;
        ray->dir.z = farpt.z - ray->origin.z;
 }
+
+static void moveobj(struct object *obj, int px0, int py0, int px1, int py1)
+{
+       cgm_ray ray;
+       float dist;
+       cgm_vec3 p0, p1;
+
+       primray(&ray, px0, py0);
+       cgm_vnormalize(&ray.dir);
+       dist = ray_object_dist(&ray, obj);
+       cgm_raypos(&p0, &ray, dist);
+       primray(&ray, px1, py1);
+       cgm_vnormalize(&ray.dir);
+       cgm_raypos(&p1, &ray, dist);
+
+       cgm_vsub(&p1, &p0);
+       cgm_vadd(&obj->pos, &p1);
+       obj->xform_valid = 0;
+
+       inval_vport();
+}
+
+static void inval_vport(void)
+{
+       vpdirty = 1;
+       app_redisplay(0, 0, 0, 0);
+}