#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"
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,
+ TBN_MTL, TBN_REND, TBN_REND_AREA, TBN_VIEWREND, TBN_SEP5, TBN_CFG,
NUM_TOOL_BUTTONS
};
"sel", "move", "rot", "scale", 0,
"add", "remove", 0,
"union", "isect", "diff", 0,
- "mtl", "rend", "viewrend", 0, "cfg"
+ "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},
{0,16}, {16,16}, {32,16}, {-1,-1},
- {48,16}, {64,16}, {80,16}, {-1,-1}, {96,16}
+ {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, 0, 0, 0
+ 0, 0, 1, 0, 0, 0
};
static rtk_icon *tbn_icons[NUM_TOOL_BUTTONS];
static rtk_widget *tbn_buttons[NUM_TOOL_BUTTONS];
enum {
TOOL_SEL, TOOL_MOVE, TOOL_ROT, TOOL_SCALE,
- TOOL_UNION, TOOL_ISECT, TOOL_DIFF,
+ 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);
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_addobj(void);
static void act_rmobj(void);
+static void fix_rect(rtk_rect *rect);
static void draw_rband(void);
-static void primray(cgm_ray *ray, int x, int y);
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",
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 rendering;
+static rtk_rect rendrect;
+
static int mdl_init(void)
{
return -1;
}
gen_sphere(mesh_sph, 1.0f, 16, 8, 1.0f, 1.0f);
+
+ vpdirty = 1;
return 0;
}
gaw_enable(GAW_CULL_FACE);
gaw_enable(GAW_LIGHTING);
gaw_enable(GAW_LIGHT0);
+
+ rend_pan(0, -TOOLBAR_HEIGHT);
return 0;
}
{
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);
+ }
- 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;
+ vpdirty = 1;
}
+ app_redisplay(rendrect.x, rendrect.y, rendrect.width, rendrect.height);
}
+ /* GUI */
+ rtk_draw_widget(toolbar);
+
if(rband_valid) {
draw_rband();
}
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();
static void mdl_keyb(int key, int press)
{
if(rtk_input_key(toolbar, key, press)) {
- app_redisplay();
return;
}
act_settool(TOOL_SCALE);
break;
+ case KEY_F6:
+ act_settool(TOOL_REND_AREA);
+ break;
+
case KEY_DEL:
act_rmobj();
break;
{
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);
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;
+ 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)) {
- 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();
}
}
int dx, dy;
if(!vpdrag && rtk_input_mmotion(toolbar, x, y)) {
- app_redisplay();
return;
}
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]) {
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;
break;
}
}
- app_redisplay();
}
}
static void tbn_callback(rtk_widget *w, void *cls)
{
int id = (intptr_t)cls;
- int idx;
switch(id) {
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;
- }
- act_settool(idx);
+ act_settool(id - TBN_UNION + TOOL_UNION);
+ break;
+ case TBN_REND_AREA:
+ act_settool(TOOL_REND_AREA);
break;
case TBN_ADD:
static void act_settool(int tidx)
{
int i;
+ rtk_rect r;
+
+ prev_tool = cur_tool;
cur_tool = tidx;
for(i=0; i<NUM_TOOLS; i++) {
if(i == cur_tool) {
- rtk_set_value(tools[i], 1);
+ if(!rtk_get_value(tools[i])) {
+ rtk_set_value(tools[i], 1);
+ rtk_get_rect(tools[i], &r);
+ }
} else {
- rtk_set_value(tools[i], 0);
+ if(rtk_get_value(tools[i])) {
+ rtk_set_value(tools[i], 0);
+ rtk_get_rect(tools[i], &r);
+ }
}
}
- app_redisplay();
}
static void act_addobj(void)
add_sphere();
selobj = idx;
- app_redisplay();
+ inval_vport();
}
static void act_rmobj(void)
if(selobj >= 0) {
scn_rm_object(scn, selobj);
selobj = -1;
- app_redisplay();
+ inval_vport();
}
}
-static void draw_rband(void)
+static void fix_rect(rtk_rect *rect)
{
- int i, x, y, w, h;
- uint32_t *fbptr, *bptr;
+ int x, y, w, h;
x = rband.x;
y = rband.y;
h = rband.height;
}
- fbptr = framebuf + y * win_width + x;
- bptr = fbptr + win_width * (h - 1);
+ 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);
- for(i=0; i<w; i++) {
+ fbptr = framebuf + rect.y * win_width + rect.x;
+ bptr = fbptr + win_width * (rect.height - 1);
+
+ for(i=0; i<rect.width; i++) {
fbptr[i] ^= 0xffffff;
bptr[i] ^= 0xffffff;
}
fbptr += win_width;
- for(i=0; i<h-2; i++) {
+ for(i=0; i<rect.height-2; i++) {
fbptr[0] ^= 0xffffff;
- fbptr[w - 1] ^= 0xffffff;
+ fbptr[rect.width - 1] ^= 0xffffff;
fbptr += win_width;
}
+ app_redisplay(rect.x, rect.y, rect.width, rect.height);
}
-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;
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);
}
projects / retroray / blobdiff