redstrate/prism
Archived
1
Fork 0
Code Activity

Fix compilation errors in editor

Browse source
This commit is contained in:
Joshua Goins 2022-08-15 10:19:37 -04:00
parent 4bb500d007
commit f500fb2d33
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/editor/include/prefabeditor.hpp
View file

@ -5,7 +5,7 @@
class PrefabEditor : public Editor { class PrefabEditor : public Editor {
public: public:
Scene* scene = nullptr; Scene* scene = nullptr;
Object root_object; prism::Object root_object;
bool showOutliner = true; bool showOutliner = true;
bool showProperties = true; bool showProperties = true;

2
tools/editor/include/prismeditor.hpp
View file

@ -57,7 +57,7 @@ public:
void drawUI() override; void drawUI() override;
void updateEditor(float deltaTime) override; void updateEditor(float deltaTime) override;
void object_selected(Object object) override; void object_selected(prism::Object object) override;
void asset_selected(const std::filesystem::path& path, AssetType type) override; void asset_selected(const std::filesystem::path& path, AssetType type) override;
private: private:

2
tools/editor/include/sceneeditor.hpp
View file

@ -5,7 +5,7 @@
class AddObjectCommand : public Command { class AddObjectCommand : public Command {
public: public:
Object id; prism::Object id;
std::string name; std::string name;
std::string fetch_name() override { std::string fetch_name() override {

10
tools/editor/src/prismeditor.cpp
View file

@ -77,7 +77,7 @@ void prepPrefabScene() {
scene->get<Transform>(plane).position = prism::float3(0, -1, 0); scene->get<Transform>(plane).position = prism::float3(0, -1, 0);
scene->get<Transform>(plane).scale = prism::float3(50); scene->get<Transform>(plane).scale = prism::float3(50);
scene->add<Renderable>(plane).mesh = assetm->get<Mesh>(prism::app_domain / "models/plane.model"); scene->add<Renderable>(plane).mesh = assetm->get<Mesh>(prism::base_domain / "models/plane.model");
prepThreePointLighting(); prepThreePointLighting();
} }
@ -92,8 +92,8 @@ Renderable* prepMaterialScene() {
scene->get<Transform>(plane).position = prism::float3(0, -1, 0); scene->get<Transform>(plane).position = prism::float3(0, -1, 0);
scene->get<Transform>(plane).scale = prism::float3(50); scene->get<Transform>(plane).scale = prism::float3(50);
scene->add<Renderable>(plane).mesh = assetm->get<Mesh>(prism::app_domain / "models/plane.model"); scene->add<Renderable>(plane).mesh = assetm->get<Mesh>(prism::base_domain / "models/plane.model");
scene->get<Renderable>(plane).materials.push_back(assetm->get<Material>(prism::app_domain / "materials/Material.material")); scene->get<Renderable>(plane).materials.push_back(assetm->get<Material>(prism::base_domain / "materials/Material.material"));
auto sphere = scene->add_object(); auto sphere = scene->add_object();
scene->get(sphere).name = "sphere"; scene->get(sphere).name = "sphere";
@ -101,7 +101,7 @@ Renderable* prepMaterialScene() {
scene->get<Transform>(sphere).rotation = euler_to_quat(prism::float3(radians(90.0f), 0, 0)); scene->get<Transform>(sphere).rotation = euler_to_quat(prism::float3(radians(90.0f), 0, 0));
scene->add<Renderable>(sphere).mesh = assetm->get<Mesh>(prism::app_domain / "models/sphere.model"); scene->add<Renderable>(sphere).mesh = assetm->get<Mesh>(prism::base_domain / "models/sphere.model");
prepThreePointLighting(); prepThreePointLighting();
@ -309,7 +309,7 @@ void PrismEditor::drawUI() {
}); });
} }
void PrismEditor::object_selected(Object object) { void PrismEditor::object_selected(prism::Object object) {
selected_object = object; selected_object = object;
} }