Make SimpleGeometryObject render a cube

1 files changed, 31 insertions, 6 deletions

diff --git a/source/EditorCorePrivate.cpp b/source/EditorCorePrivate.cpp
index 35378ce..e4fdc54 100644
--- a/source/EditorCorePrivate.cpp
+++ b/source/EditorCorePrivate.cpp
@@ -315,9 +315,10 @@ EditorInstance::EditorInstance(App* app)
 	: mApp{ app }
 	, mEdContentBrowser(&mEdInspector) {
 	mEditorCamera.name = "Editor Camera"s;
-	mEditorCamera.Move(glm::vec3(0, 0, 1));
-	mEditorCamera.LookAtAngle(glm::vec3(0, 0, -1));
-	mEditorCamera.SetHasPerspective(false);
+	mEditorCamera.Move(glm::vec3(50, 40, 50));
+	mEditorCamera.LookAtPos(glm::vec3(0, 0, 0));
+	mEditorCamera.SetHasPerspective(true);
+	app->BindActiveCamera(&mEditorCamera);
 }
 
 EditorInstance::~EditorInstance() {
@@ -729,22 +730,46 @@ void EditorInstance::ShowInspector(GameObject* object) {
 			float bounds[6] = {
 				/*x1*/ -sg->GetSize().x / 2.0f,
 				/*y1*/ -sg->GetSize().y / 2.0f,
-				/*z1*/ 0.0f,
+				/*z1*/ -sg->GetSize().z / 2.0f,
 				/*x2*/ +sg->GetSize().x / 2.0f,
 				/*y2*/ +sg->GetSize().y / 2.0f,
-				/*z2*/ 0.0f,
+				/*z2*/ +sg->GetSize().z / 2.0f,
 			};
 
 			ShowInspector(bounds);
 			ShowGuizmo(bounds);
 			ImGui::Separator();
 
-			sg->SetSize(glm::vec2(bounds[3] - bounds[0], bounds[4] - bounds[1]));
+			sg->SetSize(glm::vec3(bounds[3] - bounds[0], bounds[4] - bounds[1], bounds[5] - bounds[2]));
 
 			auto size = sg->GetSize();
 			if (ImGui::InputFloat2("Size", &size.x)) {
 				sg->SetSize(size);
 			}
+
+			auto xFaceColor = sg->GetXFaceColor();
+			if (ImGui::ColorEdit4("X color", &xFaceColor)) {
+				sg->SetXFaceColor(xFaceColor);
+			}
+			auto yFaceColor = sg->GetYFaceColor();
+			if (ImGui::ColorEdit4("Y color", &yFaceColor)) {
+				sg->SetYFaceColor(yFaceColor);
+			}
+			auto zFaceColor = sg->GetZFaceColor();
+			if (ImGui::ColorEdit4("Z color", &zFaceColor)) {
+				sg->SetZFaceColor(zFaceColor);
+			}
+
+			if (ImGui::Button("Sync from X color")) {
+				sg->SetYFaceColor(xFaceColor);
+				sg->SetZFaceColor(xFaceColor);
+			}
+			ImGui::SameLine();
+			if (ImGui::Button("Reset")) {
+				sg->SetXFaceColor(kXAxisColor);
+				sg->SetYFaceColor(kYAxisColor);
+				sg->SetZFaceColor(kZAxisColor);
+			}
 		} break;
 
 		case GameObject::KD_Building: {