Christian Semmler
b06f05ccf9
Merge remote-tracking branch 'isle/master'
2025-10-18 10:23:53 -07:00
jonschz
e355b55907
Fix some library globals ( #1692 )
...
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2025-10-09 22:28:38 +02:00
Anders Jenbo
b65284a7a0
Move 2D drawing and upscaling to the renderer ( #348 )
2025-06-25 19:45:26 +02:00
Christian Semmler
a9505f435a
Fix clang-format
2025-06-24 09:11:08 -07:00
Christian Semmler
ae632c2367
Merge: update meshbuilder.cpp
2025-06-24 09:08:16 -07:00
Christian Semmler
69b5f17599
Merge remote-tracking branch 'isle/master'
2025-06-24 09:05:44 -07:00
MS
1701117e6f
Improve MeshBuilderImpl::CreateMesh ( #1584 )
...
* CreateMesh
* Effective match for Clone()
2025-06-23 10:24:13 -04:00
Christian Semmler
a1ec97ac6e
Merge remote-tracking branch 'isle/master'
2025-05-29 08:50:07 -07:00
Anders Jenbo
ef7499bdb9
Restructure miniwin and add support for 3D backends
2025-05-29 04:07:53 +02:00
MS
5646d017f1
RendererImpl, CameraImpl, LightImpl ( #1525 )
2025-05-28 22:04:01 -04:00
Christian Semmler
5fc3bfb921
Change to unsigned int
2025-05-26 09:52:18 -07:00
Christian Semmler
70633de3f6
Merge remote-tracking branch 'isle/master' into mergeii
2025-05-26 09:49:34 -07:00
MS
b28fcae005
Match TextureImpl functions ( #1521 )
...
* TextureImpl functions
* TglD3DRMIMAGE functions
2025-05-26 18:46:22 +02:00
MS
5ad885f958
TglImpl::DeviceImpl functions ( #1519 )
2025-05-25 11:37:16 -04:00
Anonymous Maarten
bdbd0e31d7
Add D3DRMFrame parent <-> child relation ( #161 )
...
* Add D3DRMFrame parent <-> child relation
* Apply suggestions from code review
2025-05-24 22:18:53 -07:00
Christian Semmler
390fef9f9a
Fix isledecomp/isle merge ( #150 )
...
* Fix isledecomp/isle merge
* Use constant
2025-05-23 18:48:29 +02:00
Christian Semmler
a75e3a4377
Merge remote-tracking branch 'isle/master'
2025-05-23 09:34:57 -07:00
MS
4e49712391
Match Tgl MeshImpl and GroupImpl functions ( #1514 )
2025-05-23 12:27:41 -04:00
Christian Semmler
23182618cc
Merge remote-tracking branch 'isle/master'
2025-05-19 17:16:56 -07:00
Anonymous Maarten
0b9c1756c7
Fix inclusion guards of 3 files ( #1509 )
...
* Fix inclusion guards of 3 files
* Apply suggestions from code review
Co-authored-by: Christian Semmler <mail@csemmler.com>
---------
Co-authored-by: Christian Semmler <mail@csemmler.com>
2025-05-20 02:15:30 +02:00
Anders Jenbo
70536c50bd
Fix remaning UBSAN issues ( #115 )
2025-05-19 19:02:24 +02:00
Anders Jenbo
4e2df63d9c
Get the game working on 64bit systems ( #113 )
...
* Use int instead of long
* Move static_asserts to the bottom
---------
Co-authored-by: Anonymous Maarten <anonymous.maarten@gmail.com>
2025-05-19 17:56:12 +02:00
Christian Semmler
c8b1e507c7
Merge remote-tracking branch 'isle/master'
2025-05-17 16:20:08 -07:00
Anders Jenbo
bc920a295b
Correct assert in view.cpp ( #1500 )
2025-05-17 13:26:01 -07:00
Anders Jenbo
db7781473a
miniwin: Clean up headers and make bitflags and enums strict ( #90 )
2025-05-14 19:51:41 -07:00
Anonymous Maarten
537cde485a
Remove d3drm-wine ( #75 )
...
* remove d3drm-wine
* Update miniwin/miniwin/src/miniwin_ddraw.cpp
Co-authored-by: Anders Jenbo <anders@jenbo.dk>
* Run clang-format
* Update miniwin/miniwin/src/miniwin.cpp
Co-authored-by: Anders Jenbo <anders@jenbo.dk>
* Update miniwin/miniwin/src/miniwin_ddraw.cpp
Co-authored-by: Anders Jenbo <anders@jenbo.dk>
---------
Co-authored-by: Anders Jenbo <anders@jenbo.dk>
2025-05-13 19:18:20 +00:00
Anders Jenbo
08b2dab108
Make things build on Linux ( #69 )
2025-05-12 23:10:53 +02:00
Christian Semmler
7670f89f03
Merge remote-tracking branch 'isle/master' into mergeisle6
2025-04-26 09:16:06 -07:00
MS
2fef2858c9
Add all TglImpl::ImplementationData methods ( #1436 )
...
* ImplementationData methods and typedefs
* RendererImpl::CreateView
* RendererImpl::CreateMeshBuilder
* DeepClone
* CreateCamera and CreateTexture
* CreateDevice
* Disable static var annotation
2025-04-19 10:30:47 -04:00
MS
451fd63eee
Match a few more Tgl functions ( #1435 )
...
* RendererImpl::CreateLight
* Swap addrs for LightImpl and MeshBuilderImpl
* SetShadingModel functions
2025-04-17 17:19:54 -04:00
MS
544372759e
Add abstraction functions to TglImpl::ViewImpl ( #1434 )
...
* Add Destroy methods to TglImpl
* Test one abstraction
* More ViewImpl abstractions
* Finish ViewImpl
2025-04-15 16:30:56 -04:00
MS
0bc31450a4
Some beta addrs for Tgl and TglImpl ( #1433 )
2025-04-14 18:29:38 -04:00
Christian Semmler
e568740208
Merge remote-tracking branch 'isle/master'
2024-12-29 14:46:00 -07:00
Anonymous Maarten
c77b5869f5
Fix warnings triggered by isle-portable ( #1304 )
...
* Replace computed constant with more readable computed constants
* LegoAnim::GetActorUnknown0x04 returns a number, not a pointer
* Add macro for creating RGB555 colors
* Texture pixel data is passed through as const data
* Compare palette index against 0 instead of NULL pointer
* warning: deleting 'void*' is undefined [-Wdelete-incomplete] warning
Some DirectX sdk's declars D3DRMIMAGE::buffer1 and D3DRMIMAGE::buffer2
as a void pointer.
* Don't use floats
* Fix wrong op
---------
Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-12-29 22:45:00 +01:00
Christian Semmler
b0a4d0e06b
Merge remote-tracking branch 'isle/master' into isle-merge3
2024-12-29 09:21:06 -07:00
Christian Semmler
3140ba73eb
Match TglD3DRMIMAGE::FillRowsOfTexture ( #1300 )
2024-12-28 19:10:02 +01:00
Christian Semmler
7d90befd05
Merge remote-tracking branch 'isle/master' into merge-isle-2
2024-12-27 10:48:38 -07:00
jonschz
70baf8cecc
Fix float constants and conversions ( #1279 )
...
* Fix legoplants warnings, add BETA10 references
* Fix warnings in various header files, improve match
* Fix floats in legoactors.cpp
* Fix `legolocations.cpp`
* fix typo
---------
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-12-25 21:01:00 +01:00
Christian Semmler
e73f60e2c6
merge from isle/master
2024-12-20 11:54:06 -07:00
Anonymous Maarten
581ba0f5ae
Implement GroupImpl::Bounds ( #1246 )
...
* Implement/match DeviceImpl::HandleActivate
* Implement/match DeviceImpl::HandlePaint
* Implement GroupImpl::Unknown (71.63%)
* Fixes
---------
Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-12-20 19:48:31 +01:00
Anonymous Maarten
b338a66a77
Implement GroupImpl::RemoveAll ( #1244 )
...
* Implement GroupImpl::RemoveAll (81.30%)
* Minor improvement
* Add 2 to total function count
---------
Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-12-20 17:50:33 +01:00
Anonymous Maarten
a8729dfef6
glD3DRMIMAGE::CreateBuffer, LegoVideoManager::EnableRMDevice and LegoVideoManager::DisableRMDevice ( #1241 )
...
* Implement TglD3DRMIMAGE::CreateBuffer (ecx/edi are swapped)
* Implement LegoVideoManager::EnableRMDevice
* Implement LegoVideoManager::DisableRMDevice
* clang-format
* Match `LegoVideoManager::EnableRMDevice`
* Remove padding
* Fix naming
---------
Co-authored-by: Christian Semmler <mail@csemmler.com>
2024-12-19 22:52:33 +01:00
Christian Semmler
5ade193261
merge from isle/master
2024-11-29 15:27:01 -07:00
jonschz
362551e279
Clean up unused annotations to reduce errors ( #1177 )
...
Co-authored-by: jonschz <jonschz@users.noreply.github.com>
2024-11-29 22:31:37 +01:00
Christian Semmler
5f0575124f
Merge from isle/master
2024-11-24 08:01:05 -07:00
Christian Semmler
3383ae646f
Implement/match LegoBuildingManager::Tickle ( #1156 )
2024-11-15 22:51:46 +01:00
Christian Semmler
49a304d0b9
merge
2024-07-04 16:09:48 -07:00
Christian Semmler
bee101b1f4
Add clang-tidy readability-redundant-inline-specifier ( #1060 )
...
* Add clang-tidy readability-redundant-inline-specifier
* fix
* Update CONTRIBUTING.md
* format
* fix
2024-07-05 01:06:32 +02:00
Anonymous Maarten
196259c6c9
Parse cli arguments + log with SDL_Log ( #30 )
...
* cmake: copy DLL dependencies to output path
This also copies SDL3.dll from an external path when using system
dependencies.
* Only include <SDL3/SDL.h>
* isle: parse cli argument (--ini for custom ini path)
* Use SDL_CreateWIndowWithProperties to create SDL window
Less branching => Clearer code
* Log mxdirectx failure using SDL_Log + E_NOINTERFACE
* Fix d3drm32.def for msvc
* Define D3DRM_WINE when using d3drm from wine
* Ignore failed assertions from d3drm unimplemented functions
* inparser will/should create libiniparser.lib for static libraries and iniparser.lib for a shared library
2024-06-26 11:24:40 -07:00
Anonymous Maarten
8113a17167
Backports of isle-portable x64 fixes ( #1044 )
...
* Introduce LPD3DRM_APPDATA typedef for setting d3drm appdata
* Fix warning about assigning const string literals to variable char pointers
* Don't cast pointers to integers on non-32-bit architectures
* memset 2nd argument is int
* Assume cpuid is available on x86_64, needs testing on i386 and unavailable on anything else
* Store HFILE in its own member variable
2024-06-25 17:56:30 +02:00