redstrate/prism
Archived
1
Fork 0
Code Activity

Make prism editor compile again

Browse source
This commit is contained in:
Joshua Goins 2022-02-18 09:11:18 -05:00
parent b7b8c8336b
commit 5200122245
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/common/include/commoneditor.hpp
View file

@ -155,7 +155,7 @@ public:
void set_undo_stack(UndoStack* stack); void set_undo_stack(UndoStack* stack);
Object selected_object = NullObject; Object selected_object = prism::NullObject;
GFXTexture* get_material_preview(Material& material); GFXTexture* get_material_preview(Material& material);
GFXTexture* get_mesh_preview(Mesh& mesh); GFXTexture* get_mesh_preview(Mesh& mesh);
@ -349,7 +349,7 @@ private:
int defaultX, defaultY, defaultWidth, defaultHeight; int defaultX, defaultY, defaultWidth, defaultHeight;
std::vector<std::string> lastOpenedFiles; std::vector<std::string> lastOpenedFiles;
void walkObject(Object object, Object parentObject = NullObject); void walkObject(Object object, Object parentObject = prism::NullObject);
void editTransform(Object object, Transform transform); void editTransform(Object object, Transform transform);
void editRenderable(Renderable& mesh); void editRenderable(Renderable& mesh);

2
tools/common/include/debugpass.hpp
View file

@ -65,7 +65,7 @@ public:
GFXTexture* selectDepthTexture = nullptr; GFXTexture* selectDepthTexture = nullptr;
GFXTexture* sobelTexture = nullptr; GFXTexture* sobelTexture = nullptr;
Object selected_object = NullObject; Object selected_object = prism::NullObject;
private: private:
void createOffscreenResources(); void createOffscreenResources();

16
tools/common/src/commoneditor.cpp
View file

@ -127,8 +127,8 @@ void CommonEditor::update(float deltaTime) {
if(debugPass != nullptr) { if(debugPass != nullptr) {
if(engine->get_input()->is_pressed("cameraSelect") && accepting_viewport_input && !transforming_axis) { if(engine->get_input()->is_pressed("cameraSelect") && accepting_viewport_input && !transforming_axis) {
debugPass->get_selected_object(viewport_x, viewport_y, [this](SelectableObject object) { debugPass->get_selected_object(viewport_x, viewport_y, [this](SelectableObject object) {
if(object.object == NullObject) { if(object.object == prism::NullObject) {
object_selected(NullObject); object_selected(prism::NullObject);
return; return;
} }
@ -370,7 +370,7 @@ void CommonEditor::drawOutline() {
ImGui::BeginChild("outlineinner", ImVec2(-1, -1), true); ImGui::BeginChild("outlineinner", ImVec2(-1, -1), true);
for(auto& object : engine->get_scene()->get_objects()) { for(auto& object : engine->get_scene()->get_objects()) {
if(engine->get_scene()->get(object).parent == NullObject) if(engine->get_scene()->get(object).parent == prism::NullObject)
walkObject(object); walkObject(object);
} }
@ -524,9 +524,9 @@ bool componentHeader(Scene& scene, Object& object, const char* name, const bool
void CommonEditor::drawPropertyEditor() { void CommonEditor::drawPropertyEditor() {
auto scene = engine->get_scene(); auto scene = engine->get_scene();
if(scene != nullptr) { if(scene != nullptr) {
if(selected_object != NullObject) { if(selected_object != prism::NullObject) {
if(!scene->has<Data>(selected_object)) { if(!scene->has<Data>(selected_object)) {
selected_object = NullObject; selected_object = prism::NullObject;
return; return;
} }
@ -548,7 +548,7 @@ void CommonEditor::drawPropertyEditor() {
command.old_name = stored_name; command.old_name = stored_name;
} }
std::string preview_value = data.parent == NullObject ? "None" : scene->get(data.parent).name; std::string preview_value = data.parent == prism::NullObject ? "None" : scene->get(data.parent).name;
if(ImGui::BeginCombo("Parent", preview_value.c_str())) { if(ImGui::BeginCombo("Parent", preview_value.c_str())) {
for (auto& object : scene->get_objects()) { for (auto& object : scene->get_objects()) {
// dont allow selecting a node to be the parent of itself // dont allow selecting a node to be the parent of itself
@ -561,8 +561,8 @@ void CommonEditor::drawPropertyEditor() {
ImGui::Separator(); ImGui::Separator();
if (ImGui::Selectable("None", data.parent == NullObject)) if (ImGui::Selectable("None", data.parent == prism::NullObject))
data.parent = NullObject; data.parent = prism::NullObject;
ImGui::EndCombo(); ImGui::EndCombo();
} }

8
tools/common/src/debugpass.cpp
View file

@ -368,7 +368,7 @@ void DebugPass::render_scene(Scene& scene, GFXCommandBuffer* commandBuffer) {
commandBuffer->set_graphics_pipeline(arrow_pipeline); commandBuffer->set_graphics_pipeline(arrow_pipeline);
// draw handles for selected object; // draw handles for selected object;
if(selected_object != NullObject && engine->get_scene()->has<Transform>(selected_object)) { if(selected_object != prism::NullObject && engine->get_scene()->has<Transform>(selected_object)) {
const auto position = engine->get_scene()->get<Transform>(selected_object).get_world_position(); const auto position = engine->get_scene()->get<Transform>(selected_object).get_world_position();
const float base_scale = 0.05f; const float base_scale = 0.05f;
@ -395,7 +395,7 @@ void DebugPass::render_scene(Scene& scene, GFXCommandBuffer* commandBuffer) {
commandBuffer->set_render_pass(info); commandBuffer->set_render_pass(info);
if(selected_object != NullObject && engine->get_scene()->has<Renderable>(selected_object)) { if(selected_object != prism::NullObject && engine->get_scene()->has<Renderable>(selected_object)) {
commandBuffer->set_graphics_pipeline(sobelPipeline); commandBuffer->set_graphics_pipeline(sobelPipeline);
auto renderable = engine->get_scene()->get<Renderable>(selected_object); auto renderable = engine->get_scene()->get<Renderable>(selected_object);
@ -474,7 +474,7 @@ void DebugPass::get_selected_object(int x, int y, std::function<void(SelectableO
selectable_objects.push_back(so); selectable_objects.push_back(so);
}; };
if(selected_object != NullObject) { if(selected_object != prism::NullObject) {
const auto position = engine->get_scene()->get<Transform>(selected_object).get_world_position(); const auto position = engine->get_scene()->get<Transform>(selected_object).get_world_position();
const float base_scale = 0.05f; const float base_scale = 0.05f;
@ -575,7 +575,7 @@ void DebugPass::get_selected_object(int x, int y, std::function<void(SelectableO
callback(selectable_objects[id]); callback(selectable_objects[id]);
} else { } else {
SelectableObject o; SelectableObject o;
o.object = NullObject; o.object = prism::NullObject;
callback(o); callback(o);
} }
} }