isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-02-03 13:41:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
Anonymous Maarten 2024-12-19 21:14:56 +01:00
parent b92e40a7f3
commit c3f3a8a01b
3 changed files with 124 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
LEGO1/lego/legoomni/include/legovideomanager.h
View File

@ -5,8 +5,8 @@
#include "legophonemelist.h" #include "legophonemelist.h"
#include "mxvideomanager.h" #include "mxvideomanager.h"
#include <ddraw.h>
#include <d3drm.h> #include <d3drm.h>
#include <ddraw.h>
class Lego3DManager; class Lego3DManager;
class LegoROI; class LegoROI;
@ -111,9 +111,9 @@ class LegoVideoManager : public MxVideoManager {
float m_camera_width_0x560; // 0x560 float m_camera_width_0x560; // 0x560
float m_camera_height_0x564; // 0x564 float m_camera_height_0x564; // 0x564
D3DVALUE m_fov_0x568; // 0x55c D3DVALUE m_fov_0x568; // 0x55c
IDirect3DRMFrame *m_camera_0x56c; // 0x56c IDirect3DRMFrame* m_camera_0x56c; // 0x56c
D3DRMPROJECTIONTYPE m_projection_0x570; // 0x570 D3DRMPROJECTIONTYPE m_projection_0x570; // 0x570
ViewportAppData *m_appdata_0x574; // 0x574 ViewportAppData* m_appdata_0x574; // 0x574
D3DRMRENDERQUALITY m_quality_0x578; // 0x578 D3DRMRENDERQUALITY m_quality_0x578; // 0x578
DWORD m_shades_0x57c; // 0x57c DWORD m_shades_0x57c; // 0x57c
D3DRMTEXTUREQUALITY m_texture_quality_0x580; // 0x580 D3DRMTEXTUREQUALITY m_texture_quality_0x580; // 0x580

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

@ -566,29 +566,37 @@ extern void ViewportDestroyCallback(IDirect3DRMObject* pObject, void* pArg);
// FUNCTION: LEGO1 0x1007c560 // FUNCTION: LEGO1 0x1007c560
int LegoVideoManager::EnableRMDevice() int LegoVideoManager::EnableRMDevice()
{ {
IDirect3DRMViewport *viewport; IDirect3DRMViewport* viewport;
if (!m_paused) { if (!m_paused) {
return -1; return -1;
} }
int result = -1; int result = -1;
TglImpl::DeviceImpl *device_impl = (TglImpl::DeviceImpl*)m_3dManager->GetLego3DView()->GetDevice(); TglImpl::DeviceImpl* device_impl = (TglImpl::DeviceImpl*) m_3dManager->GetLego3DView()->GetDevice();
IDirect3DRM2 *d3drm2 = ((TglImpl::RendererImpl*)m_renderer)->ImplementationData(); IDirect3DRM2* d3drm2 = ((TglImpl::RendererImpl*) m_renderer)->ImplementationData();
IDirect3D2 *d3d2 = m_direct3d->Direct3D(); IDirect3D2* d3d2 = m_direct3d->Direct3D();
IDirect3DDevice2 *d3d_dev2 = m_direct3d->Direct3DDevice(); IDirect3DDevice2* d3d_dev2 = m_direct3d->Direct3DDevice();
m_direct3d->RestoreSurfaces(); m_direct3d->RestoreSurfaces();
IDirect3DRMDevice2 *d3drm_dev2 = NULL; IDirect3DRMDevice2* d3drm_dev2 = NULL;
HRESULT res = d3drm2->CreateDeviceFromD3D(d3d2, d3d_dev2, &d3drm_dev2); HRESULT res = d3drm2->CreateDeviceFromD3D(d3d2, d3d_dev2, &d3drm_dev2);
if (res == D3DRM_OK) { if (res == D3DRM_OK) {
viewport = NULL; viewport = NULL;
device_impl->SetImplementationData(d3drm_dev2); device_impl->SetImplementationData(d3drm_dev2);
res = d3drm2->CreateViewport(d3drm_dev2, m_camera_0x56c, 0, 0, m_camera_width_0x560, m_camera_height_0x564, &viewport); res = d3drm2->CreateViewport(
d3drm_dev2,
m_camera_0x56c,
0,
0,
m_camera_width_0x560,
m_camera_height_0x564,
&viewport
);
if (res == D3DRM_OK) { if (res == D3DRM_OK) {
viewport->SetBack(m_back_0x558); viewport->SetBack(m_back_0x558);
viewport->SetFront(m_front_0x55c); viewport->SetFront(m_front_0x55c);
viewport->SetField(m_fov_0x568); viewport->SetField(m_fov_0x568);
viewport->SetCamera(m_camera_0x56c); viewport->SetCamera(m_camera_0x56c);
viewport->SetProjection(m_projection_0x570); viewport->SetProjection(m_projection_0x570);
viewport->SetAppData((DWORD)m_appdata_0x574); viewport->SetAppData((DWORD) m_appdata_0x574);
d3drm_dev2->SetQuality(m_quality_0x578); d3drm_dev2->SetQuality(m_quality_0x578);
d3drm_dev2->SetShades(m_shades_0x57c); d3drm_dev2->SetShades(m_shades_0x57c);
d3drm_dev2->SetTextureQuality(m_texture_quality_0x580); d3drm_dev2->SetTextureQuality(m_texture_quality_0x580);
@ -597,7 +605,7 @@ int LegoVideoManager::EnableRMDevice()
d3drm_dev2->SetBufferCount(m_buffer_count_0x58c); d3drm_dev2->SetBufferCount(m_buffer_count_0x58c);
m_camera_0x56c->Release(); m_camera_0x56c->Release();
if (viewport->AddDestroyCallback(ViewportDestroyCallback, m_appdata_0x574) == D3DRM_OK) { if (viewport->AddDestroyCallback(ViewportDestroyCallback, m_appdata_0x574) == D3DRM_OK) {
((TglImpl::ViewImpl*)m_3dManager->GetLego3DView()->GetView())->SetImplementationData(viewport); ((TglImpl::ViewImpl*) m_3dManager->GetLego3DView()->GetView())->SetImplementationData(viewport);
m_paused = 0; m_paused = 0;
result = 0; result = 0;
} }
@ -615,10 +623,10 @@ int LegoVideoManager::DisableRMDevice()
IDirect3DRMDevice2* d3drm_dev2 = IDirect3DRMDevice2* d3drm_dev2 =
((TglImpl::DeviceImpl*) m_3dManager->GetLego3DView()->GetDevice())->ImplementationData(); ((TglImpl::DeviceImpl*) m_3dManager->GetLego3DView()->GetDevice())->ImplementationData();
if (d3drm_dev2 != NULL) { if (d3drm_dev2 != NULL) {
IDirect3DRMViewportArray *viewport_array = NULL; IDirect3DRMViewportArray* viewport_array = NULL;
if (d3drm_dev2->GetViewports(&viewport_array) == D3DRM_OK && viewport_array != NULL) { if (d3drm_dev2->GetViewports(&viewport_array) == D3DRM_OK && viewport_array != NULL) {
if (viewport_array->GetSize() == 1) { if (viewport_array->GetSize() == 1) {
IDirect3DRMViewport *viewport = NULL; IDirect3DRMViewport* viewport = NULL;
if (viewport_array->GetElement(0, &viewport) == D3DRM_OK) { if (viewport_array->GetElement(0, &viewport) == D3DRM_OK) {
m_back_0x558 = viewport->GetBack(); m_back_0x558 = viewport->GetBack();
m_front_0x55c = viewport->GetFront(); m_front_0x55c = viewport->GetFront();
@ -627,7 +635,7 @@ int LegoVideoManager::DisableRMDevice()
m_fov_0x568 = viewport->GetField(); m_fov_0x568 = viewport->GetField();
viewport->GetCamera(&m_camera_0x56c); viewport->GetCamera(&m_camera_0x56c);
m_projection_0x570 = viewport->GetProjection(); m_projection_0x570 = viewport->GetProjection();
m_appdata_0x574 = (ViewportAppData *) viewport->GetAppData(); m_appdata_0x574 = (ViewportAppData*) viewport->GetAppData();
viewport_array->Release(); viewport_array->Release();
viewport->Release(); viewport->Release();
viewport->DeleteDestroyCallback(ViewportDestroyCallback, this->m_appdata_0x574); viewport->DeleteDestroyCallback(ViewportDestroyCallback, this->m_appdata_0x574);
@ -635,7 +643,8 @@ int LegoVideoManager::DisableRMDevice()
m_paused = 1; m_paused = 1;
m_direct3d->Direct3D()->AddRef(); m_direct3d->Direct3D()->AddRef();
m_direct3d->Direct3DDevice()->AddRef(); m_direct3d->Direct3DDevice()->AddRef();
} else { }
else {
viewport_array->Release(); viewport_array->Release();
} }
} }
@ -650,7 +659,8 @@ int LegoVideoManager::DisableRMDevice()
} }
if (m_paused) { if (m_paused) {
return 0; return 0;
} else { }
else {
return -1; return -1;
} }
} }

8
LEGO1/tgl/d3drm/texture.cpp
View File

@ -86,7 +86,8 @@ void TglD3DRMIMAGE::Destroy()
delete m_image.palette; delete m_image.palette;
} }
static inline int IsPowerOfTwo(int v) { inline static int IsPowerOfTwo(int v)
{
int m = 0; int m = 0;
while (v > 2 && m == 0) { while (v > 2 && m == 0) {
m = v % 2; m = v % 2;
@ -111,8 +112,9 @@ Result TglD3DRMIMAGE::CreateBuffer(int width, int height, int depth, void* pBuff
} }
if (useBuffer) { if (useBuffer) {
m_texelsAllocatedByClient = 1; m_texelsAllocatedByClient = 1;
m_image.buffer1 = (char *)pBuffer; m_image.buffer1 = (char*) pBuffer;
} else { }
else {
m_image.buffer1 = new char[width * height]; m_image.buffer1 = new char[width * height];
memcpy(m_image.buffer1, pBuffer, width * height); memcpy(m_image.buffer1, pBuffer, width * height);
m_texelsAllocatedByClient = 0; m_texelsAllocatedByClient = 0;