Skip to content

Added some general fixes to the editor #170

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

Merged
maxvdec merged 3 commits into from
Jul 19, 2026
Merged

Added some general fixes to the editor #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d04e1f
editor | Integrate Atlas script workflow
maxvdec Jul 19, 2026
6c5e854
Added input actions and further fixes to the editor
maxvdec Jul 19, 2026
4941e58
Fixed some issues with Atlas
maxvdec Jul 19, 2026
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
122 changes: 89 additions & 33 deletions atlas/application/window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,6 +852,12 @@ void appendShadowCaster(Renderable *obj, std::unordered_set<Renderable *> &seen,
}
return;
}
if (auto *compound = dynamic_cast<CompoundObject *>(obj)) {
for (auto *child : compound->objects) {
appendShadowCaster(child, seen, casters);
}
return;
}
if (!obj->canCastShadows()) {
return;
}
Expand Down Expand Up @@ -1481,6 +1487,14 @@ bool Window::stepFrame() {
}
this->pendingObjects.clear();

for (auto *obj : this->pendingInitializedObjects) {
this->renderables.push_back(obj);
if (obj->renderLateForward) {
this->addLateForwardObject(obj);
}
}
this->pendingInitializedObjects.clear();

DebugTimer cpuTimer("Cpu Data");
DebugTimer mainTimer("Main Loop");

