projects
/
retroray
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add relative mouse handling in mouse.asm
[retroray]
/
src
/
scr_mod.c
diff --git
a/src/scr_mod.c
b/src/scr_mod.c
index
47f0119
..
d3cbb40
100644
(file)
--- a/
src/scr_mod.c
+++ b/
src/scr_mod.c
@@
-20,7
+20,7
@@
along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "app.h"
#include "rtk.h"
#include "scene.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 "cmesh.h"
#include "meshgen.h"
#include "font.h"
@@
-80,6
+80,7
@@
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 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_grid(void);
static void tbn_callback(rtk_widget *w, void *cls);
@@
-87,8
+88,8
@@
static void act_settool(int tidx);
static void act_addobj(void);
static void act_rmobj(void);
static void act_addobj(void);
static void act_rmobj(void);
+static void fix_rect(rtk_rect *rect);
static void draw_rband(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 moveobj(struct object *obj, int px0, int py0, int px1, int py1);
@@
-186,6
+187,8
@@
static int mdl_start(void)
gaw_enable(GAW_CULL_FACE);
gaw_enable(GAW_LIGHTING);
gaw_enable(GAW_LIGHT0);
gaw_enable(GAW_CULL_FACE);
gaw_enable(GAW_LIGHTING);
gaw_enable(GAW_LIGHT0);
+
+ rend_pan(0, -TOOLBAR_HEIGHT);
return 0;
}
return 0;
}
@@
-213,10
+216,10
@@
static void mdl_display(void)
draw_grid();
draw_grid();
- gaw_mtl_diffuse(0.5, 0.5, 0.5, 1);
-
num = scn_num_objects(scn);
for(i=0; i<num; i++) {
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);
if(i == selobj) {
gaw_zoffset(1);
gaw_enable(GAW_POLYGON_OFFSET);
@@
-277,6
+280,13
@@
static void draw_object(struct object *obj)
gaw_pop_matrix();
}
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 draw_grid(void)
{
gaw_save();
@@
-377,6
+387,7
@@
static void mdl_mouse(int bn, int press, int x, int y)
}
rendering = 1;
rend_size(win_width, win_height);
}
rendering = 1;
rend_size(win_width, win_height);
+ fix_rect(&rband);
rend_begin(rband.x, rband.y, rband.width, rband.height);
}
rend_begin(rband.x, rband.y, rband.width, rband.height);
}
@@
-522,10
+533,9
@@
static void act_rmobj(void)
}
}
}
}
-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;
x = rband.x;
y = rband.y;
@@
-543,22
+553,37
@@
static void draw_rband(void)
h = rband.height;
}
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);
+
+ fbptr = framebuf + rect.y * win_width + rect.x;
+ bptr = fbptr + win_width * (rect.height - 1);
- for(i=0; i<w; i++) {
+ for(i=0; i<rect.width; i++) {
fbptr[i] ^= 0xffffff;
bptr[i] ^= 0xffffff;
}
fbptr += win_width;
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[0] ^= 0xffffff;
- fbptr[w - 1] ^= 0xffffff;
+ fbptr[rect.width - 1] ^= 0xffffff;
fbptr += win_width;
}
}
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;
{
float nx, ny;
cgm_vec3 npos, farpt;