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

[studio,turbine] Fix Turbine sleep logic, tweak Studio default sleep values
All checks were successful
Build / build (push) Successful in 3m16s
Details

Browse Source
This commit is contained in:
Gary Talent 2024-06-01 01:21:43 -05:00
parent 04bf815642
commit f8acaf6551
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/jasper/modules/world/src/studio/worldeditor/worldeditor-imgui.cpp
View File

@ -78,7 +78,7 @@ WorldEditorImGui::WorldEditorImGui(studio::StudioContext &sctx, ox::StringView p
m_doc(makeValid(*readObj<WorldDoc>(keelCtx(m_sctx), path).unwrapThrow())), m_doc(makeValid(*readObj<WorldDoc>(keelCtx(m_sctx), path).unwrapThrow())),
m_objCache(buildObjCache(keelCtx(m_sctx), m_doc).unwrapThrow()), m_objCache(buildObjCache(keelCtx(m_sctx), m_doc).unwrapThrow()),
m_worldStatic(loadWorldStatic(m_objCache, m_doc)), m_worldStatic(loadWorldStatic(m_objCache, m_doc)),
m_view(m_sctx.tctx, m_worldStatic) { m_view(m_sctx, m_worldStatic) {
oxThrowError(loadObjectSets()); oxThrowError(loadObjectSets());
setRequiresConstantRefresh(false); setRequiresConstantRefresh(false);
m_objSetPicker.filePicked.connect(this, &WorldEditorImGui::addObjSet); m_objSetPicker.filePicked.connect(this, &WorldEditorImGui::addObjSet);

9
src/jasper/modules/world/src/studio/worldeditor/worldeditorview.cpp
View File

@ -8,8 +8,9 @@
namespace jasper::world { namespace jasper::world {
WorldEditorView::WorldEditorView(turbine::Context &tctx, WorldStatic const&worldStatic): WorldEditorView::WorldEditorView(studio::StudioContext &sctx, WorldStatic const&worldStatic):
m_cctx(ncore::init(tctx, {.glInstallDrawer = false}).unwrapThrow()), m_sctx(sctx),
m_cctx(ncore::init(m_sctx.tctx, {.glInstallDrawer = false}).unwrapThrow()),
m_worldStatic(worldStatic), m_worldStatic(worldStatic),
m_world(*m_cctx, m_worldStatic) { m_world(*m_cctx, m_worldStatic) {
} }
@ -33,6 +34,10 @@ void WorldEditorView::draw(ox::Size const&targetSz) noexcept {
glutils::resizeInitFrameBuffer(m_frameBuffer, ncore::gl::drawSize(m_scale)); glutils::resizeInitFrameBuffer(m_frameBuffer, ncore::gl::drawSize(m_scale));
} }
glutils::FrameBufferBind const frameBufferBind(m_frameBuffer); glutils::FrameBufferBind const frameBufferBind(m_frameBuffer);
auto const wakeUp = m_world.update();
if (wakeUp.ok()) {
turbine::setRefreshWithin(m_sctx.tctx, wakeUp.value);
}
ncore::gl::draw(*m_cctx, m_scale); ncore::gl::draw(*m_cctx, m_scale);
m_highlighter.draw(); m_highlighter.draw();
} }

5
src/jasper/modules/world/src/studio/worldeditor/worldeditorview.hpp
View File

@ -22,6 +22,7 @@ namespace ncore = nostalgia::core;
class WorldEditorView { class WorldEditorView {
private: private:
studio::StudioContext &m_sctx;
ncore::ContextUPtr m_cctx; ncore::ContextUPtr m_cctx;
WorldStatic const&m_worldStatic; WorldStatic const&m_worldStatic;
int m_columns{}, m_rows{}; int m_columns{}, m_rows{};
@ -33,7 +34,7 @@ class WorldEditorView {
MapTileHighlighter m_highlighter; MapTileHighlighter m_highlighter;
public: public:
WorldEditorView(turbine::Context &ctx, WorldStatic const&worldStatic); WorldEditorView(studio::StudioContext &ctx, WorldStatic const&worldStatic);
ox::Error setupWorld() noexcept; ox::Error setupWorld() noexcept;
@ -56,7 +57,7 @@ class WorldEditorView {
void setPixelBufferObject( void setPixelBufferObject(
unsigned vertexRow, unsigned vertexRow,
float x, float y, float x, float y,
bool const selected, bool selected,
float *vbo, float *vbo,
GLuint *ebo) const noexcept; GLuint *ebo) const noexcept;

4
src/jasper/modules/world/src/world.cpp
View File

@ -70,13 +70,15 @@ void World::setupLayer(
ox::Result<int> World::update() const noexcept { ox::Result<int> World::update() const noexcept {
auto const time = ticksMs(turbineCtx(m_nctx)); auto const time = ticksMs(turbineCtx(m_nctx));
int expiresIn = 30 * 1000;
for (size_t i = 0; auto const&pal : m_palettes) { for (size_t i = 0; auto const&pal : m_palettes) {
auto const interval = m_worldStatic.palettes[i].intervalMs; auto const interval = m_worldStatic.palettes[i].intervalMs;
auto const page = (time / interval) % pal->pages.size(); auto const page = (time / interval) % pal->pages.size();
expiresIn = ox::min(expiresIn, static_cast<int>(time % interval));
oxReturnError(ncore::loadBgPalette(m_nctx, i, *pal, static_cast<size_t>(page))); oxReturnError(ncore::loadBgPalette(m_nctx, i, *pal, static_cast<size_t>(page)));
++i; ++i;
} }
return -1; return expiresIn;
} }
} }