isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2026-01-11 18:41:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add flat shading to Appearance (#258)

Browse Source
This commit is contained in:
Anders Jenbo 2025-06-08 22:40:14 +02:00 committed by GitHub
parent f75bec997b
commit d32c30492f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
miniwin/src/d3drm/backends/opengl15/renderer.cpp
View File

@ -333,6 +333,10 @@ void OpenGL15Renderer::SubmitDraw(
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
} }
if (appearance.flat) {
glShadeModel(GL_FLAT);
}
float shininess = appearance.shininess; float shininess = appearance.shininess;
glMaterialf(GL_FRONT, GL_SHININESS, shininess); glMaterialf(GL_FRONT, GL_SHININESS, shininess);
if (shininess != 0.0f) { if (shininess != 0.0f) {

6
miniwin/src/d3drm/d3drmviewport.cpp
View File

@ -288,6 +288,7 @@ void Direct3DRMViewportImpl::CollectMeshesFromFrame(
D3DCOLOR color = mesh->GetGroupColor(gi); D3DCOLOR color = mesh->GetGroupColor(gi);
D3DRMRENDERQUALITY quality = mesh->GetGroupQuality(gi); D3DRMRENDERQUALITY quality = mesh->GetGroupQuality(gi);
bool flat = quality == D3DRMRENDER_FLAT || quality == D3DRMRENDER_UNLITFLAT;
IDirect3DRMTexture* texture = nullptr; IDirect3DRMTexture* texture = nullptr;
mesh->GetGroupTexture(gi, &texture); mesh->GetGroupTexture(gi, &texture);
@ -307,7 +308,7 @@ void Direct3DRMViewportImpl::CollectMeshesFromFrame(
for (DWORD fi = 0; fi < faceCount; ++fi) { for (DWORD fi = 0; fi < faceCount; ++fi) {
D3DVECTOR norm; D3DVECTOR norm;
if (quality == D3DRMRENDER_FLAT || quality == D3DRMRENDER_UNLITFLAT) { if (flat) {
D3DRMVERTEX& v0 = d3dVerts[faces[fi * vpf + 0]]; D3DRMVERTEX& v0 = d3dVerts[faces[fi * vpf + 0]];
D3DRMVERTEX& v1 = d3dVerts[faces[fi * vpf + 1]]; D3DRMVERTEX& v1 = d3dVerts[faces[fi * vpf + 1]];
D3DRMVERTEX& v2 = d3dVerts[faces[fi * vpf + 2]]; D3DRMVERTEX& v2 = d3dVerts[faces[fi * vpf + 2]];
@ -334,7 +335,8 @@ void Direct3DRMViewportImpl::CollectMeshesFromFrame(
static_cast<Uint8>((color >> 0) & 0xFF), static_cast<Uint8>((color >> 0) & 0xFF),
static_cast<Uint8>((color >> 24) & 0xFF)}, static_cast<Uint8>((color >> 24) & 0xFF)},
shininess, shininess,
textureId} textureId,
flat}
); );
} }
mesh->Release(); mesh->Release();

1
miniwin/src/internal/d3drmrenderer.h
View File

@ -22,6 +22,7 @@ struct Appearance {
SDL_Color color; SDL_Color color;
float shininess; float shininess;
Uint32 textureId; Uint32 textureId;
bool flat;
}; };
struct FColor { struct FColor {