Expand Down Expand Up @@ -2531,6 +2545,9 @@ bool Window::editorSelectionBounds(GameObject *object, glm::vec3 &boundsMin,

void Window::moveEditorObjectChildren(GameObject *object,
const Position3d &deltaPosition) {
if (dynamic_cast<CompoundObject *>(object) != nullptr) {
return;
}
auto childrenIt = editorObjectChildren.find(object);
if (childrenIt == editorObjectChildren.end()) {
return;
Expand Down Expand Up @@ -3422,7 +3439,10 @@ void Window::addObject(Renderable *obj) {
std::ranges::find(this->renderables, obj) != this->renderables.end();
const bool inPending = std::ranges::find(this->pendingObjects, obj) !=
this->pendingObjects.end();
if (inRenderables || inPending) {
const bool inInitializedPending =
std::ranges::find(this->pendingInitializedObjects, obj) !=
this->pendingInitializedObjects.end();
if (inRenderables || inPending || inInitializedPending) {
return;
}

Expand All @@ -3440,12 +3460,49 @@ void Window::addObject(Renderable *obj) {
this->ssaoUpdateCooldown = 0.0f;
}

void Window::removeObject(Renderable *obj) {
void Window::addInitializedObject(Renderable *obj) {
if (obj == nullptr) {
return;
}
const bool inRenderables =
std::ranges::find(this->renderables, obj) != this->renderables.end();
const bool inPending = std::ranges::find(this->pendingObjects, obj) !=
this->pendingObjects.end();
const bool inInitializedPending =
std::ranges::find(this->pendingInitializedObjects, obj) !=
this->pendingInitializedObjects.end();
if (inRenderables || inPending || inInitializedPending) {
return;
}
this->pendingRemovals.erase(std::remove(this->pendingRemovals.begin(),
this->pendingRemovals.end(), obj),
this->pendingRemovals.end());
if (this->physicsWorld != nullptr) {
this->pendingInitializedObjects.push_back(obj);
} else {
this->renderables.push_back(obj);
if (obj->renderLateForward) {
this->addLateForwardObject(obj);
}
}
this->shadowMapsDirty = true;
this->shadowUpdateCooldown = 0.0f;
this->ssaoMapsDirty = true;
this->ssaoUpdateCooldown = 0.0f;
}

void Window::removeObject(Renderable *obj) { removeObjectInternal(obj, true); }

void Window::removeObjectFromRendering(Renderable *obj) {
removeObjectInternal(obj, false);
}

void Window::removeObjectInternal(Renderable *obj, bool clearEditorState) {
if (obj == nullptr) {
return;
}
auto *gameObject = dynamic_cast<GameObject *>(obj);
if (gameObject != nullptr) {
if (clearEditorState && gameObject != nullptr) {
setEditorObjectParent(gameObject, nullptr);
auto childrenIt = editorObjectChildren.find(gameObject);
if (childrenIt != editorObjectChildren.end()) {
Expand All @@ -3455,18 +3512,26 @@ void Window::removeObject(Renderable *obj) {
editorObjectChildren.erase(childrenIt);
}
}
if (selectedEditorObject == gameObject) {
if (clearEditorState && selectedEditorObject == gameObject) {
selectedEditorObject = nullptr;
editorDragging = false;
editorActiveGizmoAxis = 0;
}

const auto pendingObject =
std::find(this->pendingObjects.begin(), this->pendingObjects.end(), obj);
const auto pendingObject = std::find(this->pendingObjects.begin(),
this->pendingObjects.end(), obj);
const bool wasPending = pendingObject != this->pendingObjects.end();
if (wasPending) {
this->pendingObjects.erase(pendingObject);
}
const auto pendingInitializedObject =
std::find(this->pendingInitializedObjects.begin(),
this->pendingInitializedObjects.end(), obj);
const bool wasInitializedPending =
pendingInitializedObject != this->pendingInitializedObjects.end();
if (wasInitializedPending) {
this->pendingInitializedObjects.erase(pendingInitializedObject);
}

this->lateForwardRenderables.erase(
std::remove(this->lateForwardRenderables.begin(),
Expand All @@ -3488,10 +3553,11 @@ void Window::removeObject(Renderable *obj) {
this->lateFluids.end());
}

if (this->physicsWorld != nullptr && !wasPending) {
if (this->physicsWorld != nullptr && !wasPending &&
!wasInitializedPending) {
if (std::find(this->pendingRemovals.begin(),
this->pendingRemovals.end(), obj) ==
this->pendingRemovals.end()) {
this->pendingRemovals.end(),
obj) == this->pendingRemovals.end()) {
this->pendingRemovals.push_back(obj);
}
} else {
Expand All @@ -3510,6 +3576,11 @@ void Window::addLateForwardObject(Renderable *object) {
return;
}

this->pendingRemovals.erase(std::remove(this->pendingRemovals.begin(),
this->pendingRemovals.end(),
object),
this->pendingRemovals.end());

if (std::ranges::find(lateForwardRenderables, object) ==
lateForwardRenderables.end()) {
lateForwardRenderables.push_back(object);
Expand Down Expand Up @@ -3621,6 +3692,7 @@ void Window::applyScene(Scene *scene) {
this->pendingRemovals.clear();
this->renderables.clear();
this->pendingObjects.clear();
this->pendingInitializedObjects.clear();
this->preferenceRenderables.clear();
this->currentRenderTarget = nullptr;
this->modeScreenTarget.reset();
Expand Down Expand Up @@ -5011,32 +5083,16 @@ BoundingBox Window::getSceneBoundingBox() {
bool any = false;

for (auto *obj : renderables) {
if (!obj)
auto *object = dynamic_cast<GameObject *>(obj);
if (object == nullptr)
continue;

const auto &vertices = obj->getVertices();
if (vertices.empty())
glm::vec3 objectMin;
glm::vec3 objectMax;
if (!objectBounds(object, objectMin, objectMax))
continue;

glm::mat4 model(1.0f);

if (const auto *coreObj = dynamic_cast<const CoreObject *>(obj)) {
model = glm::translate(model, coreObj->getPosition().toGlm());
model *= glm::mat4_cast(
glm::normalize(coreObj->getRotation().toGlmQuat()));
model = glm::scale(model, coreObj->getScale().toGlm());
} else {
model = glm::translate(model, obj->getPosition().toGlm());
model = glm::scale(model, obj->getScale().toGlm());
}

for (const auto &v : vertices) {
glm::vec3 p =
glm::vec3(model * glm::vec4(v.position.toGlm(), 1.0f));
worldMin = glm::min(worldMin, p);
worldMax = glm::max(worldMax, p);
any = true;
}
worldMin = any ? glm::min(worldMin, objectMin) : objectMin;
worldMax = any ? glm::max(worldMax, objectMax) : objectMax;
any = true;
}

if (!any)
Expand Down
Loading
Loading