mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 08:24:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support building isle with modern MSVC + msys2 (#421)

Browse Source 
* cmake: detect older MSVC and define ENABLE_DECOMP_ASSERTS to enable decomp asserts

* Add /Zc:__cplusplus to define __cplusplus with c++ version number

* Silence deprecated CRT releated warnings

* LegoCameraController overrids some methods that are not defined in its parent(s)

* Tgl::Device::GetDrawnTriangleCount does not exist (FIXME: INCORRECT FIX -> Tgl::Device should be updated instead)

* Remove copy/pasted APP_ICON from lego1 resource.h header

* Implement empty ViewLODList::Dump method

* Also enable "compat mode" for newer MSVC compilers

* Only do decomp assertions when using older MSVC compilers

* msys2 mingw compat (cannot pass reference of rvalue)

* Fix msys2 mingw warning: declaration 'class Tgl::Group' does not declare anything

* Add FIXME comment to LEgo3DView::m_previousRenderTime

* LegoView1 is 16 bytes bigger then LegoView ==> 4 32-bit pointers

* include string.h for strlen

* Fix overrides

* Fix constness of method

* Fixes

* Formatting

* Add size assert for MxFrequencyMeter

* ci: build isle with msys2 + msvc on GitHub actions

* Set vcvars for msvc

* msys2 needs the msys2 shell

* Build in default shell

* isle is not 64-bit yet (I think)

* Print bitness

* Use amd64_x64 cross tools

* Minor updates

* Add more names

---------

Co-authored-by: Christian Semmler <mail@csemmler.com>
This commit is contained in:
Anonymous Maarten
2024-01-10 23:34:32 +01:00
committed by GitHub
parent 01f3168e71
commit b996fff6fa
20 changed files with 157 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
LEGO1/lego/legoomni/include/legocameracontroller.h
View File

@@ -29,14 +29,14 @@ public:
return !strcmp(p_name, ClassName()) || MxCore::IsA(p_name);
}
virtual void OnLButtonDown(MxPoint32 p_point) override; // vtable+0x30
virtual void OnLButtonUp(MxPoint32 p_point) override; // vtable+0x34
virtual void OnRButtonDown(MxPoint32 p_point) override; // vtable+0x38
virtual void OnRButtonUp(MxPoint32 p_point) override; // vtable+0x3c
virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point) override; // vtable+0x40
virtual MxResult Create(); // vtable+0x44
virtual void OnLButtonDown(MxPoint32 p_point); // vtable+0x30
virtual void OnLButtonUp(MxPoint32 p_point); // vtable+0x34
virtual void OnRButtonDown(MxPoint32 p_point); // vtable+0x38
virtual void OnRButtonUp(MxPoint32 p_point); // vtable+0x3c
virtual void OnMouseMove(MxU8 p_modifier, MxPoint32 p_point); // vtable+0x40
virtual MxResult Create(); // vtable+0x44
void SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up);
void SetWorldTransform(const Vector3Impl& p_at, const Vector3Impl& p_dir, const Vector3Impl& p_up);
void FUN_100123e0(Matrix4Data& p_transform, MxU32);
Vector3Data& FUN_10012740();
Vector3Data& FUN_100127f0();

16
LEGO1/lego/legoomni/include/legoentity.h
View File

@@ -32,12 +32,16 @@ public:
return !strcmp(p_name, LegoEntity::ClassName()) || MxEntity::IsA(p_name);
}
virtual MxResult Create(MxDSObject& p_dsObject); // vtable+0x18
virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c
virtual void ParseAction(char*); // vtable+0x20
virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24
virtual void SetWorldTransform(Vector3Impl& p_loc, Vector3Impl& p_dir, Vector3Impl& p_up); // vtable+0x28
virtual void ResetWorldTransform(MxBool p_inVehicle); // vtable+0x2c
virtual MxResult Create(MxDSObject& p_dsObject); // vtable+0x18
virtual void Destroy(MxBool p_fromDestructor); // vtable+0x1c
virtual void ParseAction(char*); // vtable+0x20
virtual void SetROI(LegoROI* p_roi, MxBool p_bool1, MxBool p_bool2); // vtable+0x24
virtual void SetWorldTransform(
const Vector3Impl& p_loc,
const Vector3Impl& p_dir,
const Vector3Impl& p_up
); // vtable+0x28
virtual void ResetWorldTransform(MxBool p_inVehicle); // vtable+0x2c
// FUNCTION: LEGO1 0x10001090
virtual void SetWorldSpeed(MxFloat p_worldSpeed) { m_worldSpeed = p_worldSpeed; } // vtable+0x30
virtual void VTable0x34(); // vtable+0x34

1
LEGO1/lego/legoomni/include/legopointofviewcontroller.h
View File

