mirror of
https://github.com/isledecomp/isle.git
synced 2026-01-24 00:31:16 +00:00
Apply clang-format
This commit is contained in:
parent
6da1bc0a0d
commit
fc1edf7d0b
@ -1,12 +1,12 @@
|
|||||||
#ifndef MXBITMAP_H
|
#ifndef MXBITMAP_H
|
||||||
#define MXBITMAP_H
|
#define MXBITMAP_H
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#include "mxcore.h"
|
#include "mxcore.h"
|
||||||
#include "mxpalette.h"
|
#include "mxpalette.h"
|
||||||
#include "mxtypes.h"
|
#include "mxtypes.h"
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
// The stock BITMAPINFO struct from wingdi.h only makes room for one color
|
// 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)
|
// 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
|
// is to malloc as much as you actually need, and then index into the array
|
||||||
@ -30,41 +30,51 @@ struct MxBITMAPINFO {
|
|||||||
|
|
||||||
// SIZE 0x20
|
// SIZE 0x20
|
||||||
// VTABLE 0x100dc7b0
|
// VTABLE 0x100dc7b0
|
||||||
class MxBitmap : public MxCore
|
class MxBitmap : public MxCore {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
__declspec(dllexport) MxBitmap();
|
__declspec(dllexport) MxBitmap();
|
||||||
__declspec(dllexport) virtual ~MxBitmap(); // vtable+00
|
__declspec(dllexport) virtual ~MxBitmap(); // vtable+00
|
||||||
|
|
||||||
virtual MxResult ImportBitmap(MxBitmap *p_bitmap); // vtable+14
|
virtual MxResult ImportBitmap(MxBitmap* p_bitmap); // vtable+14
|
||||||
virtual MxResult ImportBitmapInfo(MxBITMAPINFO *p_info); // vtable+18
|
virtual MxResult ImportBitmapInfo(MxBITMAPINFO* p_info); // vtable+18
|
||||||
virtual MxResult SetSize(MxS32 p_width, MxS32 p_height, MxPalette *p_palette, MxBool); // vtable+1c
|
virtual MxResult SetSize(MxS32 p_width, MxS32 p_height, MxPalette* p_palette, MxBool); // vtable+1c
|
||||||
virtual MxResult LoadFile(HANDLE p_handle); // vtable+20
|
virtual MxResult LoadFile(HANDLE p_handle); // vtable+20
|
||||||
__declspec(dllexport) virtual MxLong Read(const char *p_filename); // vtable+24
|
__declspec(dllexport) virtual MxLong Read(const char* p_filename); // vtable+24
|
||||||
virtual int vtable28(int);
|
virtual int vtable28(int);
|
||||||
virtual void vtable2c(int, int, int, int, int, int, int);
|
virtual void vtable2c(int, int, int, int, int, int, int);
|
||||||
virtual void vtable30(int, int, int, int, int, int, int);
|
virtual void vtable30(int, int, int, int, int, int, int);
|
||||||
__declspec(dllexport) virtual MxPalette *CreatePalette(); // vtable+34
|
__declspec(dllexport) virtual MxPalette* CreatePalette(); // vtable+34
|
||||||
virtual void ImportPalette(MxPalette* p_palette); // vtable+38
|
virtual void ImportPalette(MxPalette* p_palette); // vtable+38
|
||||||
virtual MxResult SetBitDepth(MxBool); // vtable+3c
|
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 BITMAPINFOHEADER* GetBmiHeader() const { return m_bmiHeader; }
|
||||||
inline MxLong GetBmiWidth() const { return m_bmiHeader->biWidth; }
|
inline MxLong GetBmiWidth() const { return m_bmiHeader->biWidth; }
|
||||||
inline MxLong GetBmiStride() const { return ((m_bmiHeader->biWidth + 3) & -4); }
|
inline MxLong GetBmiStride() const { return ((m_bmiHeader->biWidth + 3) & -4); }
|
||||||
inline MxLong GetBmiHeight() const { return m_bmiHeader->biHeight; }
|
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
|
||||||
inline MxU8 *GetBitmapData() const { return m_data; }
|
{
|
||||||
|
return m_bmiHeader->biHeight > 0 ? m_bmiHeader->biHeight : -m_bmiHeader->biHeight;
|
||||||
|
}
|
||||||
|
inline MxU8* GetBitmapData() const { return m_data; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MxResult ImportColorsToPalette(RGBQUAD*, MxPalette*);
|
MxResult ImportColorsToPalette(RGBQUAD*, MxPalette*);
|
||||||
|
|
||||||
MxBITMAPINFO *m_info; // 0x8
|
MxBITMAPINFO* m_info; // 0x8
|
||||||
BITMAPINFOHEADER *m_bmiHeader; // 0xc
|
BITMAPINFOHEADER* m_bmiHeader; // 0xc
|
||||||
RGBQUAD *m_paletteData; // 0x10
|
RGBQUAD* m_paletteData; // 0x10
|
||||||
MxU8 *m_data; // 0x14
|
MxU8* m_data; // 0x14
|
||||||
MxBool m_isHighColor; // 0x18
|
MxBool m_isHighColor; // 0x18
|
||||||
MxPalette *m_palette; // 0x1c
|
MxPalette* m_palette; // 0x1c
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // MXBITMAP_H
|
#endif // MXBITMAP_H
|
||||||
|
|||||||
@ -9,11 +9,9 @@ class MxOmni;
|
|||||||
|
|
||||||
// VTABLE 0x100dc098
|
// VTABLE 0x100dc098
|
||||||
// SIZE 0x94
|
// SIZE 0x94
|
||||||
class MxDSAction : public MxDSObject
|
class MxDSAction : public MxDSObject {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
enum
|
enum {
|
||||||
{
|
|
||||||
Flag_Looping = 0x01,
|
Flag_Looping = 0x01,
|
||||||
Flag_Bit3 = 0x04,
|
Flag_Bit3 = 0x04,
|
||||||
Flag_Bit4 = 0x08,
|
Flag_Bit4 = 0x08,
|
||||||
@ -27,44 +25,45 @@ class MxDSAction : public MxDSObject
|
|||||||
__declspec(dllexport) MxDSAction();
|
__declspec(dllexport) MxDSAction();
|
||||||
__declspec(dllexport) virtual ~MxDSAction();
|
__declspec(dllexport) virtual ~MxDSAction();
|
||||||
|
|
||||||
void CopyFrom(MxDSAction &p_dsAction);
|
void CopyFrom(MxDSAction& p_dsAction);
|
||||||
MxDSAction &operator=(MxDSAction &p_dsAction);
|
MxDSAction& operator=(MxDSAction& p_dsAction);
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x100ad980
|
// OFFSET: LEGO1 0x100ad980
|
||||||
inline virtual const char *ClassName() const override // vtable+0x0c
|
inline virtual const char* ClassName() const override // vtable+0x0c
|
||||||
{
|
{
|
||||||
// 0x101013f4
|
// 0x101013f4
|
||||||
return "MxDSAction";
|
return "MxDSAction";
|
||||||
}
|
}
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x100ad990
|
// OFFSET: LEGO1 0x100ad990
|
||||||
inline virtual MxBool IsA(const char *name) const override // vtable+0x10
|
inline virtual MxBool IsA(const char* name) const override // vtable+0x10
|
||||||
{
|
{
|
||||||
return !strcmp(name, MxDSAction::ClassName()) || MxDSObject::IsA(name);
|
return !strcmp(name, MxDSAction::ClassName()) || MxDSObject::IsA(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual MxU32 GetSizeOnDisk() override; // vtable+18;
|
virtual MxU32 GetSizeOnDisk() override; // vtable+18;
|
||||||
virtual void Deserialize(char **p_source, MxS16 p_unk24) override; // vtable+1c;
|
virtual void Deserialize(char** p_source, MxS16 p_unk24) override; // vtable+1c;
|
||||||
virtual MxLong GetDuration(); // vtable+24;
|
virtual MxLong GetDuration(); // vtable+24;
|
||||||
virtual void SetDuration(MxLong p_duration); // vtable+28;
|
virtual void SetDuration(MxLong p_duration); // vtable+28;
|
||||||
virtual MxDSAction *Clone(); // vtable+2c;
|
virtual MxDSAction* Clone(); // vtable+2c;
|
||||||
virtual void MergeFrom(MxDSAction &p_dsAction); // vtable+30;
|
virtual void MergeFrom(MxDSAction& p_dsAction); // vtable+30;
|
||||||
virtual MxBool HasId(MxU32 p_objectId); // vtable+34;
|
virtual MxBool HasId(MxU32 p_objectId); // vtable+34;
|
||||||
virtual void SetUnkTimingField(MxLong p_unkTimingField); // vtable+38;
|
virtual void SetUnkTimingField(MxLong p_unkTimingField); // vtable+38;
|
||||||
virtual MxLong GetUnkTimingField(); // vtable+3c;
|
virtual MxLong GetUnkTimingField(); // vtable+3c;
|
||||||
virtual MxLong GetCurrentTime(); // vtable+40;
|
virtual MxLong GetCurrentTime(); // vtable+40;
|
||||||
|
|
||||||
void AppendData(MxU16 p_extraLength, const char *p_extraData);
|
void AppendData(MxU16 p_extraLength, const char* p_extraData);
|
||||||
|
|
||||||
inline MxU32 GetFlags() { return m_flags; }
|
inline MxU32 GetFlags() { return m_flags; }
|
||||||
inline void SetFlags(MxU32 p_flags) { m_flags = p_flags; }
|
inline void SetFlags(MxU32 p_flags) { m_flags = p_flags; }
|
||||||
inline char *GetExtraData() { return m_extraData; }
|
inline char* GetExtraData() { return m_extraData; }
|
||||||
inline MxU16 GetExtraLength() const { return m_extraLength; }
|
inline MxU16 GetExtraLength() const { return m_extraLength; }
|
||||||
inline MxLong GetStartTime() const { return m_startTime; }
|
inline MxLong GetStartTime() const { return m_startTime; }
|
||||||
inline MxS32 GetLoopCount() { return m_loopCount; }
|
inline MxS32 GetLoopCount() { return m_loopCount; }
|
||||||
inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
|
inline void SetLoopCount(MxS32 p_loopCount) { m_loopCount = p_loopCount; }
|
||||||
inline const MxVector3Data &GetLocation() const { return m_location; }
|
inline const MxVector3Data& GetLocation() const { return m_location; }
|
||||||
inline void SetOmni(MxOmni *p_omni) { m_omni = p_omni; }
|
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; }
|
inline MxBool IsLooping() const { return m_flags & Flag_Looping; }
|
||||||
inline MxBool IsBit3() const { return m_flags & Flag_Bit3; }
|
inline MxBool IsBit3() const { return m_flags & Flag_Bit3; }
|
||||||
@ -82,11 +81,11 @@ class MxDSAction : public MxDSObject
|
|||||||
MxVector3Data m_location;
|
MxVector3Data m_location;
|
||||||
MxVector3Data m_direction;
|
MxVector3Data m_direction;
|
||||||
MxVector3Data m_up;
|
MxVector3Data m_up;
|
||||||
char *m_extraData;
|
char* m_extraData;
|
||||||
MxU16 m_extraLength;
|
MxU16 m_extraLength;
|
||||||
undefined4 m_unk84;
|
MxCore* m_unk84;
|
||||||
undefined4 m_unk88;
|
undefined4 m_unk88;
|
||||||
MxOmni *m_omni; // 0x8c
|
MxOmni* m_omni; // 0x8c
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
MxLong m_unkTimingField; // 0x90
|
MxLong m_unkTimingField; // 0x90
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
#include "mxvideopresenter.h"
|
#include "mxvideopresenter.h"
|
||||||
#include "MxVideoManager.h"
|
|
||||||
|
#include "mxvideomanager.h"
|
||||||
|
|
||||||
DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
|
DECOMP_SIZE_ASSERT(MxVideoPresenter, 0x64);
|
||||||
DECOMP_SIZE_ASSERT(MxVideoPresenter::AlphaMask, 0xc);
|
DECOMP_SIZE_ASSERT(MxVideoPresenter::AlphaMask, 0xc);
|
||||||
@ -55,19 +56,17 @@ MxBool MxVideoPresenter::VTable0x7c()
|
|||||||
// OFFSET: LEGO1 0x1000c7e0
|
// OFFSET: LEGO1 0x1000c7e0
|
||||||
MxS32 MxVideoPresenter::GetWidth()
|
MxS32 MxVideoPresenter::GetWidth()
|
||||||
{
|
{
|
||||||
return m_alpha ? m_alpha->m_width
|
return m_alpha ? m_alpha->m_width : m_bitmap->GetBmiHeader()->biWidth;
|
||||||
: m_bitmap->GetBmiHeader()->biWidth;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x1000c800
|
// OFFSET: LEGO1 0x1000c800
|
||||||
MxS32 MxVideoPresenter::GetHeight()
|
MxS32 MxVideoPresenter::GetHeight()
|
||||||
{
|
{
|
||||||
return m_alpha ? m_alpha->m_height
|
return m_alpha ? m_alpha->m_height : m_bitmap->GetBmiHeader()->biHeight;
|
||||||
: m_bitmap->GetBmiHeader()->biHeight;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x100b24f0
|
// OFFSET: LEGO1 0x100b24f0
|
||||||
MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap &p_bitmap)
|
MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap& p_bitmap)
|
||||||
{
|
{
|
||||||
m_width = p_bitmap.GetBmiWidth();
|
m_width = p_bitmap.GetBmiWidth();
|
||||||
// DECOMP: ECX becomes word-sized if these are not two separate actions.
|
// DECOMP: ECX becomes word-sized if these are not two separate actions.
|
||||||
@ -80,7 +79,7 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap &p_bitmap)
|
|||||||
|
|
||||||
MxU32 biCompression = p_bitmap.GetBmiHeader()->biCompression;
|
MxU32 biCompression = p_bitmap.GetBmiHeader()->biCompression;
|
||||||
MxU32 rows_before_top;
|
MxU32 rows_before_top;
|
||||||
MxU8 *bitmap_src_ptr;
|
MxU8* bitmap_src_ptr;
|
||||||
|
|
||||||
// The goal here is to enable us to walk through the bitmap's rows
|
// The goal here is to enable us to walk through the bitmap's rows
|
||||||
// in order, regardless of the orientation. We want to end up at the
|
// in order, regardless of the orientation. We want to end up at the
|
||||||
@ -95,26 +94,30 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap &p_bitmap)
|
|||||||
// biCompression == 16 gets optimized away.
|
// biCompression == 16 gets optimized away.
|
||||||
if (biCompression == BI_RGB_TOPDOWN || p_bitmap.GetBmiHeight() < 0) {
|
if (biCompression == BI_RGB_TOPDOWN || p_bitmap.GetBmiHeight() < 0) {
|
||||||
rows_before_top = 0;
|
rows_before_top = 0;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
rows_before_top = p_bitmap.GetBmiHeightAbs();
|
rows_before_top = p_bitmap.GetBmiHeightAbs();
|
||||||
rows_before_top--;
|
rows_before_top--;
|
||||||
}
|
}
|
||||||
|
|
||||||
goto seek_to_last_row;
|
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
|
// DECOMP: This is the only condition where we skip the
|
||||||
// calculation below.
|
// calculation below.
|
||||||
bitmap_src_ptr = p_bitmap.GetBitmapData();
|
bitmap_src_ptr = p_bitmap.GetBitmapData();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
if (p_bitmap.GetBmiHeight() < 0) {
|
if (p_bitmap.GetBmiHeight() < 0) {
|
||||||
rows_before_top = 0;
|
rows_before_top = 0;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
rows_before_top = p_bitmap.GetBmiHeightAbs();
|
rows_before_top = p_bitmap.GetBmiHeightAbs();
|
||||||
rows_before_top--;
|
rows_before_top--;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: would prefer not to use goto if we can figure this structure out
|
// TODO: would prefer not to use goto if we can figure this structure out
|
||||||
seek_to_last_row:
|
seek_to_last_row:
|
||||||
bitmap_src_ptr = p_bitmap.GetBmiStride() * rows_before_top + p_bitmap.GetBitmapData();
|
bitmap_src_ptr = p_bitmap.GetBmiStride() * rows_before_top + p_bitmap.GetBitmapData();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -122,7 +125,7 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap &p_bitmap)
|
|||||||
// (i.e. the image stride)
|
// (i.e. the image stride)
|
||||||
// If this is a bottom-up DIB, we will walk it in reverse.
|
// If this is a bottom-up DIB, we will walk it in reverse.
|
||||||
// TODO: Same rounding trick as in MxBitmap
|
// TODO: Same rounding trick as in MxBitmap
|
||||||
MxS32 row_seek = ((m_width+3)&-4);
|
MxS32 row_seek = ((m_width + 3) & -4);
|
||||||
if (p_bitmap.GetBmiHeight() < 0)
|
if (p_bitmap.GetBmiHeight() < 0)
|
||||||
row_seek = -row_seek;
|
row_seek = -row_seek;
|
||||||
|
|
||||||
@ -130,13 +133,13 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap &p_bitmap)
|
|||||||
// are just for counting the pixels.
|
// are just for counting the pixels.
|
||||||
MxS32 offset = 0;
|
MxS32 offset = 0;
|
||||||
|
|
||||||
MxU8 *t_ptr = bitmap_src_ptr;
|
MxU8* t_ptr = bitmap_src_ptr;
|
||||||
for (MxS32 j = 0; j < m_height; j++) {
|
for (MxS32 j = 0; j < m_height; j++) {
|
||||||
for (MxS32 i = 0; i < m_width; i++) {
|
for (MxS32 i = 0; i < m_width; i++) {
|
||||||
if (*t_ptr) {
|
if (*t_ptr) {
|
||||||
// TODO: Second CDQ instruction for abs() should not be there.
|
// TODO: Second CDQ instruction for abs() should not be there.
|
||||||
MxU32 shift = abs(offset) & 7;
|
MxU32 shift = abs(offset) & 7;
|
||||||
m_bitmask[offset / 8] |= (1 << abs(shift));
|
m_bitmask[offset / 8] |= (1 << abs((MxS32) shift));
|
||||||
}
|
}
|
||||||
t_ptr++;
|
t_ptr++;
|
||||||
offset++;
|
offset++;
|
||||||
@ -148,7 +151,7 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxBitmap &p_bitmap)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x100b2670
|
// OFFSET: LEGO1 0x100b2670
|
||||||
MxVideoPresenter::AlphaMask::AlphaMask(const MxVideoPresenter::AlphaMask &p_alpha)
|
MxVideoPresenter::AlphaMask::AlphaMask(const MxVideoPresenter::AlphaMask& p_alpha)
|
||||||
{
|
{
|
||||||
m_width = p_alpha.m_width;
|
m_width = p_alpha.m_width;
|
||||||
m_height = p_alpha.m_height;
|
m_height = p_alpha.m_height;
|
||||||
@ -158,7 +161,6 @@ MxVideoPresenter::AlphaMask::AlphaMask(const MxVideoPresenter::AlphaMask &p_alph
|
|||||||
memcpy(m_bitmask, p_alpha.m_bitmask, size);
|
memcpy(m_bitmask, p_alpha.m_bitmask, size);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x100b26d0
|
// OFFSET: LEGO1 0x100b26d0
|
||||||
MxVideoPresenter::AlphaMask::~AlphaMask()
|
MxVideoPresenter::AlphaMask::~AlphaMask()
|
||||||
{
|
{
|
||||||
@ -239,9 +241,9 @@ void MxVideoPresenter::VTable0x64()
|
|||||||
// OFFSET: LEGO1 0x100b2900
|
// OFFSET: LEGO1 0x100b2900
|
||||||
MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
|
MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
|
||||||
{
|
{
|
||||||
MxDSAction *action = GetAction();
|
MxDSAction* action = GetAction();
|
||||||
if ((action == NULL) || (((action->GetFlags() & MxDSAction::Flag_Bit10) == 0) && !IsEnabled())
|
if ((action == NULL) || (((action->GetFlags() & MxDSAction::Flag_Bit10) == 0) && !IsEnabled()) ||
|
||||||
|| (!m_bitmap && !m_alpha))
|
(!m_bitmap && !m_alpha))
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
if (m_bitmap)
|
if (m_bitmap)
|
||||||
@ -258,7 +260,7 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
|
|||||||
if (p_x < min_x || p_x >= max_x || p_y < min_y || p_y >= max_y)
|
if (p_x < min_x || p_x >= max_x || p_y < min_y || p_y >= max_y)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
MxU8 *pixel;
|
MxU8* pixel;
|
||||||
|
|
||||||
MxLong biCompression = m_bitmap->GetBmiHeader()->biCompression;
|
MxLong biCompression = m_bitmap->GetBmiHeader()->biCompression;
|
||||||
MxLong height = m_bitmap->GetBmiHeight();
|
MxLong height = m_bitmap->GetBmiHeight();
|
||||||
@ -272,14 +274,17 @@ MxBool MxVideoPresenter::IsHit(MxS32 p_x, MxS32 p_y)
|
|||||||
if (biCompression == BI_RGB) {
|
if (biCompression == BI_RGB) {
|
||||||
if (biCompression == BI_RGB_TOPDOWN || height < 0) {
|
if (biCompression == BI_RGB_TOPDOWN || height < 0) {
|
||||||
seek_row = p_y - GetLocationY();
|
seek_row = p_y - GetLocationY();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
height = height > 0 ? height : -height;
|
height = height > 0 ? height : -height;
|
||||||
seek_row = height - p_y - 1 + GetLocationY();
|
seek_row = height - p_y - 1 + GetLocationY();
|
||||||
}
|
}
|
||||||
pixel = m_bitmap->GetBmiStride() * seek_row + m_bitmap->GetBitmapData() - GetLocationX() + p_x;
|
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();
|
pixel = m_bitmap->GetBitmapData();
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
height = height > 0 ? height : -height;
|
height = height > 0 ? height : -height;
|
||||||
height--;
|
height--;
|
||||||
pixel = m_bitmap->GetBmiStride() * height + m_bitmap->GetBitmapData();
|
pixel = m_bitmap->GetBmiStride() * height + m_bitmap->GetBitmapData();
|
||||||
|
|||||||
@ -1,31 +1,26 @@
|
|||||||
#ifndef MXVIDEOPRESENTER_H
|
#ifndef MXVIDEOPRESENTER_H
|
||||||
#define MXVIDEOPRESENTER_H
|
#define MXVIDEOPRESENTER_H
|
||||||
|
|
||||||
#include "mxmediapresenter.h"
|
|
||||||
#include "mxbitmap.h"
|
|
||||||
|
|
||||||
#include "decomp.h"
|
#include "decomp.h"
|
||||||
|
#include "mxbitmap.h"
|
||||||
|
#include "mxmediapresenter.h"
|
||||||
|
|
||||||
// VTABLE 0x100d4be8
|
// VTABLE 0x100d4be8
|
||||||
class MxVideoPresenter : public MxMediaPresenter
|
class MxVideoPresenter : public MxMediaPresenter {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
MxVideoPresenter()
|
MxVideoPresenter() { Init(); }
|
||||||
{
|
|
||||||
Init();
|
|
||||||
}
|
|
||||||
|
|
||||||
virtual ~MxVideoPresenter() override; // vtable+0x0
|
virtual ~MxVideoPresenter() override; // vtable+0x0
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x1000c820
|
// OFFSET: LEGO1 0x1000c820
|
||||||
inline virtual const char *ClassName() const override // vtable+0x0c
|
inline virtual const char* ClassName() const override // vtable+0x0c
|
||||||
{
|
{
|
||||||
// 0x100f0760
|
// 0x100f0760
|
||||||
return "MxVideoPresenter";
|
return "MxVideoPresenter";
|
||||||
}
|
}
|
||||||
|
|
||||||
// OFFSET: LEGO1 0x1000c830
|
// OFFSET: LEGO1 0x1000c830
|
||||||
inline virtual MxBool IsA(const char *name) const override // vtable+0x10
|
inline virtual MxBool IsA(const char* name) const override // vtable+0x10
|
||||||
{
|
{
|
||||||
return !strcmp(name, MxVideoPresenter::ClassName()) || MxMediaPresenter::IsA(name);
|
return !strcmp(name, MxVideoPresenter::ClassName()) || MxMediaPresenter::IsA(name);
|
||||||
}
|
}
|
||||||
@ -35,7 +30,7 @@ class MxVideoPresenter : public MxMediaPresenter
|
|||||||
|
|
||||||
virtual void Destroy() override; // vtable+0x38
|
virtual void Destroy() override; // vtable+0x38
|
||||||
|
|
||||||
virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) override; //vtable+0x50
|
virtual MxBool IsHit(MxS32 p_x, MxS32 p_y) override; // vtable+0x50
|
||||||
virtual void VTable0x5c(undefined4 p_unknown1); // vtable+0x5c
|
virtual void VTable0x5c(undefined4 p_unknown1); // vtable+0x5c
|
||||||
virtual void VTable0x60(); // vtable+0x60
|
virtual void VTable0x60(); // vtable+0x60
|
||||||
virtual void VTable0x64(); // vtable+0x64
|
virtual void VTable0x64(); // vtable+0x64
|
||||||
@ -50,19 +45,19 @@ class MxVideoPresenter : public MxMediaPresenter
|
|||||||
|
|
||||||
// SIZE 0xc
|
// SIZE 0xc
|
||||||
struct AlphaMask {
|
struct AlphaMask {
|
||||||
MxU8 *m_bitmask;
|
MxU8* m_bitmask;
|
||||||
MxU16 m_width;
|
MxU16 m_width;
|
||||||
MxU16 m_height;
|
MxU16 m_height;
|
||||||
|
|
||||||
AlphaMask(const MxBitmap &);
|
AlphaMask(const MxBitmap&);
|
||||||
AlphaMask(const AlphaMask &);
|
AlphaMask(const AlphaMask&);
|
||||||
virtual ~AlphaMask();
|
virtual ~AlphaMask();
|
||||||
|
|
||||||
MxS32 IsHit(MxU32 p_x, MxU32 p_y);
|
MxS32 IsHit(MxU32 p_x, MxU32 p_y);
|
||||||
};
|
};
|
||||||
|
|
||||||
MxBitmap *m_bitmap;
|
MxBitmap* m_bitmap;
|
||||||
AlphaMask *m_alpha;
|
AlphaMask* m_alpha;
|
||||||
LPDIRECTDRAWSURFACE m_unk58;
|
LPDIRECTDRAWSURFACE m_unk58;
|
||||||
undefined2 m_unk5c;
|
undefined2 m_unk5c;
|
||||||
unsigned char m_flags; // 0x5e
|
unsigned char m_flags; // 0x5e
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user