drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Merge commit 'ab89463b0f88f3f2191cf3f85e0e18bea39e9d36'

Browse Source
This commit is contained in:
Gary Talent
2024-01-05 22:12:08 -06:00
parent 2da5a6f024 ab89463b0f
commit 107e3dd32b
311 changed files with 434 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/color.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/consts.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/context.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/core.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/gfx.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/initparams.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/keelmodule.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/palette.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/ptidxconv.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/studiomodule.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/tilesheet.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/gba/context.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <nostalgia/core/gfx.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/gba/context.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/gba/gfx.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/fs/fs.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/gba/gfx.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/gba/panic.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/

2
deps/nostalgia/src/nostalgia/modules/core/src/gfx.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <nostalgia/core/gfx.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/keel/keelmodule.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/model/model.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/keel/typeconv.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "typeconv.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/keel/typeconv.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/opengl/context.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "context.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/opengl/context.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/opengl/gfx.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/std/array.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/opengl/gfx.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <imgui.h>

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor-imgui.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "paletteeditor.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/paletteeditor/paletteeditor.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/studiomodule.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/std/memory.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "addsubsheetcommand.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/addsubsheetcommand.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/commands.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "cutpastecommand.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/cutpastecommand.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "deletetilescommand.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/deletetilescommand.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "drawcommand.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/drawcommand.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "inserttilescommand.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/inserttilescommand.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "palettechangecommand.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/palettechangecommand.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "rmsubsheetcommand.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/rmsubsheetcommand.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include "updatesubsheetcommand.hpp"

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/commands/updatesubsheetcommand.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

9
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <imgui.h>
@ -109,8 +109,9 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key key, bool down) {
m_subsheetEditor.close();
m_exportMenu.close();
}
auto pal = m_model.pal();
if (pal) {
auto const popupOpen = m_subsheetEditor.isOpen() && m_exportMenu.isOpen();
auto const pal = m_model.pal();
if (pal && !popupOpen) {
const auto colorCnt = pal->colors.size();
if (key == turbine::Key::Alpha_D) {
m_tool = Tool::Draw;
@ -496,7 +497,7 @@ void TileSheetEditorImGui::ExportMenu::draw() noexcept {
ImGui::SetNextWindowSize(ImVec2(235, popupHeight));
if (ImGui::BeginPopupModal(popupName, &m_show, modalFlags)) {
ImGui::InputInt("Scale", &m_scale);
m_scale = ox::clamp(m_scale, 1, 20);
m_scale = ox::clamp(m_scale, 1, 50);
if (ImGui::Button("OK", ImVec2{50, 20})) {
ImGui::CloseCurrentPopup();
m_show = false;

6
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once
@ -41,6 +41,8 @@ class TileSheetEditorImGui: public studio::Editor {
}
void draw() noexcept;
void close() noexcept;
[[nodiscard]]
inline bool isOpen() const noexcept { return m_show; }
};
class ExportMenu {
int m_scale = 0;
@ -53,6 +55,8 @@ class TileSheetEditorImGui: public studio::Editor {
}
void draw() noexcept;
void close() noexcept;
[[nodiscard]]
inline bool isOpen() const noexcept { return m_show; }
};
std::size_t m_selectedPaletteIdx = 0;
turbine::Context &m_ctx;

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditormodel.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/std/point.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheeteditorview.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/claw/write.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixelgrid.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <nostalgia/core/consts.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/src/studio/tilesheeteditor/tilesheetpixels.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/core/src/tilesheet.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/std/size.hpp>

2
deps/nostalgia/src/nostalgia/modules/core/test/tests.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#undef NDEBUG

2
deps/nostalgia/src/nostalgia/modules/keelmodules.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <nostalgia/core/keelmodule.hpp>

2
deps/nostalgia/src/nostalgia/modules/keelmodules.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/include/nostalgia/scene/keelmodule.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/include/nostalgia/scene/scene.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/include/nostalgia/scene/scenestatic.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/include/nostalgia/scene/studiomodule.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/src/keel/keelmodule.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <keel/module.hpp>

2
deps/nostalgia/src/nostalgia/modules/scene/src/keel/typeconv.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <nostalgia/core/gfx.hpp>

2
deps/nostalgia/src/nostalgia/modules/scene/src/keel/typeconv.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/src/scene.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <nostalgia/core/gfx.hpp>

2
deps/nostalgia/src/nostalgia/modules/scene/src/scenestatic.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <nostalgia/scene/scenestatic.hpp>

2
deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <imgui.h>

2
deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditor-imgui.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditor.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <keel/keel.hpp>

2
deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditor.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditorview.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <nostalgia/core/gfx.hpp>

2
deps/nostalgia/src/nostalgia/modules/scene/src/studio/sceneeditorview.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/modules/scene/src/studio/studiomodule.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <studio/studio.hpp>

2
deps/nostalgia/src/nostalgia/modules/studiomodules.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <studioapp/studioapp.hpp>

2
deps/nostalgia/src/nostalgia/modules/studiomodules.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/nostalgia/player/app.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <keel/media.hpp>

2
deps/nostalgia/src/nostalgia/player/app.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/std/memory.hpp>

2
deps/nostalgia/src/nostalgia/player/main.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/logconn/def.hpp>

5
deps/nostalgia/src/nostalgia/studio/CMakeLists.txt vendored
View File

@ -9,6 +9,11 @@ target_link_libraries(
OlympicApplib
)
target_compile_definitions(
NostalgiaStudio PUBLIC
OLYMPIC_APP_VERSION="dev build"
)
install(
TARGETS
NostalgiaStudio

8
deps/nostalgia/src/olympic/applib/applib.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/logconn/def.hpp>
@ -13,6 +13,10 @@
#define OLYMPIC_APP_NAME "App"
#endif
#ifndef OLYMPIC_APP_VERSION
#define OLYMPIC_APP_VERSION "dev build"
#endif
#ifndef OLYMPIC_PROJECT_NAMESPACE
#define OLYMPIC_PROJECT_NAMESPACE project
#endif
@ -31,6 +35,8 @@
namespace olympic {
ox::String appVersion = ox::String(OLYMPIC_APP_VERSION);
ox::Error run(
ox::StringView project,
ox::StringView appName,

2
deps/nostalgia/src/olympic/keel/include/keel/asset.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/include/keel/assetmanager.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/include/keel/context.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/include/keel/keel.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/include/keel/media.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/include/keel/module.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/include/keel/pack.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/include/keel/typeconv.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/include/keel/typestore.hpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#pragma once

2
deps/nostalgia/src/olympic/keel/src/asset.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <keel/asset.hpp>

2
deps/nostalgia/src/olympic/keel/src/keel.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <keel/keel.hpp>

2
deps/nostalgia/src/olympic/keel/src/media.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <keel/media.hpp>

2
deps/nostalgia/src/olympic/keel/src/module.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <keel/module.hpp>

2
deps/nostalgia/src/olympic/keel/src/pack-applib.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <fstream>

2
deps/nostalgia/src/olympic/keel/src/pack.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/fs/fs.hpp>

2
deps/nostalgia/src/olympic/keel/src/typeconv.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <ox/claw/read.hpp>

2
deps/nostalgia/src/olympic/keel/src/typestore.cpp vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2016 - 2023 Gary Talent (gary@drinkingtea.net). All rights reserved.
* Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
*/
#include <keel/typestore.hpp>

Some files were not shown because too many files have changed in this diff Show More