falsycat/glyphs-juke
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Adjusts display position of expects text.

Browse Source
This commit is contained in:
falsycat 2021-08-27 22:27:38 +09:00
parent 55b64ffa45
commit ec2e28c389
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/InputWindowElement.h
View File

@ -35,7 +35,7 @@ class InputWindowElement : public iElement {
InputWindowElement(Param&& p) : InputWindowElement(Param&& p) :
iElement(p.period), iElement(p.period),
matcher_(std::move(p.matcher)), drv_(std::move(p.driver)), sb_(p.scoreboard), matcher_(std::move(p.matcher)), drv_(std::move(p.driver)), sb_(p.scoreboard),
text_(p.text), guide_(matcher_->expects()), width_(CountWstrBytes(p.text)) { text_(p.text), expects_(matcher_->expects()) {
param_["posX"] = 0.; param_["posX"] = 0.;
param_["posY"] = 0.; param_["posY"] = 0.;
param_["baseX"] = .5; param_["baseX"] = .5;
@ -45,10 +45,8 @@ class InputWindowElement : public iElement {
for (auto c : frame.input) { for (auto c : frame.input) {
if (matcher_->done()) break; if (matcher_->done()) break;
if (matcher_->Input(c)) { if (matcher_->Input(c)) {
guide_ = Text(matcher_->expects()); expects_ = Text(matcher_->expects());
++sb_->correct; ++sb_->correct;
} else {
++sb_->miss;
} }
++sb_->input; ++sb_->input;
} }
@ -60,12 +58,14 @@ class InputWindowElement : public iElement {
const uint32_t posXi = static_cast<int32_t>(posX * frame.w); const uint32_t posXi = static_cast<int32_t>(posX * frame.w);
const uint32_t posYi = static_cast<int32_t>(posY * frame.h); const uint32_t posYi = static_cast<int32_t>(posY * frame.h);
const uint32_t baseXi = static_cast<int32_t>(baseX * width_);
text_.SetPosition(posXi-baseXi, posYi); const uint32_t tbaseXi = static_cast<int32_t>(baseX * text_.width());
guide_.SetPosition(posXi-baseXi, posYi+1); const uint32_t ebaseXi = static_cast<int32_t>(baseX * expects_.width());
text_.SetPosition(posXi-tbaseXi, posYi);
expects_.SetPosition(posXi-ebaseXi, posYi+1);
frame.Add(&text_); frame.Add(&text_);
frame.Add(&guide_); frame.Add(&expects_);
} }
void Finalize() override { void Finalize() override {
@ -82,9 +82,7 @@ class InputWindowElement : public iElement {
Scoreboard* sb_; Scoreboard* sb_;
Text text_; Text text_;
Text guide_; Text expects_;
size_t width_;
iElementDriver::Param param_; iElementDriver::Param param_;
}; };

1
src/Scoreboard.h
View File

@ -12,7 +12,6 @@ struct Scoreboard {
size_t input = 0; size_t input = 0;
size_t correct = 0; size_t correct = 0;
size_t miss = 0;
size_t lines = 0; size_t lines = 0;
size_t completeLines = 0; size_t completeLines = 0;

6
src/TitleScene.cc
View File

@ -39,7 +39,7 @@ gj::TitleScene::TitleScene(const Param& p) :
s.displayName = obj["displayName"].get<std::string>(); s.displayName = obj["displayName"].get<std::string>();
s.music = obj["music"].get<std::string>(); s.music = obj["music"].get<std::string>();
s.score = obj["score"].get<std::string>(); s.score = obj["score"].get<std::string>();
s.playOffset = static_cast<uint64_t>(obj["playOffset"].get<double>()); s.playOffset = obj["playOffset"].get<double>();
list_.push_back(s); list_.push_back(s);
} }
@ -123,7 +123,7 @@ void gj::TitleScene::SelectScore_(size_t index) {
score_ = Text(ConvertStrToWstr(s.displayName)); score_ = Text(ConvertStrToWstr(s.displayName));
select_index_ = index; select_index_ = index;
param_.audio->SetVolume(.2); param_.audio->SetVolume(.5);
param_.audio->SetLpfIntensity(.99); param_.audio->SetLpfIntensity(.999);
param_.audio->PlayMusic(s.music, s.playOffset); param_.audio->PlayMusic(s.music, s.playOffset);
} }