mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-06-06 09:04:53 +02:00
Code Issues Releases Wiki Activity

SW renderer lighting

Browse Source
This commit is contained in:
XProger 2019-10-15 06:12:55 +03:00
parent ba71b27f8e
commit 6bb66936b5
3 changed files with 75 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game.h
View File

@ -89,6 +89,13 @@ void loadSettings(Stream *stream, void *userData) {
Core::settings.version = SETTINGS_VERSION;
Core::setVSync(Core::settings.detail.vsync != 0);
#if defined(_GAPI_SW) || defined(_GAPI_GU)
Core::settings.detail.filter = Core::Settings::LOW;
Core::settings.detail.lighting = Core::Settings::LOW;
Core::settings.detail.shadows = Core::Settings::LOW;
Core::settings.detail.water = Core::Settings::LOW;
#endif
shaderCache = new ShaderCache();
Game::startLevel((Stream*)userData);
}

79
src/gapi/sw.h
View File

@ -37,7 +37,9 @@ namespace GAPI {
#endif
typedef uint16 DepthSW;
uint8 *swLightmap; // 32 * 256
uint8 *swLightmap;
uint8 swLightmapNone[32 * 256];
uint8 swLightmapShade[32 * 256];
ColorSW *swPalette;
ColorSW swPaletteColor[256];
ColorSW swPaletteWater[256];
@ -46,6 +48,13 @@ namespace GAPI {
Tile8 *curTile;
uint8 ambient;
int32 lightsCount;
struct LightSW {
uint32 intensity;
vec3 pos;
float radius;
} lights[MAX_LIGHTS], lightsRel[MAX_LIGHTS];
// Shader
struct Shader {
@ -161,9 +170,6 @@ namespace GAPI {
DepthSW *swDepth;
short4 swClipRect;
mat4 swMatrix;
vec2 swScale;
struct VertexSW {
int32 x, y, z, w;
int32 u, v, l;
@ -277,7 +283,7 @@ namespace GAPI {
void clear(bool color, bool depth) {
if (color) {
// memset(swColor, 0x00, Core::width * Core::height * sizeof(ColorSW));
memset(swColor, 0x00, Core::width * Core::height * sizeof(ColorSW));
}
if (depth) {
@ -311,12 +317,18 @@ namespace GAPI {
void setViewProj(const mat4 &mView, const mat4 &mProj) {}
void updateLights(vec4 *lightPos, vec4 *lightColor, int count) {
int lightsCount = 0;
ambient = clamp(int32(active.material.y * 255), 0, 255);
for (int i = 0; i < MAX_LIGHTS; i++) {
// TODO
lightsCount = 0;
for (int i = 0; i < count; i++) {
if (lightColor[i].w >= 1.0f) {
continue;
}
LightSW &light = lights[lightsCount++];
vec4 &c = lightColor[i];
light.intensity = uint32(((c.x + c.y + c.z) / 3.0f) * 255.0f);
light.pos = lightPos[i].xyz();
light.radius = lightColor[i].w;
}
}
@ -558,12 +570,32 @@ namespace GAPI {
if (o->y != b->y) drawPart(*p, *o, *b, *b);
}
void applyLighting(VertexSW &result, const Vertex &vertex) {
vec3 coord = vec3(vertex.coord);
vec3 normal = vec3(vertex.normal).normal();
float lighting = 0.0f;
for (int i = 0; i < lightsCount; i++) {
LightSW &light = lightsRel[i];
vec3 dir = (light.pos - coord) * light.radius;
float att = dir.length2();
float lum = normal.dot(dir / sqrtf(att));
lighting += (max(0.0f, lum) * max(0.0f, 1.0f - att)) * light.intensity;
}
result.l = (255 - min(255, result.l + int32(lighting))) << 16;
// result.l = (255 - int32(lighting)) << 16;
}
bool transform(const Index *indices, const Vertex *vertices, int iStart, int iCount, int vStart) {
swVertices.reset();
swIndices.reset();
swTriangles.reset();
swQuads.reset();
mat4 swMatrix;
swMatrix.viewport(0.0f, (float)Core::height, (float)Core::width, -(float)Core::height, 0.0f, 1.0f);
swMatrix = swMatrix * mViewProj * mModel;
int vIndex = 0;
bool isTriangle = false;
bool colored = false;
@ -609,7 +641,9 @@ namespace GAPI {
result.v = (vertex.texCoord.y << 16);// / result.w;
}
result.w = result.w << 16;
result.l = (255 - ((vertex.light.x * ambient) >> 8)) << 16;
result.l = ((vertex.light.x * ambient) >> 8);
applyLighting(result, vertex);
swIndices.push(swVertices.push(result));
@ -627,14 +661,22 @@ namespace GAPI {
return colored;
}
void transformLights() {
memcpy(lightsRel, lights, sizeof(LightSW) * lightsCount);
mat4 mModelInv = mModel.inverseOrtho();
for (int i = 0; i < lightsCount; i++) {
lightsRel[i].pos = mModelInv * lights[i].pos;
}
}
void DIP(Mesh *mesh, const MeshRange &range) {
if (curTile == NULL) {
//uint32 *tex = (uint32*)Core::active.textures[0]->memory; // TODO
return;
}
swMatrix.viewport(0.0f, (float)Core::height, (float)Core::width, -(float)Core::height, 0.0f, 1.0f);
swMatrix = swMatrix * mViewProj * mModel;
transformLights();
bool colored = transform(mesh->iBuffer, mesh->vBuffer, range.iStart, range.iCount, range.vStart);
@ -656,7 +698,6 @@ namespace GAPI {
}
void initPalette(Color24 *palette, uint8 *lightmap) {
swLightmap = lightmap;
for (uint32 i = 0; i < 256; i++) {
const Color24 &p = palette[i];
swPaletteColor[i] = CONV_COLOR(p.r, p.g, p.b);
@ -664,12 +705,24 @@ namespace GAPI {
swPaletteGray[i] = CONV_COLOR((i * 57) >> 8, (i * 29) >> 8, (i * 112) >> 8);
swGradient[i] = i;
}
for (uint32 i = 0; i < 256 * 32; i++) {
swLightmapNone[i] = i % 256;
swLightmapShade[i] = lightmap[i];
}
swLightmap = swLightmapShade;
swPalette = swPaletteColor;
}
void setPalette(ColorSW *palette) {
swPalette = palette;
}
void setShading(bool enabled) {
swLightmap = enabled ? swLightmapShade : swLightmapNone;
}
vec4 copyPixel(int x, int y) {
return vec4(0.0f); // TODO: read from framebuffer
}

3
src/level.h
View File

@ -567,6 +567,7 @@ struct Level : IGame {
#ifdef _GAPI_SW
GAPI::setPalette(room.flags.water ? GAPI::swPaletteWater : GAPI::swPaletteColor);
GAPI::setShading(true);
#endif
Core::setMaterial(material.x, material.y, material.z, material.w);
@ -1643,7 +1644,6 @@ struct Level : IGame {
atlasSprites =
atlasGlyphs = new Texture(level.tiles8, level.tilesCount);
GAPI::initPalette(level.palette, level.lightmap);
GAPI::setPalette(GAPI::swPaletteColor);
#elif defined(_GAPI_GU)
atlasRooms =
atlasObjects =
@ -3184,6 +3184,7 @@ struct Level : IGame {
#ifdef _GAPI_SW
GAPI::setPalette(GAPI::swPaletteColor);
GAPI::setShading(false);
#endif
Core::pushLights();