mirrors/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2025-10-23 00:14:22 +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

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