isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-21 07:11:16 +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

10
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;
@ -108,12 +108,12 @@ class LegoVideoManager : public MxVideoManager {
undefined m_pad0x556[0x2]; // 0x556 undefined m_pad0x556[0x2]; // 0x556
D3DVALUE m_back_0x558; // 0x558 D3DVALUE m_back_0x558; // 0x558
D3DVALUE m_front_0x55c; // 0x55c D3DVALUE m_front_0x55c; // 0x55c
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

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

@ -566,93 +566,103 @@ 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(
if (res == D3DRM_OK) { d3drm_dev2,
viewport->SetBack(m_back_0x558); m_camera_0x56c,
viewport->SetFront(m_front_0x55c); 0,
viewport->SetField(m_fov_0x568); 0,
viewport->SetCamera(m_camera_0x56c); m_camera_width_0x560,
viewport->SetProjection(m_projection_0x570); m_camera_height_0x564,
viewport->SetAppData((DWORD)m_appdata_0x574); &viewport
d3drm_dev2->SetQuality(m_quality_0x578); );
d3drm_dev2->SetShades(m_shades_0x57c); if (res == D3DRM_OK) {
d3drm_dev2->SetTextureQuality(m_texture_quality_0x580); viewport->SetBack(m_back_0x558);
d3drm_dev2->SetRenderMode(m_rendermode_0x584); viewport->SetFront(m_front_0x55c);
d3drm_dev2->SetDither(m_dither_0x588); viewport->SetField(m_fov_0x568);
d3drm_dev2->SetBufferCount(m_buffer_count_0x58c); viewport->SetCamera(m_camera_0x56c);
m_camera_0x56c->Release(); viewport->SetProjection(m_projection_0x570);
if (viewport->AddDestroyCallback(ViewportDestroyCallback, m_appdata_0x574) == D3DRM_OK) { viewport->SetAppData((DWORD) m_appdata_0x574);
((TglImpl::ViewImpl*)m_3dManager->GetLego3DView()->GetView())->SetImplementationData(viewport); d3drm_dev2->SetQuality(m_quality_0x578);
m_paused = 0; d3drm_dev2->SetShades(m_shades_0x57c);
result = 0; d3drm_dev2->SetTextureQuality(m_texture_quality_0x580);
} d3drm_dev2->SetRenderMode(m_rendermode_0x584);
} d3drm_dev2->SetDither(m_dither_0x588);
} d3drm_dev2->SetBufferCount(m_buffer_count_0x58c);
return result; m_camera_0x56c->Release();
if (viewport->AddDestroyCallback(ViewportDestroyCallback, m_appdata_0x574) == D3DRM_OK) {
((TglImpl::ViewImpl*) m_3dManager->GetLego3DView()->GetView())->SetImplementationData(viewport);
m_paused = 0;
result = 0;
}
}
}
return result;
} }
// FUNCTION: LEGO1 0x1007c740 // FUNCTION: LEGO1 0x1007c740
int LegoVideoManager::DisableRMDevice() int LegoVideoManager::DisableRMDevice()
{ {
if (m_paused) { if (m_paused) {
return -1; return -1;
} }
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();
m_camera_width_0x560 = viewport->GetWidth(); m_camera_width_0x560 = viewport->GetWidth();
m_camera_height_0x564 = viewport->GetHeight(); m_camera_height_0x564 = viewport->GetHeight();
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);
viewport->Release(); viewport->Release();
m_paused = 1; m_paused = 1;
m_direct3d->Direct3D()->AddRef(); m_direct3d->Direct3D()->AddRef();
m_direct3d->Direct3DDevice()->AddRef(); m_direct3d->Direct3DDevice()->AddRef();
} else { }
viewport_array->Release(); else {
} viewport_array->Release();
} }
} }
m_quality_0x578 = d3drm_dev2->GetQuality(); }
m_shades_0x57c = d3drm_dev2->GetShades(); m_quality_0x578 = d3drm_dev2->GetQuality();
m_texture_quality_0x580 = d3drm_dev2->GetTextureQuality(); m_shades_0x57c = d3drm_dev2->GetShades();
m_rendermode_0x584 = d3drm_dev2->GetRenderMode(); m_texture_quality_0x580 = d3drm_dev2->GetTextureQuality();
m_dither_0x588 = d3drm_dev2->GetDither(); m_rendermode_0x584 = d3drm_dev2->GetRenderMode();
m_buffer_count_0x58c = d3drm_dev2->GetBufferCount(); m_dither_0x588 = d3drm_dev2->GetDither();
d3drm_dev2->Release(); m_buffer_count_0x58c = d3drm_dev2->GetBufferCount();
} d3drm_dev2->Release();
if (m_paused) { }
return 0; if (m_paused) {
} else { return 0;
return -1; }
} else {
return -1;
}
} }
// FUNCTION: LEGO1 0x1007c930 // FUNCTION: LEGO1 0x1007c930

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

@ -86,38 +86,40 @@ 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; {
while (v > 2 && m == 0) { int m = 0;
m = v % 2; while (v > 2 && m == 0) {
v /= 2; m = v % 2;
} v /= 2;
return v == 2 && m == 0; }
return v == 2 && m == 0;
} }
// FUNCTION: LEGO1 0x100a13e0 // FUNCTION: LEGO1 0x100a13e0
Result TglD3DRMIMAGE::CreateBuffer(int width, int height, int depth, void* pBuffer, int useBuffer) Result TglD3DRMIMAGE::CreateBuffer(int width, int height, int depth, void* pBuffer, int useBuffer)
{ {
if (!(IsPowerOfTwo(width) && IsPowerOfTwo(height) && width % 4 == 0)) { if (!(IsPowerOfTwo(width) && IsPowerOfTwo(height) && width % 4 == 0)) {
return Error; return Error;
} }
m_image.width = width; m_image.width = width;
m_image.height = height; m_image.height = height;
m_image.depth = depth; m_image.depth = depth;
m_image.bytes_per_line = width; m_image.bytes_per_line = width;
if (!m_texelsAllocatedByClient) { if (!m_texelsAllocatedByClient) {
delete[] m_image.buffer1; delete[] m_image.buffer1;
m_image.buffer1 = NULL; m_image.buffer1 = NULL;
} }
if (useBuffer) { if (useBuffer) {
m_texelsAllocatedByClient = 1; m_texelsAllocatedByClient = 1;
m_image.buffer1 = (char *)pBuffer; m_image.buffer1 = (char*) pBuffer;
} else { }
m_image.buffer1 = new char[width * height]; else {
memcpy(m_image.buffer1, pBuffer, width * height); m_image.buffer1 = new char[width * height];
m_texelsAllocatedByClient = 0; memcpy(m_image.buffer1, pBuffer, width * height);
} m_texelsAllocatedByClient = 0;
return Success; }
return Success;
} }
// FUNCTION: LEGO1 0x100a1510 // FUNCTION: LEGO1 0x100a1510