Skip to content

Solved some issue with adding lights to the editor #178

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 1 commit into from
Jul 21, 2026
Merged

Solved some issue with adding lights to the editor #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion include/atlas/runtime/context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class Context {
bool setObjectParent(int childId, int parentId);
bool deleteObject(int id);
int createObject(const std::string &type, const std::string &name);
std::string objectDefinitionJson(int id) const;
std::string objectDefinitionJson(int id);
int pasteObjectDefinition(const std::string &definition);
int pasteObjectDefinition(
const std::string &definition,
Expand Down
10 changes: 5 additions & 5 deletions include/atlas/window.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
Copyright (c) 2025 maxvdec
*/

#ifndef WINDOW_H
#define WINDOW_H
#ifndef ATLAS_WINDOW_H
#define ATLAS_WINDOW_H

#include "atlas/camera.h"
#include "atlas/core/windowing.h"
Expand Down Expand Up @@ -902,8 +902,8 @@ class Window {
void updateBackbufferTarget(int backbufferWidth, int backbufferHeight);
void renderEditorControls(
const std::shared_ptr<opal::CommandBuffer> &commandBuffer);
void renderEditorGrid(
const std::shared_ptr<opal::CommandBuffer> &commandBuffer);
void
renderEditorGrid(const std::shared_ptr<opal::CommandBuffer> &commandBuffer);
void renderEditorOverlays(
const std::shared_ptr<opal::CommandBuffer> &commandBuffer);
void updateEditorControlGeometry();
Expand Down Expand Up @@ -1062,4 +1062,4 @@ class Window {
friend struct Fluid;
};

#endif // WINDOW_H
#endif // ATLAS_WINDOW_H
61 changes: 40 additions & 21 deletions runtime/lib/context.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5455,42 +5455,44 @@ int Context::createObject(const std::string &type, const std::string &name) {
auto light = std::make_unique<Light>(position, Color::white(), 50.0f,
Color::white(), 1.0f);
light->createDebugObject();
int id = registerEditorLightObject(*this, light->debugObject,
json::object(), "pointLight");
auto debugObject = light->debugObject;
int id = registerEditorLightObject(*this, debugObject, json::object(),
"pointLight");
if (id < 0) {
return -1;
}
const std::string displayName =
uniqueEditorObjectName(*this, name.empty() ? "Point Light" : name);
light->debugObject->name = displayName;
debugObject->name = displayName;
objectNames[id] = displayName;
objectSceneReferences[id] = std::to_string(id);
registerObjectReference(*this, displayName, light->debugObject.get());
registerObjectReference(*this, displayName, debugObject.get());
editorPointLights[id] = light.get();
scene->addLight(light.get());
pointLights.push_back(std::move(light));
window->selectEditorObject(light->debugObject.get(), true);
window->selectEditorObject(debugObject.get(), true);
return id;
} else if (solidType == "spotlight" || solidType == "spot") {
auto light = std::make_unique<Spotlight>(position, Position3d::down(),
Color::white(), 35.0f, 40.0f,
Color::white(), 1.0f, 50.0f);
light->createDebugObject();
int id = registerEditorLightObject(*this, light->debugObject,
json::object(), "spotLight");
auto debugObject = light->debugObject;
int id = registerEditorLightObject(*this, debugObject, json::object(),
"spotLight");
if (id < 0) {
return -1;
}
const std::string displayName =
uniqueEditorObjectName(*this, name.empty() ? "Spot Light" : name);
light->debugObject->name = displayName;
debugObject->name = displayName;
objectNames[id] = displayName;
objectSceneReferences[id] = std::to_string(id);
registerObjectReference(*this, displayName, light->debugObject.get());
registerObjectReference(*this, displayName, debugObject.get());
editorSpotlights[id] = light.get();
scene->addSpotlight(light.get());
spotlights.push_back(std::move(light));
window->selectEditorObject(light->debugObject.get(), true);
window->selectEditorObject(debugObject.get(), true);
return id;
} else if (solidType == "directionallight" || solidType == "directional" ||
solidType == "sun") {
Expand Down Expand Up @@ -5519,21 +5521,22 @@ int Context::createObject(const std::string &type, const std::string &name) {
auto light = std::make_unique<AreaLight>();
light->position = position;
light->createDebugObject();
int id = registerEditorLightObject(*this, light->debugObject,
json::object(), "areaLight");
auto debugObject = light->debugObject;
int id = registerEditorLightObject(*this, debugObject, json::object(),
"areaLight");
if (id < 0) {
return -1;
}
const std::string displayName =
uniqueEditorObjectName(*this, name.empty() ? "Area Light" : name);
light->debugObject->name = displayName;
debugObject->name = displayName;
objectNames[id] = displayName;
objectSceneReferences[id] = std::to_string(id);
registerObjectReference(*this, displayName, light->debugObject.get());
registerObjectReference(*this, displayName, debugObject.get());
editorAreaLights[id] = light.get();
scene->addAreaLight(light.get());
areaLights.push_back(std::move(light));
window->selectEditorObject(light->debugObject.get(), true);
window->selectEditorObject(debugObject.get(), true);
return id;
} else if (solidType == "ambientlight" || solidType == "ambient") {
scene->setAmbientColor(Color::white());
Expand Down Expand Up @@ -5591,10 +5594,15 @@ int Context::createObject(const std::string &type, const std::string &name) {
return id;
}

std::string Context::objectDefinitionJson(int id) const {
std::string Context::objectDefinitionJson(int id) {
GameObject *object = findContextObject(*this, id);
return object != nullptr ? serializeNewObject(*this, *object).dump()
: std::string();
if (object == nullptr) {
return {};
}
if (isEditorLightObject(*this, *object)) {
return serializeEditorLightObject(*this, *object).dump();
}
return serializeNewObject(*this, *object).dump();
}

int Context::pasteObjectDefinition(const std::string &definition) {
Expand Down Expand Up @@ -5623,9 +5631,20 @@ int Context::pasteObjectDefinition(const std::string &definition) {
json sceneData = loadJsonFile(currentSceneFile);
if (!sceneData.is_object())
return -1;
if (!sceneData.contains("objects") || !sceneData["objects"].is_array())
sceneData["objects"] = json::array();
sceneData["objects"].push_back(objectData);
const std::string type =
normalizeToken(objectData.value("type", std::string()));
const bool isLight =
type == "point" || type == "pointlight" || type == "spot" ||
type == "spotlight" || type == "directional" ||
type == "directionallight" || type == "sun" || type == "area" ||
type == "arealight" || type == "ambient" ||
type == "ambientlight";
const char *collection = isLight ? "lights" : "objects";
if (!sceneData.contains(collection) ||
!sceneData[collection].is_array()) {
sceneData[collection] = json::array();
}
sceneData[collection].push_back(objectData);
std::ofstream output(currentSceneFile, std::ios::trunc);
if (!output.is_open())
return -1;
Expand Down
33 changes: 33 additions & 0 deletions tests/ddgi/Red.amat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"material": {
"albedo": [
0.8374150991439819,
0,
0,
1
],
"ao": 1,
"emissiveColor": [
0,
0,
0,
1
],
"emissiveIntensity": 0,
"ior": 1.45,
"metallic": 1,
"normalMapStrength": 1,
"reflectivity": 1,
"roughness": 0.5,
"textureOffset": [
0,
0
],
"textureScale": [
1,
1
],
"transmittance": 0,
"useNormalMap": true
}
}
Loading
Loading