X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscr_mod.c;h=3ad4e7b64a55c777b90aa028b9cd7cc103cfc937;hb=bba16e9faf7ff0e4089ba75c06baef713da04a4a;hp=810765028fc156703867b8e93e6b6757ccfac662;hpb=f0f09a5f3f76fd4207e4d2d71f29f876b2b379f7;p=retroray
diff --git a/src/scr_mod.c b/src/scr_mod.c
index 8107650..3ad4e7b 100644
--- a/src/scr_mod.c
+++ b/src/scr_mod.c
@@ -15,18 +15,23 @@ 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 .
*/
+#include
#include "gaw/gaw.h"
#include "app.h"
#include "rtk.h"
#include "scene.h"
+#include "geom.h"
#include "cmesh.h"
#include "meshgen.h"
+#include "font.h"
+#include "rend.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_MTL, TBN_REND, TBN_VIEWREND, TBN_SEP4, TBN_CFG,
+ TBN_UNION, TBN_ISECT, TBN_DIFF, TBN_SEP4,
+ TBN_MTL, TBN_REND, TBN_REND_AREA, TBN_VIEWREND, TBN_SEP5, TBN_CFG,
NUM_TOOL_BUTTONS
};
@@ -34,18 +39,37 @@ static const char *tbn_icon_name[] = {
"new", "open", "save", 0,
"sel", "move", "rot", "scale", 0,
"add", "remove", 0,
- "mtl", "rend", "viewrend", 0, "cfg"
+ "union", "isect", "diff", 0,
+ "mtl", "rend", "rend-area", "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},
- {48,16}, {64,16}, {80,16}, {-1,-1}, {96,16}
+ {0,16}, {16,16}, {32,16}, {-1,-1},
+ {48,16}, {64,16}, {64, 32}, {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, 1, 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, TOOL_REND_AREA,
+ NUM_TOOLS
+};
+static rtk_widget *tools[NUM_TOOLS];
+
+static int vpdirty;
+
static int mdl_init(void);
static void mdl_destroy(void);
@@ -57,9 +81,22 @@ static void mdl_keyb(int key, int press);
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 act_settool(int tidx);
+static void act_addobj(void);
+static void act_rmobj(void);
+
+static void fix_rect(rtk_rect *rect);
+static void draw_rband(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 = {
"modeller",
mdl_init, mdl_destroy,
@@ -74,11 +111,24 @@ static rtk_iconsheet *icons;
static struct cmesh *mesh_sph;
static float cam_theta, cam_phi = 20, cam_dist = 8;
+static float view_matrix[16], proj_matrix[16];
+static float view_matrix_inv[16], proj_matrix_inv[16];
+static int viewport[4];
+static cgm_ray pickray;
+
+static int cur_tool, prev_tool = -1;
+static int selobj = -1;
+
+static rtk_rect rband;
+static int rband_valid;
+
+static int rendering;
+static rtk_rect rendrect;
static int mdl_init(void)
{
- int i;
+ int i, toolidx;
rtk_widget *w;
if(!(icons = rtk_load_iconsheet("data/icons.png"))) {
@@ -99,6 +149,7 @@ static int mdl_init(void)
}
rtk_win_layout(toolbar, RTK_HBOX);
+ toolidx = 0;
for(i=0; iobjects[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;
- gaw_viewport(0, TOOLBAR_HEIGHT, win_width, win_height - TOOLBAR_HEIGHT);
+ /* dirty all GUI windows */
+ rtk_invalidate(toolbar);
+ }
- 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);
+ /* render layer */
+ if(rendering) {
+ if(!render(framebuf)) {
+ rendering = 0;
+ vpdirty = 1;
+ }
+ app_redisplay(rendrect.x, rendrect.y, rendrect.width, rendrect.height);
+ }
- draw_grid();
+ /* GUI */
+ rtk_draw_widget(toolbar);
- gaw_poly_wire();
+ if(rband_valid) {
+ draw_rband();
+ }
+}
- num = scn_num_objects(scn);
- for(i=0; iobjects[i];
- struct sphere *sph;
+static void draw_object(struct object *obj)
+{
+ struct sphere *sph;
+ if(!obj->xform_valid) {
calc_object_matrix(obj);
- gaw_push_matrix();
- gaw_mult_matrix(obj->xform);
-
- switch(obj->type) {
- case OBJ_SPHERE:
- sph = (struct sphere*)obj;
- gaw_scale(sph->rad, sph->rad, sph->rad);
- cmesh_draw(mesh_sph);
- break;
-
- default:
- break;
- }
+ }
+ gaw_push_matrix();
+ gaw_mult_matrix(obj->xform);
+
+ switch(obj->type) {
+ case OBJ_SPHERE:
+ sph = (struct sphere*)obj;
+ gaw_scale(sph->rad, sph->rad, sph->rad);
+ cmesh_draw(mesh_sph);
+ break;
- gaw_pop_matrix();
+ default:
+ break;
}
- gaw_poly_gouraud();
+ gaw_pop_matrix();
+}
- gaw_viewport(0, 0, win_width, win_height);
+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)
@@ -212,9 +322,18 @@ static void mdl_reshape(int x, int y)
{
float aspect = (float)x / (float)(y - TOOLBAR_HEIGHT);
+ viewport[0] = 0;
+ viewport[1] = TOOLBAR_HEIGHT;
+ viewport[2] = x;
+ viewport[3] = y - TOOLBAR_HEIGHT;
+ gaw_viewport(viewport[0], viewport[1], viewport[2], viewport[3]);
+
gaw_matrix_mode(GAW_PROJECTION);
gaw_load_identity();
gaw_perspective(50, aspect, 0.5, 100.0);
+ gaw_get_projection(proj_matrix);
+ cgm_mcopy(proj_matrix_inv, proj_matrix);
+ cgm_minverse(proj_matrix_inv);
rtk_resize(toolbar, win_width, TOOLBAR_HEIGHT);
}
@@ -222,24 +341,85 @@ static void mdl_reshape(int x, int y)
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;
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);
} else {
vpdrag &= ~(1 << bn);
+
+ if(rband_valid) {
+ rband_valid = 0;
+
+ if(cur_tool == TOOL_REND_AREA) {
+ if(prev_tool >= 0) {
+ act_settool(prev_tool);
+ }
+ rendering = 1;
+ rend_size(win_width, win_height);
+ 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);
+
+ } else if(bn == 0 && x == rband.x && y == rband.y) {
+ primray(&pickray, x, y);
+ if(scn_intersect(scn, &pickray, &hit)) {
+ int newsel = scn_object_index(scn, hit.obj);
+ if(newsel != selobj) {
+ selobj = newsel;
+ inval_vport();
+ }
+ } else {
+ if(selobj != -1) {
+ inval_vport();
+ }
+ selobj = -1;
+ }
+ }
}
}
@@ -248,27 +428,50 @@ static void mdl_motion(int x, int y)
int dx, dy;
if(!vpdrag && rtk_input_mmotion(toolbar, x, y)) {
- app_redisplay();
return;
}
dx = x - mouse_x;
dy = y - mouse_y;
- if((dx | dy) == 0) return;
-
- if(mouse_state[0]) {
- cam_theta += dx * 0.5f;
- cam_phi += dy * 0.5f;
- if(cam_phi < -90) cam_phi = -90;
- if(cam_phi > 90) cam_phi = 90;
- app_redisplay();
- }
+ if(modkeys) {
+ /* navigation */
+ if(mouse_state[0]) {
+ cam_theta += dx * 0.5f;
+ cam_phi += dy * 0.5f;
+ if(cam_phi < -90) cam_phi = -90;
+ if(cam_phi > 90) cam_phi = 90;
+ inval_vport();
+ }
- if(mouse_state[2]) {
- cam_dist += dy * 0.1f;
- if(cam_dist < 0) cam_dist = 0;
- app_redisplay();
+ if(mouse_state[2]) {
+ cam_dist += dy * 0.1f;
+ if(cam_dist < 0) cam_dist = 0;
+ inval_vport();
+ }
+ } else {
+ if(mouse_state[0]) {
+ 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;
+ }
+ break;
+
+ case TOOL_MOVE:
+ if(selobj >= 0) {
+ struct object *obj = scn->objects[selobj];
+ moveobj(obj, mouse_x, mouse_y, x, y);
+ }
+ break;
+
+ default:
+ break;
+ }
+ }
}
}
@@ -287,11 +490,171 @@ static void tbn_callback(rtk_widget *w, void *cls)
int id = (intptr_t)cls;
switch(id) {
+ case TBN_SEL:
+ case TBN_MOVE:
+ case TBN_ROT:
+ case TBN_SCALE:
+ act_settool(id - TBN_SEL);
+ break;
+ case TBN_UNION:
+ case TBN_ISECT:
+ case TBN_DIFF:
+ act_settool(id - TBN_UNION + TOOL_UNION);
+ break;
+ case TBN_REND_AREA:
+ act_settool(TOOL_REND_AREA);
+ break;
+
case TBN_ADD:
- add_sphere();
+ act_addobj();
+ break;
+
+ case TBN_RM:
+ act_rmobj();
break;
default:
break;
}
}
+
+static void act_settool(int tidx)
+{
+ int i;
+ rtk_rect r;
+
+ prev_tool = cur_tool;
+ cur_tool = tidx;
+ for(i=0; i= 0) {
+ scn_rm_object(scn, selobj);
+ selobj = -1;
+ inval_vport();
+ }
+}
+
+static void fix_rect(rtk_rect *rect)
+{
+ int x, y, w, h;
+
+ x = rband.x;
+ y = rband.y;
+
+ if(rband.width < 0) {
+ w = -rband.width;
+ x += rband.width;
+ } else {
+ w = rband.width;
+ }
+ if(rband.height < 0) {
+ h = -rband.height;
+ y += rband.height;
+ } else {
+ h = rband.height;
+ }
+
+ rect->x = x;
+ rect->y = y;
+ rect->width = w;
+ rect->height = h;
+}
+
+static void draw_rband(void)
+{
+ int i;
+ rtk_rect rect;
+ uint32_t *fbptr, *bptr;
+
+ rect = rband;
+ fix_rect(&rect);
+
+ fbptr = framebuf + rect.y * win_width + rect.x;
+ bptr = fbptr + win_width * (rect.height - 1);
+
+ for(i=0; iorigin, &npos, inv_pv);
+ npos.z = 1.0f;
+ cgm_unproject(&farpt, &npos, inv_pv);
+
+ ray->dir.x = farpt.x - ray->origin.x;
+ 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);
+}