mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 14:02:59 +00:00
Code Issues Releases Wiki Activity

ru:: platforms can have multiple types

Browse Source
This commit is contained in:
Zeno Rogue
2025-05-17 11:10:07 +02:00
parent c19bc4800b
commit 9359f58f77
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rogueviz/ru/classes.cpp
View File

@@ -305,7 +305,9 @@ extern man m;
struct moving_platform : public entity { struct moving_platform : public entity {
xy ctr; xy ctr;
ld radius, shift; ld radius, shift;
xy siz() override { return {36, 12}; } virtual int width() { return 3; }
virtual eWall platform_type() { return wWall; }
xy siz() override { return {12.*width(), 12}; }
string glyph() override { return "#"; } string glyph() override { return "#"; }
color_t color() override { return 0xFFFFFFFF; } color_t color() override { return 0xFFFFFFFF; }
virtual xy location_at(ld t) = 0; virtual xy location_at(ld t) = 0;

21
rogueviz/ru/entity.cpp
View File

@@ -178,29 +178,35 @@ void entity::apply_walls() {
auto pb = p->get_pixel_bbox_at(screen_ctr); auto pb = p->get_pixel_bbox_at(screen_ctr);
if(intersect(pb, eb)) { if(intersect(pb, eb)) {
zero_vel = (rmow - screen_ctr) * get_scale_at(npw.y) + npw - where; auto zvel = (rmow - screen_ctr) * get_scale_at(npw.y) + npw - where;
bool reset = false; bool reset = false;
if(intersect(pb, get_pixel_bbox_at(rmow))) { /* should not happen */ } if(p->platform_type() == wStaircase) {
if(!fallthru) { on_floor = true; zero_vel = zvel; if(rvel.y > 0) rvel.y = 0; }
}
else if(intersect(pb, get_pixel_bbox_at(rmow))) { /* should not happen */ }
else if(!intersect(pb, get_pixel_bbox_at(rmow + xy(rvel.x, 0))) && rvel.y > 0) { else if(!intersect(pb, get_pixel_bbox_at(rmow + xy(rvel.x, 0))) && rvel.y > 0) {
on_floor = true; on_floor = true;
rvel.y /= 2; rvel.y /= 2;
if(abs(rvel.y) < 1e-6) rvel.y = 0; if(abs(rvel.y) < 1e-6) rvel.y = 0;
reset = true; reset = true;
zero_vel = zvel;
} }
else if(!intersect(pb, get_pixel_bbox_at(rmow + xy(rvel.x, 0))) && rvel.y < 0) { else if(!intersect(pb, get_pixel_bbox_at(rmow + xy(rvel.x, 0))) && rvel.y < 0) {
rvel.y /= 2; rvel.y /= 2;
if(abs(rvel.y) < 1e-6) rvel.y = 0; if(abs(rvel.y) < 1e-6) rvel.y = 0;
reset = true; reset = true;
zero_vel = zvel;
} }
else { else {
rvel.x = -rvel.x; rvel.x = -rvel.x;
reset = true; reset = true;
zero_vel = zvel;
} }
vel = (rmow + rvel - screen_ctr) * get_scale_at(npw.y) + npw - where; vel = (rmow + rvel - screen_ctr) * get_scale_at(npw.y) + npw - where;
@@ -446,12 +452,13 @@ xy pendulum_platform::location_at(ld t) {
void moving_platform::draw() { void moving_platform::draw() {
double d = get_scale(); double d = get_scale();
for(int w=-1; w<=1; w++) { auto wi = width();
ld minx = where.x + siz().x * d * (w - 0.5) / 3; for(int w=0; w<wi; w++) {
ld minx = where.x + siz().x * d * (w - 0.5) / wi;
ld miny = where.y - siz().y * d / 2; ld miny = where.y - siz().y * d / 2;
ld maxx = where.x + siz().x * d * (w + 0.5) / 3; ld maxx = where.x + siz().x * d * (w + 0.5) / wi;
ld maxy = where.y + siz().y * d / 2; ld maxy = where.y + siz().y * d / 2;
asciiletter(minx, miny, maxx, maxy, "#", 0xFFFFFFFF); asciiletter(minx, miny, maxx, maxy, glyph(), color());
} }
} }