Implement calibrated Modern stadium periphery preview and staged upgrades (by Codex)
This commit is contained in:
1 parent
fff2cc2f0b
commit
bfcf9a07bf
12 files changed
+470
-37
No files matched your search
@@ -55,7 +55,7 @@ bool App::stadium_action(const std::string &action,Rml::Element *target) {
|
||||
if(!q.value("can_build",false)||stadium_view_.at("invalid_places").get<bool>()){sync_stadium_draft();return true;}
|
||||
const auto result=source_->apply({stadium_revision_,"stadium",{{"kind","build"},{"request",stadium_view_.at("draft")}}});
|
||||
if(!result.ok){stadium_view_["feedback"]="Der Bauauftrag konnte nicht übernommen werden. Bitte den aktuellen Stand erneut öffnen.";sync_stadium_draft();return true;}
|
||||
stadium_view_["future"]=true;stadium_view_["return_focus"]="stadium-future";cancel();return true;
|
||||
stadium_view_["future"]=stadium_view_.at("draft").at("kind")!="periphery";stadium_view_["hint"]="";stadium_view_["return_focus"]="stadium-future";cancel();return true;
|
||||
}
|
||||
if(action=="stadium-option") {
|
||||
if(stadium_view_.at("dialog")!="facility"||!index||!fresh())return true;
|
||||
@@ -75,6 +75,13 @@ bool App::stadium_action(const std::string &action,Rml::Element *target) {
|
||||
open_amount(std::move(request));return true;
|
||||
}
|
||||
if(stadium_view_.at("dialog")!="")return true;
|
||||
if(action=="stadium-periphery") {
|
||||
if(stadium_view_.at("view")!="panorama"||!index||*index>13||!target)return true;
|
||||
const auto &row=overview.at("periphery")[size_t(*index)];
|
||||
if(row.at("building").get<bool>()||row.at("level").get<int>()>=row.at("max_level").get<int>())return true;
|
||||
stadium_view_["draft"]={{"kind","periphery"},{"index",*index},{"level",row.at("level").get<int>()+1}};
|
||||
stadium_view_["dialog"]="periphery";stadium_view_["bound_club"]=club;stadium_view_["feedback"]="";stadium_view_["invalid_places"]=false;stadium_view_["return_focus"]=target->GetId();stadium_world_=s.world;stadium_revision_=s.revision;stadium_source_=source_.get();focus_after_render_="stadium-build";refresh();return true;
|
||||
}
|
||||
if(action=="stadium-block"||action=="stadium-facility") {
|
||||
if(!index||*index>7||!target)return true;
|
||||
const bool block=action=="stadium-block";
|
||||
@@ -85,7 +92,7 @@ bool App::stadium_action(const std::string &action,Rml::Element *target) {
|
||||
stadium_view_["dialog"]=block?"block":"facility";stadium_view_["bound_club"]=club;stadium_view_["feedback"]="";stadium_view_["invalid_places"]=false;stadium_view_["return_focus"]=target->GetId();stadium_world_=s.world;stadium_revision_=s.revision;stadium_source_=source_.get();focus_after_render_=block?"stadium-place-number":"stadium-option-"+std::to_string(row.at("level").get<int>()+1);refresh();return true;
|
||||
}
|
||||
if(action=="stadium-view"){stadium_view_["view"]=stadium_view_.at("view")=="inside"?"panorama":"inside";focus_after_render_="stadium-view";}
|
||||
else if(action=="stadium-future"){if(stadium_view_.at("view")!="inside")return true;stadium_view_["future"]=!stadium_view_.at("future").get<bool>();focus_after_render_="stadium-future";}
|
||||
else if(action=="stadium-future"){if(stadium_view_.at("view")=="data")return true;stadium_view_["future"]=!stadium_view_.at("future").get<bool>();focus_after_render_="stadium-future";}
|
||||
else if(action=="stadium-data"){stadium_view_["view"]="data";focus_after_render_="stadium-back";}
|
||||
else if(action=="stadium-back"){stadium_view_["view"]="inside";focus_after_render_="stadium-data";}
|
||||
else if(action=="stadium-curve"){if(!index||*index>5)return true;stadium_view_["curves"][size_t(*index)]=!stadium_view_.at("curves")[size_t(*index)].get<bool>();focus_after_render_="stadium-curve-"+id;}
|
||||
@@ -108,10 +115,17 @@ bool App::stadium_event(Rml::Event &event) {
|
||||
const bool dialog=stadium_view_.at("dialog")!="";
|
||||
if((type=="keydown"&&key==Rml::Input::KI_ESCAPE)||(dialog&&type=="mouseup"&&event.GetParameter<int>("button",0)==1)) {
|
||||
if(dialog)stadium_action("stadium-cancel",nullptr);
|
||||
else if(stadium_view_.at("view")=="data")stadium_action("stadium-back",nullptr);
|
||||
else if(stadium_view_.at("view")=="data"||stadium_view_.at("view")=="panorama")stadium_action("stadium-back",nullptr);
|
||||
else return false;
|
||||
event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(!dialog&&stadium_view_.at("view")=="panorama"&&(type=="mousemove"||type=="focus"||type=="blur")) {
|
||||
const auto hint=[&](Rml::Element *from) {for(auto *n=from;n&&n!=doc_;n=n->GetParentNode())if(n->HasAttribute("data-stadium-hint"))return n->GetAttribute<Rml::String>("data-stadium-hint","");return Rml::String();};
|
||||
auto text=hint(target);
|
||||
if(type=="focus"&&text.empty()&&target&&target->GetId()!="stadium-back"&&target->GetId()!="stadium-future"&&target->GetId()!="window-close")return false;
|
||||
if(type=="blur")text="";
|
||||
if(stadium_view_.at("hint")!=text) {stadium_view_["hint"]=text;if(auto *n=element("stadium-interaction-hint"))n->SetInnerRML("<span>"+esc(text.empty()?"Ein Element im Stadionumfeld auswählen.":text)+"</span>");dirty_=true;}
|
||||
}
|
||||
Rml::Element *place_range=nullptr;
|
||||
for(auto *node=target;node&&node!=doc_;node=node->GetParentNode())if(node->GetId()=="stadium-place-range"){place_range=node;break;}
|
||||
if(dialog&&type=="keydown"&&place_range&&stadium_view_.at("dialog")=="block"&&(key==Rml::Input::KI_HOME||key==Rml::Input::KI_END)) {
|
||||
|
||||
Reference in new issue
Block a user