Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2 new features #232

Merged
merged 12 commits into from
Jul 20, 2020
Merged

2 new features #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d4de01c
Add more contents to Room Config Dialog
shinespeciall Jul 7, 2020
7fe8d37
a little bit changes
shinespeciall Jul 9, 2020
072ea3c
Support Adding new Rooms
shinespeciall Jul 11, 2020
08a8239
script APIs changes and adding
shinespeciall Jul 13, 2020
92e5d90
reimplementation a part of Room Config Dialog code and add more confi…
shinespeciall Jul 14, 2020
3606598
add missing code
shinespeciall Jul 15, 2020
e040f1b
one bugfix
shinespeciall Jul 15, 2020
b3f2a2f
another bugfix which should be done in beta-10
shinespeciall Jul 16, 2020
bba2a26
revert last commit and another bugfix
shinespeciall Jul 16, 2020
faff518
another bugfix
shinespeciall Jul 16, 2020
e149e27
changes based on the review
shinespeciall Jul 19, 2020
8b4f00b
small fixes
shinespeciall Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions Dialog/DoorConfigDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,18 +245,20 @@ void DoorConfigDialog::RenderGraphicsView_Preview()
int Y_av = (door_CurY1 + door_CurY2) / 2;
float X_av_rate = static_cast<float>(X_av) / static_cast<float>(tmpCurrentRoom->GetWidth());
float Y_av_rate = static_cast<float>(Y_av) / static_cast<float>(tmpCurrentRoom->GetHeight());
int V_all = ui->GraphicsView_Preview->verticalScrollBar()->pageStep() +
ui->GraphicsView_Preview->verticalScrollBar()->maximum();
int H_all = ui->GraphicsView_Preview->horizontalScrollBar()->pageStep() +
ui->GraphicsView_Preview->horizontalScrollBar()->maximum();
float Heightrate_L1_over_L0 = qMin(1.0f, static_cast<float>(tmpCurrentRoom->GetHeight()) / static_cast<float>(tmpCurrentRoom->GetLayer0Height()));
float Widthrate_L1_over_L0 = qMin(1.0f, static_cast<float>(tmpCurrentRoom->GetWidth()) / static_cast<float>(tmpCurrentRoom->GetLayer0Width()));
int V_all = Heightrate_L1_over_L0 * (ui->GraphicsView_Preview->verticalScrollBar()->pageStep() +
ui->GraphicsView_Preview->verticalScrollBar()->maximum());
int H_all = Widthrate_L1_over_L0 * (ui->GraphicsView_Preview->horizontalScrollBar()->pageStep() +
ui->GraphicsView_Preview->horizontalScrollBar()->maximum());
int X_val = static_cast<int>(H_all * X_av_rate);
int Y_val = static_cast<int>(V_all * Y_av_rate);
ui->GraphicsView_Preview->verticalScrollBar()->setSliderPosition(
qMin(qMax(Y_val, 1) - ui->GraphicsView_Preview->verticalScrollBar()->pageStep() / 2,
ui->GraphicsView_Preview->verticalScrollBar()->maximum()));
(int)(Heightrate_L1_over_L0 * (float)ui->GraphicsView_Preview->verticalScrollBar()->maximum())));
ui->GraphicsView_Preview->horizontalScrollBar()->setSliderPosition(
qMin(qMax(X_val, 1) - ui->GraphicsView_Preview->horizontalScrollBar()->pageStep() / 2,
ui->GraphicsView_Preview->horizontalScrollBar()->maximum()));
(int)(Widthrate_L1_over_L0 * (float)ui->GraphicsView_Preview->horizontalScrollBar()->maximum())));
}

/// <summary>
Expand All @@ -282,6 +284,15 @@ void DoorConfigDialog::RenderGraphicsView_DestinationDoor(int doorIDinRoom)
ui->GraphicsView_DestinationDoor->setScene(scene);
ui->GraphicsView_DestinationDoor->setAlignment(Qt::AlignTop | Qt::AlignLeft);

if(tmpDestinationRoom->GetRoomID() == tmpCurrentRoom->GetRoomID())
shinespeciall marked this conversation as resolved.
Show resolved Hide resolved
{
tmpDestinationRoom->GetDoor(DoorID)->SetDoorPlace(static_cast<unsigned char>(ui->SpinBox_DoorX->value()),
static_cast<unsigned char>((ui->SpinBox_DoorX->value() + ui->SpinBox_DoorWidth->value() - 1)),
static_cast<unsigned char>(ui->SpinBox_DoorY->value()),
static_cast<unsigned char>((ui->SpinBox_DoorY->value() + ui->SpinBox_DoorHeight->value() - 1)));
UpdateDoorLayerGraphicsView_DestinationDoor();
}

// Set scrollbars
LevelComponents::Door *tmpdoor = tmpDestinationRoom->GetDoor(doorIDinRoom);
door_DesX1 = tmpdoor->GetX1();
Expand All @@ -292,18 +303,20 @@ void DoorConfigDialog::RenderGraphicsView_DestinationDoor(int doorIDinRoom)
int Y_av = (door_DesY1 + door_DesY2) / 2;
float X_av_rate = static_cast<float>(X_av) / static_cast<float>(tmpDestinationRoom->GetWidth());
float Y_av_rate = static_cast<float>(Y_av) / static_cast<float>(tmpDestinationRoom->GetHeight());
int V_all = ui->GraphicsView_DestinationDoor->verticalScrollBar()->pageStep() +
ui->GraphicsView_DestinationDoor->verticalScrollBar()->maximum();
int H_all = ui->GraphicsView_DestinationDoor->horizontalScrollBar()->pageStep() +
ui->GraphicsView_DestinationDoor->horizontalScrollBar()->maximum();
float Heightrate_L1_over_L0 = qMin(1.0f, static_cast<float>(tmpDestinationRoom->GetHeight()) / static_cast<float>(tmpDestinationRoom->GetLayer0Height()));
float Widthrate_L1_over_L0 = qMin(1.0f, static_cast<float>(tmpDestinationRoom->GetWidth()) / static_cast<float>(tmpDestinationRoom->GetLayer0Width()));
int V_all = Heightrate_L1_over_L0 * (ui->GraphicsView_DestinationDoor->verticalScrollBar()->pageStep() +
ui->GraphicsView_DestinationDoor->verticalScrollBar()->maximum());
int H_all = Widthrate_L1_over_L0 * (ui->GraphicsView_DestinationDoor->horizontalScrollBar()->pageStep() +
ui->GraphicsView_DestinationDoor->horizontalScrollBar()->maximum());
int X_val = static_cast<int>(H_all * X_av_rate);
int Y_val = static_cast<int>(V_all * Y_av_rate);
ui->GraphicsView_DestinationDoor->verticalScrollBar()->setSliderPosition(
qMin(qMax(Y_val, 1) - ui->GraphicsView_DestinationDoor->verticalScrollBar()->pageStep() / 2,
ui->GraphicsView_DestinationDoor->verticalScrollBar()->maximum()));
(int)(Heightrate_L1_over_L0 * (float)ui->GraphicsView_DestinationDoor->verticalScrollBar()->maximum())));
ui->GraphicsView_DestinationDoor->horizontalScrollBar()->setSliderPosition(
qMin(qMax(X_val, 1) - ui->GraphicsView_DestinationDoor->horizontalScrollBar()->pageStep() / 2,
ui->GraphicsView_DestinationDoor->horizontalScrollBar()->maximum()));
(int)(Widthrate_L1_over_L0 * (float)ui->GraphicsView_DestinationDoor->horizontalScrollBar()->maximum())));
}

/// <summary>
Expand Down
Loading