Skip to content

Commit

Permalink
Scene Editor stuff i left rotting here
Browse files Browse the repository at this point in the history 
- Added copy and paste for the select tool
- Fix tile collision viewer's random chance of displaying at an incorrect size when loading a stage
- Fix crash on pre-v5 when attempting to pick a tile/chunk from the scene viewer at a location that exceeded the limits of the selected layer
- fix RSDKModding#148 ,RSDKModding#146 and RSDKModding#145
- add RSDKModding#147 for v5
  • Loading branch information
@Leonx254
Leonx254 committed Oct 4, 2024
1 parent 0faf89d commit f897dd0
Show file tree
Hide file tree
Showing 14 changed files with 694 additions and 486 deletions.
139 changes: 108 additions & 31 deletions RetroEDv2/tools/sceneeditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,15 +364,15 @@ SceneEditor::SceneEditor(QWidget *parent) : QWidget(parent), ui(new Ui::SceneEdi
connect(objProp, &SceneObjectProperties::typeChanged, this, &SceneEditor::updateType);

connect(ui->addEnt, &QToolButton::clicked, [this] {
uint c = viewer->entities.count();
uint c = viewer->entities[(viewer->entities.count() - 1)].slotID + 1;
uint entType = (viewer->selectedObject > -1 ? viewer->selectedObject : 0);

AddEntity(entType, viewer->cameraPos.x + ((viewer->storedW / 2) * viewer->invZoom()), viewer->cameraPos.y + ((viewer->storedH / 2) * viewer->invZoom()));
ui->entityList->setCurrentRow(c);
viewer->selectedEntity = c;

ui->addEnt->setDisabled(viewer->entities.count() >= FormatHelpers::Scene::entityLimit);
DoAction("Added Entity " + QString::number(viewer->entities.count() - 1));
DoAction("Added Entity " + QString::number(c));
});

connect(ui->upEnt, &QToolButton::clicked, [this] {
Expand Down Expand Up @@ -479,6 +479,7 @@ SceneEditor::SceneEditor(QWidget *parent) : QWidget(parent), ui(new Ui::SceneEdi
&compilerv2->objectEntityList[entity->gameEntitySlot],
&compilerv3->objectEntityList[entity->gameEntitySlot],
&compilerv4->objectEntityList[entity->gameEntitySlot], viewer->gameType);
ui->propertiesBox->setCurrentWidget(ui->objPropPage);
}

ui->horizontalScrollBar->blockSignals(true);
Expand All @@ -489,12 +490,10 @@ SceneEditor::SceneEditor(QWidget *parent) : QWidget(parent), ui(new Ui::SceneEdi
ui->verticalScrollBar->setValue(viewer->cameraPos.y);
ui->verticalScrollBar->blockSignals(false);

ui->propertiesBox->setCurrentWidget(ui->objPropPage);

for (int s = n; s < viewer->selectedEntities.count(); ++s) {
if (viewer->selectedEntities[s] == (int)c)
viewer->selectedEntities[s] = c - 1;
viewer->entities[s].slotID = viewer->entities[s - 1].slotID;
viewer->entities[s].slotID = viewer->entities[s - 1].slotID;
}

ui->rmEnt->setDisabled(viewer->entities.count() <= 0);
Expand Down Expand Up @@ -907,6 +906,9 @@ SceneEditor::SceneEditor(QWidget *parent) : QWidget(parent), ui(new Ui::SceneEdi
for (int o = viewer->entities.count() - 1; o >= 0; --o) {
SceneEntity &obj = viewer->entities[o];
if (obj.type >= count){
// that's not going to be blank object, ignore
if (obj.type == count && stageConfig.loadGlobalScripts)
continue;
int newType = newTypes[obj.type - count];
if (newType >= 0)
obj.type = newType;
Expand Down Expand Up @@ -1023,26 +1025,27 @@ SceneEditor::SceneEditor(QWidget *parent) : QWidget(parent), ui(new Ui::SceneEdi
CopyPlane *sel = new CopyPlane(this);
if (sel->exec() == QDialog::Accepted) {
float progress = 1.6;
if (sel->copyTilePlanes ){
if (sel->copyTilePlanes){
SetStatus("Copying tile collision....", true);
RSDKv5::TileConfig configStore = viewer->tileconfig;
for (int i = 0; i < 0x400; ++i) { viewer->tileconfig.collisionPaths[1][i] = configStore.collisionPaths[0][i]; };
for (int i = 0; i < 0x400; ++i) { viewer->tileconfig.collisionPaths[1][i] = viewer->tileconfig.collisionPaths[0][i]; };
AddStatusProgress(progress / 5); // finished copying tile planes
progress = 3.2;
}

if (sel->copyChunkPlane){
SetStatus("Copying Chunk Planes....", true);
for (int i = 0; i < 0x200; ++i) {
for(int y = 0; y < 8; ++y){
for(int x = 0; x < 8; ++x){
viewer->chunkset.chunks[i].tiles[y][x].solidityB = viewer->chunkset.chunks[i].tiles[y][x].solidityA;
chunkset.chunks[i].tiles[y][x].solidityB = chunkset.chunks[i].tiles[y][x].solidityA;
}
}
};
AddStatusProgress(progress / 5); // finished copying tile planes
}
}
if (sel->copyTilePlanes || sel->copyChunkPlane) {
viewer->chunkset = chunkset;
viewer->updateChunkColMap();
AddStatusProgress(5 / 5); // finished copying chunks planes
DoAction();
Expand Down Expand Up @@ -1209,6 +1212,9 @@ SceneEditor::SceneEditor(QWidget *parent) : QWidget(parent), ui(new Ui::SceneEdi
for (int o = viewer->entities.count() - 1; o >= 0; --o) {
SceneEntity &obj = viewer->entities[o];
if (obj.type >= count){
// that's not going to be blank object, ignore
if (obj.type == count && stageConfig.loadGlobalScripts)
continue;
int newType = newTypes[obj.type - count];
if (newType >= 0)
obj.type = newType;
Expand Down Expand Up @@ -1455,18 +1461,21 @@ SceneEditor::~SceneEditor()
delete compilerv4;
}

void SceneEditor::updateType(SceneEntity *entity, byte type)
void SceneEditor::updateType(SceneEntity *entity, byte type, bool keepVals)
{
int c = viewer->selectedEntity;
ui->entityList->item(c)->setText(QString::number(viewer->entities[c].slotID) + ": "
+ viewer->objects[viewer->entities[c].type].name);
entity->propertyValue = 0;
entity->variables.clear();
for (int v = 0; v < viewer->objects[type].variables.count(); ++v) {
RSDKv5::Scene::VariableValue val;
val.type = VAR_UINT8;
val.value_uint8 = 0;
entity->variables.append(val);

if (!keepVals){
entity->propertyValue = 0;
entity->variables.clear();
for (int v = 0; v < viewer->objects[type].variables.count(); ++v) {
RSDKv5::Scene::VariableValue val;
val.type = VAR_UINT8;
val.value_uint8 = 0;
entity->variables.append(val);
}
}
// maybe make it use updateUI?
objProp->setupUI(entity, viewer->selectedEntity,
Expand Down Expand Up @@ -1816,8 +1825,8 @@ bool SceneEditor::eventFilter(QObject *object, QEvent *event)
if (viewer->selectedLayer >= 0) {
Rect<float> box;

for (int y = 0; y < viewer->sceneBoundsB / 0x80; ++y) {
for (int x = 0; x < viewer->sceneBoundsR / 0x80; ++x) {
for (int y = 0; y < viewer->layers[viewer->selectedLayer].height; ++y) {
for (int x = 0; x < viewer->layers[viewer->selectedLayer].width; ++x) {
box = Rect<float>(x * 0x80, y * 0x80, 0x80, 0x80);

Vector2<float> pos = Vector2<float>(
Expand Down Expand Up @@ -2083,6 +2092,7 @@ bool SceneEditor::eventFilter(QObject *object, QEvent *event)
viewer->selectedEntities.append(e);
viewer->selectedEntitiesXPos.append(entity.pos.x);
viewer->selectedEntitiesYPos.append(entity.pos.y);
viewer->selectedEntity = entity.slotID;
}
}
} else {
Expand Down Expand Up @@ -3025,7 +3035,6 @@ void SceneEditor::LoadScene(QString scnPath, QString gcfPath, byte gameType)
}

AddStatusProgress(1. / 7); // finish objects & entities

QImage tileset(16, 0x400 * 16, QImage::Format_Indexed8);
for (int i = 0; i < 256; ++i)
tileset.setColor(i, QRgb(0xFFFF00FF));
Expand Down Expand Up @@ -4009,9 +4018,44 @@ bool SceneEditor::HandleKeyPress(QKeyEvent *event)

if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier
&& event->key() == Qt::Key_V && !event->isAutoRepeat() && viewerActive) {
if (clipboard) {
if (clipboard || clipboardIDs.count()) {
switch (clipboardType) {
default: break;
case COPY_ENTITY_SELECT: {
if (viewer->activeEntityCount() + clipboardIDs.count() >= FormatHelpers::Scene::entityLimit){
QMessageBox msgBox =
QMessageBox(QMessageBox::Information, "RetroED",
QString("Copied entities will exceed the entity cap. \nPlease remove some entities first."),
QMessageBox::NoButton, this);
msgBox.exec();
break;
}
viewer->selectedEntities.clear();
viewer->selectedEntitiesXPos.clear();
viewer->selectedEntitiesYPos.clear();
for(int i = 0; i < clipboardIDs.count(); i++){
clipboard = &viewer->entities[clipboardIDs[i]];
SceneEntity *entity = (SceneEntity *)clipboard;

float entXPos = sceneMousePos.x + clipboardOffset[i].x - clipPosCenter.x;
float entYPos = sceneMousePos.y + clipboardOffset[i].y - clipPosCenter.y;

PasteEntity(entity, entXPos, entYPos);
viewer->selectedEntities.append(viewer->entities.count() - 1);
viewer->selectedEntitiesXPos.append(entXPos);
viewer->selectedEntitiesYPos.append(entYPos);
}
viewer->sceneInfo.listPos = -1;
// cheat
viewer->centerEntity = viewer->selectedEntities.count() - 1;
viewer->selectSize.x = 1;
viewer->selectSize.y = 1;

DoAction(QString("Pasted Entities: %1 - %2")
.arg(viewer->selectedEntities[0])
.arg(viewer->selectedEntities[viewer->selectedEntities.count() - 1]));
break;
}
case COPY_ENTITY: {
if (viewer->entities.count() < FormatHelpers::Scene::entityLimit) {
SceneEntity *entity = (SceneEntity *)clipboard;
Expand Down Expand Up @@ -4091,13 +4135,46 @@ bool SceneEditor::HandleKeyPress(QKeyEvent *event)
viewer->selectedEntities.clear();
}

int move = 4;
if (ctrlDownL)
move *= 4;
if (shiftDownL)
move /= 4;
if ((event->modifiers() & Qt::ControlModifier) == Qt::ControlModifier
&& event->key() == Qt::Key_C) {
std::sort(viewer->selectedEntities.begin(), viewer->selectedEntities.end(),
[](const int &a, const int &b) -> bool { return a < b; });

clipboardIDs.clear();
clipboardOffset.clear();
Vector2<float> clipPos1 = Vector2<float>(viewer->selectedEntitiesXPos[0], viewer->selectedEntitiesYPos[0]);
Vector2<float> clipPos2 = Vector2<float>(viewer->selectedEntitiesXPos[0], viewer->selectedEntitiesYPos[0]);
for (int s = viewer->selectedEntities.count() - 1; s >= 0; --s) {
clipboardIDs.append(viewer->selectedEntities[s]);
if (viewer->selectedEntitiesXPos[s] < clipPos1.x)
clipPos1.x = viewer->selectedEntitiesXPos[s];
if (viewer->selectedEntitiesYPos[s] < clipPos1.y)
clipPos1.y = viewer->selectedEntitiesYPos[s];

if (viewer->selectedEntitiesXPos[s] > clipPos2.x)
clipPos2.x = viewer->selectedEntitiesXPos[s];
if (viewer->selectedEntitiesYPos[s] > clipPos2.y)
clipPos2.y = viewer->selectedEntitiesYPos[s];
}
for (int s = viewer->selectedEntities.count() - 1; s >= 0; --s) {
Vector2<float> pos;
pos.x = viewer->selectedEntitiesXPos[s] - clipPos1.x;
pos.y = viewer->selectedEntitiesYPos[s] - clipPos1.y;
clipboardOffset.append(pos);
}
clipPosCenter.x = (clipPos2.x - clipPos1.x) / 2;
clipPosCenter.y = (clipPos2.y - clipPos1.y) / 2;
clipboardType = COPY_ENTITY_SELECT;
clipboardInfo = viewer->selectedEntity;
}

for (auto o : viewer->selectedEntities){
int move = 4;
if (ctrlDownL)
move *= 4;
if (shiftDownL)
move /= 4;

if (event->key() == Qt::Key_Up)
viewer->entities[o].pos.y -= move;

Expand Down Expand Up @@ -4128,8 +4205,8 @@ bool SceneEditor::HandleKeyPress(QKeyEvent *event)
if (viewer->selectedLayer >= 0) {
Rect<float> box;

for (int y = 0; y < viewer->sceneBoundsB / 0x80; ++y) {
for (int x = 0; x < viewer->sceneBoundsR / 0x80; ++x) {
for (int y = 0; y < viewer->layers[viewer->selectedLayer].height; ++y) {
for (int x = 0; x < viewer->layers[viewer->selectedLayer].width; ++x) {
box = Rect<float>(x * 0x80, y * 0x80, 0x80, 0x80);

Vector2<float> pos = Vector2<float>(
Expand All @@ -4150,8 +4227,8 @@ bool SceneEditor::HandleKeyPress(QKeyEvent *event)
if (viewer->selectedLayer >= 0) {
Rect<float> box;

for (int y = 0; y < viewer->sceneBoundsB / 0x80; ++y) {
for (int x = 0; x < viewer->sceneBoundsR / 0x80; ++x) {
for (int y = 0; y < viewer->layers[viewer->selectedLayer].height; ++y) {
for (int x = 0; x < viewer->layers[viewer->selectedLayer].width; ++x) {
box = Rect<float>(x * 0x80, y * 0x80, 0x80, 0x80);

Vector2<float> pos = Vector2<float>(
Expand Down Expand Up @@ -4256,7 +4333,7 @@ int SceneEditor::AddEntity(int type, float x, float y)
entity.pos.x = x;
entity.pos.y = y;

int cnt = viewer->entities.count();
int cnt = viewer->entities[(viewer->entities.count() - 1)].slotID + 1;
entity.slotID = cnt;
entity.prevSlot = entity.slotID;
entity.gameEntitySlot = entity.slotID;
Expand Down
6 changes: 5 additions & 1 deletion RetroEDv2/tools/sceneeditor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class SceneEditor : public QWidget
void TitleChanged(QString title, QString tabFullPath);

public slots:
void updateType(SceneEntity *entity, byte type);
void updateType(SceneEntity *entity, byte type, bool keepVals = false);
protected:
bool event(QEvent *event);
bool eventFilter(QObject *object, QEvent *event);
Expand All @@ -178,9 +178,13 @@ public slots:
COPY_LAYER,
COPY_CHUNK,
COPY_ENTITY,
COPY_ENTITY_SELECT,
COPY_SCROLLINFO,
};
void *clipboard = nullptr;
QList<int> clipboardIDs;
QList<Vector2<float>> clipboardOffset;
Vector2<float> clipPosCenter;
byte clipboardType = COPY_NONE;
int clipboardInfo = 0;

Expand Down
Loading

0 comments on commit f897dd0

Please sign in to comment.