mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-30 09:11:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

update from dtk-template - clangd :) (#66)

Browse Source 
* update from dtk-template and start work towards using clangd

* include <a> -> "a"

* Update build.yml

* remove/add non-trivial class in union warning
This commit is contained in:
Elijah Thomas
2024-10-16 15:36:02 -04:00
committed by GitHub
parent 4543ec129e
commit 26af4db82d
2230 changed files with 18282 additions and 8154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/lyt/d_screen_fader.cpp
+11 -13
View File
@@ -1,8 +1,10 @@
#include <d/lyt/d_screen_fader.h>
#include <egg/gfx/eggDrawGX.h>
#include <egg/gfx/eggScreen.h>
#include <m/m_mtx.h>
#include <nw4r/ut/ut_algorithm.h>
#include "d/lyt/d_screen_fader.h"
#include "egg/gfx/eggDrawGX.h"
#include "egg/gfx/eggScreen.h"
#include "m/m_mtx.h"
#include "nw4r/ut/ut_algorithm.h"
dScreenFader_c::dScreenFader_c(const mColor &color, EStatus status) : mFaderBase_c(color, status), mProgress(0.0f) {}
@@ -28,12 +30,8 @@ bool dScreenFader_c::calc() {
}
switch (mStatus) {
case FADING_IN:
mProgress = h - (h * nw4r::math::SinRad((float)elapsed * M_PI / ((float)(mFrame * 2))));
break;
case FADING_OUT:
mProgress = h - (h * nw4r::math::CosRad((float)elapsed * M_PI / ((float)(mFrame * 2))));
break;
case FADING_IN: mProgress = h - (h * nw4r::math::SinRad((float)elapsed * M_PI / ((float)(mFrame * 2)))); break;
case FADING_OUT: mProgress = h - (h * nw4r::math::CosRad((float)elapsed * M_PI / ((float)(mFrame * 2)))); break;
}
return res;
@@ -52,11 +50,11 @@ void dScreenFader_c::draw() {
PSMTXTransApply(mtx, mtx, -scaleX * 0.5f, scaleY * 0.5f - mProgress, 0.0f);
GXColor a = EGG::DrawGX::BLACK;
EGG::DrawGX::DrawDL(EGG::DrawGX::DL_17, mtx.nw4rm, a);
EGG::DrawGX::DrawDL(EGG::DrawGX::DL_17, mtx, a);
PSMTXScale(mtx, scaleX, mProgress, 1.0f);
PSMTXTransApply(mtx, mtx, -scaleX * 0.5f, -scaleY * 0.5f, 0.0f);
EGG::DrawGX::DrawDL(EGG::DrawGX::DL_17, mtx.nw4rm, a);
EGG::DrawGX::DrawDL(EGG::DrawGX::DL_17, mtx, a);
}
bool dScreenFader_c::fadeIn() {