mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-27 14:37:16 +00:00
Code Issues Releases Wiki Activity

renamed rockinfo to ads_object

Browse Source
This commit is contained in:
Zeno Rogue 2022-09-11 13:43:44 +02:00
parent 06832c5371
commit a221244cab
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rogueviz/ads/control.cpp
View File

@ -14,7 +14,7 @@ void fire() {
ads_matrix S1 = S0 * lorentz(0, 2, 3); // 0.995c ads_matrix S1 = S0 * lorentz(0, 2, 3); // 0.995c
auto& ro = ci_at[c].rocks; auto& ro = ci_at[c].rocks;
ro.emplace_back(rockinfo{oMissile, c, S1, 0xC0C0FFFF }); ro.emplace_back(ads_object{oMissile, c, S1, 0xC0C0FFFF });
auto& r = ro.back(); auto& r = ro.back();
ads_matrix Scell(Id, 0); ads_matrix Scell(Id, 0);

2
rogueviz/ads/globals.cpp
View File

@ -41,7 +41,7 @@ const char *tformat = "%.2f";
void game_menu(); void game_menu();
/** all the missiles and objects currently displayed */ /** all the missiles and objects currently displayed */
vector<struct rockinfo*> displayed; vector<struct ads_object*> displayed;
color_t missile_color = 0xFF0000FF; color_t missile_color = 0xFF0000FF;

18
rogueviz/ads/map.cpp
View File

@ -4,7 +4,7 @@ namespace ads_game {
enum eObjType { oRock, oMissile, oParticle }; enum eObjType { oRock, oMissile, oParticle };
struct rockinfo { struct ads_object {
eObjType type; eObjType type;
cell *owner; cell *owner;
ads_matrix at; ads_matrix at;
@ -14,7 +14,7 @@ struct rockinfo {
flatresult pt_main; flatresult pt_main;
vector<flatresult> pts; vector<flatresult> pts;
rockinfo(eObjType t, cell *_owner, const ads_matrix& T, color_t _col) : type(t), owner(_owner), at(T), col(_col) { ads_object(eObjType t, cell *_owner, const ads_matrix& T, color_t _col) : type(t), owner(_owner), at(T), col(_col) {
life_start = -HUGE_VAL; life_start = -HUGE_VAL;
life_end = HUGE_VAL; life_end = HUGE_VAL;
} }
@ -25,7 +25,7 @@ enum eWalltype { wtNone, wtDestructible, wtSolid, wtGate };
struct cellinfo { struct cellinfo {
int mpd_terrain; /* 0 = fully generated terrain */ int mpd_terrain; /* 0 = fully generated terrain */
int rock_dist; /* rocks generated in this radius */ int rock_dist; /* rocks generated in this radius */
vector<rockinfo> rocks; vector<ads_object> rocks;
eWalltype type; eWalltype type;
cellinfo() { cellinfo() {
mpd_terrain = 4; mpd_terrain = 4;
@ -119,7 +119,7 @@ void gen_rocks(cell *c, cellinfo& ci, int radius) {
hybrid::in_actual([&] { hybrid::in_actual([&] {
int q = rpoisson(.25); int q = rpoisson(.25);
auto add_rock = [&] (rockinfo&& r) { auto add_rock = [&] (ads_object&& r) {
if(geometry != gRotSpace) { println(hlog, "wrong geometry detected in gen_rocks 2!"); exit(1); } if(geometry != gRotSpace) { println(hlog, "wrong geometry detected in gen_rocks 2!"); exit(1); }
compute_life(hybrid::get_at(c, 0), unshift(r.at), [&] (cell *c, ld t) { compute_life(hybrid::get_at(c, 0), unshift(r.at), [&] (cell *c, ld t) {
auto& ci = ci_at[c]; auto& ci = ci_at[c];
@ -133,9 +133,9 @@ void gen_rocks(cell *c, cellinfo& ci, int radius) {
for(int i=0; i<q; i++) { for(int i=0; i<q; i++) {
int kind = hrand(100); int kind = hrand(100);
if(kind < 50) if(kind < 50)
add_rock(rockinfo(oRock, c, ads_matrix(rots::uxpush(randd() * .6 - .3) * rots::uypush(randd() * .6 - .3)), 0xC0C0C0FF)); add_rock(ads_object(oRock, c, ads_matrix(rots::uxpush(randd() * .6 - .3) * rots::uypush(randd() * .6 - .3)), 0xC0C0C0FF));
else else
add_rock(rockinfo(oRock, c, ads_matrix(rots::uypush(randd() * .6 - .3) * lorentz(0, 3, 0.5 + randd() * 1)), 0xC04040FF)); add_rock(ads_object(oRock, c, ads_matrix(rots::uypush(randd() * .6 - .3) * lorentz(0, 3, 0.5 + randd() * 1)), 0xC04040FF));
} }
}); });
} }
@ -145,7 +145,7 @@ void gen_rocks(cell *c, cellinfo& ci, int radius) {
void gen_particles(int qty, cell *c, shiftmatrix from, color_t col, ld t) { void gen_particles(int qty, cell *c, shiftmatrix from, color_t col, ld t) {
auto& ro = ci_at[c].rocks; auto& ro = ci_at[c].rocks;
for(int i=0; i<qty; i++) { for(int i=0; i<qty; i++) {
ro.emplace_back(rockinfo{oParticle, c, from * spin(randd() * TAU) * lorentz(0, 2, 1 + randd()), col }); ro.emplace_back(ads_object{oParticle, c, from * spin(randd() * TAU) * lorentz(0, 2, 1 + randd()), col });
auto& r = ro.back(); auto& r = ro.back();
r.life_end = randd() * t; r.life_end = randd() * t;
r.life_start = 0; r.life_start = 0;
@ -153,8 +153,8 @@ void gen_particles(int qty, cell *c, shiftmatrix from, color_t col, ld t) {
} }
void handle_crashes() { void handle_crashes() {
vector<rockinfo*> missiles; vector<ads_object*> missiles;
vector<rockinfo*> rocks; vector<ads_object*> rocks;
for(auto m: displayed) { for(auto m: displayed) {
if(m->type == oMissile) if(m->type == oMissile)
missiles.push_back(m); missiles.push_back(m);