mirror of
https://github.com/isledecomp/isle.git
synced 2026-02-13 16:17:37 +00:00
Apply clang-format
This commit is contained in:
disinvite
parent
6da1bc0a0d
commit
fc1edf7d0b
@ -1,12 +1,12 @@
|
||||
#ifndef MXBITMAP_H
|
||||
#define MXBITMAP_H
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "mxcore.h"
|
||||
#include "mxpalette.h"
|
||||
#include "mxtypes.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
// The stock BITMAPINFO struct from wingdi.h only makes room for one color
|
||||
// in the palette. It seems like the expectation (if you use the struct)
|
||||
// is to malloc as much as you actually need, and then index into the array
|
||||
@ -30,8 +30,7 @@ struct MxBITMAPINFO {
|
||||
|
||||
// SIZE 0x20
|
||||
// VTABLE 0x100dc7b0
|
||||
class MxBitmap : public MxCore
|
||||
{
|
||||
class MxBitmap : public MxCore {
|
||||
public:
|
||||
__declspec(dllexport) MxBitmap();
|
||||
__declspec(dllexport) virtual ~MxBitmap(); // vtable+00
|
||||
@ -47,13 +46,24 @@ class MxBitmap : public MxCore
|
||||
__declspec(dllexport) virtual MxPalette* CreatePalette(); // vtable+34
|
||||
virtual void ImportPalette(MxPalette* p_palette); // vtable+38
|
||||
virtual MxResult SetBitDepth(MxBool); // vtable+3c
|
||||
virtual MxResult StretchBits(HDC p_hdc, MxS32 p_xSrc, MxS32 p_ySrc, MxS32 p_xDest, MxS32 p_yDest, MxS32 p_destWidth, MxS32 p_destHeight); // vtable+40
|
||||
virtual MxResult StretchBits(
|
||||
HDC p_hdc,
|
||||
MxS32 p_xSrc,
|
||||
MxS32 p_ySrc,
|
||||
MxS32 p_xDest,
|
||||
MxS32 p_yDest,
|
||||
MxS32 p_destWidth,
|
||||
MxS32 p_destHeight
|
||||
); // vtable+40
|
||||
|
||||
inline BITMAPINFOHEADER* GetBmiHeader() const { return m_bmiHeader; }
|
||||
inline MxLong GetBmiWidth() const { return m_bmiHeader->biWidth; }
|
||||
inline MxLong GetBmiStride() const { return ((m_bmiHeader->biWidth + 3) & -4); }
|
||||
inline MxLong GetBmiHeight() const { return m_bmiHeader->biHeight; }
|
||||
inline MxLong GetBmiHeightAbs() const { return m_bmiHeader->biHeight > 0 ? m_bmiHeader->biHeight : -m_bmiHeader->biHeight; }
|
||||
inline MxLong GetBmiHeightAbs() const
|
||||
{
|
||||
return m_bmiHeader->biHeight > 0 ? m_bmiHeader->biHeight : -m_bmiHeader->biHeight;
|
||||
}
|
||||
inline MxU8* GetBitmapData() const { return m_data; }
|
||||
|
||||
private:
|
||||
|
||||
@ -9,11 +9,9 @@ class MxOmni;
|
||||
|
||||
// VTABLE 0x100dc098
|
||||
// SIZE 0x94
|
||||
class MxDSAction : public MxDSObject
|
||||
{
|
||||
class MxDSAction : public MxDSObject {
|
||||
public:
|
||||
enum
|
||||
{
|
||||
enum {
|
||||
Flag_Looping = 0x01,
|
||||
Flag_Bit3 = 0x04,
|
||||
Flag_Bit4 = 0x08,
|
||||
@ -64,6 +62,7 @@ class MxDSAction : public MxDSObject
|
||||
inline MxS32 GetLoopCount() { return m_loopCount; }
|
||||
inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
|
||||
inline const MxVector3Data& GetLocation() const { return m_location; }
|
||||
inline void SetUnknown84(MxCore* p_unk84) { m_unk84 = p_unk84; }
|
||||
inline void SetOmni(MxOmni* p_omni) { m_omni = p_omni; }
|
||||
|
||||
inline MxBool IsLooping() const { return m_flags & Flag_Looping; }
|
||||
@ -84,7 +83,7 @@ class MxDSAction : public MxDSObject
|
||||
MxVector3Data m_up;
|
||||
char* m_extraData;
|
||||
MxU16 m_extraLength;
|
||||
undefined4 m_unk84;
|
||||
MxCore* m_unk84;
|
||||
undefined4 m_unk88;
|
||||
MxOmni* m_omni; // 0x8c
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
#include "mxvideopresenter.h"
|
||||
#include "MxVideoManager.h"
|
||||
|
||||
#include "mxvideomanager.h"
|
||||
|
||||
DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
|
||||
DECOMP_SIZE_ASSERT(MxVideoPresenter::AlphaMask, 0xc);
|
||||
@ -55,15 +56,13 @@ MxBool MxVideoPresenter::VTable0x7c()
|
||||
// OFFSET: LEGO1 0x1000c7e0
|
||||
MxS32 MxVideoPresenter::GetWidth()
|
||||
{
|
||||
return m_alpha ? m_alpha->m_width
|
||||
: m_bitmap->GetBmiHeader()->biWidth;
|
||||
return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiHeader()->biWidth;
|
||||
}
|
||||
|
||||
// OFFSET: LEGO1 0x1000c800
|
||||
MxS32 MxVideoPresenter::GetHeight()
|
||||
{
|
||||
return m_alpha ? m_alpha->m_height
|
||||
: m_bitmap->GetBmiHeader()->biHeight;
|
||||
return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeader()->biHeight;
|
||||
}
|
||||
|
||||
// OFFSET: LEGO1 0x100b24f0
|
||||
@ -95,20 +94,24 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap &p_bitmap)
|
||||
// biCompression == 16 gets optimized away.
|
||||
if (biCompression == BI_RGB_TOPDOWN || p_bitmap.GetBmiHeight() < 0) {
|
||||
rows_before_top = 0;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
rows_before_top = p_bitmap.GetBmiHeightAbs();
|
||||
rows_before_top--;
|
||||
}
|
||||
|
||||
goto seek_to_last_row;
|
||||
} else if (biCompression == BI_RGB_TOPDOWN) {
|
||||
}
|
||||
else if (biCompression == BI_RGB_TOPDOWN) {
|
||||
// DECOMP: This is the only condition where we skip the
|
||||
// calculation below.
|
||||
bitmap_src_ptr = p_bitmap.GetBitmapData();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
if (p_bitmap.GetBmiHeight() < 0) {
|
||||
rows_before_top = 0;
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
rows_before_top = p_bitmap.GetBmiHeightAbs();
|
||||
rows_before_top--;
|
||||
}
|
||||
@ -136,7 +139,7 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap &p_bitmap)
|
||||
if (*t_ptr) {
|
||||
// TODO: Second CDQ instruction for abs() should not be there.
|
||||
MxU32 shift = abs(offset) & 7;
|
||||
m_bitmask[offset / 8] |= (1 << abs(shift));
|
||||
m_bitmask[offset / 8] |= (1 << abs((MxS32) shift));
|
||||
}
|
||||
t_ptr++;
|
||||
offset++;
|
||||
@ -158,7 +161,6 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxVideoPresenter::AlphaMask &p_alph
|
||||
memcpy(m_bitmask, p_alpha.m_bitmask, size);
|
||||
}
|
||||
|
||||
|
||||
// OFFSET: LEGO1 0x100b26d0
|
||||
MxVideoPresenter::AlphaMask::~AlphaMask()
|
||||
{
|
||||
@ -240,8 +242,8 @@ void MxVideoPresenter::VTable0x64()
|
||||
MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
|
||||
{
|
||||
MxDSAction* action = GetAction();
|
||||
if ((action == NULL) || (((action->GetFlags() & MxDSAction::Flag_Bit10) == 0) && !IsEnabled())
|
||||
|| (!m_bitmap && !m_alpha))
|
||||
if ((action == NULL) || (((action->GetFlags() & MxDSAction::Flag_Bit10) == 0) && !IsEnabled()) ||
|
||||
(!m_bitmap && !m_alpha))
|
||||
return FALSE;
|
||||
|
||||
if (m_bitmap)
|
||||
@ -272,14 +274,17 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
|
||||
if (biCompression == BI_RGB) {
|
||||
if (biCompression == BI_RGB_TOPDOWN || height < 0) {
|
||||
seek_row = p_y - GetLocationY();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
height = height > 0 ? height : -height;
|
||||
seek_row = height - p_y - 1 + GetLocationY();
|
||||
}
|
||||
pixel = m_bitmap->GetBmiStride() * seek_row + m_bitmap->GetBitmapData() - GetLocationX() + p_x;
|
||||
} else if (biCompression == BI_RGB_TOPDOWN) {
|
||||
}
|
||||
else if (biCompression == BI_RGB_TOPDOWN) {
|
||||
pixel = m_bitmap->GetBitmapData();
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
height = height > 0 ? height : -height;
|
||||
height--;
|
||||
pixel = m_bitmap->GetBmiStride() * height + m_bitmap->GetBitmapData();
|
||||
|
||||
@ -1,19 +1,14 @@
|
||||
#ifndef MXVIDEOPRESENTER_H
|
||||
#define MXVIDEOPRESENTER_H
|
||||
|
||||
#include "mxmediapresenter.h"
|
||||
#include "mxbitmap.h"
|
||||
|
||||
#include "decomp.h"
|
||||
#include "mxbitmap.h"
|
||||
#include "mxmediapresenter.h"
|
||||
|
||||
// VTABLE 0x100d4be8
|
||||
class MxVideoPresenter : public MxMediaPresenter
|
||||
{
|
||||
class MxVideoPresenter : public MxMediaPresenter {
|
||||
public:
|
||||
MxVideoPresenter()
|
||||
{
|
||||
Init();
|
||||
}
|
||||
MxVideoPresenter() { Init(); }
|
||||
|
||||
virtual ~MxVideoPresenter() override; // vtable+0x0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user