@@ -3,6 +3,7 @@
#include "decomp.h"
#include "mxcore.h"
#include "mxpoint32.h"
#include <windows.h>

7
LEGO1/lego/legoomni/src/common/legoactioncontrolpresenter.cpp
View File

@@ -39,7 +39,14 @@ void LegoActionControlPresenter::RepeatingTickle()
ParseExtra();
}
#ifdef COMPAT_MODE
{
MxAtomId atom(m_unk0x54.GetData(), LookupMode_LowerCase2);
InvokeAction(m_unk0x50, atom, m_unk0x64, NULL);
}
#else
InvokeAction(m_unk0x50, MxAtomId(m_unk0x54.GetData(), LookupMode_LowerCase2), m_unk0x64, NULL);
#endif
m_previousTickleStates |= 1 << (unsigned char) m_currentTickleState;
m_currentTickleState = TickleState_Done;
}

2
LEGO1/lego/legoomni/src/entity/legocameracontroller.cpp
View File

@@ -71,7 +71,7 @@ void LegoCameraController::OnMouseMove(MxU8 p_modifier, MxPoint32 p_point)
}
// FUNCTION: LEGO1 0x10012260
void LegoCameraController::SetWorldTransform(Vector3Impl& p_at, Vector3Impl& p_dir, Vector3Impl& p_up)
void LegoCameraController::SetWorldTransform(const Vector3Impl& p_at, const Vector3Impl& p_dir, const Vector3Impl& p_up)
{
CalcLocalTransform(p_at, p_dir, p_up, m_matrix1);
m_matrix2 = m_matrix1;

2
LEGO1/lego/legoomni/src/entity/legoentity.cpp
View File

@@ -36,7 +36,7 @@ void LegoEntity::ResetWorldTransform(MxBool p_inVehicle)
}
// STUB: LEGO1 0x10010790
void LegoEntity::SetWorldTransform(Vector3Impl& p_loc, Vector3Impl& p_dir, Vector3Impl& p_up)
void LegoEntity::SetWorldTransform(const Vector3Impl& p_loc, const Vector3Impl& p_dir, const Vector3Impl& p_up)
{
// TODO
}

1
LEGO1/lego/legoomni/src/video/legovideomanager.cpp
View File

@@ -10,6 +10,7 @@
DECOMP_SIZE_ASSERT(LegoVideoManager, 0x590);
DECOMP_SIZE_ASSERT(MxStopWatch, 0x18);
DECOMP_SIZE_ASSERT(MxFrequencyMeter, 0x20);
// FUNCTION: LEGO1 0x1007aa20
LegoVideoManager::LegoVideoManager()

8
LEGO1/lego/sources/3dmanager/lego3dmanager.h
View File

@@ -4,8 +4,12 @@
#include "assert.h"
#include "lego3dview.h"
class Tgl::Renderer;
class Tgl::Group;
namespace Tgl
{
class Renderer;
class Group;
} // namespace Tgl
class ViewROI;
// ??? for now

6
LEGO1/lego/sources/3dmanager/lego3dview.h
View File

@@ -36,10 +36,8 @@ public:
private:
ViewManager* m_pViewManager; // 0x88
double m_previousRenderTime; // 0x8c
ViewROI* m_pPointOfView; // 0x90
undefined m_unk0x94[0x0c]; // 0x94
ViewROI* m_pPointOfView; // 0x94
undefined m_unk0x98[0x0c]; // 0x98
};
// SYNTHETIC: LEGO1 0x100aaf10

6
LEGO1/lego/sources/3dmanager/legoview1.h
View File

@@ -2,9 +2,13 @@
#define _LegoView1_h
#include "compat.h"
#include "decomp.h"
#include "tglsurface.h"
class Tgl::Camera;
namespace Tgl
{
class Camera;
}
/////////////////////////////////////////////////////////////////////////////
// LegoView

5
LEGO1/lego/sources/3dmanager/tglsurface.cpp
View File

@@ -195,7 +195,12 @@ double TglSurface::Render()
#ifdef _DEBUG
{
#if 0
// FIXME: Tgl::Device::GetDrawnTriangleCount does not exist
unsigned long triangleCount = m_pDevice->GetDrawnTriangleCount();
#else
unsigned long triangleCount = 0;
#endif
m_triangleRateMeter.IncreaseOperationCount(triangleCount - m_triangleCount - 1);
m_triangleCount = triangleCount;

11
LEGO1/lego/sources/3dmanager/tglsurface.h
View File

@@ -4,10 +4,13 @@
#include "mxdirectx/mxstopwatch.h"
#include "tgl/tgl.h"
class Tgl::Renderer;
class Tgl::Device;
class Tgl::View;
class Tgl::Group;
namespace Tgl
{
class Renderer;
class Device;
class View;
class Group;
} // namespace Tgl
/////////////////////////////////////////////////////////////////////////////
// TglSurface