Makefile

@@ -5,11 +5,9 @@ BUILDCORE_PATH=deps/buildcore
 include ${BUILDCORE_PATH}/base.mk
 
 ifeq ($(BC_VAR_OS),darwin)
-	PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME}.app/Contents/MacOS/${BC_VAR_PROJECT_NAME}
 	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio.app/Contents/MacOS/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=/Applications/mGBA.app/Contents/MacOS/mGBA
 else
-	PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME}
 	NOSTALGIA_STUDIO=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}Studio
 	MGBA=mgba-qt
 endif
@@ -18,12 +16,9 @@ endif
 pkg-gba: build
 	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME}
 
-.PHONY: build-player
-build-player:
-	${BC_CMD_CMAKE_BUILD} ${BC_VAR_BUILD_PATH} ${BC_VAR_PROJECT_NAME}
 .PHONY: run
-run: build-player
+run: build
-	${PROJECT_PLAYER} sample_project
+	./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME} sample_project
 .PHONY: run-studio
 run-studio: build
 	${NOSTALGIA_STUDIO}

src/olympic/studio/applib/src/newmenu.cpp

@@ -22,12 +22,6 @@ void NewMenu::open() noexcept {
 	m_selectedType = 0;
 	m_itemName = "";
 	m_typeName = "";
-	m_path = "";
-}
-
-void NewMenu::openPath(ox::StringParam path) noexcept {
-	open();
-	m_path = std::move(path);
 }
 
 void NewMenu::close() noexcept {
@@ -164,14 +158,14 @@ void NewMenu::finish(StudioContext &sctx) noexcept {
 		oxLogError(ox::Error{1, "New file error: no file name"});
 		return;
 	}
-	auto const&im = *m_types[m_selectedType];
+	auto const&im = *m_types[static_cast<std::size_t>(m_selectedType)];
-	auto const path = m_path.len() ?
+	if (sctx.project->exists(im.itemPath(m_itemName))) {
-		im.itemPath(m_itemName, m_path) : im.itemPath(m_itemName);
-	if (sctx.project->exists(path)) {
 		oxLogError(ox::Error{1, "New file error: file already exists"});
 		return;
 	}
-	if (auto const err = im.write(sctx, path, m_selectedTemplate)) {
+	auto const [path, err] =
+		im.write(sctx, m_itemName, m_selectedTemplate);
+	if (err) {
 		oxLogError(err);
 		return;
 	}

src/olympic/studio/applib/src/newmenu.hpp

@@ -30,7 +30,6 @@ class NewMenu final: public Popup {
 		Stage m_stage = Stage::Closed;
 		ox::String m_typeName;
 		ox::IString<255> m_itemName;
-		ox::String m_path;
 		ox::Vector<ox::UPtr<studio::ItemMaker>> m_types;
 		size_t m_selectedType = 0;
 		size_t m_selectedTemplate = 0;
@@ -39,8 +38,6 @@ class NewMenu final: public Popup {
 	public:
 		NewMenu() noexcept;
 
-		void openPath(ox::StringParam path) noexcept;
-
 		void open() noexcept override;
 
 		void close() noexcept override;

src/olympic/studio/applib/src/projectexplorer.hpp

@@ -19,8 +19,7 @@ class ProjectExplorer: public Widget {
 
 	public:
 		// slots
-		ox::Signal<ox::Error(ox::StringViewCR)> fileChosen;
+		ox::Signal<ox::Error(ox::StringView const&)> fileChosen;
-		ox::Signal<ox::Error(ox::StringViewCR)> addItem;
 
 		explicit ProjectExplorer(turbine::Context &ctx) noexcept;
 

src/olympic/studio/applib/src/projecttreemodel.cpp

@@ -4,8 +4,6 @@
 
 #include <imgui.h>
 
-#include <studio/imguiutil.hpp>
-
 #include "projectexplorer.hpp"
 #include "projecttreemodel.hpp"
 
@@ -32,14 +30,10 @@ bool ProjectTreeModel::draw(turbine::Context &ctx) const noexcept {
 	constexpr auto dirFlags = ImGuiTreeNodeFlags_OpenOnArrow | ImGuiTreeNodeFlags_OpenOnDoubleClick;
 	if (!m_children.empty()) {
 		if (ImGui::TreeNodeEx(m_name.c_str(), dirFlags)) {
-            drawDirContextMenu();
 			for (auto const&child : m_children) {
 				updated = child->draw(ctx) || updated;
 			}
 			ImGui::TreePop();
-		} else {
-			ig::IDStackItem const idStackItem{m_name};
-            drawDirContextMenu();
 		}
 	} else {
 		auto const path = fullPath();
@@ -64,15 +58,6 @@ void ProjectTreeModel::setChildren(ox::Vector<ox::UPtr<ProjectTreeModel>> childr
 	m_children = std::move(children);
 }
 
-void ProjectTreeModel::drawDirContextMenu() const noexcept {
-    if (ImGui::BeginPopupContextItem("DirMenu", ImGuiPopupFlags_MouseButtonRight)) {
-        if (ImGui::MenuItem("Add Item")) {
-            m_explorer.addItem.emit(fullPath());
-        }
-        ImGui::EndPopup();
-    }
-}
-
 ox::BasicString<255> ProjectTreeModel::fullPath() const noexcept {
 	if (m_parent) {
 		return m_parent->fullPath() + "/" + ox::StringView(m_name);

src/olympic/studio/applib/src/projecttreemodel.hpp

@@ -31,8 +31,6 @@ class ProjectTreeModel {
 		void setChildren(ox::Vector<ox::UPtr<ProjectTreeModel>> children) noexcept;
 
 	private:
-		void drawDirContextMenu() const noexcept;
-
 		[[nodiscard]]
 		ox::BasicString<255> fullPath() const noexcept;
 

src/olympic/studio/applib/src/studioapp.cpp

@@ -52,7 +52,6 @@ StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexce
 		m_aboutPopup(m_tctx) {
 	turbine::setApplicationData(m_tctx, &m_sctx);
 	m_projectExplorer.fileChosen.connect(this, &StudioUI::openFile);
-	m_projectExplorer.addItem.connect(this, &StudioUI::addFile);
 	m_newProject.finished.connect(this, &StudioUI::createOpenProject);
 	m_newMenu.finished.connect(this, &StudioUI::openFile);
 	ImGui::GetIO().IniFilename = nullptr;
@@ -343,11 +342,6 @@ void StudioUI::handleKeyInput() noexcept {
 	}
 }
 
-ox::Error StudioUI::addFile(ox::StringViewCR path) noexcept {
-	m_newMenu.openPath(path);
-	return {};
-}
-
 ox::Error StudioUI::createOpenProject(ox::StringViewCR path) noexcept {
 	std::error_code ec;
 	std::filesystem::create_directories(toStdStringView(path), ec);

src/olympic/studio/applib/src/studioapp.hpp

@@ -83,8 +83,6 @@ class StudioUI: public ox::SignalHandler {
 
 		void handleKeyInput() noexcept;
 
-		ox::Error addFile(ox::StringViewCR path) noexcept;
-
 		ox::Error createOpenProject(ox::StringViewCR path) noexcept;
 
 		ox::Error openProjectPath(ox::StringParam path) noexcept;

src/olympic/studio/modlib/include/studio/itemmaker.hpp

@@ -128,16 +128,6 @@ class ItemMaker {
 			return m_templates;
 		}
 
-		[[nodiscard]]
-		ox::String const&defaultPath() const noexcept {
-			return m_parentDir;
-		}
-
-		[[nodiscard]]
-		ox::String itemPath(ox::StringViewCR pName, ox::StringViewCR pPath) const noexcept {
-			return ox::sfmt("/{}/{}.{}", pPath, pName, m_fileExt);
-		}
-
 		[[nodiscard]]
 		ox::String itemPath(ox::StringViewCR pName) const noexcept {
 			return ox::sfmt("/{}/{}.{}", m_parentDir, pName, m_fileExt);
@@ -152,40 +142,12 @@ class ItemMaker {
 		/**
 		 * Returns path of the file created.
 		 * @param ctx
-		 * @param pPath
-		 * @param pTemplateIdx
-		 * @return path of file or error in Result
-		 */
-		ox::Error write(
-			StudioContext &ctx,
-			ox::StringViewCR pPath,
-			size_t pTemplateIdx) const noexcept {
-			return writeItem(ctx, pPath, pTemplateIdx);
-		}
-
-		/**
-		 * Returns path of the file created.
-		 * @param ctx
-		 * @param pPath
 		 * @param pName
 		 * @param pTemplateIdx
 		 * @return path of file or error in Result
 		 */
-		ox::Error write(
+		virtual ox::Result<ox::String> write(
-			StudioContext &ctx,
+			StudioContext &ctx, ox::StringViewCR pName, size_t pTemplateIdx) const noexcept = 0;
-			ox::StringViewCR pPath,
-			ox::StringViewCR pName,
-			size_t pTemplateIdx) const noexcept {
-			auto const path = itemPath(pName, pPath);
-			return writeItem(ctx, path, pTemplateIdx);
-		}
-
-	protected:
-		virtual ox::Error writeItem(
-			StudioContext &ctx,
-			ox::StringViewCR pPath,
-			size_t pTemplateIdx) const noexcept = 0;
-
 };
 
 template<typename T>
@@ -243,19 +205,20 @@ class ItemMakerT final: public ItemMaker {
 			return ox::ModelTypeVersion_v<T>;
 		}
 
-		ox::Error writeItem(
+		ox::Result<ox::String> write(
-			StudioContext &ctx,
+			StudioContext &sctx,
-			ox::StringViewCR pPath,
+			ox::StringViewCR pName,
 			size_t const pTemplateIdx) const noexcept override {
-			createUuidMapping(keelCtx(ctx.tctx), pPath, ox::UUID::generate().unwrap());
+			auto const path = itemPath(pName);
+			createUuidMapping(keelCtx(sctx.tctx), path, ox::UUID::generate().unwrap());
 			auto const&templates = itemTemplates();
 			auto const tmplIdx = pTemplateIdx < templates.size() ? pTemplateIdx : 0;
 			OX_REQUIRE_M(tmpl, templates[tmplIdx]->getItem(
-				keelCtx(ctx), typeName(), typeVersion()));
+				keelCtx(sctx), typeName(), typeVersion()));
 			auto item = tmpl.template get<T>();
-			OX_RETURN_ERROR(ctx.project->writeObj(pPath, *item, m_fmt));
+			OX_RETURN_ERROR(sctx.project->writeObj(path, *item, m_fmt));
 			tmpl.free();
-			return {};
+			return path;
 		}
 
 };