X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fscr_mod.c;h=48e51a0fdcaf2e793783cdee6cc431edc9824ca7;hb=HEAD;hp=47f0119f80a195d5b3963d7848af009c3207b9e6;hpb=a8b3d0279566b8a49ea64d7e9e3dfa958364e347;p=retroray

diff --git a/src/scr_mod.c b/src/scr_mod.c
index 47f0119..48e51a0 100644
--- a/src/scr_mod.c
+++ b/src/scr_mod.c
@@ -15,58 +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_REND_AREA, 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", "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}, {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 rtk_rect totalrend;
 
 
 static int mdl_init(void);
@@ -80,17 +41,17 @@ 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 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",
@@ -100,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;
 
@@ -118,64 +77,30 @@ static rtk_rect rband;
 static int rband_valid;
 
 static int rendering;
+static rtk_rect rendrect;
 
 
 static int mdl_init(void)
 {
-	int i, toolidx;
-	rtk_widget *w;
-
-	if(!(icons = rtk_load_iconsheet("data/icons.png"))) {
-		errormsg("failed to load iconsheet\n");
+	if(modui_init() == -1) {
+		errormsg("failed to initialize modeller UI\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))) {
-		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)
@@ -186,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;
 }
 
@@ -196,61 +123,61 @@ static void mdl_stop(void)
 static void mdl_display(void)
 {
 	int i, num;
-	static int frameno;
-
-	gaw_clear(GAW_COLORBUF | GAW_DEPTHBUF);
-
-	rtk_draw_widget(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]);
+	/* 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;
+
+		/* dirty all GUI windows */
+		rtk_invalidate(toolbar);
+		rtk_invalidate(mtlwin);
 	}
 
+	/* render layer */
 	if(rendering) {
-		if(render(framebuf)) {
-			app_redisplay();
-		} else {
+		if(!render(framebuf)) {
 			rendering = 0;
 		}
+		app_redisplay(rendrect.x, rendrect.y, rendrect.width, rendrect.height);
 	}
 
-	use_font(uifont);
-	dtx_position(550, 475);
-	dtx_color(0.3, 0.3, 0.1, 1);
-	dtx_printf("update: %ld", frameno++);
-
-	if(rband_valid) {
-		draw_rband();
-	}
+	/* GUI */
+	rtk_draw_widget(toolbar);
+	rtk_draw_widget(mtlwin);
 }
 
 static void draw_object(struct object *obj)
@@ -277,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();
@@ -316,12 +250,13 @@ 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;
 	}
 
@@ -340,6 +275,10 @@ static void mdl_keyb(int key, int press)
 			act_settool(TOOL_SCALE);
 			break;
 
+		case KEY_F6:
+			act_settool(TOOL_REND_AREA);
+			break;
+
 		case KEY_DEL:
 			act_rmobj();
 			break;
@@ -356,7 +295,6 @@ 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;
 	}
 
@@ -370,25 +308,40 @@ static void mdl_mouse(int bn, int press, int x, int y)
 
 		if(rband_valid) {
 			rband_valid = 0;
+			app_rband(0, 0, 0, 0);
 
 			if(cur_tool == TOOL_REND_AREA) {
-				if(prev_tool >= 0) {
-					act_settool(prev_tool);
+				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;
+					}
 				}
-				rendering = 1;
-				rend_size(win_width, win_height);
-				rend_begin(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();
 	}
 }
 
@@ -397,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;
 	}
 
@@ -411,13 +363,13 @@ 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]) {
@@ -428,6 +380,7 @@ static void mdl_motion(int x, int 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;
 
@@ -441,7 +394,6 @@ static void mdl_motion(int x, int y)
 			default:
 				break;
 			}
-			app_redisplay();
 		}
 	}
 }
@@ -456,11 +408,16 @@ 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 id = (intptr_t)cls;
 
 	switch(id) {
+	case TBN_NEW:
+		scn_clear(scn);
+		inval_vport();
+		break;
+
 	case TBN_SEL:
 	case TBN_MOVE:
 	case TBN_ROT:
@@ -472,6 +429,16 @@ static void tbn_callback(rtk_widget *w, void *cls)
 	case TBN_DIFF:
 		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;
@@ -492,16 +459,31 @@ static void tbn_callback(rtk_widget *w, void *cls)
 static void act_settool(int tidx)
 {
 	int i;
+	rtk_rect r;
+
+	if(tidx == cur_tool) return;
+
+	if(cur_tool == TOOL_REND_AREA) {
+		totalrend.width = 0;
+		app_redisplay(totalrend.x, totalrend.y, totalrend.width, totalrend.height);
+		inval_vport();
+	}
+
 	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)
@@ -510,7 +492,7 @@ static void act_addobj(void)
 	add_sphere();
 	selobj = idx;
 
-	app_redisplay();
+	inval_vport();
 }
 
 static void act_rmobj(void)
@@ -518,47 +500,12 @@ static void act_rmobj(void)
 	if(selobj >= 0) {
 		scn_rm_object(scn, selobj);
 		selobj = -1;
-		app_redisplay();
+		inval_vport();
 	}
 }
 
-static void draw_rband(void)
-{
-	int i, x, y, w, h;
-	uint32_t *fbptr, *bptr;
-
-	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;
-	}
-
-	fbptr = framebuf + y * win_width + x;
-	bptr = fbptr + win_width * (h - 1);
-
-	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;
-	}
-}
 
-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;
@@ -598,4 +545,12 @@ static void moveobj(struct object *obj, int px0, int py0, int px1, int py1)
 	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);
 }